summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authortoni <toni@toni-EP45-UD3L.(none)>2011-01-18 23:48:12 -0200
committertoni <toni@toni-EP45-UD3L.(none)>2011-01-18 23:48:12 -0200
commit4d25d8787690193036661cdb877c45241b4a9441 (patch)
treefed9e3ffa4eb5c5eba6992c242c0cd68bca77e1c /npc
parentfb430bbd33fedc55ab5a642a0efb8df164c4ac8a (diff)
downloadserverdata-4d25d8787690193036661cdb877c45241b4a9441.tar.gz
serverdata-4d25d8787690193036661cdb877c45241b4a9441.tar.bz2
serverdata-4d25d8787690193036661cdb877c45241b4a9441.tar.xz
serverdata-4d25d8787690193036661cdb877c45241b4a9441.zip
Add a Check to see if the player have used the magic house warp.
Correcting a critical bug. If the player fails in the run, he is presented with the initial menu again, since there is no conditional for QUEST_MIRIAM == 5.
Diffstat (limited to 'npc')
-rw-r--r--npc/006-1_Desert_mountains/pachua.txt8
-rw-r--r--npc/013-2_Magic_house/notes.txt9
-rw-r--r--npc/032-1_Outback/miriam.txt11
3 files changed, 27 insertions, 1 deletions
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
index 9fa6ad14..25e961d3 100644
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ b/npc/006-1_Desert_mountains/pachua.txt
@@ -4,8 +4,10 @@
set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK;
+ if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat;
if (QUEST_MIRIAM_start != 0) goto L_smoke;
+L_Begin:
mes "[Chief Pachua]";
mes "\"How!\"";
next;
@@ -203,4 +205,10 @@ L_smoke:
set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start;
set QUEST_MIRIAM_start, 0;
end;
+
+L_warp_cheat:
+ if (@warp_cheat == 1) goto L_Begin;
+ message strcharinfo(0), "Pachua releases a ring of smoke towards the sky! But, by the look on his face, you can tell he is suspicious about your methods...";
+ set @warp_cheat, 1;
+ end;
}
diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt
index 590407e6..7b65ce2d 100644
--- a/npc/013-2_Magic_house/notes.txt
+++ b/npc/013-2_Magic_house/notes.txt
@@ -49,6 +49,15 @@
mes "You feel the floor disappear below your feet...";
next;
warp "006-1.gat",33,93;
+ if (QUEST_MIRIAM_start != 0) goto L_cheat;
+
+// If you try to use the notes to warp to pachua the quest will fail.
+
+L_cheat:
+ set QUEST_MIRIAM_cheat, 1;
+ set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start;
+ set QUEST_MIRIAM_start, 0;
+ message strcharinfo(0), "You were supposed to actually run to this place. You are not sure if this is going to work for Miriam...";
close;
}
diff --git a/npc/032-1_Outback/miriam.txt b/npc/032-1_Outback/miriam.txt
index 06684350..858a5088 100644
--- a/npc/032-1_Outback/miriam.txt
+++ b/npc/032-1_Outback/miriam.txt
@@ -9,7 +9,7 @@
// 2 waiting for the ingredients
// 3 you brought the needed stuff. if you meet other criteria (baselevel, agi) you will be taught the skill
// 4 you have met the criteria of 3, but declined to take the speed test.
-// 5 while being tested, take this state. there are not any conditional jumps for this state, it should be met by QUEST_MIRIAM_run or QUEST_MIRIAM_start
+// 5 you tried the quest but you failed
// QUEST_MIRIAM_start
// a time in ticks. This is only !=0 if you started running to pachua.
// QUEST_MIRIAM_run
@@ -29,6 +29,7 @@
if (QUEST_MIRIAM == 4) goto L_testoffer;
if (QUEST_MIRIAM_run != 0) goto L_checktime;
if (QUEST_MIRIAM_start != 0) goto L_wasting;
+ if (QUEST_MIRIAM == 5) goto L_testoffer;
L_intro:
mes "You see a woman sitting in the hot sand with eyes wide open... But she does not seem to be looking at something in particular...";
@@ -211,6 +212,7 @@ L_test:
npctalk "Run " +strcharinfo(0)+ ", run!";
set QUEST_MIRIAM, 5;
set QUEST_MIRIAM_start, gettimetick(1);
+ set QUEST_MIRIAM_cheat, 0;
end;
L_naked:
@@ -243,6 +245,12 @@ L_testoffer:
"Not yet.",-;
close;
+L_warning:
+ mes "[Miriam]";
+ mes "\"I know very well what you tried to do. I will not teach you the speed skill if you keep trying this kind of trick!\"";
+ next;
+ goto L_testoffer;
+
L_stretch:
mes "[Miriam]";
mes "\"Ok. Good idea... Stretching exercises can increase your flexibility and even prevent injuries!\"";
@@ -255,6 +263,7 @@ L_wasting:
close;
L_checktime:
+ if (QUEST_MIRIAM_cheat != 0) goto L_warning;
if (QUEST_MIRIAM_run > 210) goto L_tryagain;
if (QUEST_MIRIAM_run <= 210) goto L_goodjob;