convert usage of units.active[0] to getAdventurer()

myk002 · myk002 · commit d1285c3cc42e · 2024-05-17T09:30:42.000-07:00
diff --git a/break-dance.lua b/break-dance.lua
@@ -9,7 +9,7 @@ can't find a partner.
 ]====]
 local unit
 if dfhack.world.isAdventureMode() then
-    unit = df.global.world.units.active[0]
+    unit = dfhack.world.getAdventurer()
 else
     unit = dfhack.gui.getSelectedUnit(true) or qerror('No unit selected')
 end
diff --git a/cannibalism.lua b/cannibalism.lua
@@ -10,7 +10,7 @@ if df.viewscreen_itemst:is_instance(scrn) then
 elseif df.viewscreen_dungeon_monsterstatusst:is_instance(scrn) then
     unmark_inventory(scrn.inventory) --hint:df.viewscreen_dungeon_monsterstatusst
 elseif df.global.adventure.menu == df.ui_advmode_menu.Inventory then
-    unmark_inventory(df.global.world.units.active[0].inventory)
+    unmark_inventory(dfhack.world.getAdventurer().inventory)
 else
     qerror('Unsupported context')
 end
diff --git a/gui/companion-order.lua b/gui/companion-order.lua
@@ -346,14 +346,14 @@ end},
     return true
 end},
 {name="follow",f=function (unit_list)
-    local adv=df.global.world.units.active[0]
+    local adv=dfhack.world.getAdventurer()
     for k,v in pairs(unit_list) do
         v.relationship_ids.GroupLeader=adv.id
     end
     return true
 end},
 {name="leave",f=function (unit_list)
-    local adv=df.global.world.units.active[0]
+    local adv=dfhack.world.getAdventurer()
     local t_nem=dfhack.units.getNemesis(adv)
     for k,v in pairs(unit_list) do
 
@@ -398,7 +398,7 @@ end},
     if not CheckCursor(pos) then
         return false
     end
-    adv=df.global.world.units.active[0]
+    adv=dfhack.world.getAdventurer()
     item=GetItemsAtPos(df.global.cursor)[1]
     print(item.id)
     for k,v in pairs(unit_list) do
@@ -413,7 +413,7 @@ end},
 }
 
 function getCompanions(unit)
-    unit=unit or df.global.world.units.active[0]
+    unit=unit or dfhack.world.getAdventurer()
     local t_nem=dfhack.units.getNemesis(unit)
     if t_nem==nil then
         qerror("Invalid unit! No nemesis record")
diff --git a/launch.lua b/launch.lua
@@ -65,9 +65,11 @@ function launch(unitSource,unitRider)
     proj.speed_x=resultx*10000
     proj.speed_y=resulty*10000
     proj.speed_z=resultz*15000 --higher z speed makes it easier to reach a target safely
-    if df.global.world.units.active[0].job.hunt_target==nil then
+
+    local adv = dfhack.world.getAdventurer()
+    if adv.job.hunt_target==nil then
         proj.flags.safe_landing=true
-    elseif df.global.world.units.active[0].job.hunt_target then
+    elseif adv.job.hunt_target then
         proj.flags.safe_landing=false
     end
     local unitoccupancy = dfhack.maps.ensureTileBlock(unitSource.pos).occupancy[unitSource.pos.x%16][unitSource.pos.y%16]
@@ -80,11 +82,11 @@ function launch(unitSource,unitRider)
     unitSource.flags1.on_ground=false
 end
 
-local unitSource = df.global.world.units.active[0]
+local unitSource = dfhack.world.getAdventurer()
 local unitRider = nil --as:df.unit
 if unitSource.job.hunt_target ~= nil then
     unitRider = unitSource
-    unitSource = df.global.world.units.active[0].job.hunt_target
+    unitSource = unitSource.job.hunt_target
     unitSource.general_refs:insert("#",{new=df.general_ref_unit_riderst,unit_id=unitRider.id})
     unitRider.relationship_ids.RiderMount=unitSource.id
     unitRider.flags1.rider=true
