weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #910 from FlightControl-Master/FF/Develop

Browse Source 
ARTY v0.95
This commit is contained in:
Frank 2018-05-28 17:09:20 +02:00 committed by GitHub
commit d4fead8294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Moose Development/Moose/Functional/Artillery.lua
View File

@ -404,7 +404,7 @@ ARTY.id="ARTY | "
--- Arty script version. --- Arty script version.
-- @field #string version -- @field #string version
ARTY.version="0.9.4" ARTY.version="0.9.5"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@ -1284,6 +1284,7 @@ function ARTY:_OnEventShot(EventData)
-- Check if number of shots reached max. -- Check if number of shots reached max.
local _ceasefire=false local _ceasefire=false
local _relocate=false
if self.Nshots >= self.currentTarget.nshells then if self.Nshots >= self.currentTarget.nshells then
local text=string.format("Group %s stop firing on target %s.", self.Controllable:GetName(), self.currentTarget.name) local text=string.format("Group %s stop firing on target %s.", self.Controllable:GetName(), self.currentTarget.name)
self:T(ARTY.id..text) self:T(ARTY.id..text)
@ -1291,6 +1292,10 @@ function ARTY:_OnEventShot(EventData)
-- Cease fire. -- Cease fire.
_ceasefire=true _ceasefire=true
if self.relocateafterfire then
_relocate=true
end
end end
-- Check if we are (partly) out of ammo. -- Check if we are (partly) out of ammo.
@ -1310,7 +1315,7 @@ function ARTY:_OnEventShot(EventData)
end end
-- Relocate position -- Relocate position
if self.Nshots >= self.currentTarget.nshells and self.relocateafterfire then if _relocate then
self:_Relocate() self:_Relocate()
end end
@ -2078,7 +2083,7 @@ function ARTY:_Relocate()
end end
until _gotit or _n>_nmax until _gotit or _n>_nmax
-- Assign relocation -- Assign relocation.
if _gotit then if _gotit then
self:AssignMoveCoord(_new, nil, nil, false, false) self:AssignMoveCoord(_new, nil, nil, false, false)
end end