summaryrefslogtreecommitdiff
path: root/plugins/tweak.cpp
diff options
context:
space:
mode:
authorRobert Heinrich2012-04-14 19:06:03 +0200
committerRobert Heinrich2012-04-14 19:06:03 +0200
commit9f95e67c7575cca9495062eb275ee99a590e41cb (patch)
treecdb88342342c1469cf60334109b72bfbb52b6b0d /plugins/tweak.cpp
parent2100a95ad546ad0d4c85483e96357924c05c8b51 (diff)
downloaddfhack-9f95e67c7575cca9495062eb275ee99a590e41cb.tar.gz
dfhack-9f95e67c7575cca9495062eb275ee99a590e41cb.tar.bz2
dfhack-9f95e67c7575cca9495062eb275ee99a590e41cb.tar.xz
tweak makeown: converts MERCHANT to TRADER (otherwise you can't assign jobs to kidnapped merchants.
zone: fixed a bug which could lead to units being assigned to more than one cage and/or accidentally marked for slaughter
Diffstat (limited to 'plugins/tweak.cpp')
-rw-r--r--plugins/tweak.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/tweak.cpp b/plugins/tweak.cpp
index 4c100cc4..31969bde 100644
--- a/plugins/tweak.cpp
+++ b/plugins/tweak.cpp
@@ -227,6 +227,10 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
unit->flags1.bits.forest = 0;
if(unit->civ_id != df::global::ui->civ_id)
unit->civ_id = df::global::ui->civ_id;
+ if(unit->profession == df::profession::MERCHANT)
+ unit->profession = df::profession::TRADER;
+ if(unit->profession2 == df::profession::MERCHANT)
+ unit->profession2 = df::profession::TRADER;
return fix_clothing_ownership(out, unit);
}
else