Merge pull request #861 from RosaryMala/transform-unit

Updated transform-unit.lua to try to select the currently selected un…

modtools/transform-unit.lua

@@ -66,9 +66,17 @@ if args.clear then
  return
 end
 
-if not args.unit then
- error 'Specify a unit.'
+local unit
+if args.unit then
+ unit = df.unit.find(tonumber(args.unit))
+else
+ unit = dfhack.gui.getSelectedUnit(true)
+end
+if not unit then
+ error 'Select or specify a valid unit'
+ return
 end
+local unit_id = unit.id
 
 if not args.duration then
  args.duration = 'forever'
@@ -78,11 +86,10 @@ local raceIndex
 local race
 local caste
 if args.untransform then
- local unit = df.unit.find(tonumber(args.unit))
- raceIndex = normalRace[args.unit].race
+ raceIndex = normalRace[unit_id].race
  race = df.creature_raw.find(raceIndex)
- caste = normalRace[args.unit].caste
- normalRace[args.unit] = nil
+ caste = normalRace[unit_id].caste
+ normalRace[unit_id] = nil
 else
  if not args.race or not args.caste then
   error 'Specficy a target form.'
@@ -113,13 +120,12 @@ else
  end
 end
 
-local unit = df.unit.find(tonumber(args.unit))
 local oldRace = unit.enemy.normal_race
 local oldCaste = unit.enemy.normal_caste
 if args.setPrevRace then
- normalRace[args.unit] = {}
- normalRace[args.unit].race = oldRace
- normalRace[args.unit].caste = oldCaste
+ normalRace[unit_id] = {}
+ normalRace[unit_id].race = oldRace
+ normalRace[unit_id].caste = oldCaste
 end
 transform(unit,raceIndex,caste,args.setPrevRace)