From 4c8d2a9e25f3525c62aaf703ee2c35fa5da90dab Mon Sep 17 00:00:00 2001
From: Coffee <coffee@coffee-EP45-UD3L.(none)>
Date: Sun, 12 Jun 2011 12:46:54 -0300
Subject: Add fixes and cave fights

---
 npc/009-2/olana.txt | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'npc/009-2')

diff --git a/npc/009-2/olana.txt b/npc/009-2/olana.txt
index cafb124b..76381e7e 100644
--- a/npc/009-2/olana.txt
+++ b/npc/009-2/olana.txt
@@ -1,8 +1,8 @@
 009-2.gat,123,45,0	script	Olana	140,{ 
 
-  if (Rossy_Quest == 17) goto L_FinalEnd;
-  if (Rossy_Quest == 16) goto L_End;
-  if (Rossy_Quest == 14) goto L_Julia;
+  if (FLAGS & FLAG_ROSSI_COMPLETED) goto L_FinalEnd;
+  if (Rossy_Quest == 17 || Rossy_Quest == 18) goto L_End;
+  if (Rossy_Quest >= 14 && Rossy_Quest <= 16) goto L_Julia;
   if (Rossy_Quest == 13) goto L_Best;
   if (Rossy_Quest == 12) goto L_Give;
   if (Rossy_Quest == 11) goto L_Allergic;
@@ -174,10 +174,18 @@ L_End:
 
 L_Found:
   mes "[Olana]";
-  set Rossy_Quest, 17;
+  if (Rossy_Quest == 17) set Rossy_Quest, 18;
+  if (Rossy_Quest == 18) set Rossy_Quest, 19;
   mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\"";
   getexp 5000, 0;
   set zeny, zeny + 5000;
+  if (Rossy_Quest == 19) goto L_Clear;
+  close;
+
+L_Clear:
+  set Rossy_Quest, 0;
+  set cavefights, 0;
+  set FLAGS, FLAGS | FLAG_ROSSI_COMPLETED;
   close;
 
 L_FinalEnd:
-- 
cgit v1.2.3-70-g09d2