Merge pull request #1322 from myk002/myk_makeown_jobs

[makeown] cancel hostile jobs

changelog.txt

@@ -35,6 +35,7 @@ Template for new versions:
 ## Fixes
 - `gui/quickfort`: only print a help blueprint's text once even if the repeat setting is enabled
 - `makeown`: quell any active enemy or conflict relationships with converted creatures
+- `makeown`: halt any hostile jobs the unit may be engaged in, like kidnapping
 - `fix/loyaltycascade`: allow the fix to work on non-dwarven citizens
 - `control-panel`: fix setting numeric preferences from the commandline
 

makeown.lua

@@ -100,6 +100,17 @@ local function sanitize_profession(prof)
     return prof_map[prof] or prof
 end
 
+local hostile_jobs = utils.invert{
+    df.job_type.Kidnap,
+    df.job_type.HeistItem,
+    df.job_type.AcceptHeistItem,
+}
+
+local function cancel_hostile_jobs(job)
+    if not job or not hostile_jobs[job.job_type] then return end
+    dfhack.job.removeJob(job)
+end
+
 local function fix_unit(unit)
     unit.flags1.marauder = false;
     unit.flags1.merchant = false;
@@ -151,6 +162,8 @@ local function fix_unit(unit)
     end
 
     clear_enemy_status(unit)
+
+    cancel_hostile_jobs(unit.job.current_job)
 end
 
 local function add_to_entity(hf, eid)