summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-09-08 00:43:16 -0300
committerJesusaves <cpntb1@ymail.com>2019-09-08 00:43:16 -0300
commit999a639c2d6240cc85886bee96114ddfdc443de6 (patch)
treea98b122f455de6f65f0c37d4f17f2e93df5d3d1a
parent5ab73e06e91b77411326d6458d713e79e799eff0 (diff)
downloadserverdata-999a639c2d6240cc85886bee96114ddfdc443de6.tar.gz
serverdata-999a639c2d6240cc85886bee96114ddfdc443de6.tar.bz2
serverdata-999a639c2d6240cc85886bee96114ddfdc443de6.tar.xz
serverdata-999a639c2d6240cc85886bee96114ddfdc443de6.zip
When siege stage is over (and MK is making both sieges as personal spawns),
require 500 aggro to begin a siege (instead of 300)
-rw-r--r--npc/craft/tweak.txt2
-rw-r--r--npc/functions/gmbot.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/craft/tweak.txt b/npc/craft/tweak.txt
index e1a8811fe..c79949758 100644
--- a/npc/craft/tweak.txt
+++ b/npc/craft/tweak.txt
@@ -58,7 +58,7 @@ function script SmithTweakSystem {
return false;
// If the item have no bonuses - fail
- if (getitemoptionidbyindex(.@id, 0) <= 0) {
+ if (getitemoptionidbyindex(.@id, 0) <= 0 && !is_master()) {
mesc l("This item have no bonuses, and cannot be tweaked."), 1;
return false;
}
diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index b04c40002..deed0ae33 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -147,7 +147,7 @@ OnTimer90000:
}
// Siege events (req. 300 aggro, 3 users, and 70% chances to begin)
- if ($@MK_AGGRO >= 300 && .users >= 3 && rand(0,100) < 70 &&
+ if ($@MK_AGGRO >= ($GAME_STORYLINE == 2 ? 300 : 500) && .users >= 3 && rand(0,100) < 70 &&
is_between(1, 3, $GAME_STORYLINE) && $@MK_THROTTLE < gettimetick(2)){
// Delta handles the compulsory wait time between waves.
// 6 hours normally, 12 hours if the army is in disarray.