summaryrefslogtreecommitdiff
path: root/npc/031-3_Cave
diff options
context:
space:
mode:
Diffstat (limited to 'npc/031-3_Cave')
-rw-r--r--npc/031-3_Cave/cindyCave.txt9
-rwxr-xr-xnpc/031-3_Cave/labyrinth.txt8
2 files changed, 13 insertions, 4 deletions
diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt
index 77046422..03bb0bde 100644
--- a/npc/031-3_Cave/cindyCave.txt
+++ b/npc/031-3_Cave/cindyCave.txt
@@ -90,7 +90,7 @@ L_Reward:
getinventorylist;
if (@inventorylist_count == 100) goto L_Full_Inv;
- set @reward, rand(1);
+ set @reward, rand(2);
if (@reward == 1) goto L_Wizard_Hat;
//TODO: set right, when quarterstaff is in item_db
//getitem "WoodenStaff", 1;
@@ -100,8 +100,8 @@ L_Reward:
L_Wizard_Hat:
//TODO: set right, when quarterstaff is in item_db
- //getitem "WizardHat", 1;
- mes "DEBUG: GET ACORN INSTEAD OF WIZARDHAT";
+ //getitem "BugLeg", 1;
+ mes "DEBUG: GET BUGLEG INSTEAD OF WIZARDHAT";
getitem "acorn", 1;
L_Visit:
@@ -183,11 +183,12 @@ onReward:
if (isdead(0)) end;
//TODO: determine, if and how many boss points should be added
set BOSS_POINTS, BOSS_POINTS + 100;
-//TODO: check, if two messages for the player works
message strcharinfo(0), "You gain 100 Boss Points giving you a total of " + BOSS_POINTS;
+ if (@rescue_Cindy < 1) goto L_No_Progress;
set @rescue_Cindy, 2;
callsub S_Update_Mask;
message strcharinfo(0), "Cindy looks relieved and as if she wants to talk with you.";
+L_No_Progress:
end;
/////////
diff --git a/npc/031-3_Cave/labyrinth.txt b/npc/031-3_Cave/labyrinth.txt
index 89a0623a..a73085e3 100755
--- a/npc/031-3_Cave/labyrinth.txt
+++ b/npc/031-3_Cave/labyrinth.txt
@@ -264,10 +264,18 @@
}
031-3.gat,120,81,0 script #ChristmasBarrier 127,1,1,{
+ if ($@FIGHT_YETI_STATUS == 1) goto L_Block;
warp "031-3.gat", 46, 27;
+ end;
+L_Block:
+ message strcharinfo(0), "Some force seems to be blocking you from exiting.";
end;
}
031-3.gat,46,24,0 script #ChristmasBarrier 127,1,1,{
+if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked;
warp "031-3.gat", 120, 79;
+ end;
+L_Blocked:
+ message strcharinfo(0), "Some force seems to be blocking you from entering.";
end;
}