diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-01.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-01.html index 4a67d33110..1e0a179068 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-01.html @@ -1,5 +1,6 @@ Master Xonia:
-Welcome, Kamael.
I am Xonia. I wish to teach you about the classes available to our kind.
+Welcome, Kamael. +I am Xonia. I wish to teach you about the classes available to our kind.
Kamael Soldiers are powerful with both spell and sword, and attack with great speed. They use their opponents' souls to unleash their most powerful skills!
As your strength grows, you'll notice a Skill Window automatically popping up from time to time. You can also use the shortcut key ALT+K to check out the list of skills you already know of. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-02.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-02.html index 0caee3fcbd..6e9022eb41 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-02.html @@ -1,3 +1,3 @@ Master Xonia:
-I'm finished with my explanation. Now, you can return to Gallint and report. +I'm finished with my explanation. Now, you can return to Gallint and report. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-03.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-03.html index c429a6b2ed..ab49dd19cc 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32144-03.html @@ -1,4 +1,4 @@ Master Xonia:
Kamael strength to you, friend.
-(You have already completed this quest.) +(You have already completed this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-01.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-01.html index 49eda78169..d2cbd5b4b8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-01.html @@ -1,6 +1,7 @@ Master Cidnet:
-Welcome! I am Cidnet, skillmaster to the Elves!
-If you have a moment, I would like to tell you a little about some of the classes available to us Elves.
Elven Fighters have high Evasion Rate, Attack Accuracy, and are skilled with bows.
+Welcome! I am Cidnet, skillmaster to the Elves! +If you have a moment, I would like to tell you a little about some of the classes available to us Elves.
+Elven Fighters have high Evasion Rate, Attack Accuracy, and are skilled with bows.
Elven Mages can cast ferociously quickly, and recover lost mana at quite a rate!
If your powers improve and gain access to stronger skills, a Skill Window will automatically pop up. Furthermore, you can use the shortcut key ALT+K, to check out the list of skills you've learned. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-02.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-02.html index f6c3400924..369c9c387c 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-02.html @@ -1,3 +1,3 @@ -Master Cidnet:
-I'm finished with my explanation! You can return to Gallint and report. +Master Cindet:
+I'm finished with my explanation! You can return to Gallint and report. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-03.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-03.html index df125ce0d0..338330c62a 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32148-03.html @@ -1,4 +1,4 @@ Master Cidnet:
Good, good! I have trained you well.
-(You have already completed this quest.) +(You have already completed this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-01.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-01.html index 117c57f3f4..5faf4d5ca8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-01.html @@ -1,7 +1,6 @@ Master Talbot:
-Welcome!
-I am Talbot, human skillmaster, here to explain the benefits and drawbacks of the classes we can choose from.
-Human Fighters mainly employ short-range melee attacks, and can handle most basic weapons and armor types.
-Human Mages have an innate affinity for the power of the spoken word. They use Elemental Magic, White Magic, Supplemental Magic, Dark Magic and Summon Magic!
-As your strength grows, you'll notice a Skill Window automatically show up from time to time. You can also use the shortcut key ALT+K to check out the skills you already know. +Welcome! I am Talbot. I'm here to explain the benefits and drawbacks of the classes you can choose from.
+Human Fighters focus on short-range melee attacks, and can handle basic weapons and armor types.
+Human Mages have an innate affinity for the power of the spoken word. They use Elemental Magic, White Magic, Support Magic, Dark Magic and Summon Magic!
+When your abilities improve, theSkill Window will appear showing any new skills you can learn. You can check your list of skills by using the shortcut key ALT+K. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-02.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-02.html index 7a8ea7280a..cce93f6bf4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32156-02.html @@ -1,3 +1,3 @@ Master Talbot:
-I'm finished with my explanation! Return to Gallint and report. +That's all I have to tell you. Return to Gallint for more instructions. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32161-01.html b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32161-01.html index f3f3ad08a6..344f65300e 100644 --- a/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32161-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/32161-01.html @@ -1,5 +1,5 @@ Master Black:
-Welcome! My name is Black and I am a skillmaster to the Dark Elves.
+Welcome! My name is Black and I am a skillmaster to the Dark Elves. I want to take a minute to tell you about the different classes I train.
Dark Fighters fight extremely quickly thanks to their high Atk and Evasion rates.
Dark Mages have powerful M. Atk. and high Healing abilities.
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 a433185c6e..bb5016dcb7 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:
-%MASTER%! 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/Q10325_SearchingForNewPower.java b/trunk/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java index b6097acaee..91b37a81f2 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 @@ -35,13 +35,13 @@ 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 HERZ = 32151; private static final int KINCAID = 32159; private static final int XONIA = 32144; private static final String Talbot = "Talbot"; - private static final String Cidnet = "Cidnet"; + private static final String Cindet = "Cindet"; private static final String Black = "Black"; private static final String Herz = "Herz"; private static final String Kincaid = "Kincaid"; @@ -56,7 +56,7 @@ public class Q10325_SearchingForNewPower extends Quest { super(10325, Q10325_SearchingForNewPower.class.getSimpleName(), "Searching For New Power"); addStartNpc(GALLINT); - addTalkId(GALLINT, TALBOT, CIDNET, BLACK, HERZ, KINCAID, XONIA); + addTalkId(GALLINT, TALBOT, CINDET, BLACK, HERZ, KINCAID, XONIA); addCondMaxLevel(MAX_LEVEL, "32980-07.htm"); addCondCompletedQuest(Q10324_FindingMagisterGallint.class.getSimpleName(), "32980-07.htm"); } @@ -87,7 +87,7 @@ public class Q10325_SearchingForNewPower extends Quest } case ELF: { - htmltext = htmltext.replace("%MASTER%", Cidnet); + htmltext = htmltext.replace("%MASTER%", Cindet); qs.setCond(3); break; } @@ -189,7 +189,7 @@ public class Q10325_SearchingForNewPower extends Quest } break; } - case CIDNET: + case CINDET: { if (player.getRace() == Race.ELF) { @@ -302,7 +302,7 @@ public class Q10325_SearchingForNewPower extends Quest break; } case TALBOT: - case CIDNET: + case CINDET: case BLACK: case HERZ: case KINCAID: diff --git a/trunk/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/trunk/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java index 6ea3ee596c..c9a11ce39b 100644 --- a/trunk/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java +++ b/trunk/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java @@ -102,6 +102,7 @@ public class Q10363_RequestOfTheSeeker extends Quest if (qs.getCond() == 6) { qs.setCond(7); + showOnScreenMsg(player, NpcStringId.USE_THE_YE_SAGIRA_TELEPORT_DEVICE_TO_GO_TO_EXPLORATION_AREA_3, ExShowScreenMessage.TOP_CENTER, 10000); htmltext = event; } break; diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-01.htm b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-01.htm index f08a04c1c9..7fecc1c4a7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-01.htm +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-01.htm @@ -1,6 +1,6 @@ Celin:
Those who work together soon understand each other and begin to form bonds, you know.
-You've heard of espirit de corps, right? That sense of camaraderie can only be made in times of extreme suffering.
-That's why boot camp is so draining - the do it to establish group mentality... the physical conditional is just a bonus.
- +You've heard of esprit de corps, right? That sense of camaraderie can only be made in times of extreme suffering.
+That's why boot camp is so draining - they do it to establish group mentality... the physical conditional is just a bonus.
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-02.htm b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-02.htm index 8e66706086..440367f766 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-02.htm @@ -1,6 +1,6 @@ Celin:
Well... good!
-So you must see how jarring it is when two commandos in the same unit don't see eye to eye! Sadly, I'm not jst spouting hypotheticals here - there are two soldiers in my unit who won't talk to each other. If they were to go into combat, they'd be one hell of a weak link...
-I want somone to get them talking again. Negotiate, bang their head together... Idon't care.
- +So you must see how jarring it is when two commandos in the same unit don't see eye to eye! Sadly, I'm not just spouting hypotheticals here - there are two soldiers in my unit who won't talk to each other. If they were to go into combat, they'd be one hell of a weak link...
+I want someone to get them talking again. Negotiate, bang their heads together... I don't care.
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-03.htm b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-03.htm index 8ff93b4f6f..47defb8b05 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-03.htm +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-03.htm @@ -1,4 +1,4 @@ Celin:
-There's Walter in Exploration Zone 3, and Dep in Exploration Zone4.
+There's Walter in Exploration Zone 3, and Dep in Exploration Zone 4.
Go to Walter first - he's closer, and persuade him to sort things out. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-04.htm b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-04.html similarity index 52% rename from trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-04.htm rename to trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-04.html index fd6aef483f..612926e140 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-04.htm +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-04.html @@ -1,3 +1,3 @@ Celin:
-Have you talked to Walter? +Have you talked to Walter?
\ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.htm b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.htm new file mode 100644 index 0000000000..8c36297ae9 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.htm @@ -0,0 +1,4 @@ +Celin:
+Good, I hope that you do! Trust your allies, friend. They make you stronger than you'll ever be alone.
+(Only those who have completed the "Request of Rangers" quest, and are between levels 14-25, may start this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html new file mode 100644 index 0000000000..90bb49b965 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html @@ -0,0 +1,4 @@ +Celin:
+Good to see you friend! Things are much better here.
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-01.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-01.html index 62b9ae3163..aeae7a3e60 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-01.html @@ -1,4 +1,4 @@ Walter:
-Did Dep send you? He did, din't he. Well, I have nothing more to say to him. Hrmph!
- +Did Dep send you? He did, didn't he. Well, I have nothing more to say to him. Hrmph!
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-02.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-02.html index 90b37b93db..a29d08d1dd 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-02.html @@ -1,5 +1,5 @@ Walter:
Celin just doesn't know when to give up!
Sigh... I tell you, it's about Dep, you can go back and tell Celin it won't work! I simply refuse to get involved with someone who doesn't have a shred of common sense.
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-03.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-03.html index ce193eb68a..b63c0e8b8a 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-03.html @@ -1,6 +1,6 @@ Walter:
That's the problem, I don't know what happened! We've been working together just fine, then suddenly he gets all bent out of shape and storms off. I tried to find out what the problem was, and smooth things over, but he wouldn't even talk to me.
I don't know what he's all worked up about, and frankly, I don't care! Stubborn old... Grr!
-Well, I have some work related papers that I want to give to him, but I don't want to make waves. Could you take them to him for me? - +Well, I have some work related papers that I want to give to him, but I don't want to make waves. Could you take them to him for me?
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-04.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-04.html index 7ee6872514..4d03d082ed 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-04.html @@ -1,6 +1,6 @@ Walter:
-Ah, it's not so difficult. Old pieces of paper have been appearing around here. I'm not sure what they're regarding, but Dep likes this kind of stuff.
-I want you to gather 5 or so, then hand them to Dep in Exploration Area 4.
-You'll find the pieces of paper by defeating the Husk Kraphers and Husk Avians.
-And... say hi ti him for me, okay? +Ah, it's not so difficult. Old pieces of paper have been appearing around here. I'm not sure what they're regarding, but Dep likes this kind of stuff. +I want you to gather 5 or so, then hand them to Dep in Exploration Area 4 .
+You'll find the pieces of paper by defeating the Husk Kraphers and Husk Avians .
+And... say hi to him for me, okay? \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-05.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-05.html index 7962c434ec..8851dbf0b8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-05.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-05.html @@ -1,6 +1,6 @@ Walter:
One more time...
-I want you to gather 5 or so, then hand them to Dep in Exploration Area 4.
-You'll find the pieces of paper by defeating the Husk Kraphers and Husk Avians.
-And... say hi ti him for me, okay? +I want you to gather 5 or so, then hand them to Dep in Exploration Area 4 . +You'll find the pieces of paper by defeating the Husk Krapher and Husk Avians .
+And... say hi to him for me, okay? \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-06.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-06.html new file mode 100644 index 0000000000..c58e528347 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-06.html @@ -0,0 +1,4 @@ +Walter:
+The pieces of paper are quite hard to read.
+Take them to Dep in the 4th Exploration Area. He'll be interested in them. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-07.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-07.html new file mode 100644 index 0000000000..f13a2b1690 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33452-07.html @@ -0,0 +1,4 @@ +Walter:
+Thanks to you, Dep and I have worked out our little misunderstanding. Thank you.
+(This quest has already been completed.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-01.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-01.html index c96d5bd7d7..16ad922aa9 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-01.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-01.html @@ -1,6 +1,6 @@ Dep:
-Sigh...
+Sigh... When I'm feeling blue, I want go away, and be alone somewhere quiet. But, when you work as a ranger, you can't get away from busy place like these.
Anyway, why are you here?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-02.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-02.html index 18fde3d14e..b62dfd58e4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-02.html @@ -1,6 +1,6 @@ Dep:
The papers from the Ruins of Ye Sagira?
Ye Sagira was the home of the giants - papers discovered there will tell us more about the giants!
-Show them to me, and tell me... how did you find out about the papers?
- +Show them to me, and tell me... how did you find out about the papers?
+ \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-03.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-03.html index 4e8ee7942f..19e92211de 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-03.html @@ -1,7 +1,7 @@ Dep:
Walter? Hm...
-Actually, I've know about the paper pieces in Ye Sagira for quite some time now...
+Actually, I've known about the paper pieces in Ye Sagira for quite some time now...
I just wasn't sure exactly where they were. I was looking for them a while back, wandering through Exploration Zone 3 with Walter, but he kept following me and talking to me and... well... I ended up losing my temper and shouting at him... we haven't spoken since.
Did he say anything else?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-04.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-04.html index a86667452c..6f0751225e 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-04.html @@ -1,4 +1,4 @@ Dep:
-R... really?
+R... really?

I should apologize to Walter...Well, let me take those pieces of paper. I hope there's information about the giants in them! \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-05.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-05.html new file mode 100644 index 0000000000..c17c044ee7 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33453-05.html @@ -0,0 +1,5 @@ +Dep:
+Walter accepted my apologies! +Thank you so much!
+(You have already completed this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java index f919ae9493..6c6a08fd0a 100644 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java +++ b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java @@ -22,13 +22,15 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; +import com.l2jmobius.gameserver.network.NpcStringId; +import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import com.l2jmobius.gameserver.util.Util; import quests.Q10363_RequestOfTheSeeker.Q10363_RequestOfTheSeeker; /** * Obligations of the Seeker (10364) - * @author spider + * @author spider, gyo */ public class Q10364_ObligationsOfTheSeeker extends Quest { @@ -59,8 +61,8 @@ public class Q10364_ObligationsOfTheSeeker extends Quest addTalkId(CELIN, WALTER, DEP); addKillId(KRAPHER, AVIAN); registerQuestItems(DIRTY_PIECE_OF_PAPER); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.htm"); - addCondCompletedQuest(Q10363_RequestOfTheSeeker.class.getSimpleName(), "no_prequest.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33451-05.htm"); + addCondCompletedQuest(Q10363_RequestOfTheSeeker.class.getSimpleName(), "33451-05.htm"); } @Override @@ -97,7 +99,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest if (qs.isCond(1)) { htmltext = event; - qs.setCond(2); + qs.setCond(2, true); } break; } @@ -138,7 +140,24 @@ public class Q10364_ObligationsOfTheSeeker extends Quest } case State.COMPLETED: { - htmltext = getAlreadyCompletedMsg(player); + switch (npc.getId()) + { + case CELIN: + { + htmltext = "33451-06.html"; + break; + } + case WALTER: + { + htmltext = "33452-07.html"; + break; + } + case DEP: + { + htmltext = "33453-05.html"; + break; + } + } break; } case State.STARTED: @@ -147,7 +166,7 @@ public class Q10364_ObligationsOfTheSeeker extends Quest { case CELIN: { - htmltext = "33451-04.htm"; + htmltext = "33451-04.html"; break; } case WALTER: @@ -156,10 +175,14 @@ public class Q10364_ObligationsOfTheSeeker extends Quest { htmltext = "33452-01.html"; } - else + else if (qs.isCond(2)) { htmltext = "33452-05.html"; } + else + { + htmltext = "33452-06.html"; + } break; } case DEP: @@ -188,13 +211,15 @@ public class Q10364_ObligationsOfTheSeeker extends Quest final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); if ((qs != null) && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { - if (getQuestItemsCount(qs.getPlayer(), DIRTY_PIECE_OF_PAPER) < DPP_REQUIRED) + if (getQuestItemsCount(qs.getPlayer(), DIRTY_PIECE_OF_PAPER) < (DPP_REQUIRED - 1)) { giveItems(qs.getPlayer(), DIRTY_PIECE_OF_PAPER, 1); } else { - qs.setCond(3); + giveItems(qs.getPlayer(), DIRTY_PIECE_OF_PAPER, 1); + qs.setCond(3, true); + showOnScreenMsg(qs.getPlayer(), NpcStringId.USE_THE_YE_SAGIRA_TELEPORT_DEVICE_TO_GO_TO_EXPLORATION_AREA_4, ExShowScreenMessage.TOP_CENTER, 10000); } } return super.onKill(npc, killer, isSummon); diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/no_level.htm b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/no_level.htm deleted file mode 100644 index 854e3aff2d..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/no_level.htm +++ /dev/null @@ -1,3 +0,0 @@ -You don't meet level requirements
-(Quest available from level 14 to level 25) - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/no_prequest.html b/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/no_prequest.html deleted file mode 100644 index b671a06258..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/no_prequest.html +++ /dev/null @@ -1,2 +0,0 @@ -To begin this quest, you need to complete Request of the Seeker quest first. - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html index 374b767354..b660753303 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html @@ -1,4 +1,3 @@ Sebion:
-I'm planning to take King back to town. He's fine, don't worry.
-(Quest already completed.) +Yes? You came to give me a dog? Where is it? Did you let it get away from you? Go back to the 4th Exploration Zone, and tell Dep about it. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-04.html b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-04.html new file mode 100644 index 0000000000..a30d9347ef --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-04.html @@ -0,0 +1,4 @@ +Sebion:
+I'm planning to take King back to town. He's fine, don't worry.
+(Quest already complete) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-05.html b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-05.html new file mode 100644 index 0000000000..e2f673e9e9 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-05.html @@ -0,0 +1,4 @@ +Sebion:
+This place is dangerous. I think it's best if you go back to town.
+(Only level 16-25 characters who have completed the scout mission may complete this quest) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm index 48addc9d2a..b495d7e665 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm @@ -3,5 +3,5 @@ Yes. I want you to take King here to somewhere far away... to Sebion!
Sebion will be able to take care of King much better than me. Right, King? (King barks.) Ha - see! He knows where to find Sebion, could you just follow him and make sure he gets there safe?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.html b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.htm similarity index 50% rename from trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.html rename to trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.htm index b6980ca836..6754ebd27a 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.html +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.htm @@ -1,5 +1,5 @@ -Dep:
+Dep:
Thank you! -Sebion is in Exploration Zone 5. You just need to follow King, and he'll guide you to Sebion.
-Listen, friend. King cannot come back here. You hear that King? You can't come back! It's not safe! +Sebion is in Exploration Zone 5 . You just need to follow King, and he'll guide you to Sebion.
+Listen, friend. King cannot come back here. You hear that King? You can't come back! It's not safe! \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html index a61ae749c1..7c673798fe 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html @@ -1,4 +1,4 @@ Dep:
Don't take your eyes off King! If he loses you, he'll just come back to me! It's not safe here!
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/no_level.html b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html similarity index 51% rename from trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/no_level.html rename to trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html index 66bd20aef1..a4f2eeb6c7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/no_level.html +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html @@ -1,4 +1,4 @@ Dep:
I can't just give King to anybody!
-(Only characters between level 16 and 25 can take this quest.) +(Only characters between level 16 and 25 can take on this quest.) \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java index 07c4b7b884..9c56474ce2 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java @@ -94,8 +94,8 @@ public final class Q10365_SeekerEscort extends Quest addTalkId(DEP, SEBION); addSpawnId(BLOODHOUND); addMoveFinishedId(BLOODHOUND); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html"); - addCondCompletedQuest(Q10364_ObligationsOfTheSeeker.class.getSimpleName(), "no_level.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33453-07.html"); + addCondCompletedQuest(Q10364_ObligationsOfTheSeeker.class.getSimpleName(), "33453-07.html"); } @Override @@ -115,7 +115,7 @@ public final class Q10365_SeekerEscort extends Quest htmltext = event; break; } - case "33453-03.html": + case "33453-03.htm": { qs.startQuest(); qs.setMemoState(2); @@ -159,7 +159,7 @@ public final class Q10365_SeekerEscort extends Quest { if (loc_index == 16) { - showOnScreenMsg(player, NpcStringId.YOU_MUST_MOVE_TO_EXPLORATION_AREA_5_IN_ORDER_TO_CONTINUE, ExShowScreenMessage.TOP_CENTER, 5000); + showOnScreenMsg(player, NpcStringId.YOU_MUST_MOVE_TO_EXPLORATION_AREA_5_IN_ORDER_TO_CONTINUE, ExShowScreenMessage.TOP_CENTER, 10000); startQuestTimer("DELETE_NPC", 3000, npc, owner); startQuestTimer("NEXT_AREA", 7000, npc, owner); break; @@ -188,7 +188,7 @@ public final class Q10365_SeekerEscort extends Quest if (failCount >= 30) { qs.setMemoState(1); - showOnScreenMsg(player, NpcStringId.KING_HAS_RETURNED_TO_DEF_RETURN_TO_DEF_AND_START_AGAIN, ExShowScreenMessage.TOP_CENTER, 5000); + showOnScreenMsg(player, NpcStringId.KING_HAS_RETURNED_TO_DEF_RETURN_TO_DEF_AND_START_AGAIN, ExShowScreenMessage.TOP_CENTER, 10000); npc.deleteMe(); break; } @@ -253,7 +253,7 @@ public final class Q10365_SeekerEscort extends Quest if (owner != null) { - showOnScreenMsg(owner, NpcStringId.CATCH_UP_TO_KING_HE_S_WAITING, ExShowScreenMessage.TOP_CENTER, 5000); + showOnScreenMsg(owner, NpcStringId.CATCH_UP_TO_KING_HE_S_WAITING, ExShowScreenMessage.TOP_CENTER, 1000); npc.setHeading(Util.calculateHeadingFrom(npc, owner)); npc.broadcastPacket(new ExRotation(npc.getObjectId(), npc.getHeading())); startQuestTimer("CHECK_PLAYER", 1000, npc, owner); @@ -270,11 +270,7 @@ public final class Q10365_SeekerEscort extends Quest { case State.CREATED: { - if (npc.getId() == DEP) - { - htmltext = "33453-01.htm"; - break; - } + htmltext = npc.getId() == DEP ? "33453-01.htm" : "32978-05.html"; break; } case State.STARTED: @@ -301,6 +297,10 @@ public final class Q10365_SeekerEscort extends Quest { htmltext = "32978-01.html"; } + else + { + htmltext = "32978-03.html"; + } break; } break; @@ -309,7 +309,7 @@ public final class Q10365_SeekerEscort extends Quest { if (npc.getId() == SEBION) { - htmltext = "32978-03.html"; + htmltext = "32978-04.html"; } else { diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32146-01.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32146-01.html new file mode 100644 index 0000000000..8b214231d1 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32146-01.html @@ -0,0 +1,4 @@ +Grand Master Valfar:
+I often hear of your outstanding performances, child, but did you complete the work I assigned you in the Ruins of Ye Sagira too?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32146-02.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32146-02.html new file mode 100644 index 0000000000..de7f351939 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32146-02.html @@ -0,0 +1,5 @@ +Grand Master Valfar:
+Good! This is wonderful news. Now, perhaps we'll start to see a return to normality, even if it takes a little while for those beasts to be killed off for good. +Is there anything else?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-02.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-02.html new file mode 100644 index 0000000000..f38873bede --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-02.html @@ -0,0 +1,4 @@ +Grand Master Rivian:
+Ah, excellent! If the monsters have been cut down in number, then perhaps the rest will get the message and flee. At any rate, you've helped secure our home, and we owe you a great deal. Do you have anything else to report?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-03.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-03.html new file mode 100644 index 0000000000..0ddb6a0c04 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-03.html @@ -0,0 +1,4 @@ +Grand Master Rivian:
+What? Sebion was hurt? How? I assume from your tone that he's not been badly hurt, but still... he is an asset we can ill afford to lose. I will send a replacement soon.
+Thank you for your report, friend. You have helped save our home, and for that we are all extremely grateful. I will pray that the blessings of Einhasad will be with you always. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-04.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-04.html new file mode 100644 index 0000000000..331101b928 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-04.html @@ -0,0 +1,3 @@ +Grand Master Rivian:
+I'm in charge of educating the Elf race. I believe you came to the wrong person! + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-05.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-05.html new file mode 100644 index 0000000000..92e44b9381 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32147-05.html @@ -0,0 +1,4 @@ +Grand Master Rivian:
+Thank you again, friend. You have guided us through a great storm.
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-01.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-01.html new file mode 100644 index 0000000000..aeb1fa6201 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-01.html @@ -0,0 +1,4 @@ +High Prefect Took:
+Welcome. How goes the task in Ye Sagira? What's the latest news?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-02.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-02.html new file mode 100644 index 0000000000..f15d315382 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-02.html @@ -0,0 +1,4 @@ +High Prefect Took:
+Wonderful, wonderful. The monster population is down, the situation is under control. Lovely. Good work! I was worried that I'd run out of scholars before we ran out of scholar eating monsters. Ha! Anything else to report?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-03.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-03.html new file mode 100644 index 0000000000..c0dd6aad30 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-03.html @@ -0,0 +1,4 @@ +High Prefect Took:
+Sebion is injured? That's surprising... he has such strong magic, I wouldn't have thought.... That's strange. I'll have to send in additional support workers.
+We need to hire a Bloodhound for his return. King? Is that his name? Yes, we'll need King to protect Sebion's return journey. Thanks for your detailed report. May blessing of darkness enhance your future. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-04.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-04.html new file mode 100644 index 0000000000..f1cc1b196d --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-04.html @@ -0,0 +1,3 @@ +High Prefect Took:
+I'm only in charge of Orcs. You don't look much like an Orc.... + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-05.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-05.html new file mode 100644 index 0000000000..86993eec58 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32150-05.html @@ -0,0 +1,4 @@ +High Prefect Took:
+They're making great strides with their research at Ruins of Ye Sagira, thanks to you.
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-01.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-01.html new file mode 100644 index 0000000000..747a3e6e55 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-01.html @@ -0,0 +1,4 @@ +High Priest Franco:
+You returned from the Ruins of Ye Sagira! Are you well? What was going on there?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-02.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-02.html similarity index 68% rename from trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-02.html rename to trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-02.html index bb356eb5ae..df2a1cb7a4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-02.html +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-02.html @@ -1,4 +1,4 @@ High Priest Franco:
You were a great help! With the monsters cut down, perhaps we will start to see peace flow through this region again. But tell me, friend -- what happened to the scholars there? I doubt they were able to fend the monsters off?
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-03.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-03.html similarity index 100% rename from trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-03.html rename to trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-03.html diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-04.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-04.html new file mode 100644 index 0000000000..2c40236eb1 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-04.html @@ -0,0 +1,3 @@ +High Priest Franco:
+Hmm. I train humans, not your kind. You should look elsewhere for your training. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-05.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-05.html new file mode 100644 index 0000000000..f23e02e860 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32153-05.html @@ -0,0 +1,4 @@ +High Priest Franco:
+Thank you again, friend. You have done so much for us!
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-01.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-01.html new file mode 100644 index 0000000000..76fd9d3ebf --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-01.html @@ -0,0 +1,4 @@ +Head Blacksmith Moka:
+Hmm? You're back from Ye Sagira already? I have a lot of questions for you! So, what's the situation in Ye Sagira? How are the seekers doing? Are they finding anything interesting?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-02.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-02.html new file mode 100644 index 0000000000..5eeea5228f --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-02.html @@ -0,0 +1,4 @@ +Head Blacksmith Moka:
+Marvelous! It's good to hear that the monster population is finally on the downturn. Such good news. I was worried, everyone over there has a great scholarly pedigree, but no one had any good fighting skills or common sense! You know that scientist type. Brainy, but not terribly practical. This is a great weight off of my shoulders. Do you have any other news?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-03.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-03.html new file mode 100644 index 0000000000..822b969195 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-03.html @@ -0,0 +1,4 @@ +Head Blacksmith Moka:
+Sebion is injured?! How? I know he was conducting research in the Labyrinth of Belis... which is not exactly a cake walk, but what happened? Hmm... He's going to need someone to help dig and carry. I'll send over some additional bodies to help out.
+And, we'll need a Bloodhound to protect him on his return. Bloodhounds are rather pricey right now, but we certainly can't afford any more severe injuries, or deaths! Thanks for your report. We be in touch, when we have need of your skills again. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-04.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-04.html new file mode 100644 index 0000000000..ddebeacda3 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-04.html @@ -0,0 +1,3 @@ +Head Blacksmith Moka:
+I'm in charge of Dwarf training and I'm pretty sure you're not a Dwarf. You need to locate your own race's master. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-05.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-05.html new file mode 100644 index 0000000000..271bd07062 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32157-05.html @@ -0,0 +1,4 @@ +Head Blacksmith Moka:
+The pace of research over at the Ruins of Ye Sagira has picked up greatly, thanks entirely to your good work. Nicely done!
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-01.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-01.html new file mode 100644 index 0000000000..b045431456 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-01.html @@ -0,0 +1,4 @@ +Grand Magister Devon:
+Welcome, and well done! I've heard much about you, but... I'd like to hear a report directly from the horse's mouth... so to speak. Did you finish the work in the Ruins of Ye Sagira? How are search members doing?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-02.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-02.html new file mode 100644 index 0000000000..57e68e4a9e --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-02.html @@ -0,0 +1,6 @@ +Grand Magister Devon:
+Then you are due our thanks, friend. Perhaps over time, the area will regain its natural beauty, eh? +I don't know how long this peace will hold, but I do know that you've given me one less thing to worry about. Thank you. +Now, is there anything else we need to discuss?
+ + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-03.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-03.html new file mode 100644 index 0000000000..3ffe0d7301 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-03.html @@ -0,0 +1,4 @@ +Grand Magister Devon:
+Badly? Sebion is an able mage, and should be able to tend to his own woumds, but... hmm... I will make sure he is replaced.
+When Sebion returns, we should bring and protect Bloodhound as well. Thank you for the detailed report - I will pray that the Blessing of Darkness be with you for years to come. + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-04.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-04.html new file mode 100644 index 0000000000..4f1a94196b --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-04.html @@ -0,0 +1,3 @@ +Grand Magister Devon:
+I'm in charge of educating the Dark Elf race. I think you came to the wrong teacher - please go to your race master! + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-05.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-05.html new file mode 100644 index 0000000000..1639e94529 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32160-05.html @@ -0,0 +1,4 @@ +Grand Magister Devon:
+The investigation on the Ruins of Ye Sagira is still ongoing, friend. We have you to thank for getting us this close though.
+(You have already completed this quest.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-01.htm b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-01.htm index 384aa7b84f..f742629560 100644 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-01.htm +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-01.htm @@ -1,5 +1,5 @@ Sebion:
You've really gotten the monsters in the Ruins under control. I mean, there are still some about, but it's not nearly so bad. I'm just waiting for my replacement to come, so I can head back to town and concentrate on recovering.
But before I go, I have one more favor to ask of you.
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-02.htm b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-02.htm index 3da87c8305..a6740bb172 100644 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-02.htm +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-02.htm @@ -1,4 +1,4 @@ Sebion:
Tell the master in the Talking Island Administration Office that things are getting better in the Ruins. And, while you're there... could you poke them to make sure they haven't forgotten about replacing me out here.
- + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-03.htm b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-03.html similarity index 62% rename from trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-03.htm rename to trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-03.html index aa0d65c2d1..daf836d777 100644 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-03.htm +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-03.html @@ -1,4 +1,4 @@ Sebion:
-Oh, that's a relief. Now I won't have to contact Lakcis and Dep. Use your Scroll of Escape to travel to the Administration Office and tell High Priest Franco about the situation here.
-Thank you for everything you've done. I'm in your debt. +Oh, that's a relief. Now I won't have to contact Lakcis and Dep. Use your Scroll of Escape to travel to the Administration Office and tell %MASTER% about the situation here.
+Thank you for everything you've done. I'm in your debt.
\ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-04.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-04.html index aa0d65c2d1..e3f1f4ca85 100644 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-04.html +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-04.html @@ -1,4 +1,4 @@ Sebion:
-Oh, that's a relief. Now I won't have to contact Lakcis and Dep. Use your Scroll of Escape to travel to the Administration Office and tell High Priest Franco about the situation here.
+Oh, that's a relief. Now I won't have to contact Lakcis and Dep. Use your Scroll of Escape to travel to the Administration Office and tell %MASTER% about the situation here. Thank you for everything you've done. I'm in your debt. \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-05.htm b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-05.htm new file mode 100644 index 0000000000..7797e2449e --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-05.htm @@ -0,0 +1,4 @@ +Sebion:
+Here is very dangerous, I think you better get back in the village.
+(The quest is avaiable after reaching level 16 and until level 25.) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-06.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-06.html new file mode 100644 index 0000000000..5bd7b31091 --- /dev/null +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/32978-06.html @@ -0,0 +1,4 @@ +Sebion:
+Being out here is really slowing my recovery. I hope they send my replacement soon...
+(This quest is already completed) + \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-01.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-01.html deleted file mode 100644 index f3d77f2efd..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/33750-01.html +++ /dev/null @@ -1,4 +0,0 @@ -High Priest Franco:
-You returned from the RUins of Ye Sagira! Are you well? What was going there?
- - \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java index 6159964b7f..4cfb11ed3f 100644 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java +++ b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java @@ -16,17 +16,20 @@ */ package quests.Q10366_RuinsStatusUpdate; +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.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; +import com.l2jmobius.gameserver.network.NpcStringId; +import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import quests.Q10365_SeekerEscort.Q10365_SeekerEscort; /** * Ruins status update (10366) - * @author spider + * @author spider, gyo */ public class Q10366_RuinsStatusUpdate extends Quest { @@ -45,14 +48,21 @@ public class Q10366_RuinsStatusUpdate extends Quest // Requirements private static final int MIN_LEVEL = 16; private static final int MAX_LEVEL = 25; + // NPCs Name + private static final String GRAND_MAGISTER_DEVON = "Grand Magister Devon"; + private static final String GRAND_MASTER_RIVIAN = "Grand Master Rivian"; + private static final String GRAND_MASTER_VALFAR = "Grand Master Valfar"; + private static final String HEAD_BLACKSMITH_MOKA = "Head Blacksmith Moka"; + private static final String HIGH_PREFECT_TOOK = "High Prefect Took"; + private static final String HIGH_PRIEST_FRANCO = "High Priest Franco"; public Q10366_RuinsStatusUpdate() { super(10366, Q10366_RuinsStatusUpdate.class.getSimpleName(), "Ruins status update"); addStartNpc(SEBION); addTalkId(FRANCO, VALFAR, RIVIAN, TOOK, MOKA, DEVON, SEBION); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.htm"); - addCondCompletedQuest(Q10365_SeekerEscort.class.getSimpleName(), "no_prequest.html"); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "32978-05.htm"); + addCondCompletedQuest(Q10365_SeekerEscort.class.getSimpleName(), "32978-05.htm"); } @Override @@ -72,19 +82,68 @@ public class Q10366_RuinsStatusUpdate extends Quest htmltext = event; break; } - case "32978-03.htm": // FIXME: add race-specified texts + case "32978-03.html": { qs.startQuest(); - qs.setCond(2); - htmltext = event; + showOnScreenMsg(qs.getPlayer(), NpcStringId.USE_THE_ESCAPE_SCROLL_IN_YOUR_INVENTORY_TO_GO_TO_THE_ADMINISTRATIVE_OFFICE_IN_TALKING_ISLAND, ExShowScreenMessage.TOP_CENTER, 10000); + htmltext = getHtm(player.getHtmlPrefix(), event); + switch (player.getRace()) + { + case HUMAN: + { + qs.setCond(2); + htmltext = htmltext.replace("%MASTER%", HIGH_PRIEST_FRANCO); + break; + } + case ELF: + { + qs.setCond(3); + htmltext = htmltext.replace("%MASTER%", GRAND_MASTER_RIVIAN); + break; + } + case DARK_ELF: + { + qs.setCond(4); + htmltext = htmltext.replace("%MASTER%", GRAND_MAGISTER_DEVON); + break; + } + case ORC: + { + qs.setCond(5); + htmltext = htmltext.replace("%MASTER%", HIGH_PREFECT_TOOK); + break; + } + case DWARF: + { + qs.setCond(6); + htmltext = htmltext.replace("%MASTER%", HEAD_BLACKSMITH_MOKA); + break; + } + case KAMAEL: + { + qs.setCond(7); + htmltext = htmltext.replace("%MASTER%", GRAND_MASTER_VALFAR); + break; + } + } break; } - case "33750-02.html": + case "32146-02.html": + case "32147-02.html": + case "32150-02.html": + case "32153-02.html": + case "32157-02.html": + case "32160-02.html": { htmltext = event; break; } - case "33750-03.html": + case "32146-03.html": + case "32147-03.html": + case "32150-03.html": + case "32153-03.html": + case "32157-03.html": + case "32160-03.html": { if (qs.getCond() > 1) { @@ -117,17 +176,112 @@ public class Q10366_RuinsStatusUpdate extends Quest { case SEBION: { - htmltext = "32978-04.html"; + htmltext = getHtm(player.getHtmlPrefix(), "32978-04.html"); + switch (player.getRace()) + { + case HUMAN: + { + htmltext = htmltext.replace("%MASTER%", HIGH_PRIEST_FRANCO); + break; + } + case ELF: + { + htmltext = htmltext.replace("%MASTER%", GRAND_MASTER_RIVIAN); + break; + } + case DARK_ELF: + { + htmltext = htmltext.replace("%MASTER%", GRAND_MAGISTER_DEVON); + break; + } + case ORC: + { + htmltext = htmltext.replace("%MASTER%", HIGH_PREFECT_TOOK); + break; + } + case DWARF: + { + htmltext = htmltext.replace("%MASTER%", HEAD_BLACKSMITH_MOKA); + break; + } + case KAMAEL: + { + htmltext = htmltext.replace("%MASTER%", GRAND_MASTER_VALFAR); + break; + } + } break; } - case VALFAR:// FIXME: add all races texts - case RIVIAN: - case TOOK: - case MOKA: - case DEVON: case FRANCO: { - htmltext = "33750-01.html"; + if (player.getRace() == Race.HUMAN) + { + htmltext = "32153-01.html"; + } + else + { + htmltext = "32153-04.html"; + } + break; + } + case RIVIAN: + { + if (player.getRace() == Race.ELF) + { + htmltext = "32147-01.html"; + } + else + { + htmltext = "32147-04.html"; + } + break; + } + case DEVON: + { + if (player.getRace() == Race.DARK_ELF) + { + htmltext = "32160-01.html"; + } + else + { + htmltext = "32160-04.html"; + } + break; + } + case TOOK: + { + if (player.getRace() == Race.ORC) + { + htmltext = "32150-01.html"; + } + else + { + htmltext = "32150-04.html"; + } + break; + } + case MOKA: + { + if (player.getRace() == Race.DWARF) + { + htmltext = "32157-01.html"; + } + else + { + htmltext = "32157-04.html"; + } + break; + } + case VALFAR: + { + if (player.getRace() == Race.KAMAEL) + { + htmltext = "32146-01.html"; + } + else + { + htmltext = "32146-04.html"; + } break; } } @@ -135,7 +289,44 @@ public class Q10366_RuinsStatusUpdate extends Quest } case State.COMPLETED: { - htmltext = getAlreadyCompletedMsg(player); + switch (npc.getId()) + { + case SEBION: + { + htmltext = "32978-06.html"; + break; + } + case FRANCO: + { + htmltext = "32153-05.html"; + break; + } + case RIVIAN: + { + htmltext = "32147-05.html"; + break; + } + case DEVON: + { + htmltext = "32160-05.html"; + break; + } + case TOOK: + { + htmltext = "32150-05.html"; + break; + } + case MOKA: + { + htmltext = "32157-05.html"; + break; + } + case VALFAR: + { + htmltext = "32146-05.html"; + break; + } + } break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/no_prequest.html b/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/no_prequest.html deleted file mode 100644 index a4bc8e8a8d..0000000000 --- a/trunk/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/no_prequest.html +++ /dev/null @@ -1,2 +0,0 @@ -To begin this quest, you need to complete Seeker Escort quest first. - \ No newline at end of file