diff options
| -rw-r--r-- | npc/craft/tweak.txt | 2 | ||||
| -rw-r--r-- | npc/functions/gmbot.txt | 2 |
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. |