summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/craft/tweak.txt2
-rw-r--r--npc/functions/politics.txt4
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;
}