summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-05-23 22:53:07 -0300
committerJesusaves <cpntb1@ymail.com>2019-05-23 22:53:07 -0300
commitb5db91cfc1e49aaed06437a0709c8a3c782958bb (patch)
tree8faed70767f02b498cea9cc0869fcc42bc108fc7
parentc55cdb412c4b7e652e569c30911eb423815b6195 (diff)
downloadserverdata-b5db91cfc1e49aaed06437a0709c8a3c782958bb.tar.gz
serverdata-b5db91cfc1e49aaed06437a0709c8a3c782958bb.tar.bz2
serverdata-b5db91cfc1e49aaed06437a0709c8a3c782958bb.tar.xz
serverdata-b5db91cfc1e49aaed06437a0709c8a3c782958bb.zip
Several bugfix-degree changes
-rw-r--r--npc/001-1/portal.txt1
-rw-r--r--npc/functions/siege.txt20
2 files changed, 11 insertions, 10 deletions
diff --git a/npc/001-1/portal.txt b/npc/001-1/portal.txt
index 6493b56e2..6e8dceb09 100644
--- a/npc/001-1/portal.txt
+++ b/npc/001-1/portal.txt
@@ -69,6 +69,7 @@ L_TranslationFix:
mes l("Come, my minions! Lay siege to towns! LEAVE NO OPPOSITION TO ME!");
mes l("Burn, destroy, do whatever you need, until your last breath, my lieutenants and colonels!");
mes l("Summoned Monster");
+ mes l("Scout");
mes l("sample");
close;
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 9d6b479d7..1522549fb 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -255,20 +255,20 @@ function script siege_boss {
// Nobody is on map: Be TRULY random
if (.@val < 10) {
- .@val=rand(20,100);
+ .@val=rand(20,97);
}
- // Switch an adequate boss
- if (.@val < 20) {
+ // Switch an adequate boss, almost always stronger
+ if (.@val <= 20) {
.@mobId=MonsterSergeant;
.@ts$="Sergeant";
- } else if (.@val < 40) {
+ } else if (.@val <= 40) {
.@mobId=MonsterLieutenant;
.@ts$="Lieutenant";
- } else if (.@val < 60) {
+ } else if (.@val <= 60) {
.@mobId=MonsterCaptain;
.@ts$="Captain";
- } else if (.@val < 80) {
+ } else if (.@val <= 80) {
.@mobId=MonsterColonel;
.@ts$="Colonel";
} else {
@@ -285,7 +285,7 @@ function script siege_boss {
.@ym=.@ym+rand(-1,1);
// Announce and spawn
- .@mGID=monster(.@m$, .@xm, .@ym, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
+ .@mg=monster(.@m$, .@xm, .@ym, strmobinfo(1, .@mobId), .@mobId, 1, "#SiegeCtrl::On"+.@ts$+"Death");
// Boost the boss stats based on difficulty and nÂș of players online
.@bhp=getunitdata(.@mGID, UDT_MAXHP);
@@ -406,11 +406,11 @@ function script do_siege {
siege_cast(.@m$, .@n$, getd("$@SIEGE_"+.@c$), .@tp);
break;
// Ending flow
- case 700:
- mapannounce("012-1", "##1The Monster Army is preparing the retreat in about one minute!", bc_map);
+ case (MK_SIEGE_DURATION-90):
+ mapannounce("012-1", "##1The Monster Army is planning to retreat soon!", bc_map);
siege_cast(.@m$, .@n$, getd("$@SIEGE_"+.@c$), .@tp);
break;
- case 760:
+ case (MK_SIEGE_DURATION-30):
mapannounce("012-1", "##1The Monster Army is withdrawing within 30 seconds!", bc_map);
$@MK_SCENE=MK_NONE;
$@MK_AGGRO=$@MK_AGGRO/20;