Browse Source

...
new quest 23 - Lidias Heart, tnx Skeleton and Eyerobot
TP fixes in/to Pagan Temple
C5 updates for quests 621 & 622 (updated reward NPCs)
update for quest 637 Through the Gate Once More
corrected few minions in Forrest of Dead location
added missing import in quest 21 Hidden Thruth

Kerberos 17 years ago
parent
commit
452a5bb95a
84 changed files with 678 additions and 82 deletions
  1. 1 1
      datapack_development/data/html/teleporter/32035.htm
  2. 1 1
      datapack_development/data/html/teleporter/32037.htm
  3. 1 0
      datapack_development/data/scripts.cfg
  4. 1 1
      datapack_development/data/scripts/quests/21_HiddenTruth/__init__.py
  5. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-00.htm
  6. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-01.htm
  7. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-02.htm
  8. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-03.htm
  9. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-04.htm
  10. 9 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-05.htm
  11. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-06.htm
  12. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-07.htm
  13. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-08.htm
  14. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-09.htm
  15. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-10.htm
  16. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-11.htm
  17. 9 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-12.htm
  18. 10 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-13.htm
  19. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-14.htm
  20. 15 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-15.htm
  21. 10 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-16.htm
  22. 18 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-17.htm
  23. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-18.htm
  24. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-19.htm
  25. 9 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-20.htm
  26. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31328-21.htm
  27. 9 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31386-01.htm
  28. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31386-02.htm
  29. 9 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31386-03.htm
  30. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31386-04.htm
  31. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31523-01.htm
  32. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31523-02.htm
  33. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31523-03.htm
  34. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31523-04.htm
  35. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31523-05.htm
  36. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31523-06.htm
  37. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31524-01.htm
  38. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31524-02.htm
  39. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31524-03.htm
  40. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31524-04.htm
  41. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31524-05.htm
  42. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31524-06.htm
  43. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-00.htm
  44. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-01.htm
  45. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-02.htm
  46. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-03.htm
  47. 8 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-04.htm
  48. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-05.htm
  49. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-06.htm
  50. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-07.htm
  51. 6 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-08.htm
  52. 7 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-09.htm
  53. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-10.htm
  54. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-11.htm
  55. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-12.htm
  56. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31526-13.htm
  57. 5 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31530-01.htm
  58. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31530-02.htm
  59. 4 0
      datapack_development/data/scripts/quests/23_LidiasHeart/31530-03.htm
  60. 177 0
      datapack_development/data/scripts/quests/23_LidiasHeart/__init__.py
  61. 4 4
      datapack_development/data/scripts/quests/621_EggDelivery/31521-2.htm
  62. 3 3
      datapack_development/data/scripts/quests/621_EggDelivery/31521-3.htm
  63. 3 0
      datapack_development/data/scripts/quests/621_EggDelivery/31521-4.htm
  64. 4 0
      datapack_development/data/scripts/quests/621_EggDelivery/31584-1.htm
  65. 4 0
      datapack_development/data/scripts/quests/621_EggDelivery/31584-2.htm
  66. 14 9
      datapack_development/data/scripts/quests/621_EggDelivery/__init__.py
  67. 4 0
      datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-1.htm
  68. 4 0
      datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-2.htm
  69. 5 4
      datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-2.htm
  70. 4 5
      datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-3.htm
  71. 4 0
      datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-4.htm
  72. 14 9
      datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/__init__.py
  73. 2 2
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-01.htm
  74. 4 0
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-01a.htm
  75. 2 1
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-02.htm
  76. 1 2
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-03.htm
  77. 1 1
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-04.htm
  78. 6 0
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-08.htm
  79. 6 0
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-09.htm
  80. 3 0
      datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-10.htm
  81. 6 3
      datapack_development/data/scripts/quests/637_ThroughOnceMore/__init__.py
  82. 2 2
      datapack_development/data/scripts/teleports/1630_PaganTeleporters/FadedMark.htm
  83. 37 19
      datapack_development/data/scripts/teleports/1630_PaganTeleporters/__init__.py
  84. 13 15
      datapack_development/sql/minions.sql

+ 1 - 1
datapack_development/data/html/teleporter/32035.htm

@@ -1,5 +1,5 @@
 <html><body>Temple Gatekeeper:<br>
 <br>
 The skull in the center looks as though it could be pressed.<br><br>
- <a action="bypass -h npc_%objectId%_goto 11999">Press the skull.</a>
+<a action="bypass -h npc_%objectId%_Quest 1630_PaganTeleporters">Press the skull.</a>
 </body></html>

+ 1 - 1
datapack_development/data/html/teleporter/32037.htm

@@ -1,5 +1,5 @@
 <html><body>Temple Gatekeeper:<br>
 <br>
 The skull in the center looks as though it could be pressed.<br><br>
- <a action="bypass -h npc_%objectId%_goto 11998">Press the skull.</a>
+<a action="bypass -h npc_%objectId%_Quest 1630_PaganTeleporters">Press the skull.</a>
 </body></html>

+ 1 - 0
datapack_development/data/scripts.cfg

@@ -114,6 +114,7 @@ quests/19_GoToThePastureland/__init__.py
 quests/20_BringUpWithLove/__init__.py
 quests/21_HiddenTruth/__init__.py
 quests/22_TragedyInVonHellmannForest/__init__.py
+quests/23_LidiasHeart/__init__.py
 quests/27_ChestCaughtWithABaitOfWind/__init__.py
 quests/28_ChestCaughtWithABaitOfIcyAir/__init__.py
 quests/29_ChestCaughtWithABaitOfEarth/__init__.py

+ 1 - 1
datapack_development/data/scripts/quests/21_HiddenTruth/__init__.py

@@ -7,6 +7,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
 from net.sf.l2j.gameserver.model import L2CharPosition
+from net.sf.l2j.gameserver.serverpackets import CreatureSay
 
 qn = "21_HiddenTruth"
 
@@ -46,7 +47,6 @@ class Quest (JQuest) :
             htmltext = "31328-05.htm"
         elif event == "31523-03.htm" :
             st.playSound("SkillSound5.horror_02")
-            st.playSound("ItemSound.quest_middle")
             st.set("cond","2")
             ghost = st.addSpawn(31524,51432,-54570,-3136,1800000)
             ghost.broadcastPacket(CreatureSay(ghost.getObjectId(),0,ghost.getName(),"Who awoke me?"))

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-00.htm

@@ -0,0 +1,7 @@
+<html><head><body>Innocentin:<br>
+This is something you can get started on immediately!<br>
+There's a vast conspiracy afoot in Rune Castle Town and the Forest of the Dead!<br>
+The roots of this conspiracy lie in that forest, and you should seek the truth there.<br>
+(This quest may only be undertaken by a character of level 64 or above who has completed the Hidden Truth and
+Tragedy of Hellmann Forest quests.)
+</body></html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-01.htm

@@ -0,0 +1,5 @@
+<html><head><body>Innocentin:<br>
+You've been a great help to me in the past, and I'd like to thank you again for bringing me that report!
+There's one more thing... Could you help me out again?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-02.htm">"OK, whatever."</a>
+</body></html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-02.htm

@@ -0,0 +1,4 @@
+<html><head><body>Innocentin:<br>
+Here's the Map and key he left behind. Take them and find out what he was searching for.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-03.htm">"Tell me more about the Map and key."</a>
+</body></html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-03.htm

@@ -0,0 +1,5 @@
+<html><head><body>Innocentin:<br>
+He probably drew this Map while exploring the Forest of the Dead. As for the key...
+I'm not sure. The only clue I've found is the Silver Spear engraved upon it.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-05.htm">"Tell me more about the Silver Spear."</a>
+</body></html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-04.htm

@@ -0,0 +1,6 @@
+<html><head><body>Innocentin:<br>
+He probably drew this Map while exploring the Forest of the Dead. As for the key... I'm not sure.
+The only clue I've found is the Silver Spear engraved upon it.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-05.htm">"Tell me more about the Silver Spear."</a>
+</body>
+</html>

+ 9 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-05.htm

@@ -0,0 +1,9 @@
+<html><head><body>Innocentin:<br>
+According to a custom from the Elmoreden period, a Silver Spear was the symbol of the family responsible for guarding
+the royal family.<br>
+An ancient proverb says, <font color="LEVEL">"A jeweled scepter for the mighty King of Elmore and two Silver Spears for
+his protectors"</font>.<br>
+I'll wager that somewhere is a lock that matches this key...<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-06.htm">"Who holds the spear now?"</a>
+</body>
+</html>

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-06.htm

@@ -0,0 +1,7 @@
+<html><head><body>Innocentin:<br>
+These days the Silver Spear is awarded to whomever distinguishes himself suppressing the insurrection. One is held by
+the King's royal escort, who recently caught and executed a traitor, and the other spear is held by someone else...
+someone who dealt mercilessly with the undead insurrection and expelled the filthy devil worshippers!<br>
+You'll find him in the temple of Rune Castle Town.<br>
+Don't ask me any more. Take your clues and go find out where the key can be used.
+</body></html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-07.htm

@@ -0,0 +1,5 @@
+<html><head><body>Innocentin:<br>
+You must find the lock that matches that key! It would probably be in the possession of a family worthy of the spear!
+</body>
+</html>
+

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-08.htm

@@ -0,0 +1,5 @@
+<html><head><body>Innocentin:<br>
+So, did you find anything?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-09.htm">"Here is the diary and the hairpin."</a>
+</body>
+</html>

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-09.htm

@@ -0,0 +1,7 @@
+<html><head><body>Innocentin:<br>
+Please! Put those things away...Please!<br>
+I'm sorry, but the power of darkness contained in them is overpowering! I can't even look at them...<br>
+How about you? Are you okay?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-10.htm">"I'm fine."</a>
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-10.htm

@@ -0,0 +1,6 @@
+<html><head><body>Innocentin:<br>
+Really? Have you read it?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-12.htm">"Yes, I read it."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"No, I haven't read it."</a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-11.htm

@@ -0,0 +1,5 @@
+<html><head><body>Innocentin:<br>
+Read it and come back to me... I have many questions!
+</body>
+</html>
+

+ 9 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-12.htm

@@ -0,0 +1,9 @@
+<html><head><body>Innocentin:<br>
+Then answer me... What is it?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-15.htm">"Lidia's Diary."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-13.htm">"Alfred's Diary."</a>
+</body>
+</html>
+
+
+

+ 10 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-13.htm

@@ -0,0 +1,10 @@
+<html><head><body>Innocentin:<br>
+Have you read the document?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-14.htm">"Yes, I read it."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">No, I didn't read it."</a>
+</body>
+</html>
+
+
+
+

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-14.htm

@@ -0,0 +1,6 @@
+<html><head><body>Innocentin:<br>
+Then answer me... What is it?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-15.htm">"Lidia's Diary."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-13.htm">"Alfred's Diary."</a>
+</body>
+</html>

+ 15 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-15.htm

@@ -0,0 +1,15 @@
+<html><head><body>Innocentin:<br>
+Lidia's Diary?<br>
+Lidia was dear Alfred's precious daughter... They led an idyllic life, until that tragic day...<br>
+Does her diary cover the period after she became lord of the forest?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-16.htm">"Yes, it does."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"No, it doesn't."</a>
+</body>
+</html>
+
+
+
+
+
+
+

+ 10 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-16.htm

@@ -0,0 +1,10 @@
+<html><head><body>Innocentin:<br>
+What did you learn from the diary?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"Lidia was bitten by a vampire."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-17.htm">"Lidia signed some sort of Contract."</a>
+</body>
+</html>
+
+
+
+

+ 18 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-17.htm

@@ -0,0 +1,18 @@
+<html><head><body>Innocentin:<br>
+A Contract?!<br>
+I'll bet that rascal Nidrah was behind this! Was he involved?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"Yes, he forced her to sign the Contract."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-18.htm">"Lidia approached Nidrah."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"Nidrah wasn't involved."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"As I said before, Lidia was bitten by a vampire!
+Don't you get it?"</a>
+</body>
+</html>
+
+
+
+
+
+
+
+

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-18.htm

@@ -0,0 +1,7 @@
+<html><head><body>Innocentin:<br>
+Oh really? Then let me ask you one more question. Have you ever heard the expression <font color="LEVEL">"Owner of
+a Moon Face Flower"</font>?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-19.htm">"It's the Lord of the Forest of the Dead."</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31328-11.htm">"It's Lidia von Hellmann."</a>
+</body>
+</html>

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-19.htm

@@ -0,0 +1,7 @@
+<html><head><body>Innocentin:<br>
+Ah ha! Then that hairpin must belong to Lidia!<br>
+Now I remember it! She used to wear it in her hair! Sigh... She was so beautiful then...<br>
+Thank you for your help! I suppose our business is done now, but your journey continues...<br>
+I'll always be here for you if you have any questions.
+</body>
+</html>

+ 9 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-20.htm

@@ -0,0 +1,9 @@
+<html>
+<head>
+<body>
+The moment the words leave your lips, you feel an electric current shoot through your head, buzzing like
+5000 wyverns in flight! Deep within your heart wells an emotion, small but growing more intense by the moment...
+It's remorse! Lidia must have been angered by your answer!
+</body>
+</html>
+

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31328-21.htm

@@ -0,0 +1,5 @@
+<html><head><body>Innocentin:<br>
+I don't think your journey's over yet. Someone close to her wants to see you. He'll show you the path that leads to your
+next adventure.
+</body>
+</html>

+ 9 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31386-01.htm

@@ -0,0 +1,9 @@
+<html><head><body>Violet:<br>
+Oh, the key? That's right! That's the key that Duke Adolph von Hellmann asked me to keep for him! That was a very long time
+ago! He told me that it guards the highest honor his family received from the King!<br>
+But I can't go there. I can't leave this village.<br>
+Go towards the northern part of the village. You'll find a box near the center of the Forest of the Dead. This key opens
+the padlock on the box.<br>
+Bring me the object you find inside the box.
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31386-02.htm

@@ -0,0 +1,6 @@
+<html><head><body>Violet:<br>
+I can't go there. I can't leave this village!<br>
+Go towards the northern part of the village, you'll find a box near the center of the Forest of the Dead. This key opens
+the padlock on the box.<br>Bring me the object you find inside the box.
+</body>
+</html>

+ 9 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31386-03.htm

@@ -0,0 +1,9 @@
+<html><head><body>Violet:<br>
+This is the very Silver Spear that King Astaire Van Halter bestowed upon Duke Adolph! It's the treasured heirloom of the
+Hellmann family!  The lord will be overjoyed! The long lost honor of his family name is restored, and it's all because of
+you!<br>
+Thank you. Please accept this small token of our gratitude! I only wish that we could have you over to the castle and give
+you a more formal recognition...<br>
+I probably have to express our gratitude to the lord through another person, not me. Please talk with the village people.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31386-04.htm

@@ -0,0 +1,5 @@
+<html><head><body>Violet:<br>
+Find someone among the villagers to express your gratitude to the lord.<br>
+Have you visited Doriun yet?
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31523-01.htm

@@ -0,0 +1,6 @@
+<html><head><body>Tombstone:<br><br>
+<font color="LEVEL">One jeweled scepter for the King and two Silver Spears for the von Hellmann family who protects
+him.</font><br>
+<a action="bypass -h Quest 23_LidiasHeart 31523-02.htm">Wait a while.</a>
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31523-02.htm

@@ -0,0 +1,4 @@
+<html><head><body>Tombstone:<br><br>
+After a while, a white ghost appears.
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31523-03.htm

@@ -0,0 +1,4 @@
+<html><head><body>Tombstone:<br><br>
+The ghost was beside you all along!
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31523-04.htm

@@ -0,0 +1,6 @@
+<html><head><body>Tombstone:<br><br>
+There is a tablet engraved with familiar characters.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31523-05.htm">Dig</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-10.htm">Recall the ghost</a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31523-05.htm

@@ -0,0 +1,5 @@
+<html><head><body>Tombstone:<br><br>
+There is a tablet engraved with familiar characters.<br>
+It appears that something else has been crudely etched into the tablet.
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31523-06.htm

@@ -0,0 +1,4 @@
+<html><head><body>Tombstone:<br><br>
+You find a key engraved with a Silver Spear.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31524-01.htm

@@ -0,0 +1,5 @@
+<html><head><body>Ghost of von Hellmann:<br>
+Who has summoned me here? Why can't I sleep?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31524-02.htm">"Let me tell you about Lidia von Hellmann."</a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31524-02.htm

@@ -0,0 +1,5 @@
+<html><head><body>Ghost of von Hellmann:<br>
+Oh, the horror! The von Hellmann's are dead and Lidia is a demon? Her curse upon this land is depriving me of my rest!<br>
+<a action="bypass -h Quest 23_LidiasHeart 31524-03.htm">"It's the truth."</a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31524-03.htm

@@ -0,0 +1,5 @@
+<html><head><body>Ghost of von Hellmann:<br>
+How did she become the Lord of the Dead?<br>
+<a action="bypass -h Quest 23_LidiasHeart 31524-04.htm">"Here's her diary."</a>
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31524-04.htm

@@ -0,0 +1,6 @@
+<html><head><body>Ghost of von Hellmann:<br>
+Her diary?! How wonderful!<br>
+I'll reward you if you retrieve my key from under the monument. Take it and find the von Hellmann's page.
+<font color="LEVEL">He's in the hidden village in the center of the forest</font>.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31524-05.htm

@@ -0,0 +1,5 @@
+<html><head><body>Ghost of von Hellmann:<br>
+<font color="LEVEL">Dig under this monument for the key and take it to the von Hellmann's page.</font><br>
+He's in the hidden village in the center of the forest.
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31524-06.htm

@@ -0,0 +1,4 @@
+<html><head><body>Ghost of von Hellmann:<br>
+Take the key to von Hellmann's page, He's in <font color="LEVEL">the hidden village in the center of the forest</font>.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-00.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Desk:<br>
+The chest is secured with a padlock which bears the mark of the Hellmann family.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-01.htm">Use a Silver Spear key</a>
+</body>
+</html>

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-01.htm

@@ -0,0 +1,7 @@
+<html><head><body>Broken Desk:<br>
+The chest opens with a creak.<br>
+Inside, you find an old hairpin and a book tied with a leather string.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-03.htm"> Examine the hair pin.</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-07.htm"> Examine the book. </a>
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-02.htm

@@ -0,0 +1,6 @@
+<html><head><body>Broken Bookshelf:<br>
+The chest opens with a creak. Inside, you find an old hairpin and a book tied with a leather string.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-03.htm"> Examine the hair pin.</a><br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-07.htm"> Examine the book.</a>
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-03.htm

@@ -0,0 +1,6 @@
+<html><head><body>Broken Bookshelf:<br>
+The hair pin is a type once used by aristocratic ladies.It's engraved with the image of a Moon Face Flower, and was
+probably used by a unattached young lady. <br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-04.htm"> "I wonder what that design means?"</a>
+</body>
+</html>

+ 8 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-04.htm

@@ -0,0 +1,8 @@
+<html><head><body>Broken Bookshelf:<br>
+According to legend,the Moon Face Flower only blooms on moonlit nights.<br>
+It's very shy, and shows its face only to its future husband.This legend made it quite popular among young, single,
+aristocratic ladies.<br>
+I wonder who might have owned this one? <br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-05.htm"> Take the hairpin. </a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-05.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Bookshelf:<br>
+You took the hairpin.<br>
+Check the bookshelf. You may find something else.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-06.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Bookshelf:<br>
+In the locker where you found the hairpin, you also find a book tied with a leather string.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-07.htm"> Examine the book.</a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-07.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Bookshelf:<br>
+A book tied with a leather string. It's tied very tight, and doesn't seem like it could easily be cut.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-08.htm"> Try to cut the string.</a>
+</body>
+</html>

+ 6 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-08.htm

@@ -0,0 +1,6 @@
+<html><head><body>Broken Bookshelf:<br>
+When you cut the string, it falls to the floor and you hear a faint sigh.<br>
+Shall you read the book? <br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-09.htm"> Read the book.</a>
+</body>
+</html>

+ 7 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-09.htm

@@ -0,0 +1,7 @@
+<html><head><body>Broken Bookshelf:<br><br>
+"Month of Shilen, 15th day.<br>Lately, Father spends all his days with Nidrah! He doesn't take care of the manor like he
+should.  What makes him so angry?<br>
+What's this?!<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-10.htm"> "It's Lidia's Diary!"</a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-10.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Bookshelf:<br>
+It's a journal that belonged to Lidia von Hellmann. It probably has a lot of useful information in it!<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-11.htm"> Pick up the journal. </a>
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-11.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Bookshelf:<br>
+You've found Lidia's Diary!<br>
+Check the bookshelf again. You may find something else.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-12.htm

@@ -0,0 +1,5 @@
+<html><head><body>Broken Bookshelf:<br>
+In the chest where you found the book, you also find a hairpin shaped like a Moon Face Flower.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31526-03.htm"> Examine the hairpin.</a>
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31526-13.htm

@@ -0,0 +1,4 @@
+<html><head><body>Broken Bookshelf:<br>
+The locker is empty.
+</body>
+</html>

+ 5 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31530-01.htm

@@ -0,0 +1,5 @@
+<html><head><body>Box:<br>
+It's an antique box with the von Hellmann family seal on the lock.<br>
+<a action="bypass -h Quest 23_LidiasHeart 31530-02.htm">Use the Silver Spear key.</a>
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31530-02.htm

@@ -0,0 +1,4 @@
+<html><head><body>Box:<br>
+The box opens.
+</body>
+</html>

+ 4 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/31530-03.htm

@@ -0,0 +1,4 @@
+<html><head><body>Box:<br>
+It's empty.
+</body>
+</html>

+ 177 - 0
datapack_development/data/scripts/quests/23_LidiasHeart/__init__.py

@@ -0,0 +1,177 @@
+#  Created by Skeleton, Rewritten by Eyerobot
+import sys
+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
+from net.sf.l2j.gameserver.serverpackets import CreatureSay
+
+qn = "23_LidiasHeart"
+
+# ~~~~~~ npcId list: ~~~~~~
+Innocentin          = 31328
+BrokenBookshelf     = 31526
+GhostofvonHellmann  = 31524
+Tombstone           = 31523
+Violet              = 31386
+Box                 = 31530
+# ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# ~~~~~ itemId List ~~~~~
+MapForestofDeadman = 7063
+SilverKey          = 7149
+LidiaHairPin       = 7148
+LidiaDiary         = 7064
+SilverSpear        = 7150
+Adena              = 57
+# ~~~~~~~~~~~~~~~~~~~~~~~
+
+class Quest (JQuest) : 
+
+    def __init__(self,id,name,descr):  
+       JQuest.__init__(self,id,name,descr)
+       self.questItemIds = [SilverKey,LidiaHairPin,LidiaDiary,SilverSpear] 
+
+    def onAdvEvent (self,event,npc,player) :
+        st = player.getQuestState(qn)
+        htmltext = event
+        if event == "31328-02.htm": # call 31328-03.htm
+            st.giveItems(MapForestofDeadman,1)
+            st.giveItems(SilverKey,1)
+            st.set("cond","1")
+            st.playSound("ItemSound.quest_accept")
+            st.setState(State.STARTED)
+        elif event == "31328-03.htm": # call 31328-05.htm and 31328-06.htm
+            st.set("cond","2")
+            st.playSound("ItemSound.quest_middle")
+        elif event == "31526-05.htm": # called by 31526-03.htm for hairpin
+            if st.getQuestItemsCount(LidiaHairPin) == 0:
+                st.giveItems(LidiaHairPin,1) # give hairpin
+                if st.getQuestItemsCount(LidiaDiary) != 0: # if has diary cond = 4
+                    st.set("cond","4")
+                    st.playSound("ItemSound.quest_middle")
+        elif event == "31526-11.htm": # called by 31526-07 for diary
+            if st.getQuestItemsCount(LidiaDiary) == 0:
+                st.giveItems(LidiaDiary,1)
+                if st.getQuestItemsCount(LidiaHairPin) != 0: # if has hairpin cond = 4
+                    st.set("cond","4")
+                    st.playSound("ItemSound.quest_middle")
+        elif event == "31328-19.htm": # end of questions loop go to ghost
+            st.set("cond","6")
+            st.playSound("ItemSound.quest_middle")
+        elif event == "31524-04.htm":# sends you to the tombstone to dig
+            st.set("cond","7")
+            st.playSound("ItemSound.quest_middle")
+            st.takeItems(LidiaDiary,-1)
+        elif event == "31523-02.htm":
+            st.playSound("SkillSound5.horror_02")
+            ghost = st.addSpawn(31524,51432,-54570,-3136,1800000)
+            ghost.broadcastPacket(CreatureSay(ghost.getObjectId(),0,ghost.getName(),"Who awoke me?"))
+        elif event == "31523-05.htm":
+            st.startQuestTimer("ghost_timer",10000)
+        elif event == "ghost_timer":
+            st.set("cond","8")
+            htmltext = "31523-06.htm"
+            st.giveItems(SilverKey,1)
+        elif event == "31530-02.htm":# box gives spear takes key
+            st.set("cond","10")
+            st.playSound("ItemSound.quest_middle")
+            st.takeItems(SilverKey,-1)
+            st.giveItems(SilverSpear,1)
+        return htmltext
+
+    def onTalk (self,npc,player):
+        htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>"
+        st = player.getQuestState(qn)
+        if not st : return htmltext
+        state = st.getState()
+        if state == State.COMPLETED :
+            htmltext = "<html><body>This quest has already been completed.</body></html>"
+        npcId = npc.getNpcId()
+        cond = st.getInt("cond")
+        if npcId == Innocentin :
+            if state == State.CREATED :
+                st2 = st.getPlayer().getQuestState("22_TragedyInVonHellmannForest")
+                if st2 :
+                    if st2.getState() == State.COMPLETED :
+                        htmltext = "31328-01.htm" # previous quest finished, call 31328-02.htm
+                    else:
+                        htmltext = "31328-00.htm" # requirements not met
+            elif cond == 1 :
+                htmltext = "31328-03.htm"
+            elif cond == 2 :
+                htmltext = "31328-07.htm"
+            elif cond == 4 :
+                htmltext = "31328-08.htm"
+            elif cond == 6 :
+                htmltext = "31328-19.htm"
+        elif npcId == BrokenBookshelf:
+            if cond == 2 : 
+                if st.getQuestItemsCount(SilverKey) != 0:
+                    htmltext = "31526-00.htm"
+                    st.playSound("ItemSound.quest_middle")
+                    st.set("cond","3")
+            elif cond == 3 :
+                if st.getQuestItemsCount(SilverKey) != 0:
+                    htmltext = "31526-00.htm"
+                    st.playSound("ItemSound.quest_middle")
+                    st.set("cond","3")
+                elif st.getQuestItemsCount(LidiaHairPin) == 0 and st.getQuestItemsCount(LidiaDiary) != 0:
+                    htmltext = "31526-12.htm"
+                elif st.getQuestItemsCount(LidiaHairPin) != 0 and st.getQuestItemsCount(LidiaDiary) == 0:
+                    htmltext = "31526-06.htm"
+                elif st.getQuestItemsCount(LidiaHairPin) == 0 and st.getQuestItemsCount(LidiaDiary) == 0:
+                    htmltext = "31526-02.htm"
+            elif cond == 4 :
+                htmltext = "31526-13.htm"
+        elif npcId == GhostofvonHellmann:
+            if cond == 6 :
+                htmltext = "31524-01.htm" # sends you to the tombstone to dig
+            elif cond == 7 :
+                htmltext = "31524-05.htm"
+        elif npcId == Tombstone:
+            if cond == 6 :
+                if st.getQuestTimer("spawn_timer") != None:
+                    htmltext = "31523-03.htm"
+                else:
+                    htmltext = "31523-01.htm"
+            if cond == 7 :
+                htmltext = "31523-04.htm"
+            elif cond == 8 :
+                htmltext = "31523-06.htm"
+        elif npcId == Violet:
+            if cond == 8 :
+                htmltext = "31386-01.htm" # send to box 
+                st.playSound("ItemSound.quest_middle")
+                st.set("cond","9")
+            elif cond == 9 :
+                htmltext = "31386-02.htm"
+            elif cond == 10 :
+                if st.getQuestItemsCount(SilverSpear) != 0:
+                    htmltext = "31386-03.htm"
+                    st.takeItems(SilverSpear,-1)
+                    st.giveItems(Adena,100000)
+                    st.exitQuest(False)
+                    st.playSound("ItemSound.quest_finish")
+                else:
+                    htmltext = "You have no Silver Spear..."
+        elif npcId == Box:
+            if cond == 9 :
+                if st.getQuestItemsCount(SilverKey) != 0:
+                    htmltext = "31530-01.htm"
+                else:
+                    htmltext = "You have no key..."
+            elif cond == 10 :
+                htmltext = "31386-03.htm"
+        return htmltext
+
+QUEST     = Quest(23,qn,"Lidia's Heart")
+
+QUEST.setInitialState(CREATED)
+QUEST.addStartNpc(Innocentin)
+
+QUEST.addTalkId(Innocentin)
+QUEST.addTalkId(BrokenBookshelf)
+QUEST.addTalkId(GhostofvonHellmann)
+QUEST.addTalkId(Tombstone)
+QUEST.addTalkId(Violet)
+QUEST.addTalkId(Box)

+ 4 - 4
datapack_development/data/scripts/quests/621_EggDelivery/31521-2.htm

@@ -1,5 +1,5 @@
-<html><body>Chef Jeremy:<br>
-Good!<br>
-Did all the deliveries go off without a hitch?<br>
-<a action="bypass -h Quest 621_EggDelivery 31521-3.htm">I made all the deliveries.</a>
+<html><body>Chef Jeremy:<br>
+OK, OK!<br>
+Did Did you?<br>
+<a action="bypass -h Quest 621_EggDelivery 31521-3.htm">"I completed the delivery."</a>
 </body></html>

+ 3 - 3
datapack_development/data/scripts/quests/621_EggDelivery/31521-3.htm

@@ -1,4 +1,4 @@
-<html><body>Chef Jeremy:<br>
-Excellent!<br>
-As you can propably tell, my cooking is absolutely state of the art! If you continue to help me, who knows? You might have a nice treat coming your way! Ha!
+<html><body>Chef Jeremy:<br>
+Excellent!<br>
+You seem to have more aptitude for delivery work than I thought. You did a good job, but unfortunately, I don't have the adena to pay you. I don't have any more work for you, either... Talk to Valentine in the Town of Goddard. He owes me, and he'll give you a satisfactory reward.
 </body></html>

+ 3 - 0
datapack_development/data/scripts/quests/621_EggDelivery/31521-4.htm

@@ -0,0 +1,3 @@
+<html><body>Jeremy:<br>
+Hey, what are you doing here? you should've visited Valentine in the Town of Goddard. I don't have any adena to give you.
+</body></html>

+ 4 - 0
datapack_development/data/scripts/quests/621_EggDelivery/31584-1.htm

@@ -0,0 +1,4 @@
+<HTML><BODY>Brewer Valentine:<br>
+Would you like a drink? What is it that you want?<br>
+<a action="bypass -h Quest 621_EggDelivery 31584-2.htm">"Jeremy sent me."</a>
+</BODY></HTML>

+ 4 - 0
datapack_development/data/scripts/quests/621_EggDelivery/31584-2.htm

@@ -0,0 +1,4 @@
+<HTML><BODY>Brewer Valentine:<br>
+Jeremy? <br>He wants to be paid?...<br>
+I thought this matter was settled! I distinctly remember paying you before!
+</BODY></HTML>

+ 14 - 9
datapack_development/data/scripts/quests/621_EggDelivery/__init__.py

@@ -13,6 +13,7 @@ NAFF = 31544
 CROCUS = 31545
 KUBER = 31546
 BEORIN = 31547
+VALENTINE = 31584
 
 #QUEST ITEMS
 BOILED_EGGS = 7195
@@ -47,7 +48,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_accept")
      else:
        htmltext=default
-   if event == "31543-1.htm" :
+   elif event == "31543-1.htm" :
      if st.getQuestItemsCount(BOILED_EGGS):
        if cond==1:
          st.takeItems(BOILED_EGGS,1)
@@ -58,7 +59,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31544-1.htm" :
+   elif event == "31544-1.htm" :
      if st.getQuestItemsCount(BOILED_EGGS):
        if cond==2:
          st.takeItems(BOILED_EGGS,1)
@@ -69,7 +70,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31545-1.htm" :
+   elif event == "31545-1.htm" :
      if st.getQuestItemsCount(BOILED_EGGS):
        if cond==3:
          st.takeItems(BOILED_EGGS,1)
@@ -80,7 +81,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31546-1.htm" :
+   elif event == "31546-1.htm" :
      if st.getQuestItemsCount(BOILED_EGGS):
        if cond==4:
          st.takeItems(BOILED_EGGS,1)
@@ -91,7 +92,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.extiQuest(1)
-   if event == "31547-1.htm" :
+   elif event == "31547-1.htm" :
      if st.getQuestItemsCount(BOILED_EGGS):
        if cond==5:
          st.takeItems(BOILED_EGGS,1)
@@ -102,7 +103,9 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.extiQuest(1)
-   if event == "31521-3.htm" :
+   elif event == "31521-3.htm" :
+     st.set("cond","7")
+   elif event == "31584-2.htm" :
      if st.getQuestItemsCount(FEE_OF_EGGS) == 5:
         st.takeItems(FEE_OF_EGGS,5)
         if st.getRandom(100) < RPCHANCE :
@@ -143,13 +146,15 @@ class Quest (JQuest) :
          htmltext = "31547-0.htm"
        elif npcId == 31521 and cond == 6 and st.getQuestItemsCount(FEE_OF_EGGS) == 5 :
          htmltext = "31521-2.htm"
+       elif npcId == 31521 and cond == 7 and st.getQuestItemsCount(FEE_OF_EGGS) == 5 :
+         htmltext = "31521-4.htm"
+       elif npcId == 31584 and cond == 7 and st.getQuestItemsCount(FEE_OF_EGGS) == 5 :
+         htmltext = "31584-1.htm"
    return htmltext
 
 QUEST       = Quest(621,qn,"Egg Delivery")
 
 QUEST.addStartNpc(31521)
 
-QUEST.addTalkId(31521)
-
-for i in range(31543,31548):
+for i in range(31543,31548)+[31521,31584]:
     QUEST.addTalkId(i)

+ 4 - 0
datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-1.htm

@@ -0,0 +1,4 @@
+<HTML><BODY>Lietta:<br>
+Are you here for something? Or perhaps to drop something off?<br>
+<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31267-2.htm">"Jeremy sent me to get some adena." </a>
+</BODY></HTML>

+ 4 - 0
datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-2.htm

@@ -0,0 +1,4 @@
+<HTML><BODY>Lietta:<br>
+Oh, I see. Jeremy didn't pay you after you did work for him? That sounds like Jeremy!<br>
+Hold on...<br>Here you are. This should be enough.
+</BODY></HTML>

+ 5 - 4
datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-2.htm

@@ -1,4 +1,5 @@
-<html><body>Chef Jeremy:<br>
-Finally!<br>
-Did you deliver the liquor to all of my customers?<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31521-3.htm">Yes. I finished all the deliveries</a></body></html>
+<HTML><BODY>Jeremy:<br>
+You've come back?<br>
+Did you finish delivering all the liquor?<br>
+<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31521-3.htm">"I completed the delivery."</a>
+</BODY></HTML>

+ 4 - 5
datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-3.htm

@@ -1,5 +1,4 @@
-<html><body>Chef Jeremy:<br>
-This liquor was first distilled by my great-great grandmother for soldiers on the battlefield!<br>
-Belive it or not, it's been said that this liquor so boosted the soldiers' morale they won the war! Ha!<br>
-Whatever the truth , it's a great drink!<br>
-Well, I'm rambling on, aren't I? Here's your reward!</body></html>
+<HTML><BODY>Jeremy:<br>
+My mother's mother's mother made this wine for the soldiers fighting in the war. They say that when the soldiers drank it, it so raised their fighting spirit that they won the battle. Believe it or not!<br>
+In any case, I'd like to pay you for your work, but I'm afraid that I don't have any money with me at the moment. I know it's a bit of trouble, but if you visit Warehouse Keeper Lietta in Goddard Castle Town and tell her that I sent you, she'll give you what you deserve.
+</BODY></HTML>

+ 4 - 0
datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-4.htm

@@ -0,0 +1,4 @@
+<HTML><BODY>Jeremy:<br>
+What are you still doing here? Have you forgotten what you were supposed to do?<br>
+Go to Warehouse Keeper Lietta in the Town of Goddard and say that you've come on my orders.
+</BODY></HTML>

+ 14 - 9
datapack_development/data/scripts/quests/622_DeliveryOfSpecialLiquor/__init__.py

@@ -8,6 +8,7 @@ from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 qn = "622_DeliveryOfSpecialLiquor"
 
 #NPC
+LIETTA - 31267
 JEREMY = 31521
 PULIN = 31543
 NAFF = 31544
@@ -48,7 +49,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_accept")
      else:
        htmltext=default
-   if event == "31547-1.htm" :
+   elif event == "31547-1.htm" :
      if st.getQuestItemsCount(SPECIAL_DRINK):
        if cond==1:
          st.takeItems(SPECIAL_DRINK,1)
@@ -59,7 +60,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31546-1.htm" :
+   elif event == "31546-1.htm" :
      if st.getQuestItemsCount(SPECIAL_DRINK):
        if cond==2:
          st.takeItems(SPECIAL_DRINK,1)
@@ -70,7 +71,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31545-1.htm" :
+   elif event == "31545-1.htm" :
      if st.getQuestItemsCount(SPECIAL_DRINK):
        if cond==3:
          st.takeItems(SPECIAL_DRINK,1)
@@ -81,7 +82,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31544-1.htm" :
+   elif event == "31544-1.htm" :
      if st.getQuestItemsCount(SPECIAL_DRINK):
        if cond==4:
          st.takeItems(SPECIAL_DRINK,1)
@@ -92,7 +93,7 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31543-1.htm" :
+   elif event == "31543-1.htm" :
      if st.getQuestItemsCount(SPECIAL_DRINK):
        if cond==5:
          st.takeItems(SPECIAL_DRINK,1)
@@ -103,7 +104,9 @@ class Quest (JQuest) :
      else:
        htmltext="LMFAO!"
        st.exitQuest(1)
-   if event == "31521-3.htm" :
+   elif event == "31521-3.htm" :
+     st.set("cond","7")
+   elif event == "31267-2.htm" :
      if st.getQuestItemsCount(FEE_OF_DRINK) == 5:
         st.takeItems(FEE_OF_DRINK,5)
         random = st.getRandom(1000)
@@ -149,13 +152,15 @@ class Quest (JQuest) :
                  htmltext = "31543-0.htm"
            elif npcId == 31521 and cond == 6 and st.getQuestItemsCount(FEE_OF_DRINK) == 5 :
                  htmltext = "31521-2.htm"
+           elif npcId == 31521 and cond == 7 and st.getQuestItemsCount(FEE_OF_DRINK) == 5 :
+                 htmltext = "31521-4.htm"
+           elif npcId == 31267 and cond == 7 and st.getQuestItemsCount(FEE_OF_DRINK) == 5 :
+                 htmltext = "31267-1.htm"
    return htmltext
 
 QUEST       = Quest(622,qn,"Delivery of special liquor")
 
 QUEST.addStartNpc(31521)
 
-QUEST.addTalkId(31521)
-
-for i in range(31543,31548):
+for i in range(31543,31548)+[31267,31521]:
     QUEST.addTalkId(i)

+ 2 - 2
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-01.htm

@@ -1,4 +1,4 @@
 <html><body>Priest Flauron:<br>
-So you want to enter the<font color="LEVEL"> Pagan Temple</font> again? I can help you but you need to do a little help for me.<br>
-(Quest only for characters with a Faded Visitors Mark and level 73 or above.)
+I'm too busy to help you.  Sorry!<br>
+(Only characters level 73 and above who possess a Faded Visitor's Mark are permitted to take on the quest.)
 </body></html>

+ 4 - 0
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-01a.htm

@@ -0,0 +1,4 @@
+<html><body>Priest Flauron:<br>
+You should go on to the temple; I'm too busy to see you just now.<br>
+(Only characters level 73 and above are permitted to take on the quest.)
+</body></html>

+ 2 - 1
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-02.htm

@@ -1,5 +1,6 @@
 <html><body>Priest Flauron:<br>
 Eh? Oh, my, it's you! I, uh, <font color="LEVEL"> I didn't expect to see you again. Not alive, at any rate.</font><br>
 Well, er, let us rejoice in your good fortune! Surely your relief at your survival will allow you to laugh at any harmless incidents in the past! Eheheh.<br>
-<a action="bypass -h Quest 637_ThroughOnceMore 32010-06.htm">"Grab him by the collar."</a>
+<a action="bypass -h Quest 637_ThroughOnceMore 32010-06.htm">"Grab him by the collar."</a><br>
+<a action="bypass -h Quest 637_ThroughOnceMore 32010-08.htm">Listen to his story.</a>
 </body></html>

+ 1 - 2
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-03.htm

@@ -1,4 +1,3 @@
 <html><body>Priest Flauron:<br>
-A wise decision! Now, here's what I want: go to the <font color="LEVEL"> Forest of the Dead</font> and defeat the Bone Animator, the Bone Slayer and the Skull Animator. Bring me 10 Necromancer Hearts. Do that, and I'll give you the real sign - the occult sign that will allow you to enter the chapel of the Temple.<br>
-<a action="bypass -h Quest 637_ThroughOnceMore 32010-04.htm">"I will do this."</a>
+A wise decision! Now, here's what I want: go to the<font color="LEVEL"> Forest of the Dead </font>and defeat<font color="LEVEL"> the Bone Animator, the Bone Slayer and the Skull Animator.  </font>Bring me <font color="LEVEL">10 Necromancer Hearts.  </font>Do that, and I'll give you the real sign - the occult sign that will allow you to enter the chapel of the Temple.
 </body></html>

+ 1 - 1
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-04.htm

@@ -1,3 +1,3 @@
 <html><body>Priest Flauron:<br>
-Go and hunt<font color="LEVEL"> Bone Animators, Bone Slayers and Skull Animators</font> in<font color="LEVEL"> Forest of the Dead</font>.
+We have a deal, then.  Now go to the <font color="LEVEL">Forest of the Dead</font> and defeat <font color="LEVEL">the Bone Animator, the Bone Slayer, and the Skull Animator.</font> Bring me <font color="LEVEL">ten Necromancer Hearts.</font>, and I will give you the Pagan's Mark that will allow you to enter the chapel of the Temple.
 </body></html>

+ 6 - 0
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-08.htm

@@ -0,0 +1,6 @@
+<html><body>Priest Flauron:<br>
+Ha, you emerged alive! My felicitations. And even better, you came back to speak with me! So, all water under the bridge, then, eh?<br>
+<font color="LEVEL">Yes, Visitor's Day is a lie. We use it to attract live sacrifices, frankly.</font><br>
+Anyway, it's been a long time since I've seen anyone return from there alive. I'm interested in you; I think you're capable of doing me a particular favor.<br>
+<a action="bypass -h Quest 637_ThroughOnceMore 32010-09.htm">"Why would I do you a favor after you lied to me?"</a>
+</body></html>

+ 6 - 0
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-09.htm

@@ -0,0 +1,6 @@
+<html><body>Priest Flauron:<br>
+Oh, that. Disregard that; it was a minor matter. You have survived and gained by your experiences, surely. How can that be bad? Keep your thoughts on the future, that is my motto!<br>
+Look, let's deal. I'm not going to try any more tricks. I know better now. If I'd known you for what you were, I'd never have tried it in the first place. But I have a job that needs doing, and I can offer you a real benefit in exchange:  <font color="LEVEL">the mark that lets you go all the way into the chapel of the temple</font>. I think that's where you want to go, am I right?<br>
+<a action="bypass -h Quest 637_ThroughOnceMore 32010-07.htm">"I want to go into the chapel, but why would you want to help me?"</a><br>
+<a action="bypass -h Quest 637_ThroughOnceMore 32010-10.htm">"I am not interested in the chapel of the temple."</a>
+</body></html>

+ 3 - 0
datapack_development/data/scripts/quests/637_ThroughOnceMore/32010-10.htm

@@ -0,0 +1,3 @@
+<html><body>Priest Flauron:<br>
+Oh, really?  What a pity.  Please feel free to return any time!
+</body></html>

+ 6 - 3
datapack_development/data/scripts/quests/637_ThroughOnceMore/__init__.py

@@ -9,11 +9,11 @@ from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest
 qn = "637_ThroughOnceMore"
 
 #Drop rate
-DROP_CHANCE=40
+DROP_CHANCE=90
 #Npc
 FLAURON = 32010
 #Items
-FADEDMARK,NECROHEART,MARK = 8065,8066,8067
+VISITOR_MARK,FADEDMARK,NECROHEART,MARK = 8064,8065,8066,8067
 
 class Quest (JQuest) :
 
@@ -24,7 +24,7 @@ class Quest (JQuest) :
 
  def onEvent (self,event,st) :
     htmltext = event
-    if htmltext == "32010-04.htm" :
+    if htmltext == "32010-03.htm" :
        st.set("cond","1")
        st.setState(State.STARTED)
        st.takeItems(FADEDMARK,1)
@@ -40,6 +40,9 @@ class Quest (JQuest) :
      if id == State.CREATED :
         if player.getLevel()>72 and st.getQuestItemsCount(FADEDMARK) :
            htmltext = "32010-02.htm"
+        elif player.getLevel()>72 and st.getQuestItemsCount(VISITOR_MARK) :
+           htmltext = "32010-01a.htm"
+           st.exitQuest(1)
         else:
            htmltext = "32010-01.htm"
            st.exitQuest(1)

+ 2 - 2
datapack_development/data/scripts/teleports/1630_PaganTeleporters/FadedMark.htm

@@ -1,3 +1,3 @@
-<html><body>
-As you pass through the gates your mark fades. Make a note to return to <font color="LEVEL">Priest Flauron</font> to inquire about this!
+<html><body>The Temple Gatekeeper:<br>
+The moment the mark touches the hole, the door swings open with a mechanical whir.
 </body></html>

+ 37 - 19
datapack_development/data/scripts/teleports/1630_PaganTeleporters/__init__.py

@@ -3,44 +3,62 @@
 # v1.1 Done by BiTi
 
 import sys
+from net.sf.l2j.gameserver.datatables import DoorTable
 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
 qn = "1630_PaganTeleporters"
-NPCS=[32034,32036,32039,32040]
+NPCS=[32034,32035,32036,32037,32039,32040]
 
 # Main Quest Code
 class Quest (JQuest):
 
   def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
 
+  def onEvent (self,event,st) :
+    if event == "Close_Door1" :
+       DoorTable.getInstance().getDoor(19160001).closeMe()
+    elif event == "Close_Door2" :
+       DoorTable.getInstance().getDoor(19160010).openMe()
+       DoorTable.getInstance().getDoor(19160010).openMe()
+    return
+
   def onTalk (self,npc,player):
     st = player.getQuestState(qn)
     npcId = npc.getNpcId()
-    htmltext = "You have been teleported."
-    if player.getLevel() < 73 :
-       htmltext = "<html><body>Teleport available only for characters with Pagans Mark and level 73 or above.</body></html>"
-    elif npcId == 32034 and st.getQuestItemsCount(8064) :
-          st.takeItems(8064,1)
+    htmltext = ""
+    if npcId == 32034 :
+          if st.getQuestItemsCount(8064) :
+             st.takeItems(8064,1) # TODO: this part must happen when u walk through doors >.<
+             st.giveItems(8065,1)
+          elif st.getQuestItemsCount(8065) :
+             break
+          else:
+             return "<html><body>The Temple Gatekeeper:<br>You have nothing that would cover the holes.<br>(You must have a Visitor's Mark, a Faded Visitor's Mark, or a Pagan's Mark in order to open this door.)</body></html>"
+          htmltext = "FadedMark.htm"
+          DoorTable.getInstance().getDoor(19160001).openMe()
+          self.startQuestTimer("Close_Door1",10000,none,none)
+    elif npcId == 32035:
+          DoorTable.getInstance().getDoor(19160001).openMe()
+          self.startQuestTimer("Close_Door1",10000,none,none)
           htmltext = "FadedMark.htm"
-          st.giveItems(8065,1)
-          player.teleToLocation(-16324,-37147,-10724)
-    elif npcId in [32034,32036]:
+    elif npcId == 32036:
        if not st.getQuestItemsCount(8067) :
-          htmltext = '<html><body>Teleport available only for characters with Pagans Mark and level 73 or above.</body></html>'
+          htmltext = "<html><body>The Temple Gatekeeper:<br>Show your Mark or be gone from my sight!<br>Only those who possess the Pagan's Mark may pass through this gate!</body></html>"
        else:
-          if npcId == 32034 :
-             player.teleToLocation(-16324,-37147,-10724)
-          else :
-             player.teleToLocation(-16324,-44638,-10724)
-    elif npcId == 32040 and st.getQuestItemsCount(8065) :
-       player.teleToLocation(36640,-51218,718)
-    elif not st.getQuestItemsCount(8064)+st.getQuestItemsCount(8067) :
-       htmltext = '<html>Teleport available only for characters with Pagans Mark or Visitors Mark and level 73 or above.</body></html>'
+          htmltext = "<html><body>The Temple Gatekeeper:<br>On seeing the Pagan's Mark, the statue's probing eyes go blank.<br>With the quiet whir of an engine, the gate swings open...</body></html>"
+          self.startQuestTimer("Close_Door2",10000,none,none)
+          DoorTable.getInstance().getDoor(19160010).openMe()
+          DoorTable.getInstance().getDoor(19160010).openMe()
+    elif npcId == 32037:
+          DoorTable.getInstance().getDoor(19160010).openMe()
+          DoorTable.getInstance().getDoor(19160010).openMe()
+          self.startQuestTimer("Close_Door2",10000,none,none)
+          htmltext = "FadedMark.htm"
     else :
        if npcId == 32039 :
-          player.teleToLocation(-12241,-35884,-10856)
+          player.teleToLocation(-12766,-35840,-10856)
        elif npcId == 32040 :
           player.teleToLocation(36640,-51218,718)
     st.exitQuest(1)

+ 13 - 15
datapack_development/sql/minions.sql

@@ -15,7 +15,6 @@ CREATE TABLE `minions` (
 -- Dumping data for table `minions`
 --
 
--- c1 mobs
 INSERT INTO `minions` VALUES
 (20117,20118,1,3),
 (20376,20377,1,2),
@@ -95,12 +94,18 @@ INSERT INTO `minions` VALUES
 (21081,21083,1,3),
 (21090,21091,1,1),
 (21090,21092,1,1),
-(21312,21313,2,2);
-
--- 
--- work in progress C5 minions - 22xxx mobs
--- 
-INSERT INTO `minions` VALUES 
+(21312,21313,2,2),
+(21345,21346,2,2),
+(21347,21348,1,1),
+(21347,21349,1,1),
+(21369,21370,2,2),
+(21371,21372,2,2),
+(21373,21374,1,1),
+(21373,21375,1,1),
+(21596,21597,1,1),
+(21596,21598,1,1),
+(21599,21600,1,1),
+(21599,21601,1,1),
 (22028,22027,3,4),
 (22080,22079,3,3),
 (22084,22083,3,3),
@@ -113,14 +118,7 @@ INSERT INTO `minions` VALUES
 (22104,22103,8,8),
 (22123,22122,2,3),
 (22135,22130,1,1),
-(22135,22131,1,1),
-(21345,21346,2,2),
-(21347,21348,1,1),
-(21347,21349,1,1),
-(21369,21370,2,2),
-(21371,21372,2,2),
-(21373,21374,1,1),
-(21373,21375,1,1);
+(22135,22131,1,1);
 
 INSERT INTO `minions` VALUES 
 (27021,20492,6,8),