diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7178-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30178-01.htm
similarity index 81%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7178-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30178-01.htm
index c750ed2fa29322e0eb5433d4d262efe195df728e..2aeef89ecffdb19e0f8eae4aea6fda32a979d8d9 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/7178-01.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/30178-01.htm
@@ -2,6 +2,6 @@
 Trader Zenkin:<br>
 Maestro Reorin's Mold?  Yes, I bought it from him a year ago.  I got a great deal on it.  Actually, since it was a tool used by such a famous artisan, I was ready to pay considerably more for it.  When I saw how cheaply he had it priced, I snatched it right up.<br>
 As soon as I gave him the adena Maestro Reorin ran to a liquor store.  I hated to see him like that.  He was so well-respected at one time...<br>
-<a action="bypass -h Quest 234_FatesWhisper 7178_01">"I would like to buy the mold from you."</a>
+<a action="bypass -h Quest 234_FatesWhisper 30178_01">"I would like to buy the mold from you."</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7178-01a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30178-01a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7178-01a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30178-01a.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7178-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30178-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7178-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30178-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01.htm
similarity index 76%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7182-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30182-01.htm
index 664b76fb9a9d2ac7fdd2e1a9bafc8434f919d521..5d7f84659ea9d71b4254011d5601a242ca36590d 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01.htm
@@ -2,6 +2,6 @@
 Warehouse Freightman Cliff:<br>
 Ah, so you were sent by Maestro Reorin?  What wonderful news!<br>
 How is the Maestro?  I am so glad to hear he is active again.  I feel bad because I've been too busy to go and see him.  What happened was so sad... To tell you the truth, I couldn't bear to look him in the eye.<br>
-<a action="bypass -h Quest 234_FatesWhisper 7182-01a.htm">"I am looking for Infernium Varnish"</a>
+<a action="bypass -h Quest 234_FatesWhisper 30182-01a.htm">"I am looking for Infernium Varnish"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01a.htm
similarity index 72%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7182-01a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30182-01a.htm
index 9c1fedb4384d3cc6dcd70365110dcd1d51391f01..72480ea27587cfe963d6aea2ec4da0b99b9107ce 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01a.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01a.htm
@@ -2,6 +2,6 @@
 Warehouse Freightman Cliff:<br>
 Why do you seek Infernium Varnish?  Don't tell me that Maestro Reorin is fooling around with demons again!  He should know better than that, after what happened with demon Hallate... He was tricked into making scepters for them! <br>
 Oh, that's not it this time, eh?<br>
-<a action="bypass -h Quest 234_FatesWhisper 7182-01b.htm">"All the scepters have been recovered from the demons."</a>
+<a action="bypass -h Quest 234_FatesWhisper 30182-01b.htm">"All the scepters have been recovered from the demons."</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01b.htm
similarity index 70%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7182-01b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30182-01b.htm
index a640540a7f129b8d450eb57e3fbaadc0d5cdfbc0..099ec5398eeb2f6ff4bbced2341c2af8cb1f0723 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01b.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01b.htm
@@ -1,6 +1,6 @@
 <html><head><body>
 Warehouse Freightman Cliff:<br>
 Very impressive!  All the scepters!  How wonderful!  I must report this to the superiors of the guild!  Perhaps they will reconsider his banishment for "dealings with demons". What does he intend to do with the scepters?<br>
-<a action="bypass -h Quest 234_FatesWhisper 7182_01">"He will melt them down in order to create something else."</a>
+<a action="bypass -h Quest 234_FatesWhisper 30182_01">"He will melt them down in order to create something else."</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-01c.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-01c.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7182-01c.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30182-01c.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7182-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30182-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7182-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30182-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-01.htm
similarity index 84%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7833-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30833-01.htm
index 8e5d018818c5a3b0a08c6778a199055d647f7ca5..aa130fce78ff8c4a5b0cefbd48cf5f27532cba9d 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-01.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-01.htm
@@ -3,6 +3,6 @@ Magister Kaspar:<br>
 Ah, you must have come for Maestro's Reorin's Mold.  How is Reorin?<br>
 I should check you out.  Uh oh, did I say that out loud?  Sorry... I was just talking to myself<br>
 If you knew what I went through to get this mold, you would understand why I can't just give it to you for nothing... If you ask me to set a price on it, I will set it so high that you could not possibly afford it.  But there is another way you can get it.  Perhaps you could do a favor for me...<br>
-<a action="bypass -h Quest 234_FatesWhisper 7833-01a.htm">"What do you want me to do?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 30833-01a.htm">"What do you want me to do?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-01a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-01a.htm
similarity index 83%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7833-01a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30833-01a.htm
index 18bca55feed2b0efa10abd14fe7c6ee2e6e5964d..ee0fba9b225d476704c019a73608c7af1ae106ac 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-01a.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-01a.htm
@@ -2,6 +2,6 @@
 Magister Kaspar:<br>
 Oh!  You're the one who explored the Tower of Insolence on behalf of Reorin!  Hardin's Academy is not your ordinary place of learning.  It constantly monitors world affairs.<br>
 Recently there have been interesting developments around the Tower of Insolence.  Even now, forces are gathering to fight over ancient relics that are supposedly hidden in the tower.  Of course, our interests are different from theirs...<br>
-<a action="bypass -h Quest 234_FatesWhisper 7833_01a">"What are your interests?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 30833_01a">"What are your interests?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-01b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-01b.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7833-01b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30833-01b.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7833-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30833-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-03.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7833-03.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30833-03.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7833-04.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30833-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7833-04.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30833-04.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7847-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30847-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7847-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30847-01.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/7847-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/30847-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/7847-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/30847-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-01.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02.htm
similarity index 86%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-02.htm
index 4b084df67511b3d4f17cba9b9aa4a0a1a8f6c64f..df1aeb57cb7eb18371870889c9354c0f50d19f35 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02.htm
@@ -4,6 +4,6 @@ Are you the one that woman was talking about?<br>
 What woman...?  I don't know.  I had never seen her before.  She was quite beautiful, with blonde hair and blue eyes.  She said that soon I would have an important visitor and that I should make a top-quality weapon for that person!  Sadly, I've been thrown out of the guild.  I explained to her that I no longer make weapons.  But she wouldn't accept any of my excuses.  She said that I would know after meeting you that I must once again pick up the hammer.<br>
 But what am I to do?  I drank away the money she gave me...Even if I wanted to make a weapon for you, I don't have the money to pay for the materials I need!
 <br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-02a.htm">"Why were you thrown out of the guild?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-02a.htm">"Why were you thrown out of the guild?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02a.htm
similarity index 84%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-02a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-02a.htm
index 01babf8ac076b21482fd3fbaafb8d837ae32a13d..9da66a757e9e7a4789c5d3eb5c7eac0be3764bbb 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02a.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02a.htm
@@ -4,5 +4,5 @@ I thought I had told you that already!  I foolishly broke the guild's taboo and
 However, I cannot turn back the hands of time.  My honor has been destroyed and all of my apprentices have abandoned me.  My pride is long-gone.  Now I am reduced to working for the favor of those filthy demons.  I have earned my new nickname, "blacksmith of demons".<br>
 Now all I live for is the drink.  Liquor is my only friend.
 <br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-02b.htm">"I will restore your honor!"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-02b.htm">"I will restore your honor!"</a>
 </body></html>
\ No newline at end of file
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02b.htm
similarity index 80%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-02b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-02b.htm
index 43c211772b7e37ce193dc4f1a5a7f242600d4ce4..6dca4661095923b15a2a2177cffc2791319e0434 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02b.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02b.htm
@@ -2,5 +2,5 @@
 Maestro Reorin:<br>
 Don't bother!  The only way I could possibly have my honor restored would be to stop my dealings with demons.  However I... I... cannot refuse their requests.<br>
 They have the soul of my wife, and are holding her hostage!  If I don't do exactly as they say, they will throw her soul into eternal torment!  I cannot let this happen to my dear Reiria, my honor is sacrificed for her! <br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-02c.htm">"I will rescue the soul of your wife!"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-02c.htm">"I will rescue the soul of your wife!"</a>
 </body></html>
\ No newline at end of file
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-02c.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-02c.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-02c.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-02c.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-03.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-03.htm
similarity index 82%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-03.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-03.htm
index 23f8a63754742dd8703fc824a68402835b1813e3..9bf3842c739d7c2915e4b49d4e645f6350d57046 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-03.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-03.htm
@@ -4,6 +4,6 @@ Well, I suppose that I will have to trust you.  But mark my words, if the soul o
 Now listen carefully.  <font color="LEVEL">Messenger Cabrio</font> is a cruel collector of souls.  This demon keeps the souls in this world, never allowing them to cross into eternal rest.  Some time ago, the soul of my wife was added to his collection!<br>
 He can be found in <font color="LEVEL">the Cemetery</font> in Aden...<br>
 Please free my wife's soul from this wicked demon...<br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-04.htm">"Tell me more about the woman who came to see you?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-04.htm">"Tell me more about the woman who came to see you?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-04.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-04.htm
similarity index 85%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-04.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-04.htm
index eb4ad7bffa5d7089138121cfa49926e768b7cee8..6ba681e0afa8d06bb87b746c19305209f3eabd84 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-04.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-04.htm
@@ -1,6 +1,6 @@
 <html><head><body>
 Maestro Reorin:<br>
 That is all very hazy to me.  I was sitting on my front porch, drunk as usual, and she appeared.  She was accompanied by a black knight.  Although I shall never forget that day, I cannot tell you much about their appearance.  Now it seems like it was a dream... I do remember that she had an other-wordly beauty, with blonde hair and blue eyes.  The knight was quite old, with gray hair and a dark countenance.  Other than that... I cannot say...<br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-04a.htm">"What did she say?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-04a.htm">"What did she say?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-04a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-04a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-04a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-04a.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-04b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-04b.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-04b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-04b.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-05.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-05.htm
similarity index 75%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-05.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-05.htm
index 731c0719f02b65f5561df7e2854734a651e2d225..5719f762e32cb7e779dfc6f9c6c1ee1a2767fe60 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-05.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-05.htm
@@ -3,6 +3,6 @@ Maestro Reorin:<br>
 The soul of Reiria is at rest...<br>
 Yes, I feel she is finally at peace!  My friend, I am in your debt.<br>
 Now I shall have my revenge on her tormentor.  My honor can now be restored, but I will need your help!<br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-05a.htm">"I will help you"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-05a.htm">"I will help you"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-05a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-05a.htm
similarity index 87%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-05a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-05a.htm
index 4f04625a89cd8bc8db8cae08ecb096de45f7dec8..3af22b682adc35f6927e3bafa8304a251b972c70 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-05a.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-05a.htm
@@ -3,6 +3,6 @@ Maestro Reorin:<br>
 Those wicked demons forced me to make an <font color="LEVEL">infernium scepter</font>.  Infernium is a very rare element, seldom seen since the time of the Titans.  They told me that I should be honored to be working with such a precious material.  I must admit that this thought appealed to me, and I quickly set about creating the scepters for them.<br>
 Now it is clear what I must do.  I must recover the three scepters and melt them away so that they cannot be used by the demons.  This will restore my honor!  To do this, I will have to confront <font color="LEVEL">Death Lord Hallate and his minions</font>!  I will not be successful without your help.  Please, help me do this!
 <br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-05b.htm">"Tell me about Death Lord Hallate"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-05b.htm">"Tell me about Death Lord Hallate"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-05b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-05b.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-05b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-05b.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-05c.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-05c.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-05c.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-05c.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-06.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-06.htm
similarity index 87%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-06.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-06.htm
index 647daca7971aa99c572307dd8df1c0c09d2b4831..933a890c572b113e1e17271ec97f1194bc4235eb 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-06.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-06.htm
@@ -3,6 +3,6 @@ Maestro Reorin:<br>
 Is it true?  Have you really slain Death Lord Hallate and his underlings...? Indeed, the mysterious woman was telling the truth.<br>
 Yes, the infernium scepters... My greatest masterpiece and the key to my downfall... Now, I will gladly destroy them and create an even more powerful weapon for you!<br>
 Do you smell that?  It's the infernium.  Smells like Sulfur, doesn't it?  That's why the demons are so fond of it.  An amazing material, really.  Tougher and lighter than mithril, it is one of the finest materials you will find.  It can be used to make Grade A weapon that you will find most useful.  Refining this material can be tricky, however.  I will need some <font color="LEVEL">Infernium Varnish</font>.  It is quite rare.<br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-06a.htm">"Where can I find Infernium Varnish?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-06a.htm">"Where can I find Infernium Varnish?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-06a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-06a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-06a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-06a.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-06b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-06b.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-06b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-06b.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-07.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-07.htm
similarity index 86%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-07.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-07.htm
index 53f04ff2e655bc9a4e356cac5bde53ba128cab41..bdd6666071ebb24cb7bcce44a8fb560fbb74ce93 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-07.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-07.htm
@@ -3,6 +3,6 @@ Maestro Reorin:<br>
 Ah, the Infernium Varnish!  I wish that you hadn't told him so much... I just wanted you to get the Varnish, not gossip about my personal business!<br>
 Anyway, thanks for the Varnish.  Things are going well.  Yesterday, I received a letter from the president of the Black Anvil Guild!  He says that he will pardon my sins and accept me as a guildsman.  Yes, thanks to you, I've become a maestro again...<br>
 Now I can set about making a weapon of the utmost quality for you!  Unfortunately, I don't have the hammer I need to make it.  If only I had my old hammer...<br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-07a.htm">"Where is your hammer?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-07a.htm">"Where is your hammer?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-07a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-07a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-07a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-07a.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-07b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-07b.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-07b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-07b.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-08.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-08.htm
similarity index 75%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-08.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-08.htm
index b90999070631a934ae1de68c1217e71e411df5de..2d8e64ab7505d4a4592120e0a2f927edffae3eac 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-08.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-08.htm
@@ -1,6 +1,6 @@
 <html><head><body>
 Maestro Reorin:<br>
 Ah, my hammer!  Good job!  It feels good to hold it in my hand again.  How long has it beed!  The infernium is almost ready to be formed... Now the work can begin!  Ah, yes, all I need now is the mold... Ahem...<br>
-<a action="bypass -h Quest 234_FatesWhisper 8002-08a.htm">"Where is the mold?"</a>
+<a action="bypass -h Quest 234_FatesWhisper 31002-08a.htm">"Where is the mold?"</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-08a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-08a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-08a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-08a.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-08b.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-08b.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-08b.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-08b.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-09.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-09.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-09.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-09a.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-09a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-09a.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-09a.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-10.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-10.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-10.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-11.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-11.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-11.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-11.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-12.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-12.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-12.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-12.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8002-AGradeList.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31002-AGradeList.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8002-AGradeList.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31002-AGradeList.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8027-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31027-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8027-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31027-01.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8028-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31028-01.htm
similarity index 61%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8028-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31028-01.htm
index 5dff55f6eb3c0fff3a397aebf160b971e7e80c92..dba195594c866dd8be0a44e6d8a7b3fe9647b045 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8028-01.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31028-01.htm
@@ -1,5 +1,5 @@
 <html><head><body>
 This chest was found guarded Kermon.  It looks locked, but the buckle seems rusty.<br>
-<a action="bypass -h Quest 234_FatesWhisper 8028_01">Break the lock</a>
+<a action="bypass -h Quest 234_FatesWhisper 31028_01">Break the lock</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8028-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31028-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8028-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31028-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8029-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31029-01.htm
similarity index 74%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8029-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31029-01.htm
index 8c8f2bf57d6f277da71bd9500976fa5e29748ecb..c9f14c8ea63c1eddea553b028a0917443a40164a 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8029-01.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31029-01.htm
@@ -1,5 +1,5 @@
 <html><head><body>
 Fortunately, it seems tha Longhorn Golkonda, obsessed with the power of this scepter, had recently taken it out and forgot to secure the chest.  The buckle seems unlocked.<br>
-<a action="bypass -h Quest 234_FatesWhisper 8029_01">Open it up</a>
+<a action="bypass -h Quest 234_FatesWhisper 31029_01">Open it up</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8029-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31029-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8029-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31029-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8030-01.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31030-01.htm
similarity index 63%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8030-01.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31030-01.htm
index a2a9a2d96b17d9103c282b10f98908eec1ef3039..bedc1d291822f428f9c7fa507ea701676083a27a 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/8030-01.htm
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/31030-01.htm
@@ -1,5 +1,5 @@
 <html><head><body>
 As Death Lord Hallate falls to his death, this chest fell on the floor and cracked open.<br>
-<a action="bypass -h Quest 234_FatesWhisper 8030_01">Look inside</a>
+<a action="bypass -h Quest 234_FatesWhisper 31030_01">Look inside</a>
 </body></html>
 
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/8030-02.htm b/datapack_development/data/jscript/quests/234_FatesWhisper/31030-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/234_FatesWhisper/8030-02.htm
rename to datapack_development/data/jscript/quests/234_FatesWhisper/31030-02.htm
diff --git a/datapack_development/data/jscript/quests/234_FatesWhisper/__init__.py b/datapack_development/data/jscript/quests/234_FatesWhisper/__init__.py
index 76ee90280353242f7da2e7e02ee6e97d7eee2732..a7304dad7e8c1a820dc6c3511cb26ec318212de0 100644
--- a/datapack_development/data/jscript/quests/234_FatesWhisper/__init__.py
+++ b/datapack_development/data/jscript/quests/234_FatesWhisper/__init__.py
@@ -18,11 +18,11 @@ STAR_OF_DESTINY = 5011
 CRYSTAL_B = 1460
 
 #Leorin, Cliff, Ferris, Zenkin, Kaspar, Kernon's Chest, Golkonda's Chest, Hallate's Chest, Cabrio's "Coffer of the Dead"
-NPC=[8002,7182,7847,7178,7833,8028,8029,8030,8027]
+NPC=[31002,30182,30847,30178,30833,31028,31029,31030,31027]
 
 #mobId=[cond,spawn,dropId,rate]
 DROPLIST={
-12372: [7,0,RED_PIPETTE_KNIFE,10]				#Baium...NOTE: rate may need adjustment
+29020: [7,0,RED_PIPETTE_KNIFE,10]				#Baium...NOTE: rate may need adjustment
 }
 
 ## START: Weapon exchange section (any top B grade for 2nd best A grade)
@@ -49,30 +49,30 @@ class Quest (JQuest) :
 		if event == "1" :
 			st.set("cond","1")
 			st.setState(STARTED)
-			htmltext = "8002-03.htm"
+			htmltext = "31002-03.htm"
 		# talking with cliff...last dialog to get the Infernium Varnish
-		elif event == "7182_01" :
-			htmltext = "7182-01c.htm"
+		elif event == "30182_01" :
+			htmltext = "30182-01c.htm"
 			st.giveItems(INFERNIUM_VARNISH,1)
 		# open Kernon's Chest
-		elif event == "8028_01" :
-			htmltext = "8028-02.htm"
+		elif event == "31028_01" :
+			htmltext = "31028-02.htm"
 			st.giveItems(KERMONS_INFERNIUM_SCEPTER,1)
 		# open Hallate's Chest
-		elif event == "8029_01" :
-			htmltext = "8029-02.htm"
+		elif event == "31029_01" :
+			htmltext = "31029-02.htm"
 			st.giveItems(GOLCONDAS_INFERNIUM_SCEPTER,1)
 		# open Golkonda's Chest
-		elif event == "8030_01" :
-			htmltext = "8030-02.htm"
+		elif event == "31030_01" :
+			htmltext = "31030-02.htm"
 			st.giveItems(HALLATES_INFERNIUM_SCEPTER,1)
 		# dialog with Zenkin
-		elif event == "7178_01" :
+		elif event == "30178_01" :
 			st.set("cond","6")
-			htmltext = "7178-01a.htm"
+			htmltext = "30178-01a.htm"
 		# dialog with Kaspar - go to baium
-		elif event == "7833_01a" :
-			htmltext = "7833-01b.htm"
+		elif event == "30833_01a" :
+			htmltext = "30833-01b.htm"
 			st.giveItems(PIPETTE_KNIFE,1)
 			st.set("cond","7")
 		## FINAL ITEM EXCHANGE SECTION
@@ -100,13 +100,13 @@ class Quest (JQuest) :
 				st.getPlayer().destroyItem("234_FatesWhisper",bGradeObjId, 1, st.getPlayer(), 0)
 				st.set("bypass","1")
 				# now show the A Grade weapon list
-				htmltext = "8002-AGradeList.htm"
+				htmltext = "31002-AGradeList.htm"
 			else :
 				htmltext = "<html><body>Maestro Reorin:<br>Are you trying to cheat me?!  What happenned to the weapon you were about to give me for the neutralization of Infernum's evil aura?</body></html>"
 		elif event.startswith("selectAGrade_"):
 			if st.getInt("bypass"):
 				aGradeItemId = int(event.replace("selectAGrade_", ""))
-				htmltext = "8002-12.htm"
+				htmltext = "31002-12.htm"
 				st.giveItems(aGradeItemId,1)
 				st.giveItems(STAR_OF_DESTINY,1)
 				st.setState(COMPLETED)
@@ -124,9 +124,9 @@ class Quest (JQuest) :
 		# first time when a player join the quest
 		if id == CREATED:
 			if st.getPlayer().getLevel() >= 75:
-				htmltext = "8002-02.htm"
+				htmltext = "31002-02.htm"
 			else:
-				htmltext = "8002-01.htm"
+				htmltext = "31002-01.htm"
 				st.exitQuest(1)
 			return htmltext
 		# if quest is already completed
@@ -137,112 +137,112 @@ class Quest (JQuest) :
 			cond =st.getInt("cond")
 			if npcId == NPC[0] :
 				if cond == 1 and not st.getQuestItemsCount(REIRIAS_SOUL_ORB) :  # waiting for the orb
-					htmltext = "8002-04b.htm"
+					htmltext = "31002-04b.htm"
 				elif cond == 1 :	#got the orb!  Go to the next step (infernium scepter pieces)
 					st.takeItems(REIRIAS_SOUL_ORB,1)
-					htmltext = "8002-05.htm"
+					htmltext = "31002-05.htm"
 					st.set("cond","2")
 				# waiting for infernium scepter pieces
 				elif cond == 2 and (st.getQuestItemsCount(KERMONS_INFERNIUM_SCEPTER)+st.getQuestItemsCount(GOLCONDAS_INFERNIUM_SCEPTER)+st.getQuestItemsCount(HALLATES_INFERNIUM_SCEPTER) < 3) :
-					htmltext = "8002-05c.htm"
+					htmltext = "31002-05c.htm"
 				elif cond == 2 :	#got the infernium scepter pieces!  Go to the next step (infernium Varnish)
 					st.takeItems(KERMONS_INFERNIUM_SCEPTER,1)
 					st.takeItems(GOLCONDAS_INFERNIUM_SCEPTER,1)
 					st.takeItems(HALLATES_INFERNIUM_SCEPTER,1)
-					htmltext = "8002-06.htm"
+					htmltext = "31002-06.htm"
 					st.set("cond","3")
 				# waiting for infernium varnish
 				elif cond == 3 and not st.getQuestItemsCount(INFERNIUM_VARNISH) :
-					htmltext = "8002-06b.htm"
+					htmltext = "31002-06b.htm"
 				elif cond == 3 :	#got the infernium varnish!  Go to the next step (Leorin's Hammer)
 					st.takeItems(INFERNIUM_VARNISH,1)
-					htmltext = "8002-07.htm"
+					htmltext = "31002-07.htm"
 					st.set("cond","4")
 				# waiting for Leorin's Hammer
 				elif cond == 4 and not st.getQuestItemsCount(REORINS_HAMMER) :
-					htmltext = "8002-07b.htm"
+					htmltext = "31002-07b.htm"
 				elif cond == 4 :	# got Leorin's Hammer!  Go to the next step (Leorin's Mold)
 					st.takeItems(REORINS_HAMMER,1)
-					htmltext = "8002-08.htm"
+					htmltext = "31002-08.htm"
 					st.set("cond","5")
 				elif cond < 8 :	 	# waiting for Leorin's Mold
-					htmltext = "8002-08b.htm"
+					htmltext = "31002-08b.htm"
 				elif cond == 8 :	# got Leorin's Mold!  Go to the next step (B Crystals)
 					st.takeItems(REORINS_MOLD,1)
-					htmltext = "8002-09.htm"
+					htmltext = "31002-09.htm"
 					st.set("cond","9")
 				# waiting for 984 B Grade Crystals
 				elif cond == 9 and (st.getQuestItemsCount(CRYSTAL_B) < 984) :
-					htmltext = "8002-09a.htm"
+					htmltext = "31002-09a.htm"
 				elif cond == 9 : # got the crystals
 					st.takeItems(CRYSTAL_B,984)
-					htmltext = "8002-10.htm"
+					htmltext = "31002-10.htm"
 					st.set("cond","10")
 				# all is ready.  Now give a menu to trade the B weapon for the player's choice of A Weapon.
 				elif cond == 10:
 					if st.getInt("bypass") :
-						htmltext = "8002-AGradeList.htm"
+						htmltext = "31002-AGradeList.htm"
 					else :
-						htmltext = "8002-11.htm"
+						htmltext = "31002-11.htm"
 			## CLIFF.
 			# came to take the varnish
 			elif npcId == NPC[1] and cond==3 and not st.getQuestItemsCount(INFERNIUM_VARNISH) :
-				htmltext = "7182-01.htm"
+				htmltext = "30182-01.htm"
 			# you already got the varnish...why are you back?
 			elif npcId == NPC[1] and (cond>=3 or st.getQuestItemsCount(INFERNIUM_VARNISH)) :
-				htmltext = "7182-02.htm"
+				htmltext = "30182-02.htm"
 			## FERRIS
 			# go to take the mold			
 			elif npcId == NPC[2] and cond==4 and not st.getQuestItemsCount(REORINS_HAMMER) :
-				htmltext = "7847-01.htm"	# go to trader Zenkin
+				htmltext = "30847-01.htm"	# go to trader Zenkin
 				st.giveItems(REORINS_HAMMER,1)
 			# I already told you I don't have it!  
 			elif npcId == NPC[2] and cond>=4 :
-				htmltext = "7847-02.htm"	# go to trader Zenkin
+				htmltext = "30847-02.htm"	# go to trader Zenkin
 			## ZENKIN
 			# go to take mold
 			elif npcId == NPC[3] and cond==5 :
-				htmltext = "7178-01.htm"	# go to Magister Kaspar
+				htmltext = "30178-01.htm"	# go to Magister Kaspar
 			# I already told you I don't have it!  
 			elif npcId == NPC[3] and cond>5 :
-				htmltext = "7178-02.htm"	# go to Magister Kaspar
+				htmltext = "30178-02.htm"	# go to Magister Kaspar
 			## KASPAR
 			elif npcId == NPC[4]:
 				# first visit: You have neither plain nor blooded knife.
 				if cond==6 :
-					htmltext = "7833-01.htm"	# go to Magister Hanellin,etc. Get Baium's Blood with the pipette
+					htmltext = "30833-01.htm"	# go to Magister Hanellin,etc. Get Baium's Blood with the pipette
 				# revisit before getting the blood: remind "go get the blood"
 				if cond==7 and st.getQuestItemsCount(PIPETTE_KNIFE) and not st.getQuestItemsCount(RED_PIPETTE_KNIFE) :
-					htmltext = "7833-02.htm"	# go to Magister Hanellin,etc. Get Baium's Blood with the pipette
+					htmltext = "30833-02.htm"	# go to Magister Hanellin,etc. Get Baium's Blood with the pipette
 				# got the blood and I'm ready to proceed
 				if cond==7 and not st.getQuestItemsCount(PIPETTE_KNIFE) and st.getQuestItemsCount(RED_PIPETTE_KNIFE) :
-					htmltext = "7833-03.htm"	# great! Here is your mold for Leorin
+					htmltext = "30833-03.htm"	# great! Here is your mold for Leorin
 					st.takeItems(RED_PIPETTE_KNIFE,1)
 					st.giveItems(REORINS_MOLD,1)
 					st.set("cond","8")
 				#revisit after you've gotten the mold: What are you still doing here?
 				if st.getInt("cond")>7 :
-					htmltext = "7833-04.htm"	# Have you given the mold to Leorin, yet?
+					htmltext = "30833-04.htm"	# Have you given the mold to Leorin, yet?
 			## CHESTS FROM RAIDBOSSES
 			elif cond==1 :
 				if npcId ==NPC[8] and st.getQuestItemsCount(REIRIAS_SOUL_ORB)==0 :
-					htmltext = "8027-01.htm"
+					htmltext = "31027-01.htm"
 					st.giveItems(REIRIAS_SOUL_ORB,1)
 					st.playSound("Itemsound.quest_itemget")
 			elif cond==2 :
 				# Kernon's Chest
 				if npcId == NPC[5] and st.getQuestItemsCount(KERMONS_INFERNIUM_SCEPTER)==0 :
-					htmltext = "8028-01.htm"
+					htmltext = "31028-01.htm"
 				elif npcId == NPC[5] :
 					htmltext = "<html><head><body>This chest looks empty</body></html>"
 				# Golkonda's Chest
 				elif npcId == NPC[6] and st.getQuestItemsCount(GOLCONDAS_INFERNIUM_SCEPTER)==0 :
-					htmltext = "8029-01.htm"
+					htmltext = "31029-01.htm"
 				elif npcId == NPC[6] :
 					htmltext = "<html><head><body>This chest looks empty</body></html>"
 				# Hallate's Chest 
 				elif npcId == NPC[7] and st.getQuestItemsCount(HALLATES_INFERNIUM_SCEPTER)==0 :
-					htmltext = "8030-01.htm"
+					htmltext = "31030-01.htm"
 				elif npcId == NPC[7] :
 					htmltext = "<html><head><body>This chest looks empty</body></html>"
 		return htmltext		
@@ -250,7 +250,7 @@ class Quest (JQuest) :
 	def onAttack (self, npc, st):                   
 		npcId = npc.getNpcId()
 		value,dummy,dropId,chance = DROPLIST[npcId]
-		if value == st.getInt("cond") and npcId==12372 :
+		if value == st.getInt("cond") and npcId==29020 :
 			if st.getPlayer().getActiveWeaponItem() and st.getPlayer().getActiveWeaponItem().getItemId() == PIPETTE_KNIFE and st.getRandom(100)<chance and st.getQuestItemsCount(dropId) == 0:
 				st.giveItems(dropId,1)
 				st.takeItems(PIPETTE_KNIFE,1)
@@ -265,7 +265,7 @@ class Quest (JQuest) :
 				if st.getRandom(100) < chance and st.getQuestItemsCount(dropId) == 0:
 					st.giveItems(dropId,1)
 					st.playSound("Itemsound.quest_itemget")
-					if npcId == 12372:
+					if npcId == 29020:
 						st.takeItems(PIPETTE_KNIFE,1)
 			if spawnId > 0 :
 				st.getPcSpawn().addSpawn(spawnId,npc.getX(),npc.getY(),npc.getZ(),120000)
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-01.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-01.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-01.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-01a.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-01a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-01a.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-01a.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-02.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-02.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-02.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-02a.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-02a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-02a.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-02a.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-03.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-03.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-03.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-04.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-04.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-04.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-05.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-05.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-05.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-06.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-06.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-06.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-07.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-07.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-07.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-08.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-08.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-08.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-08.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-09.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-09.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-09.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7166-10.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30166-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7166-10.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30166-10.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7718-01.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30718-01.htm
similarity index 86%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7718-01.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30718-01.htm
index 29cff72e85128f818705ff7c379d46e5e9187193..790aecfb3af8f4c99e565dcb22be4b86ff324dff 100644
--- a/datapack_development/data/jscript/quests/235_MimirsElixir/7718-01.htm
+++ b/datapack_development/data/jscript/quests/235_MimirsElixir/30718-01.htm
@@ -1,5 +1,5 @@
 <html><head><body>Magister Joan:<br>
 Are you the person Ladd sent for True Gold?  I was already informed you were coming.  To tell you the truth, I do not really need it any more, but seing how much you need it, how about a trade?<br>
 For my next experiment, I need the Stone of Wisdom.  Some also call it Sage's Stone.  It can only be acquired by killing <font color="LEVEL">Chimera Piece</font>.  You can find this monster in the Field of Silence, near Giant's Cave.  If you bring me this stone, I will give you some True Gold.  So, what do you think?<br>
-<a action="bypass -h Quest 235_MimirsElixir 7718_1">"I'll get the stone for you"</a>
+<a action="bypass -h Quest 235_MimirsElixir 30718_1">"I'll get the stone for you"</a>
 </body></html>
\ No newline at end of file
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7718-01a.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30718-01a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7718-01a.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30718-01a.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7718-02.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30718-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7718-02.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30718-02.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7718-03.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30718-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7718-03.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30718-03.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/7718-04.htm b/datapack_development/data/jscript/quests/235_MimirsElixir/30718-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/235_MimirsElixir/7718-04.htm
rename to datapack_development/data/jscript/quests/235_MimirsElixir/30718-04.htm
diff --git a/datapack_development/data/jscript/quests/235_MimirsElixir/__init__.py b/datapack_development/data/jscript/quests/235_MimirsElixir/__init__.py
index b4a5a040df08285ad9cda28c543c8b85be1932f7..107c86729a6d05d8225180e9ad7916d7f5e2251a 100644
--- a/datapack_development/data/jscript/quests/235_MimirsElixir/__init__.py
+++ b/datapack_development/data/jscript/quests/235_MimirsElixir/__init__.py
@@ -26,11 +26,11 @@ SCROLL_ENCHANT_WEAPON_A = 729
 #Messages
 default   = "<html><head><body>I have nothing to say to you.</body></html>"
 #NPCs
-LADD,JOAN=7721,7718
+LADD,JOAN=7721,30718
 #Mobs, cond, Drop
 DROPLIST = {
-965: [3,SAGES_STONE],   #Chimera Piece
-1090: [6,BLOOD_FIRE]    #Bloody Guardian
+20965: [3,SAGES_STONE],   #Chimera Piece
+21090: [6,BLOOD_FIRE]    #Bloody Guardian
 }
 
 class Quest (JQuest) :
@@ -41,10 +41,10 @@ class Quest (JQuest) :
     if event == "1" :
         st.setState(PROGRESS)
         st.set("cond","1")
-        htmltext = "7166-02a.htm"
-    elif event == "7718_1" :
+        htmltext = "30166-02a.htm"
+    elif event == "30718_1" :
         st.set("cond","3")
-        htmltext = "7718-01a.htm"
+        htmltext = "30718-01a.htm"
     return htmltext
  
  def onTalk (self,npc,st):
@@ -57,41 +57,41 @@ class Quest (JQuest) :
             st.set("cond","0")
             if st.getPlayer().getLevel() < MINLEVEL :
                 st.exitQuest(1)
-                htmltext = "7166-01.htm"     #not qualified
+                htmltext = "30166-01.htm"     #not qualified
             elif not st.getQuestItemsCount(STAR_OF_DESTINY) :
                 st.exitQuest(1)
-                htmltext = "7166-01a.htm"     #not qualified
+                htmltext = "30166-01a.htm"     #not qualified
             elif int(st.get("cond"))==0 :
-                htmltext = "7166-02.htm"    # Successful start: Bring me Pure silver from Reagents quest
+                htmltext = "30166-02.htm"    # Successful start: Bring me Pure silver from Reagents quest
         elif id == COMPLETED :
             htmltext = "<html><head><body>You have already completed this quest.</body></html>"
         # was asked to get pure silver but has not done so yet.  Repeat: get pure silver
         elif cond==1 and not st.getQuestItemsCount(PURE_SILVER) :
-            htmltext = "7166-03.htm"    # Bring me Pure silver from Reagents quest
+            htmltext = "30166-03.htm"    # Bring me Pure silver from Reagents quest
         # got the pure silver and came back.  Ask for TrueGold.
         elif cond==1 and st.getQuestItemsCount(PURE_SILVER) :
             st.set("cond","2")
-            htmltext = "7166-04.htm"    # Bring me True Gold from Joan
+            htmltext = "30166-04.htm"    # Bring me True Gold from Joan
         elif 1<cond<5 :
-            htmltext = "7166-05.htm"    # Where is my GOLD?!  Bring to me first.
+            htmltext = "30166-05.htm"    # Where is my GOLD?!  Bring to me first.
         # got the true gold...look for Blood fire
         elif cond==5 :
             st.set("cond","6")
-            htmltext = "7166-06.htm"    # find Blood Fire from "bloody guardians"
+            htmltext = "30166-06.htm"    # find Blood Fire from "bloody guardians"
         # still looking for blood fire?
         elif cond==6 :
-            htmltext = "7166-07.htm"    # find Blood Fire from "bloody guardians"
+            htmltext = "30166-07.htm"    # find Blood Fire from "bloody guardians"
         # Ah, you got the blood fire!  Time to mix them up!
         elif cond==7 and st.getQuestItemsCount(PURE_SILVER) and st.getQuestItemsCount(TRUE_GOLD):
-            htmltext = "7166-08.htm"     # what are you standing there for?  Go to the cauldron and mix them...
+            htmltext = "30166-08.htm"     # what are you standing there for?  Go to the cauldron and mix them...
         # you idiot, how did you lose your quest items?
         elif cond==7 :   
-            htmltext = "7166-09.htm"     # Well...you already know what to do...go get the 3 items...
+            htmltext = "30166-09.htm"     # Well...you already know what to do...go get the 3 items...
             st.set("cond","3")          # start over...yay...
         # cond for this quest is set to 8 from Supplier or Reagents, when you create Mimir's Elixir.
         # Finally, all is done...time to learn how to use the Elixir...
         elif cond==8 :
-            htmltext = "7166-10.htm"     # here's what you do...
+            htmltext = "30166-10.htm"     # here's what you do...
             #st.takeItems(MIMIRS_ELIXIR,-1)  #disabled for compatibility with the way java expects things at Grand Master.
             st.giveItems(SCROLL_ENCHANT_WEAPON_A,1)
             st.setState(COMPLETED)
@@ -99,18 +99,18 @@ class Quest (JQuest) :
     elif npcId == JOAN :
        # first time talking to Joan: You ask for True Gold, she sends you for Sage's stone
         if cond==2 :
-            htmltext = "7718-01.htm"      # You want True Gold?  Please get the sage's stone.  Kill Chimera!
+            htmltext = "30718-01.htm"      # You want True Gold?  Please get the sage's stone.  Kill Chimera!
         # Why are you back alraedy?  You don't have the stone.
         elif cond==3 :
-            htmltext = "7718-02.htm"     # you haven't gotten the sage's stone yet?
+            htmltext = "30718-02.htm"     # you haven't gotten the sage's stone yet?
         # aha!  Here is the sage's stone!  Cool, now we can make true gold
         elif cond==4 :
             st.takeItems(SAGES_STONE,-1)
             st.giveItems(TRUE_GOLD,1)
             st.set("cond","5")
-            htmltext = "7718-03.htm"     # here you go...take the gold.  Now go back to ladd.
+            htmltext = "30718-03.htm"     # here you go...take the gold.  Now go back to ladd.
         elif cond>=5 :
-            htmltext = "7718-04.htm"     # Go back to ladd already!
+            htmltext = "30718-04.htm"     # Go back to ladd already!
     return htmltext
  
  def onKill (self,npc,st) :
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7097-05.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30097-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7097-05.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30097-05.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7097-06.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30097-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7097-06.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30097-06.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-00.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-00.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-00.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-00.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-01.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-01.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-01.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-01a.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-01a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-01a.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-01a.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-02.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-02.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-02.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-03.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-03.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-03.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-03a.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-03a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-03a.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-03a.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-04.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-04.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-04.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-05.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-05.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-05.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-05a.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-05a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-05a.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-05a.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-06.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-06.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-06.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/7829-07.htm b/datapack_development/data/jscript/quests/43_HelpTheSister/30829-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/43_HelpTheSister/7829-07.htm
rename to datapack_development/data/jscript/quests/43_HelpTheSister/30829-07.htm
diff --git a/datapack_development/data/jscript/quests/43_HelpTheSister/__init__.py b/datapack_development/data/jscript/quests/43_HelpTheSister/__init__.py
index f7b576a89d913e9f82a698e6f448ca615aa77b55..ced93dc7c9fe50eacf9c38c93a4f7ad1882d75b5 100644
--- a/datapack_development/data/jscript/quests/43_HelpTheSister/__init__.py
+++ b/datapack_development/data/jscript/quests/43_HelpTheSister/__init__.py
@@ -4,16 +4,16 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-COOPER=7829
-GALLADUCCI=7097
+COOPER=30829
+GALLADUCCI=30097
 
 CRAFTED_DAGGER=220
 MAP_PIECE=7550
 MAP=7551
 PET_TICKET=7584
 
-SPECTER=171
-SORROW_MAIDEN=197
+SPECTER=20171
+SORROW_MAIDEN=20197
 
 MAX_COUNT=30
 MIN_LEVEL=26
@@ -22,25 +22,25 @@ class Quest (JQuest) :
 	def onEvent(self, event, st):
 		htmltext=event
 		if event=="1":
-			htmltext="7829-01.htm"
+			htmltext="30829-01.htm"
 			st.set("cond","1")
 			st.setState(STARTED)
 			st.playSound("ItemSound.quest_accept")
 		elif event=="3" and st.getQuestItemsCount(CRAFTED_DAGGER):
-			htmltext="7829-03.htm"
+			htmltext="30829-03.htm"
 			st.takeItems(CRAFTED_DAGGER,1)
 			st.set("cond","2")
 		elif event=="4" and st.getQuestItemsCount(MAP_PIECE)>=MAX_COUNT:
-			htmltext="7829-05.htm"
+			htmltext="30829-05.htm"
 			st.takeItems(MAP_PIECE,MAX_COUNT)
 			st.giveItems(MAP,1)
 			st.set("cond", "4")
 		elif event=="5" and st.getQuestItemsCount(MAP):
-			htmltext="7097-06.htm"
+			htmltext="30097-06.htm"
 			st.takeItems(MAP,1)
 			st.set("cond","5")
 		elif event=="7":
-			htmltext="7829-07.htm"
+			htmltext="30829-07.htm"
 			st.giveItems(PET_TICKET,1)
 			st.setState(COMPLETED)
 			st.exitQuest(0)
@@ -52,7 +52,7 @@ class Quest (JQuest) :
 		id=st.getState()
 		if id==CREATED:
 			if st.getPlayer().getLevel()>=MIN_LEVEL:
-				htmltext="7829-00.htm"
+				htmltext="30829-00.htm"
 			else:
 				st.exitQuest(1)
 				htmltext="<html><head><body>This quest can only be taken by characters that have a minimum level of %s. Return when you are more experienced.</body></html>" % MIN_LEVEL
@@ -61,20 +61,20 @@ class Quest (JQuest) :
 			if npcId==COOPER:
 				if cond==1:
 					if not st.getQuestItemsCount(CRAFTED_DAGGER):
-						htmltext="7829-01a.htm"
+						htmltext="30829-01a.htm"
 					else:
-						htmltext="7829-02.htm"
+						htmltext="30829-02.htm"
 				elif cond==2:
-					htmltext="7829-03a.htm"
+					htmltext="30829-03a.htm"
 				elif cond==3:
-						htmltext="7829-04.htm"
+						htmltext="30829-04.htm"
 				elif cond==4:
-					htmltext="7829-05a.htm"
+					htmltext="30829-05a.htm"
 				elif cond==5:
-					htmltext="7829-06.htm"
+					htmltext="30829-06.htm"
 			elif npcId==GALLADUCCI:
 				if cond==4 and st.getQuestItemsCount(MAP):
-					htmltext="7097-05.htm"
+					htmltext="30097-05.htm"
 		elif id==COMPLETED:
 			st.exitQuest(0)
 			htmltext="<html><head><body>This quest have already been completed.</body></html>"
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7505-05.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30505-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7505-05.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30505-05.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7505-06.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30505-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7505-06.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30505-06.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7505-06a.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30505-06a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7505-06a.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30505-06a.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-00.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-00.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-00.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-00.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-01.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-01.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-01.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-01a.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-01a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-01a.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-01a.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-02.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-02.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-02.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-03.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-03.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-03.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-03a.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-03a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-03a.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-03a.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-04.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-04.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-04.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-05.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-05.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-05.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-05a.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-05a.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-05a.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-05a.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-06.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-06.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-06.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/7827-07.htm b/datapack_development/data/jscript/quests/44_HelpTheSon/30827-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/44_HelpTheSon/7827-07.htm
rename to datapack_development/data/jscript/quests/44_HelpTheSon/30827-07.htm
diff --git a/datapack_development/data/jscript/quests/44_HelpTheSon/__init__.py b/datapack_development/data/jscript/quests/44_HelpTheSon/__init__.py
index 9a6e064e0b9d6179257c26ce373b8743e47ede6d..2afd94ca752df0ce3ac690f0d9535b395500446f 100644
--- a/datapack_development/data/jscript/quests/44_HelpTheSon/__init__.py
+++ b/datapack_development/data/jscript/quests/44_HelpTheSon/__init__.py
@@ -4,17 +4,17 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-LUNDY=7827
-DRIKUS=7505
+LUNDY=30827
+DRIKUS=30505
 
 WORK_HAMMER=168
 GEMSTONE_FRAGMENT=7552
 GEMSTONE=7553
 PET_TICKET=7585
 
-MAILLE_GUARD=921
-MAILLE_SCOUT=920
-MAILLE_LIZARDMAN=919
+MAILLE_GUARD=20921
+MAILLE_SCOUT=20920
+MAILLE_LIZARDMAN=20919
 
 MAX_COUNT=30
 MIN_LEVEL=24
@@ -23,25 +23,25 @@ class Quest (JQuest) :
 	def onEvent(self, event, st):
 		htmltext=event
 		if event=="1":
-			htmltext="7827-01.htm"
+			htmltext="30827-01.htm"
 			st.set("cond","1")
 			st.setState(STARTED)
 			st.playSound("ItemSound.quest_accept")
 		if event=="3" and st.getQuestItemsCount(WORK_HAMMER):
-			htmltext="7827-03.htm"
+			htmltext="30827-03.htm"
 			st.takeItems(WORK_HAMMER,1)
 			st.set("cond","2")
 		if event=="4" and st.getQuestItemsCount(GEMSTONE_FRAGMENT)>=MAX_COUNT:
-			htmltext="7827-05.htm"
+			htmltext="30827-05.htm"
 			st.takeItems(GEMSTONE_FRAGMENT,MAX_COUNT)
 			st.giveItems(GEMSTONE,1)
 			st.set("cond", "4")
 		if event=="5" and st.getQuestItemsCount(GEMSTONE):
-			htmltext="7505-06.htm"
+			htmltext="30505-06.htm"
 			st.takeItems(GEMSTONE,1)
 			st.set("cond","5")
 		if event=="7":
-			htmltext="7827-07.htm"
+			htmltext="30827-07.htm"
 			st.giveItems(PET_TICKET,1)
 			st.setState(COMPLETED)
 			st.exitQuest(0)
@@ -53,7 +53,7 @@ class Quest (JQuest) :
 		id=st.getState()
 		if id==CREATED:
 			if st.getPlayer().getLevel()>=MIN_LEVEL:
-				htmltext="7827-00.htm"
+				htmltext="30827-00.htm"
 			else:
 				st.exitQuest(1)
 				htmltext="<html><head><body>This quest can only be taken by characters that have a minimum level of %s. Return when you are more experienced.</body></html>" % MIN_LEVEL
@@ -62,22 +62,22 @@ class Quest (JQuest) :
 			if npcId==LUNDY:
 				if cond==1:
 					if not st.getQuestItemsCount(WORK_HAMMER):
-						htmltext="7827-01a.htm"
+						htmltext="30827-01a.htm"
 					else:
-						htmltext="7827-02.htm"
+						htmltext="30827-02.htm"
 				elif cond==2:
-					htmltext="7827-03a.htm"
+					htmltext="30827-03a.htm"
 				elif cond==3:
-						htmltext="7827-04.htm"
+						htmltext="30827-04.htm"
 				elif cond==4:
-					htmltext="7827-05a.htm"
+					htmltext="30827-05a.htm"
 				elif cond==5:
-					htmltext="7827-06.htm"
+					htmltext="30827-06.htm"
 			elif npcId==DRIKUS:
 				if cond==4 and st.getQuestItemsCount(GEMSTONE):
-					htmltext="7505-05.htm"
+					htmltext="30505-05.htm"
 				elif cond==5:
-					htmltext="7505-06a.htm"
+					htmltext="30505-06a.htm"
 		elif id==COMPLETED:
 			st.exitQuest(0)
 			htmltext="<html><head><body>This quest have already been completed.</body></html>"
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7090-01.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30090-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7090-01.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30090-01.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7090-02.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30090-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7090-02.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30090-02.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7090-03.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30090-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7090-03.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30090-03.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7094-01.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30094-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7094-01.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30094-01.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7094-02.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30094-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7094-02.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30094-02.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7094-03.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30094-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7094-03.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30094-03.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-01.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-01.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-01.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-02.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-02.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-02.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-03.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-03.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-03.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-04.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-04.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-04.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-05.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-05.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-05.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-06.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-06.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-06.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-07.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-07.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-07.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-08.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-08.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-08.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-08.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-09.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-09.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-09.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-10.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-10.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-10.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-11.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-11.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-11.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-11.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-12.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-12.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7097-12.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30097-12.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7116-01.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30116-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7116-01.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30116-01.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7116-02.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30116-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7116-02.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30116-02.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/7116-03.htm b/datapack_development/data/jscript/quests/45_ToTalkingIsland/30116-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/45_ToTalkingIsland/7116-03.htm
rename to datapack_development/data/jscript/quests/45_ToTalkingIsland/30116-03.htm
diff --git a/datapack_development/data/jscript/quests/45_ToTalkingIsland/__init__.py b/datapack_development/data/jscript/quests/45_ToTalkingIsland/__init__.py
index 64221a8f59676133ae7c6b1c7e8357e645f9187e..5e6351ca3a164b7dab96c52b27333d25b014c886 100644
--- a/datapack_development/data/jscript/quests/45_ToTalkingIsland/__init__.py
+++ b/datapack_development/data/jscript/quests/45_ToTalkingIsland/__init__.py
@@ -5,15 +5,15 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-TRADER_GALLADUCCI_ID = 7097
+TRADER_GALLADUCCI_ID = 30097
 GALLADUCCIS_ORDER_DOCUMENT_ID_1 = 7563
 GALLADUCCIS_ORDER_DOCUMENT_ID_2 = 7564
 GALLADUCCIS_ORDER_DOCUMENT_ID_3 = 7565
-MAGIC_TRADER_GENTLER_ID = 7094
+MAGIC_TRADER_GENTLER_ID = 30094
 MAGIC_SWORD_HILT_ID = 7568
-JEWELER_SANDRA_ID = 7090
+JEWELER_SANDRA_ID = 30090
 GEMSTONE_POWDER_ID = 7567
-PRIEST_DUSTIN_ID = 7116
+PRIEST_DUSTIN_ID = 30116
 PURIFIED_MAGIC_NECKLACE_ID = 7566
 MARK_OF_TRAVELER_ID = 7570
 SCROLL_OF_ESCAPE_SPECIAL = 7554
@@ -31,36 +31,36 @@ class Quest (JQuest) :
             st.setState(STARTED)
             st.playSound("ItemSound.quest_accept")
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-            htmltext = "7097-03.htm"
+            htmltext = "30097-03.htm"
         elif event == "2" :
             st.set("cond","2")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
             st.giveItems(MAGIC_SWORD_HILT_ID,1)
-            htmltext = "7094-02.htm"
+            htmltext = "30094-02.htm"
         elif event == "3" :
             st.set("cond","3")
             st.takeItems(MAGIC_SWORD_HILT_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-            htmltext = "7097-06.htm"
+            htmltext = "30097-06.htm"
         elif event == "4" :
             st.set("cond","4")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
             st.giveItems(GEMSTONE_POWDER_ID,1)
-            htmltext = "7090-02.htm"
+            htmltext = "30090-02.htm"
         elif event == "5" :
             st.set("cond","5")
             st.takeItems(GEMSTONE_POWDER_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-            htmltext = "7097-09.htm"
+            htmltext = "30097-09.htm"
         elif event == "6" :
             st.set("cond","6")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
             st.giveItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7116-02.htm"
+            htmltext = "30116-02.htm"
         elif event == "7" :
             st.giveItems(SCROLL_OF_ESCAPE_SPECIAL,1)
             st.takeItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7097-12.htm"
+            htmltext = "30097-12.htm"
             st.set("cond","0")
             st.setState(COMPLETED)
             st.playSound("ItemSound.quest_finish")
@@ -73,36 +73,36 @@ class Quest (JQuest) :
         if id == CREATED :
             st.set("cond","0")
             if st.getPlayer().getRace().ordinal() == RACE and st.getQuestItemsCount(MARK_OF_TRAVELER_ID) > 0:
-                htmltext = "7097-02.htm"
+                htmltext = "30097-02.htm"
             else :
-                htmltext = "7097-01.htm"
+                htmltext = "30097-01.htm"
                 st.exitQuest(1)
-        elif npcId == 7097 and id == COMPLETED :
+        elif npcId == 30097 and id == COMPLETED :
             htmltext = "<html><head><body>I can't supply you with another Scroll of Escape. Sorry traveller.</body></html>"
-        elif npcId == 7097 and int(st.get("cond"))==1 :
-            htmltext = "7097-04.htm"
-        elif npcId == 7097 and int(st.get("cond"))==2 :
-            htmltext = "7097-05.htm"
-        elif npcId == 7097 and int(st.get("cond"))==3 :
-            htmltext = "7097-07.htm"
-        elif npcId == 7097 and int(st.get("cond"))==4 :
-            htmltext = "7097-08.htm"
-        elif npcId == 7097 and int(st.get("cond"))==5 :
-            htmltext = "7097-10.htm"
-        elif npcId == 7097 and int(st.get("cond"))==6 :
-            htmltext = "7097-11.htm"
-        elif npcId == 7094 and int(st.get("cond"))==1 :
-            htmltext = "7094-01.htm"
-        elif npcId == 7094 and int(st.get("cond"))==2 :
-            htmltext = "7094-03.htm"
-        elif npcId == 7090 and int(st.get("cond"))==3 :
-            htmltext = "7090-01.htm"
-        elif npcId == 7090 and int(st.get("cond"))==4 :
-            htmltext = "7090-03.htm"
-        elif npcId == 7116 and int(st.get("cond"))==5 :
-            htmltext = "7116-01.htm"
-        elif npcId == 7116 and int(st.get("cond"))==6 :
-            htmltext = "7116-03.htm"
+        elif npcId == 30097 and int(st.get("cond"))==1 :
+            htmltext = "30097-04.htm"
+        elif npcId == 30097 and int(st.get("cond"))==2 :
+            htmltext = "30097-05.htm"
+        elif npcId == 30097 and int(st.get("cond"))==3 :
+            htmltext = "30097-07.htm"
+        elif npcId == 30097 and int(st.get("cond"))==4 :
+            htmltext = "30097-08.htm"
+        elif npcId == 30097 and int(st.get("cond"))==5 :
+            htmltext = "30097-10.htm"
+        elif npcId == 30097 and int(st.get("cond"))==6 :
+            htmltext = "30097-11.htm"
+        elif npcId == 30094 and int(st.get("cond"))==1 :
+            htmltext = "30094-01.htm"
+        elif npcId == 30094 and int(st.get("cond"))==2 :
+            htmltext = "30094-03.htm"
+        elif npcId == 30090 and int(st.get("cond"))==3 :
+            htmltext = "30090-01.htm"
+        elif npcId == 30090 and int(st.get("cond"))==4 :
+            htmltext = "30090-03.htm"
+        elif npcId == 30116 and int(st.get("cond"))==5 :
+            htmltext = "30116-01.htm"
+        elif npcId == 30116 and int(st.get("cond"))==6 :
+            htmltext = "30116-03.htm"
 
         return htmltext
 
@@ -112,21 +112,21 @@ STARTED     = State('Started', QUEST)
 COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
-QUEST.addStartNpc(7097)
+QUEST.addStartNpc(30097)
 
-CREATED.addTalkId(7097)
-COMPLETED.addTalkId(7097)
+CREATED.addTalkId(30097)
+COMPLETED.addTalkId(30097)
 
-STARTED.addTalkId(7097)
-STARTED.addTalkId(7094)
-STARTED.addTalkId(7090)
-STARTED.addTalkId(7116)
+STARTED.addTalkId(30097)
+STARTED.addTalkId(30094)
+STARTED.addTalkId(30090)
+STARTED.addTalkId(30116)
 
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-STARTED.addQuestDrop(7094,MAGIC_SWORD_HILT_ID,1)
-STARTED.addQuestDrop(7090,GEMSTONE_POWDER_ID,1)
-STARTED.addQuestDrop(7116,PURIFIED_MAGIC_NECKLACE_ID,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
+STARTED.addQuestDrop(30094,MAGIC_SWORD_HILT_ID,1)
+STARTED.addQuestDrop(30090,GEMSTONE_POWDER_ID,1)
+STARTED.addQuestDrop(30116,PURIFIED_MAGIC_NECKLACE_ID,1)
 
 print "importing quests: 45: To Talking Island"
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7090-01.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30090-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7090-01.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30090-01.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7090-02.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30090-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7090-02.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30090-02.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7090-03.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30090-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7090-03.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30090-03.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7094-01.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30094-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7094-01.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30094-01.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7094-02.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30094-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7094-02.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30094-02.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7094-03.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30094-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7094-03.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30094-03.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-01.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-01.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-01.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-02.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-02.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-02.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-03.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-03.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-03.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-04.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-04.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-04.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-05.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-05.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-05.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-06.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-06.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-06.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-07.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-07.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-07.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-08.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-08.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-08.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-08.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-09.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-09.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-09.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-10.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-10.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-10.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-11.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-11.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-11.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-11.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-12.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-12.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7097-12.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30097-12.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7116-01.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30116-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7116-01.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30116-01.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7116-02.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30116-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7116-02.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30116-02.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7116-03.htm b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30116-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/7116-03.htm
rename to datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/30116-03.htm
diff --git a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/__init__.py b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/__init__.py
index 835ac8730e67e9b94ee990fec116ff7abb3c2393..24803b8288c6a664cbfe83396278a02397942c91 100644
--- a/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/__init__.py
+++ b/datapack_development/data/jscript/quests/46_OnceMoreInTheArmsOfTheMotherTree/__init__.py
@@ -5,15 +5,15 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-TRADER_GALLADUCCI_ID = 7097
+TRADER_GALLADUCCI_ID = 30097
 GALLADUCCIS_ORDER_DOCUMENT_ID_1 = 7563
 GALLADUCCIS_ORDER_DOCUMENT_ID_2 = 7564
 GALLADUCCIS_ORDER_DOCUMENT_ID_3 = 7565
-MAGIC_TRADER_GENTLER_ID = 7094
+MAGIC_TRADER_GENTLER_ID = 30094
 MAGIC_SWORD_HILT_ID = 7568
-JEWELER_SANDRA_ID = 7090
+JEWELER_SANDRA_ID = 30090
 GEMSTONE_POWDER_ID = 7567
-PRIEST_DUSTIN_ID = 7116
+PRIEST_DUSTIN_ID = 30116
 PURIFIED_MAGIC_NECKLACE_ID = 7566
 MARK_OF_TRAVELER_ID = 7570
 SCROLL_OF_ESCAPE_SPECIAL = 7555
@@ -31,36 +31,36 @@ class Quest (JQuest) :
             st.setState(STARTED)
             st.playSound("ItemSound.quest_accept")
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-            htmltext = "7097-03.htm"
+            htmltext = "30097-03.htm"
         elif event == "2" :
             st.set("cond","2")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
             st.giveItems(MAGIC_SWORD_HILT_ID,1)
-            htmltext = "7094-02.htm"
+            htmltext = "30094-02.htm"
         elif event == "3" :
             st.set("cond","3")
             st.takeItems(MAGIC_SWORD_HILT_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-            htmltext = "7097-06.htm"
+            htmltext = "30097-06.htm"
         elif event == "4" :
             st.set("cond","4")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
             st.giveItems(GEMSTONE_POWDER_ID,1)
-            htmltext = "7090-02.htm"
+            htmltext = "30090-02.htm"
         elif event == "5" :
             st.set("cond","5")
             st.takeItems(GEMSTONE_POWDER_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-            htmltext = "7097-09.htm"
+            htmltext = "30097-09.htm"
         elif event == "6" :
             st.set("cond","6")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
             st.giveItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7116-02.htm"
+            htmltext = "30116-02.htm"
         elif event == "7" :
             st.giveItems(SCROLL_OF_ESCAPE_SPECIAL,1)
             st.takeItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7097-12.htm"
+            htmltext = "30097-12.htm"
             st.set("cond","0")
             st.setState(COMPLETED)
             st.playSound("ItemSound.quest_finish")
@@ -73,36 +73,36 @@ class Quest (JQuest) :
         if id == CREATED :
             st.set("cond","0")
             if st.getPlayer().getRace().ordinal() == RACE and st.getQuestItemsCount(MARK_OF_TRAVELER_ID) > 0:
-                htmltext = "7097-02.htm"
+                htmltext = "30097-02.htm"
             else :
-                htmltext = "7097-01.htm"
+                htmltext = "30097-01.htm"
                 st.exitQuest(1)
-        elif npcId == 7097 and id == COMPLETED :
+        elif npcId == 30097 and id == COMPLETED :
             htmltext = "<html><head><body>I can't supply you with another Scroll of Escape. Sorry traveller.</body></html>"
-        elif npcId == 7097 and int(st.get("cond"))==1 :
-            htmltext = "7097-04.htm"
-        elif npcId == 7097 and int(st.get("cond"))==2 :
-            htmltext = "7097-05.htm"
-        elif npcId == 7097 and int(st.get("cond"))==3 :
-            htmltext = "7097-07.htm"
-        elif npcId == 7097 and int(st.get("cond"))==4 :
-            htmltext = "7097-08.htm"
-        elif npcId == 7097 and int(st.get("cond"))==5 :
-            htmltext = "7097-10.htm"
-        elif npcId == 7097 and int(st.get("cond"))==6 :
-            htmltext = "7097-11.htm"
-        elif npcId == 7094 and int(st.get("cond"))==1 :
-            htmltext = "7094-01.htm"
-        elif npcId == 7094 and int(st.get("cond"))==2 :
-            htmltext = "7094-03.htm"
-        elif npcId == 7090 and int(st.get("cond"))==3 :
-            htmltext = "7090-01.htm"
-        elif npcId == 7090 and int(st.get("cond"))==4 :
-            htmltext = "7090-03.htm"
-        elif npcId == 7116 and int(st.get("cond"))==5 :
-            htmltext = "7116-01.htm"
-        elif npcId == 7116 and int(st.get("cond"))==6 :
-            htmltext = "7116-03.htm"
+        elif npcId == 30097 and int(st.get("cond"))==1 :
+            htmltext = "30097-04.htm"
+        elif npcId == 30097 and int(st.get("cond"))==2 :
+            htmltext = "30097-05.htm"
+        elif npcId == 30097 and int(st.get("cond"))==3 :
+            htmltext = "30097-07.htm"
+        elif npcId == 30097 and int(st.get("cond"))==4 :
+            htmltext = "30097-08.htm"
+        elif npcId == 30097 and int(st.get("cond"))==5 :
+            htmltext = "30097-10.htm"
+        elif npcId == 30097 and int(st.get("cond"))==6 :
+            htmltext = "30097-11.htm"
+        elif npcId == 30094 and int(st.get("cond"))==1 :
+            htmltext = "30094-01.htm"
+        elif npcId == 30094 and int(st.get("cond"))==2 :
+            htmltext = "30094-03.htm"
+        elif npcId == 30090 and int(st.get("cond"))==3 :
+            htmltext = "30090-01.htm"
+        elif npcId == 30090 and int(st.get("cond"))==4 :
+            htmltext = "30090-03.htm"
+        elif npcId == 30116 and int(st.get("cond"))==5 :
+            htmltext = "30116-01.htm"
+        elif npcId == 30116 and int(st.get("cond"))==6 :
+            htmltext = "30116-03.htm"
 
         return htmltext
 
@@ -112,21 +112,21 @@ STARTED     = State('Started', QUEST)
 COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
-QUEST.addStartNpc(7097)
+QUEST.addStartNpc(30097)
 
-CREATED.addTalkId(7097)
-COMPLETED.addTalkId(7097)
+CREATED.addTalkId(30097)
+COMPLETED.addTalkId(30097)
 
-STARTED.addTalkId(7097)
-STARTED.addTalkId(7094)
-STARTED.addTalkId(7090)
-STARTED.addTalkId(7116)
+STARTED.addTalkId(30097)
+STARTED.addTalkId(30094)
+STARTED.addTalkId(30090)
+STARTED.addTalkId(30116)
 
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-STARTED.addQuestDrop(7094,MAGIC_SWORD_HILT_ID,1)
-STARTED.addQuestDrop(7090,GEMSTONE_POWDER_ID,1)
-STARTED.addQuestDrop(7116,PURIFIED_MAGIC_NECKLACE_ID,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
+STARTED.addQuestDrop(30094,MAGIC_SWORD_HILT_ID,1)
+STARTED.addQuestDrop(30090,GEMSTONE_POWDER_ID,1)
+STARTED.addQuestDrop(30116,PURIFIED_MAGIC_NECKLACE_ID,1)
 
 print "importing quests: 46: Once More In The Arms of the Mother Tree"
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7090-01.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30090-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7090-01.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30090-01.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7090-02.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30090-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7090-02.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30090-02.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7090-03.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30090-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7090-03.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30090-03.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7094-01.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30094-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7094-01.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30094-01.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7094-02.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30094-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7094-02.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30094-02.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7094-03.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30094-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7094-03.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30094-03.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-01.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-01.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-01.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-02.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-02.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-02.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-03.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-03.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-03.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-04.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-04.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-04.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-05.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-05.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-05.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-06.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-06.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-06.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-07.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-07.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-07.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-08.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-08.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-08.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-08.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-09.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-09.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-09.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-10.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-10.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-10.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-11.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-11.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-11.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-11.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-12.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-12.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7097-12.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30097-12.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7116-01.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30116-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7116-01.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30116-01.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7116-02.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30116-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7116-02.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30116-02.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/7116-03.htm b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/30116-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/47_IntoTheDarkForest/7116-03.htm
rename to datapack_development/data/jscript/quests/47_IntoTheDarkForest/30116-03.htm
diff --git a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/__init__.py b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/__init__.py
index c3282e3b1c7925bb6e32c2a14d6d0aee9fcc155b..169b1ff7c816e36b6376b1cd4e6afadec86c4a45 100644
--- a/datapack_development/data/jscript/quests/47_IntoTheDarkForest/__init__.py
+++ b/datapack_development/data/jscript/quests/47_IntoTheDarkForest/__init__.py
@@ -5,15 +5,15 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-TRADER_GALLADUCCI_ID = 7097
+TRADER_GALLADUCCI_ID = 30097
 GALLADUCCIS_ORDER_DOCUMENT_ID_1 = 7563
 GALLADUCCIS_ORDER_DOCUMENT_ID_2 = 7564
 GALLADUCCIS_ORDER_DOCUMENT_ID_3 = 7565
-MAGIC_TRADER_GENTLER_ID = 7094
+MAGIC_TRADER_GENTLER_ID = 30094
 MAGIC_SWORD_HILT_ID = 7568
-JEWELER_SANDRA_ID = 7090
+JEWELER_SANDRA_ID = 30090
 GEMSTONE_POWDER_ID = 7567
-PRIEST_DUSTIN_ID = 7116
+PRIEST_DUSTIN_ID = 30116
 PURIFIED_MAGIC_NECKLACE_ID = 7566
 MARK_OF_TRAVELER_ID = 7570
 SCROLL_OF_ESCAPE_SPECIAL = 7556
@@ -31,36 +31,36 @@ class Quest (JQuest) :
             st.setState(STARTED)
             st.playSound("ItemSound.quest_accept")
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-            htmltext = "7097-03.htm"
+            htmltext = "30097-03.htm"
         elif event == "2" :
             st.set("cond","2")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
             st.giveItems(MAGIC_SWORD_HILT_ID,1)
-            htmltext = "7094-02.htm"
+            htmltext = "30094-02.htm"
         elif event == "3" :
             st.set("cond","3")
             st.takeItems(MAGIC_SWORD_HILT_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-            htmltext = "7097-06.htm"
+            htmltext = "30097-06.htm"
         elif event == "4" :
             st.set("cond","4")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
             st.giveItems(GEMSTONE_POWDER_ID,1)
-            htmltext = "7090-02.htm"
+            htmltext = "30090-02.htm"
         elif event == "5" :
             st.set("cond","5")
             st.takeItems(GEMSTONE_POWDER_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-            htmltext = "7097-09.htm"
+            htmltext = "30097-09.htm"
         elif event == "6" :
             st.set("cond","6")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
             st.giveItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7116-02.htm"
+            htmltext = "30116-02.htm"
         elif event == "7" :
             st.giveItems(SCROLL_OF_ESCAPE_SPECIAL,1)
             st.takeItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7097-12.htm"
+            htmltext = "30097-12.htm"
             st.set("cond","0")
             st.setState(COMPLETED)
             st.playSound("ItemSound.quest_finish")
@@ -73,36 +73,36 @@ class Quest (JQuest) :
         if id == CREATED :
             st.set("cond","0")
             if st.getPlayer().getRace().ordinal() == RACE and st.getQuestItemsCount(MARK_OF_TRAVELER_ID) > 0:
-                htmltext = "7097-02.htm"
+                htmltext = "30097-02.htm"
             else :
-                htmltext = "7097-01.htm"
+                htmltext = "30097-01.htm"
                 st.exitQuest(1)
-        elif npcId == 7097 and id == COMPLETED :
+        elif npcId == 30097 and id == COMPLETED :
             htmltext = "<html><head><body>I can't supply you with another Scroll of Escape. Sorry traveller.</body></html>"
-        elif npcId == 7097 and int(st.get("cond"))==1 :
-            htmltext = "7097-04.htm"
-        elif npcId == 7097 and int(st.get("cond"))==2 :
-            htmltext = "7097-05.htm"
-        elif npcId == 7097 and int(st.get("cond"))==3 :
-            htmltext = "7097-07.htm"
-        elif npcId == 7097 and int(st.get("cond"))==4 :
-            htmltext = "7097-08.htm"
-        elif npcId == 7097 and int(st.get("cond"))==5 :
-            htmltext = "7097-10.htm"
-        elif npcId == 7097 and int(st.get("cond"))==6 :
-            htmltext = "7097-11.htm"
-        elif npcId == 7094 and int(st.get("cond"))==1 :
-            htmltext = "7094-01.htm"
-        elif npcId == 7094 and int(st.get("cond"))==2 :
-            htmltext = "7094-03.htm"
-        elif npcId == 7090 and int(st.get("cond"))==3 :
-            htmltext = "7090-01.htm"
-        elif npcId == 7090 and int(st.get("cond"))==4 :
-            htmltext = "7090-03.htm"
-        elif npcId == 7116 and int(st.get("cond"))==5 :
-            htmltext = "7116-01.htm"
-        elif npcId == 7116 and int(st.get("cond"))==6 :
-            htmltext = "7116-03.htm"
+        elif npcId == 30097 and int(st.get("cond"))==1 :
+            htmltext = "30097-04.htm"
+        elif npcId == 30097 and int(st.get("cond"))==2 :
+            htmltext = "30097-05.htm"
+        elif npcId == 30097 and int(st.get("cond"))==3 :
+            htmltext = "30097-07.htm"
+        elif npcId == 30097 and int(st.get("cond"))==4 :
+            htmltext = "30097-08.htm"
+        elif npcId == 30097 and int(st.get("cond"))==5 :
+            htmltext = "30097-10.htm"
+        elif npcId == 30097 and int(st.get("cond"))==6 :
+            htmltext = "30097-11.htm"
+        elif npcId == 30094 and int(st.get("cond"))==1 :
+            htmltext = "30094-01.htm"
+        elif npcId == 30094 and int(st.get("cond"))==2 :
+            htmltext = "30094-03.htm"
+        elif npcId == 30090 and int(st.get("cond"))==3 :
+            htmltext = "30090-01.htm"
+        elif npcId == 30090 and int(st.get("cond"))==4 :
+            htmltext = "30090-03.htm"
+        elif npcId == 30116 and int(st.get("cond"))==5 :
+            htmltext = "30116-01.htm"
+        elif npcId == 30116 and int(st.get("cond"))==6 :
+            htmltext = "30116-03.htm"
 
         return htmltext
 
@@ -112,21 +112,21 @@ STARTED     = State('Started', QUEST)
 COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
-QUEST.addStartNpc(7097)
+QUEST.addStartNpc(30097)
 
-CREATED.addTalkId(7097)
-COMPLETED.addTalkId(7097)
+CREATED.addTalkId(30097)
+COMPLETED.addTalkId(30097)
 
-STARTED.addTalkId(7097)
-STARTED.addTalkId(7094)
-STARTED.addTalkId(7090)
-STARTED.addTalkId(7116)
+STARTED.addTalkId(30097)
+STARTED.addTalkId(30094)
+STARTED.addTalkId(30090)
+STARTED.addTalkId(30116)
 
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-STARTED.addQuestDrop(7094,MAGIC_SWORD_HILT_ID,1)
-STARTED.addQuestDrop(7090,GEMSTONE_POWDER_ID,1)
-STARTED.addQuestDrop(7116,PURIFIED_MAGIC_NECKLACE_ID,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
+STARTED.addQuestDrop(30094,MAGIC_SWORD_HILT_ID,1)
+STARTED.addQuestDrop(30090,GEMSTONE_POWDER_ID,1)
+STARTED.addQuestDrop(30116,PURIFIED_MAGIC_NECKLACE_ID,1)
 
 print "importing quests: 47: Into the Dark Forest"
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7090-01.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30090-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7090-01.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30090-01.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7090-02.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30090-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7090-02.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30090-02.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7090-03.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30090-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7090-03.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30090-03.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7094-01.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30094-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7094-01.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30094-01.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7094-02.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30094-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7094-02.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30094-02.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7094-03.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30094-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7094-03.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30094-03.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-01.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-01.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-01.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-02.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-02.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-02.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-03.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-03.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-03.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-04.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-04.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-04.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-05.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-05.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-05.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-06.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-06.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-06.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-07.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-07.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-07.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-08.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-08.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-08.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-08.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-09.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-09.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-09.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-10.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-10.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-10.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-11.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-11.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-11.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-11.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-12.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-12.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7097-12.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30097-12.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7116-01.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30116-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7116-01.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30116-01.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7116-02.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30116-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7116-02.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30116-02.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7116-03.htm b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30116-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/7116-03.htm
rename to datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/30116-03.htm
diff --git a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/__init__.py b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/__init__.py
index 36e0ac1cf1d4050532b5a70a17b1b11e256432a7..7b9969a6e59512c4d6a7c55213e947298323a8ab 100644
--- a/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/__init__.py
+++ b/datapack_development/data/jscript/quests/48_ToTheImmortalPlateau/__init__.py
@@ -5,15 +5,15 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-TRADER_GALLADUCCI_ID = 7097
+TRADER_GALLADUCCI_ID = 30097
 GALLADUCCIS_ORDER_DOCUMENT_ID_1 = 7563
 GALLADUCCIS_ORDER_DOCUMENT_ID_2 = 7564
 GALLADUCCIS_ORDER_DOCUMENT_ID_3 = 7565
-MAGIC_TRADER_GENTLER_ID = 7094
+MAGIC_TRADER_GENTLER_ID = 30094
 MAGIC_SWORD_HILT_ID = 7568
-JEWELER_SANDRA_ID = 7090
+JEWELER_SANDRA_ID = 30090
 GEMSTONE_POWDER_ID = 7567
-PRIEST_DUSTIN_ID = 7116
+PRIEST_DUSTIN_ID = 30116
 PURIFIED_MAGIC_NECKLACE_ID = 7566
 MARK_OF_TRAVELER_ID = 7570
 SCROLL_OF_ESCAPE_SPECIAL = 7557
@@ -31,36 +31,36 @@ class Quest (JQuest) :
             st.setState(STARTED)
             st.playSound("ItemSound.quest_accept")
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-            htmltext = "7097-03.htm"
+            htmltext = "30097-03.htm"
         elif event == "2" :
             st.set("cond","2")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
             st.giveItems(MAGIC_SWORD_HILT_ID,1)
-            htmltext = "7094-02.htm"
+            htmltext = "30094-02.htm"
         elif event == "3" :
             st.set("cond","3")
             st.takeItems(MAGIC_SWORD_HILT_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-            htmltext = "7097-06.htm"
+            htmltext = "30097-06.htm"
         elif event == "4" :
             st.set("cond","4")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
             st.giveItems(GEMSTONE_POWDER_ID,1)
-            htmltext = "7090-02.htm"
+            htmltext = "30090-02.htm"
         elif event == "5" :
             st.set("cond","5")
             st.takeItems(GEMSTONE_POWDER_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-            htmltext = "7097-09.htm"
+            htmltext = "30097-09.htm"
         elif event == "6" :
             st.set("cond","6")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
             st.giveItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7116-02.htm"
+            htmltext = "30116-02.htm"
         elif event == "7" :
             st.giveItems(SCROLL_OF_ESCAPE_SPECIAL,1)
             st.takeItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7097-12.htm"
+            htmltext = "30097-12.htm"
             st.set("cond","0")
             st.setState(COMPLETED)
             st.playSound("ItemSound.quest_finish")
@@ -73,36 +73,36 @@ class Quest (JQuest) :
         if id == CREATED :
             st.set("cond","0")
             if st.getPlayer().getRace().ordinal() == RACE and st.getQuestItemsCount(MARK_OF_TRAVELER_ID) > 0:
-                htmltext = "7097-02.htm"
+                htmltext = "30097-02.htm"
             else :
-                htmltext = "7097-01.htm"
+                htmltext = "30097-01.htm"
                 st.exitQuest(1)
-        elif npcId == 7097 and id == COMPLETED :
+        elif npcId == 30097 and id == COMPLETED :
             htmltext = "<html><head><body>I can't supply you with another Scroll of Escape. Sorry traveller.</body></html>"
-        elif npcId == 7097 and int(st.get("cond"))==1 :
-            htmltext = "7097-04.htm"
-        elif npcId == 7097 and int(st.get("cond"))==2 :
-            htmltext = "7097-05.htm"
-        elif npcId == 7097 and int(st.get("cond"))==3 :
-            htmltext = "7097-07.htm"
-        elif npcId == 7097 and int(st.get("cond"))==4 :
-            htmltext = "7097-08.htm"
-        elif npcId == 7097 and int(st.get("cond"))==5 :
-            htmltext = "7097-10.htm"
-        elif npcId == 7097 and int(st.get("cond"))==6 :
-            htmltext = "7097-11.htm"
-        elif npcId == 7094 and int(st.get("cond"))==1 :
-            htmltext = "7094-01.htm"
-        elif npcId == 7094 and int(st.get("cond"))==2 :
-            htmltext = "7094-03.htm"
-        elif npcId == 7090 and int(st.get("cond"))==3 :
-            htmltext = "7090-01.htm"
-        elif npcId == 7090 and int(st.get("cond"))==4 :
-            htmltext = "7090-03.htm"
-        elif npcId == 7116 and int(st.get("cond"))==5 :
-            htmltext = "7116-01.htm"
-        elif npcId == 7116 and int(st.get("cond"))==6 :
-            htmltext = "7116-03.htm"
+        elif npcId == 30097 and int(st.get("cond"))==1 :
+            htmltext = "30097-04.htm"
+        elif npcId == 30097 and int(st.get("cond"))==2 :
+            htmltext = "30097-05.htm"
+        elif npcId == 30097 and int(st.get("cond"))==3 :
+            htmltext = "30097-07.htm"
+        elif npcId == 30097 and int(st.get("cond"))==4 :
+            htmltext = "30097-08.htm"
+        elif npcId == 30097 and int(st.get("cond"))==5 :
+            htmltext = "30097-10.htm"
+        elif npcId == 30097 and int(st.get("cond"))==6 :
+            htmltext = "30097-11.htm"
+        elif npcId == 30094 and int(st.get("cond"))==1 :
+            htmltext = "30094-01.htm"
+        elif npcId == 30094 and int(st.get("cond"))==2 :
+            htmltext = "30094-03.htm"
+        elif npcId == 30090 and int(st.get("cond"))==3 :
+            htmltext = "30090-01.htm"
+        elif npcId == 30090 and int(st.get("cond"))==4 :
+            htmltext = "30090-03.htm"
+        elif npcId == 30116 and int(st.get("cond"))==5 :
+            htmltext = "30116-01.htm"
+        elif npcId == 30116 and int(st.get("cond"))==6 :
+            htmltext = "30116-03.htm"
 
         return htmltext
 
@@ -112,21 +112,21 @@ STARTED     = State('Started', QUEST)
 COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
-QUEST.addStartNpc(7097)
+QUEST.addStartNpc(30097)
 
-CREATED.addTalkId(7097)
-COMPLETED.addTalkId(7097)
+CREATED.addTalkId(30097)
+COMPLETED.addTalkId(30097)
 
-STARTED.addTalkId(7097)
-STARTED.addTalkId(7094)
-STARTED.addTalkId(7090)
-STARTED.addTalkId(7116)
+STARTED.addTalkId(30097)
+STARTED.addTalkId(30094)
+STARTED.addTalkId(30090)
+STARTED.addTalkId(30116)
 
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-STARTED.addQuestDrop(7094,MAGIC_SWORD_HILT_ID,1)
-STARTED.addQuestDrop(7090,GEMSTONE_POWDER_ID,1)
-STARTED.addQuestDrop(7116,PURIFIED_MAGIC_NECKLACE_ID,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
+STARTED.addQuestDrop(30094,MAGIC_SWORD_HILT_ID,1)
+STARTED.addQuestDrop(30090,GEMSTONE_POWDER_ID,1)
+STARTED.addQuestDrop(30116,PURIFIED_MAGIC_NECKLACE_ID,1)
 
 print "importing quests: 48: To the Immortal Plateau"
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7090-01.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30090-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7090-01.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30090-01.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7090-02.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30090-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7090-02.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30090-02.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7090-03.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30090-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7090-03.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30090-03.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7094-01.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30094-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7094-01.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30094-01.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7094-02.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30094-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7094-02.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30094-02.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7094-03.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30094-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7094-03.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30094-03.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-01.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-01.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-01.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-02.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-02.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-02.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-03.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-03.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-03.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-04.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-04.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-04.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-04.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-05.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-05.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-05.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-06.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-06.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-06.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-07.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-07.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-07.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-07.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-08.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-08.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-08.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-08.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-09.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-09.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-09.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-09.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-10.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-10.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-10.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-10.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-11.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-11.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-11.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-11.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7097-12.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30097-12.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7097-12.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30097-12.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7116-01.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30116-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7116-01.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30116-01.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7116-02.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30116-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7116-02.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30116-02.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/7116-03.htm b/datapack_development/data/jscript/quests/49_TheRoadHome/30116-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/49_TheRoadHome/7116-03.htm
rename to datapack_development/data/jscript/quests/49_TheRoadHome/30116-03.htm
diff --git a/datapack_development/data/jscript/quests/49_TheRoadHome/__init__.py b/datapack_development/data/jscript/quests/49_TheRoadHome/__init__.py
index 3886ab35df3f0c6d067d1e1637551e7b1fca31e4..9db8f87ebbf6c4d8780791e92c15a074a26e511c 100644
--- a/datapack_development/data/jscript/quests/49_TheRoadHome/__init__.py
+++ b/datapack_development/data/jscript/quests/49_TheRoadHome/__init__.py
@@ -5,15 +5,15 @@ from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
-TRADER_GALLADUCCI_ID = 7097
+TRADER_GALLADUCCI_ID = 30097
 GALLADUCCIS_ORDER_DOCUMENT_ID_1 = 7563
 GALLADUCCIS_ORDER_DOCUMENT_ID_2 = 7564
 GALLADUCCIS_ORDER_DOCUMENT_ID_3 = 7565
-MAGIC_TRADER_GENTLER_ID = 7094
+MAGIC_TRADER_GENTLER_ID = 30094
 MAGIC_SWORD_HILT_ID = 7568
-JEWELER_SANDRA_ID = 7090
+JEWELER_SANDRA_ID = 30090
 GEMSTONE_POWDER_ID = 7567
-PRIEST_DUSTIN_ID = 7116
+PRIEST_DUSTIN_ID = 30116
 PURIFIED_MAGIC_NECKLACE_ID = 7566
 MARK_OF_TRAVELER_ID = 7570
 SCROLL_OF_ESCAPE_SPECIAL = 7558
@@ -31,36 +31,36 @@ class Quest (JQuest) :
             st.setState(STARTED)
             st.playSound("ItemSound.quest_accept")
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-            htmltext = "7097-03.htm"
+            htmltext = "30097-03.htm"
         elif event == "2" :
             st.set("cond","2")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
             st.giveItems(MAGIC_SWORD_HILT_ID,1)
-            htmltext = "7094-02.htm"
+            htmltext = "30094-02.htm"
         elif event == "3" :
             st.set("cond","3")
             st.takeItems(MAGIC_SWORD_HILT_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-            htmltext = "7097-06.htm"
+            htmltext = "30097-06.htm"
         elif event == "4" :
             st.set("cond","4")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
             st.giveItems(GEMSTONE_POWDER_ID,1)
-            htmltext = "7090-02.htm"
+            htmltext = "30090-02.htm"
         elif event == "5" :
             st.set("cond","5")
             st.takeItems(GEMSTONE_POWDER_ID,1)
             st.giveItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-            htmltext = "7097-09.htm"
+            htmltext = "30097-09.htm"
         elif event == "6" :
             st.set("cond","6")
             st.takeItems(GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
             st.giveItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7116-02.htm"
+            htmltext = "30116-02.htm"
         elif event == "7" :
             st.giveItems(SCROLL_OF_ESCAPE_SPECIAL,1)
             st.takeItems(PURIFIED_MAGIC_NECKLACE_ID,1)
-            htmltext = "7097-12.htm"
+            htmltext = "30097-12.htm"
             st.set("cond","0")
             st.setState(COMPLETED)
             st.playSound("ItemSound.quest_finish")
@@ -73,36 +73,36 @@ class Quest (JQuest) :
         if id == CREATED :
             st.set("cond","0")
             if st.getPlayer().getRace().ordinal() == RACE and st.getQuestItemsCount(MARK_OF_TRAVELER_ID) > 0:
-                htmltext = "7097-02.htm"
+                htmltext = "30097-02.htm"
             else :
-                htmltext = "7097-01.htm"
+                htmltext = "30097-01.htm"
                 st.exitQuest(1)
-        elif npcId == 7097 and id == COMPLETED :
+        elif npcId == 30097 and id == COMPLETED :
             htmltext = "<html><head><body>I can't supply you with another Scroll of Escape. Sorry traveller.</body></html>"
-        elif npcId == 7097 and int(st.get("cond"))==1 :
-            htmltext = "7097-04.htm"
-        elif npcId == 7097 and int(st.get("cond"))==2 :
-            htmltext = "7097-05.htm"
-        elif npcId == 7097 and int(st.get("cond"))==3 :
-            htmltext = "7097-07.htm"
-        elif npcId == 7097 and int(st.get("cond"))==4 :
-            htmltext = "7097-08.htm"
-        elif npcId == 7097 and int(st.get("cond"))==5 :
-            htmltext = "7097-10.htm"
-        elif npcId == 7097 and int(st.get("cond"))==6 :
-            htmltext = "7097-11.htm"
-        elif npcId == 7094 and int(st.get("cond"))==1 :
-            htmltext = "7094-01.htm"
-        elif npcId == 7094 and int(st.get("cond"))==2 :
-            htmltext = "7094-03.htm"
-        elif npcId == 7090 and int(st.get("cond"))==3 :
-            htmltext = "7090-01.htm"
-        elif npcId == 7090 and int(st.get("cond"))==4 :
-            htmltext = "7090-03.htm"
-        elif npcId == 7116 and int(st.get("cond"))==5 :
-            htmltext = "7116-01.htm"
-        elif npcId == 7116 and int(st.get("cond"))==6 :
-            htmltext = "7116-03.htm"
+        elif npcId == 30097 and int(st.get("cond"))==1 :
+            htmltext = "30097-04.htm"
+        elif npcId == 30097 and int(st.get("cond"))==2 :
+            htmltext = "30097-05.htm"
+        elif npcId == 30097 and int(st.get("cond"))==3 :
+            htmltext = "30097-07.htm"
+        elif npcId == 30097 and int(st.get("cond"))==4 :
+            htmltext = "30097-08.htm"
+        elif npcId == 30097 and int(st.get("cond"))==5 :
+            htmltext = "30097-10.htm"
+        elif npcId == 30097 and int(st.get("cond"))==6 :
+            htmltext = "30097-11.htm"
+        elif npcId == 30094 and int(st.get("cond"))==1 :
+            htmltext = "30094-01.htm"
+        elif npcId == 30094 and int(st.get("cond"))==2 :
+            htmltext = "30094-03.htm"
+        elif npcId == 30090 and int(st.get("cond"))==3 :
+            htmltext = "30090-01.htm"
+        elif npcId == 30090 and int(st.get("cond"))==4 :
+            htmltext = "30090-03.htm"
+        elif npcId == 30116 and int(st.get("cond"))==5 :
+            htmltext = "30116-01.htm"
+        elif npcId == 30116 and int(st.get("cond"))==6 :
+            htmltext = "30116-03.htm"
 
         return htmltext
 
@@ -112,21 +112,21 @@ STARTED     = State('Started', QUEST)
 COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
-QUEST.addStartNpc(7097)
+QUEST.addStartNpc(30097)
 
-CREATED.addTalkId(7097)
-COMPLETED.addTalkId(7097)
+CREATED.addTalkId(30097)
+COMPLETED.addTalkId(30097)
 
-STARTED.addTalkId(7097)
-STARTED.addTalkId(7094)
-STARTED.addTalkId(7090)
-STARTED.addTalkId(7116)
+STARTED.addTalkId(30097)
+STARTED.addTalkId(30094)
+STARTED.addTalkId(30090)
+STARTED.addTalkId(30116)
 
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
-STARTED.addQuestDrop(7097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
-STARTED.addQuestDrop(7094,MAGIC_SWORD_HILT_ID,1)
-STARTED.addQuestDrop(7090,GEMSTONE_POWDER_ID,1)
-STARTED.addQuestDrop(7116,PURIFIED_MAGIC_NECKLACE_ID,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_1,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_2,1)
+STARTED.addQuestDrop(30097,GALLADUCCIS_ORDER_DOCUMENT_ID_3,1)
+STARTED.addQuestDrop(30094,MAGIC_SWORD_HILT_ID,1)
+STARTED.addQuestDrop(30090,GEMSTONE_POWDER_ID,1)
+STARTED.addQuestDrop(30116,PURIFIED_MAGIC_NECKLACE_ID,1)
 
 print "importing quests: 49: The Road Home"
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7559-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30559-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7559-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30559-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7559-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30559-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7559-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30559-02.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7560-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30560-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7560-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30560-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7560-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30560-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7560-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30560-02.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7562-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30562-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7562-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30562-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7562-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30562-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7562-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30562-02.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7566-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30566-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7566-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30566-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7566-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30566-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7566-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30566-02.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-00.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-00.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-00.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-00.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-02.htm
similarity index 79%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-02.htm
index 73b49acd6b6153858ce08676a9c7b195272eb070..b790e33ae21d1740033e1e08ca72557efbc836b2 100644
--- a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-02.htm
+++ b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-02.htm
@@ -1,5 +1,5 @@
 <html><head><body>
 Centurion Nakusin:<br>
 Dekara Lamchar Kakai! Kakai, the Paagrio Lord, has not been well recently. The tribal elders have decided that each tribe should offer him <font color="LEVEL">something that is good for his health </font>. Meet the representatives of each tribe and bring back their gifts! Can you do it?<br>
-<a action="bypass -h Quest 4_LongLiveLordOfFlame 7578-03.htm">Say you will do it</a>
+<a action="bypass -h Quest 4_LongLiveLordOfFlame 30578-03.htm">Say you will do it</a>
 </body></html>
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-03.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-03.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-03.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-04.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-04.htm
similarity index 68%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-04.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-04.htm
index 7847edb1ccfbf8dabe25a52988fe1090b63edc38..247678ac7d6172c1ca0f9378e2a817638f09f2c2 100644
--- a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-04.htm
+++ b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-04.htm
@@ -1,5 +1,5 @@
 <html><head><body>
 Centurion Nakusin:<br>
 Meet the representatives of each tribe and bring back their gifts! Don't tell me that you have forgotten what your task is?<br>
-<a action="bypass -h Quest 4_LongLiveLordOfFlame 7578-05.htm">Say you forgot</a>
+<a action="bypass -h Quest 4_LongLiveLordOfFlame 30578-05.htm">Say you forgot</a>
 </body></html>
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-05.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-05.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-05.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-06.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7578-06.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30578-06.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7585-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30585-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7585-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30585-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7585-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30585-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7585-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30585-02.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7587-01.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30587-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7587-01.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30587-01.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7587-02.htm b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30587-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/7587-02.htm
rename to datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/30587-02.htm
diff --git a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/__init__.py b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/__init__.py
index ffef8599a4195bd63429cc537d24ef2e2e955285..619011635023acc0fc554dfafa7774062f9c8ef3 100644
--- a/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/__init__.py
+++ b/datapack_development/data/jscript/quests/4_LongLiveLordOfFlame/__init__.py
@@ -5,7 +5,7 @@ from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
 HONEY_KHANDAR,BEAR_FUR_CLOAK,BLOODY_AXE,ANCESTOR_SKULL,SPIDER_DUST,DEEP_SEA_ORB = range(1541,1547)
-NPC_GIFTS = {7585:BEAR_FUR_CLOAK,7566:HONEY_KHANDAR,7562:BLOODY_AXE,7560:ANCESTOR_SKULL,7559:SPIDER_DUST,7587:DEEP_SEA_ORB}
+NPC_GIFTS = {30585:BEAR_FUR_CLOAK,30566:HONEY_KHANDAR,30562:BLOODY_AXE,30560:ANCESTOR_SKULL,30559:SPIDER_DUST,30587:DEEP_SEA_ORB}
 
 class Quest (JQuest) :
 
@@ -13,7 +13,7 @@ class Quest (JQuest) :
 
  def onEvent (self,event,st) :
     htmltext = event
-    if event == "7578-03.htm" :
+    if event == "30578-03.htm" :
       st.set("cond","1")
       st.set("id","1")
       st.setState(STARTED)
@@ -28,20 +28,20 @@ class Quest (JQuest) :
 
    if id == COMPLETED :
      htmltext = "<html><head><body>This quest have already been completed.</body></html>"
-   elif npcId == 7578 :
+   elif npcId == 30578 :
      if cond == 0 :
        if st.getPlayer().getRace().ordinal() <> 3 :
-         htmltext = "7578-00.htm"
+         htmltext = "30578-00.htm"
          st.exitQuest(1)
        elif st.getPlayer().getLevel() >= 2 :
-         htmltext = "7578-02.htm"
+         htmltext = "30578-02.htm"
        else:
-         htmltext = "7578-01.htm"
+         htmltext = "30578-01.htm"
          st.exitQuest(1)
      elif cond == 1 :
-       htmltext = "7578-04.htm"
+       htmltext = "30578-04.htm"
      elif cond == 2 :
-       htmltext = "7578-06.htm"
+       htmltext = "30578-06.htm"
        st.giveItems(4,1)
        for item in NPC_GIFTS.values():
            st.takeItems(item,-1)
@@ -74,21 +74,21 @@ STARTED   = State('Started',   QUEST)
 COMPLETED = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
-QUEST.addStartNpc(7578)
+QUEST.addStartNpc(30578)
 
-CREATED.addTalkId(7578)
-STARTING.addTalkId(7578)
-COMPLETED.addTalkId(7578)
+CREATED.addTalkId(30578)
+STARTING.addTalkId(30578)
+COMPLETED.addTalkId(30578)
 
-STARTED.addTalkId(7559)
-STARTED.addTalkId(7560)
-STARTED.addTalkId(7562)
-STARTED.addTalkId(7566)
-STARTED.addTalkId(7578)
-STARTED.addTalkId(7585)
-STARTED.addTalkId(7587)
+STARTED.addTalkId(30559)
+STARTED.addTalkId(30560)
+STARTED.addTalkId(30562)
+STARTED.addTalkId(30566)
+STARTED.addTalkId(30578)
+STARTED.addTalkId(30585)
+STARTED.addTalkId(30587)
 
 for i in range(1541,1547) :
-   STARTED.addQuestDrop(7578,i,1)
+   STARTED.addQuestDrop(30578,i,1)
 
 print "importing quests: 4: Long Live the Paagrio Lord"
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7517-01.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30517-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7517-01.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30517-01.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7517-02.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30517-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7517-02.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30517-02.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7518-01.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30518-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7518-01.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30518-01.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7518-02.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30518-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7518-02.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30518-02.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7520-01.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30520-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7520-01.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30520-01.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7520-02.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30520-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7520-02.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30520-02.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7526-01.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30526-01.htm
similarity index 67%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7526-01.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30526-01.htm
index d71bd1bff14a487eb0ad7a52e23ec7e4b097dce9..9e2c3454c57136992d8a5aae5c95fccecf8be6e4 100644
--- a/datapack_development/data/jscript/quests/5_MinersFavor/7526-01.htm
+++ b/datapack_development/data/jscript/quests/5_MinersFavor/30526-01.htm
@@ -2,5 +2,5 @@
 Blacksmith Bruno:<br>
 What is it now? I am very busy now, so get to the point.<br>
 The one Bolter ordered? Who is Bolter? I have no idea what you are saying ...<br>
-<a action="bypass -h Quest 5_MinersFavor 7526-02.htm">Take out Bolter's smelly socks</a> 
+<a action="bypass -h Quest 5_MinersFavor 30526-02.htm">Take out Bolter's smelly socks</a> 
 </body></html> 
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7526-02.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30526-02.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7526-02.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30526-02.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7526-03.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30526-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7526-03.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30526-03.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7554-01.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30554-01.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7554-01.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30554-01.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7554-02.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30554-02.htm
similarity index 87%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7554-02.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30554-02.htm
index f3f77434379fc5b3982a353509c19eb0bbd62dbd..4342ea07aada7767ff386acc0dc74ee18eefa9e4 100644
--- a/datapack_development/data/jscript/quests/5_MinersFavor/7554-02.htm
+++ b/datapack_development/data/jscript/quests/5_MinersFavor/30554-02.htm
@@ -2,5 +2,5 @@
 Miner Bolter:<br>
 My Gray Column Guild specializes in architecture and mine development. This strip mine is also under our control. Those hard-working miners over there are all my guild brothers.<br>
 Everyone is familiar with soil and rocks, so they like to stay here rather than in the village. But sometimes, we have to go to the village to get daily necessities. You don't know how troublesome it is. Will you do me a favor? All you need to do is to go to the village and bring me a few things. What do you think? It's not that difficult, right?<br>
-<a action="bypass -h Quest 5_MinersFavor 7554-03.htm">Say you will help</a> 
+<a action="bypass -h Quest 5_MinersFavor 30554-03.htm">Say you will help</a> 
 </body></html> 
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7554-03.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30554-03.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7554-03.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30554-03.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7554-04.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30554-04.htm
similarity index 82%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7554-04.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30554-04.htm
index e261a275ddabcf0da4f53b75655895b4cd8b3a58..c2cce288b32157aa06a6b8cd1c27e76bc0d7a92b 100644
--- a/datapack_development/data/jscript/quests/5_MinersFavor/7554-04.htm
+++ b/datapack_development/data/jscript/quests/5_MinersFavor/30554-04.htm
@@ -4,7 +4,7 @@
 Miner Bolter:<br>
 Hey, you! What happened? I asked for four things, but some are missing! I am sorry, but you need to go to the village again. Please try harder, if not for me, than for the brothers who work day and night at the strip mine!<br>
 But ... Could it be? Did you forget what you need to bring?<br>
-<a action="bypass -h Quest 5_MinersFavor 7554-05.htm">Say you forgot</a>
+<a action="bypass -h Quest 5_MinersFavor 30554-05.htm">Say you forgot</a>
 
 
 </body>
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7554-05.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30554-05.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7554-05.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30554-05.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/7554-06.htm b/datapack_development/data/jscript/quests/5_MinersFavor/30554-06.htm
similarity index 100%
rename from datapack_development/data/jscript/quests/5_MinersFavor/7554-06.htm
rename to datapack_development/data/jscript/quests/5_MinersFavor/30554-06.htm
diff --git a/datapack_development/data/jscript/quests/5_MinersFavor/__init__.py b/datapack_development/data/jscript/quests/5_MinersFavor/__init__.py
index 0eff99e4135f7cfb08c61f1e80e411e538ab745f..15464cf3e61bdf4d63b1ab0c298e981824f20923 100644
--- a/datapack_development/data/jscript/quests/5_MinersFavor/__init__.py
+++ b/datapack_development/data/jscript/quests/5_MinersFavor/__init__.py
@@ -5,11 +5,11 @@ from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
 #NPCs 
-BOLTER = 7554 
-SHARI  = 7517 
-GARITA = 7518 
-REED   = 7520 
-BRUNON = 7526 
+BOLTER = 30554 
+SHARI  = 30517 
+GARITA = 30518 
+REED   = 30520 
+BRUNON = 30526 
 
 #ITEMS 
 BOLTERS_LIST         = 1547 
@@ -28,14 +28,14 @@ class Quest (JQuest) :
 
  def onEvent (self,event,st) :
    htmltext = event 
-   if event == "7554-03.htm" : 
+   if event == "30554-03.htm" : 
      st.giveItems(BOLTERS_LIST,1) 
      st.giveItems(BOLTERS_SMELLY_SOCKS,1) 
      st.set("cond","1") 
      st.set("id","1") 
      st.setState(STARTED) 
      st.playSound("ItemSound.quest_accept") 
-   elif event == "7526-02.htm" : 
+   elif event == "30526-02.htm" : 
      st.takeItems(BOLTERS_SMELLY_SOCKS,-1) 
      st.giveItems(MINERS_PICK,1) 
      if st.getQuestItemsCount(BOLTERS_LIST) and (st.getQuestItemsCount(MINING_BOOTS) + st.getQuestItemsCount(MINERS_PICK) + st.getQuestItemsCount(BOOMBOOM_POWDER) + st.getQuestItemsCount(REDSTONE_BEER) >= 4) : 
@@ -65,14 +65,14 @@ class Quest (JQuest) :
      if onlyone == 1 : 
        htmltext = "<html><head><body>This quest have already been completed.</body></html>" 
      elif st.getPlayer().getLevel() >= 2 : 
-       htmltext = "7554-02.htm" 
+       htmltext = "30554-02.htm" 
      else: 
-       htmltext = "7554-01.htm" 
+       htmltext = "30554-01.htm" 
        st.exitQuest(1) 
    elif npcId == BOLTER and cond == 1 : 
-     htmltext = "7554-04.htm" 
+     htmltext = "30554-04.htm" 
    elif npcId == BOLTER and cond == 2 : 
-     htmltext = "7554-06.htm" 
+     htmltext = "30554-06.htm" 
      st.takeItems(MINING_BOOTS,-1) 
      st.takeItems(MINERS_PICK,-1) 
      st.takeItems(BOOMBOOM_POWDER,-1) 
@@ -85,30 +85,30 @@ class Quest (JQuest) :
      st.playSound("ItemSound.quest_finish") 
    elif npcId == SHARI and cond == 1 and st.getQuestItemsCount(BOLTERS_LIST) : 
      if st.getQuestItemsCount(BOOMBOOM_POWDER) == 0 : 
-       htmltext = "7517-01.htm" 
+       htmltext = "30517-01.htm" 
        st.giveItems(BOOMBOOM_POWDER,1) 
        st.playSound("ItemSound.quest_itemget") 
      else: 
-       htmltext = "7517-02.htm" 
+       htmltext = "30517-02.htm" 
    elif npcId == GARITA and cond == 1 and st.getQuestItemsCount(BOLTERS_LIST) : 
      if st.getQuestItemsCount(MINING_BOOTS) == 0 : 
-       htmltext = "7518-01.htm" 
+       htmltext = "30518-01.htm" 
        st.giveItems(MINING_BOOTS,1) 
        st.playSound("ItemSound.quest_itemget") 
      else: 
-       htmltext = "7518-02.htm" 
+       htmltext = "30518-02.htm" 
    elif npcId == REED and cond == 1 and st.getQuestItemsCount(BOLTERS_LIST) : 
      if st.getQuestItemsCount(REDSTONE_BEER) == 0 : 
-       htmltext = "7520-01.htm" 
+       htmltext = "30520-01.htm" 
        st.giveItems(REDSTONE_BEER,1) 
        st.playSound("ItemSound.quest_itemget") 
      else: 
-       htmltext = "7520-02.htm" 
+       htmltext = "30520-02.htm" 
    elif npcId == BRUNON and cond == 1 and st.getQuestItemsCount(BOLTERS_LIST) : 
      if st.getQuestItemsCount(MINERS_PICK) == 0 : 
-       htmltext = "7526-01.htm" 
+       htmltext = "30526-01.htm" 
      else: 
-       htmltext = "7526-03.htm" 
+       htmltext = "30526-03.htm" 
    if st.getQuestItemsCount(BOLTERS_LIST) and (st.getQuestItemsCount(MINING_BOOTS) + st.getQuestItemsCount(MINERS_PICK) + st.getQuestItemsCount(BOOMBOOM_POWDER) + st.getQuestItemsCount(REDSTONE_BEER) >= 4) : 
      st.set("cond","2") 
      st.set("id","2")