Made some fixes and improved some scripts.

6 files changed, 64 insertions, 13 deletions

diff --git a/npc/009-2/olana.txt b/npc/009-2/olana.txt
index 23606069..cafb124b 100644
--- a/npc/009-2/olana.txt
+++ b/npc/009-2/olana.txt
@@ -1,7 +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 == 17) goto L_FinalEnd;
+  if (Rossy_Quest == 16) goto L_End;
   if (Rossy_Quest == 14) goto L_Julia;
   if (Rossy_Quest == 13) goto L_Best;
   if (Rossy_Quest == 12) goto L_Give;
@@ -174,7 +174,7 @@ L_End:
 
 L_Found:
   mes "[Olana]";
-  set Rossy_Quest, 18;
+  set Rossy_Quest, 17;
   mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
   getexp 5000, 0;
   set zeny, zeny + 5000;
diff --git a/npc/024-1/david.txt b/npc/024-1/david.txt
index 99c119c1..c76cba20 100644
--- a/npc/024-1/david.txt
+++ b/npc/024-1/david.txt
@@ -1,6 +1,6 @@
 024-1.gat,70,70,0	script	David	120,{ 
 
-  if (Rossy_Quest == 18) goto L_FinalEnd;
+  if (Rossy_Quest == 17) goto L_FinalEnd;
   if (Rossy_Quest == 14) goto L_Julia;
   if (Rossy_Quest >= 8) goto L_Done;
   
diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index 45403dd6..bb7c01ec 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -1,7 +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 >= 17) goto L_FinalEnd;
+  if (Rossy_Quest == 16) goto L_End;
   if (Rossy_Quest == 14) goto L_Julia;
   if (Rossy_Quest >= 13) goto L_Best;
   if (Rossy_Quest >= 11) goto L_Allergic;
@@ -163,23 +163,25 @@ L_Best:
   mes "[Rossy]";
   set Rossy_Quest, 14;
   mes "\"Thank you "+ strcharinfo(0) +", you helped me so much! I now need to find my sister before my mum gets worried...\"";
+  next;
+  mes "\"Please find her.\"";
   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 find her now!\"";
+  mes "\"I saw my twin, Julia! She was forced to enter a cave not far from here. I heard her scream. Please save 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!\"";
+  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?\"";
   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;
+  set Rossy_Quest, 17;
   mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
   getexp 5000, 0;
   set zeny, zeny + 5000;
diff --git a/npc/025-3/barrier.txt b/npc/025-3/barrier.txt
index dd4ad0f4..96ca06e6 100644
--- a/npc/025-3/barrier.txt
+++ b/npc/025-3/barrier.txt
@@ -1,5 +1,9 @@
 025-3.gat,77,169,0	script	#JuliaBarrier	127,1,1,{
-	if (Rossy_Quest <= 15) goto L_Block;
+	if (Battle_Caves == 0) goto L_Block;
+    warp "025-4.gat", 157, 46;
+	end;
+
+	if (Battle_Caves == 2) goto L_Block2;
     warp "025-4.gat", 157, 46;
 	end;
 
@@ -7,4 +11,8 @@ L_Block:
     message strcharinfo(0), "You don't feel powerful enough to enter. You maybe should explore somewhere else before.";
     end;
 
+L_Block2:
+    message strcharinfo(0), "There is nothing else in this cave that seems interesting.";
+    end;
+
 }
diff --git a/npc/025-4/clauquer.txt b/npc/025-4/clauquer.txt
index 4593f36d..db2a0487 100644
--- a/npc/025-4/clauquer.txt
+++ b/npc/025-4/clauquer.txt
@@ -1,5 +1,10 @@
 025-4.gat,30,30,0	script	Clauquer	169,{ 
 
+  if (Rossy_Quest >= 15) goto L_Done;
+  if (Rossy_Quest == 14) goto L_Help;
+  if (Rossy_Quest <= 13) goto L_Hmmm;
+
+L_Help:
   mes "[Clauquer]";
   mes "It seems you are lost in these caves.";
   next;
@@ -19,7 +24,34 @@
   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;
+  set Rossy_Quest, 15;
+  close;
+
+L_Help:
+  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!";
+  close;
+
+L_Hmmm
+  mes "[Clauquer]";
+  mes "Why are you here? Get out.";
   close;
 
 L_No:
diff --git a/npc/025-4/julia.txt b/npc/025-4/julia.txt
index f4a053f0..c8efacb2 100644
--- a/npc/025-4/julia.txt
+++ b/npc/025-4/julia.txt
@@ -1,13 +1,17 @@
 025-4.gat,89,21,0	script	Julia	114,{ 
 
-  if (Rossy_Quest >= 17) goto L_End;
+  if (Rossy_Quest >= 16) goto L_End;
+  if (Rossy_Quest == 15) goto L_Done;
+  if (Rossy_Quest <= 14) goto L_Hmmm;
+
+L_Done:
   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;
+  set Rossy_Quest, 16;
   mes "I'm out of here now, come out from this horrible cave.";
   close;
 
@@ -16,4 +20,9 @@ L_End:
   mes "Come out from this horrible cave.";
   close;
 
+L_Hmmm
+  mes "[Julia]";
+  mes "Don't hurt me!";
+  close;
+
 }