From b5db91cfc1e49aaed06437a0709c8a3c782958bb Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Thu, 23 May 2019 22:53:07 -0300
Subject: Several bugfix-degree changes

---
 npc/functions/siege.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'npc/functions/siege.txt')

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;
-- 
cgit v1.2.3-60-g2f50