From 48be8ad18688d6bba32bd07d663c4cc83c227927 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 29 Apr 2019 09:34:15 -0300 Subject: Colonel and Lieutenant now use the new siege functions, too Pipelines, how are we? --- npc/012-1/guards.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'npc/012-1') diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt index 491492220..6c7b16d94 100644 --- a/npc/012-1/guards.txt +++ b/npc/012-1/guards.txt @@ -639,14 +639,12 @@ OnManaGhostDeath: OnLieutenantDeath: getitem StrangeCoin, 1; - Karma=Karma+1; mapannounce("012-1", l("##2The Monster Lieutenant was defeated by @@!", strcharinfo(0)), bc_map); $MK_TEMPVAR+=1; end; OnColonelDeath: - getitem StrangeCoin, 1; - Karma=Karma+1; + getitem StrangeCoin, 5; $MOST_HEROIC$=strcharinfo(0); mapannounce("012-1", l("##2The Monster Colonel was defeated by @@!", strcharinfo(0)), bc_map); $MK_TEMPVAR+=10; @@ -711,13 +709,18 @@ OnTimer60000: OnTimer120000: 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); - areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Monster Colonel"), 1036, 1, "#HurnscaldSiege::OnColonelDeath"); } 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); - areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Monster Lieutenant"), 1077, 1, "#HurnscaldSiege::OnLieutenantDeath"); } + + // Clear $@SIEGE_TMPMOBS + siege_selectmob(siege_calcdiff("012-1"), $@SIEGE_HURNS, TP_HURNS); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 15); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death"); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, GreenSlime), 1085, 10, "#HurnscaldSiege::OnGreenSlimeDeath"); -- cgit v1.2.3-60-g2f50