unstable: all non-quest jscripts

datapack_development/data/jscript/blacksmith/1001_dual_swords/__init__.py

@@ -3,8 +3,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
 
-SMITHS = [7283,7298,7300,7317,7458,7471,7526,7527,7536,7621,7678,7688,7846,7898,8002,8044,8271,8274,8316,8539,8583,8626,8668]
-
+SMITHS = [30283,30298,30300,30317,30458,30471,30526,30527,30536,30621,30678,30688,30846,30898,31002,31044,31271,31274,31316,31539,31583,31626,31668]
 class Quest (JQuest) :
 
  def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)

datapack_development/data/jscript/blacksmith/1002_unseal/__init__.py

@@ -3,7 +3,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
 
-SMITHS = [7283,7298,7300,7317,7458,7471,7526,7527,7536,7621,7678,7688,7846,7898,8002,8044,8271,8274,8316,8539,8583,8626,8668]
+SMITHS = [30283,30298,30300,30317,30458,30471,30526,30527,30536,30621,30678,30688,30846,30898,31002,31044,31271,31274,31316,31539,31583,31626,31668]
 
 class Quest (JQuest) :
 

datapack_development/data/jscript/blacksmith/1003_reseal/__init__.py

@@ -3,7 +3,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
 
-SMITHS = [7283,7298,7300,7317,7458,7471,7526,7527,7536,7621,7678,7688,7846,7898,8002,8044,8271,8274,8316,8539,8583,8626,8668]
+SMITHS = [30283,30298,30300,30317,30458,30471,30526,30527,30536,30621,30678,30688,30846,30898,31002,31044,31271,31274,31316,31539,31583,31626,31668]
 
 class Quest (JQuest) :
 

datapack_development/data/jscript/blacksmith/1005_unseal/__init__.py

@@ -545,9 +545,9 @@ COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(8126)
+QUEST.addStartNpc(31126)
 
-STARTED.addTalkId(8126)
+STARTED.addTalkId(31126)
 
 
 

datapack_development/data/jscript/blacksmith/1007_enhance/__init__.py

@@ -7,7 +7,7 @@ from net.sf.l2j.gameserver.model.quest import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 from net.sf.l2j.gameserver import ItemTable
 
-SMITHS = [7283,7298,7300,7317,7458,7471,7526,7527,7536,7621,7678,7688,7846,7898,8002,8044,8271,8274,8316,8539,8583,8626,8668]
+SMITHS = [30283,30298,30300,30317,30458,30471,30526,30527,30536,30621,30678,30688,30846,30898,31002,31044,31271,31274,31316,31539,31583,31626,31668]
 
 ############################## Feel Free to add more Weapons ##########################################################################################################3
 

datapack_development/data/jscript/blacksmith/1008_enhance_mammon/__init__.py

@@ -173,7 +173,7 @@ QUEST.setInitialState(CREATED)
 
 
 # init all npc to the correct stats
-for npcId in [8126]:
+for npcId in [31126]:
 	QUEST.addStartNpc(npcId)
 	STARTED.addTalkId(npcId)
 	

datapack_development/data/jscript/blacksmith/1009_remove_mammon/__init__.py

@@ -170,7 +170,7 @@ QUEST.setInitialState(CREATED)
  
  
 # init all npc to the correct stats
-for npcId in [8092]:
+for npcId in [31092]:
         QUEST.addStartNpc(npcId)
         STARTED.addTalkId(npcId)
         

datapack_development/data/jscript/blacksmith/1010_exchange/__init__.py

@@ -386,7 +386,7 @@ QUEST.setInitialState(CREATED)
 
 
 # init all npc to the correct stats
-for npcId in [8126]:
+for npcId in [31126]:
    QUEST.addStartNpc(npcId)
    STARTED.addTalkId(npcId)
    

datapack_development/data/jscript/blacksmith/1011_enhance_mammon_s/__init__.py

@@ -166,7 +166,7 @@ QUEST.setInitialState(CREATED)
 
 
 # init all npc to the correct stats
-for npcId in [8126]:
+for npcId in [31126]:
 	QUEST.addStartNpc(npcId)
 	STARTED.addTalkId(npcId)
 	

datapack_development/data/jscript/blacksmith/1012_upgrade/__init__.py

@@ -460,7 +460,7 @@ COMPLETED   = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-QUEST.addStartNpc(8126)
-STARTED.addTalkId(8126)
+QUEST.addStartNpc(31126)
+STARTED.addTalkId(31126)
 
 print "importing blacksmith data: 1012_upgrade"

datapack_development/data/jscript/custom/12535_WakeBaium/__init__.py

@@ -16,18 +16,18 @@ class Quest (JQuest):
 
   def onTalk (self,npc,st):
     npcId = npc.getNpcId()
-    if npcId == 12535 :
+    if npcId == 29025 :
       if st.getInt("ok"):
         if not npc.isBusy():
            npc.setBusy(True)
            npc.setBusyMessage("Attending another player's request")
-           st.getPcSpawn().addSpawn(12372)
+           st.getPcSpawn().addSpawn(29020)
            npc.reduceCurrentHp(9999999, npc)
         st.exitQuest(1)
       else:
         st.exitQuest(1)
         return "Conditions are not right to wake up Baium"
-    elif npcId == 12571 :
+    elif npcId == 31862 :
       if st.getQuestItemsCount(4295) > 0 :   # bloody fabric
         st.takeItems(4295,1)
         st.getPlayer().teleToLocation(113100,14500,10077)
@@ -44,9 +44,9 @@ COMPLETED   = State('Completed',   QUEST)
 # Quest initialization
 QUEST.setInitialState(CREATED)
 # Quest NPC starter initialization
-QUEST.addStartNpc(12535)
-QUEST.addStartNpc(12571)
-CREATED.addTalkId(12535)
-CREATED.addTalkId(12571)
+QUEST.addStartNpc(29025)
+QUEST.addStartNpc(31862)
+CREATED.addTalkId(29025)
+CREATED.addTalkId(31862)
 
 print "importing quests: 12535: Wake Up Baium"

datapack_development/data/jscript/custom/3995_echo/__init__.py

@@ -5,7 +5,7 @@
 ### ---------------------------------------------------------------------------
 
 ### Settings
-NPC         = [8042,8043]
+NPC         = [31042,31043]
 QuestId     = 3995
 QuestName   = "echo"
 QuestDesc   = "custom"

datapack_development/data/jscript/custom/7000_HeroItems/__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
 from net.sf.l2j.gameserver import ItemTable
 
-MONUMENTS=[8690]+range(8769,8773)
+MONUMENTS=[31690]+range(31769,31773)
 
 HERO_ITEMS={
 6611:["weapon_the_sword_of_hero_i00","Infinity Blade","During a critical attack, decreases one's P. Def and increases de-buff casting ability, damage shield effect, Max HP, Max MP, Max CP, and shield defense power. Also enhances damage to target during PvP.","297/137","Sword"],

datapack_development/data/jscript/teleports/1100_teleport_with_charm/__init__.py

@@ -10,8 +10,8 @@ from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
 ORC_GATEKEEPER_CHARM   	= 1658
 DWARF_GATEKEEPER_TOKEN 	= 1659
-WHIRPY			= 7540
-TAMIL			= 7576
+WHIRPY			= 30540
+TAMIL			= 30576
 
 class Quest (JQuest) :
 
@@ -28,7 +28,7 @@ class Quest (JQuest) :
        return
      else:
        st.exitQuest(1)
-       return "7576-01.htm"
+       return "30576-01.htm"
    # DWARVEN_VILLAGE
    elif npcId == WHIRPY: 
      if st.getQuestItemsCount(DWARF_GATEKEEPER_TOKEN) >= 1:
@@ -38,7 +38,7 @@ class Quest (JQuest) :
        return
      else:
        st.exitQuest(1)
-       return "7540-01.htm"
+       return "30540-01.htm"
 
 QUEST       = Quest(1100,"1100_teleport_with_charm","Teleports")
 CREATED     = State('Start',QUEST)

datapack_development/data/jscript/teleports/1101_teleport_to_race_track/__init__.py

@@ -1,27 +1,29 @@
 #
-# Created by DraX on 2005.07.27. updated by mr.
+# Created by DraX on 2005.07.27. updated by mr.
 #
-
-print "importing teleport data: 1101_teleport_to_race_track"
-
 import sys
 
 from net.sf.l2j.gameserver.model.actor.instance import L2PcInstance
-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
-
-TRISHA	     = 7059
-CLARISSA     = 7080
-VALENTIA     = 7177
-ESMERALDA    = 7233
-BELLA        = 7256
-RICHLIN	     = 7320
-ELISA        = 7848
-FLAUEN       = 7899
-TATIANA	     = 8275
-ILYANA	     = 8320
-RACE_MANAGER = 7995
+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
+
+TRISHA	     = 30059
+CLARISSA     = 30080
+VALENTIA     = 30177
+ESMERALDA    = 30233
+BELLA        = 30256
+RICHLIN	     = 30320
+ELISA        = 30848
+FLAUEN       = 30899
+TATIANA	     = 31275
+ILYANA	     = 31320
+RACE_MANAGER = 30995
+#TODO
+ANYA         = 30237
+MINERVA      = 30836
+VERONA       = 30727
+
 
 class Quest (JQuest) :
 
@@ -90,14 +92,14 @@ class Quest (JQuest) :
      st.setState(STARTED)
      st.set("id","8")     
      return
-
+
    # Rune Town
    if npcId == ILYANA: 
      st.player.teleToLocation(12661,181687,-3560)
      st.setState(STARTED)
      st.set("id","9")     
      return
-
+
    # Goddard Castle Town
    if npcId == TATIANA: 
      st.player.teleToLocation(12661,181687,-3560)
@@ -110,70 +112,70 @@ class Quest (JQuest) :
    ############################
    
    # back to Gludin Village
-   if npcId == RACE_MANAGER and int(st.get("id")) == 1:
+   if npcId == RACE_MANAGER and st.getInt("id") == 1:
      st.player.teleToLocation(-80826,149775,-3043)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
    
    # back to Gludio Castle Town
-   if npcId == RACE_MANAGER and int(st.get("id")) == 2:
+   if npcId == RACE_MANAGER and st.getInt("id") == 2:
      st.player.teleToLocation(-12672,122776,-3116)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
   
    # back to Dion Castle Town
-   if npcId == RACE_MANAGER and int(st.get("id")) == 3:
+   if npcId == RACE_MANAGER and st.getInt("id") == 3:
      st.player.teleToLocation(15670,142983,-2705)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
 
    # back to Giran Castle Town
-   if npcId == RACE_MANAGER and int(st.get("id")) == 4:
+   if npcId == RACE_MANAGER and st.getInt("id") == 4:
      st.player.teleToLocation(83400,147943,-3404)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
 
    # back to Heine
-   if npcId == RACE_MANAGER and int(st.get("id")) == 5:
+   if npcId == RACE_MANAGER and st.getInt("id") == 5:
      st.player.teleToLocation(111409,219364,-3545)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
 
    # back to Town of Oren
-   if npcId == RACE_MANAGER and int(st.get("id")) == 6:
+   if npcId == RACE_MANAGER and st.getInt("id") == 6:
      st.player.teleToLocation(82956,53162,-1495)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
 
    # back to Town of Aden
-   if npcId == RACE_MANAGER and int(st.get("id")) == 7:
+   if npcId == RACE_MANAGER and st.getInt("id") == 7:
      st.player.teleToLocation(146331,25762,-2018)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
 
    # back to Hunters Village
-   if npcId == RACE_MANAGER and int(st.get("id")) == 8:
+   if npcId == RACE_MANAGER and st.getInt("id") == 8:
      st.player.teleToLocation(116819,76994,-2714)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
-
+
    # back to Rune Village
-   if npcId == RACE_MANAGER and int(st.get("id")) == 9:
+   if npcId == RACE_MANAGER and st.getInt("id") == 9:
      st.player.teleToLocation(43835,-47749,-792)
      st.setState(COMPLETED)
      st.exitQuest(1)
      return
-
+
    # back to Goddard Castle Town
-   if npcId == RACE_MANAGER and int(st.get("id")) == 10:
+   if npcId == RACE_MANAGER and st.getInt("id") == 10:
      st.player.teleToLocation(147930,-55281,-2728)
      st.setState(COMPLETED)
      st.exitQuest(1)
@@ -209,3 +211,5 @@ CREATED.addTalkId(ILYANA)
 CREATED.addTalkId(TATIANA)
 
 STARTED.addTalkId(RACE_MANAGER)
+
+print "importing teleport data: 1101_teleport_to_race_track"

datapack_development/data/jscript/teleports/1102_toivortex_blue/__init__.py

@@ -6,8 +6,8 @@ from net.sf.l2j.gameserver.model.quest        import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
 BLUE_DIMENSION_STONE    = 4402
-DIMENSION_VORTEX_1      = 7952
-DIMENSION_VORTEX_3      = 7954
+DIMENSION_VORTEX_1      = 30952
+DIMENSION_VORTEX_3      = 30954
 
 class Quest (JQuest) :
 

datapack_development/data/jscript/teleports/1102_toivortex_green/__init__.py

@@ -6,8 +6,8 @@ from net.sf.l2j.gameserver.model.quest        import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
 GREEN_DIMENSION_STONE  	= 4401
-DIMENSION_VORTEX_2      = 7953
-DIMENSION_VORTEX_3      = 7954
+DIMENSION_VORTEX_2      = 30953
+DIMENSION_VORTEX_3      = 30954
 
 class Quest (JQuest) :
 

datapack_development/data/jscript/teleports/1102_toivortex_red/__init__.py

@@ -6,8 +6,8 @@ from net.sf.l2j.gameserver.model.quest        import QuestState
 from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 
 RED_DIMENSION_STONE	= 4403
-DIMENSION_VORTEX_1      = 7952
-DIMENSION_VORTEX_2      = 7953
+DIMENSION_VORTEX_1      = 30952
+DIMENSION_VORTEX_2      = 30953
 
 class Quest (JQuest) :
 

datapack_development/data/jscript/teleports/1103_OracleTeleport/__init__.py

@@ -6,20 +6,20 @@ 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
 
-GLUDIN_DAWN = 8078
-GLUDIN_DUSK = 8085
-GLUDIO_DAWN = 8079
-GLUDIO_DUSK = 8086
-DION_DAWN = 8080
-DION_DUSK = 8087
-GIRAN_DAWN = 8081
-GIRAN_DUSK = 8088
-OREN_DAWN = 8083
-OREN_DUSK = 8090
-ADEN_DAWN = 8084
-ADEN_DUSK = 8091
-HEINE_DAWN = 8082
-HEINE_DUSK = 8089
+GLUDIN_DAWN = 31078
+GLUDIN_DUSK = 31085
+GLUDIO_DAWN = 31079
+GLUDIO_DUSK = 31086
+DION_DAWN = 31080
+DION_DUSK = 31087
+GIRAN_DAWN = 31081
+GIRAN_DUSK = 31088
+OREN_DAWN = 31083
+OREN_DUSK = 31090
+ADEN_DAWN = 31084
+ADEN_DUSK = 31091
+HEINE_DAWN = 31082
+HEINE_DUSK = 31089
 
 class Quest (JQuest) :
 
@@ -137,49 +137,49 @@ class Quest (JQuest) :
    ################
    
    # back to Gludin Village
-    if int(st.get("id")) == 1:
+    if st.getInt("id") == 1:
         st.player.teleToLocation(-80826, 149775, -3043)
         st.setState(COMPLETED)
         st.exitQuest(1)
         return
    
    # back to Gludio Castle Town
-    if int(st.get("id")) == 2:
+    if st.getInt("id") == 2:
         st.player.teleToLocation(-12672, 122776, -3116)
         st.setState(COMPLETED)
         st.exitQuest(1)
         return
   
    # back to Dion Castle Town
-    if int(st.get("id")) == 3:
+    if st.getInt("id") == 3:
         st.player.teleToLocation(15670, 142983, -2705)
         st.setState(COMPLETED)
         st.exitQuest(1)
         return
 
    # back to Giran Castle Town
-    if int(st.get("id")) == 4:
+    if st.getInt("id") == 4:
         st.player.teleToLocation(83400, 147943, -3404)
         st.setState(COMPLETED)
         st.exitQuest(1)
         return
 
    # back to Town of Oren
-    if int(st.get("id")) == 5:
+    if st.getInt("id") == 5:
         st.player.teleToLocation(82956, 53162, -1495)
         st.setState(COMPLETED)
         st.exitQuest(1)
         return
 
    # back to Town of Aden
-    if int(st.get("id")) == 6:
+    if st.getInt("id") == 6:
         st.player.teleToLocation(146331, 25762, -2018)
         st.setState(COMPLETED)
         st.exitQuest(1)
         return
 
     # back to Heine
-    if int(st.get("id")) == 7:
+    if st.getInt("id") == 7:
         st.player.teleToLocation(111409, 219364, -3545)
         st.setState(COMPLETED)
         st.exitQuest(1)
@@ -192,12 +192,12 @@ COMPLETED    = State('Completed', QUEST)
 
 QUEST.setInitialState(CREATED)
 
-for i in range(8078,8092) :
+for i in range(31078,31092) :
     QUEST.addStartNpc(i)
     CREATED.addTalkId(i)
     STARTED.addTalkId(i)
 
-for j in range(8127,8142) :
+for j in range(31127,31142) :
     STARTED.addTalkId(j)
 
 print "importing teleport data: 1103_OracleTeleport"