From 02d3e71bcf5e7f30deefe719be9af4d2e8f77227 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 13 Aug 2015 21:33:02 +0000 Subject: [PATCH] Minor quest fixes. --- .../{no_quest.htm => no_quest.html} | 0 .../Q10735_ASpecialPower/Q10735_ASpecialPower.java | 8 ++++---- .../quests/Q10735_ASpecialPower/no_quest.html | 1 + .../Q10736_ASpecialPower/Q10736_ASpecialPower.java | 8 ++++---- .../quests/Q10736_ASpecialPower/no_quest.html | 1 + .../Q10737_GrakonsWarehouse.java | 4 ++-- .../quests/Q10737_GrakonsWarehouse/no_quest.html | 1 + .../Q10741_ADraughtForTheCold.java | 12 ++++++------ .../Q10742_AFurryFriend/Q10742_AFurryFriend.java | 4 ++-- .../scripts/quests/Q10742_AFurryFriend/no_quest.html | 1 + .../Q10743_StrangeFungus/Q10743_StrangeFungus.java | 2 +- .../quests/Q10743_StrangeFungus/no_quest.html | 1 + .../Q10744_StrongerThanSteel.java | 4 ++-- .../quests/Q10744_StrongerThanSteel/no_quest.html | 1 + .../Q10745_TheSecretIngredients.java | 4 ++-- .../quests/Q10745_TheSecretIngredients/no_quest.html | 1 + 16 files changed, 30 insertions(+), 23 deletions(-) rename trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/{no_quest.htm => no_quest.html} (100%) create mode 100644 trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/no_quest.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/no_quest.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/no_quest.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/no_quest.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/no_quest.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/no_quest.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/no_quest.html diff --git a/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/no_quest.htm b/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/no_quest.html similarity index 100% rename from trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/no_quest.htm rename to trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/no_quest.html diff --git a/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java index 80b5b6a9ca..ed077a2510 100644 --- a/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java +++ b/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java @@ -62,10 +62,10 @@ public class Q10735_ASpecialPower extends Quest addStartNpc(AYANTHE); addTalkId(AYANTHE, AYANTHE_2); addKillId(FLOATO, RATEL); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); - addCondRace(Race.ERTHEIA, "fixme.html"); - addCondClassId(ClassId.ERTHEIA_WIZARD, "fixme.html"); - addCondCompletedQuest(Q10734_DoOrDie.class.getSimpleName(), "fixme.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); + addCondRace(Race.ERTHEIA, "no_quest.html"); + addCondClassId(ClassId.ERTHEIA_WIZARD, "no_quest.html"); + addCondCompletedQuest(Q10734_DoOrDie.class.getSimpleName(), "no_quest.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java index ebd537b4c7..b890b56855 100644 --- a/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java +++ b/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java @@ -62,10 +62,10 @@ public class Q10736_ASpecialPower extends Quest addStartNpc(KATALIN); addTalkId(KATALIN, KATALIN_2); addKillId(FLOATO, RATEL); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); - addCondRace(Race.ERTHEIA, "fixme.html"); - addCondClassId(ClassId.ERTHEIA_FIGHTER, "fixme.html"); - addCondCompletedQuest(Q10734_DoOrDie.class.getSimpleName(), "fixme.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); + addCondRace(Race.ERTHEIA, "no_quest.html"); + addCondClassId(ClassId.ERTHEIA_FIGHTER, "no_quest.html"); + addCondCompletedQuest(Q10734_DoOrDie.class.getSimpleName(), "no_quest.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java b/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java index 9a58a0f324..e2629af731 100644 --- a/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java +++ b/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/Q10737_GrakonsWarehouse.java @@ -48,8 +48,8 @@ public class Q10737_GrakonsWarehouse extends Quest super(10737, Q10737_GrakonsWarehouse.class.getSimpleName(), "Grakon's Warehouse"); addStartNpc(KATALIN, AYANTHE); addTalkId(KATALIN, AYANTHE, GRAKON); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); - addCondRace(Race.ERTHEIA, "fixme.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); + addCondRace(Race.ERTHEIA, "no_quest.html"); registerQuestItems(APPRENTICE_SUPPORT_BOX.getId()); } diff --git a/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10737_GrakonsWarehouse/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java b/trunk/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java index 27ea912878..4a6b72ec61 100644 --- a/trunk/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java +++ b/trunk/dist/game/data/scripts/quests/Q10741_ADraughtForTheCold/Q10741_ADraughtForTheCold.java @@ -103,21 +103,21 @@ public class Q10741_ADraughtForTheCold extends Quest if (qs.isCompleted()) { - htmltext = getAlreadyCompletedMsg(player); + return getAlreadyCompletedMsg(player); } switch (npc.getId()) { case SIVANTHE: { - if (qs.isCreated()) - { - htmltext = "33951-01.htm"; - } - else if (qs.isStarted()) + if (qs.isStarted()) { htmltext = "33951-04.html"; } + else + { + htmltext = "33951-01.htm"; + } break; } case LEIRA: diff --git a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 60ffeebc5f..28c151ba06 100644 --- a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -59,8 +59,8 @@ public class Q10742_AFurryFriend extends Quest addStartNpc(LEIRA); addTalkId(LEIRA, KIKU_S_CAVE); addMoveFinishedId(RICKY); - addCondRace(Race.ERTHEIA, "fixme.html"); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); + addCondRace(Race.ERTHEIA, "no_quest.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 8146d88f45..2951980645 100644 --- a/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -52,7 +52,7 @@ public class Q10743_StrangeFungus extends Quest addTalkId(LEIRA, MILONE); addKillId(GROWLER, ROBUST_GROWLER, EVOLVED_GROWLER); registerQuestItems(PECULIAR_MUSHROOM_SPORE); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10743_StrangeFungus/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java b/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java index a61728e4de..e98fdf8263 100644 --- a/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java +++ b/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/Q10744_StrongerThanSteel.java @@ -48,8 +48,8 @@ public class Q10744_StrongerThanSteel extends Quest addTalkId(MILONE, DOLKIN); addKillId(TREANT, LEAFIE); registerQuestItems(TREANT_LEAF, LEAFIE_LEAF); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); - addCondRace(Race.ERTHEIA, "fixme.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); + addCondRace(Race.ERTHEIA, "no_quest.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10744_StrongerThanSteel/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file 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 b034336c8a..7fcc29e371 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 @@ -59,8 +59,8 @@ public class Q10745_TheSecretIngredients extends Quest addTalkId(DOLKIN, DOLKIN_INSTANCE, KARLA); addKillId(KARAPHON, KEEN_HONEYBEE, KEEN_GROWLER); registerQuestItems(SECRET_INGREDIENTS.getId(), DOLKIN_REPORT.getId()); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "fixme.html"); - addCondRace(Race.ERTHEIA, "fixme.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_quest.html"); + addCondRace(Race.ERTHEIA, "no_quest.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/no_quest.html b/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/no_quest.html new file mode 100644 index 0000000000..216c66a59a --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/no_quest.html @@ -0,0 +1 @@ +You either don't meet this NPC's minimum quest requirements, or your level is too low to start this quest. \ No newline at end of file