Skip to content

bodyswap: minor adjustments #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lethosor merged 1 commit into from
Jun 19, 2018
Merged

bodyswap: minor adjustments #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 15 additions & 18 deletions bodyswap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ local usage = [====[

bodyswap
========
This script allows the player to gain control over a new unit in adventurer mode
whilst simultaneously loosing control over their current character.
This script allows the player to take direct control of any unit present in
adventure mode whilst losing control of their current adventurer.

To specify the target unit, simply select it in the user interface,
such as by opening the unit's status screen or viewing its description
such as by opening the unit's status screen or viewing its description,
and enter "bodyswap" in the DFHack console.

Alternatively, the target unit can be specified by its unit id as shown below.
Expand Down Expand Up @@ -51,9 +51,6 @@ end
function setOldAdvNemFlags(nem)
nem.flags.ACTIVE_ADVENTURER = false
nem.flags.RETIRED_ADVENTURER = true
nem.unit.idle_area.x = nem.unit.pos.x
nem.unit.idle_area.y = nem.unit.pos.y
nem.unit.idle_area.z = nem.unit.pos.z
end

function clearNemesisFromLinkedSites(nem)
Expand Down Expand Up @@ -84,7 +81,8 @@ function swapAdvUnit(newUnit)
qerror('Target unit not specified!')
end

local oldUnit = df.nemesis_record.find(df.global.ui_advmode.player_id).unit
local oldNem = df.nemesis_record.find(df.global.ui_advmode.player_id)
local oldUnit = oldNem.unit
if newUnit == oldUnit then
return
end
Expand Down Expand Up @@ -113,19 +111,18 @@ function swapAdvUnit(newUnit)
qerror("Target unit index not found!")
end

activeUnits[newUnitIndex] = oldUnit
activeUnits[oldUnitIndex] = newUnit

local newNem = dfhack.units.getNemesis(newUnit) or createNemesis(newUnit)
if newNem then
local oldNem = dfhack.units.getNemesis(oldUnit)
if oldNem then
setOldAdvNemFlags(oldNem)
end
setNewAdvNemFlags(newNem)
clearNemesisFromLinkedSites(newNem)
df.global.ui_advmode.player_id = newNem.id
if not newNem then
qerror("Failed to obtain target nemesis!")
end

setOldAdvNemFlags(oldNem)
setNewAdvNemFlags(newNem)
clearNemesisFromLinkedSites(newNem)
df.global.ui_advmode.player_id = newNem.id
activeUnits[newUnitIndex] = oldUnit
activeUnits[oldUnitIndex] = newUnit
oldUnit.idle_area:assign(oldUnit.pos)
end

if not dfhack_flags.module then
Expand Down