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

14 files changed, 131 insertions, 21 deletions

diff --git a/data/025-3.wlk b/data/025-3.wlk
index 28e6ba81..3f8e8640 100644
--- a/data/025-3.wlk
+++ b/data/025-3.wlk
diff --git a/npc/009-2/olana.txt b/npc/009-2/olana.txt
index 729ffb93..23606069 100644
--- a/npc/009-2/olana.txt
+++ b/npc/009-2/olana.txt
@@ -1,5 +1,7 @@
 009-2.gat,123,45,0	script	Olana	140,{ 
 
+  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 == 12) goto L_Give;
@@ -28,7 +30,7 @@ L_Daughter:
   mes "*Olana begins to sobb...*";
   next;
   menu
-    "Wait, I saw Rossy I think and I helped her get back some fruits she lost in the forest. I didn't saw Julia though.", L_Help,
+    "Wait, I saw Rossy, she is fine.", L_Help,
     "Wait a bit, I'm sure they'll get back soon.", L_No;
 
 L_No:
@@ -162,5 +164,25 @@ L_Julia:
   mes "[Olana]";
   mes "\"Where is Julia? I want to know where she is! Go and find her please "+ 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) +".\"";
+  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 "[Olana]";
+  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 "[Olana]";
+  mes "*The mother is calmly waiting her daughters to come back for diner.*";
+  close;
   
 }
diff --git a/npc/024-1/david.txt b/npc/024-1/david.txt
index 3128392b..99c119c1 100644
--- a/npc/024-1/david.txt
+++ b/npc/024-1/david.txt
@@ -1,5 +1,6 @@
 024-1.gat,70,70,0	script	David	120,{ 
 
+  if (Rossy_Quest == 18) goto L_FinalEnd;
   if (Rossy_Quest == 14) goto L_Julia;
   if (Rossy_Quest >= 8) goto L_Done;
   
@@ -38,6 +39,12 @@ L_No:
 L_Julia:
   mes "[David]";
   mes "\"I heard Rossy's sister got kidnapped. We count on you to find her!\"";
+  mes "\"When you'll find her, talk to her sister or mother.\"";
+  close;
+
+L_FinalEnd:
+  mes "[David]";
+  mes "Thank you for finding Julia.";
   close;
 
 }
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;
+
 }
diff --git a/npc/025-3/_import.txt b/npc/025-3/_import.txt
index abec253e..a02d4c7e 100644
--- a/npc/025-3/_import.txt
+++ b/npc/025-3/_import.txt
@@ -2,3 +2,4 @@
 map: 025-3.gat
 npc: npc/025-3/_mobs.txt
 npc: npc/025-3/_warps.txt
+npc: npc/025-3/barrier.txt
diff --git a/npc/025-3/_warps.txt b/npc/025-3/_warps.txt
index c40cdf6b..a6a94b38 100644
--- a/npc/025-3/_warps.txt
+++ b/npc/025-3/_warps.txt
@@ -1,16 +1,6 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // 025-3 warps
 
-025-3.gat,112,99	warp	ToOutside	1,-1,025-1.gat,42,81
+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,71,84	warp	ToBattleCave	-1,-1,025-4.gat,41,95
 025-3.gat,80,84	warp	ToBattleCave	-1,-1,025-4.gat,110,94
-025-3.gat,53,108	warp	ToBattleCave	-1,-1,025-4.gat,168,115
-025-3.gat,78,128	warp	ToBattleCave	-1,-1,025-4.gat,32,154
-025-3.gat,138,159	warp	ToBattleCave	-1,-1,025-4.gat,100,158
-025-3.gat,80,84	warp	ToBattleCave	-1,-1,025-4.gat,110,94
-025-3.gat,138,93	warp	ToBattleCave	-1,-1,025-4.gat,159,172
-025-3.gat,70,58	warp	ToBattleCave	-1,-1,025-4.gat,41,95
-025-3.gat,70,58	warp	ToBattleCave	-1,-1,025-4.gat,42,217
-025-3.gat,71,31	warp	ToBattleCave	-1,-1,025-4.gat,105,214
-025-3.gat,128,36	warp	ToBattleCave	-1,-1,025-4.gat,157,224
diff --git a/npc/025-3/barrier.txt b/npc/025-3/barrier.txt
new file mode 100644
index 00000000..dd4ad0f4
--- /dev/null
+++ b/npc/025-3/barrier.txt
@@ -0,0 +1,10 @@
+025-3.gat,77,169,0	script	#JuliaBarrier	127,1,1,{
+	if (Rossy_Quest <= 15) goto L_Block;
+    warp "025-4.gat", 157, 46;
+	end;
+
+L_Block:
+    message strcharinfo(0), "You don't feel powerful enough to enter. You maybe should explore somewhere else before.";
+    end;
+
+}
diff --git a/npc/025-4/_import.txt b/npc/025-4/_import.txt
index 0cf829e7..94cb5a0e 100644
--- a/npc/025-4/_import.txt
+++ b/npc/025-4/_import.txt
@@ -2,3 +2,5 @@
 map: 025-4.gat
 npc: npc/025-4/_mobs.txt
 npc: npc/025-4/_warps.txt
+npc: npc/025-4/clauquer.txt
+npc: npc/025-4/julia.txt
diff --git a/npc/025-4/_warps.txt b/npc/025-4/_warps.txt
index 895ce9cd..7ed92366 100644
--- a/npc/025-4/_warps.txt
+++ b/npc/025-4/_warps.txt
@@ -3,5 +3,3 @@
 
 025-4.gat,28,37	warp	ToMainHall	-1,-1,025-3.gat,105,87
 025-4.gat,93,34	warp	ToMainHall	-1,-1,025-4.gat,157,26
-025-4.gat,157,47	warp	ToMainHall	-1,-1,025-3.gat,77,168
-025-4.gat,157,25	warp	ToGirl	-1,-1,025-4.gat,93,33
diff --git a/npc/025-4/clauquer.txt b/npc/025-4/clauquer.txt
new file mode 100644
index 00000000..4593f36d
--- /dev/null
+++ b/npc/025-4/clauquer.txt
@@ -0,0 +1,28 @@
+025-4.gat,30,30,0	script	Clauquer	169,{ 
+
+  mes "[Clauquer]";
+  mes "It seems you are lost in these caves.";
+  next;
+  mes "Do you want some advices to be able to find out the mistery of this place?";
+  menu
+    "Please tell me everything about these caves.", -,
+    "I'm not lost and I know everything about these caves.", L_No;
+  next;
+  mes "\"All of these caves contain horrible blood thursty monsters. They are coming from nowhere and you can't escape while they are still alive. Or you die, or they die. When the monsters of a cave will be dead, you'll be, just by magic, teleported out of the cave. You will not be able to enter it anymore.\"";
+  next;
+  mes "There are nine caves in which monsters are located, kill them all and you'll be able to rescue the harmless young girl who got caught by uhm... I shouldn't say his name. Well, you should be warned! This isn't easy, you will need to kill... him!";
+  menu
+    "I'm not afraid of these stories, please continue.", -,
+    "Sounds dangerous, I might need to go now, bye.", L_No;
+  mes "Well, you need to kill him and all of his horrible, nasty minions. Beware, don't kill them or more will come!";
+  next;
+  mes "When you'll rescue the little girl, you will not be able to enter these caves anymore, though I don't see why you would do so.";
+  next;
+  mes "It seems you know everything you should know. Dangerous secrets must be kept... You now know what to do!";
+  set Rossy_Quest, 16;
+  close;
+
+L_No:
+  close;
+
+}
diff --git a/npc/025-4/julia.txt b/npc/025-4/julia.txt
new file mode 100644
index 00000000..f4a053f0
--- /dev/null
+++ b/npc/025-4/julia.txt
@@ -0,0 +1,19 @@
+025-4.gat,89,21,0	script	Julia	114,{ 
+
+  if (Rossy_Quest >= 17) goto L_End;
+  mes "[Julia]";
+  mes "Oh, you saved me, thank you!";
+  next;
+  mes "Here is a present for you.";
+  getitem "BunchOfParsley", 1;
+  getexp 5000, 0;
+  set Rossy_Quest, 17;
+  mes "I'm out of here now, come out from this horrible cave.";
+  close;
+
+L_End:
+  mes "[Julia]";
+  mes "Come out from this horrible cave.";
+  close;
+
+}