Home Explore Help
Register Sign In
L2j
/
l2j-server-datapack
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Just cleaning mostly. Little fix to noblesse quest saga, should resolve issues with quest aborting when player tries to use main char instead of subclass (might fix #1892)

Emperorc 17 years ago
parent
a4204d1aed
commit
aeb99b48cf
39 changed files with 42 additions and 72 deletions
Split View Show Diff Stats
  1. 1 1
      datapack_development/data/html/default/30754.htm
  2. 1 2
      datapack_development/data/scripts/quests/100_SagaOfTheMaestro/__init__.py
  3. 1 2
      datapack_development/data/scripts/quests/241_PossessorOfAPreciousSoul_1/__init__.py
  4. 2 0
      datapack_development/data/scripts/quests/242_PossessorOfAPreciousSoul_2/__init__.py
  5. 2 1
      datapack_development/data/scripts/quests/246_PossessorOfAPreciousSoul_3/__init__.py
  6. 2 0
      datapack_development/data/scripts/quests/247_PossessorOfAPreciousSoul_4/__init__.py
  7. 1 2
      datapack_development/data/scripts/quests/67_SagaOfTheDoombringer/__init__.py
  8. 1 2
      datapack_development/data/scripts/quests/68_SagaOfTheSoulHound/__init__.py
  9. 1 2
      datapack_development/data/scripts/quests/69_SagaOfTheTrickster/__init__.py
  10. 1 2
      datapack_development/data/scripts/quests/70_SagaOfThePhoenixKnight/__init__.py
  11. 1 2
      datapack_development/data/scripts/quests/71_SagaOfEvasTemplar/__init__.py
  12. 1 2
      datapack_development/data/scripts/quests/72_SagaOfTheSwordMuse/__init__.py
  13. 1 2
      datapack_development/data/scripts/quests/73_SagaOfTheDuelist/__init__.py
  14. 1 2
      datapack_development/data/scripts/quests/74_SagaOfTheDreadnoughts/__init__.py
  15. 1 2
      datapack_development/data/scripts/quests/75_SagaOfTheTitan/__init__.py
  16. 1 2
      datapack_development/data/scripts/quests/76_SagaOfTheGrandKhavatari/__init__.py
  17. 1 2
      datapack_development/data/scripts/quests/77_SagaOfTheDominator/__init__.py
  18. 1 2
      datapack_development/data/scripts/quests/78_SagaOfTheDoomcryer/__init__.py
  19. 1 2
      datapack_development/data/scripts/quests/79_SagaOfTheAdventurer/__init__.py
  20. 1 2
      datapack_development/data/scripts/quests/80_SagaOfTheWindRider/__init__.py
  21. 1 2
      datapack_development/data/scripts/quests/81_SagaOfTheGhostHunter/__init__.py
  22. 1 2
      datapack_development/data/scripts/quests/82_SagaOfTheSagittarius/__init__.py
  23. 1 2
      datapack_development/data/scripts/quests/83_SagaOfTheMoonlightSentinel/__init__.py
  24. 1 2
      datapack_development/data/scripts/quests/84_SagaOfTheGhostSentinel/__init__.py
  25. 1 2
      datapack_development/data/scripts/quests/85_SagaOfTheCardinal/__init__.py
  26. 1 2
      datapack_development/data/scripts/quests/86_SagaOfTheHierophant/__init__.py
  27. 1 2
      datapack_development/data/scripts/quests/87_SagaOfEvasSaint/__init__.py
  28. 1 2
      datapack_development/data/scripts/quests/88_SagaOfTheArchmage/__init__.py
  29. 1 2
      datapack_development/data/scripts/quests/89_SagaOfTheMysticMuse/__init__.py
  30. 1 2
      datapack_development/data/scripts/quests/90_SagaOfTheStormScreamer/__init__.py
  31. 1 2
      datapack_development/data/scripts/quests/91_SagaOfTheArcanaLord/__init__.py
  32. 1 2
      datapack_development/data/scripts/quests/92_SagaOfTheElementalMaster/__init__.py
  33. 1 2
      datapack_development/data/scripts/quests/93_SagaOfTheSpectralMaster/__init__.py
  34. 1 2
      datapack_development/data/scripts/quests/94_SagaOfTheSoultaker/__init__.py
  35. 1 2
      datapack_development/data/scripts/quests/95_SagaOfTheHellKnight/__init__.py
  36. 1 2
      datapack_development/data/scripts/quests/96_SagaOfTheSpectralDancer/__init__.py
  37. 1 2
      datapack_development/data/scripts/quests/97_SagaOfTheShillienTemplar/__init__.py
  38. 1 2
      datapack_development/data/scripts/quests/98_SagaOfTheShillienSaint/__init__.py
  39. 1 2
      datapack_development/data/scripts/quests/99_SagaOfTheFortuneSeeker/__init__.py

+ 1 - 1
datapack_development/data/html/default/30754.htm
View File 

@@ -1,7 +1,7 @@
 
 <html><body>Antharas Watchman Gilmore:<br>

 I am Gilmore, watcher of the beast Antharas...<br>

 I must monitor every breath that demon dragon takes, every twitch of its mighty tail, to assure that it does not awaken from its deep sleep. I have watched the beast for 1,000 years, since I had an army against him. We were able to subdue the beast, but he must be watched.<br>

-Do you truly desire to face Antharas, the Land Dragon? He is imprisoned in cave with no entryway. There is only one way in or out... The<font color="LEVEL"> Hearth of Warding</font>...<br>

+Do you truly desire to face Antharas, the Land Dragon? He is imprisoned in cave with no entryway. There is only one way in or out... The<font color="LEVEL"> Heart of Warding</font>...<br>

 <a action="bypass -h npc_%objectId%_Chat 1">"Tell me about the Heart of Warding."</a><br>

 <a action="bypass -h npc_%objectId%_Quest">Quest</a>

 </body></html>

+ 1 - 2
datapack_development/data/scripts/quests/100_SagaOfTheMaestro/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/241_PossessorOfAPreciousSoul_1/__init__.py
View File 

@@ -244,8 +244,7 @@ class Quest (JQuest) :
 
        elif cond == 21 :

          htmltext = "31272-7.htm"

    else :

-     htmltext = "31739-2.htm"

-     st.exitQuest(1)

+     htmltext = "<html><body>This quest may only be undertaken by sub-class characters of level 50 or above.</body></html>"

    return htmltext

 

  def onKill(self,npc,player,isPet):

+ 2 - 0
datapack_development/data/scripts/quests/242_PossessorOfAPreciousSoul_2/__init__.py
View File 

@@ -184,6 +184,8 @@ class Quest (JQuest) :
 
              htmltext = "31747-1.htm"

          elif cond == 11 :

              htmltext = "31747-2.htm"

+   else :

+     htmltext = "<html><body>This quest may only be undertaken by sub-class characters of level 50 or above.</body></html>"

    return htmltext

 

  def onKill(self,npc,player,isPet):

+ 2 - 1
datapack_development/data/scripts/quests/246_PossessorOfAPreciousSoul_3/__init__.py
View File 

@@ -82,7 +82,6 @@ class Quest (JQuest) :
 
          if cond == 0 and st.getQuestItemsCount(CARADINE_LETTER) == 1 :

            if id == State.COMPLETED :

              htmltext = "<html><body>This quest has already been completed.</body></html>"

-

            elif player.getLevel() < 65 : 

              htmltext = "31740-2.htm"

              st.exitQuest(1)

@@ -105,6 +104,8 @@ class Quest (JQuest) :
 
            htmltext = "31741-11.htm"

      elif npcId == LADD and cond == 6 :

        htmltext = "30721-1.htm"

+   else :

+     htmltext = "<html><body>This quest may only be undertaken by sub-class characters of level 50 or above.</body></html>"

    return htmltext

 

  def onKill(self,npc,player,isPet):

+ 2 - 0
datapack_development/data/scripts/quests/247_PossessorOfAPreciousSoul_4/__init__.py
View File 

@@ -65,6 +65,8 @@ class Quest (JQuest) :
 
              htmltext = "31740-6.htm"

      elif npcId == LADY_OF_LAKE and cond == 2 :

          htmltext = "31745-1.htm"

+   else :

+     htmltext = "<html><body>This quest may only be undertaken by sub-class characters of level 50 or above.</body></html>"

    return htmltext

 

 QUEST       = Quest(247,qn,"Possessor Of A Precious Soul - 4")

+ 1 - 2
datapack_development/data/scripts/quests/67_SagaOfTheDoombringer/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/68_SagaOfTheSoulHound/__init__.py
View File 

@@ -44,5 +44,4 @@ class Quest (JQuest) :
 
      if player.getAppearance().getSex() : return self.prevclass[1] #if female kamael

      else : return self.prevclass[0]                               #else, it's male

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/69_SagaOfTheTrickster/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/70_SagaOfThePhoenixKnight/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/71_SagaOfEvasTemplar/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/72_SagaOfTheSwordMuse/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/73_SagaOfTheDuelist/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/74_SagaOfTheDreadnoughts/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/75_SagaOfTheTitan/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/76_SagaOfTheGrandKhavatari/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/77_SagaOfTheDominator/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/78_SagaOfTheDoomcryer/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/79_SagaOfTheAdventurer/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/80_SagaOfTheWindRider/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/81_SagaOfTheGhostHunter/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/82_SagaOfTheSagittarius/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/83_SagaOfTheMoonlightSentinel/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/84_SagaOfTheGhostSentinel/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/85_SagaOfTheCardinal/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/86_SagaOfTheHierophant/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/87_SagaOfEvasSaint/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/88_SagaOfTheArchmage/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/89_SagaOfTheMysticMuse/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/90_SagaOfTheStormScreamer/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/91_SagaOfTheArcanaLord/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/92_SagaOfTheElementalMaster/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/93_SagaOfTheSpectralMaster/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/94_SagaOfTheSoultaker/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/95_SagaOfTheHellKnight/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/96_SagaOfTheSpectralDancer/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/97_SagaOfTheShillienTemplar/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/98_SagaOfTheShillienSaint/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)

+ 1 - 2
datapack_development/data/scripts/quests/99_SagaOfTheFortuneSeeker/__init__.py
View File 

@@ -33,5 +33,4 @@ class Quest (JQuest) :
 
      # finally, register all events to be triggered appropriately, using the overriden values.

      JQuest.registerNPCs(self)

 

-QUEST       = Quest(qnu,qn,qna)

-

+QUEST       = Quest(qnu,qn,qna)