From 1f4a951d85e0ff8984f4f050e8d53a1145d97263 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 28 Jul 2020 06:05:56 -0300
Subject: When resigning office, your automatic application will be canceled as
 well

---
 npc/craft/tweak.txt        | 2 ++
 npc/functions/politics.txt | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'npc')

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