Merge pull request DFHack#1107 from myk002/myk-res

reinstate resurrect-adv

Author: myk002

changelog.txt

@@ -34,6 +34,7 @@ Template for new versions:
 - `fix/engravings`: fix corrupt engraving tiles
 - `unretire-anyone`: (reinstated) choose anybody in the world as an adventurer
 - `reveal-adv-map`: (reinstated) reveal (or hide) the adventure map
+- `resurrect-adv`: (reinstated) allow your adventurer to recover from death
 
 ## New Features
 - `instruments`: new subcommand ``instruments order`` for creating instrument work orders

docs/resurrect-adv.rst

@@ -3,7 +3,7 @@ resurrect-adv
 
 .. dfhack-tool::
     :summary: Bring a dead adventurer back to life.
-    :tags: unavailable
+    :tags: adventure armok units
 
 Have you ever died, but wish you hadn't? This tool can help : ) When you see the
 "You are deceased" message, run this command to be resurrected and fully healed.

full-heal.lua

@@ -1,6 +1,3 @@
--- Attempts to fully heal the selected unit
---author Kurik Amudnil, Urist DaVinci
---edited by expwnent and AtomicChicken
 --@ module = true
 
 local utils = require('utils')
@@ -45,7 +42,7 @@ function addResurrectionEvent(histFigID)
     df.global.hist_event_next_id = df.global.hist_event_next_id + 1
 end
 
-function heal(unit,resurrect,keep_corpse)
+function heal(unit, resurrect, keep_corpse)
     if not unit then
         return
     end

resurrect-adv.lua

@@ -1,31 +1,16 @@
--- Bring your adventurer back to life.
--- author: Atomic Chicken
--- essentially a wrapper for "full-heal.lua"
-
---[====[
-
-resurrect-adv
-=============
-Brings a dead adventurer back to life, fully healing them
-in the process.
-
-This script only targets the current player character in
-your party, and should be run after being presented with
-the "You are deceased" message. It is not possible to
-resurrect the adventurer after the game has been ended.
-
-]====]
-
 local fullHeal = reqscript('full-heal')
 
-if df.global.gamemode ~= df.game_mode.ADVENTURE then
-  qerror("This script can only be used in adventure mode!")
+if not dfhack.world.isAdventureMode() then
+    qerror("This script can only be used in adventure mode!")
 end
 
-local adventurer = df.nemesis_record.find(df.global.adventure.player_id).unit
+local adventurer = dfhack.world.getAdventurer()
 if not adventurer or not adventurer.flags2.killed then
-  qerror("Your adventurer hasn't died yet!")
+    qerror("Your adventurer hasn't died yet!")
 end
 
 fullHeal.heal(adventurer, true)
-df.global.adventure.player_control_state = 1 -- this ensures that the player will be able to regain control of their unit after resurrection if the script is run before hitting DONE at the "You are deceased" message
+
+-- this ensures that the player will be able to regain control of their unit after
+-- resurrection if the script is run before hitting DONE at the "You are deceased" message
+df.global.adventure.player_control_state = 1