Bodyswap Improvements and Additions

bodyswap.lua

@@ -1,27 +1,27 @@
 --@ module = true
-
+local dialogs = require 'gui.dialogs'
 local utils = require 'utils'
-local validArgs = utils.invert({
-    'unit',
-    'help'
-})
-local args = utils.processArgs({ ... }, validArgs)
 
-if args.help then
+local makeown = reqscript('makeown')
+
+local args = {...}
+local command = table.remove(args, 1)
+
+if command == 'help' then
     print(dfhack.script_help())
     return
 end
 
-function setNewAdvNemFlags(nem)
+local function setNewAdvNemFlags(nem)
     nem.flags.ACTIVE_ADVENTURER = true
     nem.flags.ADVENTURER = true
 end
 
-function setOldAdvNemFlags(nem)
+local function setOldAdvNemFlags(nem)
     nem.flags.ACTIVE_ADVENTURER = false
 end
 
-function clearNemesisFromLinkedSites(nem)
+local function clearNemesisFromLinkedSites(nem)
     -- omitting this step results in duplication of the unit entry in df.global.world.units.active when the site to which the historical figure is linked is reloaded with said figure present as a member of the player party
     -- this can be observed as part of the normal recruitment process when the player adds a site-linked historical figure to their party
     if not nem.figure then
@@ -33,15 +33,15 @@ function clearNemesisFromLinkedSites(nem)
     end
 end
 
-function createNemesis(unit)
+local function createNemesis(unit)
     local nemesis = unit:create_nemesis(1, 1)
     nemesis.figure.flags.never_cull = true
     return nemesis
 end
 
-function isPet(nemesis)
+local function isPet(nemesis)
     if nemesis.unit then
-        if nemesis.unit.relationship_ids.Pet ~= -1 then
+        if nemesis.unit.relationship_ids.PetOwner ~= -1 then
             return true
         end
     elseif nemesis.figure then -- in case the unit is offloaded
@@ -54,7 +54,7 @@ function isPet(nemesis)
     return false
 end
 
-function processNemesisParty(nemesis, targetUnitID, alreadyProcessed)
+local function processNemesisParty(nemesis, targetUnitID, alreadyProcessed)
     -- configures the target and any leaders/companions to behave as cohesive adventure mode party members
     local alreadyProcessed = alreadyProcessed or {}
     alreadyProcessed[tostring(nemesis.id)] = true
@@ -66,8 +66,7 @@ function processNemesisParty(nemesis, targetUnitID, alreadyProcessed)
     elseif isPet(nemesis) then -- pets belonging to the target or to their companions
         df.global.adventure.interactions.party_pets:insert('#', nemesis.figure.id)
     else
-        df.global.adventure.interactions.party_core_members:insert('#', nemesis.figure.id) -- placing all non-pet companions into the core party list to enable tactical mode swapping
-        nemesis.flags.ADVENTURER = true
+        df.global.adventure.interactions.party_extra_members:insert('#', nemesis.figure.id) -- placing all non-pet companions into the extra party list
         if nemUnit then                                                                -- check in case the companion is offloaded
             nemUnit.relationship_ids.GroupLeader = targetUnitID
         end
@@ -92,14 +91,21 @@ function processNemesisParty(nemesis, targetUnitID, alreadyProcessed)
     end
 end
 
-function configureAdvParty(targetNemesis)
+local function configureAdvParty(targetNemesis)
     local party = df.global.adventure.interactions
     party.party_core_members:resize(0)
     party.party_pets:resize(0)
     party.party_extra_members:resize(0)
     processNemesisParty(targetNemesis, targetNemesis.unit_id)
 end
 
+-- shamelessly copy pasted from flashstep.lua
+local function reveal_tile(pos)
+    local des = dfhack.maps.getTileFlags(pos)
+    des.hidden = false
+    des.pile = true  -- reveal the tile on the map
+end
+
 function swapAdvUnit(newUnit)
     if not newUnit then
         qerror('Target unit not specified!')
@@ -111,6 +117,9 @@ function swapAdvUnit(newUnit)
         return
     end
 
+    -- Make sure the unit we're swapping into isn't nameless
+    makeown.name_unit(newUnit)
+
     local newNem = dfhack.units.getNemesis(newUnit) or createNemesis(newUnit)
     if not newNem then
         qerror("Failed to obtain target nemesis!")
@@ -122,22 +131,103 @@ function swapAdvUnit(newUnit)
     df.global.adventure.player_id = newNem.id
     df.global.world.units.adv_unit = newUnit
     oldUnit.idle_area:assign(oldUnit.pos)
+    local pos = xyz2pos(dfhack.units.getPosition(newUnit))
+
+    -- reveal the tiles around the bodyswapped unit
+    reveal_tile(xyz2pos(pos.x-1, pos.y-1, pos.z))
+    reveal_tile(xyz2pos(pos.x,   pos.y-1, pos.z))
+    reveal_tile(xyz2pos(pos.x+1, pos.y-1, pos.z))
+    reveal_tile(xyz2pos(pos.x-1, pos.y,   pos.z))
+    reveal_tile(pos)
+    reveal_tile(xyz2pos(pos.x+1, pos.y,   pos.z))
+    reveal_tile(xyz2pos(pos.x-1, pos.y+1, pos.z))
+    reveal_tile(xyz2pos(pos.x,   pos.y+1, pos.z))
+    reveal_tile(xyz2pos(pos.x+1, pos.y+1, pos.z))
+
+    dfhack.gui.revealInDwarfmodeMap(pos, true)
+end
 
-    dfhack.gui.revealInDwarfmodeMap(xyz2pos(dfhack.units.getPosition(newUnit)), true)
+-- shamelessly copy pasted from gui/sitemap.lua
+local function get_unit_choices()
+    local choices = {}
+    for _, unit in ipairs(df.global.world.units.active) do
+        if not dfhack.units.isActive(unit) or
+            dfhack.units.isHidden(unit)
+        then
+            goto continue
+        end
+        local name = dfhack.units.getReadableName(unit)
+        table.insert(choices, {
+            text=name,
+            unit=unit,
+            search_key=dfhack.toSearchNormalized(name),
+        })
+        ::continue::
+    end
+    return choices
+end
+
+local function swapAdvUnitPrompt()
+    local choices = get_unit_choices()
+    dialogs.showListPrompt('bodyswap', "Select a unit to bodyswap to:", COLOR_WHITE,
+        choices, function(id, choice)
+            swapAdvUnit(choice.unit)
+        end, nil, nil, true)
+end
+
+function getHistoricalSlayer(unit)
+    local histFig = unit.hist_figure_id ~= -1 and df.historical_figure.find(unit.hist_figure_id)
+    if not histFig then
+        return
+    end
+
+    local deathEvents = df.global.world.history.events_death
+    for i = #deathEvents - 1, 0, -1 do
+        local event = deathEvents[i] --as:df.history_event_hist_figure_diedst
+        if event.victim_hf == unit.hist_figure_id then
+            return df.historical_figure.find(event.slayer_hf)
+        end
+    end
+end
+
+if command == 'linger' then
+    local adventurer = dfhack.world.getAdventurer()
+    if not adventurer.flags2.killed then
+        qerror("Your adventurer hasn't died yet!")
+    end
+
+    local slayerHistFig = getHistoricalSlayer(adventurer)
+    local slayer = slayerHistFig and df.unit.find(slayerHistFig.unit_id)
+    if not slayer then
+        slayer = df.unit.find(adventurer.relationship_ids.LastAttacker)
+    end
+    if not slayer then
+        qerror("Killer not found!")
+    elseif slayer.flags2.killed then
+        local slayerName = ""
+        if slayer.name.has_name then
+            slayerName = ", " .. dfhack.TranslateName(slayer.name) .. ","
+        end
+        qerror("Your slayer" .. slayerName .. " is dead!")
+    end
+
+    swapAdvUnit(slayer)
+    return
 end
 
 if not dfhack_flags.module then
     if df.global.gamemode ~= df.game_mode.ADVENTURE then
         qerror("This script can only be used in adventure mode!")
     end
 
-    local unit = args.unit and df.unit.find(tonumber(args.unit)) or dfhack.gui.getSelectedUnit()
+    local unit = command == 'unit' and df.unit.find(tonumber(args[1])) or dfhack.gui.getSelectedUnit()
     if not unit then
         print("Enter the following if you require assistance: help bodyswap")
-        if args.unit then
-            qerror("Invalid unit id: " .. args.unit)
+        if command == 'unit' then
+            qerror("Invalid unit id: " .. tonumber(args[1]))
         else
-            qerror("Target unit not specified!")
+            swapAdvUnitPrompt()
+            return
         end
     end
     swapAdvUnit(unit)

changelog.txt

@@ -99,6 +99,7 @@ Template for new versions:
 - `max-wave`: merged into `pop-control`
 - `devel/find-offsets`, `devel/find-twbt`, `devel/prepare-save`: remove development scripts that are no longer useful
 - `fix/item-occupancy`, `fix/tile-occupancy`: merged into `fix/occupancy`
+- `linger`: merged into `bodyswap` as ``bodyswap linger``
 - `adv-fix-sleepers`: renamed to `fix/sleepers`
 - `adv-rumors`: merged into `advtools`
 

docs/bodyswap.rst

@@ -13,16 +13,28 @@ Usage
 
 ::
 
-    bodyswap [--unit <id>]
+    bodyswap [unit <id>]
+    bodyswap linger
 
 If no specific unit id is specified, the target unit is the one selected in the
 user interface, such as by opening the unit's status screen or viewing its
-description.
+description. Otherwise, a valid list of units to bodyswap into will be shown.
+If bodyswapping into an entity that has no historical figure, a new historical figure is created for it.
+If said unit has no name, a new name is randomly generated for it, based on the unit's race.
+If no valid language is found for that race, it will use the DIVINE language.
+
+If you run bodyswap linger, the killer is identified by examining the historical event generated
+when the adventurer died. If this is unsuccessful, the killer is assumed to be the last unit to have
+attacked the adventurer prior to their death.
+
+This will fail if the unit in question is no longer present on the local map or is also dead.
 
 Examples
 --------
 
 ``bodyswap``
-    Takes control of the selected unit.
-``bodyswap --unit 42``
+    Takes control of the selected unit, or brings up a list of swappable units if no unit is selected.
+``bodyswap unit 42``
     Takes control of unit with id 42.
+``bodyswap linger``
+    Takes control of your killer when you die