diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-07-28 06:05:56 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-07-28 06:05:56 -0300 |
| commit | 1f4a951d85e0ff8984f4f050e8d53a1145d97263 (patch) | |
| tree | dfb913e3b91563ab30b80c4f42a48ed5ad593d66 | |
| parent | fa607ca9ec76959cb490204ba2028a93d5814b3c (diff) | |
| download | serverdata-1f4a951d85e0ff8984f4f050e8d53a1145d97263.tar.gz serverdata-1f4a951d85e0ff8984f4f050e8d53a1145d97263.tar.bz2 serverdata-1f4a951d85e0ff8984f4f050e8d53a1145d97263.tar.xz serverdata-1f4a951d85e0ff8984f4f050e8d53a1145d97263.zip | |
When resigning office, your automatic application will be canceled as well
| -rw-r--r-- | npc/craft/tweak.txt | 2 | ||||
| -rw-r--r-- | npc/functions/politics.txt | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/npc/craft/tweak.txt b/npc/craft/tweak.txt index 131f34872..971f731b5 100644 --- a/npc/craft/tweak.txt +++ b/npc/craft/tweak.txt @@ -73,6 +73,8 @@ function script SmithTweakSystem { return false; } + // FIXME Skip equipped items + // If the item have no bonuses - fail setarray .@AlwaysTweaks, 65535, BlacksmithAxe, Dustynator, Lightbringer, DemureAxe, Tyranny, Runestaff, AegisShield, diff --git a/npc/functions/politics.txt b/npc/functions/politics.txt index b97cdfb12..269f8cd5c 100644 --- a/npc/functions/politics.txt +++ b/npc/functions/politics.txt @@ -470,6 +470,10 @@ function script POL_Manage { next; if (askyesno() == ASK_YES) { setd(.@town$+"_MAYOR$", "Jesus Saves"); + // If you have already received a vote, this will be skipped + if (!getd(.@town$+"_VOTES[0]") && + getd(.@town$+"_CANDIDATE$[0]") == strcharinfo(0)) + setd(.@town$+"_CANDIDATE$[0]", "Jesus Saves")); mesc l("YOU HAVE RESIGNED THE OFFICE."), 1; close; } |