summaryrefslogtreecommitdiff
path: root/npc/quests/quests_rachel.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests/quests_rachel.txt')
-rw-r--r--npc/quests/quests_rachel.txt46
1 files changed, 21 insertions, 25 deletions
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 6de585782..79bff59fe 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.8
+//= 1.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -47,6 +47,7 @@
//= Fixed EXP reward in Ice Necklace quest, fixed a typo in an NPC header.
//= Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
//= the ontouch "key". Thanks to Gepard for pointing them out.
+//= 1.9 Fixed a misorder with variable checkings. [SinSloth]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@@ -5465,7 +5466,25 @@ L_End:
ra_temin,170,46,3 script Panno#rachel 920,{
cutin "ra_fano03",2;
- if (ra_tem_q < 2) {
+ if (ra_tem_q >= 12 || MISC_QUEST & 8192) {
+ cutin "ra_fano03",2;
+ mes "[Priestess Panno]";
+ mes "Good day.";
+ mes "Have you come to";
+ mes "redeem Lottery Tickets?";
+ next;
+ if (select("Yes:No") == 1) goto L_Lottery;
+ if (ra_tem_q == 12) {
+ cutin "ra_fano01",2;
+ mes "[Priestess Panno]";
+ mes "I already told you";
+ mes "everything I know.";
+ mes "Remember to keep";
+ mes "quiet about what I said.";
+ goto L_End;
+ }
+ }
+ else if (ra_tem_q < 2) {
mes "[Priestess Panno]";
mes "Greetings.";
mes "May Freya fill";
@@ -5540,7 +5559,6 @@ ra_temin,170,46,3 script Panno#rachel 920,{
goto L_End;
}
}
-
else if (ra_tem_q == 10) {
mes "[Priestess Panno]";
mes "Good day.";
@@ -5660,11 +5678,8 @@ ra_temin,170,46,3 script Panno#rachel 920,{
mes ".........";
set ra_tem_q,11;
goto L_End;
-
}
-
}
-
else if (ra_tem_q == 11) {
mes "["+strcharinfo(0)+"]";
mes "I remember now...!";
@@ -5799,25 +5814,6 @@ ra_temin,170,46,3 script Panno#rachel 920,{
set ra_tem_q,12;
goto L_End;
}
-
- else if (ra_tem_q >= 12 || MISC_QUEST & 8192) {
- cutin "ra_fano03",2;
- mes "[Priestess Panno]";
- mes "Good day.";
- mes "Have you come to";
- mes "redeem Lottery Tickets?";
- next;
- if (select("Yes:No") == 1) goto L_Lottery;
- if (ra_tem_q == 12) {
- cutin "ra_fano01",2;
- mes "[Priestess Panno]";
- mes "I already told you";
- mes "everything I know.";
- mes "Remember to keep";
- mes "quiet about what I said.";
- goto L_End;
- }
- }
cutin "ra_fano02",2;
mes "[Priestess Panno]";
mes "This is a holy place";