summaryrefslogtreecommitdiff
path: root/npc/025-1
diff options
context:
space:
mode:
authorCoffee <coffee@coffee-EP45-UD3L.(none)>2011-06-12 12:46:54 -0300
committerBen Longbons <b.r.longbons@gmail.com>2011-06-12 14:51:03 -0700
commit4c8d2a9e25f3525c62aaf703ee2c35fa5da90dab (patch)
tree287a6b9b77b473cc66d1c8430a434664a4c7ff56 /npc/025-1
parent7db5813c87d4b964d7a9caa14bef582935481920 (diff)
downloadserverdata-4c8d2a9e25f3525c62aaf703ee2c35fa5da90dab.tar.gz
serverdata-4c8d2a9e25f3525c62aaf703ee2c35fa5da90dab.tar.bz2
serverdata-4c8d2a9e25f3525c62aaf703ee2c35fa5da90dab.tar.xz
serverdata-4c8d2a9e25f3525c62aaf703ee2c35fa5da90dab.zip
Add fixes and cave fights
Diffstat (limited to 'npc/025-1')
-rw-r--r--npc/025-1/reset.txt3
-rw-r--r--npc/025-1/rossy.txt21
2 files changed, 17 insertions, 7 deletions
diff --git a/npc/025-1/reset.txt b/npc/025-1/reset.txt
index 382b6761..bc6f7110 100644
--- a/npc/025-1/reset.txt
+++ b/npc/025-1/reset.txt
@@ -5,7 +5,8 @@
"Yes.", -,
"No.", L_No;
set Rossy_Quest, 0;
- set Cave_Battles, 0;
+ set cavefights, 0;
+ set FLAGS, FLAGS & ~FLAG_ROSSI_COMPLETED;
L_No:
close;
diff --git a/npc/025-1/rossy.txt b/npc/025-1/rossy.txt
index bb7c01ec..98f47b98 100644
--- a/npc/025-1/rossy.txt
+++ b/npc/025-1/rossy.txt
@@ -1,8 +1,8 @@
025-1.gat,80,88,0 script Rossy 114,{
- 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 >= 11) goto L_Allergic;
if (Rossy_Quest >= 8 && Rossy_Quest < 11) goto L_Donet;
@@ -124,7 +124,7 @@ L_BT:
L_Donet:
mes "[Rossy]";
mes "\"Cool, I've passed my exam! Hurray!!!\"";
- if (Rossy_Quest == 10 && countitem("redrose") == 15) goto L_RG;
+ if (Rossy_Quest == 10 && countitem("redrose") >= 15) goto L_RG;
close;
L_RG:
@@ -144,7 +144,7 @@ L_RG:
L_Allergic:
mes "*Girl sneezes a lot*";
- if (Rossy_Quest == 12 && countitem("redtulip") == 15) goto L_Sorry;
+ if (Rossy_Quest == 12 && countitem("redtulip") >= 15) goto L_Sorry;
close;
L_Sorry:
@@ -181,12 +181,21 @@ L_End:
L_Found:
mes "[Rossy]";
- 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:
mes "[Rossy]";
mes "\"Julia and I are playing hide and seek right now, it is funny in the forest!\"";