migrate users of teleport to dfhack.units.teleport

myk002 · myk002 · commit 97da3a82adb4 · 2021-06-08T22:19:56.000-07:00
diff --git a/deep-embark.lua b/deep-embark.lua
@@ -53,7 +53,6 @@ Usage::
 ]====]
 
 local utils = require 'utils'
-local teleport = reqscript("teleport").teleport
 
 function getFeatureID(cavernType)
   local features = df.global.world.features
@@ -220,7 +219,7 @@ function moveEmbarkStuff(selectedBlock, embarkTiles)
   for i, unit in ipairs(unitsAtSpawn) do
     if unit.civ_id == df.global.ui.civ_id and not unit.flags1.inactive and not unit.flags2.killed then
       local pos = embarkTiles[math.random(1, #embarkTiles)]
-      teleport(unit, pos)
+      dfhack.units.teleport(unit, pos)
       reveal(pos)
       movedUnit = true
     end
diff --git a/flashstep.lua b/flashstep.lua
@@ -7,14 +7,12 @@ A hotkey-friendly teleport that places your adventurer where your cursor is.
 
 ]====]
 
-local teleport = reqscript("teleport").teleport
-
 function flashstep()
     local unit = df.global.world.units.active[0]
     if df.global.ui_advmode.menu ~= df.ui_advmode_menu.Look then
         qerror("No [l] cursor located! You kinda need it for this script.")
     end
-    teleport(unit, xyz2pos(pos2xyz(df.global.cursor)))
+    dfhack.units.teleport(unit, xyz2pos(pos2xyz(df.global.cursor)))
     dfhack.maps.getTileBlock(unit.pos).designation[unit.pos.x%16][unit.pos.y%16].hidden = false
 end
 
diff --git a/gui/teleport.lua b/gui/teleport.lua
@@ -11,7 +11,6 @@ using the in-game cursor.
 ]====]
 
 guidm = require 'gui.dwarfmode'
-teleport = reqscript 'teleport'
 widgets = require 'gui.widgets'
 
 function uiMultipleUnits()
@@ -67,7 +66,7 @@ function TeleportSidebar:choose()
         self.in_pick_pos = true
         df.global.ui.main.mode = df.ui_sidebar_mode.LookAround
     else
-        teleport.teleport(self.unit, xyz2pos(pos2xyz(df.global.cursor)))
+        dfhack.units.teleport(self.unit, xyz2pos(pos2xyz(df.global.cursor)))
         self:dismiss()
     end
 end
