summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-07-31 15:49:04 -0300
committerJesusaves <cpntb1@ymail.com>2019-07-31 15:49:04 -0300
commit7a513056a9d1ce8898a998d33616497c7d4d9050 (patch)
treefa30a1e04e8821e8f153df3235a67633a39d4206
parent593ba18cd9d549e9b6bc03eea5636e74affc7a7c (diff)
parent6f499d71453a841fca7a243fb8f86f78377337a3 (diff)
downloadserverdata-7a513056a9d1ce8898a998d33616497c7d4d9050.tar.gz
serverdata-7a513056a9d1ce8898a998d33616497c7d4d9050.tar.bz2
serverdata-7a513056a9d1ce8898a998d33616497c7d4d9050.tar.xz
serverdata-7a513056a9d1ce8898a998d33616497c7d4d9050.zip
Merge branch 'master' into testserver
-rw-r--r--npc/boss/throne.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/boss/throne.txt b/npc/boss/throne.txt
index d6f1a7add..dcc601b03 100644
--- a/npc/boss/throne.txt
+++ b/npc/boss/throne.txt
@@ -26,10 +26,10 @@ OnBegin:
// Spawn reinforcements
.@mobId=MonsterLieutenant;
.@ts$="Lieutenant";
- monster("boss", 40, 40, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
- monster("boss", 50, 50, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
- monster("boss", 40, 50, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
- monster("boss", 50, 40, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
+ monster("boss", 40, 40, strmobinfo(1, .@mobId), .@mobId, 1);
+ monster("boss", 50, 50, strmobinfo(1, .@mobId), .@mobId, 1);
+ monster("boss", 40, 50, strmobinfo(1, .@mobId), .@mobId, 1);
+ monster("boss", 50, 40, strmobinfo(1, .@mobId), .@mobId, 1);
mapannounce("boss", "Begin!", bc_map|bc_npc);
initnpctimer;
@@ -60,12 +60,12 @@ OnTimer120000:
if (.CYCLES == 5) {
.@mobId=MonsterColonel;
.@ts$="Colonel";
- monster("boss", 45, 44, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
+ monster("boss", 45, 44, strmobinfo(1, .@mobId), .@mobId, 1);
}
if (.CYCLES == 15) {
.@mobId=MonsterGeneral;
.@ts$="General";
- monster("boss", 45, 44, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
+ monster("boss", 45, 44, strmobinfo(1, .@mobId), .@mobId, 1);
}
initnpctimer;
OnTimer15000: