diff options
| author | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/npc/031-4/cindyCave.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/npc/031-4/cindyCave.txt')
| -rw-r--r-- | world/map/npc/031-4/cindyCave.txt | 64 |
1 files changed, 22 insertions, 42 deletions
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt index 6c03e951..0be990c8 100644 --- a/world/map/npc/031-4/cindyCave.txt +++ b/world/map/npc/031-4/cindyCave.txt @@ -176,48 +176,12 @@ L_NextWave: areamonster "031-4.gat", 0, 0, 95, 91, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::OnPetDeath"; - if ($@FIGHT_YETI_WAVE == 1) - mapannounce "031-4.gat", "Cindy: Yetis!", 0; - if ($@FIGHT_YETI_WAVE == 2) - mapannounce "031-4.gat", "Cindy: Watch out!", 0; - if ($@FIGHT_YETI_WAVE == 3) - mapannounce "031-4.gat", "Cindy: More of them are coming!", 0; - if ($@FIGHT_YETI_WAVE == 4) - mapannounce "031-4.gat", "Cindy: Be careful! More of them!", 0; - if ($@FIGHT_YETI_WAVE == 5) - mapannounce "031-4.gat", "Cindy: Attention! There is another bunch of them!", 0; - if ($@FIGHT_YETI_WAVE == 6) - mapannounce "031-4.gat", "Cindy: Hang on! More of them!", 0; - if ($@FIGHT_YETI_WAVE == 7) - mapannounce "031-4.gat", "Cindy: More Yetis! Will this never end?", 0; - if ($@FIGHT_YETI_WAVE == 8) - mapannounce "031-4.gat", "Cindy: There are coming more and more!", 0; - if ($@FIGHT_YETI_WAVE == 9) - mapannounce "031-4.gat", "Cindy: Watch your back! There are so many of them!", 0; - if ($@FIGHT_YETI_WAVE == 10) - mapannounce "031-4.gat", "Cindy: This seems to be their final attack! I believe in you!", 0; - - if ($@FIGHT_YETI_WAVE == 1) - mapannounce "031-3.gat", "Cindy: Yetis!", 0; - if ($@FIGHT_YETI_WAVE == 2) - mapannounce "031-3.gat", "Cindy: Watch out!", 0; - if ($@FIGHT_YETI_WAVE == 3) - mapannounce "031-3.gat", "Cindy: More of them are coming!", 0; - if ($@FIGHT_YETI_WAVE == 4) - mapannounce "031-3.gat", "Cindy: Be careful! More of them!", 0; - if ($@FIGHT_YETI_WAVE == 5) - mapannounce "031-3.gat", "Cindy: Attention! There is another bunch of them!", 0; - if ($@FIGHT_YETI_WAVE == 6) - mapannounce "031-3.gat", "Cindy: Hang on! More of them!", 0; - if ($@FIGHT_YETI_WAVE == 7) - mapannounce "031-3.gat", "Cindy: More Yetis! Will this never end?", 0; - if ($@FIGHT_YETI_WAVE == 8) - mapannounce "031-3.gat", "Cindy: There are coming more and more!", 0; - if ($@FIGHT_YETI_WAVE == 9) - mapannounce "031-3.gat", "Cindy: Watch your back! There are so many of them!", 0; - if ($@FIGHT_YETI_WAVE == 10) - mapannounce "031-3.gat", "Cindy: This seems to be their final attack! I believe in you!", 0; - + set $@msg$, $@FIGHT_YETI_MESSAGES$[$@FIGHT_YETI_WAVE]; + if ($@msg$ == "") + goto L_Return_1; + mapannounce "031-4.gat", $@msg$, 0; + mapannounce "031-3.gat", $@msg$, 0; + set $@msg$, ""; goto L_Return_1; // Called on each player once every 5 seconds @@ -266,6 +230,22 @@ L_End: set @rescue_Cindy, 0; end; +OnInit: + setarray $@FIGHT_YETI_MESSAGES$, + "", // unused + // " : " is magic so that it says "global announcement from" + "Cindy : Yetis!", + "Cindy : Watch out!", + "Cindy : More of them are coming!", + "Cindy : Be careful! More of them!", + "Cindy : Attention! There is another bunch of them!", + "Cindy : Hang on! More of them!", + "Cindy : More Yetis! Will this never end?", + "Cindy : There are coming more and more!", + "Cindy : Watch your back! There are so many of them!", + "Cindy : This seems to be their final attack! I believe in you!"; + end; + ///////// S_Update_Mask: set QUEST_Nivalis_state, |