summaryrefslogtreecommitdiff
path: root/npc/012-1
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-04-29 10:41:52 -0300
committerJesusaves <cpntb1@ymail.com>2019-04-29 10:41:52 -0300
commite6b4e0f1f88c63844a5b10c2d54ea9ddad8d50a5 (patch)
tree2af82a65464d95bd7ba8076624e57312fbdd200b /npc/012-1
parent3ed73e0a0b424ca5b2b8491f365bf601e34220f9 (diff)
downloadserverdata-e6b4e0f1f88c63844a5b10c2d54ea9ddad8d50a5.tar.gz
serverdata-e6b4e0f1f88c63844a5b10c2d54ea9ddad8d50a5.tar.bz2
serverdata-e6b4e0f1f88c63844a5b10c2d54ea9ddad8d50a5.tar.xz
serverdata-e6b4e0f1f88c63844a5b10c2d54ea9ddad8d50a5.zip
Okay, it works now
Diffstat (limited to 'npc/012-1')
-rw-r--r--npc/012-1/guards.txt34
1 files changed, 23 insertions, 11 deletions
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 1c1735bbf..8c3cc3f7a 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -708,16 +708,28 @@ OnTimer30000:
OnTimer60000:
debugmes "12k";
- if ($@SIEGE_HURNS >= 5) {
- siege_selectmob(siege_calcdiff("012-1", 80), $@SIEGE_HURNS);
- siege_spawn("012-1", any_of($@SIEGE_TMPMOBS), 1+$@SIEGE_HURNS, "#HurnscaldSiege::OnColonelDeath");
- mapannounce("012-1", "##1The Monster Colonel arrived!", bc_map);
- }
- else if ($@SIEGE_HURNS >= 1) {
- siege_selectmob(siege_calcdiff("012-1", 40), $@SIEGE_HURNS);
- siege_spawn("012-1", any_of($@SIEGE_TMPMOBS), 1+$@SIEGE_HURNS, "#HurnscaldSiege::OnLieutenantDeath");
- mapannounce("012-1", "##1The Monster Lieutenant arrived!", bc_map);
- }
+
+ // Setup the lieutenant/colonel level and event/designation
+ // It'll be 40 + Siege*5, meaning the cap is 90.
+ .@val=40+($@SIEGE_HURNS*5);
+ if (.@val > 100)
+ .@val=100;
+ if (.@val >= 80)
+ .@ts$="Colonel";
+ else
+ .@ts$="Lieutenant";
+
+ // Select a type for them (saved as .@mobId)
+ siege_selectmob(siege_calcdiff("012-1", .@val), $@SIEGE_HURNS);
+ array_remove($@SIEGE_TMPMOBS, Bif);
+ array_remove($@SIEGE_TMPMOBS, CandiedSlime);
+ array_remove($@SIEGE_TMPMOBS, ManaGhost);
+ array_remove($@SIEGE_TMPMOBS, SlimeBlast);
+ .@mobId=any_of($@SIEGE_TMPMOBS);
+
+ // Announce and spawn
+ siege_spawn("012-1", .@mobId, 1, "#HurnscaldSiege::On"+.@ts$+"Death");
+ mapannounce("012-1", "##1The Monster "+.@ts$+" arrived! It is a "+strmobinfo(1, any_of($@SIEGE_TMPMOBS)), bc_map);
// Clear $@SIEGE_TMPMOBS
siege_selectmob(siege_calcdiff("012-1"), $@SIEGE_HURNS, TP_HURNS);
@@ -767,7 +779,7 @@ OnTimer600000:
$@MK_AGGRO=$@MK_AGGRO/20;
mapannounce("012-1", "##1The Monster King army is preparing to withdraw!", bc_map);
end;
-OnTimer630000:
+OnTimer150000:
removemapmask "012-1", MASK_MATTACK;
removemapmask "014-3", MASK_MATTACK;
changemusic "012-1", "caketown.ogg"; // Restore to default