瀏覽代碼

JYTHON: Update for quest 62_PathoftheTrooper, thx t0rm3nt0r!

Emperorc 17 年之前
父節點
當前提交
d63aa529f3

+ 1 - 1
datapack_development/data/scripts/quests/62_PathoftheTrooper/32194-03.htm

@@ -1,4 +1,4 @@
 <html><body>Master Shubain:<br>
-<font color="LEVEL">Go to the Fellmere Harvesting Grounds, defeat the Felim 
+As I told you earlier, experience is the best teacher. Go to the <font color="LEVEL">Fellmere Harvesting Grounds, defeat the Felim 
 Lizardman Warriors and bring back 5 of their heads.</font>
 </body></html>

+ 1 - 2
datapack_development/data/scripts/quests/62_PathoftheTrooper/32194-05.htm

@@ -1,4 +1,3 @@
 <html><body>Master Shubain:<br>
-Go to <font color="LEVEL">WindMill Hill</font> south of here, defeat the huge 
-Venomous Spiders and bring back 10 legs.
+Go to <font color="LEVEL">WindMill Hill</font> south of here, defeat the huge poison spiders and bring back 10 legs. Oh, you had best take an antidote with you...
 </body></html>

+ 1 - 1
datapack_development/data/scripts/quests/62_PathoftheTrooper/32194-07.htm

@@ -1,3 +1,3 @@
 <html><body>Master Shubain:<br>
-Go see Master Gwain in the Town of Gludio.
+Well done! Take this letter of recommendation to Master Gwain in the Town of Gludio.
 </body></html>

+ 5 - 0
datapack_development/data/scripts/quests/62_PathoftheTrooper/32197-00a.htm

@@ -0,0 +1,5 @@
+<html><body>Master Gwain:<br>
+So you have come here because you want to become a Dragon, eh? You should know that we only admit those who possess the right temperament and natural ability to learn our sophisticated skills.<br>
+In short, you must pass a test to prove yourself to us. I can tell from your look that you are not yet experienced enough to even attempt the test...<br>
+(Only male Kamael soldiers level 19 or higher may embark on this quest.)
+<body><html>

+ 0 - 0
datapack_development/data/scripts/quests/62_PathoftheTrooper/32197-00.htm → datapack_development/data/scripts/quests/62_PathoftheTrooper/32197-00b.htm


+ 1 - 2
datapack_development/data/scripts/quests/62_PathoftheTrooper/32197-03.htm

@@ -1,4 +1,3 @@
 <html><body>Master Gwain:<br>
-Go to Gludin Village, train under Master Shubain and bring back his letter of 
-recommendation. Then we will discuss the details of the test.
+First, go to Master Shubain in Gludin Village, train under him and obtain his recommendation. Then return here and we will discuss the details of the test in more detail.
 </body></html>

+ 1 - 3
datapack_development/data/scripts/quests/62_PathoftheTrooper/32197-05.htm

@@ -1,5 +1,3 @@
 <html><body>Master Gwain:<br>
-Follow the road that runs west of this village to a place called the 
-<font color="LEVEL">Ruins of Agony</font>. Defeat the <font color="LEVEL">
-Tumran Bugbear</font> and bring me his heart.
+Go to the <font color="LEVEL">Ruins of Agony</font> that lie to the west of this village, defeat the <font color="LEVEL">Tumran Bugbear</font> and bring me his heart.
 </body></html>

+ 5 - 0
datapack_development/data/scripts/quests/62_PathoftheTrooper/32197-07.htm

@@ -0,0 +1,5 @@
+<html><body>Master Gwain:<br>
+You have already passed the test! Didn't you go through with your class transfer?<br>
+If not, go to Grand Master Gershwin of the Kamael Guild. He will help you.<br>
+(You have already completed this quest.)
+</body></html>

+ 11 - 9
datapack_development/data/scripts/quests/62_PathoftheTrooper/__init__.py

@@ -1,4 +1,5 @@
 # Made by Emperorc
+# Update 17-01-08 by t0rm3nt0r
 import sys
 from net.sf.l2j.gameserver.model.quest import State
 from net.sf.l2j.gameserver.model.quest import QuestState
@@ -21,7 +22,7 @@ Head,Leg,Heart,Shubain_Rec,Gwain_Rec = range(9749,9754)
 class Quest (JQuest) :
     def __init__(self,id,name,descr):
         JQuest.__init__(self,id,name,descr)
-        self.questItemIds = range(9749,9754)
+        self.questItemIds = range(9749,9753)
 
     def onEvent (self,event,st) :
         htmltext = event
@@ -41,11 +42,13 @@ class Quest (JQuest) :
         id = st.getState()
         cond = st.getInt("cond")
         if id == State.COMPLETED :
-            htmltext = "<html><body>This quest has already been completed.</body></html>"
-
+            htmltext = "32197-07.htm"
         elif npcId == Gwain :
-            if player.getClassId().getId() != 123 or player.getLevel() < 19:
-                htmltext = "32197-00.htm"
+            if player.getLevel() < 19 :
+                htmltext = "32197-00a.htm"
+                st.exitQuest(1)
+            elif player.getClassId().getId() != 123 :
+                htmltext = "32197-00b.htm"
                 st.exitQuest(1)
             elif id == State.CREATED :
                 htmltext = "32197-01.htm"
@@ -64,7 +67,6 @@ class Quest (JQuest) :
                     st.addExpAndSp(3200,4736)
                     st.exitQuest(False)
                     st.playSound("ItemSound.quest_finish")
-                    st.unset("cond")
                     htmltext = "32197-06.htm"
         elif npcId == Shubain :
             if cond == 1 :
@@ -95,21 +97,21 @@ class Quest (JQuest) :
         npcId = npc.getNpcId()
         cond = st.getInt("cond")
         if npcId == Warrior :
-            if st.getQuestItemsCount(Head) < 5 and st.getRandom(10) < 4 and cond == 2 :
+            if st.getQuestItemsCount(Head) < 5 and cond == 2 :
                 st.giveItems(Head,1)
                 if st.getQuestItemsCount(Head) == 5 :
                     st.playSound("ItemSound.quest_middle")
                 else:
                     st.playSound("ItemSound.quest_itemget")
         elif npcId == Spider :
-            if st.getQuestItemsCount(Leg) < 10 and st.getRandom(10) < 6 and cond == 3 :
+            if st.getQuestItemsCount(Leg) < 10 and cond == 3 :
                 st.giveItems(Leg,1)
                 if st.getQuestItemsCount(Leg) == 10 :
                     st.playSound("ItemSound.quest_middle")
                 else:
                     st.playSound("ItemSound.quest_itemget")
         elif npcId == Tumran :
-            if not st.getQuestItemsCount(Heart) and st.getRandom(10) < 3 and cond == 5 :
+            if not st.getQuestItemsCount(Heart) and cond == 5 :
                 st.giveItems(Heart,1)
                 st.playSound("ItemSound.quest_middle")
         return