From bd0ac70590b7e0d21220eb642a241a375ad764ce Mon Sep 17 00:00:00 2001 From: Zoey76 <zoey_76@msn.com> Date: Sun, 12 Jan 2014 22:56:52 +0000 Subject: [PATCH] BETA: Fixes for quest Refined Dragon Blood (905). * Fixed double reward. * Fixed dialog delay, working one time until restart. * Added missing kill/reward ID. * Implemented reward items. * Implemented skills from reward items. Reported by: St3eT --- .../Q00905_RefinedDragonBlood.java | 9 +++---- .../game/data/stats/items/21900-21999.xml | 22 +++++++++++++++++ .../game/data/stats/skills/22200-22299.xml | 24 ++++++++++++------- 3 files changed, 43 insertions(+), 12 deletions(-) diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java index f7aee5e6bd..fc9e9c5e8c 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java @@ -62,6 +62,7 @@ public final class Q00905_RefinedDragonBlood extends Quest MONSTERS.put(22846, UNREFINED_BLUE_DRAGON_BLOOD); // Elite Dragon Knight MONSTERS.put(22847, UNREFINED_RED_DRAGON_BLOOD); // Dragon Knight Warrior MONSTERS.put(22848, UNREFINED_RED_DRAGON_BLOOD); // Drake Leader + MONSTERS.put(22849, UNREFINED_RED_DRAGON_BLOOD); // Drake Warrior MONSTERS.put(22850, UNREFINED_RED_DRAGON_BLOOD); // Drake Scout MONSTERS.put(22851, UNREFINED_RED_DRAGON_BLOOD); // Drake Mage MONSTERS.put(22852, UNREFINED_BLUE_DRAGON_BLOOD); // Dragon Guard @@ -71,8 +72,6 @@ public final class Q00905_RefinedDragonBlood extends Quest private static final int MIN_LEVEL = 83; private static final int DRAGON_BLOOD_COUNT = 10; - private boolean _wait = true; - private Q00905_RefinedDragonBlood(int questId, String name, String descr) { super(questId, name, descr); @@ -138,6 +137,7 @@ public final class Q00905_RefinedDragonBlood extends Quest st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = event; + break; } case "32864-12.html": { @@ -145,6 +145,7 @@ public final class Q00905_RefinedDragonBlood extends Quest st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = event; + break; } } } @@ -186,10 +187,10 @@ public final class Q00905_RefinedDragonBlood extends Quest } case 2: { - if (_wait) + if (!st.isSet("wait")) { htmltext = "32864-07.html"; - _wait = false; + st.set("wait", 1); } else { diff --git a/L2J_DataPack_BETA/dist/game/data/stats/items/21900-21999.xml b/L2J_DataPack_BETA/dist/game/data/stats/items/21900-21999.xml index 37a30fdced..55aa505e60 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/items/21900-21999.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/items/21900-21999.xml @@ -54,16 +54,38 @@ <item id="21903" type="EtcItem" name="Refined Red Dragon Blood"> <!-- Description: When used, instantly recovers some HP to yourself and to party members. Can only be used inside the lairs of Valakas and Antharas. Re-use time is 5 minutes. --> <set name="icon" val="BranchSys2.icon.refined_red_blood_of_dragon" /> + <set name="default_action" val="skill_reduce" /> + <set name="etcitem_type" val="potion" /> + <set name="immediate_effect" val="1" /> <set name="material" val="liquid" /> <set name="weight" val="10" /> + <set name="shared_reuse_group" val="20" /> <!-- TODO: Custom. --> + <set name="reuse_delay" val="300000" /> <set name="is_stackable" val="true" /> + <set name="is_oly_restricted" val="true" /> + <set name="handler" val="ItemSkills" /> + <set name="item_skill" val="22298-1" /> + <cond msgId="113" addName="1"> + <player insideZoneId="12010, 12001" /> + </cond> </item> <item id="21904" type="EtcItem" name="Refined Blue Dragon Blood"> <!-- Description: When used, instantly recovers some MP to yourself and to party members. Can only be used inside the lairs of Valakas and Antharas. Re-use time is 5 minutes. --> <set name="icon" val="BranchSys2.icon.refined_blue_blood_of_dragon" /> + <set name="default_action" val="skill_reduce" /> + <set name="etcitem_type" val="potion" /> + <set name="immediate_effect" val="1" /> <set name="material" val="liquid" /> <set name="weight" val="10" /> + <set name="shared_reuse_group" val="20" /> <!-- TODO: Custom. --> + <set name="reuse_delay" val="300000" /> <set name="is_stackable" val="true" /> + <set name="is_oly_restricted" val="true" /> + <set name="handler" val="ItemSkills" /> + <set name="item_skill" val="22299-1" /> + <cond msgId="113" addName="1"> + <player insideZoneId="12010, 12001" /> + </cond> </item> <item id="21905" type="EtcItem" name="Clear Crystal"> <!-- Description: There is nothing inside the clear crystal. Rumors say that this crystal can store the Antharas's energy. --> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml index 624db308c9..67c0c244f3 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22200-22299.xml @@ -743,17 +743,25 @@ </for> </skill> <skill id="22298" levels="1" name="Refined Red Dragon Blood"> - <!-- none --> <set name="icon" val="BranchSys2.icon.refined_red_blood_of_dragon" /> - <set name="operateType" val="P" /> - <set name="skillType" val="NOTDONE" /> - <set name="targetType" val="NONE" /> + <set name="isMagic" val="2" /> <!-- Static Skill --> + <set name="itemConsumeCount" val="1" /> + <set name="itemConsumeId" val="21903" /> + <set name="operateType" val="A1" /> + <set name="targetType" val="PARTY" /> + <for> + <effect name="Heal" val="1000" /> <!-- TODO: Custom. --> + </for> </skill> <skill id="22299" levels="1" name="Refined Blue Dragon Blood"> - <!-- none --> <set name="icon" val="BranchSys2.icon.refined_blue_blood_of_dragon" /> - <set name="operateType" val="P" /> - <set name="skillType" val="NOTDONE" /> - <set name="targetType" val="NONE" /> + <set name="isMagic" val="2" /> <!-- Static Skill --> + <set name="itemConsumeCount" val="1" /> + <set name="itemConsumeId" val="21904" /> + <set name="operateType" val="A1" /> + <set name="targetType" val="PARTY" /> + <for> + <effect name="ManaHeal" val="1000" /> <!-- TODO: Custom. --> + </for> </skill> </list> -- GitLab