Fixed several issues.

5 files changed, 10 insertions, 11 deletions

diff --git a/npc/024-1/david.txt b/npc/024-1/david.txt
index c76cba20..612d1c14 100644
--- a/npc/024-1/david.txt
+++ b/npc/024-1/david.txt
@@ -16,13 +16,13 @@ L_Help:
     
 L_Set:
   mes "[David]";
-  set Rossy_Quest, 8;
   mes "\"Yes, I do. I am her teacher. That makes me remember 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. She asked me to bring it to you for her.", -;
   mes "[David]";
   mes "\"Oh, that's great! Let me look at it...\"";
+  set Rossy_Quest, 8;
   mes "\"Great! This potion is perfect, tell Rossy that she passed her exam! And here is a small reward for your help.\"";
   getexp 2000, 0;
   set zeny, zeny + 500;
diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index 98f47b98..95a96670 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -34,7 +34,7 @@ L_No:
 
 L_Set:
   mes "[Rossy]";
-  mes "\"Really? Can you get 5 Cherries for me? These are the fruits I like best.\"";
+  mes "\"Really? 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,
@@ -43,14 +43,14 @@ L_Set:
 L_Get:
   mes "[Rossy]";
   set Rossy_Quest, 1;
-  mes "\"Please, get 5 Cherries for me.\"";
+  mes "\"Please, get 10 Cherries for me.\"";
   close;
 
 L_Check:
-  if(countitem("Cherry") < 5) goto L_Get;
+  if(countitem("Cherry") < 10) goto L_Get;
   mes "[Rossy]";
   set Rossy_Quest, 2;
-  delitem "Cherry", 5;
+  delitem "Cherry", 10;
   getexp 2000, 0;
   mes "\"I can't believe my eyes, you got them! Thanks a lot!\"";
   next;
@@ -123,7 +123,7 @@ L_BT:
   
 L_Donet:
   mes "[Rossy]";
-  mes "\"Cool, I've passed my exam! Hurray!!!\"";
+  mes "\"Cool, I've passed my exam! Hurray! You might want to talk to my mother now.\"";
   if (Rossy_Quest == 10 && countitem("redrose") >= 15) goto L_RG;
   close;
   
diff --git a/npc/025-3/_mobs.txt b/npc/025-3/_mobs.txt
index 0b110386..03c831fb 100644
--- a/npc/025-3/_mobs.txt
+++ b/npc/025-3/_mobs.txt
@@ -1,9 +1,9 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // 025-3 mobs
 
-025-3.gat,0,0,0,0	monster	CaveMaggot	1056,200,0,100,Mob025-3::On1056
-025-3.gat,0,0,0,0	monster	Archant	1060,50,0,100,Mob025-3::On1060
-025-3.gat,0,0,0,0	monster	AngryScorpion	1057,75,0,0,Mob025-3::On1057
+025-3.gat,0,0,0,0	monster	CaveMaggot	1056,100,0,100,Mob025-3::On1056
+025-3.gat,0,0,0,0	monster	Archant	1060,20,0,100,Mob025-3::On1060
+025-3.gat,0,0,0,0	monster	AngryScorpion	1057,25,0,0,Mob025-3::On1057
 025-3.gat,67,153,4,2	monster	Skeleton	1043,1,0,30000,Mob025-3::On1043
 
 
diff --git a/npc/025-3/_warps.txt b/npc/025-3/_warps.txt
index a6a94b38..d6ee0fad 100644
--- a/npc/025-3/_warps.txt
+++ b/npc/025-3/_warps.txt
@@ -3,4 +3,3 @@
 
 025-3.gat,112,98	warp	ToOutside	1,-1,025-1.gat,42,81
 025-3.gat,105,86	warp	ToHelper	-1,-1,025-4.gat,28,36
-025-3.gat,80,84	warp	ToBattleCave	-1,-1,025-4.gat,110,94
diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
index e999a151..0d36f56e 100644
--- a/npc/025-4/_import.txt
+++ b/npc/025-4/_import.txt
@@ -1,8 +1,8 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 map: 025-4.gat
+npc: npc/025-4/Battlecaves.txt
 npc: npc/025-4/_mobs.txt
 npc: npc/025-4/_warps.txt
 npc: npc/025-4/clauquer.txt
 npc: npc/025-4/julia.txt
-npc: npc/025-4/Battlecaves.txt
 npc: npc/025-4/mapflags.txt