FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ops

Browse Source
This commit is contained in:
Frank 2020-09-09 00:02:46 +02:00
parent edb0032118
commit d5c4c34759
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Ops/ArmyGroup.lua
View File

@ -69,6 +69,8 @@ function ARMYGROUP:New(GroupName)
self:SetDefaultAlarmstate()
self:SetDetection()
self:SetPatrolAdInfinitum(false)
--self:AddWeaponRange(10, 32)
-- Add FSM transitions.
-- From State --> Event --> To State

41
Moose Development/Moose/Ops/OpsGroup.lua
View File

@ -511,9 +511,9 @@ function OPSGROUP:GetWeaponData(BitType)
BitType=BitType or ENUMS.WeaponFlag.Auto
if self.weaponData[BitType] then
return self.wself.weaponData[BitType]
return self.weaponData[BitType]
else
return self.wself.weaponData[ENUMS.WeaponFlag.Auto]
return self.weaponData[ENUMS.WeaponFlag.Auto]
end
end
@ -2469,18 +2469,35 @@ function OPSGROUP:RouteToMission(mission, delay)
elseif mission.type==AUFTRAG.Type.ARTY then
-- Get weapon range.
local weapondata=self:GetWeaponData(mission.engageWeaponType)
local targetcoord=mission:GetTargetCoordinate()
if weapondata then
local heading=self:GetCoordinate():HeadingTo(targetcoord)
local dist=self:GetCoordinate():Get2DDistance(targetcoord)
if dist>weapondata.RangeMax then
waypointcoord=self:GetCoordinate():Translate(dist-weapondata.RangeMax, heading)
elseif dist<weapondata.RangeMin then
waypointcoord=self:GetCoordinate():Translate(dist-weapondata.RangeMin, heading)
-- Get target coordinate.
local targetcoord=mission:GetTargetCoordinate()
-- Heading to target.
local heading=self:GetCoordinate():HeadingTo(targetcoord)
-- Distance to target.
local dist=self:GetCoordinate():Get2DDistance(targetcoord)
-- Check if we are within range.
if dist>weapondata.RangeMax then
local d=dist-weapondata.RangeMax
d=(1.1)*d
-- New waypoint coord.
waypointcoord=self:GetCoordinate():Translate(d, heading)
elseif dist<weapondata.RangeMin then
local d=dist-weapondata.RangeMin
d=(1.1)*d
-- New waypoint coord.
waypointcoord=self:GetCoordinate():Translate(d, heading)
end
end
end
@ -4638,7 +4655,7 @@ function OPSGROUP:_CheckStuck()
-- Time we are holding.
local holdtime=Tnow-self.stuckTimestamp
if holdtime>=5*60 then
if holdtime>=10*60 then
self:E(self.lid..string.format("WARNING: Group came to an unexpected standstill. Speed=%.1f<%.1f m/s expected for %d sec", speed, ExpectedSpeed, holdtime))