diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index 6dd92fc120e94e7ff2b8d76e210304a58043d82f..5426924b833d64b0dcd82b33722267f2b5aa56ea 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -19,7 +19,9 @@ package quests.Q00032_AnObviousLie; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import com.l2jserver.gameserver.enums.QuestSound; import com.l2jserver.gameserver.model.actor.L2Npc; @@ -30,10 +32,10 @@ import com.l2jserver.gameserver.model.quest.State; import com.l2jserver.gameserver.util.Util; /** - * An Obvious Lie (32) + * An Obvious Lie (32). * @author janiko */ -public class Q00032_AnObviousLie extends Quest +public final class Q00032_AnObviousLie extends Quest { // NPCs private static final int MAXIMILIAN = 30120; @@ -51,13 +53,16 @@ public class Q00032_AnObviousLie extends Quest private static final int MIN_LVL = 45; private static final int REQUIRED_HERB_COUNT = 20; // Reward - private static final int RACCOON_EAR = 7680; - private static final int CAT_EAR = 6843; - private static final int RABBIT_EAR = 7683; + private static final Map<String, Integer> EARS = new HashMap<>(); + { + EARS.put("cat", 6843); // Cat Ears + EARS.put("raccoon", 7680); // Raccoon ears + EARS.put("rabbit", 7683); // Rabbit ears + } - private Q00032_AnObviousLie(int questId, String name, String descr) + private Q00032_AnObviousLie() { - super(questId, name, descr); + super(32, Q00032_AnObviousLie.class.getSimpleName(), "An Obvious Lie"); addStartNpc(MAXIMILIAN); addTalkId(MAXIMILIAN, GENTLER, MIKI_THE_CAT); addKillId(ALLIGATOR); @@ -153,18 +158,9 @@ public class Q00032_AnObviousLie extends Quest { if (st.isCond(8) && (st.getQuestItemsCount(THREAD) >= 1000) && (st.getQuestItemsCount(SUEDE) >= 500)) { - if (event.equals("cat")) - { - st.giveItems(CAT_EAR, 1); - } - else if (event.equals("racoon")) - { - st.giveItems(RACCOON_EAR, 1); - } - else if (event.equals("rabbit")) - { - st.giveItems(RABBIT_EAR, 1); - } + st.takeItems(THREAD, 1000); + st.takeItems(SUEDE, 500); + st.rewardItems(EARS.get(event), 1); st.exitQuest(false, true); htmltext = "30094-16.html"; } @@ -340,6 +336,6 @@ public class Q00032_AnObviousLie extends Quest public static void main(String[] args) { - new Q00032_AnObviousLie(32, Q00032_AnObviousLie.class.getSimpleName(), "An Obvious Lie"); + new Q00032_AnObviousLie(); } }