summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-01-03 19:34:16 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-01-03 19:34:16 +0100
commit2f0982dbc2c2c9df46af6376d607d1c63f02a2c8 (patch)
treee470afe8e930c80e7dcd87ddc828b5df6d219ad0
parented8d0807f7acbf29f7d3866f22308ace2d16d3b7 (diff)
downloadserverdata-2f0982dbc2c2c9df46af6376d607d1c63f02a2c8.tar.gz
serverdata-2f0982dbc2c2c9df46af6376d607d1c63f02a2c8.tar.bz2
serverdata-2f0982dbc2c2c9df46af6376d607d1c63f02a2c8.tar.xz
serverdata-2f0982dbc2c2c9df46af6376d607d1c63f02a2c8.zip
setting reward from cindy, adding debug pssibility in angela
-rw-r--r--npc/031-1_NivalisPort/angelaOutside.txt8
-rw-r--r--npc/031-3_Cave/cindyCave.txt29
2 files changed, 18 insertions, 19 deletions
diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1_NivalisPort/angelaOutside.txt
index b10bb5f9..ae5b6bfa 100644
--- a/npc/031-1_NivalisPort/angelaOutside.txt
+++ b/npc/031-1_NivalisPort/angelaOutside.txt
@@ -123,11 +123,19 @@ S_Update_Mask:
menu
"close", L_close,
"reset quest", -,
+ "skip yeti battle", yeti,
"magic", magic;
set @rescue_Cindy, 0;
callsub S_Update_Mask;
mes "quest variable is now " + @rescue_Cindy;
close;
+
+yeti:
+ set @rescue_Cindy, 2;
+ callsub S_Update_Mask;
+ mes "quest variable is now " + @rescue_Cindy;
+ close;
+
L_close:
close;
diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt
index 029ea00d..131db3c8 100644
--- a/npc/031-3_Cave/cindyCave.txt
+++ b/npc/031-3_Cave/cindyCave.txt
@@ -66,12 +66,6 @@ L_Try_Cage:
startnpctimer;
goto L_Exit;
-//TODO: remove
- mes "DEBUG: ADD YETIFIGHT HERE, QUEST VARIABLE INCREASED";
- set @rescue_Cindy, 2;
- callsub S_Update_Mask;
- close;
-
L_Exit:
close;
@@ -89,26 +83,24 @@ L_Reward:
getinventorylist;
if (@inventorylist_count == 100) goto L_Full_Inv;
- set @reward, rand(2);
- if (@reward == 1) goto L_Wizard_Hat;
- //TODO: set right, when quarterstaff is in item_db
- //getitem "WoodenStaff", 1;
- mes "DEBUG: GET ACORN INSTEAD OF WOODENSTAFF";
- getitem "acorn", 1;
+ set @reward, rand(15);
+ if (@reward < 10) goto L_Wizard_Hat;
+ getitem "WoodenStaff", 1;
+ set @rescue_Cindy, 3;
+ callsub S_Update_Mask;
goto L_Visit;
L_Wizard_Hat:
- //TODO: set right, when quarterstaff is in item_db
- //getitem "BugLeg", 1;
- mes "DEBUG: GET BUGLEG INSTEAD OF WIZARDHAT";
- getitem "acorn", 1;
+ // get a wizard hat in one of the ten colors - no white
+ setarray @wizardhats[0], 2200, 2201, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209;
+ getitem @wizardhats[@reward], 1;
+ set @rescue_Cindy, 3;
+ callsub S_Update_Mask;
L_Visit:
mes "\"Thank you so much, please come to my home. It's the house at the beach.\"";
next;
mes "\"I'm sure, my mother want to thank you as well.\"";
- set @rescue_Cindy, 3;
- callsub S_Update_Mask;
close;
L_Please_Visit:
@@ -152,7 +144,6 @@ L_NextWave:
set $@FIGHT_YETI_WAVE, $@FIGHT_YETI_WAVE + 1;
if ($@FIGHT_YETI_WAVE > 10 && $@YETI_COUNT == 0) goto L_CleanUp;
if ($@FIGHT_YETI_WAVE > 10) goto L_Return_1;
-//TODO: adjust number of yetis spawned
set $@FIGHT_YETI_NUMBER, (1 + (1 * $@FIGHT_YETI_WAVE) + (2 * $@FIGHT_YETI_PLAYER_COUNT))/4;
set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER;