Comment Debug NPC, Changes some dialogues and adds some small fixes.

5 files changed, 47 insertions, 47 deletions

diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt
index bc402847..e2f868d1 100644
--- a/world/map/npc/009-2/olana.txt
+++ b/world/map/npc/009-2/olana.txt
@@ -40,7 +40,7 @@ L_Daughter:
   mes "Olana looks really worried - she seems about to burst into tears.";
   mes "[Olana]";
   mes "\"I would be relieved if you could look for my daughters.";
-  mes "The went to forest near the swamps to play there.\"";
+  mes "They must be playing in the forest near the swamps.\"";
   if (Rossy_Quest == 1) close;
   next;
   menu
diff --git a/world/map/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt
index 26feec12..627724db 100644
--- a/world/map/npc/025-1/reset.txt
+++ b/world/map/npc/025-1/reset.txt
@@ -1,5 +1,5 @@
-//
-025-1.gat,47,84,0	script	reset	145,{ 
+// Uncomment this line if you want to test the script in your local server
+//025-1.gat,47,84,0	script	reset	145,{ 
 
   mes "Do you want to reset Rossy Quest?";
   menu
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index b9496208..7dd36477 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -60,7 +60,7 @@ L_Get_Cherry:
 
 L_Check:
   mes "[Rossy]";
-  mes "\"Hey, that is nice of you to come back. I was thinking about giving a basket full of cherries to my mother, to make her happy, you know... But I can't get very many cherries alone. I would need at least 10 cherries, and it would take too much time!\"";
+  mes "\"Hey, that is nice of you to come back. I was thinking about giving a basket full of cherries to my mother, to make her happy, you know... But we'd need at least ten cherries, and it would take ages for me to get so many by myself!\"";
   next;
   menu
     "That is no problem for me. Just wait and I will come back with the cherries", L_No,
diff --git a/world/map/npc/025-3/barriers.txt b/world/map/npc/025-3/barriers.txt
index 8b57bee1..f1784ac0 100644
--- a/world/map/npc/025-3/barriers.txt
+++ b/world/map/npc/025-3/barriers.txt
@@ -32,7 +32,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -48,7 +48,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave1fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave1start) < 60) set $@cave1start, $@cave1start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -85,7 +85,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave1, 0;
     set $@cave1_kills, 0;
     set $@cave1start, 0;
@@ -100,7 +100,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave1fighter$));
     warp "025-3.gat", 78, 129;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave1, 0;
     set $@cave1_kills, 0;
     set $@cave1start, 0;
@@ -176,7 +176,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -192,7 +192,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave2fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave2start) < 60) set $@cave2start, $@cave2start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -229,7 +229,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave2, 0;
     set $@cave2_kills, 0;
     set $@cave2start, 0;
@@ -244,7 +244,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave2fighter$));
     warp "025-3.gat", 53, 109;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave2, 0;
     set $@cave2_kills, 0;
     set $@cave2start, 0;
@@ -319,7 +319,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -335,7 +335,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave3fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave3start) < 60) set $@cave3start, $@cave3start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -372,7 +372,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave3, 0;
     set $@cave3_kills, 0;
     set $@cave3start, 0;
@@ -387,7 +387,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave3fighter$));
     warp "025-3.gat", 71, 85;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave3, 0;
     set $@cave3_kills, 0;
     set $@cave3start, 0;
@@ -462,7 +462,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -478,7 +478,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave4fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave4start) < 60) set $@cave4start, $@cave4start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -515,7 +515,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave4, 0;
     set $@cave4_kills, 0;
     set $@cave4start, 0;
@@ -530,7 +530,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave4fighter$));
     warp "025-3.gat", 80, 85;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave4, 0;
     set $@cave4_kills, 0;
     set $@cave4start, 0;
@@ -605,7 +605,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -621,7 +621,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave5fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave5start) < 60) set $@cave5start, $@cave5start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -658,7 +658,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave5, 0;
     set $@cave5_kills, 0;
     set $@cave5start, 0;
@@ -673,7 +673,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave5fighter$));
     warp "025-3.gat", 71, 32;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave5, 0;
     set $@cave5_kills, 0;
     set $@cave5start, 0;
@@ -748,7 +748,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -764,7 +764,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave6fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave6start) < 60) set $@cave6start, $@cave6start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -801,7 +801,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave6, 0;
     set $@cave6_kills, 0;
     set $@cave6start, 0;
@@ -816,7 +816,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave6fighter$));
     warp "025-3.gat", 128, 37;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave6, 0;
     set $@cave6_kills, 0;
     set $@cave6start, 0;
@@ -891,7 +891,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -907,7 +907,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave7fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave7start) < 60) set $@cave7start, $@cave7start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -944,7 +944,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave7, 0;
     set $@cave7_kills, 0;
     set $@cave7start, 0;
@@ -959,7 +959,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave7fighter$));
     warp "025-3.gat", 70, 59;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave7, 0;
     set $@cave7_kills, 0;
     set $@cave7start, 0;
@@ -1034,7 +1034,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -1050,7 +1050,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave8fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave8start) < 60) set $@cave8start, $@cave8start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -1087,7 +1087,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave8, 0;
     set $@cave8_kills, 0;
     set $@cave8start, 0;
@@ -1102,7 +1102,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave8fighter$));
     warp "025-3.gat", 138, 94;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave8, 0;
     set $@cave8_kills, 0;
     set $@cave8start, 0;
@@ -1177,7 +1177,7 @@ L_AlreadyHelped:
     end;
 
 L_Block:
-    message strcharinfo(0), "I should maybe learn a bit more about this place before I go inside.";
+    message strcharinfo(0), "Maybe I should learn a bit more about this place before I go inside.";
     end;
 
 OnTimer5000:
@@ -1193,7 +1193,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave9fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave9start) < 60) set $@cave9start, $@cave9start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -1230,7 +1230,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave9, 0;
     set $@cave9_kills, 0;
     set $@cave9start, 0;
@@ -1245,7 +1245,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave9fighter$));
     warp "025-3.gat", 138, 158;
-    message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     set $@wave_cave9, 0;
     set $@cave9_kills, 0;
     set $@cave9start, 0;
@@ -1346,7 +1346,7 @@ OnTimer5000:
 
 L_Win:
     attachrid(getcharid(3,$@cave10fighter$));
-    message strcharinfo(0), "It is getting more and more difficult to breathe inside this cave... You feel like you are almost passing out.";
+    message strcharinfo(0), "It is getting harder to breathe inside this cave... You feel like you are almost passing out.";
     if ((gettimetick(2) - $@cave10start) < 60) set $@cave10start, $@cave10start + 60;
     if (Hp - (MaxHp*5)/100 <= 0) goto L_BadAir;
     percentheal -5, 0;
@@ -1384,7 +1384,7 @@ L_BadAir:
 L_Cleaning:
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
-    message strcharinfo(0), "You took too much time to free this cave from evil forces.";
+    message strcharinfo(0), "You took too much time to eliminate this source of energy... If you stay one more second in this cave you won't be able to breathe....";
     set $@wave_cave10, 0;
     set $@cave10_kills, 0;
     set $@cave10start, 0;
@@ -1400,7 +1400,7 @@ L_Cleaning:
 L_CleaningDead:
     attachrid(getcharid(3,$@cave10fighter$));
     warp "025-3.gat", 77, 168;
-    if ($@wave_cave10 < 5) message strcharinfo(0), "You were surrounded by monsters and got eaten alive.";
+    if ($@wave_cave10 < 5) message strcharinfo(0), "You were not strong enough to eliminate this power source.";
     if ($@wave_cave10 == 5) message strcharinfo(0), "This horrible monster is probably too powerful for you right now.";
     set $@wave_cave10, 0;
     set $@cave10_kills, 0;
diff --git a/world/map/npc/025-4/clauquer.txt b/world/map/npc/025-4/clauquer.txt
index c514bf48..51f4b4b2 100644
--- a/world/map/npc/025-4/clauquer.txt
+++ b/world/map/npc/025-4/clauquer.txt
@@ -12,15 +12,15 @@ L_Help:
   mes "\"Hello stranger, are you lost?\"";
   next;
   mes "\"Don't answer, I know you are looking for someone... A little girl, is that right?\"";
+  next;
   menu
     "I must admit you're right, but how come you...", -,
     "I'm not lost and I don't need help, bye.", L_No;
-  next;
   mes "[Clauquer]";
-  mes "\"How do I know you're looking for her? Well, because I saw her. I also heard her. She screamed, and still screams like hell. Moreover, I don't think you would enter these caves just for fun!\"";
+  mes "\"How do I know you're looking for her? Well, because I am a very good observer. I know you were helping her family. Besides, I saw the little girl. I also heard her. She screamed, and probably still screams like hell. Moreover, I don't think you would enter these caves just for fun!\"";
+  next;
   menu
     "Of course not.", -;
-  next;
   mes "[Clauquer]";
   mes "\"I can see that you really want to save the little girl. She is trapped in a place inside one of these caves, protected by a magic barrier created by a fey spirit. To save her, you have to annulate the energy sources of this barrier. They are located in 10 different spots, each one in a different cave.\"";
   next;
@@ -44,7 +44,7 @@ L_Advice:
   next;
   mes "However, the girl you are looking for is mentally too strong, and the spirit is having problems creating a changeling identical to her. So it locked her in one of those terrible caves, trying to scare the poor girl and make his task easier.\"";
   next;
-  mes "\"Oh, and if you really plan to rescue the girl in the cave, I advise you to use potions for every single battle. I'm thinking of Concentration and Iron Potions. You might want to take some food with you too, you might be hungry in battle. I would personally take some water, I'm always thirsty. Don't be afraid to take too much of each, the battles take time to end.\"";
+  mes "\"Oh, and if you really plan to rescue the girl, I advise you to use potions for every single battle. I'm thinking of Concentration and Iron Potions. You might want to take some food with you too. I would personally take some water, I'm always thirsty. Don't be afraid to bring too much with you, these battles take time to end.\"";
   next;
   mes "\"I think you're now ready to explore these caves and fight.\"";
   if (Rossy_Quest == 14) set Rossy_Quest, 15;