fix for #2273

datapack_development/data/scripts/quests/134_TempleMissionary/__init__.py

@@ -45,7 +45,7 @@ class Quest (JQuest) :
        st.exitQuest(False)
        st.giveItems(57, 15100)
        st.giveItems(BADGE, 1)
-       if player.getLevel() >= 35 and player.getLevel() <= 40:
+       if st.getPlayer().getLevel() >= 35 and st.getPlayer().getLevel() <= 40:
           st.addExpAndSp(30000,2000)
     elif event == "31418-02.htm" :
        st.set("cond","3")

datapack_development/data/scripts/quests/135_TempleExecutor/__init__.py

@@ -46,7 +46,7 @@ class Quest (JQuest) :
        st.exitQuest(False)
        st.giveItems(57, 16924)
        st.giveItems(BADGE, 1)
-       if player.getLevel() >= 35 and player.getLevel() <= 40:
+       if st.getPlayer().getLevel() >= 35 and st.getPlayer().getLevel() <= 40:
           st.addExpAndSp(30000,2000)
     elif event == "30068-03.htm" :
        st.set("cond","2")

datapack_development/data/scripts/quests/137_TempleChampionPart1/__init__.py

@@ -47,7 +47,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_finish")
        st.unset("talk")
        st.exitQuest(False)
-       if player.getLevel() >= 35 and player.getLevel() <= 40:
+       if st.getPlayer().getLevel() >= 35 and st.getPlayer().getLevel() <= 40:
           st.addExpAndSp(219975,13047)
     return htmltext
 

datapack_development/data/scripts/quests/138_TempleChampionPart2/__init__.py

@@ -41,7 +41,7 @@ class Quest (JQuest) :
        st.giveItems(57, 84593)
        st.playSound("ItemSound.quest_finish")
        st.exitQuest(False)
-       if player.getLevel() >= 36 and player.getLevel() <= 41:
+       if st.getPlayer().getLevel() >= 36 and st.getPlayer().getLevel() <= 41:
           st.addExpAndSp(219975,13047)
     elif event == "30070-03.htm" :
        st.set("cond","2")

datapack_development/data/scripts/quests/139_ShadowFoxPart1/__init__.py

@@ -42,7 +42,7 @@ class Quest (JQuest) :
        st.unset("talk")
        st.exitQuest(False)
        st.giveItems(57, 14050)
-       if player.getLevel() >= 37 and player.getLevel() <= 42:
+       if st.getPlayer().getLevel() >= 37 and st.getPlayer().getLevel() <= 42:
           st.addExpAndSp(30000,2000)
     return htmltext
 

datapack_development/data/scripts/quests/140_ShadowFoxPart2/__init__.py

@@ -41,7 +41,7 @@ class Quest (JQuest) :
        st.unset("talk")
        st.exitQuest(False)
        st.giveItems(57, 18775)
-       if player.getLevel() >= 37 and player.getLevel() <= 42:
+       if st.getPlayer().getLevel() >= 37 and st.getPlayer().getLevel() <= 42:
           st.addExpAndSp(30000,2000)
     elif event == "30912-07.htm" :
        st.set("cond","3")

datapack_development/data/scripts/quests/141_ShadowFoxPart3/__init__.py

@@ -42,7 +42,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_finish")
        st.exitQuest(False)
        st.giveItems(57, 88888)
-       if player.getLevel() >= 37 and player.getLevel() <= 42:
+       if st.getPlayer().getLevel() >= 37 and st.getPlayer().getLevel() <= 42:
           st.addExpAndSp(219975,13047)
     elif event == "AngelSelect" :
        qs = player.getQuestState("998_FallenAngelSelect")
@@ -109,7 +109,7 @@ class Quest (JQuest) :
       if qs.getState() == State.COMPLETED :
          if st.getState() == State.CREATED :
             st.setState(State.STARTED)
-   if st.getState() == State.COMPLETED :
+   if st.getState() == State.COMPLETED and player.getLevel() >= 38:
       if not qs2 :
          q = QuestManager.getInstance().getQuest("998_FallenAngelSelect")
          if q :

datapack_development/data/scripts/quests/998_FallenAngelSelect/30894-01.htm

@@ -3,6 +3,6 @@ On behalf of Shadow Fox's organization, you must choose either the request of th
 Choose carefully -- there is no going back...<br><br>
 <a action="bypass -h Quest 998_FallenAngelSelect 30894-02.htm">"Tell me about the Temple and the Rulers of Dawn again."</a><br>
 <a action="bypass -h Quest 998_FallenAngelSelect 30894-03.htm">"Tell me about the Preachers of the Wilderness and the Revolutionaries of Dusk again."</a><br><br>
-"I will carry out the mission of the Temple and the Rulers of Dawn."<br>
-"I will carry out the mission of the Preachers of the Wilderness and the Revolutionaries of Dusk."
+<a action="bypass -h Quest 998_FallenAngelSelect dawn">"I will carry out the mission of the Temple and the Rulers of Dawn."</a><br>
+<a action="bypass -h Quest 998_FallenAngelSelect dusk">"I will carry out the mission of the Preachers of the Wilderness and the Revolutionaries of Dusk."</a>
 </body></html>

datapack_development/data/scripts/quests/998_FallenAngelSelect/__init__.py

@@ -2,6 +2,7 @@
 # this script is part of the Official L2J Datapack Project.
 # Visit http://forum.l2jdp.com for more details.
 import sys
+from net.sf.l2j.gameserver.instancemanager import QuestManager
 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
@@ -15,6 +16,22 @@ class Quest (JQuest) :
  def __init__(self,id,name,descr):    JQuest.__init__(self,id,name,descr)
 
  def onEvent (self,event,st) :
+    q1 = QuestManager.getInstance().getQuest("142_FallenAngelRequestOfDawn")
+    q2 = QuestManager.getInstance().getQuest("143_FallenAngelRequestOfDusk")
+    if event == "dawn" :
+       if q1 :
+          qs1 = q.newQuestState(player)
+          qs1.setState(State.STARTED)
+          qs1.getQuest().onEvent(qs1.getQuest(), "30894-01.htm", qs1)
+          st.setState(State.COMPLETED)
+       return
+    elif event == "dusk" :
+       if q2 :
+          qs2 = q.newQuestState(player)
+          qs2.setState(State.STARTED)
+          qs2.getQuest().onEvent(qs2.getQuest(), "30894-01.htm", qs2)
+          st.setState(State.COMPLETED)
+       return
     return event
 
  def onTalk (self,npc,player):