summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt1
-rw-r--r--npc/quests/The_Sign_Quest.txt14
-rw-r--r--npc/quests/gunslinger_quests.txt4
-rw-r--r--npc/quests/quests_13_1.txt2
-rw-r--r--npc/quests/quests_amatsu.txt2
-rw-r--r--npc/quests/quests_moscovia.txt2
6 files changed, 15 insertions, 10 deletions
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index ff4d29000..5f577af9d 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -1191,6 +1191,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
set KielHyreQuest,8;
//KHPubMasterEnd no longer needed-- deleting.
set KHPubMasterEnd,0;
+ set KHToastGirlEnd,0;
emotion e_ho;
}
}
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 6970a4a58..9a45914f4 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -2679,7 +2679,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "......";
mes "...No!";
mes "Look what";
- mes "made me do!";
+ mes "you made me do!";
next;
emotion e_sob;
mes "[Sir Jore]";
@@ -2754,10 +2754,10 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
next;
set sign_q,16;
mes "[Sir Jore]";
- mes "Just bring";
- mes "10 Empty Test Tube,";
- mes "10 Green Herb and";
- mes "2 Yggdrasil Leaf.";
+ mes "Just bring me";
+ mes "10 Empty Test Tubes,";
+ mes "10 Green Herbs and";
+ mes "2 Yggdrasil Leafs.";
next;
mes "[Sir Jore]";
mes "You see, l-lately I've";
@@ -8486,7 +8486,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "to find some ancient";
mes "or really aged paper...";
next;
- if (countitem(1097) > 6) {
+ if (countitem(1097) > 9) {
mes "[Cyon]";
mes "How did you find these";
mes "Worn Out Pages? This is great,";
@@ -8506,7 +8506,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "Just as I thought!";
mes "The Sobbing Starlight is responding to these Worn Out Pages! Excellent! I've finally fulfilled my promise to Metz! Now he can leave";
mes "me alone!";
- delitem 1097,7; //Worn_Out_Page
+ delitem 1097,10; //Worn_Out_Page
set sign_q,76;
getitem 7275,1; //Ancient_Document
close;
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index 503a8923a..5c59020a1 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -252,6 +252,10 @@ que_ng,182,85,3 script Garrison 109,{
callsub SubGarrison;
case 2:
callsub SubGarrison_;
+ case 3:
+ mes "[Garrison]";
+ mes "I'll see you when I see you~";
+ close;
}
}
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 23a1add3a..6d551141f 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -10003,7 +10003,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 421,{
close;
}
else {
- // custom translation
+ // custom translation
mes "Ferocious Gorurug welcomes you gracefully.";
next;
mes "[Ferocious Gorurug]";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 840947699..231cee0af 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -722,8 +722,8 @@ OnTouch:
set event_momo,3;
warp "amatsu",223,230;
disablenpc "Coach#after";
- donpcevent "Assistant#ama::Onreset";
donpcevent "Timer#ama::OnDisable";
+ donpcevent "Assistant#ama::Onreset";
end;
}
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index c12e0a7b3..d19f10405 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -11346,7 +11346,7 @@ moscovia,178,127,0 script The Blacksmith#rus06 63,{
mes "And don't forget to wear these!";
delitem 999,25;
set rhea_rus_main,8;
- if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer) {
+ if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer || BaseClass == Job_Ninja || BaseClass == Job_Gunslinger) {
getitem 2429,1;
close;
}else {