From d21d470338b6ad5f6d9d540cb61212a4c3bfb064 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Fri, 31 Dec 2010 01:20:51 +0100
Subject: Rescue Cindy quest: - reward fix in Cindy - blocking the warp of the
fight cave during battle - changing yeti stats for next test
---
db/mob_db.txt | 2 +-
npc/031-3_Cave/cindyCave.txt | 9 +++++----
npc/031-3_Cave/labyrinth.txt | 8 ++++++++
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/db/mob_db.txt b/db/mob_db.txt
index c619b968..6f4884fb 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -69,4 +69,4 @@
1069, Scythe, Scythe, 40, 3000, 0, 0, 500, 1, 200, 350, 30, 10, 100, 250, 1, 1, 150, 90, 1, 50, 1, 0, 40, 133, 220, 700, 672, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
1070, BallLightning, Ball Lightning, 40, 50, 0, 0, 10, 1, 5, 10, 40, 65, 1, 200, 1, 1, 1, 1, 1, 50, 1, 0, 47, 133, 110, 1500, 672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 0, 0
1071, IceElement, Ice Element, 20, 1000, 0, 0, 200, 2, 60, 60, 0, 20, 15, 25, 15, 15, 20, 50, 1, 1, 1, 0, 41, 135, 330, 740, 672, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 20
-1072, Yeti, Yeti, 35,8500, 0, 0, 300, 2,100,400,60,15,60, 5,45, 15,40,32, 1, 1, 1, 0, 61, 135,220, 1500, 672, 900, 0, 800, 0, 800, 0, 800, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
+1072, Yeti, Yeti, 35,8500, 0, 0, 300, 2,100,400,60,15,60, 5,45, 15,45,32, 1, 1, 1, 0, 61, 135,220, 1500, 672, 900, 0, 800, 0, 800, 0, 800, 0, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , , 2, 30
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;
}
--
cgit v1.2.3-70-g09d2