unstable: last VM part

datapack_development/data/html/villagemaster/30115.htm

@@ -9,7 +9,7 @@ Greetings. I am Grand Magister Jurek of the Mystics Guild, and I train Mystics.
 Get information on 2nd occupational change
 </a>
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">
 Listen to information about 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30512.htm

@@ -7,7 +7,7 @@ I am Head Blacksmith Kusto of the Black Anvil guild, here in Giran. Our guild di
 <br>
 Well, but what has brought you here? I would be more than happy to assist you if I can.
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">
 Hear information on 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30513.htm

@@ -5,7 +5,7 @@ High Prefect Penatus:
 <br>
 I am the High Prefect Penatus, heir to the authority of the father of the eternal flame, Paagrio, and one who endeavors to revive the glory of the Orcs by teaching them.
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">
 Hear information on 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30520.htm

@@ -5,7 +5,7 @@ Warehouse Chief Reed:
 <br>
 I am Warehouse Chief Reed of the <font color="LEVEL">Iron Gate</font> Guild. The Iron Gate Guild is the most influential of the top six guilds. You can tell this by the fact that we run almost all the banks and the warehouses.
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7520_reed_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30520_reed_occupation_change">
 Get information on changing occupation
 </a>
 <br>

datapack_development/data/html/villagemaster/30525.htm

@@ -5,7 +5,7 @@ Head Blacksmith Bronk:
 <br>
 I am Head Blacksmith Bronk of <font color="LEVEL">the Black Anvil Guild</font>. The Black Anvil Guild is a proud guild that produces many excellent Artisans and Warsmiths. A Dwarven tribe without our guild is like bread without butter, or a Dwarf with no money. So, what has brought you to me?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7525_bronk_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30525_bronk_occupation_change">
 Get information on changing occupation
 </a>
 <br>

datapack_development/data/html/villagemaster/30565.htm

@@ -5,7 +5,7 @@ Flame Lord Kakai:
 <br>
 I am Flame Lord Kakai. I have been given the authority of Paagrio, the father of eternal flame, and am the leader of the great Orc race. Young Orc warrior, you are the flame of hope that can revive the fallen glory of the Orc race once more. How may I assist you?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7565_kakai_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30565_kakai_occupation_change">
 Get information on changing occupation
 </a>
 <br>

datapack_development/data/html/villagemaster/30594.htm

@@ -7,7 +7,7 @@ I am Warehouse Chief Ranspo of the Iron Gate Guild here in Gludio. Our guild
 <br>
 But you seem like a new face. Have we met before? Anyway, why have you come to me?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7594_ranspo_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30594_ranspo_occupation_change">
 Get information on changing occupations.
 </a>
 <br>

datapack_development/data/html/villagemaster/30595.htm

@@ -7,7 +7,7 @@ I am Head Blacksmith Opix of the Black Anvil guild, here in the village of Gludi
 <br>
 But wait, what brings you to the great Opix?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7595_opix_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30595_opix_occupation_change">
 Hear information on changing occupations.
 </a>
 <br>

datapack_development/data/html/villagemaster/30677.htm

@@ -5,7 +5,7 @@ Head Blacksmith Flutter:
 <br>
 I am Head Blacksmith Flutter of the Black Anvil guild, here in the town of Oren. I've been quite busy lately dealing with Artisans asking me to help them advance their occupation to a Warsmith.
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">
 Hear information on 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30681.htm

@@ -5,7 +5,7 @@ High Prefect Karia:
 <br>
 I am the High Prefect Karia, heir to the authority of the father of the eternal flame, Paagrio, and one who endeavors to revive the glory of the Orcs by teaching them. What are you searching for?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">
 Get information on 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30687.htm

@@ -5,7 +5,7 @@ Head Blacksmith Vergara:
 <br>
 I am Head Blacksmith Vergara of the Black Anvil guild's Hunters Village branch. I train skillful Artisans so they can become useful Warsmiths. Warsmith is the best occupation to earn great amounts of money. Do you wish to become a Warsmith?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">
 Hear information on 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30704.htm

@@ -5,7 +5,7 @@ High Prefect Garvarentz:
 <br>
 I am the High Prefect Garvarentz. I have the authority of Paagrio, the father of the eternal Flame, and i am the leader of the great Orcs. What are you searching for?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">
 Get information on 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30847.htm

@@ -7,7 +7,7 @@ There used to be a lot of work for us blacksmiths to do here in Aden Castle Town
 <br>
 I was wondering if things would slow down after that terrible war was over but it looks like it will be difficult to relax for the time being...
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">
 Listen to information about secondary specializations.
 </a>
 <br>

datapack_development/data/html/villagemaster/30865.htm

@@ -7,7 +7,7 @@ Adventurer, you've done well to come to the city of the Humans. Humans needed th
 <br>
 It means a lot to us that the we, the children of Paagrio, have come to the prosperity of the kingdom of Humans that were our enemies at one time.
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">
 Listen to information about 2nd occupational change.
 </a>
 <br>

datapack_development/data/html/villagemaster/30897.htm

@@ -1,7 +1,7 @@
 <html><head><body>
 Head Blacksmith Roman:<br>
 During the reign of Lionel Hunter, Innadril was never embroiled in wars. He was an amazing statesman, capable of calming the wild havoc of Fafurion without mobilizing his army... However those days are over. That is obvious by the volume of war materials currently being produced... There are dark days ahead... Diligence and sincerity are no longer traits to be admired!<br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">"Tell me about a second class transfer."</a><br>
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">"Tell me about a second class transfer."</a><br>
 <a action="bypass -h npc_%objectId%_Chat 0">Change between sub-classes.</a><br>
 <a action="bypass -h npc_%objectId%_Quest 9000_clan">Clan</a><br>
 <a action="bypass -h npc_%objectId%_Quest 9001_alliance">Form an alliance.</a><br>

datapack_development/data/html/villagemaster/30913.htm

@@ -8,7 +8,7 @@ All the sparkling buildings and Elves running about reeking of candy and cookies
 <br> 
 Ah, but we all have our burden to bear, am I right?  By the way, why were you looking for me?
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">
 "I wish to learn about the second occupational change." 
 </a>
 <br>

datapack_development/data/html/villagemaster/31272.htm

@@ -7,7 +7,7 @@ This cold weather is perfect for forging iron! Hot fire and cold air! What a com
 <br>
 Life is like blacksmithing... Only trials, no matter how troublesome they are can make you strong! Of course, some people can't stand the heat!
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">
 "Tell me about the second class transfer."
 </a>
 <br>

datapack_development/data/html/villagemaster/31288.htm

@@ -5,7 +5,7 @@ The stinking Varka Silenos are about to go to war with the Ketra Orcs  near our
 Valakas the legendary fire dragon has just awoken!<br>
 Soon, the awesome army of Paagrio will arise! You should definitely practice your skills!
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">"Tell me about the second class transfer."</a><br>
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">"Tell me about the second class transfer."</a><br>
 <br>
 <a action="bypass -h npc_%objectId%_Subclass 1">
 Add a sub-class.

datapack_development/data/html/villagemaster/31317.htm

@@ -3,7 +3,7 @@ Head Blacksmith Lombert:<br>
 I don't recognize you. Are you a traveler? <br>
 Just so you know... this is no longer the capital of Elmore. Although you can still find plenty of natural resources, it's definitely not the same place it was before. Frankly, it's gone to the dogs! There's something seriously, deeply wrong with this place!
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7512_kusto_occupation_change">
+<a action="bypass -h npc_%objectId%_Quest 30512_kusto_occupation_change">
 "Tell me about the second class transfer."
 </a>
 <br>

datapack_development/data/html/villagemaster/31326.htm

@@ -3,7 +3,7 @@ High Prefect Lambac:<br>
 This is the best camp for warriors in the kingdom... Unfortunately, all I get to do here is to train delicate Humans and Elves. I'm going crazy! They're far too frail! If I use just a little force, their bones break or they pass out...<br>
 Tejakar Oroka! I should be training Orcs!<br>
 <br>
-<a action="bypass -h npc_%objectId%_Quest 7513_penatus_occupation_change">"Tell me about the second class transfer."</a><br>
+<a action="bypass -h npc_%objectId%_Quest 30513_penatus_occupation_change">"Tell me about the second class transfer."</a><br>
 <br>
 <a action="bypass -h npc_%objectId%_Subclass 1">
 Add a sub-class.

datapack_development/data/jscript/village_master/7512_kusto_occupation_change/7512-01.htm → datapack_development/data/jscript/village_master/30512_kusto_occupation_change/30512-01.htm

@@ -3,7 +3,7 @@
 <body>
 Change of occupation means one with certain abilities and experience gets promoted to a higher-level occupation. If you are an Artisan you can change to a <font color="LEVEL">Warsmith</font>. Any other occupations? Nope. You have already chosen an occupation that makes things. There is no other path.
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change 7512-02.htm">
+<a action="bypass -h Quest 30512_kusto_occupation_change 30512-02.htm">
 Warsmith
 </a>
 </body>

datapack_development/data/jscript/village_master/7512_kusto_occupation_change/7512-02.htm → datapack_development/data/jscript/village_master/30512_kusto_occupation_change/30512-02.htm

@@ -3,15 +3,15 @@
 <body>
 A Warsmith is an advancement from the occupation you have chosen, the Artisan, which makes wonderful items from various materials.
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change 7512-03.htm">
+<a action="bypass -h Quest 30512_kusto_occupation_change 30512-03.htm">
 Description of the Warsmith
 </a>
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change class_change_57">
+<a action="bypass -h Quest 30512_kusto_occupation_change class_change_57">
 Change occupations to a Warsmith.
 </a>
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change 7512-01.htm">
+<a action="bypass -h Quest 30512_kusto_occupation_change 30512-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7512_kusto_occupation_change/7512-03.htm → datapack_development/data/jscript/village_master/30512_kusto_occupation_change/30512-03.htm

@@ -7,11 +7,11 @@ Skills are mainly crafting items and summoning golems and siege weapons to fight
 <br>
 To be a Warsmith, your level must be over 40 and you need to collect the Mark of the Guildsman, the Mark of Prosperity, and the Mark of the Maestro.
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change 7512-04.htm">
+<a action="bypass -h Quest 30512_kusto_occupation_change 30512-04.htm">
 Ask about marks.
 </a>
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change 7512-02.htm">
+<a action="bypass -h Quest 30512_kusto_occupation_change 30512-02.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7512_kusto_occupation_change/7512-04.htm → datapack_development/data/jscript/village_master/30512_kusto_occupation_change/30512-04.htm

@@ -9,7 +9,7 @@ The <font color="LEVEL">Mark of Prosperity</font> is only given to those who pas
 <br>
 And finally the <font color="LEVEL">Mark of the Maestro</font> is only given to those who pass the Test of the Maestro. You must be above <font color="LEVEL">level 39</font> to take the test. To take the Test of the Maestro, visit <font color="LEVEL">First Elder Lockirin</font> of the Dwarven Village.
 <br>
-<a action="bypass -h Quest 7512_kusto_occupation_change 7512-03.htm">
+<a action="bypass -h Quest 30512_kusto_occupation_change 30512-03.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7512_kusto_occupation_change/__init__.py → datapack_development/data/jscript/village_master/30512_kusto_occupation_change/__init__.py

@@ -13,11 +13,13 @@ from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 MARK_OF_MAESTRO_ID      = 2867
 MARK_OF_GUILDSMAN_ID    = 3119
 MARK_OF_PROSPERITY_ID   = 3238
-HEAD_BLACKSMITH_KUSTO   = 7512
-HEAD_BLACKSMITH_FLUTTER = 7677
-HEAD_BLACKSMITH_VERGARA = 7687
-HEAD_BLACKSMITH_FERRIS  = 7847
-HEAD_BLACKSMITH_ROMAN   = 7897
+HEAD_BLACKSMITH_KUSTO   = 30512
+HEAD_BLACKSMITH_FLUTTER = 30677
+HEAD_BLACKSMITH_VERGARA = 30687
+HEAD_BLACKSMITH_FERRIS  = 30847
+HEAD_BLACKSMITH_ROMAN   = 30897
+HEAD_BLACKSMITH_NOEL    = 31272
+HEAD_BLACKSMITH_LOMBERT = 31317
 
 class Quest (JQuest) :
 
@@ -31,28 +33,28 @@ class Quest (JQuest) :
    ClassId  = st.getPlayer().getClassId()
    Level    = st.getPlayer().getLevel()
 
-   if event == "7512-01.htm":
-     return "7512-01.htm"
+   if event == "30512-01.htm":
+     return "30512-01.htm"
 
-   if event == "7512-02.htm":
-     return "7512-02.htm"
+   if event == "30512-02.htm":
+     return "30512-02.htm"
 
-   if event == "7512-03.htm":
-     return "7512-03.htm"
+   if event == "30512-03.htm":
+     return "30512-03.htm"
 
-   if event == "7512-04.htm":
-     return "7512-04.htm"
+   if event == "30512-04.htm":
+     return "30512-04.htm"
 
    if event == "class_change_57":
      if ClassId in [ClassId.artisan]:
         if Level <= 39:
           if st.getQuestItemsCount(MARK_OF_MAESTRO_ID) == 0 or st.getQuestItemsCount(MARK_OF_GUILDSMAN_ID) == 0 or st.getQuestItemsCount(MARK_OF_PROSPERITY_ID) == 0:
-            htmltext = "7512-05.htm"
+            htmltext = "30512-05.htm"
           else:
-            htmltext = "7512-06.htm"
+            htmltext = "30512-06.htm"
         else:
           if st.getQuestItemsCount(MARK_OF_MAESTRO_ID) == 0 or st.getQuestItemsCount(MARK_OF_GUILDSMAN_ID) == 0 or st.getQuestItemsCount(MARK_OF_PROSPERITY_ID) == 0:
-            htmltext = "7512-07.htm"
+            htmltext = "30512-07.htm"
           else:
             st.takeItems(MARK_OF_MAESTRO_ID,1)
             st.takeItems(MARK_OF_GUILDSMAN_ID,1)
@@ -61,7 +63,7 @@ class Quest (JQuest) :
             st.player.setBaseClass(57)
             st.player.broadcastUserInfo()
             st.playSound("ItemSound.quest_fanfare_2")
-            htmltext = "7512-08.htm"
+            htmltext = "30512-08.htm"
 
    st.setState(COMPLETED)
    st.exitQuest(1)
@@ -75,23 +77,23 @@ class Quest (JQuest) :
    ClassId = st.getPlayer().getClassId()
 
    # Dwarfs got accepted
-   if npcId == HEAD_BLACKSMITH_KUSTO or HEAD_BLACKSMITH_VERGARA or HEAD_BLACKSMITH_FLUTTER or HEAD_BLACKSMITH_FERRIS or HEAD_BLACKSMITH_ROMAN and Race in [Race.dwarf]:
+   if Race in [Race.dwarf]:
      if ClassId in [ClassId.artisan]:
-       htmltext = "7512-01.htm"
+       htmltext = "30512-01.htm"
        st.setState(STARTED)
        return htmltext
      elif ClassId in [ClassId.dwarvenFighter]:
-       htmltext = "7512-09.htm"
+       htmltext = "30512-09.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      elif ClassId in [ClassId.warsmith, ClassId.bountyHunter]:
-       htmltext = "7512-10.htm"
+       htmltext = "30512-10.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      else:
-       htmltext = "7512-11.htm"
+       htmltext = "30512-11.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
@@ -100,23 +102,27 @@ class Quest (JQuest) :
    else:
      st.setState(COMPLETED)
      st.exitQuest(1)
-     return "7512-11.htm"
+     return "30512-11.htm"
 
-QUEST   = Quest(7512,"7512_kusto_occupation_change","village_master")
+QUEST   = Quest(30512,"30512_kusto_occupation_change","village_master")
 CREATED   = State('Start',     QUEST)
 STARTED   = State('Started',   QUEST)
 COMPLETED = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(7512)
-QUEST.addStartNpc(7677)
-QUEST.addStartNpc(7687)
-QUEST.addStartNpc(7847)
-QUEST.addStartNpc(7897)
-
-STARTED.addTalkId(7512)
-STARTED.addTalkId(7677)
-STARTED.addTalkId(7687)
-STARTED.addTalkId(7847)
-STARTED.addTalkId(7897)
+QUEST.addStartNpc(30512)
+QUEST.addStartNpc(30677)
+QUEST.addStartNpc(30687)
+QUEST.addStartNpc(30847)
+QUEST.addStartNpc(30897)
+QUEST.addStartNpc(31272)
+QUEST.addStartNpc(31317)
+
+STARTED.addTalkId(30512)
+STARTED.addTalkId(30677)
+STARTED.addTalkId(30687)
+STARTED.addTalkId(30847)
+STARTED.addTalkId(30897)
+STARTED.addTalkId(31272)
+STARTED.addTalkId(31317)

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-01.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-01.htm

@@ -3,7 +3,7 @@
 <body>
 An occupational change is when one with certain abilities and experience gets promoted to a higher-level occupation. If you are an Monk you can change occupations to a <font color="LEVEL">Tyrant</font>.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-02.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-02.htm">
 Tyrant
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-02.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-02.htm

@@ -3,15 +3,15 @@
 <body>
 Tyrants are the ones who spread the wisdom of power, the highest of Priests. They do not rely on swords or axes, but fight with their bare fists, they do not feel any fear.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-03.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-03.htm">
 Description of the Tyrant
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change class_change_48">
+<a action="bypass -h Quest 30513_penatus_occupation_change class_change_48">
 Change occupations to a Tyrant.
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-01.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-03.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-03.htm

@@ -7,11 +7,11 @@ They have basic skills such as strengthening their light equipment and melee wea
 <br>
 To be a Tyrant, your level must be over 40 and you need to collect the Mark of the Challenger, the Mark of Glory, and the Mark of the Duelist.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-04.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-04.htm">
 Explanation of marks
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-02.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-02.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-04.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-04.htm

@@ -9,7 +9,7 @@ The <font color="LEVEL">Mark of Glory</font> is only given to those who pass the
 <br>
 And finally the <font color="LEVEL">Mark of the Duelist</font> is only given to those who pass the Test of the Duelist. You must be above <font color="LEVEL">level 39</font> to take the test. To take the Test of the Duelist, meet <font color="LEVEL">Duelist Kaien of the Town of Oren</font>.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-03.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-03.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-05.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-05.htm

@@ -3,7 +3,7 @@
 <body>
 An occupational change is when one with certain abilities and experience gets promoted to a higher-level occupation. If you are an Raider you can change occupations to a <font color="LEVEL">Destroyer</font>.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-06.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-06.htm">
 Destroyer
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-06.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-06.htm

@@ -3,15 +3,15 @@
 <body>
 Destroyers are the most excellent Fighter of the Orcs, they fight with huge weapons until they fall, the name Destroyer is just right for them.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-07.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-07.htm">
 Description of the Destroyer
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change class_change_46">
+<a action="bypass -h Quest 30513_penatus_occupation_change class_change_46">
 Change occupations to a Destroyer.
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-05.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-05.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-07.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-07.htm

@@ -7,11 +7,11 @@ Their basic skills support them to use polearms, swords and clubs. They also hav
 <br>
 To be a Destroyer, your level must be over 40 and you need to collect the Mark of the Challenger, the Mark of Glory, and the Mark of the Champion.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-08.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-08.htm">
 Ask about marks.
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-06.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-06.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-08.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-08.htm

@@ -9,7 +9,7 @@ The <font color="LEVEL">Mark of Glory</font> is only given to those who pass the
 <br>
 And finally, the <font color="LEVEL">Mark of the Champion</font> is only given to those who pass the Test of the Champion. You must be above <font color="LEVEL">level 39</font> to take the test. To take the Test of the Champion, visit <font color="LEVEL">Veteran Ascalon of Giran Castle Town</font>.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-07.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-07.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-09.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-09.htm

@@ -3,11 +3,11 @@
 <body>
 An occupational change is when one with certain abilities and experience gets promoted to a higher-level occupation. If you are an Shaman you can change occupations to an <font color="LEVEL">Overlord</font> or a <font color="LEVEL">Warcryer</font>. Which occupation do you want to learn about?
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-10.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-10.htm">
 Overlord
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-13.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-13.htm">
 Warcryer
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-10.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-10.htm

@@ -3,15 +3,15 @@
 <body>
 An Overlord is an Orc Shaman with the qualities to be nominated as head of a tribe. Only the Overlords can lead our blood pledge to a higher level.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-11.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-11.htm">
 Description of the Overlord
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change class_change_51">
+<a action="bypass -h Quest 30513_penatus_occupation_change class_change_51">
 Change occupations to an Overlord.
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-09.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-09.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-11.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-11.htm

@@ -7,11 +7,11 @@ Of course, the basic skills are used to support blood pledge members, increasing
 <br>
 To be an Overlord, your level must be over 40 and you need to collect the Mark of the Pilgrim, the Mark of Glory, and the Mark of the Lord.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-12.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-12.htm">
 Ask about marks.
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-10.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-10.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-12.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-12.htm

@@ -9,7 +9,7 @@ The <font color="LEVEL">Mark of Glory</font> is only given to those who pass the
 <br>
 And finally, the <font color="LEVEL">Mark of the Lord</font> is only given to those who pass the Test of the Lord. You must be above <font color="LEVEL">level 39</font> to take the test. To take the Test of the Lord, visit <font color="LEVEL">Flame Lord Kakai of the Orc Village</font>.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-11.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-11.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-13.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-13.htm

@@ -3,15 +3,15 @@
 <body>
 Warcryers are an advancement of Shamans, they sing during the peak of war to pull up the fighting spirit of our force and they support us during war.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-14.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-14.htm">
 Description of the Warcryer
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change class_change_52">
+<a action="bypass -h Quest 30513_penatus_occupation_change class_change_52">
 Change occupations to a Warcryer.
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-09.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-09.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-14.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-14.htm

@@ -7,11 +7,11 @@ Of course they have offensive magic skills, increasing attack speed, evasion, cr
 <br>
 To be a Warcryer, your level must be over 40 and you need to collect the Mark of the Pilgrim, the Mark of Glory, and the Mark of the War Spirit.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-15.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-15.htm">
 Explanation of marks
 </a>
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-13.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-13.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/7513-15.htm → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/30513-15.htm

@@ -9,7 +9,7 @@ The <font color="LEVEL">Mark of Glory</font> is only given to those who pass the
 <br>
 And finally, the <font color="LEVEL">Mark of the War Spirit</font> is only given to those who pass the Test of the War Spirit. You must be above <font color="LEVEL">level 39</font> to take the test. To take the Test of the War Spirit, visit <font color="LEVEL">Seer Somak of Dion Castle Town</font>.
 <br>
-<a action="bypass -h Quest 7513_penatus_occupation_change 7513-14.htm">
+<a action="bypass -h Quest 30513_penatus_occupation_change 30513-14.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7513_penatus_occupation_change/__init__.py → datapack_development/data/jscript/village_master/30513_penatus_occupation_change/__init__.py

@@ -17,11 +17,14 @@ MARK_OF_WARSPIRIT_ID    = 2879
 MARK_OF_GLORY_ID        = 3203
 MARK_OF_CHAMPION_ID     = 3276
 MARK_OF_LORD_ID         = 3390
-HIGH_PREFECT_PENATUS    = 7513
-HIGH_PREFECT_KARIA      = 7681
-HIGH_PREFECT_GARVARENTZ = 7704
-HIGH_PREFECT_LADANZA    = 7865
-HIGH_PREFECT_TUSHKU     = 7913
+HIGH_PREFECT_PENATUS    = 30513
+HIGH_PREFECT_KARIA      = 30681
+HIGH_PREFECT_GARVARENTZ = 30704
+HIGH_PREFECT_LADANZA    = 30865
+HIGH_PREFECT_TUSHKU     = 30913
+HIGH_PREFECT_AKLAN      = 31288
+HIGH_PREFECT_LAMBAC     = 31326
+
 
 class Quest (JQuest) :
 
@@ -35,61 +38,61 @@ class Quest (JQuest) :
    ClassId  = st.getPlayer().getClassId()
    Level    = st.getPlayer().getLevel()
 
-   if event == "7513-01.htm":
-     return "7513-01.htm"
+   if event == "30513-01.htm":
+     return "30513-01.htm"
 
-   if event == "7513-02.htm":
-     return "7513-02.htm"
+   if event == "30513-02.htm":
+     return "30513-02.htm"
 
-   if event == "7513-03.htm":
-     return "7513-03.htm"
+   if event == "30513-03.htm":
+     return "30513-03.htm"
 
-   if event == "7513-04.htm":
-     return "7513-04.htm"
+   if event == "30513-04.htm":
+     return "30513-04.htm"
 
-   if event == "7513-05.htm":
-     return "7513-05.htm"
+   if event == "30513-05.htm":
+     return "30513-05.htm"
 
-   if event == "7513-06.htm":
-     return "7513-06.htm"
+   if event == "30513-06.htm":
+     return "30513-06.htm"
 
-   if event == "7513-07.htm":
-     return "7513-07.htm"
+   if event == "30513-07.htm":
+     return "30513-07.htm"
 
-   if event == "7513-08.htm":
-     return "7513-08.htm"
+   if event == "30513-08.htm":
+     return "30513-08.htm"
 
-   if event == "7513-09.htm":
-     return "7513-09.htm"
+   if event == "30513-09.htm":
+     return "30513-09.htm"
 
-   if event == "7513-10.htm":
-     return "7513-10.htm"
+   if event == "30513-10.htm":
+     return "30513-10.htm"
 
-   if event == "7513-11.htm":
-     return "7513-11.htm"
+   if event == "30513-11.htm":
+     return "30513-11.htm"
 
-   if event == "7513-12.htm":
-     return "7513-12.htm"
+   if event == "30513-12.htm":
+     return "30513-12.htm"
 
-   if event == "7513-13.htm":
-     return "7513-13.htm"
+   if event == "30513-13.htm":
+     return "30513-13.htm"
 
-   if event == "7513-14.htm":
-     return "7513-14.htm"
+   if event == "30513-14.htm":
+     return "30513-14.htm"
 
-   if event == "7513-15.htm":
-     return "7513-15.htm"
+   if event == "30513-15.htm":
+     return "30513-15.htm"
 
    if event == "class_change_48":
      if ClassId in [ClassId.orcMonk]:
         if Level <= 39:
           if st.getQuestItemsCount(MARK_OF_CHALLENGER_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_DUELIST_ID) == 0:
-            htmltext = "7513-16.htm"
+            htmltext = "30513-16.htm"
           else:
-            htmltext = "7513-17.htm"
+            htmltext = "30513-17.htm"
         elif Level >= 40:
           if st.getQuestItemsCount(MARK_OF_CHALLENGER_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_DUELIST_ID) == 0:
-            htmltext = "7513-18.htm"
+            htmltext = "30513-18.htm"
           else:
             st.takeItems(MARK_OF_CHALLENGER_ID,1)
             st.takeItems(MARK_OF_GLORY_ID,1)
@@ -98,18 +101,18 @@ class Quest (JQuest) :
             st.player.setBaseClass(48)
             st.player.broadcastUserInfo()
             st.playSound("ItemSound.quest_fanfare_2")
-            htmltext = "7513-19.htm"
+            htmltext = "30513-19.htm"
 
    if event == "class_change_46":
      if ClassId in [ClassId.orcRaider]:
         if Level <= 39:
           if st.getQuestItemsCount(MARK_OF_CHALLENGER_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_CHAMPION_ID) == 0:
-            htmltext = "7513-20.htm"
+            htmltext = "30513-20.htm"
           else:
-            htmltext = "7513-21.htm"
+            htmltext = "30513-21.htm"
         elif Level >= 40:
           if st.getQuestItemsCount(MARK_OF_CHALLENGER_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_CHAMPION_ID) == 0:
-            htmltext = "7513-22.htm"
+            htmltext = "30513-22.htm"
           else:
             st.takeItems(MARK_OF_CHALLENGER_ID,1)
             st.takeItems(MARK_OF_GLORY_ID,1)
@@ -118,18 +121,18 @@ class Quest (JQuest) :
             st.player.setBaseClass(46)
             st.player.broadcastUserInfo()
             st.playSound("ItemSound.quest_fanfare_2")
-            htmltext = "7513-23.htm"
+            htmltext = "30513-23.htm"
 
    if event == "class_change_51":
      if ClassId in [ClassId.orcShaman]:
         if Level <= 39:
           if st.getQuestItemsCount(MARK_OF_PILGRIM_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_LORD_ID) == 0:
-            htmltext = "7513-24.htm"
+            htmltext = "30513-24.htm"
           else:
-            htmltext = "7513-25.htm"
+            htmltext = "30513-25.htm"
         elif Level >= 40:
           if st.getQuestItemsCount(MARK_OF_PILGRIM_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_LORD_ID) == 0:
-            htmltext = "7513-26.htm"
+            htmltext = "30513-26.htm"
           else:
             st.takeItems(MARK_OF_PILGRIM_ID,1)
             st.takeItems(MARK_OF_GLORY_ID,1)
@@ -138,18 +141,18 @@ class Quest (JQuest) :
             st.player.setBaseClass(51)
             st.player.broadcastUserInfo()
             st.playSound("ItemSound.quest_fanfare_2")
-            htmltext = "7513-27.htm"
+            htmltext = "30513-27.htm"
 
    if event == "class_change_52":
      if ClassId in [ClassId.orcShaman]:
         if Level <= 39:
           if st.getQuestItemsCount(MARK_OF_PILGRIM_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_WARSPIRIT_ID) == 0:
-            htmltext = "7513-28.htm"
+            htmltext = "30513-28.htm"
           else:
-            htmltext = "7513-29.htm"
+            htmltext = "30513-29.htm"
         elif Level >= 40:
           if st.getQuestItemsCount(MARK_OF_PILGRIM_ID) == 0 or st.getQuestItemsCount(MARK_OF_GLORY_ID) == 0 or st.getQuestItemsCount(MARK_OF_WARSPIRIT_ID) == 0:
-            htmltext = "7513-30.htm"
+            htmltext = "30513-30.htm"
           else:
             st.takeItems(MARK_OF_PILGRIM_ID,1)
             st.takeItems(MARK_OF_GLORY_ID,1)
@@ -158,7 +161,7 @@ class Quest (JQuest) :
             st.player.setBaseClass(52)
             st.player.broadcastUserInfo()
             st.playSound("ItemSound.quest_fanfare_2")
-            htmltext = "7513-31.htm"
+            htmltext = "30513-31.htm"
 
    st.setState(COMPLETED)
    st.exitQuest(1)
@@ -172,31 +175,31 @@ class Quest (JQuest) :
    ClassId = st.getPlayer().getClassId()
 
    # orcs got accepted
-   if npcId == HIGH_PREFECT_PENATUS or HIGH_PREFECT_GARVARENTZ or HIGH_PREFECT_KARIA or HIGH_PREFECT_LADANZA or HIGH_PREFECT_TUSHKU and Race in [Race.orc]:
+   if Race in [Race.orc]:
      if ClassId in [ClassId.orcMonk]:
-       htmltext = "7513-01.htm"
+       htmltext = "30513-01.htm"
        st.setState(STARTED)
        return htmltext
      elif ClassId in [ClassId.orcRaider]:
-       htmltext = "7513-05.htm"
+       htmltext = "30513-05.htm"
        st.setState(STARTED)
        return htmltext
      elif ClassId in [ClassId.orcShaman]:
-       htmltext = "7513-09.htm"
+       htmltext = "30513-09.htm"
        st.setState(STARTED)
        return htmltext
      elif ClassId in [ClassId.destroyer, ClassId.tyrant, ClassId.overlord, ClassId.warcryer]:
-       htmltext = "7513-32.htm"
+       htmltext = "30513-32.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      elif ClassId in [ClassId.orcFighter, ClassId.orcMage]:
-       htmltext = "7513-33.htm"
+       htmltext = "30513-33.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      else:
-       htmltext = "7513-34.htm"
+       htmltext = "30513-34.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
@@ -205,23 +208,27 @@ class Quest (JQuest) :
    else:
      st.setState(COMPLETED)
      st.exitQuest(1)
-     return "7513-34.htm"
+     return "30513-34.htm"
 
-QUEST   = Quest(7513,"7513_penatus_occupation_change","village_master")
+QUEST   = Quest(30513,"30513_penatus_occupation_change","village_master")
 CREATED   = State('Start',     QUEST)
 STARTED   = State('Started',   QUEST)
 COMPLETED = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(7513)
-QUEST.addStartNpc(7681)
-QUEST.addStartNpc(7704)
-QUEST.addStartNpc(7865)
-QUEST.addStartNpc(7913)
-
-STARTED.addTalkId(7513)
-STARTED.addTalkId(7681)
-STARTED.addTalkId(7704)
-STARTED.addTalkId(7865)
-STARTED.addTalkId(7913)
+QUEST.addStartNpc(30513)
+QUEST.addStartNpc(30681)
+QUEST.addStartNpc(30704)
+QUEST.addStartNpc(30865)
+QUEST.addStartNpc(30913)
+QUEST.addStartNpc(31288)
+QUEST.addStartNpc(31326)
+
+STARTED.addTalkId(30513)
+STARTED.addTalkId(30681)
+STARTED.addTalkId(30704)
+STARTED.addTalkId(30865)
+STARTED.addTalkId(30913)
+STARTED.addTalkId(31288)
+STARTED.addTalkId(31326)

datapack_development/data/jscript/village_master/7520_reed_occupation_change/7520-01.htm → datapack_development/data/jscript/village_master/30520_reed_occupation_change/30520-01.htm

@@ -5,11 +5,11 @@ Warehouse Chief Reed:
 <br>
 To change profession means that you have attained a certain degree of ability and experience, and may be promoted to a higher-level profession. If you are a Dwarven Fighter, you can change profession to become a <font color="LEVEL">Scavenger</font> or an <font color="LEVEL">Artisan</font>. Which profession do you want to know about?
 <br>
-<a action="bypass -h Quest 7520_reed_occupation_change 7520-02.htm">
+<a action="bypass -h Quest 30520_reed_occupation_change 30520-02.htm">
 Scavenger
 </a>
 <br>
-<a action="bypass -h Quest 7520_reed_occupation_change 7520-04.htm">
+<a action="bypass -h Quest 30520_reed_occupation_change 30520-04.htm">
 Artisan
 </a>
 </body>

datapack_development/data/jscript/village_master/7520_reed_occupation_change/7520-02.htm → datapack_development/data/jscript/village_master/30520_reed_occupation_change/30520-02.htm

@@ -7,11 +7,11 @@ The fundamental characteristics of <font color="LEVEL">Scavengers</font> and Art
 <br>
 The most talented Scavengers are selected to be <font color="LEVEL">Bounty Hunters</font>. Bounty Hunters go to the extreme to find arcane items like dragon scales.
 <br>
-<a action="bypass -h Quest 7520_reed_occupation_change 7520-03.htm">
+<a action="bypass -h Quest 30520_reed_occupation_change 30520-03.htm">
 Ask about changing profession to a Scavenger
 </a>
 <br>
-<a action="bypass -h Quest 7520_reed_occupation_change 7520-01.htm">
+<a action="bypass -h Quest 30520_reed_occupation_change 30520-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7520_reed_occupation_change/7520-03.htm → datapack_development/data/jscript/village_master/30520_reed_occupation_change/30520-03.htm

@@ -9,7 +9,7 @@ However, even if you have earned the qualifications, I cannot change your profes
 <br>
 To take the Test of the Scavenger, go to <font color="LEVEL">Collector Pippi</font> in the Bronze Key Guild over there. She will tell you everything you need to know. If you earn the qualifications, go to <font color="LEVEL">the village of Gludin</font> and meet <font color="LEVEL">Warehouse Chief Moke</font>. He will change your profession to Scavenger if you have prepared yourself properly.
 <br>
-<a action="bypass -h Quest 7520_reed_occupation_change 7520-01.htm">
+<a action="bypass -h Quest 30520_reed_occupation_change 30520-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7520_reed_occupation_change/7520-04.htm → datapack_development/data/jscript/village_master/30520_reed_occupation_change/30520-04.htm

@@ -5,7 +5,7 @@ Warehouse Chief Reed:
 <br>
 I am one who teaches Scavengers. If you want to be an <font color="LEVEL">Artisan</font>, go to <font color="LEVEL">Head Blacksmith Bronk</font> in the warehouse. He will be happy to tell you all you need to know.
 <br>
-<a action="bypass -h Quest 7520_reed_occupation_change 7520-01.htm">
+<a action="bypass -h Quest 30520_reed_occupation_change 30520-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7520_reed_occupation_change/__init__.py → datapack_development/data/jscript/village_master/30520_reed_occupation_change/__init__.py

@@ -8,7 +8,7 @@ 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
 
-WAREHOUSE_CHIEF_REED = 7520
+WAREHOUSE_CHIEF_REED = 30520
 
 class Quest (JQuest) :
 
@@ -22,17 +22,17 @@ class Quest (JQuest) :
    ClassId  = st.getPlayer().getClassId()
    Level    = st.getPlayer().getLevel()
 
-   if event == "7520-01.htm":
-     return "7520-01.htm"
+   if event == "30520-01.htm":
+     return "30520-01.htm"
 
-   if event == "7520-02.htm":
-     return "7520-02.htm"
+   if event == "30520-02.htm":
+     return "30520-02.htm"
 
-   if event == "7520-03.htm":
-     return "7520-03.htm"
+   if event == "30520-03.htm":
+     return "30520-03.htm"
 
-   if event == "7520-04.htm":
-     return "7520-04.htm"
+   if event == "30520-04.htm":
+     return "30520-04.htm"
 
    st.setState(COMPLETED)
    st.exitQuest(1)
@@ -48,16 +48,16 @@ class Quest (JQuest) :
    # Dwarfs got accepted
    if npcId == WAREHOUSE_CHIEF_REED and Race in [Race.dwarf]:
      if ClassId in [ClassId.dwarvenFighter]:
-       htmltext = "7520-01.htm"
+       htmltext = "30520-01.htm"
        st.setState(STARTED)
        return htmltext
      if ClassId in [ClassId.scavenger, ClassId.artisan]:
-       htmltext = "7520-05.htm"
+       htmltext = "30520-05.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      if ClassId in [ClassId.bountyHunter, ClassId.warsmith]:
-       htmltext = "7520-06.htm"
+       htmltext = "30520-06.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
@@ -66,15 +66,15 @@ class Quest (JQuest) :
    if npcId == WAREHOUSE_CHIEF_REED and Race in [Race.orc, Race.darkelf, Race.elf, Race.human]:
      st.setState(COMPLETED)
      st.exitQuest(1)
-     return "7520-07.htm"
+     return "30520-07.htm"
 
-QUEST   = Quest(7520,"7520_reed_occupation_change","village_master")
+QUEST   = Quest(30520,"30520_reed_occupation_change","village_master")
 CREATED   = State('Start',     QUEST)
 STARTED   = State('Started',   QUEST)
 COMPLETED = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(7520)
+QUEST.addStartNpc(30520)
 
-STARTED.addTalkId(7520)
+STARTED.addTalkId(30520)

datapack_development/data/jscript/village_master/7525_bronk_occupation_change/7525-01.htm → datapack_development/data/jscript/village_master/30525_bronk_occupation_change/30525-01.htm

@@ -5,11 +5,11 @@ Head Blacksmith Bronk:
 <br>
 To change profession means that you have attained a certain degree of ability and experience, and may be promoted to a higher-level profession. You cannot change profession here, however I can give you some information. If you are a Dwarven Fighter, you can change profession to become an <font color="LEVEL">Artisan</font> or a <font color="LEVEL">Scavenger</font>. Which profession do you want to know about?
 <br>
-<a action="bypass -h Quest 7525_bronk_occupation_change 7525-02.htm">
+<a action="bypass -h Quest 30525_bronk_occupation_change 30525-02.htm">
 Artisan
 </a>
 <br>
-<a action="bypass -h Quest 7525_bronk_occupation_change 7525-04.htm">
+<a action="bypass -h Quest 30525_bronk_occupation_change 30525-04.htm">
 Scavenger
 </a>
 </body>

datapack_development/data/jscript/village_master/7525_bronk_occupation_change/7525-02.htm → datapack_development/data/jscript/village_master/30525_bronk_occupation_change/30525-02.htm

@@ -7,11 +7,11 @@ The fundamental characteristics of Scavengers and <font color="LEVEL">Artisans</
 <br>
 Among Artisans, the best are selected to be <font color="LEVEL">Warsmiths</font>. Warsmith is an exalted profession with manufacturing skills of the highest level -- they can even make siege golems.
 <br>
-<a action="bypass -h Quest 7525_bronk_occupation_change 7525-03.htm">
+<a action="bypass -h Quest 30525_bronk_occupation_change 30525-03.htm">
 Ask about changing professions to an Artisan
 </a>
 <br>
-<a action="bypass -h Quest 7525_bronk_occupation_change 7525-01.htm">
+<a action="bypass -h Quest 30525_bronk_occupation_change 30525-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7525_bronk_occupation_change/7525-03.htm → datapack_development/data/jscript/village_master/30525_bronk_occupation_change/30525-03.htm

@@ -9,7 +9,7 @@ However, even if you earn these qualifications, I cannot change your profession.
 <br>
 To take the Test of the Artisan, go to <font color="LEVEL">Blacksmith Silvery</font>. She will give you detailed instructions. If you pass the test and earn your qualifications, go to the <font color="LEVEL">town of Gludio</font> and meet <font color="LEVEL">Head Blacksmith Tapoy</font> in the blacksmith's there. If you have met the qualifications, he will change your profession to Artisan.
 <br>
-<a action="bypass -h Quest 7525_bronk_occupation_change 7525-01.htm">
+<a action="bypass -h Quest 30525_bronk_occupation_change 30525-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7525_bronk_occupation_change/7525-04.htm → datapack_development/data/jscript/village_master/30525_bronk_occupation_change/30525-04.htm

@@ -5,7 +5,7 @@ Head Blacksmith Bronk:
 <br>
 I teach Artisans. If you want to be a <font color="LEVEL">Scavenger</font>, then go to <font color="LEVEL">Warehouse Chief Reed</font>in the warehouse. He will provide you with information.
 <br>
-<a action="bypass -h Quest 7525_bronk_occupation_change 7525-01.htm">
+<a action="bypass -h Quest 30525_bronk_occupation_change 30525-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7525_bronk_occupation_change/__init__.py → datapack_development/data/jscript/village_master/30525_bronk_occupation_change/__init__.py

@@ -10,7 +10,7 @@ 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
 
-HEAD_BLACKSMITH_BRONK = 7525
+HEAD_BLACKSMITH_BRONK = 30525
 
 class Quest (JQuest) :
 
@@ -24,17 +24,17 @@ class Quest (JQuest) :
    ClassId  = st.getPlayer().getClassId()
    Level    = st.getPlayer().getLevel()
 
-   if event == "7525-01.htm":
-     return "7525-01.htm"
+   if event == "30525-01.htm":
+     return "30525-01.htm"
 
-   if event == "7525-02.htm":
-     return "7525-02.htm"
+   if event == "30525-02.htm":
+     return "30525-02.htm"
 
-   if event == "7525-03.htm":
-     return "7525-03.htm"
+   if event == "30525-03.htm":
+     return "30525-03.htm"
 
-   if event == "7525-04.htm":
-     return "7525-04.htm"
+   if event == "30525-04.htm":
+     return "30525-04.htm"
 
    st.setState(COMPLETED)
    st.exitQuest(1)
@@ -50,21 +50,21 @@ class Quest (JQuest) :
    # Dwarfs got accepted
    if npcId == HEAD_BLACKSMITH_BRONK and Race in [Race.dwarf]:
      if ClassId in [ClassId.dwarvenFighter]:
-       htmltext = "7525-01.htm"
+       htmltext = "30525-01.htm"
        st.setState(STARTED)
        return htmltext
      if ClassId in [ClassId.artisan]:
-       htmltext = "7525-05.htm"
+       htmltext = "30525-05.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      if ClassId in [ClassId.warsmith]:
-       htmltext = "7525-06.htm"
+       htmltext = "30525-06.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      if ClassId in [ClassId.scavenger, ClassId.bountyHunter]:
-       htmltext = "7525-07.htm"
+       htmltext = "30525-07.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
@@ -73,15 +73,15 @@ class Quest (JQuest) :
    if npcId == HEAD_BLACKSMITH_BRONK and Race in [Race.orc, Race.darkelf, Race.elf, Race.human]:
      st.setState(COMPLETED)
      st.exitQuest(1)
-     return "7525-07.htm"
+     return "30525-07.htm"
 
-QUEST   = Quest(7525,"7525_bronk_occupation_change","village_master")
+QUEST   = Quest(30525,"30525_bronk_occupation_change","village_master")
 CREATED   = State('Start',     QUEST)
 STARTED   = State('Started',   QUEST)
 COMPLETED = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(7525)
+QUEST.addStartNpc(30525)
 
-STARTED.addTalkId(7525)
+STARTED.addTalkId(30525)

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-01.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-01.htm

@@ -5,11 +5,11 @@ Flame Lord Kakai:
 <br>
 To change profession means that you have attained a certain degree of ability and experience, and may be promoted to a higher-level profession. Orc Fighters can change profession to an <font color="LEVEL">Raider</font> or a <font color="LEVEL">Monk</font>. Which profession do you want to know about?
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-02.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-02.htm">
 Raider
 </a>
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-04.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-04.htm">
 Monk
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-02.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-02.htm

@@ -7,11 +7,11 @@ Flame Lord Kakai:
 <br>
 The most skillful Raiders are later selected as <font color="LEVEL">Destroyers</font>. One on one, Destroyers surpass all other Fighters.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-03.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-03.htm">
 Ask about changing profession to an Raider
 </a>
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-01.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-03.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-03.htm

@@ -9,7 +9,7 @@ I cannot change your profession for you, however, because only those who have ex
 <br>
 To take the Test of the Raider, go to <font color="LEVEL">Prefect Karukia</font> over there. He will tell you everything you need to know. And when you are ready to change profession, you must leave this place and go to the <font color="LEVEL">village of Gludin</font> in the region of Gludio to meet <font color="LEVEL">High Prefect Osborn</font>. If you have the qualifications, he will change your profession.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-01.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-04.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-04.htm

@@ -7,11 +7,11 @@ Flame Lord Kakai:
 <br>
 The finest Monks are selected to become <font color="LEVEL">Tyrants</font>, for still more advanced physical and technical training.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-05.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-05.htm">
 Ask about changing profession to a Monk
 </a>
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-01.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-05.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-05.htm

@@ -9,7 +9,7 @@ I cannot change your profession for you, however, because only those who have ex
 <br>
 To take the Test of the Monk, go to the Orc named <font color="LEVEL">Gantaki Zu Urutu</font> of our village. He will tell you everything you need to know. Also, to change profession, you must go to <font color="LEVEL">the village of Gludin</font> in the region of Gludio. There are Orcs there that teach warriors like you. Go find <font color="LEVEL">High Prefect Osborn</font>. If you have the qualifications, he will change your profession to a Monk.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-01.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-06.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-06.htm

@@ -5,7 +5,7 @@ Flame Lord Kakai:
 <br>
 To change profession means that you have attained a certain degree of ability and experience, and may be promoted to a higher-level profession. All Orc Mystics can change profession to become <font color="LEVEL">Orc Shamans</font>.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-07.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-07.htm">
 Description of an Orc Shaman
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-07.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-07.htm

@@ -7,11 +7,11 @@ Flame Lord Kakai:
 <br>
 Many of the Shamans who have the highest qualifications become <font color="LEVEL">Chief Candidates</font> and are called <font color="LEVEL">Overlords</font>. Only Shamans can become Overlords. Certain Shamans are also selected as <font color="LEVEL">Warcryers</font>, and learn even stronger spells.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-08.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-08.htm">
 Ask about changing profession to an Orc Shaman
 </a>
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-06.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-06.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/7565-08.htm → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/30565-08.htm

@@ -9,7 +9,7 @@ I cannot change your profession for you, however, because only those who have ex
 <br>
 If you want to take the Test of the Orc Shaman, go to <font color="LEVEL">Tataru Zu Hestui</font> of our village. He will tell you everything you need to know. Also, to change profession, you must leave this place and go to the <font color="LEVEL">village of Gludin</font> in the region of Gludio. There are Orcs there that teach Mystics like you. Go find <font color="LEVEL">High Prefect Osborn</font>. If you have the qualifications, he will change your profession to Orc Shaman.
 <br>
-<a action="bypass -h Quest 7565_kakai_occupation_change 7565-06.htm">
+<a action="bypass -h Quest 30565_kakai_occupation_change 30565-06.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7565_kakai_occupation_change/__init__.py → datapack_development/data/jscript/village_master/30565_kakai_occupation_change/__init__.py

@@ -10,7 +10,7 @@ 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
 
-KAKAI_LORD_OF_FLAME = 7565
+KAKAI_LORD_OF_FLAME = 30565
 
 class Quest (JQuest) :
 
@@ -24,29 +24,29 @@ class Quest (JQuest) :
    ClassId  = st.getPlayer().getClassId()
    Level    = st.getPlayer().getLevel()
 
-   if event == "7565-01.htm":
-     return "7565-01.htm"
+   if event == "30565-01.htm":
+     return "30565-01.htm"
 
-   if event == "7565-02.htm":
-     return "7565-02.htm"
+   if event == "30565-02.htm":
+     return "30565-02.htm"
 
-   if event == "7565-03.htm":
-     return "7565-03.htm"
+   if event == "30565-03.htm":
+     return "30565-03.htm"
 
-   if event == "7565-04.htm":
-     return "7565-04.htm"
+   if event == "30565-04.htm":
+     return "30565-04.htm"
 
-   if event == "7565-05.htm":
-     return "7565-05.htm"
+   if event == "30565-05.htm":
+     return "30565-05.htm"
 
-   if event == "7565-06.htm":
-     return "7565-06.htm"
+   if event == "30565-06.htm":
+     return "30565-06.htm"
 
-   if event == "7565-07.htm":
-     return "7565-07.htm"
+   if event == "30565-07.htm":
+     return "30565-07.htm"
 
-   if event == "7565-08.htm":
-     return "7565-08.htm"
+   if event == "30565-08.htm":
+     return "30565-08.htm"
 
    st.setState(COMPLETED)
    st.exitQuest(1)
@@ -62,21 +62,21 @@ class Quest (JQuest) :
    # Orcs got accepted
    if npcId == KAKAI_LORD_OF_FLAME and Race in [Race.orc]:
      if ClassId in [ClassId.orcFighter]:
-       htmltext = "7565-01.htm"
+       htmltext = "30565-01.htm"
        st.setState(STARTED)
        return htmltext
      if ClassId in [ClassId.orcRaider, ClassId.orcMonk, ClassId.orcShaman]:
-       htmltext = "7565-09.htm"
+       htmltext = "30565-09.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      if ClassId in [ClassId.destroyer, ClassId.tyrant, ClassId.overlord, ClassId.warcryer]:
-       htmltext = "7565-10.htm"
+       htmltext = "30565-10.htm"
        st.setState(COMPLETED)
        st.exitQuest(1)
        return htmltext
      if ClassId in [ClassId.orcMage]:
-       htmltext = "7565-06.htm"
+       htmltext = "30565-06.htm"
        st.setState(STARTED)
        return htmltext
 
@@ -84,15 +84,15 @@ class Quest (JQuest) :
    if npcId == KAKAI_LORD_OF_FLAME and Race in [Race.dwarf, Race.darkelf, Race.elf, Race.human]:
      st.setState(COMPLETED)
      st.exitQuest(1)
-     return "7565-11.htm"
+     return "30565-11.htm"
 
-QUEST   = Quest(7565,"7565_kakai_occupation_change","village_master")
+QUEST   = Quest(30565,"30565_kakai_occupation_change","village_master")
 CREATED   = State('Start',     QUEST)
 STARTED   = State('Started',   QUEST)
 COMPLETED = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(7565)
+QUEST.addStartNpc(30565)
 
-STARTED.addTalkId(7565)
+STARTED.addTalkId(30565)

datapack_development/data/jscript/village_master/7594_ranspo_occupation_change/7594-01.htm → datapack_development/data/jscript/village_master/30594_ranspo_occupation_change/30594-01.htm

@@ -5,11 +5,11 @@ Warehouse Chief Ranspo:
 <br>
 To change profession means that you have attained a certain degree of ability and experience, and may be promoted to a higher-level profession. If you are a Dwarven Fighter, you can change profession to become a <font color="LEVEL">Scavenger</font> or an <font color="LEVEL">Artisan</font>. Which profession do you want to know about?
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change 7594-02.htm">
+<a action="bypass -h Quest 30594_ranspo_occupation_change 30594-02.htm">
 Scavenger
 </a>
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change 7594-04.htm">
+<a action="bypass -h Quest 30594_ranspo_occupation_change 30594-04.htm">
 Artisan
 </a>
 </body>

datapack_development/data/jscript/village_master/7594_ranspo_occupation_change/7594-02.htm → datapack_development/data/jscript/village_master/30594_ranspo_occupation_change/30594-02.htm

@@ -7,15 +7,15 @@ The fundamental characteristics of <font color="LEVEL">Scavengers</font> and Art
 <br>
 The most talented Scavengers are selected to be <font color="LEVEL">Bounty Hunters</font>. Bounty Hunters go to the extreme to find arcane items like dragon scales.
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change 7594-03.htm">
+<a action="bypass -h Quest 30594_ranspo_occupation_change 30594-03.htm">
 Ask about changing profession to a Scavenger
 </a>
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change class_change_54">
+<a action="bypass -h Quest 30594_ranspo_occupation_change class_change_54">
 Change profession to a Scavenger
 </a>
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change 7594-01.htm">
+<a action="bypass -h Quest 30594_ranspo_occupation_change 30594-01.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7594_ranspo_occupation_change/7594-03.htm → datapack_development/data/jscript/village_master/30594_ranspo_occupation_change/30594-03.htm

@@ -9,7 +9,7 @@ Ask <font color="LEVEL">Collector Pippi of the Dwarven village</font> about the
 <br>
 Use a Gatekeeper to get to the Dwarven village.
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change 7594-02.htm">
+<a action="bypass -h Quest 30594_ranspo_occupation_change 30594-02.htm">
 Return
 </a>
 </body>

datapack_development/data/jscript/village_master/7594_ranspo_occupation_change/7594-04.htm → datapack_development/data/jscript/village_master/30594_ranspo_occupation_change/30594-04.htm

@@ -5,7 +5,7 @@ Warehouse Chief Ranspo:
 <br>
 You there! Can't you tell just by looking at me? I only teach Scavengers. If you want to be an <font color="LEVEL">Artisan</font>, then go to <font color="LEVEL">Head Blacksmith Opix</font>. He will tell you everything you need to know.
 <br>
-<a action="bypass -h Quest 7594_ranspo_occupation_change 7594-01.htm">
+<a action="bypass -h Quest 30594_ranspo_occupation_change 30594-01.htm">
 Return
 </a>
 </body>