some more fixes on rossy quest

1 files changed, 33 insertions, 35 deletions

diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index f93be8b2..6bd949a9 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -1,6 +1,6 @@
 // Authors: alastrim, Ali-g, Dark Mage
 
-025-1.gat,80,88,0	script	Rossy	114,{ 
+025-1.gat,80,88,0	script	Rossy	114,{
 
   if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
   if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
@@ -16,7 +16,7 @@
   if (Rossy_Quest == 3) goto L_Check;
   if (Rossy_Quest == 2) goto L_Mother;
 
-  mes "*A 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;
@@ -33,10 +33,10 @@
   mes "[Rossy]";
   mes "\"Really? But she let us play in the woods... There is no reason to be worried. Unless...\"";
   next;
-  mes "*Rossy suddenly gets a strange look on her face, mumbling something about Julia...*";
+  mes "Rossy suddenly gets a strange look on her face, mumbling something about Julia...";
   next;
   mes "[Rossy]";
-  mes "\"Could you do me a favor? Please, tell my mother we are OK... There is.. uh... there is no reason to worry about us.\"";
+  mes "\"Could you do me a favor? Please, tell my mother we are alright... There is.. uh... there is no reason to worry about us.\"";
   next;
   menu
     "Ok, if you say so.", -,
@@ -51,7 +51,7 @@ L_No:
 
 L_Mother:
   mes "[Rossy]";
-  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.\"";
+  mes "\"Please, tell my mother we are fine. If you feel like helping, come back after you talk to my mother. Maybe you could help us find some fruits.\"";
   close;
 
 L_Get_Cherry:
@@ -71,9 +71,11 @@ L_Check:
   mes "[Rossy]";
   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.\"";
+  mes "\"I can't believe it, you got them all! Please give them to my mother. 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*   ";
+  mes "Rossy mumbles to herself.";
+  mes "[Rossy]";
+  mes "\"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.\"";
@@ -91,49 +93,43 @@ L_Let:
   menu
     "Your mother asked me to hand you this letter. She told me it was from your teacher.", L_Let2,
     "Not at all... I need to go now, see you next time.", L_No;
-    
+
 L_Let2:
   mes "[Rossy]";
-  mes "*The little girl grabs the piece of paper and reads it quickly. Her face turns pale.*";
+  mes "The little girl grabs the piece of paper and reads it quickly. Her face turns pale.";
   menu
     "What does it say?", -;
   mes "[Rossy]";
   mes "\"Oh no, I completely forgot! My magic school exam! I need to make a potion and give it to my teacher today! But I haven't found 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,
-    "Well, I'm already really busy right now, sorry. Bye.", L_No;
-    
-L_Sett:
-  mes "[Rossy]";
   set Rossy_Quest, 6;
   mes "\"I need 24 Cactus Drinks, 32 Maggot Slimes, 50 Gamboge Herbs, 43 Alizarin Herbs and 30 Bug Legs.\"";
   next;
   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 Drinks, 32 Maggot Slimes, 50 Gamboge Herbs, 43 Alizarin Herbs and 30 Bug Legs.\"";
   next;
   mes "\"Please hurry!\"";
   close;
-  
+
 L_Check2:
   if(countitem("CactusDrink") < 24) goto L_NE;
   if(countitem("MaggotSlime") < 32) goto L_NE;
   if(countitem("GambogeHerb") < 50) goto L_NE;
   if(countitem("AlizarinHerb") < 43) goto L_NE;
   if(countitem("BugLeg") < 30) goto L_NE;
-  mes "Rossy gets all the ingredients and places them on the ground. She starts to mix some herbs with the cactus drinks and appears to cast some spells... She seems to know what she is doing";
-  next;
-  mes "[Rossy]";
-  mes "\"Oh, thank you "+ strcharinfo(0) +" ! It is done. If you don't mind, please give this potion to my teacher.\"";
   delitem "CactusDrink", 24;
   delitem "MaggotSlime", 32;
   delitem "GambogeHerb", 50;
   delitem "AlizarinHerb", 43;
   delitem "BugLeg", 30;
+  mes "Rossy gets all the ingredients and places them on the ground. She starts to mix some herbs with the cactus drinks and appears to cast some spells... She seems to know what she is doing.";
+  next;
+  mes "[Rossy]";
+  mes "\"Oh, thank you "+ strcharinfo(0) +" ! It is done. If you don't mind, please give this potion to my teacher.\"";
   set Rossy_Quest, 7;
   getexp 3000, 0;
   message strcharinfo(0), "Rossy hands you the potion, holding the bottle very carefully.";
@@ -142,14 +138,14 @@ L_Check2:
   next;
   mes "\"Please, give it to him as soon as you can!\"";
   close;
-  
+
 L_BT:
   mes "[Rossy]";
   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;
-  
+
 L_Donet:
   if (Rossy_Quest == 10 && countitem("redrose") >= 15) goto L_RG;
   menu
@@ -157,48 +153,50 @@ L_Donet:
   mes "[Rossy]";
   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:
+  if (countitem("redrose") < 15) goto L_No;
+  delitem "redrose", 15;
   menu
     "Your mother was so happy that she asked me to bring you these flowers.", -;
   mes "[Rossy]";
   mes "\"How nice!\"";
   next;
-  mes "*Rossy takes the flowers from your hands and suddenly throws them on the ground. She begins sneezing.*";
+  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 you don't like roses, right?", -;
   mes "[Rossy]";
   mes "\"I am allergic to roses, my mother should already know that!\"";
   close;
-  
+
 L_Allergic:
-  mes "*Rossy sneezes a lot*";
+  mes "Rossy sneezes a lot.";
   if (Rossy_Quest == 12 && countitem("redtulip") >= 15) goto L_Sorry;
   close;
-  
+
 L_Sorry:
   menu
     "Your mother is sorry about the roses. Here are some beautiful red tulips instead.", L_See;
-    
+
 L_See:
   mes "[Rossy]";
-  set Rossy_Quest, 13;
+  if (countitem("redtulip") < 15) goto L_No;
   delitem "redtulip", 15;
+  set Rossy_Quest, 13;
   mes "\"That's better! Go and tell my mother that she is the nicest mother in the world.\"";
   next;
   mes "\"Now I should really find my sister... Come back later.\"";
   getexp 2500, 0;
   close;
-  
+
 L_Best:
   mes "[Rossy]";
   mes "\"Thank you "+ strcharinfo(0) +", you helped me so much!\"";
   next;
   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.\"";
+  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;
 
@@ -220,7 +218,7 @@ L_Found:
   if (Rossy_Quest == 18) set Rossy_Quest, 19;
   mes "\"Oh "+ strcharinfo(0) +", thank you very much! Take this, you deserve it!\"";
   next;
-  mes "\"*Rossy hands you a huge bag full of coins.*\"";
+  mes "Rossy hands you a huge bag full of coins.";
   getexp 5000, 0;
   set zeny, zeny + 5000;
   if (Rossy_Quest == 19) goto L_Clear;
@@ -236,7 +234,7 @@ L_Clear:
 L_FinalEnd:
   mes "[Rossy]";
   mes "\"Julia and I are playing hide and seek right now. It is fun in the forest!\"";
-  mes "*The young girl laughs quietly.*";
+  mes "The young girl laughs quietly.";
   close;
 
 }