diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/421_LittleWingAdventures/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/421_LittleWingAdventures/__init__.py index ead7fe2343e13af6be1ec1f04c26aa5ed00c5e14..96b9021b1f0693628a8e68bb6a41ca002dd61094 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/421_LittleWingAdventures/__init__.py +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/421_LittleWingAdventures/__init__.py @@ -199,7 +199,7 @@ class Quest (JQuest) : npc.setTarget(player) skill = SkillTable.getInstance().getInfo(4167,1) if skill != None: - skill.getEffects(npc, player) + skill.applyEffects(npc, player) htmltext = "30747-18.htm" elif st.getQuestItemsCount(3501) == 1 : item = player.getInventory().getItemByItemId(3501) @@ -214,7 +214,7 @@ class Quest (JQuest) : npc.setTarget(player) skill = SkillTable.getInstance().getInfo(4167,1) if skill != None: - skill.getEffects(npc, player) + skill.applyEffects(npc, player) htmltext = "30747-18.htm" elif st.getQuestItemsCount(3502) == 1 : item = player.getInventory().getItemByItemId(3502) @@ -229,7 +229,7 @@ class Quest (JQuest) : npc.setTarget(player) skill = SkillTable.getInstance().getInfo(4167,1) if skill != None: - skill.getEffects(npc, player) + skill.applyEffects(npc, player) htmltext = "30747-18.htm" else : htmltext = "30747-18.htm" diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py index 2f7d941da09a22e7eb043cad273166698cde88a1..a6eb4828ef333e1dad0432563882c23411ce73bb 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/501_ProofOfClanAlliance/__init__.py @@ -68,13 +68,6 @@ def leader(player) : leaderst = leader.getQuestState(qn) return leaderst -def isEffected(player,skillId) : - bool = 0 - effect = player.getFirstEffect(skillId) - if effect : - bool = 1 - return bool - class Quest (JQuest) : def __init__(self,id,name,descr) : @@ -120,7 +113,7 @@ class Quest (JQuest) : st.set("cond","3") st.startQuestTimer("poison_timer",3600000) st.addNotifyOfDeath(player) - SkillTable.getInstance().getInfo(4082,1).getEffects(npc,player); + SkillTable.getInstance().getInfo(4082,1).applyEffects(npc,player); elif event == "poison_timer" : st.exitQuest(1) if DEBUG : @@ -221,10 +214,10 @@ class Quest (JQuest) : htmltext = "01" elif part == 2 and symbol < 3 : htmltext = "05" - elif symbol >= 3 and not isEffected(player,4082) : + elif symbol >= 3 and not player.isAffectedBySkill(4082) : htmltext = "06" elif part == 5 and st.getQuestItemsCount(HERB_OF_HARIT) and st.getQuestItemsCount(HERB_OF_VANOR) and \ - st.getQuestItemsCount(HERB_OF_OEL_MAHUM) and st.getQuestItemsCount(BLOOD_OF_EVA) and isEffected(player,4082): + st.getQuestItemsCount(HERB_OF_OEL_MAHUM) and st.getQuestItemsCount(BLOOD_OF_EVA) and player.isAffectedBySkill(4082): htmltext = "08" st.giveItems(VOUCHER_OF_FAITH,1) st.giveItems(POTION_OF_RECOVERY,1) @@ -235,7 +228,7 @@ class Quest (JQuest) : timer = st.getQuestTimer("poison_timer") if timer != None : timer.cancel() elif part == 3 or part == 4 or part == 5 : - if not isEffected(player,4082) : + if not player.isAffectedBySkill(4082) : htmltext = "09" st.set("part","1") st.takeItems(ANTIDOTE_RECIPE,-1)