Explorar o código

BETA: Quests in Java:
* Secret Buried in the Swamp (31)
* Patch by: janiko
* Reviewed by: xban1x, St3eT, Zoey76, jurchiks
* Tested by: Zoey76
* An Obvious Lie (32)
* Patch by: janiko, Zoey76
* Reviewed by: jurchiks, UnAfraid, xban1x, nonom, Zoey76
* Tested by: Zoey76
* A Special Order (40)
* Patch by: janiko
* Reviewed by: xban1x, jurchiks, Zoey76
* Tested by: Zoey76
* Orc Subjugation (263)
* Patch by: ivantotov
* Reviewed by: xban1x, Zoey76
* Tested by: ivantotov, Zoey76
* Hunting Leto Lizardman (300)
* Patch by: ivantotov
* Reviewed by: Zoey76
* Tested by: ivantotov, Zoey76

Zoey76 %!s(int64=11) %!d(string=hai) anos
pai
achega
563c5364f1
Modificáronse 100 ficheiros con 717 adicións e 726 borrados
  1. 5 5
      L2J_DataPack_BETA/dist/game/data/scripts.cfg
  2. 0 85
      L2J_DataPack_BETA/dist/game/data/scripts/quests/263_KillAllSylphs1/__init__.py
  3. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/300_HuntingLetoLizardman/30126-03.htm
  4. 0 85
      L2J_DataPack_BETA/dist/game/data/scripts/quests/300_HuntingLetoLizardman/__init__.py
  5. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-0.htm
  6. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-2.htm
  7. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-5.htm
  8. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-6.htm
  9. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31661-0.htm
  10. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31662-0.htm
  11. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-0.htm
  12. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-0a.htm
  13. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-1.htm
  14. 0 115
      L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/__init__.py
  15. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-0.htm
  16. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-1.htm
  17. 0 6
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-13.htm
  18. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-3.htm
  19. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-4.htm
  20. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-5.htm
  21. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-6.htm
  22. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-8.htm
  23. 0 6
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-9.htm
  24. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-0a.htm
  25. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-1.htm
  26. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-2.htm
  27. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-2.htm
  28. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-3.htm
  29. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-4.htm
  30. 0 164
      L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/__init__.py
  31. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-04a.htm
  32. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30511-01.htm
  33. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/31572-01.htm
  34. 0 122
      L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/__init__.py
  35. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-01.htm
  36. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-02.html
  37. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-03.htm
  38. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-04.html
  39. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-05.html
  40. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-06.html
  41. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-07.html
  42. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-08.html
  43. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31661-01.html
  44. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31661-02.html
  45. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31661-03.html
  46. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31662-01.html
  47. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31662-02.html
  48. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31662-03.html
  49. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31663-01.html
  50. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31663-02.html
  51. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31663-03.html
  52. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31664-01.html
  53. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31664-02.html
  54. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31664-03.html
  55. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31665-01.html
  56. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31665-02.html
  57. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31665-03.html
  58. 226 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
  59. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-01.html
  60. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-02.html
  61. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-03.html
  62. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-04.html
  63. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-05.html
  64. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-06.html
  65. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-07.html
  66. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-08.html
  67. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-09.html
  68. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-10.html
  69. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-11.html
  70. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-12.html
  71. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-13.html
  72. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-14.html
  73. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-15.html
  74. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-16.html
  75. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-17.html
  76. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-01.htm
  77. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-02.html
  78. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-03.htm
  79. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-04.html
  80. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-01.html
  81. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-02.html
  82. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-03.html
  83. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-04.html
  84. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-05.html
  85. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-06.html
  86. 344 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
  87. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-01.htm
  88. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-02.htm
  89. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-03.html
  90. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-04.html
  91. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-05.html
  92. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-06.html
  93. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-07.html
  94. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-08.html
  95. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-09.html
  96. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-10.html
  97. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-01.html
  98. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-02.html
  99. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-03.html
  100. 0 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-04.html

+ 5 - 5
L2J_DataPack_BETA/dist/game/data/scripts.cfg

@@ -242,8 +242,8 @@ quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
 quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
 quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
 quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
-quests/31_SecretBuriedInTheSwamp/__init__.py
-quests/32_AnObviousLie/__init__.py
+quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
 quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
 quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
 quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -251,7 +251,7 @@ quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
 quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
 quests/38_DragonFangs/__init__.py
 quests/39_RedEyedInvaders/__init__.py
-quests/40_ASpecialOrder/__init__.py
+quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
 quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
 quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
 quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -405,7 +405,7 @@ quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
 quests/Q00260_OrcHunting/Q00260_OrcHunting.java
 quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
 quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
-quests/263_KillAllSylphs1/__init__.py
+quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
 quests/Q00264_KeenClaws/Q00264_KeenClaws.java
 quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
 quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -440,7 +440,7 @@ quests/296_SilkOfTarantula/__init__.py
 quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
 quests/298_LizardmensConspiracy/__init__.py
 quests/299_GatherIngredientsForPie/__init__.py
-quests/300_HuntingLetoLizardman/__init__.py
+quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
 quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
 quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
 quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java

+ 0 - 85
L2J_DataPack_BETA/dist/game/data/scripts/quests/263_KillAllSylphs1/__init__.py

@@ -1,85 +0,0 @@
-# Made by Mr. - Version 0.3 by DrLecter
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "263_KillAllSylphs1"
-
-ORC_AMULET = 1116
-ORC_NECKLACE = 1117
-ADENA_ID = 57
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [ORC_AMULET, ORC_NECKLACE]
-
- def onAdvEvent (self,event,npc, player) :
-    htmltext = event
-    st = player.getQuestState(qn)
-    if not st : return
-    if event == "30346-03.htm" :
-      st.set("cond","1")
-      st.setState(State.STARTED)
-      st.playSound("ItemSound.quest_accept")
-    elif event == "30346-06.htm" :
-      st.exitQuest(1)
-      st.playSound("ItemSound.quest_finish")
-    return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   npcId = npc.getId()
-   id = st.getState()
-
-   if id == State.CREATED :
-     st.set("cond","0")
-   if st.getInt("cond")==0 :
-     if player.getRace().ordinal() != 2 :
-       htmltext = "30346-00.htm"
-       st.exitQuest(1)
-     elif player.getLevel()<8 :
-       htmltext = "30346-01.htm"
-       st.exitQuest(1)
-     else :
-       htmltext = "30346-02.htm"
-   else :
-     amulet = st.getQuestItemsCount(ORC_AMULET)
-     necklace = st.getQuestItemsCount(ORC_NECKLACE)
-     if amulet == necklace == 0 :
-       htmltext = "30346-04.htm"
-     else :
-       htmltext = "30346-05.htm"
-       st.giveItems(ADENA_ID,amulet*20+necklace*30)
-       st.takeItems(ORC_AMULET,-1)
-       st.takeItems(ORC_NECKLACE,-1)
-   return htmltext
-
- def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
-   if not st : return 
-   if st.getState() != State.STARTED : return 
-   
-   item=ORC_NECKLACE
-   if npc.getId() == 20385 :
-     item = ORC_AMULET
-   if self.getRandom(10)>4 :
-     st.giveItems(item,1)
-     st.playSound("ItemSound.quest_itemget")
-   return
-
-QUEST       = Quest(263,qn,"Kill All Sylphs1")
-
-QUEST.addStartNpc(30346)
-
-QUEST.addTalkId(30346)
-
-QUEST.addKillId(20385)
-QUEST.addKillId(20386)
-QUEST.addKillId(20387)
-QUEST.addKillId(20388)

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/300_HuntingLetoLizardman/30126-03.htm

@@ -1,5 +0,0 @@
-<html><body>Guard Rath:<br>
-Destroy the lizardmen and take their bracelets as proof of your victory.<br>
-Kill the<font color="LEVEL"> Leto Lizardmen, Leto Lizardman Archers, Leto Lizardman Soldiers, Leto Lizardman Overlords', Leto Lizardman Warriors</font> and so on. Don't attack their shaman! It might cause them to stop the ritual before our investigation is complete. The ritual must not end until our investigation is complete!<br>
-The guild had already sent me a reward for 60 bracelets. I'll give it to you as soon as you earn it.
-</body></html>

+ 0 - 85
L2J_DataPack_BETA/dist/game/data/scripts/quests/300_HuntingLetoLizardman/__init__.py

@@ -1,85 +0,0 @@
-# Hunting Leto Lizardman - Version 0.1 by DrLecter
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "300_HuntingLetoLizardman"
-
-#NPC
-RATH=30126
-#Items
-BRACELET=7139
-#BASE CHANCE FOR DROP
-CHANCE = 50
-#REWARDS
-REWARDS=[[57,30000],[1867,50],[1872,50]]
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [BRACELET]
-
- def onAdvEvent (self,event,npc, player) :
-   htmltext = event
-   st = player.getQuestState(qn)
-   if not st : return
-   cond = st.getInt("cond")
-   count = st.getQuestItemsCount(BRACELET)
-   if event == "30126-03.htm" and cond == 0 :
-     st.set("cond","1")
-     st.setState(State.STARTED)
-     st.playSound("ItemSound.quest_accept")
-   elif event == "30126-05.htm" :
-     if count == 60 and cond == 2 :
-       htmltext = "30126-06.htm"
-       st.takeItems(BRACELET,-1)
-       item,qty = REWARDS[self.getRandom(len(REWARDS))]
-       st.giveItems(item,qty)
-       st.playSound("ItemSound.quest_finish")
-       st.exitQuest(1)
-   return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   npcId = npc.getId()
-   id = st.getState()
-   cond=st.getInt("cond")
-   if cond == 0 :
-     if player.getLevel() >= 34 :
-       htmltext = "30126-02.htm"
-     else:
-       htmltext = "30126-01.htm"
-       st.exitQuest(1)
-   else :
-       htmltext = "30126-04.htm"
-   return htmltext
-
- def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
-   if not st : return 
-   if st.getState() != State.STARTED : return 
-   
-   count = st.getQuestItemsCount(BRACELET)
-   cond = st.getInt("cond")
-   if self.getRandom(100) < CHANCE + ((npc.getId() - 20579)*5) and count < 60 and cond == 1:
-     st.giveItems(BRACELET,1)
-     if count == 59 :
-        st.playSound("ItemSound.quest_middle")
-        st.set("cond","2")
-     else :
-        st.playSound("ItemSound.quest_itemget")
-   return
-
-QUEST       = Quest(300,qn,"Hunting Leto Lizardman")
-
-QUEST.addStartNpc(RATH)
-
-QUEST.addTalkId(RATH)
-
-for mob in range(20577,20581)+[20582] :
-    QUEST.addKillId(mob)

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-0.htm

@@ -1,4 +0,0 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
-The person we sent to investigate the ancient monument is missing. Can you help us find him?<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31555-1.htm">Yes.</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-2.htm

@@ -1,4 +0,0 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
-Rangers reported that Krorin went missing somewhere in the Swamp of Screams. Look for him there. If he is dead find his diary. It might hold a clue about the ancient monuments hidden there.<br>
-The swamp is a dangerous place, but i'm sure you can handle it. Good luck!
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-5.htm

@@ -1,3 +0,0 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
-It would look very bad if you went missing too, so be creful. Watch for the Stakatos!
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-6.htm

@@ -1,4 +0,0 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
-You've returned! Did you find the monuments?<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31555-7.htm">"I found all four"</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31661-0.htm

@@ -1,4 +0,0 @@
-<html><body>Forgotten Monument :<br>
-An ancient stone monument. Scrape away the mud and you'll find mysterious hieroglyphs and diagrams.<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31661-1.htm">Examine the markings closely</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31662-0.htm

@@ -1,4 +0,0 @@
-<html><body>Forgotten Monument :<br>
-An ancient monument made in the same style as the monument that was discovered first. You find hieroglyphic characters and diagrams inscribed on the surface after cleaning off the mud<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31662-1.htm">Analyze the diagrams</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-0.htm

@@ -1,4 +0,0 @@
-<html><body>Forgotten Monument :<br>
-Another ancient monument in the same style as the first. After cleaning it off, you discover hieroglyhps and diagrams inscribed on it<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31663-0a.htm">Examine the markings</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-0a.htm

@@ -1,4 +0,0 @@
-<html><body>Forgotten Monument :<br>
-Much cleaner and better preserved than the previous monuments. It's covered in strange hieroglyphs and diagrams.<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31663-1.htm">Examine the markings closely</a>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-1.htm

@@ -1,3 +0,0 @@
-<html><body>Forgotten Monument :<br>
-The fourth monument seems to be in the most dangerous part of Swamp of Screams.
-</body></html>

+ 0 - 115
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/__init__.py

@@ -1,115 +0,0 @@
-# by disKret
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "31_SecretBuriedInTheSwamp"
-
-#NPC
-ABERCROMBIE = 31555
-FORGOTTEN_MONUMENT_1,FORGOTTEN_MONUMENT_2,FORGOTTEN_MONUMENT_3,FORGOTTEN_MONUMENT_4,CORPSE_OF_DWARF = range(31661,31666)
-#ITEMS
-KRORINS_JOURNAL = 7252
-#MESSAGES
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [KRORINS_JOURNAL]
-
- def onEvent (self,event,st) :
-   id = st.getState()
-   cond = st.getInt("cond")
-   htmltext = event
-   if event == "31555-1.htm" and id == State.CREATED:
-     st.set("cond","1")
-     st.setState(State.STARTED)
-     st.playSound("ItemSound.quest_accept")
-   elif event == "31665-1.htm" and cond == 1:
-     st.set("cond","2")
-     st.playSound("ItemSound.quest_itemget")
-     st.giveItems(KRORINS_JOURNAL,1)
-   elif event == "31555-4.htm" and cond == 2:
-     st.set("cond","3")
-   elif event == "31661-1.htm" and cond == 3:
-     st.set("cond","4")
-   elif event == "31662-1.htm" and cond == 4:
-     st.set("cond","5")
-   elif event == "31663-1.htm" and cond == 5:
-     st.set("cond","6")
-   elif event == "31664-1.htm" and cond == 6:
-     st.set("cond","7")
-     st.playSound("ItemSound.quest_middle")
-   elif event == "31555-7.htm" and cond == 7:
-     st.takeItems(KRORINS_JOURNAL,-1)
-     st.addExpAndSp(490000,45880)
-     st.giveItems(57,120000)
-     st.playSound("ItemSound.quest_finish")
-     st.exitQuest(False)
-   elif event != "31663-0a.htm":
-     htmltext = Quest.getNoQuestMsg(player)
-   return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-   
-   npcId = npc.getId()
-   id = st.getState()
-   cond = st.getInt("cond")
-   if id == State.COMPLETED :
-     htmltext = Quest.getAlreadyCompletedMsg(player)
-
-   elif npcId == ABERCROMBIE :
-     if cond == 0 :
-       if player.getLevel() >= 66 :
-         htmltext = "31555-0.htm"
-       else :
-         htmltext = "31555-0a.htm"
-         st.exitQuest(1)
-     elif cond == 1 :
-       htmltext = "31555-2.htm"
-     elif cond == 2 :
-       htmltext = "31555-3.htm"
-     elif cond == 3 :
-       htmltext = "31555-5.htm"
-     elif cond == 7 :
-       htmltext = "31555-6.htm"
-   elif id == State.STARTED : 
-       if npcId == CORPSE_OF_DWARF :
-         if cond == 1 :
-           htmltext = "31665-0.htm"
-         elif cond == 2 :
-           htmltext = "31665-2.htm"
-       elif npcId == FORGOTTEN_MONUMENT_1 :
-         if cond == 3 :
-           htmltext = "31661-0.htm"
-         elif cond > 3 :
-           htmltext = "31661-2.htm"
-       elif npcId == FORGOTTEN_MONUMENT_2:
-         if cond == 4 :
-           htmltext = "31662-0.htm"
-         elif cond > 4 :
-           htmltext = "31662-2.htm"
-       elif npcId == FORGOTTEN_MONUMENT_3 :
-         if cond == 5 :
-           htmltext = "31663-0.htm"
-         elif cond > 5 :
-           htmltext = "31663-2.htm"
-       elif npcId == FORGOTTEN_MONUMENT_4 :
-         if cond == 6 :
-           htmltext = "31664-0.htm"
-         elif cond > 6 :
-           htmltext = "31664-2.htm"
-   return htmltext
-
-QUEST       = Quest(31,qn,"Secret Buried In The Swamp")
-
-QUEST.addStartNpc(ABERCROMBIE)
-
-QUEST.addTalkId(ABERCROMBIE)
-
-for i in range(31661,31666):
-    QUEST.addTalkId(i)

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-0.htm

@@ -1,5 +0,0 @@
-<html><body>Magic Trader Gentler:<br>
-Welcome. What can I do for you?<br>
-Ah yes, I'd love to fulfill the high priest's request, but I don't think I can make that medicine. I sent<font color="LEVEL"> Miki the Cat</font> looking for Moretti's herbs, but I lost contact with him.<br>
-<a action="bypass -h Quest 32_AnObviousLie 30094-1.htm">Should I look for him?</a>
-</body></html>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-1.htm

@@ -1,5 +0,0 @@
-<html><body>Magic Trader Gentler:<br>
-If you can find him for me, I'll give you a great reward.<br>
-Actually,<font color="LEVEL"> Miki the cat</font> gets lost easily, so I got him a map, but he forgot it.<br>
-Last I heard from him he was at the<font color="LEVEL"> entrance to Devil's Isle</font>. He went to get some other herbs, and hasn't been back. If you see him, give him this map and bring me the herbs!
-</body></html>

+ 0 - 6
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-13.htm

@@ -1,6 +0,0 @@
-<html><body>Magic Trader Gentler:<br>
-Be patient! Still don't trust me? What kind of shape do you want? Please pick one.<br>
-<a action="bypass -h Quest 32_AnObviousLie cat">Cat's Ear.</a><br>
-<a action="bypass -h Quest 32_AnObviousLie racoon">Raccoon's Ear</a><br>
-<a action="bypass -h Quest 32_AnObviousLie rabbit">Rabbit's Ear</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-3.htm

@@ -1,4 +0,0 @@
-<html><body>Magic Trader Gentler:<br>
-You found him? I was right! I was wandering about. May I have the herbs?<br>
-<a action="bypass -h Quest 32_AnObviousLie 30094-4.htm">Here are the herbs.</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-4.htm

@@ -1,4 +0,0 @@
-<html><body>Trader Gentler:<br>
-Thank you. Now I can make the medicine. First grind this herb into a fine powder. Then, I need to add some spirit ore powder.<br>
-Rats! I don't have any spirit ore left. I'm sorry. Can you get<font color="LEVEL"> 500 spirit ore</font> for me? If I don't grind it in soon, the medicine will lose potency. Can you help?
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-5.htm

@@ -1,3 +0,0 @@
-<html><body>Trader Gentler:<br>
-If you don't bring the ore quickly, I'll lose the medicine. You'll have to pay for my loss! Go!
-</body></html>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-6.htm

@@ -1,5 +0,0 @@
-<html><body>Trader Gentler:<br>
-Good, your brought back 500 spirit ore. Let me finish here.<br>
-Let me have the ore.<br>
-<a action="bypass -h Quest 32_AnObviousLie 30094-7.htm">Here it is.</a>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-8.htm

@@ -1,3 +0,0 @@
-<html><body>Trader Gentler:<br>
-The contract says<font color="LEVEL"> Miki the Cat</font> should pay for any additional expenses. Bother him, not me!
-</body></html>

+ 0 - 6
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-9.htm

@@ -1,6 +0,0 @@
-<html><body>Trader Gentler:<br>
-What can I do for you? I think I told you to visit Miki the Cat.<br>
-Hmm. Did you meet him? Then, why did you come to me?<br>
-Oh! You're smarter than I thought. I have to agree with that. However, I have no Adena to pay with.<br>
-<a action="bypass -h Quest 32_AnObviousLie 30094-10.htm">Are you cheating me again?</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-0a.htm

@@ -1,4 +0,0 @@
-<html><body>High Priest Maximilian:<br>
-By the grace of Einhasad, you're here! Would you help me?<br>
-<font color="LEVEL">(Quest for characters level 45 and above)</font>
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-1.htm

@@ -1,3 +0,0 @@
-<html><body>High Priest Maximilian:<br>
-I asked<font color="LEVEL"> Trader Gentler</font> of Giran Castle Town to mix a batch of medicine for me, but he's having trouble acquiring some key ingredients. Help him find them.
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-2.htm

@@ -1,3 +0,0 @@
-<html><body>High Priest Maximilian:<br>
-Talk to<font color="LEVEL"> Trader Gentler</font> of Giran Castle Town for more information.
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-2.htm

@@ -1,3 +0,0 @@
-<html><body>Miki the Cat:<br>
-Meow~! You can find the herb in the stomachs of alligators on<font color="LEVEL"> Alligator Island</font>. Meow~! Gentler needs 20 of them. Meow~!
-</body></html>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-3.htm

@@ -1,3 +0,0 @@
-<html><body>Miki the Cat:<br>What now? Meow~!<br>
-<a action="bypass -h Quest 32_AnObviousLie 31706-4.htm">I want payment for the runestones!</a>
-</body></html>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-4.htm

@@ -1,5 +0,0 @@
-<html><body>Miki the Cat:<br>
-What are you talking about?<br>
-Are you saying<font color="LEVEL"> Gentler</font> told you to get the payment for the runestone from me? I never signed such a contract! Our agreement was that I would bring the herbs on time and he would pay me for them.<br>
-He probably thought he wouldn't see me again because I wander about so much. Go back to<font color="LEVEL"> Gentler</font> and get the reward from him!
-</body></html>

+ 0 - 164
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/__init__.py

@@ -1,164 +0,0 @@
-# Made by disKret
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "32_AnObviousLie"
-
-#NPC
-MAXIMILIAN = 30120
-GENTLER = 30094
-MIKI_THE_CAT = 31706
-
-#MOBS
-ALLIGATOR = 20135
-
-#CHANCE FOR DROP
-CHANCE_FOR_DROP = 30
-
-#ITEMS
-MAP = 7165
-MEDICINAL_HERB = 7166
-SPIRIT_ORES = 3031
-THREAD = 1868
-SUEDE = 1866
-
-#REWARDS
-RACCOON_EAR = 7680
-CAT_EAR = 6843
-RABBIT_EAR = 7683
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [MEDICINAL_HERB, MAP]
-
- def onEvent (self,event,st) :
-   htmltext = event
-   if event == "30120-1.htm" :
-     st.set("cond","1")
-     st.setState(State.STARTED)
-     st.playSound("ItemSound.quest_accept")
-   elif event == "30094-1.htm" :
-     st.giveItems(MAP,1)
-     st.set("cond","2")
-   elif event == "31706-1.htm" :
-     st.takeItems(MAP,1)
-     st.set("cond","3")
-   elif event == "30094-4.htm" :
-     if st.getQuestItemsCount(MEDICINAL_HERB) > 19 :
-       st.takeItems(MEDICINAL_HERB,20)
-       st.set("cond","5")
-     else:
-       htmltext="You don't have enough materials"
-       st.set("cond","3")
-   elif event == "30094-7.htm" :
-     if st.getQuestItemsCount(SPIRIT_ORES) >= 500:
-       st.takeItems(SPIRIT_ORES,500)
-       st.set("cond","6")
-     else:
-       htmltext="Youn don't have enough materials"
-   elif event == "31706-4.htm" :
-     st.set("cond","7")
-   elif event == "30094-10.htm" :
-     st.set("cond","8")
-   elif event == "30094-13.htm" :
-     if st.getQuestItemsCount(THREAD) >= 1000 and st.getQuestItemsCount(SUEDE) >= 500 :
-       st.takeItems(THREAD,1000)
-       st.takeItems(SUEDE,500)
-     else:
-       htmltext="You don't have enough materials"
-   elif event in ["cat","racoon","rabbit"] :
-     if st.getInt("cond") == 8 :
-       if event == "cat" :
-         item=CAT_EAR
-       elif event == "racoon":
-         item=RACCOON_EAR
-       elif event=="rabbit":
-         item=RABBIT_EAR
-       st.giveItems(item,1)
-       st.exitQuest(False)
-       st.unset("cond")
-       st.playSound("ItemSound.quest_finish")
-       htmltext = "30094-14.htm"
-     else :
-       htmltext="???"
-   return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   npcId = npc.getId()
-   id = st.getState()
-   cond=st.getInt("cond")
-   if id == State.COMPLETED :
-       htmltext = Quest.getAlreadyCompletedMsg(player)
-   elif npcId == MAXIMILIAN :
-     if id == State.CREATED :
-       if player.getLevel() >= 45 :
-         htmltext = "30120-0.htm"
-       else:
-         htmltext = "30120-0a.htm"
-         st.exitQuest(1)
-     elif cond == 1 :
-       htmltext = "30120-2.htm"
-   elif id == State.STARTED :    
-       if npcId == GENTLER :
-         if cond == 1 :
-           htmltext = "30094-0.htm"
-         elif cond == 2 :
-           htmltext = "30094-2.htm"
-         elif cond == 4 :
-           htmltext = "30094-3.htm"
-         elif cond == 5 and st.getQuestItemsCount(SPIRIT_ORES) < 500 :
-           htmltext = "30094-5.htm"
-         elif cond == 5 and st.getQuestItemsCount(SPIRIT_ORES) >= 500 :
-           htmltext = "30094-6.htm"
-         elif cond == 6 :
-           htmltext = "30094-8.htm"
-         elif cond == 7 :
-           htmltext = "30094-9.htm"
-         elif cond == 8 and (st.getQuestItemsCount(THREAD) < 1000 or st.getQuestItemsCount(SUEDE) < 500) :
-           htmltext = "30094-11.htm"
-         elif cond == 8 and st.getQuestItemsCount(THREAD) >= 1000 and st.getQuestItemsCount(SUEDE) >= 500 :
-           htmltext = "30094-12.htm"
-       if npcId == MIKI_THE_CAT :
-         if cond == 2 :
-           htmltext = "31706-0.htm"
-         elif cond == 3 :
-           htmltext = "31706-2.htm"
-         elif cond == 6 :
-           htmltext = "31706-3.htm"
-         elif cond == 7 :
-           htmltext = "31706-5.htm"
-   return htmltext
-
- def onKill(self,npc,player,isPet):
-   st = player.getQuestState(qn)
-   if not st : return
-   if st.getState()!=State.STARTED : return
-   
-   chance = self.getRandom(100)
-   count = st.getQuestItemsCount(MEDICINAL_HERB)
-   if chance < CHANCE_FOR_DROP and st.getInt("cond")== 3 :
-     if count < 20 :
-       st.giveItems(MEDICINAL_HERB,1)
-       if count == 19 :
-         st.playSound("ItemSound.quest_middle")
-         st.set("cond","4")
-       else:
-         st.playSound("ItemSound.quest_itemget")
-   return
-
-QUEST       = Quest(32,qn,"An Obvious Lie")
-
-QUEST.addStartNpc(MAXIMILIAN)
-QUEST.addTalkId(MAXIMILIAN)
-
-QUEST.addTalkId(GENTLER)
-QUEST.addTalkId(MIKI_THE_CAT)
-QUEST.addKillId(ALLIGATOR)

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-04a.htm

@@ -1,5 +0,0 @@
-<html><body>Helvetia:<br>
-Did you have to catch the fish yourself?! Why did it take so long?<br>
-Please give me the chest of fish right away -- my customer will be here soon!<br>
-<a action="bypass -h Quest 40_ASpecialOrder 30081-05a.htm">"Hand over the chest of fish."</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30511-01.htm

@@ -1,4 +0,0 @@
-<html><body>Warehouse Chief Gesto:<br>
-Why are you here?<br>
-<a action="bypass -h Quest 40_ASpecialOrder 30511-02.htm">"I came to get the seed jar Miss Helvetia ordered."</a>
-</body></html>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/31572-01.htm

@@ -1,4 +0,0 @@
-<html><body>O'Fulle:<br>
-What brought you here?<br>
-<a action="bypass -h Quest 40_ASpecialOrder 31572-02.htm">"I'm here to receive a chest of fish that Helvetia ordered."</a>
-</body></html>

+ 0 - 122
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/__init__.py

@@ -1,122 +0,0 @@
-# Made by L2Emu Team
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-from com.l2jserver.util import Rnd
-
-qn = "40_ASpecialOrder"
-
-# NPC
-HELVETIA = 30081
-OFULLE = 31572
-GESTO = 30511
-
-# Items
-OrangeNimbleFish,OrangeUglyFish,OrangeFatFish,FishChest = 6450,6451,6452,12764
-GoldenCobol,ThornCobol,GreatCobol,SeedJar = 5079,5082,5084,12765
-WondrousCubic = 10632
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): 
-    JQuest.__init__(self,id,name,descr)
-    self.questItemIds = [12764,12765]
-
- def onEvent (self,event,st) :
-    htmltext = event
-    if event == "30081-02.htm" :
-      st.set("cond","1")
-      condition = Rnd.get(1,2)
-      if condition == 1 :
-        st.set("cond","2")
-        htmltext = "30081-02a.htm"
-      else :
-        st.set("cond","5")
-        htmltext = "30081-02b.htm"
-      st.setState(State.STARTED)
-      st.playSound("ItemSound.quest_accept")
-    elif event == "30511-03.htm" :
-      st.set("cond","6")
-      st.playSound("ItemSound.quest_middle")
-    elif event == "31572-03.htm" :
-      st.set("cond","3")
-      st.playSound("ItemSound.quest_middle")
-    elif event == "30081-05a.htm" :
-      st.takeItems(FishChest,1)
-      st.giveItems(WondrousCubic,1)
-      st.playSound("ItemSound.quest_finish")
-      st.exitQuest(False)
-    elif event == "30081-05b.htm" :
-      st.takeItems(SeedJar,1)
-      st.giveItems(WondrousCubic,1)
-      st.playSound("ItemSound.quest_finish")
-      st.exitQuest(False)
-    return htmltext
-
- def onTalk (self,npc,player) :
-    htmltext = Quest.getNoQuestMsg(player)
-    st = player.getQuestState(qn)
-    if not st : return htmltext
-
-    npcId = npc.getId()
-    id = st.getState()
-    cond = st.getInt("cond")
-    if id == State.COMPLETED :
-      htmltext = Quest.getAlreadyCompletedMsg(player)
-    elif npcId == HELVETIA :
-      if cond == 0 :
-        if player.getLevel() >= 40 :
-          htmltext = "30081-01.htm"
-        else :
-          htmltext = "30081-00.htm"
-          st.exitQuest(1)
-      elif cond == 2 or cond == 3 :
-        htmltext = "30081-03a.htm"
-      elif cond == 4 :
-        htmltext = "30081-04a.htm"
-      elif cond == 5 or cond == 6 :
-        htmltext = "30081-03b.htm"
-      elif cond == 7 :
-        htmltext = "30081-04b.htm"
-    elif npcId == OFULLE :
-      if cond == 2 :
-        htmltext = "31572-01.htm"
-      elif cond == 3 :
-        if st.getQuestItemsCount(OrangeNimbleFish) >= 10 and st.getQuestItemsCount(OrangeUglyFish) >= 10 and st.getQuestItemsCount(OrangeFatFish) >= 10 :
-          st.set("cond","4")
-          st.takeItems(OrangeNimbleFish,10)
-          st.takeItems(OrangeUglyFish,10)
-          st.takeItems(OrangeFatFish,10)
-          st.playSound("ItemSound.quest_middle")
-          st.giveItems(FishChest,1)
-          htmltext = "31572-04.htm"
-        else :
-          htmltext = "31572-05.htm"
-      elif cond == 4 :
-        htmltext = "31572-06.htm"
-    elif npcId == GESTO :
-      if cond == 5 :
-        htmltext = "30511-01.htm"
-      elif cond == 6 :
-        if st.getQuestItemsCount(GoldenCobol) >= 40 and st.getQuestItemsCount(ThornCobol) >= 40 and st.getQuestItemsCount(GreatCobol) >= 40 :
-          st.set("cond","7")
-          st.takeItems(GoldenCobol,40)
-          st.takeItems(ThornCobol,40)
-          st.takeItems(GreatCobol,40)
-          st.playSound("ItemSound.quest_middle")
-          st.giveItems(SeedJar,1)
-          htmltext = "30511-04.htm"
-        else :
-          htmltext = "30511-05.htm"
-      elif cond == 7 :
-        htmltext = "30511-06.htm"
-    return htmltext
-
-QUEST = Quest(40,qn,"A Special Order")
-
-QUEST.addStartNpc(HELVETIA)
-
-QUEST.addTalkId(HELVETIA)
-QUEST.addTalkId(OFULLE)
-QUEST.addTalkId(GESTO)

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-01.htm

@@ -0,0 +1,4 @@
+<html><body>Mercenary Supplier Abercrombie:<br>
+The person we sent to investigate the ancient monument is missing. Can you help us find him?<br>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31555-02.html">Quest</a>
+</body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-02.html

@@ -1,4 +1,4 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
+<html><body>Mercenary Supplier Abercrombie:<br>
 Rangers reported that Krorin went missing somewhere in the Swamp of Screams. Look for him there. If he is dead find his diary. It might hold a clue about the ancient monuments hidden there.<br>
-The swamp is a dangerous place, but i'm sure you can handle it. Good luck!
+The swamp is a dangerous place, but I'm sure you can handle it. Good luck!
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-0a.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-03.htm

@@ -1,4 +1,4 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
+<html><body>Mercenary Supplier Abercrombie:<br>
 The Swamp of Screams is very dangerous. This is too difficult a mission for you.<br>
 (This quest may only be undertaken by a character level 66 or above.)
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-3.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-04.html

@@ -1,4 +1,4 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
+<html><body>Mercenary Supplier Abercrombie:<br>
 He was a good guild member, he will be missed. Captain Pierce thinks this could be why the Golden Ram are here. Would you complete his research so his death is not in vain?<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31555-4.htm">"I'll help."</a>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31555-05.html">"I'll help."</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-4.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-05.html

@@ -1,4 +1,4 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
+<html><body>Mercenary Supplier Abercrombie:<br>
 Krorin's diary tells of four ancient monuments scattered in the swamp.<br>
 Priests of the Elmoreden Empire used them for astronomical observation.<br>
 He must have found the first monument! I'll mark it on your Map. Deciphering the ancient hieroglyphs on it will lead you to the next one.

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-06.html

@@ -0,0 +1,4 @@
+<html><body>Mercenary Supplier Abercrombie:<br>
+According to Krorin's journal, there should be four monuments left behind by the people of the ancient empire. They must be scattered around the swamp... <br>
+I've heard that the monuments were used as datum points for making astronomical observations. It seems that Krorin had located the first monument, so you'll want to follow the route marked in his journal. Beyond that, Krorin writes that there are strange characters drawn on the monuments which you must decypher in order to learn the location of the next monument. Those ancient people and their puzzles! Good luck! 
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-07.html

@@ -0,0 +1,4 @@
+<html><body>Mercenary Supplier Abercrombie:<br>
+You've returned! Did you find the monuments?<br>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31555-08.html">"I found all four"</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31555-7.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31555-08.html

@@ -1,4 +1,4 @@
-<html><body>Mercenary Supplier Abercrombie :<br>
+<html><body>Mercenary Supplier Abercrombie:<br>
 Very good! With help like yours, we'd be done with this swamp in no time. So they are related to astronomy. Krorin would be proud of you.<br>
 Please take this as a small token of my thanks, I'd have something better for you if I weren't stuck in this swamp!
 </body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31661-01.html

@@ -0,0 +1,4 @@
+<html><body>Forgotten Monument:<br>
+An ancient stone monument. Scrape away the mud and you'll find mysterious hieroglyphs and diagrams.<br>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31661-02.html">Examine the markings closely.</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31661-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31661-02.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 All signs seem to reveal that the diagrams carved on the monument are a Map to the second monument, located somewhere in the Marshland.
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31661-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31661-03.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 The diagrams are a Map to the second monument, somewhere in the swamp.
 </body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31662-01.html

@@ -0,0 +1,4 @@
+<html><body>Forgotten Monument:<br>
+An ancient monument made in the same style as the monument that was discovered first. You find hieroglyphic characters and diagrams inscribed on the surface after cleaning off the mud.<br>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31662-02.html">Analyze the diagrams.</a>
+</body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31662-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31662-02.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
-The lines' intersection may be the location of the third monument. After comparing it to the Map, you've discovered its approximate location
+<html><body>Forgotten Monument:<br>
+The lines' intersection may be the location of the third monument. After comparing it to the Map, you've discovered its approximate location.
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31662-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31662-03.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 It seems to be a Map to a third monument, somewhere in the Swamp of Screams.
 </body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31663-01.html

@@ -0,0 +1,4 @@
+<html><body>Forgotten Monument:<br>
+Much cleaner and better preserved than the previous monuments. It's covered in strange hieroglyphs and diagrams.<br>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31663-02.html">Examine the markings.</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31663-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31663-02.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 Further analysis is futile. Only the discovery of the fourth monument remains.
 </body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31663-03.html

@@ -0,0 +1,3 @@
+<html><body>Forgotten Monument:<br>
+The fourth monument seems to be in the most dangerous part of the Swamp of Screams.
+</body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31664-0.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31664-01.html

@@ -1,4 +1,4 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 Like the previous monuments, an ancient Map is inscribed in the fourth monument. After cleaning it off you recognize the markings.<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31664-1.htm">Examine the markings closely</a>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31664-02.html">Examine the markings closely.</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31664-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31664-02.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 The Map seems to indicate that the monuments in this area were built to track the moon. The four monuments indicate the positions of the moon on the fall and spring equinoxes, and the summer and winter solstices. There are no more forgotten monuments in this area.
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31664-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31664-03.html

@@ -1,3 +1,3 @@
-<html><body>Forgotten Monument :<br>
+<html><body>Forgotten Monument:<br>
 Further analysis is futile.
 </body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31665-0.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31665-01.html

@@ -1,4 +1,4 @@
-<html><body>Corpse of Dwarf :<br>
+<html><body>Corpse of Dwarf:<br>
 The corpse of a male Dwarf, presumedly that of Researcher Krorin. Aparently he lost his life after being poisoned by a highly toxic substance he was exposed to in the swampland.<br>
-<a action="bypass -h Quest 31_SecretBuriedInTheSwamp 31665-1.htm">Examine the corpse</a>
+<a action="bypass -h Quest Q00031_SecretBuriedInTheSwamp 31665-02.html">Examine the corpse.</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31665-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31665-02.html

@@ -1,3 +1,3 @@
-<html><body>Corpse of Dwarf :<br>
+<html><body>Corpse of Dwarf:<br>
 When you open the backpack that is still on the corpse, you find a waterproof lambskin-covered book. Various memos are written in it, and on one page you find a sloppily drawn Map that seems to be of the Swamp of Screams. Could this be the log mentioned by Mercenary Supplier Abercrombie?
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/31_SecretBuriedInTheSwamp/31665-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/31665-03.html

@@ -1,3 +1,3 @@
-<html><body>Corpse of Dwarf :<br>
+<html><body>Corpse of Dwarf:<br>
 There's nothing else.
 </body></html>

+ 226 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java

@@ -0,0 +1,226 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00031_SecretBuriedInTheSwamp;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Secret Buried in the Swamp (31)
+ * @author janiko
+ */
+public final class Q00031_SecretBuriedInTheSwamp extends Quest
+{
+	// NPCs
+	private static final int ABERCROMBIE = 31555;
+	private static final int FORGOTTEN_MONUMENT_1 = 31661;
+	private static final int FORGOTTEN_MONUMENT_2 = 31662;
+	private static final int FORGOTTEN_MONUMENT_3 = 31663;
+	private static final int FORGOTTEN_MONUMENT_4 = 31664;
+	private static final int CORPSE_OF_DWARF = 31665;
+	// Items
+	private static final int KRORINS_JOURNAL = 7252;
+	// Misc
+	private static final int MIN_LVL = 66;
+	// Monuments
+	private static final List<Integer> MONUMENTS = Arrays.asList(FORGOTTEN_MONUMENT_1, FORGOTTEN_MONUMENT_2, FORGOTTEN_MONUMENT_3, FORGOTTEN_MONUMENT_4);
+	
+	private Q00031_SecretBuriedInTheSwamp(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(ABERCROMBIE);
+		addTalkId(ABERCROMBIE, CORPSE_OF_DWARF);
+		addTalkId(MONUMENTS);
+		registerQuestItems(KRORINS_JOURNAL);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		String htmltext = null;
+		if (st == null)
+		{
+			return htmltext;
+		}
+		
+		switch (event)
+		{
+			case "31555-02.html":
+			{
+				if (st.isCreated())
+				{
+					st.startQuest();
+					htmltext = event;
+				}
+				break;
+			}
+			case "31665-02.html":
+			{
+				if (st.isCond(1))
+				{
+					st.setCond(2, true);
+					st.giveItems(KRORINS_JOURNAL, 1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "31555-05.html":
+			{
+				if (st.isCond(2) && st.hasQuestItems(KRORINS_JOURNAL))
+				{
+					st.takeItems(KRORINS_JOURNAL, -1);
+					st.setCond(3, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "31661-02.html":
+			case "31662-02.html":
+			case "31663-02.html":
+			case "31664-02.html":
+			{
+				if (MONUMENTS.contains(npc.getId()) && st.isCond(MONUMENTS.indexOf(npc.getId()) + 3))
+				{
+					st.setCond(st.getCond() + 1, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "31555-08.html":
+			{
+				if (st.isCond(7))
+				{
+					st.addExpAndSp(490000, 45880);
+					st.giveAdena(120000, true);
+					st.exitQuest(false, true);
+					htmltext = event;
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		String htmltext = getNoQuestMsg(player);
+		if (st == null)
+		{
+			return htmltext;
+		}
+		switch (npc.getId())
+		{
+			case ABERCROMBIE:
+			{
+				switch (st.getState())
+				{
+					case State.CREATED:
+					{
+						htmltext = (player.getLevel() >= MIN_LVL) ? "31555-01.htm" : "31555-03.htm";
+						break;
+					}
+					case State.STARTED:
+					{
+						switch (st.getCond())
+						{
+							case 1:
+							{
+								htmltext = "31555-02.html";
+								break;
+							}
+							case 2:
+							{
+								if (st.hasQuestItems(KRORINS_JOURNAL))
+								{
+									htmltext = "31555-04.html";
+								}
+								break;
+							}
+							case 3:
+							{
+								htmltext = "31555-06.html";
+								break;
+							}
+							case 7:
+							{
+								htmltext = "31555-07.html";
+								break;
+							}
+						}
+						break;
+					}
+					case State.COMPLETED:
+					{
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+					}
+				}
+				break;
+			}
+			case CORPSE_OF_DWARF:
+			{
+				switch (st.getCond())
+				{
+					case 1:
+					{
+						htmltext = "31665-01.html";
+						break;
+					}
+					case 2:
+					{
+						htmltext = "31665-03.html";
+						break;
+					}
+				}
+				break;
+			}
+			case FORGOTTEN_MONUMENT_1:
+			case FORGOTTEN_MONUMENT_2:
+			case FORGOTTEN_MONUMENT_3:
+			case FORGOTTEN_MONUMENT_4:
+			{
+				final int loc = MONUMENTS.indexOf(npc.getId()) + 3;
+				if (st.isCond(loc))
+				{
+					htmltext = npc.getId() + "-01.html";
+				}
+				else if (st.isCond(loc + 1))
+				{
+					htmltext = npc.getId() + "-03.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00031_SecretBuriedInTheSwamp(31, Q00031_SecretBuriedInTheSwamp.class.getSimpleName(), "Secret Buried in the Swamp");
+	}
+}

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-01.html

@@ -0,0 +1,5 @@
+<html><body>Magic Trader Gentler:<br>
+Welcome. What can I do for you?<br>
+Ah yes, I'd love to fulfill the high priest's request, but I don't think I can make that medicine. I sent <font color="LEVEL">Miki the Cat</font> looking for Moretti's Herbs, but I lost contact with him.<br>
+<a action="bypass -h Quest Q00032_AnObviousLie 30094-02.html">"Should I look for him?"</a>
+</body></html>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-02.html

@@ -0,0 +1,5 @@
+<html><body>Magic Trader Gentler:<br>
+If you can find him for me, I'll give you a great reward.<br>
+Actually, <font color="LEVEL">Miki the Cat</font> gets lost easily, so I got him a Map, but he forgot it.<br>
+Last I heard from him he was at the <font color="LEVEL">entrance to Devil's Isle</font>. He went to get some other herbs, and hasn't been back. If you see him, give him this Map and bring me the herbs!
+</body></html>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-2.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-03.html

@@ -1,3 +1,3 @@
-<html><body>Magic Trader Gentler:<br>
-You forgot where the last message came from, didn't you? Miki the Cat was last seen at the<font color="LEVEL"> entrance to Devil's Isle</font>. Start your search there! Good luck!
+<html><body>Trader Gentler:<br>
+You forgot where the last message came from, didn't you? Miki the Cat was last seen at the <font color="LEVEL">entrance of Devil's Isle</font>. Start your search there! Good luck!
 </body></html>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-04.html

@@ -0,0 +1,5 @@
+<html><body>Magic Trader Gentler:<br>
+You found him?<br>
+I was right! He was wandering about. May I have the herbs?<br>
+<a action="bypass -h Quest Q00032_AnObviousLie 30094-06.html">"Here are the herbs."</a>
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-05.html

@@ -0,0 +1,4 @@
+<html><body>Magic Trader Gentler:<br>
+You found Miki the Cat but lost the herbs?<br>
+Can you hunt an <font color="LEVEL">alligator from Alligator Island</font>, obtain the herbs and bring them back to me?
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-06.html

@@ -0,0 +1,4 @@
+<html><body>Trader Gentler:<br>
+Thank you. Now I can make the medicine. First grind this herb into a fine powder. Then, I need to add some Spirit Ore powder.<br>
+Rats! I don't have any Spirit Ore left. I'm sorry. Can you get <font color="LEVEL">500 Spirit Ore</font> for me? If I don't grind it in soon, the medicine will lose potency. Can you help?
+</body></html>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-07.html

@@ -0,0 +1,5 @@
+<html><body>Magic Trader Gentler:<br>
+Good, you brought back 500 Spirit Ore. Let me finish here.<br>
+Let me have the ore.<br>
+<a action="bypass -h Quest Q00032_AnObviousLie 30094-09.html">"Here it is."</a>
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-08.html

@@ -0,0 +1,3 @@
+<html><body>Magic Trader Gentler:<br>
+If you don't bring the Spirit Ore quickly, I'll lose the medicine. You'll have to pay for my loss! Go!
+</body></html>

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-7.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-09.html

@@ -1,6 +1,5 @@
 <html><body>Trader Gentler:<br>
-You finally finished, huh?<br>
 What are you still doing here?<br>
 You want payment?<br>
-You should talk to<font color="LEVEL"> Miki the cat</font> about your payment. It's not my responsibility! By the terms of the contract, he's responsible for all additional costs due to any delay in delivery!
+You should talk to <font color="LEVEL">Miki the Cat</font> about your payment. It's not my responsibility! By the terms of the Contract, he's responsible for all additional costs due to any delay in delivery!
 </body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-10.html

@@ -0,0 +1,3 @@
+<html><body>Magic Trader Gentler:<br>
+The Contract says <font color="LEVEL">Miki the Cat</font> should pay for any additional expenses. Bother him, not me!
+</body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-11.html

@@ -0,0 +1,6 @@
+<html><body>Trader Gentler:<br>
+What can I do for you?  I think I told you to visit Miki the Cat.<br>
+Hmm.. Did you meet him? Then, why did you come to me?<br>
+Oh! You're smarter than I thought. I have to agree with that. However, I have no Adena to pay with.<br>
+<a action="bypass -h Quest Q00032_AnObviousLie 30094-12.html">Are you cheating me again?</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-10.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-12.html

@@ -1,4 +1,4 @@
 <html><body>Magic Trader Gentler:<br>
 I'm not lying! Call the guards, you still won't get any.<br>
-I'll make you a very valuable ornament instead. Just find the raw materials. I'll need<font color="LEVEL"> 1000 threads and 500 suedes</font>. I have the rest. You can't find this just anywhere, it fetches a high price!
+I'll make you a very valuable ornament instead. Just find the raw materials. I'll need <font color="LEVEL">1000 thread and 500 Suede</font>. I have the rest. You can't find this just anywhere, it fetches a high price!
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-12.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-13.html

@@ -1,5 +1,5 @@
 <html><body>Magic Trader Gentler:<br>
 Now let me have them.<br>
 Still don't trust me? It'll be worth it! What'll it be?<br>
-<a action="bypass -h Quest 32_AnObviousLie 30094-13.htm">Take them! But don't trick me again, or else!</a>
+<a action="bypass -h Quest Q00032_AnObviousLie 30094-15.html">"Take them! But don't trick me again, or else!"</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-11.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-14.html

@@ -1,3 +1,3 @@
 <html><body>Magic Trader Gentler:<br>
-I requested 1000 threads and 500 suedes.
+I requested 1000 threads and 500 Suedes.
 </body></html>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-15.html

@@ -0,0 +1,6 @@
+<html><body>Trader Gentler:<br>
+Be patient! Still don't trust me? What kind of shape do you want? Please pick one.<br>
+<a action="bypass -h Quest Q00032_AnObviousLie cat">Cat's Ear</a><br>
+<a action="bypass -h Quest Q00032_AnObviousLie raccoon">Raccoon's Ear</a><br>
+<a action="bypass -h Quest Q00032_AnObviousLie rabbit"> Rabbit's Ear</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30094-14.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-16.html

@@ -1,3 +1,3 @@
-<html><body>Magic Trader Gentler:<br>
+<html><body>Trader Gentler:<br>
 I made this accessory to redeem my debts. They have now been paid. Goodbye.
 </body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30094-17.html

@@ -0,0 +1,3 @@
+<html><body>Trader Gentler:<br>
+I'm not that gullible. This isn't 1000 threads and 500 Suedes!
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/30120-0.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-01.htm

@@ -1,4 +1,4 @@
 <html><body>High Priest Maximilian:<br>
 By the grace of Einhasad, you're here! Would you help me?<br>
-<a action="bypass -h Quest 32_AnObviousLie 30120-1.htm">What can I do?</a>
+<a action="bypass -h Quest Q00032_AnObviousLie 30120-02.html">"What can I do?"</a>
 </body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-02.html

@@ -0,0 +1,3 @@
+<html><body>High Priest Maximilian:<br>
+I asked <font color="LEVEL">Trader Gentler</font> of the Town of Giran to mix a batch of medicine for me, but he's having trouble acquiring some key ingredients. Help him find them.
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-03.htm

@@ -0,0 +1,4 @@
+<html><body>High Priest Maximilian:<br>
+Nice to meet you, traveler. The grace of Einhasad has brought you here! I'm sorry you had to come here for nothing.<br>
+(Only characters of level 45 or above may undertake this quest.)
+</body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/30120-04.html

@@ -0,0 +1,3 @@
+<html><body>High Priest Maximilian:<br>
+Talk to <font color="LEVEL">Trader Gentler</font> of the Town of Giran for more information.
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-0.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-01.html

@@ -1,4 +1,4 @@
 <html><body>Miki the Cat:<br>
 Meow~! Did Gentler send anything with you? Oh, I'm late! Meow~!<br>
-<a action="bypass -h Quest 32_AnObviousLie 31706-1.htm">Here's the map.</a>
+<a action="bypass -h Quest Q00032_AnObviousLie 31706-02.html">"Here's the Map."</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-1.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-02.html

@@ -1,3 +1,3 @@
 <html><body>Miki the Cat:<br>
-He did send me the map! Meow~! Thank you for delivering it. I don't have any Moretti's herb for him, I lost it while wandering around. I'll tell you where to get some, though. Will you get it for me? I'm sure Gentler will give you a proper reward. You can get them from<font color="LEVEL"> alligators on Alligator Island</font>. They eat the herbs for digestion. Hunt alligators, get 20 herbs and go straight to Gentler when you're done.
+He did send me the Map! Meow~! Thank you for delivering it. I don't have any Moretti's Herb for him, I lost it while wandering around. I'll tell you where to get some, though. Will you get it for me? I'm sure Gentler will give you a proper reward. You can get them from <font color="LEVEL">alligators on Alligator Island</font>. They eat the herbs for digestion. Hunt alligators, get 20 herbs and go straight to Gentler when you're done.
 </body></html>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-03.html

@@ -0,0 +1,3 @@
+<html><body>Miki the Cat:<br>
+Meow~! You can find the herb in the stomachs of alligators on <font color="LEVEL">Alligator Island</font>. Meow~! Gentler needs 20 of them. Meow~!
+</body></html>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-04.html

@@ -0,0 +1,4 @@
+<html><body>Miki the Cat:<br>
+What now? Meow~!<br>
+<a action="bypass -h Quest Q00032_AnObviousLie 31706-05.html">"I'd like my payment now."</a>
+</body></html>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-05.html

@@ -0,0 +1,5 @@
+<html><body>Miki the Cat:<br>
+What are you talking about?<br>
+Are you saying <font color="LEVEL">Gentler</font> told you to get the payment for the Spirit Ore from me? I never signed such a Contract! Our agreement was that I would bring the herbs on time and he would pay for them.<br>
+He probably thought he wouldn't see me again because I wander about so much. Go back to <font color="LEVEL">Gentler</font> and get the reward from him!
+</body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/32_AnObviousLie/31706-5.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/31706-06.html


+ 344 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java

@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00032_AnObviousLie;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * An Obvious Lie (32)
+ * @author janiko
+ */
+public class Q00032_AnObviousLie extends Quest
+{
+	// NPCs
+	private static final int MAXIMILIAN = 30120;
+	private static final int GENTLER = 30094;
+	private static final int MIKI_THE_CAT = 31706;
+	// Monster
+	private static final int ALLIGATOR = 20135;
+	// Items
+	private static final int MAP_OF_GENTLER = 7165;
+	private static final int MEDICINAL_HERB = 7166;
+	private static final int SPIRIT_ORE = 3031;
+	private static final int THREAD = 1868;
+	private static final int SUEDE = 1866;
+	// Misc
+	private static final int MIN_LVL = 45;
+	private static final int REQUIRED_HERB_COUNT = 20;
+	// Reward
+	private static final int RACCOON_EAR = 7680;
+	private static final int CAT_EAR = 6843;
+	private static final int RABBIT_EAR = 7683;
+	
+	private Q00032_AnObviousLie(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(MAXIMILIAN);
+		addTalkId(MAXIMILIAN, GENTLER, MIKI_THE_CAT);
+		addKillId(ALLIGATOR);
+		registerQuestItems(MEDICINAL_HERB, MAP_OF_GENTLER);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		String htmltext = null;
+		if (st == null)
+		{
+			return htmltext;
+		}
+		switch (event)
+		{
+			case "30120-02.html":
+			{
+				if (st.isCreated())
+				{
+					st.startQuest();
+					htmltext = event;
+				}
+				break;
+			}
+			case "30094-02.html":
+			{
+				if (st.isCond(1))
+				{
+					st.setCond(2, true);
+					st.giveItems(MAP_OF_GENTLER, 1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "31706-02.html":
+			{
+				if (st.isCond(2) && st.hasQuestItems(MAP_OF_GENTLER))
+				{
+					st.setCond(3, true);
+					st.takeItems(MAP_OF_GENTLER, 1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30094-06.html":
+			{
+				if (st.isCond(4) && (st.getQuestItemsCount(MEDICINAL_HERB) >= 20))
+				{
+					st.takeItems(MEDICINAL_HERB, 20);
+					st.setCond(5, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30094-09.html":
+			{
+				if (st.isCond(5) && (st.getQuestItemsCount(SPIRIT_ORE) >= 500))
+				{
+					st.takeItems(SPIRIT_ORE, 500);
+					st.setCond(6, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30094-12.html":
+			{
+				if (st.isCond(7))
+				{
+					st.setCond(8, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30094-15.html":
+			{
+				htmltext = event;
+				break;
+			}
+			case "31706-05.html":
+			{
+				if (st.isCond(6))
+				{
+					st.setCond(7, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "cat":
+			case "raccoon":
+			case "rabbit":
+			{
+				if (st.isCond(8) && (st.getQuestItemsCount(THREAD) >= 1000) && (st.getQuestItemsCount(SUEDE) >= 500))
+				{
+					if (event.equals("cat"))
+					{
+						st.giveItems(CAT_EAR, 1);
+					}
+					else if (event.equals("racoon"))
+					{
+						st.giveItems(RACCOON_EAR, 1);
+					}
+					else if (event.equals("rabbit"))
+					{
+						st.giveItems(RABBIT_EAR, 1);
+					}
+					st.exitQuest(false, true);
+					htmltext = "30094-16.html";
+				}
+				else
+				{
+					htmltext = "30094-17.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+	{
+		final List<QuestState> players = new ArrayList<>();
+		QuestState qs = killer.getQuestState(getName());
+		if ((qs != null) && qs.isCond(3))
+		{
+			players.add(qs);
+			players.add(qs);
+		}
+		
+		if (killer.isInParty())
+		{
+			for (L2PcInstance member : killer.getParty().getMembers())
+			{
+				qs = member.getQuestState(getName());
+				if ((qs != null) && qs.isCond(3))
+				{
+					players.add(qs);
+				}
+			}
+		}
+		
+		if (!players.isEmpty())
+		{
+			qs = players.get(getRandom(players.size()));
+			if (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
+			{
+				final long herbCount = qs.getQuestItemsCount(MEDICINAL_HERB);
+				if (herbCount < REQUIRED_HERB_COUNT)
+				{
+					qs.giveItems(MEDICINAL_HERB, 1);
+					if ((herbCount + 1) == REQUIRED_HERB_COUNT)
+					{
+						qs.setCond(4, true);
+					}
+					else
+					{
+						qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+					}
+				}
+			}
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		String htmltext = getNoQuestMsg(player);
+		if (st == null)
+		{
+			return htmltext;
+		}
+		switch (npc.getId())
+		{
+			case MAXIMILIAN:
+			{
+				switch (st.getState())
+				{
+					case State.CREATED:
+					{
+						htmltext = (player.getLevel() >= MIN_LVL) ? "30120-01.htm" : "30120-03.htm";
+						break;
+					}
+					case State.STARTED:
+					{
+						if (st.isCond(1))
+						{
+							htmltext = "30120-04.html";
+						}
+						break;
+					}
+					case State.COMPLETED:
+					{
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+					}
+				}
+				break;
+			}
+			case GENTLER:
+			{
+				switch (st.getCond())
+				{
+					case 1:
+					{
+						htmltext = "30094-01.html";
+						break;
+					}
+					case 2:
+					{
+						htmltext = "30094-03.html";
+						break;
+					}
+					case 4:
+					{
+						htmltext = (st.getQuestItemsCount(MEDICINAL_HERB) >= 20) ? "30094-04.html" : "30094-05.html";
+						break;
+					}
+					case 5:
+					{
+						htmltext = (st.getQuestItemsCount(SPIRIT_ORE) >= 500) ? "30094-07.html" : "30094-08.html";
+						break;
+					}
+					case 6:
+					{
+						htmltext = "30094-10.html";
+						break;
+					}
+					case 7:
+					{
+						htmltext = "30094-11.html";
+						break;
+					}
+					case 8:
+					{
+						htmltext = (st.getQuestItemsCount(THREAD) >= 1000) && (st.getQuestItemsCount(SUEDE) >= 500) ? "30094-13.html" : "30094-14.html";
+						break;
+					}
+				}
+				break;
+			}
+			case MIKI_THE_CAT:
+			{
+				switch (st.getCond())
+				{
+					case 2:
+					{
+						if (st.hasQuestItems(MAP_OF_GENTLER))
+						{
+							htmltext = "31706-01.html";
+						}
+						break;
+					}
+					case 3:
+					case 4:
+					case 5:
+					{
+						htmltext = "31706-03.html";
+						break;
+					}
+					case 6:
+					{
+						htmltext = "31706-04.html";
+						break;
+					}
+					case 7:
+					{
+						htmltext = "31706-06.html";
+						break;
+					}
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00032_AnObviousLie(32, Q00032_AnObviousLie.class.getSimpleName(), "An Obvious Lie");
+	}
+}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-01.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-01.htm

@@ -1,5 +1,5 @@
 <html><body>Helvetia:<br>
 Adventurer, you are not too busy, are you?<br>
 Please help me! I promise that I will give you a generous reward.<br>
-<a action="bypass -h Quest 40_ASpecialOrder 30081-02.htm">"How can I help you?"</a>
+<a action="bypass -h Quest Q00040_ASpecialOrder accept">"How can I help you?"</a>
 </body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-00.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-02.htm


+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-02a.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-03.html


+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-02b.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-04.html


+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-03a.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-05.html


+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-06.html

@@ -0,0 +1,5 @@
+<html><body>Helvetia:<br>
+Did you have to catch the fish yourself?! Why did it take you so long?<br>
+Please give me the chest of fish right away -- my customer will be here soon!<br>
+<a action="bypass -h Quest Q00040_ASpecialOrder 30081-07.html">Hand over the chest of fish.</a>
+</body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-05a.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-07.html


+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-03b.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-08.html


+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-04b.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-09.html

@@ -1,5 +1,5 @@
 <html><body>Helvetia:<br>
 Did you have to gather the seeds yourself?! Why did it take so long?<br>
 Please give me the jar of seeds right away -- my customer will be here any moment.<br>
-<a action="bypass -h Quest 40_ASpecialOrder 30081-05b.htm">"Hand over the jar of seeds."</a>
+<a action="bypass -h Quest Q00040_ASpecialOrder 30081-10.html">Hand over the jar of seeds.</a>
 </body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30081-05b.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30081-10.html


+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-01.html

@@ -0,0 +1,4 @@
+<html><body>Warehouse Chief Gesto:<br>
+Why are you here?<br>
+<a action="bypass -h Quest Q00040_ASpecialOrder 30511-02.html">"I came to get the seed jar Miss Helvetia ordered."</a>
+</body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30511-02.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-02.html

@@ -1,5 +1,5 @@
 <html><body>Warehouse Chief Gesto:<br>
 Seed jar!<br>
 Oh my, I completely forgot about it! It's late! Would you help me? Since you'll have to wait for it anyway, it'll be faster if you help me.<br>
-<a action="bypass -h Quest 40_ASpecialOrder 30511-03.htm">"What can I do for you?"</a>
+<a action="bypass -h Quest Q00040_ASpecialOrder 30511-03.html">"What can I do for you?"</a>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30511-03.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-03.html

@@ -1,3 +1,3 @@
 <html><body>Warehouse Chief Gesto:<br>
-You can bring me some of the seeds she ordered. I need 40 seeds from each of the following: the <font color="LEVEL">Thorn Cobol, Golden Cobol and Great Cobol</font>. Go to the Manor Manager and get the seed. I'm counting on you -- for both our sakes!
+You can bring me some of the crops she ordered. I need 40 crops from each of the following: the <font color="LEVEL">Thorn Cobol, Golden Cobol and Great Cobol</font>. Go to the Manor Manager and get the crops. I'm counting on you -- for both our sakes!
 </body></html>

+ 0 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/40_ASpecialOrder/30511-05.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00040_ASpecialOrder/30511-04.html


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio