Improved the script in all ways. Also improved some maps.

4 files changed, 40 insertions, 7 deletions

diff --git a/npc/025-1/_import.txt b/npc/025-1/_import.txt
index e554fb4d..35633eca 100644
--- a/npc/025-1/_import.txt
+++ b/npc/025-1/_import.txt
@@ -3,4 +3,5 @@
 map: 025-1.gat
 npc: npc/025-1/_mobs.txt
 npc: npc/025-1/_warps.txt
+npc: npc/025-1/barrier.txt
 npc: npc/025-1/rossy.txt
diff --git a/npc/025-1/_warps.txt b/npc/025-1/_warps.txt
index fba6d9d2..e408c509 100644
--- a/npc/025-1/_warps.txt
+++ b/npc/025-1/_warps.txt
@@ -4,4 +4,3 @@
 025-1.gat,19,66	warp	toSwamp	-1,-1,026-1.gat,128,66
 025-1.gat,90,19	warp	toWoodland	2,-1,015-1.gat,59,100
 025-1.gat,130,58	warp	toWoodland	-1,1,016-1.gat,20,53
-025-1.gat,42,80	warp	ToCave	-1,-1,025-3.gat,112,98
diff --git a/npc/025-1/barrier.txt b/npc/025-1/barrier.txt
new file mode 100644
index 00000000..d41ad953
--- /dev/null
+++ b/npc/025-1/barrier.txt
@@ -0,0 +1,10 @@
+025-1.gat,42,79,0	script	#JuliaBarrier	127,1,1,{
+	if (Rossy_Quest <= 13) goto L_Block;
+    warp "025-3.gat", 112, 97;
+	end;
+
+L_Block:
+    message strcharinfo(0), "You are too frightened by what you can hear coming out of the cave that you can't enter.";
+    end;
+
+}
diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index 288d2cb6..45403dd6 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -1,5 +1,7 @@
 025-1.gat,80,88,0	script	Rossy	114,{ 
 
+  if (Rossy_Quest == 18) goto L_FinalEnd;
+  if (Rossy_Quest == 17) goto L_End;
   if (Rossy_Quest == 14) goto L_Julia;
   if (Rossy_Quest >= 13) goto L_Best;
   if (Rossy_Quest >= 11) goto L_Allergic;
@@ -11,7 +13,7 @@
   if (Rossy_Quest == 1) goto L_Check;
 
   mes "[Rossy]";
-  mes "The young girl looks at you in tears.";
+  mes "*The young girl looks at you in tears.*";
   menu
     "Please stop crying and tell me what's wrong.", -,
     "I don't like people who cry. Bye.", L_No;
@@ -32,7 +34,7 @@ L_No:
 
 L_Set:
   mes "[Rossy]";
-  mes "\"Really? Can you get 20 Cherries for me? These are the fruits I like best.\"";
+  mes "\"Really? Can you get 5 Cherries for me? These are the fruits I like best.\"";
   next;
   menu
     "Sure, I'll be back with your cherries.", L_Get,
@@ -41,14 +43,14 @@ L_Set:
 L_Get:
   mes "[Rossy]";
   set Rossy_Quest, 1;
-  mes "\"Please, get 20 Cherries for me.\"";
+  mes "\"Please, get 5 Cherries for me.\"";
   close;
 
 L_Check:
-  if(countitem("Cherry") < 20) goto L_Get;
+  if(countitem("Cherry") < 5) goto L_Get;
   mes "[Rossy]";
   set Rossy_Quest, 2;
-  delitem "Candy", 20;
+  delitem "Cherry", 5;
   getexp 2000, 0;
   mes "\"I can't believe my eyes, you got them! Thanks a lot!\"";
   next;
@@ -167,5 +169,26 @@ 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 find her now!\"";
   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. Please find her now!\"";
+  menu
+    "She'll be back soon, trust me, I saved her.", L_Found,
+    "I didn't saw her yet, sorry.", L_No;
+
+L_Found:
+  mes "[Rossy]";
+  set Rossy_Quest, 18;
+  mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
+  getexp 5000, 0;
+  set zeny, zeny + 5000;
+  close;
+
+L_FinalEnd:
+  mes "[Rossy]";
+  mes "\"Julia and I are playing hide and seek right now, it is funny in the forest!\"";
+  mes "*The young girl laughs quietly.*";
+  close;
+
 }