Browse Source

BETA: Quest '''Specialty Liquor Delivery''' (622) in Java.
Patch by: janiko
Reviewed by: Adry_85, jurchiks
Tested by: Adry_85

Adry_85 11 years ago
parent
commit
f1510726f5
50 changed files with 413 additions and 213 deletions
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts.cfg
  2. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-1.htm
  3. 0 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-2.htm
  4. 0 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-1.htm
  5. 0 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-2.htm
  6. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31543-0.htm
  7. 0 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31543-1.htm
  8. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31544-0.htm
  9. 0 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31544-1.htm
  10. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31545-0.htm
  11. 0 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31545-1.htm
  12. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31546-0.htm
  13. 0 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31546-1.htm
  14. 0 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31547-0.htm
  15. 0 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31547-1.htm
  16. 0 163
      L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/__init__.py
  17. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java
  18. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31267-01.html
  19. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31267-02.html
  20. 6 5
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-01.htm
  21. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-02.htm
  22. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-03.htm
  23. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-04.html
  24. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-05.html
  25. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-06.html
  26. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-07.html
  27. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-08.html
  28. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-01.html
  29. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-02.html
  30. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-03.html
  31. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-04.html
  32. 5 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-01.html
  33. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-02.html
  34. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-03.html
  35. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-04.html
  36. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-01.html
  37. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-02.html
  38. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-03.html
  39. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-04.html
  40. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-01.html
  41. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-02.html
  42. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-03.html
  43. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-04.html
  44. 4 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-01.html
  45. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-02.html
  46. 3 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-03.html
  47. 6 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-04.html
  48. 285 0
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
  49. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
  50. 2 1
      L2J_DataPack_BETA/dist/sql/game/updates/20131222update.sql

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

@@ -590,7 +590,7 @@ quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
 quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
 quests/620_FourGoblets/__init__.py
 quests/Q00621_EggDelivery/Q00621_EggDelivery.java
-quests/622_DeliveryOfSpecialLiquor/__init__.py
+quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java
 quests/623_TheFinestFood/__init__.py
 quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
 quests/625_TheFinestIngredientsPart2/__init__.py

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-1.htm

@@ -1,4 +0,0 @@
-<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>

+ 0 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31267-2.htm

@@ -1,4 +0,0 @@
-<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>

+ 0 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-1.htm

@@ -1,3 +0,0 @@
-<html><body>Chef Jeremy:<br>
-Take these specialty liquor to my customers at the hot springs resort.Our motto is "The Customer Always Comes First"! Don't ever forget it!
-</body></html>

+ 0 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-2.htm

@@ -1,5 +0,0 @@
-<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>

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31543-0.htm

@@ -1,2 +0,0 @@
-<html><body>Pulin:<br>You're the liquor delivery man, right? Show me the booze! I came all the way from Horse Island for a drink!<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31543-1.htm">Here's the liquor delivery.</a></body></html>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31543-1.htm

@@ -1 +0,0 @@
-<html><body>Pulin:<br>Actually, I'm not much of a drinker...<br>I thought this might be different!<br>Here's your money.</body></html>

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31544-0.htm

@@ -1,2 +0,0 @@
-<html><body>Naff:<br>The hot springs always reminds me of Jeremy's special liquor!<br>Let me guess... You must be Jeremy's delivery man!<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31544-1.htm">Say "I've brought you some specially brewed liquor!"</a></body></html>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31544-1.htm

@@ -1 +0,0 @@
-<html><body>Naff:<br>What a marvelous taste!<br>It's truly worthy of the gods!</body></html>

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31545-0.htm

@@ -1,2 +0,0 @@
-<html><body>Crocus:<br>I need a drink! Do you have any liquor?<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31545-1.htm">I have your liquor right here!</a></body></html>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31545-1.htm

@@ -1 +0,0 @@
-<html><body>Crocus:<br>The fruity bouquet and sparkling sensation on my tongue is awesome! There's absolutely nothing like this in the whole world!<br>Jeremy's liquor is unique to this region but very popular everywhere! I'm so glad I came here.</body></html>

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31546-0.htm

@@ -1,2 +0,0 @@
-<html><body>Kuber:<br>That feels so good! I ordered a boiled egg to go with my drink! Once the liquor and the egg arrive, I'll be in heaven!<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31546-1.htm">I'm here to delivery some liquor.</a></body></html>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31546-1.htm

@@ -1 +0,0 @@
-<html><body>Kuber:<br>Mmm... That's delicious!<br>You look tired! Can I buy you a drink?</body></html>

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31547-0.htm

@@ -1,2 +0,0 @@
-<html><body>Beorin:<br>Dammit! I need a drink! When will that liquor order get here?<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31547-1.htm">I'm here to deliver some liquor.</a></body></html>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31547-1.htm

@@ -1 +0,0 @@
-<html><body>Beorin:<br>It'a about time!<br>Mmm... These hot springs just aren't the same without a nice glass of wine...<br>Hee hee... I'll never get tired of drinking this stuff!<br>Oh, thanks for the delivery! Here's the money for the wine.</body></html>

+ 0 - 163
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/__init__.py

@@ -1,163 +0,0 @@
-# Made by disKret
-import sys
-from com.l2jserver import Config 
-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 = "622_DeliveryOfSpecialLiquor"
-
-#NPC
-LIETTA = 31267
-JEREMY = 31521
-PULIN = 31543
-NAFF = 31544
-CROCUS = 31545
-KUBER = 31546
-BEORIN = 31547
-
-#QUEST ITEMS
-SPECIAL_DRINK = 7197
-FEE_OF_DRINK = 7198
-
-#REWARDS
-ADENA = 57
-HASTE_POTION = 734
-
-#Chance to get an S-grade random recipe instead of just adena and haste potion
-RPCHANCE=10
-#Change this value to 1 if you wish 100% recipes, default 70%
-ALT_RP100=0
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [SPECIAL_DRINK, FEE_OF_DRINK]
-
- def onEvent (self,event,st) :
-   htmltext = event
-   cond=st.getInt("cond")
-   if event == "31521-1.htm" :
-     if cond==0:
-       st.set("cond","1")
-       st.setState(State.STARTED)
-       st.giveItems(SPECIAL_DRINK,5)
-       st.playSound("ItemSound.quest_accept")
-     else:
-       htmltext = Quest.getNoQuestMsg(player)
-   elif event == "31547-1.htm" :
-     if st.getQuestItemsCount(SPECIAL_DRINK):
-       if cond==1:
-         st.takeItems(SPECIAL_DRINK,1)
-         st.giveItems(FEE_OF_DRINK,1)
-         st.set("cond","2")
-       else:
-         htmltext = Quest.getNoQuestMsg(player)
-     else:
-       htmltext="LMFAO!"
-       st.exitQuest(1)
-   elif event == "31546-1.htm" :
-     if st.getQuestItemsCount(SPECIAL_DRINK):
-       if cond==2:
-         st.takeItems(SPECIAL_DRINK,1)
-         st.giveItems(FEE_OF_DRINK,1)
-         st.set("cond","3")
-       else:
-         htmltext = Quest.getNoQuestMsg(player)
-     else:
-       htmltext="LMFAO!"
-       st.exitQuest(1)
-   elif event == "31545-1.htm" :
-     if st.getQuestItemsCount(SPECIAL_DRINK):
-       if cond==3:
-         st.takeItems(SPECIAL_DRINK,1)
-         st.giveItems(FEE_OF_DRINK,1)
-         st.set("cond","4")
-       else:
-         htmltext = Quest.getNoQuestMsg(player)
-     else:
-       htmltext="LMFAO!"
-       st.exitQuest(1)
-   elif event == "31544-1.htm" :
-     if st.getQuestItemsCount(SPECIAL_DRINK):
-       if cond==4:
-         st.takeItems(SPECIAL_DRINK,1)
-         st.giveItems(FEE_OF_DRINK,1)
-         st.set("cond","5")
-       else:
-         htmltext = Quest.getNoQuestMsg(player)
-     else:
-       htmltext="LMFAO!"
-       st.exitQuest(1)
-   elif event == "31543-1.htm" :
-     if st.getQuestItemsCount(SPECIAL_DRINK):
-       if cond==5:
-         st.takeItems(SPECIAL_DRINK,1)
-         st.giveItems(FEE_OF_DRINK,1)
-         st.set("cond","6")
-       else:
-         htmltext = Quest.getNoQuestMsg(player)
-     else:
-       htmltext="LMFAO!"
-       st.exitQuest(1)
-   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 = self.getRandom(1000)
-        if random < 800 :
-          st.giveItems(ADENA,18800)
-          st.rewardItems(HASTE_POTION,1)
-        elif random < 880 :
-          st.giveItems(6849+ALT_RP100,1)
-        elif random < 960 :
-          st.giveItems(6847+ALT_RP100,1)
-        elif random < 1000 :
-          st.giveItems(6851+ALT_RP100,1)
-        st.playSound("ItemSound.quest_finish")
-        st.exitQuest(1)
-     else:
-        htmltext = Quest.getNoQuestMsg(player)
-   return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if st :
-        npcId = npc.getId()
-        id = st.getState()
-        if id == State.CREATED :
-             st.set("cond","0")
-        cond = st.getInt("cond")
-        if npcId == 31521 and cond == 0 :
-         if player.getLevel() >= 68 :
-               htmltext = "31521-0.htm"
-         else:
-               st.exitQuest(1)
-        elif id == State.STARTED :
-           if npcId == 31547 and cond == 1 and st.getQuestItemsCount(SPECIAL_DRINK) :
-                 htmltext = "31547-0.htm"
-           elif npcId == 31546 and cond == 2 and st.getQuestItemsCount(SPECIAL_DRINK) :
-                 htmltext = "31546-0.htm"
-           elif npcId == 31545 and cond == 3 and st.getQuestItemsCount(SPECIAL_DRINK) :
-                 htmltext = "31545-0.htm"
-           elif npcId == 31544 and cond == 4 and st.getQuestItemsCount(SPECIAL_DRINK) :
-                 htmltext = "31544-0.htm"
-           elif npcId == 31543 and cond == 5 and st.getQuestItemsCount(SPECIAL_DRINK) :
-                 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)
-
-for i in range(31543,31548)+[31267,31521]:
-    QUEST.addTalkId(i)

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java

@@ -149,8 +149,7 @@ public final class Q00367_ElectrifyingRecharge extends Quest
 				{
 					giveItems(luckyPlayer, TITAN_LAMP5, 1);
 					takeItems(luckyPlayer, TITAN_LAMP4, -1);
-					luckyPlayer.getQuestState(getName()).setCond(2);
-					playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+					luckyPlayer.getQuestState(getName()).setCond(2, true);
 				}
 			}
 			else if ((random == 1) && !hasQuestItems(luckyPlayer, BROKEN_TITAN_LAMP))

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31267-01.html

@@ -0,0 +1,4 @@
+<head><body>Lietta:<br>
+Are you here for something? Or perhaps to drop something off?<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31267-02.html">"Jeremy sent me to get some Adena."</a>
+</head></body>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31267-02.html

@@ -0,0 +1,5 @@
+<head><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.
+</head></body>

+ 6 - 5
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-0.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-01.htm

@@ -1,5 +1,6 @@
-<html><body>Chef Jeremy:<br>
-You look like you could use a few extra adena...<br>
-Well I'm looking for a helper! You'll earn an honest wage around here, that's for sure!<br>
-All you have to do is take these specialty liquors to my customers. Their names are already written down. Deliver them quickly, and who knows? I might teach you a secret cooking technique! Ha!<br>
-<a action="bypass -h Quest 622_DeliveryOfSpecialLiquor 31521-1.htm">I'll deliver your liquor.</a></body></html>
+<head><body>Chef Jeremy:<br>
+You look like you could use a few extra Adena...<br>
+Well I'm looking for a helper! You'll earn an honest wage around here, that's for sure!<br>
+All you have to do is take these specialty liquors to my customers. Their names are already written down. Deliver them quickly, and who knows? I might teach you a secret cooking technique! Ha!<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31521-03.htm">"I'll deliver your liquor."</a>
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-02.htm

@@ -0,0 +1,4 @@
+<head><body>Chef Jeremy:<br>
+Many dangerous and ferocious beasts lurk these parts. I'd really hate to have to bury another assistant!<br>
+(Only a character of level 68 or above may undertake this quest.) 
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-03.htm

@@ -0,0 +1,4 @@
+<head><body>Chef Jeremy:<br>
+Please take this specialty liquor to my customers at the hot springs resort.<br>
+Our motto is "The Customer Always Comes First!" Don't ever forget it!
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-04.html

@@ -0,0 +1,4 @@
+<head><body>Chef Jeremy:<br>
+What are you waiting for?<br>
+Think my customers who are waiting for my delicious liquor to arrive! Get going!
+</head></body>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-05.html

@@ -0,0 +1,5 @@
+<head><body>Jeremy:<br>
+You've come back?<br>
+Did you finish delivering all the liquor?<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31521-06.html">"I completed the delivery."</a>
+</head></body>

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-3.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-06.html

@@ -1,4 +1,4 @@
-<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>
+<head><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.
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-07.html

@@ -0,0 +1,3 @@
+<head><body>Jeremy:<br>
+Deliver and collect the money, deliver and collect the money. You just have to keep repeating. Go finish the rest of your deliveries and get back here.
+</head></body>

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/622_DeliveryOfSpecialLiquor/31521-4.htm → L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31521-08.html

@@ -1,4 +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>
+<head><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.
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-01.html

@@ -0,0 +1,4 @@
+<head><body>Pulin:<br>
+You're the liquor delivery man, right? Show me the booze! I came all the way from Horse Island for a drink!<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31543-02.html">"Here's the liquor delivery."</a>
+</head></body>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-02.html

@@ -0,0 +1,5 @@
+<head><body>Pulin:<br>
+Actually, I'm not much of a drinker...<br>
+I thought this might be different!<br>
+Here's your money.
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-03.html

@@ -0,0 +1,3 @@
+<head><body>Pulin:<br>
+Does alcohol taste different here? I'm scared but excited at the same time! I want a drink!
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31543-04.html

@@ -0,0 +1,3 @@
+<head><body>Pulin:<br>
+I think the taste of this liquor is starting to grow on me! I'll probably be seeing you again!
+</head></body>

+ 5 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-01.html

@@ -0,0 +1,5 @@
+<head><body>Naff:<br>
+The hot springs always reminds me of Jeremy's special liquor!<br>
+Let me guess... You must be Jeremy's delivery man!<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31544-02.html">Say "I've brought you some specially brewed liquor!"</a>
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-02.html

@@ -0,0 +1,4 @@
+<head><body>Naff:<br>
+What a marvelous taste!<br>
+It's truly worthy of the gods!
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-03.html

@@ -0,0 +1,4 @@
+<head><body>Naff:<br>
+I'm trying to be patient, but it's not working!<br>
+Where the hell is my liquor?
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31544-04.html

@@ -0,0 +1,4 @@
+<head><body>Naff:<br>
+How could I have gotten so drunk from one glass?<br>
+Woohoo! I feel great!
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-01.html

@@ -0,0 +1,4 @@
+<head><body>Crocus:<br>
+I need a drink! Do you have any liquor?<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31545-02.html">"I have your liquor right here!"</a>
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-02.html

@@ -0,0 +1,4 @@
+<head><body>Crocus:<br>
+The fruity bouquet and sparkling sensation on my tongue is awesome! There's absolutely nothing like this in the whole world!<br>
+Jeremy's liquor is unique to this region but very popular everywhere! I'm so glad I came here.
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-03.html

@@ -0,0 +1,3 @@
+<head><body>Crocus:<br>
+What a wonderful diversion! I'll wager that even the gods are jealous! If only I could snack on some of Jeremy's eggs...
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31545-04.html

@@ -0,0 +1,3 @@
+<head><body>Crocus:<br>
+If I could eat just one of Jeremy's eggs, I'd be the happiest person in the world!
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-01.html

@@ -0,0 +1,4 @@
+<head><body>Kuber:<br>
+That feels so good! I ordered a boiled egg to go with my drink! Once the liquor and the egg arrive, I'll be in heaven!<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31546-02.html">"I'm here to deliver some liquor."</a>
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-02.html

@@ -0,0 +1,4 @@
+<head><body>Kuber:<br>
+Mmm... That's delicious!<br>
+You look tired! Can I buy you a drink?
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-03.html

@@ -0,0 +1,3 @@
+<head><body>Kuber:<br>
+What happened to my liquor? I can't wait any longer!
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31546-04.html

@@ -0,0 +1,3 @@
+<head><body>Kuber:<br>
+Thank you so much! I look forward to getting more deliveries from you!
+</head></body>

+ 4 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-01.html

@@ -0,0 +1,4 @@
+<head><body>Beolin:<br>
+Dammit! I need a drink! When will that liquor order get here?<br>
+<a action="bypass -h Quest Q00622_SpecialtyLiquorDelivery 31547-02.html">"I'm here to deliver some liquor."</a>
+</head></body>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-02.html

@@ -0,0 +1,6 @@
+<head><body>Beolin:<br>
+It's about time!<br>
+Mmm... These hot springs just aren't the same without a nice glass of wine...<br>
+Hee hee... I'll never get tired of drinking this stuff!<br>
+Oh, thanks for the delivery! Here's the money for the wine.
+</head></body>

+ 3 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-03.html

@@ -0,0 +1,3 @@
+<head><body>Beolin:<br>
+Boy, do I need a drink! Are you by any chance the deliveryman Jeremy sent? He should be here by now!
+</head></body>

+ 6 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/31547-04.html

@@ -0,0 +1,6 @@
+<head><body>Beolin:<br>
+Mmm!<br>
+Gulp~!<br>
+Oh, yeah! That's the stuff!<br>
+What are you staring at, stranger?
+</head></body>

+ 285 - 0
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00622_SpecialtyLiquorDelivery/Q00622_SpecialtyLiquorDelivery.java

@@ -0,0 +1,285 @@
+/*
+ * 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.Q00622_SpecialtyLiquorDelivery;
+
+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;
+
+/**
+ * Liquor Delivery (622)
+ * @author Janiko
+ */
+public final class Q00622_SpecialtyLiquorDelivery extends Quest
+{
+	// NPCs
+	private static final int JEREMY = 31521;
+	private static final int PULIN = 31543;
+	private static final int NAFF = 31544;
+	private static final int CROCUS = 31545;
+	private static final int KUBER = 31546;
+	private static final int BOELIN = 31547;
+	private static final int LIETTA = 31267;
+	// Items
+	private static final int SPECIAL_DRINK = 7197;
+	private static final int SPECIAL_DRINK_PRICE = 7198;
+	// Rewards
+	private static final int QUICK_STEP_POTION = 734;
+	private static final int SEALED_RING_OF_AURAKYRA = 6849;
+	private static final int SEALED_SANDDRAGONS_EARING = 6847;
+	private static final int SEALED_DRAGON_NECKLACE = 6851;
+	// Misc
+	private static final int MIN_LVL = 68;
+	// Talkers
+	private static final List<Integer> TALKERS = Arrays.asList(KUBER, CROCUS, NAFF, PULIN);
+	
+	private Q00622_SpecialtyLiquorDelivery()
+	{
+		super(622, Q00622_SpecialtyLiquorDelivery.class.getSimpleName(), "Specialty Liquor Delivery");
+		addStartNpc(JEREMY);
+		addStartNpc(JEREMY);
+		addTalkId(JEREMY, BOELIN, LIETTA);
+		addTalkId(TALKERS);
+		registerQuestItems(SPECIAL_DRINK, SPECIAL_DRINK_PRICE);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		String htmltext = null;
+		if (qs == null)
+		{
+			return htmltext;
+		}
+		switch (event)
+		{
+			case "31521-03.htm":
+			{
+				if (qs.isCreated())
+				{
+					qs.startQuest();
+					giveItems(player, SPECIAL_DRINK, 5);
+					htmltext = event;
+				}
+				break;
+			}
+			case "31521-06.html":
+			{
+				if (qs.isCond(6))
+				{
+					if (getQuestItemsCount(player, SPECIAL_DRINK_PRICE) >= 5)
+					{
+						qs.setCond(7, true);
+						takeItems(player, -1, SPECIAL_DRINK_PRICE);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "31521-07.html";
+					}
+				}
+				break;
+			}
+			case "31547-02.html":
+			{
+				if (qs.isCond(1))
+				{
+					if (hasQuestItems(player, SPECIAL_DRINK))
+					{
+						qs.setCond(2, true);
+						takeItems(player, SPECIAL_DRINK, 1);
+						giveItems(player, SPECIAL_DRINK_PRICE, 1);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "31547-03.html";
+					}
+				}
+				break;
+			}
+			case "31543-02.html":
+			case "31544-02.html":
+			case "31545-02.html":
+			case "31546-02.html":
+			{
+				if (TALKERS.contains(npc.getId()) && qs.isCond(TALKERS.indexOf(npc.getId()) + 2))
+				{
+					if (hasQuestItems(player, SPECIAL_DRINK))
+					{
+						qs.setCond(qs.getCond() + 1, true);
+						takeItems(player, SPECIAL_DRINK, 1);
+						giveItems(player, SPECIAL_DRINK_PRICE, 1);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = npc.getId() + "-03.html";
+					}
+				}
+				break;
+			}
+			case "31267-02.html":
+			{
+				if (qs.isCond(7))
+				{
+					int rnd = getRandom(1000);
+					if (rnd < 800)
+					{
+						rewardItems(player, QUICK_STEP_POTION, 1);
+						giveAdena(player, 18800, true);
+					}
+					else if (rnd < 880)
+					{
+						rewardItems(player, SEALED_RING_OF_AURAKYRA, 1);
+					}
+					else if (rnd < 960)
+					{
+						rewardItems(player, SEALED_SANDDRAGONS_EARING, 1);
+					}
+					else
+					{
+						rewardItems(player, SEALED_DRAGON_NECKLACE, 1);
+					}
+					qs.exitQuest(true, true);
+					htmltext = event;
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance talker)
+	{
+		final QuestState qs = getQuestState(talker, true);
+		String htmltext = getNoQuestMsg(talker);
+		switch (npc.getId())
+		{
+			case JEREMY:
+			{
+				switch (qs.getState())
+				{
+					case State.CREATED:
+					{
+						htmltext = (talker.getLevel() >= MIN_LVL) ? "31521-01.htm" : "31521-02.htm";
+						break;
+					}
+					case State.STARTED:
+					{
+						switch (qs.getCond())
+						{
+							case 1:
+							{
+								htmltext = "31521-04.html";
+								break;
+							}
+							case 6:
+							{
+								if (hasQuestItems(talker, SPECIAL_DRINK_PRICE))
+								{
+									htmltext = "31521-05.html";
+								}
+								break;
+							}
+							case 7:
+							{
+								if (!hasQuestItems(talker, SPECIAL_DRINK))
+								{
+									htmltext = "31521-08.html";
+								}
+								break;
+							}
+						}
+						break;
+					}
+					case State.COMPLETED:
+					{
+						htmltext = getAlreadyCompletedMsg(talker);
+						break;
+					}
+				}
+				break;
+			}
+			case BOELIN:
+			{
+				if (qs.isStarted())
+				{
+					switch (qs.getCond())
+					{
+						case 1:
+						{
+							if (getQuestItemsCount(talker, SPECIAL_DRINK) >= 5)
+							{
+								htmltext = "31547-01.html";
+							}
+							break;
+						}
+						case 2:
+						{
+							htmltext = "31547-04.html";
+							break;
+						}
+					}
+				}
+				break;
+			}
+			case KUBER:
+			case CROCUS:
+			case NAFF:
+			case PULIN:
+			{
+				if (qs.isStarted())
+				{
+					final int cond = TALKERS.indexOf(npc.getId()) + 2;
+					if (qs.isCond(cond) && hasQuestItems(talker, SPECIAL_DRINK_PRICE)) // 2,3,4,5
+					{
+						htmltext = npc.getId() + "-01.html";
+					}
+					else if (qs.isCond(cond + 1)) // 3,4,5,6
+					{
+						htmltext = npc.getId() + "-04.html";
+					}
+				}
+				break;
+			}
+			case LIETTA:
+			{
+				if (qs.isStarted() && qs.isCond(7))
+				{
+					htmltext = "31267-01.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00622_SpecialtyLiquorDelivery();
+	}
+}

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java

@@ -103,9 +103,9 @@ public final class Q00654_JourneyToASettlement extends Quest
 	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
 	{
 		final QuestState st = getRandomPartyMemberState(player, 2, 3, npc);
-		if (st != null)
+		if ((st != null) && giveItemRandomly(st.getPlayer(), npc, ANTELOPE_SKIN, 1, 1, MOBS_SKIN.get(npc.getId()), true))
 		{
-			giveItemRandomly(st.getPlayer(), npc, ANTELOPE_SKIN, 1, 1, MOBS_SKIN.get(npc.getId()), true);
+			st.setCond(3);
 		}
 		return super.onKill(npc, player, isSummon);
 	}

+ 2 - 1
L2J_DataPack_BETA/dist/sql/game/updates/20131222update.sql

@@ -1,2 +1,3 @@
 UPDATE character_quests SET name='Q00366_SilverHairedShaman' WHERE name='366_SilverHairedShaman';
-UPDATE character_quests SET name='Q00367_ElectrifyingRecharge' WHERE name='367_ElectrifyingRecharge';
+UPDATE character_quests SET name='Q00367_ElectrifyingRecharge' WHERE name='367_ElectrifyingRecharge';
+UPDATE character_quests SET name='Q00367_ElectrifyingRecharge' WHERE name='622_DeliveryOfSpecialLiquor';