Eliminates the use of some permanent variables, adjust reset npc and review the whole quest.

7 files changed, 165 insertions, 194 deletions

diff --git a/npc/009-2/olana.txt b/npc/009-2/olana.txt
index b0471a3f..a27fc519 100644
--- a/npc/009-2/olana.txt
+++ b/npc/009-2/olana.txt
@@ -2,81 +2,84 @@
 
   if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
   if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
+
+
   if (Rossy_Quest >= 14 && Rossy_Quest <= 16) goto L_Julia;
   if (Rossy_Quest == 13) goto L_Best;
   if (Rossy_Quest == 12) goto L_Give;
   if (Rossy_Quest == 11) goto L_Allergic;
   if (Rossy_Quest == 10) goto L_BringRose;
   if (Rossy_Quest == 9) goto L_RC;
-  if (Rossy_Quest == 8) goto L_RL;
+  if (Rossy_Quest == 8) goto L_Rose;
   if (Rossy_Quest >= 6 && Rossy_Quest < 8) goto L_BL;
   if (Rossy_Quest == 5) goto L_Bring;
-  if (Rossy_Quest == 4) goto L_Cont;
-  if (Rossy_Quest == 3) goto L_See;
-  if (Rossy_Quest == 2) goto L_Daughter;
+  if (Rossy_Quest == 4) goto L_See;
+  if (Rossy_Quest == 3) goto L_Worried;
+  if (Rossy_Quest == 1 || Rossy_Quest == 2) goto L_Daughter;
 
   mes "[Olana]";
-  mes "\"I come from Tulimshar to Hurnscald for vacation with my two young daughters, Rossy and Julia. I already have been to Hurnscald once and felt quite safe in ths area.\"";
+  mes "\"I came from Tulimshar to Hurnscald on vacation with my two young daughters, Rossy and Julia. I have already been to Hurnscald once and felt quite safe in this area.\"";
+  if (baselevel < 50) close;
   next;
-  mes "\"I let my two lovely girls play in the woods near by but they still didn't came back!\"";
+  mes "\"I let my two lovely girls play in the woods nearby but they didn't come back yet!\"";
   next;
-  mes "\"Please go and have a look in the forest near the swamps and come back to see me when you'll find them.\"";
+  mes "Olana suddenly looks very pale and starts to shiver.";
+  next;
+  mes "\"Oh, I have a bad feeling about this whole situation... If you go to the forest near the swamps, can you see if you find my daughters? I need to know if they are safe.\"";
+  menu
+    "Sure, I can do that.", -,
+    "I am sorry, I don't usually go to this area", L_No;
+  set Rossy_Quest, 1;
   close;
 
 L_Daughter:
-  mes "[Olana]";
-  mes "\"I come from Tulimshar to Hurnscald for vacation with my two young daughters, Rossy and Julia. I already have been to Hurnscald once and felt quite safe in ths area.\"";
-  mes "\"I let my two lovely girls play in the woods near by but they still didn't came back!\"";
-  next;
-  mes "*Olana begins to sobb...*";
+  mes "*Olana looks really worried... she seems about to burst into tears...*";
+  if (Rossy_Quest == 1) close;
   next;
   menu
     "Wait, I saw Rossy, she is fine.", L_Help,
-    "Wait a bit, I'm sure they'll both get back soon.", L_No;
+    "Hey, don't worry, I'm sure they'll be back soon.", L_No;
 
 L_No:
   close;
 
 L_Help:
   mes "[Olana]";
-  mes "\"Oh yes? Is Rossy alright? That's good. I'm relieved. I hope she'll find Julia soon.\"";
+  mes "\"Oh yes? Is Rossy alright? That's good. I'm relieved. But what about Julia?\"";
   next;
-  mes "\"Oh by the way, I would need your help myself too. I think Rossy colected some cherries while she was in the woods, could you bring me them please?.\"";
   menu
-    "Sure, I'll be back with cherries.", L_Set,
-    "Sorry, I'm too busy.", L_No;
-
-L_Set:
-  mes "[Olana]";
+    "I didn't find Julia yet, sorry", -;
+  mes "\"Ok. They must be playing hide and seek. Thanks again... I can't express how grateful I am.\"";
   set Rossy_Quest, 3;
-  mes "\"I'd like 10 Cherries.\"";
   close;
 
-L_Get:
-  mes "[Olana]";
-  mes "\"Please, get 10 cherries for me.\"";
+L_Worried:
+  mes "*Olana smiles at you, trying to show some happiness, but her facial expression only conveys tension and preoccupation*";
   close;
 
 L_See:
-  if(countitem("cherry") < 10) goto L_Get;
+  if (gotcherry == 1) goto L_Task;
+  if (countitem("cherry") < 10) goto L_Worried;
+  menu
+    "Hi, Rossy asked me to give you this. She says it is a gift from her and from Julia", -;
   mes "[Olana]";
-  set Rossy_Quest, 4;
-  mes "\"You got them for me! Thank you! Here you are... a small reward from me for your precious help!\"";
+  mes "\"Ohhh... How sweet... Sometimes Rossy impress me with her kindness. Here. You are spending so much time helping us, and we give nothing back. Take this as a small reward. \"";
   delitem "cherry", 10;
   getexp 1000, 0;
   set zeny, zeny + 1000;
+  set gotcherry, 1;
   goto L_Task;
 
 L_Task:
   mes "[Olana]";
-  mes "\"It seems I have another task for you, would you like to help me again?\"";
+  mes "\"I know I barely know you, but can I ask you for a small favor?\"";
   menu
     "Sure, tell me about it.", L_Cont,
     "No, sorry, I'm busy.", L_No;
 
 L_Cont:
   mes "[Olana]";
-  mes "\"Can you give this letter to my little daughter please? Her teacher asked me to do it, but I can't walk, my knees...\"";
+  mes "\"Would you mind giving this letter to my little Rossy? Today is the last day for her final exam, and I know my daughter. If I don't remind her, she will surely forget about it and flunk the exam. I would deliver it myself, but I can't walk, my knees...\"";
   menu
     "Of course I can. Hand me the letter, I'll give it to Rossy as soon as I see her.", L_Let,
     "No, sorry, I'm not interested in that sort of task. Hand it to her yourself.", L_No;
@@ -84,40 +87,36 @@ L_Cont:
 L_Let:
   mes "[Olana]";
   set Rossy_Quest, 5;
-  mes "\"Please bring it to her as fast as you can, she really needs to know this news!\"";
+  set gotcherry, 0;
+  mes "\"Thank you again. Please, bring it to her as fast as you can.\"";
   close;
   
 L_Bring:
   mes "[Olana]";
-  mes "\"Bring this letter to my daughter as fast as you can, please!\"";
+  mes "\"Please, bring this letter to my daughter as fast as you can.\"";
   close;
   
 L_BL:
   mes "[Olana]";
-  mes "\"Good, now she remembers that she needs to craft a potion! Please, "+ strcharinfo(0) +", help Rossy, she will tell you what to do.\"";
+  mes "\"Good, now she won't forget her final exam.\"";
   close;
   
-L_Done:
-  mes "[Olana]";
-  mes "\"Thanks you "+ strcharinfo(0) +", I and Rossy will never forget what you did for us!\"";
-  goto L_Rose;
-  
 L_Rose:
+  menu
+    "Hi, Rossy did great in the exam. David told me her potion was flawless.", -;
   mes "[Olana]";
-  mes "\"I would like congratulate my daughter, Rossy, would you help me?\"";
+  mes "\"Wow! Really? That is great! I would like to congratulate my little Rossy, would you help me?\"";
   menu
-    "Just tell me what to do.", L_RL,
+    "Just tell me what to do.", -,
     "No, I'm busy, maybe later.", L_No;
-    
-L_RL:
   mes "[Olana]";
-  set Rossy_Quest, 9;
-  mes "\"Can you bring me 15 [Red Rose]s? I would like to give them to my daughter because she succesfully made her potion!\"";
+  mes "\"Can you bring me 15 [Red Rose]s? I would like to give them to Rossy. I am sure she will love it!\"";
   menu
-    "Ok, I will be back with these.", L_RG,
+    "Ok, I will be back with the roses.", L_RG,
     "I'm allergic to roses, can't even touch them. Sorry.", L_No;
     
 L_RG:
+  if (Rossy_Quest == 8) set Rossy_Quest, 9;
   mes "[Olana]";
   mes "\"Please, bring me 15 [Red Rose]s as soon as you can.\"";
   close;
@@ -136,25 +135,25 @@ L_BringRose:
   
 L_Allergic:
   mes "[Olana]";
-  set Rossy_Quest, 12;
   mes "\"Did she like my present?\"";
   menu
     "Sure she did...", L_No,
-    "Well, you should of known that your daughter is allergic to roses.", -;
+    "Well, you should known that your daughter is allergic to roses.", -;
+  set Rossy_Quest, 12;
   mes "[Olana]";
-  mes "\"How stupid I am! Here, take some of my money and buy [Red Tulip]s instead, about the same amount. Keep the flowers.\"";
+  mes "\"How stupid I am! Here, take some of my money and buy [Red Tulip]s instead, the same amount. Keep the flowers.\"";
   set zeny, zeny + 1500;
   next;
-  mes "\"I want Rossy to be happy and to forgive me for my stupidity.\"";
+  mes "\"Please, tell Rossy I am really sorry. My mind was in Julia when I asked you to bring the red roses, they are her favorite.\"";
   menu
-    "I will give her the tulips when I'll see her.", -;
+    "I will give her the tulips when I see her.", -;
   mes "[Olana]";
   mes "\"And don't forget to tell her that I'm really sorry.\"";
   close;
   
 L_Give:
   mes "[Olana]";
-  mes "\""+ strcharinfo(0) +", please, get 15 [Red Tulip]s and hand them to Rossy. Don't forget to tell her that I'm really sorry for the mistake I did.\"";
+  mes "\""+ strcharinfo(0) +", please, get 15 [Red Tulip]s and hand them to Rossy. Don't forget to tell her that I'm really sorry.\"";
   close;
   
 L_Best:
@@ -164,15 +163,15 @@ L_Best:
 
 L_Julia:
   mes "[Olana]";
-  mes "\"Where is Julia? I want to know where she is! Go and find her please "+ strcharinfo(0) +"!\"";
+  mes "\"Oh no, I can't take this anymore. Something must have happened... Where is Julia? I want to know where she is! Please, find her "+ strcharinfo(0) +"!\"";
   close;
 
 L_End:
   mes "[Olana]";
-  mes "\"Where is Julia? I want to know where she is! Go and find her please "+ strcharinfo(0) +"!\"";
+  mes "\"Where is Julia? I want to know where she is! Please, find her "+ strcharinfo(0) +"!\"";
   menu
     "She'll be back soon, trust me, I saved her from an evil spirit.", L_Found,
-    "I didn't saw her yet, sorry.", L_No;
+    "I didn't see her yet, sorry.", L_No;
 
 L_Found:
   mes "[Olana]";
@@ -192,7 +191,7 @@ L_Clear:
 
 L_FinalEnd:
   mes "[Olana]";
-  mes "*The mother is calmly waiting her daughters to come back for diner.*";
+  mes "*The mother is calmly waiting her daughters to come back for dinner.*";
   close;
   
 }
diff --git a/npc/024-1/david.txt b/npc/024-1/david.txt
index 7174ee7c..6c30afc9 100644
--- a/npc/024-1/david.txt
+++ b/npc/024-1/david.txt
@@ -16,21 +16,20 @@ L_Help:
     
 L_Set:
   mes "[David]";
-  mes "\"Yes, I do. I am her new teacher. That makes me remember she didn't hand me her potion yet. Time is running out.\"";
+  mes "\"Yes, I do. I am her teacher. That makes me remember about her final exam, she didn't hand me her potion yet. Time is running out.\"";
   menu
-    "A potion? Oh, uhm... never heard about it.", L_No,
-    "Right, I have her potion in my pocket. She asked me to bring it to you for her. Here it is.", -;
+    "A potion? Oh, uhm... Strange kind of exam. Bye.", L_No,
+    "Right, I have her potion in my pocket. She asked me to bring it to you. Here it is.", -;
   mes "[David]";
   mes "\"Let me see...\"";
   set Rossy_Quest, 8;
-  mes "\"This potion is... perfect! Tell Rossy that she succesfully made her potion! And here is a small reward for your help.\"";
+  mes "\"This potion is... perfect! Tell Rossy that she succesfully made her potion, it is flawless!\"";
   getexp 2000, 0;
-  set zeny, zeny + 500;
   close;
   
 L_Done:
   mes "[David]";
-  mes "\"I am really happy that my best student succesfully passed her exam! Thank you "+ strcharinfo(0) +"!\"";
+  mes "\"I am really happy that my best student succesfully passed her exam!\"";
   close;
 
 L_No:
@@ -40,12 +39,12 @@ L_Julia:
   mes "[David]";
   mes "\"I heard Rossy's sister got kidnapped. We count on you to find her!\"";
   next;
-  mes "\"When you'll find her, talk to her sister and her mother.\"";
+  mes "\"If you find her, talk to her sister and her mother.\"";
   close;
 
 L_FinalEnd:
   mes "[David]";
-  mes "Well done for finding Julia!";
+  mes "Well done! Thanks for finding Julia!";
   close;
 
 }
diff --git a/npc/025-1/reset.txt b/npc/025-1/reset.txt
index 634b2c29..26feec12 100644
--- a/npc/025-1/reset.txt
+++ b/npc/025-1/reset.txt
@@ -7,33 +7,13 @@
     "Set Rossy_Quest.", L_Set,
     "Pass cave quest.", L_Pass2,
     "Pass all caves except boss cave.", L_Pass,
-    "Reset Alrd_Been only.", L_reSet,
     "Do not reset.", L_No;
   set Rossy_Quest, 0;
   set cavefights, 0;
-  set Alrd_Been, 0;
-  set Boss_10, 0;
-  set Clauquer_Talk, 0;
-  set Clauquer_Enough, 0;
-  set Killed_Boss, 0;
-  set @juliadone1, 0;
-  set @juliadone2, 0;
-  set @juliadone3, 0;
-  set @juliadone4, 0;
-  set @juliadone5, 0;
-  set @juliadone6, 0;
-  set @juliadone7, 0;
-  set @juliadone8, 0;
-  set @juliadone9, 0;
-  set @juliadone10, 0;
   set FLAGS, FLAGS & ~FLAG_ROSSI_COMPLETED;
 
 L_No:
   close;
-
-L_reSet:
-  set Alrd_Been, 0;
-  close;
   
 L_Set:
   mes "value";
@@ -43,8 +23,6 @@ L_Set:
   
 L_Pass:
   set Rossy_Quest, 15;
-  set Clauquer_Talk, 1;
-  set Clauquer_Enough, 1;
   set cavefights, (cavefights ^ BATTLE_CAVE1);
   set cavefights, (cavefights ^ BATTLE_CAVE2);
   set cavefights, (cavefights ^ BATTLE_CAVE3);
@@ -58,8 +36,6 @@ L_Pass:
   
 L_Pass2:
   set Rossy_Quest, 16;
-  set Killed_Boss, 1;
-  set Clauquer_Talk, 1;
   set cavefights, (cavefights ^ BATTLE_CAVE1);
   set cavefights, (cavefights ^ BATTLE_CAVE2);
   set cavefights, (cavefights ^ BATTLE_CAVE3);
diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index 7d6d2d3b..1392392f 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -2,6 +2,7 @@
 
   if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
   if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
+
   if (Rossy_Quest >= 14 && Rossy_Quest <= 16) goto L_Julia;
   if (Rossy_Quest >= 13) goto L_Best;
   if (Rossy_Quest >= 11) goto L_Allergic;
@@ -9,59 +10,76 @@
   if (Rossy_Quest == 7) goto L_BT;
   if (Rossy_Quest == 6) goto L_Check2;
   if (Rossy_Quest == 5) goto L_Let;
-  if (Rossy_Quest >= 2 && Rossy_Quest < 5) goto L_Done;
-  if (Rossy_Quest == 1) goto L_Check;
+  if (Rossy_Quest == 4 || Rossy_Quest == 5) goto L_Cherry_Done;
+  if (Rossy_Quest == 3) goto L_Check;
+  if (Rossy_Quest == 2) goto L_Mother;
 
-  mes "[Rossy]";
-  mes "*The young girl looks at you in tears.*";
+  mes "*A young girl looks at you in tears.*";
+  if (baselevel < 50) close;
+  if (Rossy_Quest < 1) close;
+  next;
   menu
-    "Please stop crying and tell me what's wrong.", -,
-    "I don't like people who cry. Bye.", L_No;
+    "Hey, hey... Why are you crying? Are you hurt?", -,
+    "Sorry kid, I don't have time to play with children.", L_No;
+  mes "[Young Girl]";
+  mes "\"No. I am crying because I lost all my fruits. My sister and I were collecting some near Dimond's Cove, but then I stumbled on a giant snail and it attacked us!";
+  next;
+  mes "But we were lucky, because the snail is really slow and we ran away from it. Julia ran to the left and I ran to the right. The snail got pretty confused, because we are identical twins... But the problem is that I dropped the basket full of fruits on the ground and that evil snail ate them all! And I can't find Julia to help me collect more fruits.\"";
   next;
-  mes "[Rossy]";
-  mes "\"I dropped a basket of fruits on the ground and these evil snails ate them all!\"";
-  if (baselevel < 50) goto L_LowLevel;
   menu
-    "Oh, I presume that you want some. Would you like me to get some fruits for you?", L_Set,
-    "Oh well, life isn't fair.", L_No;
-
-L_LowLevel:
+    "Did you say Julia? I talked to you mother. She is very worried about you.", -;
+  mes "[Rossy]";
+  mes "\"Really? But she let us play in the woods... There is no reason to be worried. Unless...\"";
+  next;
+  mes "*Rossy suddenly looks strange, mumbling something about Julia...*";
+  next;
+  mes "[Rossy]";
+  mes "\"Could you do me a favor? Please, tell my mother we are OK... There is.. erh... there is no reason to worry about us.\"";
+  next;
   menu
-    "I can't do anything about it, sorry.", L_No;
+    "Ok, if you say so", -,
+    "Sorry, I have no time for this", L_No;
+  mes "[Rossy]";
+  mes "\"Thank you very much!\"";
+  set Rossy_Quest, 2;
+  close;
 
 L_No:
   close;
 
-L_Set:
+L_Mother:
   mes "[Rossy]";
-  mes "\"That would be great! Can you get 10 Cherries for me? These are the fruits I like best.\"";
-  next;
-  menu
-    "Sure, I'll be back with your cherries.", L_Get,
-    "No, get some yourself.", L_No;
+  mes "\"Please, tell my mother we are OK... If you feel like helping, come back after you talk to my mother. Maybe you could help us find some fruits.\"";
+  close;
 
-L_Get:
-  mes "[Rossy]";
-  set Rossy_Quest, 1;
-  mes "\"Please, get 10 Cherries for me.\"";
+L_Get_Cherry:
+  mes "[Young Girl]";
+  mes "\"No, you don't have 10 cherries. I know how to count. I hope you get them soon.\"";
   close;
 
 L_Check:
-  if(countitem("Cherry") < 10) goto L_Get;
   mes "[Rossy]";
-  set Rossy_Quest, 2;
-  getexp 2000, 0;
-  mes "\"I can't believe my eyes, you got them all! Please give them to my mother when she will ask for them.\"";
+  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 so many cherries alone. I would need at least 10 cherries, and It would take too much time!\"";
   next;
   menu
-    "No problem, I'm in a hurry, bye.", -,
-    "Certainly, I'm always here to help, do you need anything else?", L_Done;
+    "That is no problem for me. Just wait and I will come back with the cherries", L_No,
+    "Hey, I have some cherries in my backpack!", -,
+    "You should get them yourself.", L_No;
+  if(countitem("Cherry") < 10) goto L_Get_Cherry;
   mes "[Rossy]";
-  mes "\"I might need your help later. Bye.\"";
+  set Rossy_Quest, 4;
+  getexp 2000, 0;
+  mes "\"I can't believe it, you got them all! Please give them to my mother, she is in one of the buildings in the town north east from here. Tell her it is a gift from me and Julia and there is no reason to worry about us.\"";
+  next;
+  mes "(Rossy mumbles to herself)   *I hope*   ";
+  next;
+  mes "[Rossy]";
+  mes "\"Oh, after you give the cherries to my mother, please come back here. If you have some free time, of course.\"";
+  close;
 
-L_Done:
+L_Cherry_Done:
   mes "[Rossy]";
-  mes "\"My mother might need help. She is in one of the buildings in the town north east from here.\"";
+  mes "\"Please, try to distract my mother... I don't want her to be worried about us. While you do this, I will try to find Julia.\"";
   close;
 
 L_Let:
@@ -74,11 +92,11 @@ L_Let:
     
 L_Let2:
   mes "[Rossy]";
-  mes "*The little girl grabs the piece of paper and reads it with an authomatic gesture. Her face turns pale.*";
+  mes "*The little girl grabs the piece of paper and reads it with an automatic gesture. Her face turns pale.*";
   menu
     "What does it say?", -;
   mes "[Rossy]";
-  mes "\"Oh no, I completely forgot! I need to make a potion but don't have any of the ingredients required. Could you get them for me?\"";
+  mes "\"Oh no, I completely forgot! My magic scholl exam! I need to make a potion and give it to my teacher today! But I didn't find Julia yet and I don't even have any of the ingredients required. Could you get them for me, please?\"";
   next;
   menu
     "Of course I can, what do you need?", L_Sett,
@@ -89,14 +107,14 @@ L_Sett:
   set Rossy_Quest, 6;
   mes "\"I need 24 [Cactus Drink]s, 32 [Maggot Slime]s, 50 [Gamboge Herb]s, 43 [Alizarin Herb]s and 30 [Bug Leg]s.\"";
   next;
-  mes "\"Please collect all of that and come back to see me. I know the recipe by heart.\"";
+  mes "\"Please come back to see me when you have the ingredients. I know the recipe by heart.\"";
   close;
   
 L_NE:
   mes "[Rossy]";
   mes "\"Please bring me 24 [Cactus Drink]s, 32 [Maggot Slime]s, 50 [Gamboge Herb]s, 43 [Alizarin Herb]s and 30 [Bug Leg]s.\"";
   next;
-  mes "\"It seems you miss some of the ingredients I've asked you. Please hurry!\"";
+  mes "\"Please hurry!\"";
   close;
   
 L_Check2:
@@ -107,7 +125,7 @@ L_Check2:
   if(countitem("BugLeg") < 30) goto L_NE;
   mes "[Rossy]";
   set Rossy_Quest, 7;
-  mes "\"Oh, thank you "+ strcharinfo(0) +" so much! If you don't mind, please bring this potion to my teacher and don't lose it!\"";
+  mes "\"Oh, thank you "+ strcharinfo(0) +" ! If you don't mind, please give this potion to my teacher.\"";
   delitem "CactusDrink", 24;
   delitem "MaggotSlime", 32;
   delitem "GambogeHerb", 50;
@@ -115,14 +133,14 @@ L_Check2:
   delitem "BugLeg", 30;
   getexp 3000, 0;
   next;
-  mes "\"His name is David, he is a very young magician and lives near the magic school in the north of Tulimshar.\"";
+  mes "\"My teacher's name is David, he is a very young magician and lives near the magic school in the north of Tulimshar.\"";
   next;
   mes "\"Please, give it to him as soon as you can!\"";
   close;
   
 L_BT:
   mes "[Rossy]";
-  mes "\"Great. Now you just should bring it to my teacher. His name is David, he is a very young magician and lives near the magic school in the north of Tulimshar.\"";
+  mes "\"Great. Now if you could just give it to my teacher. His name is David, he is a very young magician and lives near the magic school in the north of Tulimshar.\"";
   next;
   mes "\"You should take the ferry, that'll be faster than swimming!\"";
   close;
@@ -130,22 +148,22 @@ L_BT:
 L_Donet:
   if (Rossy_Quest == 10 && countitem("redrose") >= 15) goto L_RG;
   menu
-    "David took your potion and he tested it in front of me. It perfectly worked!", -;
+    "David took your potion and he tested it in front of me. It worked perfectly!", -;
   mes "[Rossy]";
-  mes "\"Hurray! You might want to tell that to my mother now.\"";
+  mes "\"Yay! Phew... That was close, I almost forgot about my exam. Please, tell my mother about it. I am sure she will be proud of me.\"";
   close;
   
 L_RG:
   menu
-    "Your mother asked me to bring you these flowers because you succesfully made your potion.", -;
+    "Your mother was so happy that she asked me to bring you these flowers.", -;
   mes "[Rossy]";
-  set Rossy_Quest, 11;
   mes "\"How nice!\"";
   next;
   mes "*Rossy takes the flowers from your hands and suddenly throws them on the ground. She begins sneezing.*";
+  set Rossy_Quest, 11;
   delitem "redrose", 15;
   menu
-    "I presume that you don't like roses, right?", -;
+    "I presume you don't like roses, right?", -;
   mes "[Rossy]";
   mes "\"I am allergic to roses, my mother should already know that!\"";
   close;
@@ -165,29 +183,31 @@ L_See:
   delitem "redtulip", 15;
   mes "\"That's better! Go and tell my mother that she is the nicest mother in the world.\"";
   next;
-  mes "\"Come back and see me afterwards.\"";
+  mes "\"Now I should really find my sister... Come back later.\"";
   getexp 2500, 0;
   close;
   
 L_Best:
   mes "[Rossy]";
-  set Rossy_Quest, 14;
   mes "\"Thank you "+ strcharinfo(0) +", you helped me so much!\"";
   next;
-  mes "\"I now need to find my sister before my mum gets worried... Please find her!\"";
+  menu
+    "Did you find your sister? I am starting to get worried too.", -;
+  mes "\"I think I have an idea where she might be... Come back in a few minutes, I will tell you if she is OK.\"";
+  set Rossy_Quest, 14;
   close;
 
 L_Julia:
   mes "[Rossy]";
-  mes "\"I saw my twin, Julia! She was forced to enter a cave not far from here. I heard her scream. Please enter that cave and save her now!\"";
+  mes "\"I saw Julia! She was running away from something and entered in a cave not far from here. I heard her scream. Please can you enter that cave and save her? Im so scared!\"";
   close;
 
 L_End:
   mes "[Rossy]";
-  mes "\"I saw my twin, Julia! She was forced to enter a cave not far from here. I heard her scream. Did you saved her yet?\"";
+  mes "\"Oh no, Julia... Why would you go to that scary place? Have you seen her yet?\"";
   menu
     "She'll be back soon, trust me, I saved her.", L_Found,
-    "I didn't saw her yet, sorry.", L_No;
+    "I didn't see her yet, sorry.", L_No;
 
 L_Found:
   mes "[Rossy]";
diff --git a/npc/025-4/battlecaves.txt b/npc/025-4/battlecaves.txt
index 3b63203e..3587c769 100644
--- a/npc/025-4/battlecaves.txt
+++ b/npc/025-4/battlecaves.txt
@@ -694,15 +694,14 @@ L_Done:
 
 025-4.gat,157,42,0	script	#StartBossCaveFight	111,{
     if (Rossy_Quest == 16) goto L_Found;
-    if ($@battlebosscave == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15) goto L_Summon;
+    if ($@battlebosscave == 1 && cavefights & BATTLE_CAVE1 && cavefights & BATTLE_CAVE2 && cavefights & BATTLE_CAVE3 && cavefights & BATTLE_CAVE4 && cavefights & BATTLE_CAVE5 && cavefights & BATTLE_CAVE6 && cavefights & BATTLE_CAVE7 && cavefights & BATTLE_CAVE8 && cavefights & BATTLE_CAVE9 && Rossy_Quest == 15) goto L_Found;
     message strcharinfo(0), "You shouldn't be here, you cheater.";
     percentheal -100, 0;
     end;
 
 L_Found:
-    message strcharinfo(0), "You found a golden key.";
-    set Killed_Boss, 1;
-    end;
+    message strcharinfo(0), "You found a golden key inside the chest.";
+    goto L_Summon;
 
 L_Summon:
     set $@cave10_loop, $@cave10_loop + 1;
@@ -769,7 +768,7 @@ OnBossDeath:
     set $@cave10start, 0;
     set $@cave10fighter$, "";
     set $@cave10fighterdeaths$, 0;
-    message strcharinfo(0), "What a harsh battle! Oh, a golden key, it might open the chest!";
+    message strcharinfo(0), "What a harsh battle! I should have peace to use that golden key now.";
     set Rossy_Quest, 16;
     end;
 
@@ -791,12 +790,12 @@ onInit:
 
 025-4.gat,157,48,0	script	#CheckCaveFightBoss	127,1,1,{
     if (Rossy_Quest >= 17) goto L_Done;
-    if (Killed_Boss == 1) goto L_Done;
+    if (Rossy_Quest == 17) goto L_Julia;
     message strcharinfo(0), "Evil forces make you stop, you need to defeat them first before getting out.";
     end;
 
-L_Killed:
-    message strcharinfo(0), "The little girl seems so close, you can't let her stay here.";
+L_Julia:
+    message strcharinfo(0), "I shoudn't get out. Julia is still in danger.";
     end;
 
 L_Done:
@@ -807,10 +806,14 @@ L_Done:
 // ---------------------  Julia Cave Checker Outside  ----------------------------
 
 025-4.gat,157,24,0	script	#CheckJuliaCaveOutside	127,1,1,{
-    if (Killed_Boss == 1) goto L_Done;
+    if ($@wave_cave10 != 0) goto L_Focus;
     message strcharinfo(0), "As you try to walk through, you bump into an invisible door. You might need a key to open it.";
     end;
 
+L_Focus:
+    message strcharinfo(0), "I can't use the key while there are monsters around... I should defeat them first.";
+    end;
+
 L_Done:
     warp "025-4.gat", 93, 33;
     end;
@@ -819,10 +822,8 @@ L_Done:
 // ---------------------  Julia Cave Checker Inside  ----------------------------
 
 025-4.gat,93,35,0	script	#CheckJuliaCaveInside	127,1,1,{
-    if (Rossy_Quest >= 17 && Killed_Boss == 1) goto L_Done;
-    if (Rossy_Quest >= 17 && Killed_Boss == 0) goto L_Cheat2;
-    if (Rossy_Quest == 16 && Killed_Boss == 1) goto L_Save;
-    if (Rossy_Quest == 16 && Killed_Boss == 0) goto L_Cheat3;
+    if (Rossy_Quest >= 17) goto L_Done;
+    if (Rossy_Quest == 16) goto L_Save;
     if (Rossy_Quest <= 15) goto L_Cheat;
     end;
 
@@ -831,16 +832,6 @@ L_Cheat:
     percentheal -100, 0;
     end;
 
-L_Cheat2:
-    message strcharinfo(0), "You saved Julia without having killed the boss? Is that even possible?";
-    percentheal -100, 0;
-    end;
-
-L_Cheat3:
-    message strcharinfo(0), "You can save Julia without killing the boss? Cheating isn't fair.";
-    percentheal -100, 0;
-    end;
-
 L_Done:
     warp "025-4.gat", 157, 26;
     end;
diff --git a/npc/025-4/clauquer.txt b/npc/025-4/clauquer.txt
index e39e27d7..0fe3c910 100644
--- a/npc/025-4/clauquer.txt
+++ b/npc/025-4/clauquer.txt
@@ -4,7 +4,6 @@
   if (Rossy_Quest == 15) goto L_Hmmm;
   if (Rossy_Quest == 14) goto L_Help;
   if (Rossy_Quest <= 13) goto L_Huh;
-  if (Clauquer_Enough == 1) goto L_End;
 
 L_Help:
   mes "[Clauquer]";
@@ -16,59 +15,46 @@ L_Help:
     "I'm not lost and I don't need help, bye.", L_No;
   next;
   mes "[Clauquer]";
-  mes "\"How do I kow 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 will come in these caves just for fun!\"";
+  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!\"";
   menu
     "Of course not.", -,
   next;
   mes "[Clauquer]";
-  mes "\"I can see that you need help to be able to save the little girl. First of all, you should know that these little caves contain horrible blood thursty earth monsters. They are coming from nowhere and you can't escape while they are still alive. Watch out because if you take too much time, you will die due to the smell of the caves. You will try to come out of the aceve, crawling and whe you'll be outside, the normal air will kill you. So you better be quick.\"";
+  mes "\"I can see that you really want to save the little girl. First of all, you should know that these little caves contain horrible blood thirsty earth monsters. They come from nowhere and you can't escape while they are still alive. And if you take too much time, you will die due to the foul air in the caves and the monsters will move your body outside, to the entrance of the cave. So you better be quick.\"";
   next;
-  mes "\"In these caves, or you die, or they die, that is the only rule. When the monsters of a cave will be dead, you'll quickly come out of the cave because of its smell. Don't worry, you'll have time to look in each chest of each caves. Why chests? Well because you have a hidden cave which is locked by several lockets on an invisible door. I don't exactly know the number of lockets but that might turn around 10.\"";
+  mes "\"The girl is trapped in a place inside one of these caves, protected by a door with 9 different locks. You have to find the key for each one of these locks in the different caves around here. They are inside some chests. The problem is, once you try to open the chest, the monsters I told you about will surround you.\"";
   next;
-  mes "\"When you'll enter the locked cave, you'll be in front of numerous monsters. But watch out, the last one is more dangerous than the other ones. As you will see him, you will be frightened to death. Don't worry, I can give you some advices.\"";
-  menu
-    "Please go on.", -,
-    "Sounds dangerous, but I know enough now.", L_Enough;
+  mes "\"In these caves, either you die, or they die. This is the only rule. When you kill all the monsters in a cave, make sure you get out immediatelly, because of the air. Don't worry, They only appear when you open the chests.\"";
+  next;
+  mes "\"When you enter the cave in which the girl is locked, you'll be in front of numerous monsters. But watch out, the last one is more dangerous than the other ones. When you see it you will be frightened to death. Don't worry, I can give you some advices.\"";
   next;
+  menu
+    "Please go on.", -;
+L_Advice:
   mes "[Clauquer]";
-  mes "\"I advice you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl to change it into a changling. However the changling has been killed along the way to the caves. In fact no, he tried to take the girl's appearence but she was mentally too strong for the changling. That is why the fey element is waiting for another fresh changling, stronger than the previous one. As you can see, scary story.\"";
+  mes "\"I advise you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl to change it into a changling. However the changling has been killed along the way to the caves. In fact no, he tried to take the girl's appearence but she was mentally too strong for the changling. That is why the fey element is waiting for another fresh changling, stronger than the previous one. As you can see, scary story.\"";
   next;
-  mes "\"Oh, I advice you to use battle potions for every single battle, I'm thinking of Concentration and Iron Potions. You might want to take some food with you, 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, I advise you to use battle potions for every single battle, I'm thinking of Concentration and Iron Potions. You might want to take some food with you, 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.\"";
   next;
-  mes "\"I think you're now ready to explore these caves and fight. May god be with you.\"";
-  set Rossy_Quest, 15;
-  close;
-
-L_Enough:
-  mes "[Clauquer]";
-  mes "\"Enough? No, you don't even know the fun part yet. I know you'll come back soon.\"";
-  set Clauquer_Enough, 1;
+  mes "\"I think you're now ready to explore these caves and fight.\"";
+  if (Rossy_Quest == 14) set Rossy_Quest, 15;
   close;
 
 L_End:
-
   mes "[Clauquer]";
   mes "\"I see you came back because you didn't know enough of these caves... Well, well...\"";
   next;
-  mes "\"I advice you to be mentally prepared for this rescue operation. A fey nature spirit creature kidnapped the little girl to change it into a changling. However the changling has been killed along the way to the caves. In fact no, he tried to take the girl's appearence but she was mentally too strong for the changling. That is why the fey element is waiting for another fresh changling, stronger than the previous one. As you can see, scary story.\"";
-  next;
-  mes "\"Oh, I advice you to use battle potions for every single battle, I'm thinking of Concentration and Iron Potions. You might want to take some food with you, 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.\"";
-  next;
-  mes "\"I think you're now ready to explore these caves and fight. May god be with you.\"";
-  set Rossy_Quest, 15;
-  close;
+  goto L_Advice;
 
 L_Hmmm:
-  if (Clauquer_Talk == 1) goto L_Huh;
   mes "[Clauquer]";
-  mes "\"You already know everythng about these caves. You don't need me anymore to find the little girl.\"";
+  mes "\"You already know everything about these caves. You don't need me anymore to find the little girl.\"";
   menu
     "But please, I really need your help!", -,
     "You're right, I don't need your help!", L_No;
   next;
-  mes "\"I don't repeat myself. Bye.\"";
-  set Clauquer_Talk, 1;
-  close;
+  mes "\"Ok, if you insist... But I can only repeat what I already said.\"";
+  goto L_Advice;
 
 L_Huh:
   mes "[Clauquer]";
diff --git a/npc/025-4/julia.txt b/npc/025-4/julia.txt
index ad0c8a1a..8c7b3ce4 100644
--- a/npc/025-4/julia.txt
+++ b/npc/025-4/julia.txt
@@ -6,7 +6,7 @@
 
 L_Done:
   mes "[Julia]";
-  mes "I heard some battle noises few minutes ago and I presume you are here to save me!";
+  mes "I heard some battle noises a few minutes ago and I presume you are here to save me!";
   next;
   menu
     "Of course I'm here to save you, Rossy sent me here!", -;
@@ -16,12 +16,12 @@ L_Done:
   getitem "BlackBoots", 1;
   getexp 5000, 0;
   set Rossy_Quest, 17;
-  mes "I'm out of here now, come out from this horrible cave.";
+  mes "I'm out of here now, let's get out of this horrible cave.";
   close;
 
 L_End:
   mes "[Julia]";
-  mes "Come out from this horrible cave.";
+  mes "Let's get out of this horrible cave.";
   close;
 
 L_Hmmm: