diff options
| author | toni <toni@toni-EP45-UD3L.(none)> | 2011-01-18 23:54:43 -0200 |
|---|---|---|
| committer | toni <toni@toni-EP45-UD3L.(none)> | 2011-01-18 23:54:43 -0200 |
| commit | b62862c2e4a47c5219e9542ae23c6ebc3dca0da9 (patch) | |
| tree | 6950e21db78e2cc2159d3ecc715a399299409fa3 | |
| parent | 4d25d8787690193036661cdb877c45241b4a9441 (diff) | |
| parent | 319bfa1ce75f29ce4a9bcf526675e41a87d0b9f7 (diff) | |
| download | serverdata-b62862c2e4a47c5219e9542ae23c6ebc3dca0da9.tar.gz serverdata-b62862c2e4a47c5219e9542ae23c6ebc3dca0da9.tar.bz2 serverdata-b62862c2e4a47c5219e9542ae23c6ebc3dca0da9.tar.xz serverdata-b62862c2e4a47c5219e9542ae23c6ebc3dca0da9.zip | |
Merge branch 'master' of gitorious.org:~wombat/tmw-eathena-data/cache-serverdata
| -rw-r--r-- | npc/031-1_NivalisPort/angelaOutside.txt | 2 | ||||
| -rw-r--r-- | npc/031-3_Cave/cindyCave.txt | 25 |
2 files changed, 25 insertions, 2 deletions
diff --git a/npc/031-1_NivalisPort/angelaOutside.txt b/npc/031-1_NivalisPort/angelaOutside.txt index 98523903..b42c5318 100644 --- a/npc/031-1_NivalisPort/angelaOutside.txt +++ b/npc/031-1_NivalisPort/angelaOutside.txt @@ -22,7 +22,7 @@ mes "\"It's terrible, oh my dear child!\""; next; - if (countitem("ConcentrationPotion") > 0) goto L_Menu_Potion; + if (countitem("ConcentrationPotion") > 0 && baselevel > 70) goto L_Menu_Potion; menu "\"Please calm down and tell me what happened.\"", L_Whining, diff --git a/npc/031-3_Cave/cindyCave.txt b/npc/031-3_Cave/cindyCave.txt index accc68b5..3eeb8184 100644 --- a/npc/031-3_Cave/cindyCave.txt +++ b/npc/031-3_Cave/cindyCave.txt @@ -46,7 +46,7 @@ L_Please_Help: close; L_Try_Cage: - if (baselevel < 65) goto L_To_Weak; + if (baselevel < 70) goto L_To_Weak; if (countitem("TreasureKey") < @KEYS_AMOUNT) goto L_Not_Enough_Keys; delitem "TreasureKey", @KEYS_AMOUNT; mes "As you try to open the door of the cage, there is a loudly squeaking noise."; @@ -61,6 +61,7 @@ L_Try_Cage: set $@FIGHT_YETI_WAVE, 0; set $@YETI_COUNT, 0; set $@FIGHT_YETI_PLAYER_COUNT, getareausers("031-3.gat", 80, 20, 160, 90); + areamonster "031-3.gat", 80, 20, 160, 90, "", 1072, 1, "Cindy::onPetDeath"; startnpctimer; goto L_Exit; @@ -147,6 +148,28 @@ L_NextWave: set $@YETI_COUNT, $@YETI_COUNT + $@FIGHT_YETI_NUMBER; areamonster "031-3.gat", 80, 20, 160, 90, "", 1072, $@FIGHT_YETI_NUMBER, "Cindy::onPetDeath"; + + 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 carful! 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; + // mapannounce "031-3.gat", "WAVE: " + $@FIGHT_YETI_WAVE + " NUMBER OF YETIS SPAWNED: " + $@FIGHT_YETI_NUMBER + " TOTAL YETIS: " + $@YETI_COUNT, 0; goto L_Return_1; |