diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-04-29 09:51:25 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-04-29 09:51:25 -0300 |
| commit | 7b1f6f59b0781188c967b896a62c6ecc05df84e4 (patch) | |
| tree | 721f458678fff29eb11cac4b5c5f07d4dbd69ba1 | |
| parent | 597c464873405244d5b2d00e46532b0cff93a5c3 (diff) | |
| download | serverdata-7b1f6f59b0781188c967b896a62c6ecc05df84e4.tar.gz serverdata-7b1f6f59b0781188c967b896a62c6ecc05df84e4.tar.bz2 serverdata-7b1f6f59b0781188c967b896a62c6ecc05df84e4.tar.xz serverdata-7b1f6f59b0781188c967b896a62c6ecc05df84e4.zip | |
Fix pipeline and other minor improvements
| -rw-r--r-- | npc/012-1/guards.txt | 3 | ||||
| -rw-r--r-- | npc/functions/siege.txt | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt index c9db38be7..449ae0dc0 100644 --- a/npc/012-1/guards.txt +++ b/npc/012-1/guards.txt @@ -655,7 +655,7 @@ OnMKSiege: addmapmask "014-3", MASK_MATTACK; changemusic "012-1", any("mythica.ogg", "eric_matyas_ghouls.ogg", "misuse.ogg", "Arabesque.ogg"); disablenpc("Mana Stone"); - $@SIEGE_HURNS=rand(0,10); + $@SIEGE_HURNS=rand(1,10); pvpon("012-1"); pvpon("014-3"); announce(("##1WARNING! WARNING! Siege starting at Hurnscald!!"), bc_all); @@ -737,6 +737,7 @@ OnTimer180000: end; OnTimer240000: + debugmes "24k"; areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 25); 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, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath"); diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt index 72566549e..9149cfaa4 100644 --- a/npc/functions/siege.txt +++ b/npc/functions/siege.txt @@ -26,25 +26,26 @@ function script siege_calcdiff { .@highest=getarg(1, false); .@c = getunits(BL_PC, .@players, false, getarg(0)); for (.@i = 0; .@i < .@c; .@i++) { - .@b=;readparam(BaseLevel, .@players[.@i]) + .@b=readparam(BaseLevel, .@players[.@i]); .@bsum+=.@b; if (.@b > .@highest) .@highest=.@b; } + debugmes "calcdiff: Total %d Average %d Highest %d", .@bsum, (.@bsum/.@c), .@highest; if (getarg(1,false)) return .@highest; else return (.@bsum/.@c); } -// push to $@SIEGE_TMPMOBS the <mobID> if their level is within a 20 level range +// push to $@SIEGE_TMPMOBS the <mobID> if their level is within a 15 levels range // above or below <level> // siege_push ( mobID, level ) function script siege_push { .@mi=getarg(0); .@lv=getarg(1,0); - if (is_between(.@lv-20, .@lv+20, atoi(strmobinfo(3, .@mi)) ) ) + if ( is_between(.@lv-15, .@lv+15, strmobinfo(3, .@mi)) ) array_push($@SIEGE_TMPMOBS, .@mi); return; } |