summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNetSysFire <16-NetSysFire@users.noreply.git.themanaworld.org>2023-02-01 16:31:27 +0000
committerNetSysFire <16-NetSysFire@users.noreply.git.themanaworld.org>2023-02-01 16:31:27 +0000
commit89cef3d0841af5b77886be32344549d7e0a1ffe7 (patch)
treefe665b316baeb59869c978e7bf1d59db158bd599
parentd967aa14f8f5f680e1560be74b2d9375c3530a21 (diff)
parent78be42cbfa5c4c2c5571d73dd5c3028d44c39ab0 (diff)
downloadserverdata-89cef3d0841af5b77886be32344549d7e0a1ffe7.tar.gz
serverdata-89cef3d0841af5b77886be32344549d7e0a1ffe7.tar.bz2
serverdata-89cef3d0841af5b77886be32344549d7e0a1ffe7.tar.xz
serverdata-89cef3d0841af5b77886be32344549d7e0a1ffe7.zip
Merge branch 'patch-1' into 'master'
bring zegas patch up to date See merge request ml/serverdata!83
-rw-r--r--npc/005-1/zegas.txt34
1 files changed, 20 insertions, 14 deletions
diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt
index d41eaadf5..a7cbdb3bd 100644
--- a/npc/005-1/zegas.txt
+++ b/npc/005-1/zegas.txt
@@ -21,16 +21,16 @@
L_Weak:
mesn;
- mesq l("Do not enter in this storehouse, the maggots there will kill you.");
+ mesq l("Please don't go inside this storehouse, it is infested with aggressive maggots.");
close;
L_Meet:
mesn;
- mesq l("Hey do you have a second?");
+ mesq l("Excuse me! Do you have a second?");
next;
- mesq l("The storehouse here is overrun with house maggots.");
+ mesq l("The storehouse here is overrun with house maggots. Those little wretches are eating and destroying everything inside.");
next;
- mesq l("Wouldn't you know it, the bug bomb Eomie gave us is in one of the store room barrels.");
+ mesq l("Luckily, professor Eomie of the Tulimshar Magic Academy gave us a bug bomb to deal with them. Its inside one of the store room barrels but i don't remember which is.");
next;
mesq l("Can you search ##Bthe barrels##b for the bug bomb and set it off when you find it?");
setq CandorQuest_Barrel, 1;
@@ -40,12 +40,12 @@ L_Meet:
L_Find:
mesn;
- mesq l("The storehouse is still over run with house maggots.");
+ mesq l("Excuse me! The storehouse is still overrun with house maggots.");
next;
- mesq l("Please help me find the bug bomb Eomie gave us is in one of the store room barrels?");
+ mesq l("Please get it done quickly. The villagers' livelihood is depending on this storehouse!");
menu
- l("Sure."),L_Start,
- l("Maybe some other time."),L_Close;
+ l("I'll finish it in no time. Don't worry."),L_Start,
+ l("I need more time to prepare."),L_Close;
L_Start:
mesn;
@@ -66,8 +66,8 @@ L_Looking:
L_QuestEnd:
mesn;
- mesq l("From the smell I can see you found the bug bomb!");
- mesq l("Thanks once again, I know it's not much but here is @@ GP for your troubles.", 350);
+ mesq l("From the smell I know you found the bug bomb!");
+ mesq l("Thanks once again, I know it's not much but here are %d GP and a pair of self-sewn shorts for your troubles.", 350);
getexp 63, 0;
getitem CandorShorts, 1;
Zeny = (Zeny + 350);
@@ -76,17 +76,23 @@ L_QuestEnd:
L_Thanks:
mesn;
- mesq l("Thanks for Helping with clear out the store room!");
+ mesq l("Thank you very much! You are a great help.");
if (!getq(CandorQuest_Chest)) {
next;
mesn;
- mesq l("Do you see that fancy house over there? My husband, @@, used to live there.", b(l("Saxso")));
+ mesq l("Do you see that fancy house over there? My husband, %%s, used to live there.", b(l("Saxso")));
next;
mesn;
mesq l("Strangely enough, when he died, he became a ghost. This shouldn't happen, but yet...");
next;
mesn;
- mesq l("Anyway, conspiratory theories aside, his ghost is a powerful boss. I would not attack him if I were you!");
+ if ( BaseLevel < 25) {
+ mesq l("Anyway, conspiratory theories aside, his ghost is a powerful boss. I would not attack him yet if I were you!");
+ mesc l("You should come back when you are stronger, ideally at ") + b(l("level 25 or above") + ".");
+ } else {
+ mesq l("Anyway, conspiratory theories aside, his ghost is a powerful boss.");
+ mesq l("You look ready to take him on.");
+ }
}
close;
@@ -98,7 +104,7 @@ L_Close:
function lagTutorial {
// TUTORIAL block
tutmes l("The bugs there can be pretty vicious. Do you know what's worse though? Lag.");
- tutmes l("By pressing @@, you can open the Shortcut menu. And by pressing @@, you open the skill menu!", b("F8"), b("F5"));
+ tutmes l("By pressing %s, you can open the Shortcut menu. And by pressing %s, you open the skill menu!", b("F8"), b("F5"));
tutmes l("If you drag the \"Resync\" skill from the skill list to the shortcut list, you'll be able to rapidly solve some lag issues!");
tutmes l("Of course, lag might always be a problem. Remember to drag healing items to the shortcut list too. %%2");
return;