diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua index 54cd4635a..c3de86af6 100644 --- a/Moose Development/Moose/Functional/Artillery.lua +++ b/Moose Development/Moose/Functional/Artillery.lua @@ -675,7 +675,7 @@ ARTY.id="ARTY | " --- Arty script version. -- @field #string version -ARTY.version="1.0.5" +ARTY.version="1.0.6" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -1189,7 +1189,14 @@ function ARTY:AssignTargetCoord(coord, prio, radius, nshells, maxengage, time, w end -- Time in seconds. - local _time=self:_ClockToSeconds(time) + local _time + if type(time)=="string" then + _time=self:_ClockToSeconds(time) + elseif type(time)=="number" then + _time=timer.getAbsTime()+time + else + _time=timer.getAbsTime() + end -- Prepare target array. local _target={name=_name, coord=coord, radius=radius, nshells=nshells, engaged=0, underfire=false, prio=prio, maxengage=maxengage, time=_time, weapontype=weapontype} @@ -1240,9 +1247,6 @@ function ARTY:AssignMoveCoord(coord, time, speed, onroad, cancel, name, unique) return nil end - -- Default is current time if no time was specified. - time=time or self:_SecondsToClock(timer.getAbsTime()) - -- Set speed. if speed then -- Make sure, given speed is less than max physiaclly possible speed of group. @@ -1264,7 +1268,14 @@ function ARTY:AssignMoveCoord(coord, time, speed, onroad, cancel, name, unique) end -- Time in seconds. - local _time=self:_ClockToSeconds(time) + local _time + if type(time)=="string" then + _time=self:_ClockToSeconds(time) + elseif type(time)=="number" then + _time=timer.getAbsTime()+time + else + _time=timer.getAbsTime() + end -- Prepare move array. local _move={name=_name, coord=coord, time=_time, speed=speed, onroad=onroad, cancel=cancel}