From c1e8bb8876bd7c04112e516c7f77e91ae54337ae Mon Sep 17 00:00:00 2001 From: mobius <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 21 Feb 2015 22:41:21 +0000 Subject: [PATCH] Minor quest improvements. --- .../quests/Q10331_StartOfFate/Q10331_StartOfFate.java | 2 ++ .../Q10745_TheSecretIngredients.java | 7 ------- .../quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java | 5 ----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index adbe5b9889..31c4de1ba7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -123,6 +123,7 @@ public class Q10331_StartOfFate extends Quest { return null; } + switch (player.getRace()) { case HUMAN: @@ -162,6 +163,7 @@ public class Q10331_StartOfFate extends Quest break; } } + takeItems(player, SARIL_NECKLACE, -1); break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java b/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java index 8c63de3c89..b034336c8a 100644 --- a/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java +++ b/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/Q10745_TheSecretIngredients.java @@ -37,21 +37,17 @@ public class Q10745_TheSecretIngredients extends Quest private static final int DOLKIN = 33954; private static final int DOLKIN_INSTANCE = 34002; private static final int KARLA = 33933; - // Monsters private static final int KARAPHON = 23459; private static final int KEEN_HONEYBEE = 23460; private static final int KEEN_GROWLER = 23461; - // Locations private static final Location DOLKIN_INSTANCE_SPAWN = new Location(-82407, 246018, -14158); - // Items private static final ItemHolder SECRET_INGREDIENTS = new ItemHolder(39533, 1); private static final ItemHolder DOLKIN_REPORT = new ItemHolder(39534, 1); private static final ItemHolder FAERON_SUPPORT_BOX = new ItemHolder(40262, 1); private static final ItemHolder FAERON_SUPPORT_BOX_MAGE = new ItemHolder(40263, 1); - // Level Condition private static final int MIN_LEVEL = 17; private static final int MAX_LEVEL = 25; @@ -85,7 +81,6 @@ public class Q10745_TheSecretIngredients extends Quest htmltext = event; break; } - case "33954-04.html": { if (qs.isCond(2)) @@ -97,7 +92,6 @@ public class Q10745_TheSecretIngredients extends Quest } break; } - case "33933-02.html": { if (qs.isCond(3)) @@ -118,7 +112,6 @@ public class Q10745_TheSecretIngredients extends Quest } break; } - case "spawn_dolkin": { showOnScreenMsg(player, NpcStringId.TALK_TO_DOLKIN_AND_LEAVE_THE_KARAPHON_HABITAT, ExShowScreenMessage.TOP_CENTER, 4500); diff --git a/trunk/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java b/trunk/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java index a1f8ca5ba2..19313e6464 100644 --- a/trunk/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java +++ b/trunk/dist/game/data/scripts/quests/Q10746_SeeTheWorld/Q10746_SeeTheWorld.java @@ -38,11 +38,9 @@ public class Q10746_SeeTheWorld extends Quest private static final int KARLA = 33933; private static final int ASTIEL = 33948; private static final int LEVIAN = 30037; - // Items private static final ItemHolder EMISSARY_SUPPORT_BOX_WARRIOR = new ItemHolder(40264, 1); private static final ItemHolder EMISSARY_SUPPORT_BOX_MAGE = new ItemHolder(40265, 1); - // Level Condition private static final int MIN_LEVEL = 19; private static final int MAX_LEVEL = 25; @@ -75,7 +73,6 @@ public class Q10746_SeeTheWorld extends Quest htmltext = event; break; } - case "33948-02.htm": { if (qs.isCond(1)) @@ -115,7 +112,6 @@ public class Q10746_SeeTheWorld extends Quest } break; } - case ASTIEL: { switch (qs.getCond()) @@ -128,7 +124,6 @@ public class Q10746_SeeTheWorld extends Quest } break; } - case LEVIAN: { switch (qs.getCond())