diff options
| -rw-r--r-- | npc/003-1/lieutenantdausen.txt | 6 | ||||
| -rw-r--r-- | npc/012-1/guards.txt | 12 | ||||
| -rw-r--r-- | npc/functions/gmbot.txt | 7 |
3 files changed, 13 insertions, 12 deletions
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index 5c5214eb3..496f25993 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -129,7 +129,7 @@ OnMKSiege: addmapmask "004-1", MASK_MATTACK; changemusic "003-1", any("mythica.ogg", "eric_matyas_ghouls.ogg", "misuse.ogg", "Arabesque.ogg"); disablenpc("Mana Stone"); - $@SIEGE_TULIM=($@MK_AGGRO/30); // Each 30 aggro raises difficulty in 1 + $@SIEGE_TULIM=($@MK_AGGRO/45); // Each 45 aggro raises difficulty in 1 pvpon("003-1"); pvpon("004-1"); announce(("##1WARNING! WARNING! Siege starting at Tulimshar!!"), bc_all); @@ -305,7 +305,7 @@ OnTimer15000: end; OnTimer60000: - if ($@SIEGE_TULIM == 1) { + if ($@SIEGE_TULIM >= 1 && $@SIEGE_TULIM < 5) { mapannounce("003-1", "##1The Monster Lieutenant arrived!", bc_map); areamonster("003-1", 0, 0, 120, 155, ("Monster Lieutenant"), 1077, 1, "Lieutenant Dausen::OnLieutenantDeath"); } @@ -315,7 +315,7 @@ OnTimer60000: end; OnTimer120000: - if ($@SIEGE_TULIM == 5) { + if ($@SIEGE_TULIM >= 5) { mapannounce("003-1", "##1The Monster Colonel arrived!", bc_map); areamonster("003-1", 0, 0, 120, 155, ("Monster Colonel"), 1036, 1, "Lieutenant Dausen::OnColonelDeath"); } diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt index be93bc603..097b229b0 100644 --- a/npc/012-1/guards.txt +++ b/npc/012-1/guards.txt @@ -645,7 +645,7 @@ OnMKSiege: addmapmask "012-3", MASK_MATTACK; changemusic "012-1", any("mythica.ogg", "eric_matyas_ghouls.ogg", "misuse.ogg", "Arabesque.ogg"); disablenpc("Mana Stone"); - $@SIEGE_HURNS=($@MK_AGGRO/30); // Each 30 aggro raises difficulty in 1 + $@SIEGE_TULIM=($@MK_AGGRO/45); // Each 45 aggro raises difficulty in 1 pvpon("012-1"); pvpon("012-3"); announce(("##1WARNING! WARNING! Siege starting at Hurnscald!!"), bc_all); @@ -690,20 +690,20 @@ OnTimer15000: end; OnTimer60000: - if ($@SIEGE_HURNS == 1) { - mapannounce("012-1", "##1The Monster Lieutenant arrived!", bc_map); - areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Monster Lieutenant"), 1077, 1, "#HurnscaldSiege::OnLieutenantDeath"); - } areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Black Scorpion"), BlackScorpion, 3, "#HurnscaldSiege::OnBlackScorpion2Death"); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, GreenSlime), 1085, 10+$@SIEGE_HURNS, "#HurnscaldSiege::OnGreenSlimeDeath"); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, CandiedSlime), 1089, 1+$@SIEGE_HURNS, "#HurnscaldSiege::OnCandiedSlimeDeath"); end; OnTimer120000: - if ($@SIEGE_HURNS == 5) { + if ($@SIEGE_HURNS >= 5) { mapannounce("012-1", "##1The Monster Colonel arrived!", bc_map); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Monster Colonel"), 1036, 1, "#HurnscaldSiege::OnColonelDeath"); } + else if ($@SIEGE_HURNS >= 1) { + mapannounce("012-1", "##1The Monster Lieutenant arrived!", bc_map); + areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Monster Lieutenant"), 1077, 1, "#HurnscaldSiege::OnLieutenantDeath"); + } areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 15); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death"); areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, GreenSlime), 1085, 10, "#HurnscaldSiege::OnGreenSlimeDeath"); diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt index 778796ce2..83a422a79 100644 --- a/npc/functions/gmbot.txt +++ b/npc/functions/gmbot.txt @@ -102,8 +102,8 @@ OnTimer90000: end; } - // Siege events (req. 40 aggro, and 70% chances to begin) - if ($@MK_AGGRO >= 40 && rand(0,100) < 70) { + // Siege events (req. 80 aggro, 3 users, and 70% chances to begin) + if ($@MK_AGGRO >= 80 && .users >= 3 && rand(0,100) < 70) { // Tulimshar if (.mp$ ~= "003-*") { announce ("Monster King: I smell humans! Humans must die!"), bc_map|bc_npc; @@ -119,7 +119,8 @@ OnTimer90000: } // If a player is nearby, MK might randomly make an event for said player - if (.nearby > 1 && $@MK_AGGRO >= rand(0,100)){ + // Of course, this is unlikely, unless we have too few players + if (.nearby > 1 && $@MK_AGGRO >= 120){ // We should decide event kind, but that's NYI announce ("Monster King: I smell humans! Humans must die!"), bc_map|bc_npc; |