From 2dfb4847adc15b36e0be7f738584f4a8ebeda71f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 6 Jan 2016 09:51:52 +0000 Subject: [PATCH] Underground quest updates (10320 to 10327). Contributed by gyo. --- .../scripts/ai/npc/Pantheon/Pantheon.java | 2 +- .../MuseumDungeon/MuseumDungeon.java | 41 ++++- .../instances/MuseumDungeon/desk_normal.html | 4 + .../{32972-01a.html => 32972-06.html} | 0 .../{32972-01b.html => 32972-07.html} | 0 .../Q10320_LetsGoToTheCentralSquare.java | 4 +- .../32975-01a.html | 4 - .../32975-02.htm | 2 +- .../32975-03.html | 6 - .../Q10321_QualificationsOfTheSeeker.java | 6 +- .../32974-02.htm | 2 +- .../32974-03.html | 5 - .../{32974-01a.html => 32974-06.html} | 2 +- .../32981-03.html | 2 +- .../33464-04.html | 2 +- ...Q10322_SearchingForTheMysteriousPower.java | 11 +- .../Q10323_TrainLikeItsReal/33194-01.html | 2 +- .../Q10323_TrainLikeItsReal/33194-02.html | 4 +- .../Q10323_TrainLikeItsReal/33194-04.html | 6 +- .../Q10323_TrainLikeItsReal/33194-05.html | 9 +- .../Q10323_TrainLikeItsReal/33194-06.html | 6 +- .../Q10323_TrainLikeItsReal/33194-07.html | 10 +- .../Q10323_TrainLikeItsReal/33194-08.html | 5 +- .../Q10323_TrainLikeItsReal/33194-09.html | 4 + .../Q10323_TrainLikeItsReal/33194-10.html | 4 + .../Q10323_TrainLikeItsReal/33194-11.html | 4 + .../Q10323_TrainLikeItsReal/33194-12.html | 4 + .../Q10323_TrainLikeItsReal/33194-13.html | 5 + .../Q10323_TrainLikeItsReal/33194-14.html | 3 + .../Q10323_TrainLikeItsReal/33194-15.html | 3 + .../Q10323_TrainLikeItsReal/33464-01.htm | 2 +- .../Q10323_TrainLikeItsReal/33464-02.htm | 2 +- .../Q10323_TrainLikeItsReal/33464-03.html | 4 - .../Q10323_TrainLikeItsReal/33464-04.html | 5 +- .../Q10323_TrainLikeItsReal/33464-05.html | 3 +- .../Q10323_TrainLikeItsReal/33464-06.html | 4 + .../Q10323_TrainLikeItsReal/33464-07.html | 4 + .../Q10323_TrainLikeItsReal.java | 167 +++++++++++++----- .../32974-01.htm | 2 +- .../32974-01a.html | 4 - .../32974-02.htm | 2 +- .../32974-03.htm | 4 + .../32974-03.html | 3 - .../32974-06.html | 4 + .../32980-02.html | 2 +- .../Q10324_FindingMagisterGallint.java | 6 +- .../Q10325_SearchingForNewPower/32151-01.html | 3 +- .../Q10325_SearchingForNewPower/32151-03.html | 2 +- .../Q10325_SearchingForNewPower/32159-03.html | 3 +- .../Q10325_SearchingForNewPower/32980-05.html | 2 +- .../Q10325_SearchingForNewPower/32980-06.html | 2 +- .../Q10325_SearchingForNewPower/32980-07.html | 5 +- .../Q10325_SearchingForNewPower/32980-08.html | 3 - .../Q10325_SearchingForNewPower/32980-09.html | 3 - .../Q10325_SearchingForNewPower/32980-10.html | 3 - .../Q10325_SearchingForNewPower/32980-11.html | 3 - .../Q10325_SearchingForNewPower/32980-12.html | 4 - .../Q10325_SearchingForNewPower.java | 140 ++++++++------- .../Q10326_RespectYourElders/32972-01.html | 6 +- .../Q10326_RespectYourElders/32972-02.html | 4 +- .../Q10326_RespectYourElders/32980-01.htm | 5 +- .../Q10326_RespectYourElders/32980-02.htm | 8 +- .../Q10326_RespectYourElders/32980-03.htm | 4 + .../Q10326_RespectYourElders/32980-03.html | 3 - .../Q10326_RespectYourElders/32980-04.html | 3 +- .../Q10326_RespectYourElders/32980-05.html | 2 +- .../Q10326_RespectYourElders/32980-06.htm | 4 + .../Q10326_RespectYourElders.java | 16 +- .../32972-02.htm | 2 +- .../32972-03.html | 6 - .../32972-05.html | 7 +- .../32972-06.html | 9 +- .../32972-07.html | 6 +- .../32972-08.html | 4 + .../32972-09.htm | 4 + ...10327_IntruderWhoWantsTheBookOfGiants.java | 33 ++-- .../no_level.html | 4 - 77 files changed, 421 insertions(+), 262 deletions(-) create mode 100644 trunk/dist/game/data/scripts/instances/MuseumDungeon/desk_normal.html rename trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/{32972-01a.html => 32972-06.html} (100%) rename trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/{32972-01b.html => 32972-07.html} (100%) delete mode 100644 trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-01a.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-03.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-03.html rename trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/{32974-01a.html => 32974-06.html} (77%) create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-09.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-10.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-11.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-12.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-13.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-14.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-15.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-03.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-06.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-07.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01a.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.htm delete mode 100644 trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-06.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-08.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-09.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-10.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-11.html delete mode 100644 trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-12.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.htm delete mode 100644 trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-06.htm delete mode 100644 trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-03.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-08.html create mode 100644 trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-09.htm delete mode 100644 trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/no_level.html diff --git a/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java b/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java index abfef67fe4..2aab4507b5 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java +++ b/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java @@ -38,7 +38,7 @@ public final class Pantheon extends AbstractNpcAI // Location private static final Location MUSEUM = new Location(-114711, 243911, -7968); // Misc - private static final int MIN_LEVEL = 20; + private static final int MIN_LEVEL = 6; private Pantheon() { diff --git a/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index 0b7d795821..57d2cdf401 100644 --- a/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -121,7 +121,38 @@ public final class MuseumDungeon extends AbstractInstance { return null; } - enterInstance(player, new MDWorld(), "MuseumDungeon.xml", TEMPLATE_ID); + + InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player); + if ((tmpworld == null) || !(tmpworld instanceof MDWorld)) + { + tmpworld = new MDWorld(); + } + final MDWorld world = (MDWorld) tmpworld; + enterInstance(player, world, "MuseumDungeon.xml", TEMPLATE_ID); + + final QuestState qs = player.getQuestState(Q10327_IntruderWhoWantsTheBookOfGiants.class.getSimpleName()); + if (qs.isCond(1)) + { + showOnScreenMsg(player, NpcStringId.AMONG_THE_4_BOOKSHELVES_FIND_THE_ONE_CONTAINING_A_VOLUME_CALLED_THE_WAR_OF_GODS_AND_GIANTS, ExShowScreenMessage.TOP_CENTER, 10000); + } + else if (qs.isCond(2)) + { + if ((world.thiefSpawns != null) && (world.thiefSpawns.get(0) != null)) + { + world.thiefSpawns.get(0).deleteMe(); + } + if ((world.thiefSpawns != null) && (world.thiefSpawns.get(1) != null)) + { + world.thiefSpawns.get(1).deleteMe(); + } + world.toyron.setIsRunning(true); + world.thiefSpawns = spawnGroup("thiefs", world.getInstanceId()); + for (L2Npc thief : world.thiefSpawns) + { + ((L2MonsterInstance) thief).addDamage(player, 1, null); + } + startQuestTimer("assist_player", 2000, world.toyron, player); + } } return super.onAdvEvent(event, npc, player); } @@ -140,6 +171,10 @@ public final class MuseumDungeon extends AbstractInstance qs.setCond(2); giveItems(player, THE_WAR_OF_GODS_AND_GIANTS, 1); world.thiefSpawns = spawnGroup("thiefs", world.getInstanceId()); + for (L2Npc thief : world.thiefSpawns) + { + ((L2MonsterInstance) thief).addDamage(player, 1, null); + } showOnScreenMsg(player, NpcStringId.WATCH_OUT_YOU_ARE_BEING_ATTACKED, ExShowScreenMessage.TOP_CENTER, 5000); startQuestTimer("assist_player", 2000, world.toyron, player); htmltext = "desk_correct.html"; @@ -149,6 +184,10 @@ public final class MuseumDungeon extends AbstractInstance htmltext = "desk_wrong.html"; } } + else + { + htmltext = "desk_normal.html"; + } return htmltext; } diff --git a/trunk/dist/game/data/scripts/instances/MuseumDungeon/desk_normal.html b/trunk/dist/game/data/scripts/instances/MuseumDungeon/desk_normal.html new file mode 100644 index 0000000000..5b82562a5c --- /dev/null +++ b/trunk/dist/game/data/scripts/instances/MuseumDungeon/desk_normal.html @@ -0,0 +1,4 @@ +[Desk]:
+A desk normally used by Pantheon.
+It's so disorganized, it'll take a while to search it. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-01a.html b/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-06.html similarity index 100% rename from trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-01a.html rename to trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-06.html diff --git a/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-01b.html b/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-07.html similarity index 100% rename from trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-01b.html rename to trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/32972-07.html diff --git a/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java index 3ab3d7e310..563fd62a95 100644 --- a/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java +++ b/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java @@ -60,8 +60,8 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest addStartNpc(PANTHEON); addTalkId(PANTHEON, THEODORE); addEnterZoneId(TALKING_ISLAND_PRESENTATION_MOVIE_ZONE); - addCondMaxLevel(MAX_LEVEL, "32972-01a.html"); - addCondNotRace(Race.ERTHEIA, "32972-01b.html"); + addCondMaxLevel(MAX_LEVEL, "32972-06.html"); + addCondNotRace(Race.ERTHEIA, "32972-07.html"); } @Override diff --git a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-01a.html b/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-01a.html deleted file mode 100644 index adbe71581c..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-01a.html +++ /dev/null @@ -1,4 +0,0 @@ -Theodore:
-Not now! Can't you see I'm busy? Come back later.
-(You must be level 20 or above to start this quest.) - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-02.htm b/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-02.htm index 90a70097bc..e5d9ff40a8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-02.htm @@ -1,5 +1,5 @@ Theodore:
Seekers are scholars and warriors dedicated to searching through the Ruins of Ye Sagira.
However, they recently ran into a spot of bother after the local monsters decided to get all territorial. Now, a good number of my Seekers are injured, and the work just keeps on piling up...
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-03.html b/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-03.html deleted file mode 100644 index 3ca433dc55..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32975-03.html +++ /dev/null @@ -1,6 +0,0 @@ -Theodore:
-You what? Really? Even after what I just told you??
-Well, anyone can become a seeker, but you must first get certified. Shannon can start you on that path - head to the Training Grounds to see her, and she'll teach you about scouts.
-Now get going - speed is of the essence and all that!
-I will briefly tell you how to get there. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java index e7aa3f6453..9bcd82fc80 100644 --- a/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java +++ b/trunk/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java @@ -46,8 +46,8 @@ public final class Q10321_QualificationsOfTheSeeker extends Quest super(10321, Q10321_QualificationsOfTheSeeker.class.getSimpleName(), "Qualifications Of The Seeker"); addStartNpc(THEODORE); addTalkId(THEODORE, SHANNON); - addCondMaxLevel(MAX_LEVEL, "32975-01a.html"); - addCondCompletedQuest(Q10320_LetsGoToTheCentralSquare.class.getSimpleName(), "32975-01a.html"); + addCondMaxLevel(MAX_LEVEL, "32975-06.html"); + addCondCompletedQuest(Q10320_LetsGoToTheCentralSquare.class.getSimpleName(), "32975-06.html"); } @Override @@ -62,7 +62,7 @@ public final class Q10321_QualificationsOfTheSeeker extends Quest String htmltext = null; switch (event) { - case "32975-03.html": + case "32975-03.htm": { qs.startQuest(); qs.setCond(2); // show arrow hack diff --git a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-02.htm b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-02.htm index a564421fc6..3463b0a4c3 100644 --- a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-02.htm @@ -2,5 +2,5 @@ Why would I do that? Well, let me see. For starters, I'm training up the entire district, so it's kind of what I do. Second, we need all the help we can get, and third, maybe I think you might have what it takes to be someone in this place. Thought about that?
You know, suspicious isn't an attractive trait. Either you calm down and tell me where you need help, or you can jog on and find your own way.
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-03.html b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-03.html deleted file mode 100644 index b3a35d19ae..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-03.html +++ /dev/null @@ -1,5 +0,0 @@ -Shannon:
-Well, guess what? I can help. That's right - H.E.L.P.
-I've set up a little test for newbies - just head down the hill until you see Evain.
-Go on. You'll have fun, probably. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-01a.html b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-06.html similarity index 77% rename from trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-01a.html rename to trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-06.html index 84a430dac4..70cd9a91b8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-01a.html +++ b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32974-06.html @@ -1,4 +1,4 @@ Shannon:
Did you need me?
-(Only characters under level 20, who have completed "Conditions of Scout" may start this quest.) +(Only characters under level 20, who have completed "Conditions of Scout" may start this quest) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32981-03.html b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32981-03.html index 934b06680c..b112809a5d 100644 --- a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32981-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/32981-03.html @@ -1,3 +1,3 @@ -Adventurers' Guide for Training:
+Training Newbie Helper:
Now, go ahead and attack the scarecrow. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/33464-04.html b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/33464-04.html index d0103f455a..8b5b368628 100644 --- a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/33464-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/33464-04.html @@ -1,3 +1,3 @@ Evain:
-Stop being so slow! There's more to combat that swings and grunts! You need precision! Deftness! Agility! +Stop being so slow! There's more to combat than swings and grunts! You need precision! Deftness! Agility! \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java index b9cbe9cdeb..a316c0f261 100644 --- a/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java +++ b/trunk/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java @@ -83,8 +83,8 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest addStartNpc(SHANNON); addTalkId(SHANNON, ADVENTURERS_GUIDE, EVAIN); addKillId(SCARECROW); - addCondMaxLevel(MAX_LEVEL, "32974-01a.html"); - addCondCompletedQuest(Q10321_QualificationsOfTheSeeker.class.getSimpleName(), "32974-01a.html"); + addCondMaxLevel(MAX_LEVEL, "32974-06.html"); + addCondCompletedQuest(Q10321_QualificationsOfTheSeeker.class.getSimpleName(), "32974-06.html"); } @Override @@ -99,7 +99,7 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest String htmltext = null; switch (event) { - case "32974-03.html": + case "32974-03.htm": { qs.startQuest(); htmltext = event; @@ -199,6 +199,11 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest htmltext = "32981-03.html"; break; } + else + { + htmltext = getNoQuestMsg(player); + break; + } } else if (npc.getId() == EVAIN) { diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-01.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-01.html index b797e44f1d..2f852e703b 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-01.html @@ -1,4 +1,4 @@ Holden:
Evain sent you? That means you only had practice against a dummy. That's not enough. Wouldn't you agree that your training will only be effective if you train as if it were real combat?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-02.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-02.html index 916b367627..c524d806ba 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-02.html @@ -1,5 +1,5 @@ Holden:
-That's why we made a Training Golem. It's designed to attack you, but won't be dangerous.
+That's why we made a Training Golem. It's designed to attack you, but it won't be dangerous.
Can you show me what you're capable of?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-04.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-04.html index 16287b24ac..bbcc39ce49 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-04.html @@ -1,7 +1,3 @@ Holden:
-Good job.
-Good work. But I noticed that there wasn't any light of spirits when you were fighting. Using -Soulshots or Spiritshots will empower you weapons temporarily to deal powerful attacks
-Do you know how to use Soulshots?
- +The real battle got your tongue? But you've got to overcome it one day. Kill the Training Golems in front of you. Come back after you've killed plenty.
\ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-05.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-05.html index 079f06b4d5..2eacc48aec 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-05.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-05.html @@ -1,7 +1,6 @@ Holden:
-You don't? Then why don't you try again with these soulshot I have for you? -Open your Inventory, check for Soulshots or Spiritshots.
-Click and Drag Soulshot/Spiritshot into your Shortcut Bar. Right Click the Soulshot/Spiritshot Shortcut Icon to use it automatically. -After this, the lights of the spirits will help you every time you attack.
-Tell me when you have that done. +Good job.
+Good work. But I noticed that there wasn't any lights of spirits when you were fighting. Using Soulshots will empower your weapons temporarily to deal powerful attacks.
+Do you know how to use Soulshots?
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-06.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-06.html index 6650c99437..ee386efa91 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-06.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-06.html @@ -1,4 +1,6 @@ Holden:
-Are you ready? Then let's check the power of Soulshots or Spiritshots by fighting one more time. The targets are the Training Golems.
-Come back to me after killing plenty. +Good job.
+Good work. But I noticed that there wasn't any spirit lights when you were fighting. Using Spiritshots will empower your weapons temporarily to deal powerful attacks.
+Do you know how to use Spiritshots?
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-07.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-07.html index 408991907a..2b2d1f1190 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-07.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-07.html @@ -1,5 +1,9 @@ Holden:
-You're done. How was it? Isn't it more efficient?
-Make sure to use what you've learned in battle later.
- +You don't? Then why don't you try it with this Soulshot I have for you? +Open your Inventory and check for Soulshots.
+Also, remember that the grades of the weapon and the Soulshot have to be the same.
+Then, check if the Soulshot in the Automatic Soulshot window is activated.
+You can activate/deactivate by clicking on the icon.
+It will be very handy from now on when you fight.
+Tell me when you have that done. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-08.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-08.html index 0e8d9b8a97..8171f6bb6b 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-08.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-08.html @@ -1,3 +1,6 @@ Holden:
-You're done with me. Now you can report to Shannon at the Basic Training Grounds. +You don't? Then why don't you try it with this Spiritshot I have for you? +Open your Inventory and look for Spiritshots.
+Click and drag the Spiritshots onto the Shortcut bar and right click the Spiritshot shortcut icon to use them automatically.
+Tell me when you have that done. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-09.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-09.html new file mode 100644 index 0000000000..128e650f16 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-09.html @@ -0,0 +1,4 @@ +Holden:
+Are you ready? Then let's check the power of Soulshots by fighting one more time. The targets are the Training Golems.
+Come back to me after killing plenty. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-10.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-10.html new file mode 100644 index 0000000000..7426c3afce --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-10.html @@ -0,0 +1,4 @@ +Holden:
+Ready? Then let's test your mettle using Spiritshots. Target the Training Golems and fire away.
+Return to me when you've had your fill. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-11.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-11.html new file mode 100644 index 0000000000..580573a3c4 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-11.html @@ -0,0 +1,4 @@ +Holden:
+Check the power of Soulshots by fighting one more time. The targets are the Training Golems.
+Come back to me after killing plenty. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-12.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-12.html new file mode 100644 index 0000000000..7426c3afce --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-12.html @@ -0,0 +1,4 @@ +Holden:
+Ready? Then let's test your mettle using Spiritshots. Target the Training Golems and fire away.
+Return to me when you've had your fill. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-13.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-13.html new file mode 100644 index 0000000000..3b7a8cdf9f --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-13.html @@ -0,0 +1,5 @@ +Holden:
+You're done. How was it? Isn't it more efficient? +Make sure to use what you've learned in battle later.
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-14.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-14.html new file mode 100644 index 0000000000..47f2482d19 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-14.html @@ -0,0 +1,3 @@ +Holden:
+You're done with me. Now you can report to Shannon at the Basic Training Grounds. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-15.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-15.html new file mode 100644 index 0000000000..180f991216 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33194-15.html @@ -0,0 +1,3 @@ +Holden:
+I thought I told you. You're done. Now you can report to Shannon at the Basic Training Grounds. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-01.htm b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-01.htm index 52c3456a3c..d390c2f5cd 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-01.htm +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-01.htm @@ -1,4 +1,4 @@ Evain:
Looks like you understand the basics behind buffs. Now it's time to get some real combat experience. Ready?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-02.htm b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-02.htm index 48f827f59f..db9ac7037d 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-02.htm @@ -2,5 +2,5 @@ Good. After all, a dummy is an easy opponent.
We wanted to prepare something a little more challenging for you. You know, something that actually moves?
This training is to prepare you for battle, not to knock down straw dolls.
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-03.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-03.html deleted file mode 100644 index af9105c0d3..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-03.html +++ /dev/null @@ -1,4 +0,0 @@ -Evain:
-No need to hurry. Also, the mission is managed by Holden at the Training Grounds Underground Facility Entrance. -If you tell him that I sent you, he will give you details. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-04.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-04.html index 071457948b..201a940bfc 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-04.html @@ -1,4 +1,5 @@ Evain:
-It's good to see you growing stronger with each passing day. Is there something you want from me?
-(This quest has already been completed) +Did you forget about your mission. +The next mission is managed by Holden at the Training Grounds Underground Facility Entrance. +If you tell him that I sent you, he will give you details. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-05.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-05.html index 852ff1b568..3d75ce7af2 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-05.html +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-05.html @@ -1,4 +1,3 @@ Evain:
-Why did you come here?
-(Only characters under level 20, who have completed the Looking for Mysterious Power quest, may start this quest) +If you've defeated all the training Golems, report to Shannon at the Basic Training Grounds! \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-06.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-06.html new file mode 100644 index 0000000000..071457948b --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-06.html @@ -0,0 +1,4 @@ +Evain:
+It's good to see you growing stronger with each passing day. Is there something you want from me?
+(This quest has already been completed) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-07.html b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-07.html new file mode 100644 index 0000000000..852ff1b568 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/33464-07.html @@ -0,0 +1,4 @@ +Evain:
+Why did you come here?
+(Only characters under level 20, who have completed the Looking for Mysterious Power quest, may start this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java index 2bf59450b4..9c7ae45ad8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.Set; import com.l2jmobius.gameserver.enums.QuestSound; +import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -34,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; import quests.Q10322_SearchingForTheMysteriousPower.Q10322_SearchingForTheMysteriousPower; /** - * @author Sdw, Gladicek + * @author Sdw, Gladicek, gyo */ public class Q10323_TrainLikeItsReal extends Quest { @@ -45,6 +46,7 @@ public class Q10323_TrainLikeItsReal extends Quest // Mobs private static final int TRAINING_GOLEM = 27532; // Misc + private static final int TRAINING_GOLEM_REQUIRED = 1; private static final int MAX_LEVEL = 20; // Items private static final ItemHolder SPIRITSHOTS = new ItemHolder(2509, 500); @@ -54,10 +56,10 @@ public class Q10323_TrainLikeItsReal extends Quest { super(10323, Q10323_TrainLikeItsReal.class.getSimpleName(), "Train Like It's Real"); addStartNpc(EVAIN); - addTalkId(HOLDEN, EVAIN, SHANNON); + addTalkId(EVAIN, HOLDEN, SHANNON); addKillId(TRAINING_GOLEM); - addCondMaxLevel(MAX_LEVEL, "33464-05.html"); - addCondCompletedQuest(Q10322_SearchingForTheMysteriousPower.class.getSimpleName(), "33464-05.html"); + addCondMaxLevel(MAX_LEVEL, "33464-07.html"); + addCondCompletedQuest(Q10322_SearchingForTheMysteriousPower.class.getSimpleName(), "33464-07.html"); } @Override @@ -89,7 +91,7 @@ public class Q10323_TrainLikeItsReal extends Quest showOnScreenMsg(player, NpcStringId.AUTOMATE_SOULSHOT_AS_SHOWN_IN_THE_TUTORIAL, ExShowScreenMessage.TOP_CENTER, 4500); break; } - case "33464-03.html": + case "33464-03.htm": { qs.startQuest(); htmltext = event; @@ -99,37 +101,42 @@ public class Q10323_TrainLikeItsReal extends Quest { if (qs.isCond(1)) { + // show NpcLog dialog trick + qs.setCond(3); qs.setCond(2, true); htmltext = event; } break; } - case "33194-05.html": + case "33194-07.html": { if (qs.isCond(3)) { qs.setMemoState(0); - if (player.isMageClass()) - { - giveItems(player, SPIRITSHOTS); - showOnScreenMsg(player, NpcStringId.SPIRITSHOT_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500); - startQuestTimer("showscreen_spiritshot", 4500, npc, player); - player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_003_bullet_01.htm", TutorialShowHtml.LARGE_WINDOW)); - qs.setCond(5, true); - } - else - { - giveItems(player, SOULSHOTS); - showOnScreenMsg(player, NpcStringId.SOULSHOT_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500); - startQuestTimer("showscreen_soulshot", 4500, npc, player); - player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_003_bullet_01.htm", TutorialShowHtml.LARGE_WINDOW)); - qs.setCond(4, true); - } + giveItems(player, SOULSHOTS); + showOnScreenMsg(player, NpcStringId.SOULSHOT_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500); + startQuestTimer("showscreen_soulshot", 4500, npc, player); + player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_003_bullet_01.htm", TutorialShowHtml.LARGE_WINDOW)); + qs.setCond(4, true); htmltext = event; } break; } case "33194-08.html": + { + if (qs.isCond(3)) + { + qs.setMemoState(0); + giveItems(player, SPIRITSHOTS); + showOnScreenMsg(player, NpcStringId.SPIRITSHOT_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500); + startQuestTimer("showscreen_spiritshot", 4500, npc, player); + player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_003_bullet_01.htm", TutorialShowHtml.LARGE_WINDOW)); + qs.setCond(5, true); + htmltext = event; + } + break; + } + case "33194-14.html": { if (qs.isCond(8)) { @@ -164,22 +171,48 @@ public class Q10323_TrainLikeItsReal extends Quest { case State.CREATED: { - if (npc.getId() == EVAIN) + switch (npc.getId()) { - htmltext = "33464-01.htm"; - break; - } - else if (npc.getId() == SHANNON) - { - htmltext = "32974-03.html"; - break; + case EVAIN: + { + htmltext = "33464-01.htm"; + break; + } + case SHANNON: + { + htmltext = "32974-03.html"; + break; + } + case HOLDEN: + { + htmltext = getNoQuestMsg(player); + break; + } } + break; } case State.STARTED: { if (npc.getId() == EVAIN) { - htmltext = "33464-03.html"; + switch (qs.getCond()) + { + case 1: + { + htmltext = "33464-04.html"; + break; + } + case 9: + { + htmltext = "33464-05.html"; + break; + } + default: + { + htmltext = getNoQuestMsg(player); + break; + } + } break; } else if (npc.getId() == HOLDEN) @@ -191,26 +224,55 @@ public class Q10323_TrainLikeItsReal extends Quest htmltext = "33194-01.html"; break; } - case 3: + case 2: { htmltext = "33194-04.html"; break; } + case 3: + { + // Orc Mystic will get Soulshots + if (!player.isMageClass() || (player.getRace() == Race.ORC)) + { + htmltext = "33194-05.html"; + } + else + { + htmltext = "33194-06.html"; + } + break; + } case 4: { - htmltext = "33194-06.html"; + htmltext = "33194-09.html"; qs.setCond(6, true); break; } case 5: { - htmltext = "33194-06.html"; + htmltext = "33194-10.html"; qs.setCond(7, true); break; } + case 6: + { + htmltext = "33194-11.html"; + break; + } + case 7: + { + // same text as 33194-10.html + htmltext = "33194-12.html"; + break; + } case 8: { - htmltext = "33194-07.html"; + htmltext = "33194-13.html"; + break; + } + case 9: + { + htmltext = "33194-15.html"; break; } } @@ -221,22 +283,31 @@ public class Q10323_TrainLikeItsReal extends Quest if (qs.isCond(9)) { htmltext = "32974-01.html"; - break; } + break; } } case State.COMPLETED: { - if (npc.getId() == EVAIN) + switch (npc.getId()) { - htmltext = "33464-04.html"; - break; - } - else if (npc.getId() == SHANNON) - { - htmltext = "32974-05.html"; - break; + case EVAIN: + { + htmltext = "33464-06.html"; + break; + } + case SHANNON: + { + htmltext = "32974-05.html"; + break; + } + case HOLDEN: + { + htmltext = getNoQuestMsg(player); + break; + } } + break; } } return htmltext; @@ -254,30 +325,30 @@ public class Q10323_TrainLikeItsReal extends Quest if (qs.isCond(2)) { killedGolem++; + sendNpcLogList(killer); - if (killedGolem >= 4) + if (killedGolem >= TRAINING_GOLEM_REQUIRED) { qs.setCond(3, true); } else { qs.setMemoState(killedGolem); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } else if (qs.isCond(6) || qs.isCond(7)) { killedGolem++; + sendNpcLogList(killer); - if (killedGolem >= 4) + if (killedGolem >= TRAINING_GOLEM_REQUIRED) { qs.setCond(8, true); } else { qs.setMemoState(killedGolem); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01.htm b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01.htm index 3b665d8761..36e4e44ce9 100644 --- a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01.htm +++ b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01.htm @@ -1,5 +1,5 @@ Shannon:
You're back already? Hmm... good.
-I hear you're strong and resilent, but are lacking somewhat in the more technical skills. Flair will bedazzle your opponents, friend.
+I hear you're strong and resilient, but are lacking somewhat in the more technical skills. Flair will bedazzle your opponents, friend.
\ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01a.html b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01a.html deleted file mode 100644 index 73fba09c9d..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-01a.html +++ /dev/null @@ -1,4 +0,0 @@ -Shannon:
-We can only take on so many tasks, friend!
-(Only characters below level 20 who have already completed the "Effect of the Mysterious Power" quest, may start this quest) - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-02.htm b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-02.htm index 73a257eaf0..b82eb0166e 100644 --- a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-02.htm @@ -1,5 +1,5 @@ Shannon:
Can I? No, but I know who can.
I will introduce you to a teacher, if you're willing to learn.
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.htm b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.htm new file mode 100644 index 0000000000..5a77beb532 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.htm @@ -0,0 +1,4 @@ +Shannon:
+Enthusiasm! Good!
+You should go find Gallint near the Administration Office ! He'll teach you everything you need to know. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.html b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.html deleted file mode 100644 index 94b648e747..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-03.html +++ /dev/null @@ -1,3 +0,0 @@ -Shannon:
-Enthusiasm! Good! You should go find Gallint near the Administration Office ! He'll teach you everything you need to know. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-06.html b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-06.html new file mode 100644 index 0000000000..64198135de --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32974-06.html @@ -0,0 +1,4 @@ +Shannon:
+We can only take on so many tasks, friend!
+(Only characters below level 20, who have already completed the "Effect of the Mysterious Power" quest, may start this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32980-02.html b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32980-02.html index 19fedb3772..481ba2b11e 100644 --- a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32980-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/32980-02.html @@ -1,4 +1,4 @@ Gallint:
Shannon? I taught her her skills many years ago, until she left to be taught by others.
-Look, I just don't have time to talk to you about these things - we're rebuilding Talking Island Village. You should come back soon though - can teach you skills once my work is done. +Look, I just don't have time to talk to you about these things - we're rebuilding Talking Island Village. You should come back soon though - I can teach you skills once my work is done. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java index 5f41c2607a..017abed4d2 100644 --- a/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java +++ b/trunk/dist/game/data/scripts/quests/Q10324_FindingMagisterGallint/Q10324_FindingMagisterGallint.java @@ -42,8 +42,8 @@ public final class Q10324_FindingMagisterGallint extends Quest super(10324, Q10324_FindingMagisterGallint.class.getSimpleName(), "Finding Magister Gallint"); addStartNpc(SHANNON); addTalkId(SHANNON, GALLINT); - addCondMaxLevel(MAX_LEVEL, "32974-01a.html"); - addCondCompletedQuest(Q10323_TrainLikeItsReal.class.getSimpleName(), "32974-01a.html"); + addCondMaxLevel(MAX_LEVEL, "32974-06.html"); + addCondCompletedQuest(Q10323_TrainLikeItsReal.class.getSimpleName(), "32974-06.html"); } @Override @@ -58,7 +58,7 @@ public final class Q10324_FindingMagisterGallint extends Quest String htmltext = null; switch (event) { - case "32974-03.html": + case "32974-03.htm": { qs.startQuest(); htmltext = event; diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-01.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-01.html index a5fcb6f310..e542dfa32f 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-01.html @@ -1,5 +1,6 @@ Prefect Herz:
Welcome, warrior of flame. I am Herz, the Orc race trainer. Listen up! I'll explain the characteristics and skills of Orc race classes to you.
-Orc Fighters have fast and good physical and Mana healings, making long battles possible.
Even though an Orc Mystic uses magic, the class also has warrior abilities. We are Orcs, after all.
+Orc Fighters have fast and good physical and Mana healings, making long battles possible.
+Even though an Orc Mystic uses magic, the class also has warrior abilities. We are Orcs, after all.
When your abilities improve, and you have new skills that you can learn, the Skill Window will automatically appear. You can check the list of skills that you have by using the shortcut keys ALT+K. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-03.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-03.html index 8c095f204f..7ba44ac3fc 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32151-03.html @@ -1,4 +1,4 @@ Prefect Herz:
-Keep working hard
+Keep working hard.
(You have already completed this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32159-03.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32159-03.html index df5e16da71..35823e8f81 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32159-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32159-03.html @@ -1,3 +1,4 @@ Blacksmith Kincaid:
-The explanation's over. Hurry back to Gallint! +Don't forget what you've learned.
+(You've already completed this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-05.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-05.html index 5ca7819418..5971a655fb 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-05.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-05.html @@ -1,4 +1,4 @@ Gallint:
-Books are food for your mind. Do not let your mind go hungry
+Books are food for your mind. Do not let your mind go hungry.
(You already completed this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-06.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-06.html index 42a9ef815b..a433185c6e 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-06.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-06.html @@ -1,3 +1,3 @@ Gallint:
-Talbot! Go and find them - they should be in front of the Administration Office. +%MASTER%! Go and find them - they should be in front of the Administration Office. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-07.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-07.html index b75a847bce..410747f22b 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-07.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-07.html @@ -1,3 +1,4 @@ -Gallint:
-Cidnet! Go and find them... they should be in front of the Administration Office. +Gallint:
+My entire life, I've been paired with academia. But if there's anything, in all that time, that I now know, it is that I know nothing.
+(Only characters below level 20 who have completed the Looking for Sorcecer Gallint quest, can start this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-08.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-08.html deleted file mode 100644 index 085c5d13d0..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-08.html +++ /dev/null @@ -1,3 +0,0 @@ -Gallint:
-Black! Go and find them... they should be in front of the Administration Office. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-09.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-09.html deleted file mode 100644 index 2114eb55ea..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-09.html +++ /dev/null @@ -1,3 +0,0 @@ -Gallint:
-Herz! Go and find them... they should be in front of the Administration Office. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-10.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-10.html deleted file mode 100644 index 9fb49e4daf..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-10.html +++ /dev/null @@ -1,3 +0,0 @@ -Gallint:
-Kincaid! Go and find them... they should be in front of the Administration Office. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-11.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-11.html deleted file mode 100644 index d220faca05..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-11.html +++ /dev/null @@ -1,3 +0,0 @@ -Gallint:
-Xonia! Go and find them... they should be in front of the Administration Office. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-12.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-12.html deleted file mode 100644 index a68a904718..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32980-12.html +++ /dev/null @@ -1,4 +0,0 @@ -Gallint:
-My entire life, I've been paired with academia. But if there's anything, in all that time I now know, it is that I know nothing.
-(Only characters below level 20 who have completed the Looking for Sorcecer Gallint quest, can start this quest.) - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java index fe467e4447..15c52ae5fa 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java @@ -28,18 +28,24 @@ import quests.Q10324_FindingMagisterGallint.Q10324_FindingMagisterGallint; /** * Searching For New Power (10325) - * @author Gladicek, Neanrakyr + * @author Gladicek, Neanrakyr, gyo */ public class Q10325_SearchingForNewPower extends Quest { // NPCs private static final int GALLINT = 32980; private static final int TALBOT = 32156; - private static final int CIDNET = 32148; + private static final int CINDET = 32148; private static final int BLACK = 32161; - private static final int HERTZ = 32151; + private static final int HERZ = 32151; private static final int KINCAID = 32159; private static final int XONIA = 32144; + private static final String Talbot = "Talbot"; + private static final String Cindet = "Cindet"; + private static final String Black = "Black"; + private static final String Herz = "Herz"; + private static final String Kincaid = "Kincaid"; + private static final String Xonia = "Xonia"; // Items private static final ItemHolder SPIRITSHOTS = new ItemHolder(2509, 1000); private static final ItemHolder SOULSHOTS = new ItemHolder(1835, 1000); @@ -50,9 +56,9 @@ public class Q10325_SearchingForNewPower extends Quest { super(10325, Q10325_SearchingForNewPower.class.getSimpleName(), "Searching For New Power"); addStartNpc(GALLINT); - addTalkId(GALLINT, TALBOT, CIDNET, BLACK, HERTZ, KINCAID, XONIA); - addCondMaxLevel(MAX_LEVEL, "32980-12.html"); - addCondCompletedQuest(Q10324_FindingMagisterGallint.class.getSimpleName(), "32980-12.html"); + addTalkId(GALLINT, TALBOT, CINDET, BLACK, HERZ, KINCAID, XONIA); + addCondMaxLevel(MAX_LEVEL, "32980-07.html"); + addCondCompletedQuest(Q10324_FindingMagisterGallint.class.getSimpleName(), "32980-07.htm"); } @Override @@ -68,53 +74,44 @@ public class Q10325_SearchingForNewPower extends Quest if (event.equals("check_race")) { + qs.startQuest(); + qs.setMemoState(1); + htmltext = getHtm(player.getHtmlPrefix(), "32980-06.html"); switch (player.getRace()) { case HUMAN: { - qs.startQuest(); - qs.setMemoState(1); - htmltext = "32980-06.html"; + htmltext = htmltext.replace("%MASTER%", Talbot); qs.setCond(2); break; } case ELF: { - qs.startQuest(); - qs.setMemoState(1); - htmltext = "32980-07.html"; + htmltext = htmltext.replace("%MASTER%", Cindet); qs.setCond(3); break; } case DARK_ELF: { - qs.startQuest(); - qs.setMemoState(1); - htmltext = "32980-08.html"; + htmltext = htmltext.replace("%MASTER%", Black); qs.setCond(4); break; } case ORC: { - qs.startQuest(); - qs.setMemoState(1); - htmltext = "32980-09.html"; + htmltext = htmltext.replace("%MASTER%", Herz); qs.setCond(5); break; } case DWARF: { - qs.startQuest(); - qs.setMemoState(1); - htmltext = "32980-10.html"; + htmltext = htmltext.replace("%MASTER%", Kincaid); qs.setCond(6); break; } case KAMAEL: { - qs.startQuest(); - qs.setMemoState(1); - htmltext = "32980-11.html"; + htmltext = htmltext.replace("%MASTER%", Xonia); qs.setCond(7); break; } @@ -131,7 +128,7 @@ public class Q10325_SearchingForNewPower extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { @@ -145,6 +142,7 @@ public class Q10325_SearchingForNewPower extends Quest } case State.STARTED: { + int cond = qs.getCond(); switch (npc.getId()) { case GALLINT: @@ -175,96 +173,120 @@ public class Q10325_SearchingForNewPower extends Quest { if (player.getRace() == Race.HUMAN) { - if ((qs.isCond(2))) + if (qs.isCond(2)) { htmltext = "32156-01.html"; qs.setCond(8); - break; } - htmltext = "32156-02.html"; - break; + else if (qs.isCond(8)) + { + htmltext = "32156-02.html"; + } + } + else if ((cond > 1) && (cond < 8)) + { + htmltext = "32156-04.html"; } - htmltext = "32156-04.html"; break; } - case CIDNET: + case CINDET: { if (player.getRace() == Race.ELF) { - if ((qs.isCond(3))) + if (qs.isCond(3)) { htmltext = "32148-01.html"; qs.setCond(8); - break; } - htmltext = "32148-02.html"; - break; + else if (qs.isCond(8)) + { + htmltext = "32148-02.html"; + } + } + else if ((cond > 1) && (cond < 8)) + { + htmltext = "32148-04.html"; } - htmltext = "32148-04.html"; break; } case BLACK: { if (player.getRace() == Race.DARK_ELF) { - if ((qs.isCond(4))) + if (qs.isCond(4)) { htmltext = "32161-01.html"; qs.setCond(8); - break; } - htmltext = "32161-02.html"; - break; + else if (qs.isCond(8)) + { + htmltext = "32161-02.html"; + } + } + else if ((cond > 1) && (cond < 8)) + { + htmltext = "32161-04.html"; } - htmltext = "32161-04.html"; break; } - case HERTZ: + case HERZ: { if (player.getRace() == Race.ORC) { - if ((qs.isCond(5))) + if (qs.isCond(5)) { htmltext = "32151-01.html"; qs.setCond(8); - break; } - htmltext = "32151-02.html"; - break; + else if (qs.isCond(8)) + { + htmltext = "32151-02.html"; + } + } + else if ((cond > 1) && (cond < 8)) + { + htmltext = "32151-04.html"; } - htmltext = "32151-04.html"; break; } case KINCAID: { if (player.getRace() == Race.DWARF) { - if ((qs.isCond(6))) + if (qs.isCond(6)) { htmltext = "32159-01.html"; qs.setCond(8); - break; } - htmltext = "32159-02.html"; - break; + else if (qs.isCond(8)) + { + htmltext = "32159-02.html"; + } + } + else if ((cond > 1) && (cond < 8)) + { + htmltext = "32159-04.html"; } - htmltext = "32159-04.html"; break; } case XONIA: { if (player.getRace() == Race.KAMAEL) { - if ((qs.isCond(7))) + if (qs.isCond(7)) { htmltext = "32144-01.html"; qs.setCond(8); - break; } - htmltext = "32144-02.html"; - break; + else if (qs.isCond(8)) + { + htmltext = "32144-02.html"; + } + } + else if ((cond > 1) && (cond < 8)) + { + htmltext = "32144-04.html"; } - htmltext = "32144-04.html"; break; } } @@ -280,9 +302,9 @@ public class Q10325_SearchingForNewPower extends Quest break; } case TALBOT: - case CIDNET: + case CINDET: case BLACK: - case HERTZ: + case HERZ: case KINCAID: case XONIA: { diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-01.html b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-01.html index 97aed26ac1..8c12c2c397 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-01.html @@ -1,5 +1,5 @@ Pantheon:
-Hmm? You came Gallint instead? Injured by falling book... How is he? He could not move away from the shock of the fall of the Island, but still continued to work... Even don `t know what to say... just restless... Hmm...
-Right. What Gallint asked me to tell me?
- +Huh? You came instead of Gallint?
+Is he okay? I heard about his little accident... He was overworked, the poor, stupid fool.
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-02.html b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-02.html index edad11681d..7e4b232f05 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32972-02.html @@ -1,4 +1,4 @@ Pantheon:
-Suspicious Types... Now I remember that in recent times have also seen in the Museum of strange personalities. It seemed to me that they are looking for material on the Giants... Maybe they're one of those bands that were seen in the Ruins?
-They tried to steal a book called War of the Gods and the Giants. In this ancient manuscript contains information in the power of the Giants, the origin of their powers, monsters era Giants and the like. I am afraid that now, after the fall of the Island of Giants, this information can be used for evil purposes. It is necessary to rearrange the book elsewhere. +Hmm... we had the same thing happen here in the museum. We think they were looking for anything related to the Giants, and tried to steal The War of Gods and Giants , an ancient book that was discovered in Ye Sagira. +It has many stories about the powers of the Giants, how that power can be learned, and about others species from their time. With the recent devastation, perhaps... \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-01.htm b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-01.htm index 4d60592e7e..0cc3486933 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-01.htm +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-01.htm @@ -1,4 +1,5 @@ Gallint:
-Ah-ah! My back... Something I overworked these documents... Ah... I wanted to give something... How am I so...
- +My god. My back! I can't even move. I worked too hard organizing... documents. +Ahh.. I have something to tell you... But my body is... + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-02.htm b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-02.htm index 46812ce171..c34b46b7ca 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-02.htm @@ -1,6 +1,6 @@ Gallint:
-You know... Today I long for the first time, brought order to the documents. There were so many that had to move folders using magic.
-But these manuscripts was so much dust that I started sneezing. Distracted, and documents that are carried through the air, dropped over. Now sore lower back.
-For three days had passed on his feet I stood up, but moving all Yeshe hard. It was necessary to convey something of the Pantheon. Phew.
- +NO I'M NOT OKAY! OW! Don't make me shout!
+I was organizing the... documents in our old storage rooms, lifting up whole tomes with my magic. But... ow ow ow... okay... but they'd not been moved for years, and had quite a collection of dust covering them. The dust was getting thrown up everywhere, then I... I sneezed, and everything came crashing down around me. Around me, and on me.
+And I had something important to tell Pantheon... Sigh... + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.htm b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.htm new file mode 100644 index 0000000000..3191f356f0 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.htm @@ -0,0 +1,4 @@ +Gallint:
+Ah yes! Yes, you can...
+Well then... please go into the museum and tell Pantheon that "there were suspicious people... OW... caught in Ye Sagira" . You can leave out the 'ow' part. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.html b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.html deleted file mode 100644 index 0d8ed6b9df..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-03.html +++ /dev/null @@ -1,3 +0,0 @@ -Gallint:
-You are so kind. Pantheon is located at the Museum. Tell him: "In Esagire caught suspicious characters". And pass. I beg you. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-04.html b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-04.html index 5fe208f68f..27148eebf4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-04.html @@ -1,4 +1,3 @@ Gallint:
-Come back... laster! Too much... pain, and you can't help Argh!
-(Only characters level 20 or above may take on this quest) +Please go into the museum and tell Pantheon that "there were suspicious people caught in Sagira". \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-05.html b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-05.html index 77deba60fc..5fe208f68f 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-05.html +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-05.html @@ -1,4 +1,4 @@ Gallint:
Come back... laster! Too much... pain, and you can't help Argh!
-(Only characters under level 20 who have completed the Looking for New Power quest may take on this quest) +(Only characters level 20 or above may take on this quest) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-06.htm b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-06.htm new file mode 100644 index 0000000000..77deba60fc --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/32980-06.htm @@ -0,0 +1,4 @@ +Gallint:
+Come back... laster! Too much... pain, and you can't help Argh!
+(Only characters under level 20 who have completed the Looking for New Power quest may take on this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java index bd8f45ba95..de5b9a7287 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java @@ -63,8 +63,8 @@ public class Q10326_RespectYourElders extends Quest addTalkId(GALLINT, PANTHEON); addSpawnId(HANDERMONKEY); addMoveFinishedId(HANDERMONKEY); - addCondMaxLevel(MAX_LEVEL, "32980-04.html"); - addCondCompletedQuest(Q10325_SearchingForNewPower.class.getSimpleName(), "32980-05.html"); + addCondMaxLevel(MAX_LEVEL, "32980-05.html"); + addCondCompletedQuest(Q10325_SearchingForNewPower.class.getSimpleName(), "32980-06.htm"); } @Override @@ -79,7 +79,7 @@ public class Q10326_RespectYourElders extends Quest String htmltext = null; switch (event) { - case "32980-03.html": + case "32980-03.htm": { qs.startQuest(); htmltext = event; @@ -193,21 +193,17 @@ public class Q10326_RespectYourElders extends Quest { case State.CREATED: { - if (npc.getId() == GALLINT) - { - htmltext = "32980-01.htm"; - break; - } + htmltext = npc.getId() == GALLINT ? "32980-01.htm" : getNoQuestMsg(player); break; } case State.STARTED: { - htmltext = npc.getId() == GALLINT ? "32980-03.html" : "32972-01.html"; + htmltext = npc.getId() == GALLINT ? "32980-04.html" : "32972-01.html"; break; } case State.COMPLETED: { - htmltext = npc.getId() == GALLINT ? "32980-04.html" : "32972-03.html"; + htmltext = npc.getId() == GALLINT ? "32980-05.html" : "32972-03.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-02.htm b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-02.htm index 4d5305bf3e..900d898323 100644 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-02.htm @@ -1,5 +1,5 @@ Pantheon:
We think they were looking for anything related to the Giants,and tried to steal The War of Gods and Giants, an ancient book that was discovered in Ye Sagira.
It has many stories about the powers of the Giants, how that power can be learned, and about others species from their time. Now that the island has crashed, perhaps we should think about safeguarding the book...
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-03.html b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-03.html deleted file mode 100644 index a78d596f51..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-03.html +++ /dev/null @@ -1,6 +0,0 @@ -Pantheon:
-Thank you! -When you get to the museum, you should see a number of desks - one of them has The War of Giants and Gods on it. Find it, and bring it to me.
-Would you like to go to the museum?
- - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-05.html b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-05.html index be6fa970d2..97ae48b0ba 100644 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-05.html +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-05.html @@ -1,5 +1,4 @@ -Pantheon:
-You've brought the book? Good! It must have been difficult to find it amongst all those others!
-I hope you didn't get hurt either - Gallint may be a fool, but plenty have hurt themselves moving books around before him.
- +Pantheon:
+I just saw suspicious intruders entering the Museum! I fear for the rare and valuable articles inside the Museum. Please hurry into the Museum and deal with the intruders!
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-06.html b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-06.html index 8528007c48..d6fbdad956 100644 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-06.html +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-06.html @@ -1,6 +1,5 @@ -Pantheon:
-What? The thieves are getting more brash by the day!
-Hmm... So, I wonder if the books related to Giants... are also related to Embryo. It's just speculation, but something worth considering.
-Now, I must apologize for placing you in harm's way. Please accept these Earrings - accessories such as these help protect you against magic!
-Remember: you can wear up to two earrings at a time. Purchase more from the General Merchant if you wish. +Pantheon:
+You've brought the book? Good! It must have been difficult to find it amongst all those others!
+I hope you didn't get hurt either - Gallint may be a fool, but plenty have hurt themselves moving books around before him.
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-07.html b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-07.html index 951438b5dc..d60976cfa0 100644 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-07.html +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-07.html @@ -1,4 +1,6 @@ Pantheon:
-I'm still looking into things, friend. I'll let you know when I find anything.
-(You have already completed this quest.) +'What? The thieves are getting more brash by the day!
+Hmm... So, I wonder if the books related to Giants... are also related to Embryo. It's just speculation, but something worth considering.
+Now, I must apologize for placing you in harm's way. Please accept these Earrings - accessories such as these help protect you against magic!
+Remember: you can wear up to two earrings at a time. Purchase more from the General Merchant if you wish. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-08.html b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-08.html new file mode 100644 index 0000000000..951438b5dc --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-08.html @@ -0,0 +1,4 @@ +Pantheon:
+I'm still looking into things, friend. I'll let you know when I find anything.
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-09.htm b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-09.htm new file mode 100644 index 0000000000..193f809d21 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/32972-09.htm @@ -0,0 +1,4 @@ +Pantheon:
+This mission can't be given to just anyone!
+(Only characters below 20, who've completed the "Let's Respect Elders" quest, may start this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java index 6a03df9501..f9d8def77a 100644 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java +++ b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java @@ -46,8 +46,8 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest addStartNpc(PANTHEON); addTalkId(PANTHEON); registerQuestItems(THE_WAR_OF_GODS_AND_GIANTS); - addCondMaxLevel(MAX_LEVEL, "no_level.html"); - addCondCompletedQuest(Q10326_RespectYourElders.class.getSimpleName(), "no_level.html"); + addCondMaxLevel(MAX_LEVEL, "32972-09.htm"); + addCondCompletedQuest(Q10326_RespectYourElders.class.getSimpleName(), "32972-09.htm"); } @Override @@ -67,13 +67,13 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest htmltext = event; break; } - case "32972-03.html": + case "32972-03.htm": { qs.startQuest(); htmltext = event; break; } - case "32972-06.html": + case "32972-07.html": { if (qs.isCond(3)) { @@ -82,6 +82,7 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest addExpAndSp(player, 7800, 5); showOnScreenMsg(player, NpcStringId.ACCESSORIES_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 5000); qs.exitQuest(false, true); + htmltext = event; } break; } @@ -104,19 +105,29 @@ public class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest } case State.STARTED: { - if (qs.isCond(3)) + switch (qs.getCond()) { - htmltext = "32972-05.html"; - } - else - { - htmltext = "32972-04.html"; + case 1: + { + htmltext = "32972-04.html"; + break; + } + case 2: + { + htmltext = "32972-05.html"; + break; + } + case 3: + { + htmltext = "32972-06.html"; + break; + } } break; } case State.COMPLETED: { - htmltext = "32972-07.html"; + htmltext = "32972-08.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/no_level.html b/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/no_level.html deleted file mode 100644 index f7b7db13e2..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/no_level.html +++ /dev/null @@ -1,4 +0,0 @@ -Pantheon:
-This mission can't be give to just anyone!
-(Only characters below 20, who have completed the "Respect Your Elders" quest, may start this quest.) - \ No newline at end of file