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

Merge remote-tracking branch 'origin/develop' into branch

Browse Source 
# Conflicts:
#	Moose Development/Moose/Functional/Mantis.lua
#	Moose Development/Moose/Ops/Auftrag.lua
This commit is contained in:
Applevangelist 2024-12-05 10:59:08 +01:00
commit e53f1aa68d
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Functional/Mantis.lua
View File

@ -1449,7 +1449,7 @@ do
-- @return #string type Long, medium or short range -- @return #string type Long, medium or short range
-- @return #number blind "blind" spot -- @return #number blind "blind" spot
function MANTIS:_GetSAMRange(grpname) function MANTIS:_GetSAMRange(grpname)
self:I(self.lid.."_GetSAMRange for "..tostring(grpname)) self:T(self.lid.."_GetSAMRange for "..tostring(grpname))
local range = self.checkradius local range = self.checkradius
local height = 3000 local height = 3000
local type = MANTIS.SamType.MEDIUM local type = MANTIS.SamType.MEDIUM

16
Moose Development/Moose/Ops/Auftrag.lua
View File

@ -2302,7 +2302,7 @@ function AUFTRAG:NewCAPTUREZONE(OpsZone, Coalition, Speed, Altitude, Formation)
params.formation=Formation or "Off Road" params.formation=Formation or "Off Road"
params.zone=mission:GetObjective() params.zone=mission:GetObjective()
params.altitude=mission.missionAltitude params.altitude=mission.missionAltitude
params.speed=mission.missionSpeed params.speed=mission.missionSpeed and UTILS.KmphToMps(mission.missionSpeed) or nil
mission.DCStask.params=params mission.DCStask.params=params
@ -2352,7 +2352,7 @@ function AUFTRAG:NewGROUNDATTACK(Target, Speed, Formation)
mission.DCStask=mission:GetDCSMissionTask() mission.DCStask=mission:GetDCSMissionTask()
mission.DCStask.params.speed=Speed mission.DCStask.params.speed=mission.missionSpeed and UTILS.KmphToMps(mission.missionSpeed) or nil
mission.DCStask.params.formation=Formation or ENUMS.Formation.Vehicle.Vee mission.DCStask.params.formation=Formation or ENUMS.Formation.Vehicle.Vee
return mission return mission
@ -3493,7 +3493,7 @@ end
--- Set Reaction on Threat (ROT) for this mission. --- Set Reaction on Threat (ROT) for this mission.
-- @param #AUFTRAG self -- @param #AUFTRAG self
-- @param #number rot Mission ROT, e.g. `ENUMS.ROT.NoReaction` (whiche equals 0) -- @param #number rot Mission ROT, e.g. `ENUMS.ROT.NoReaction` (whiche equals 0)
-- @return #AUFTRAG self -- @return #AUFTRAG self
function AUFTRAG:SetROT(rot) function AUFTRAG:SetROT(rot)
@ -6099,7 +6099,7 @@ function AUFTRAG:GetDCSMissionTask()
local param={} local param={}
param.zone=self:GetObjective() param.zone=self:GetObjective()
param.altitude=self.missionAltitude param.altitude=self.missionAltitude
param.speed=self.missionSpeed param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
DCStask.params=param DCStask.params=param
@ -6179,7 +6179,7 @@ function AUFTRAG:GetDCSMissionTask()
local param={} local param={}
param.target=self.engageTarget param.target=self.engageTarget
param.altitude=self.missionAltitude param.altitude=self.missionAltitude
param.speed=self.missionSpeed param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
param.lastindex=nil param.lastindex=nil
DCStask.params=param DCStask.params=param
@ -6352,7 +6352,7 @@ function AUFTRAG:GetDCSMissionTask()
local param={} local param={}
param.zone=self:GetObjective() param.zone=self:GetObjective()
param.altitude=self.missionAltitude param.altitude=self.missionAltitude
param.speed=self.missionSpeed param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
DCStask.params=param DCStask.params=param
@ -6388,7 +6388,7 @@ function AUFTRAG:GetDCSMissionTask()
local param={} local param={}
param.zone=self:GetObjective() param.zone=self:GetObjective()
param.altitude=self.missionAltitude param.altitude=self.missionAltitude
param.speed=self.missionSpeed param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
DCStask.params=param DCStask.params=param
@ -6408,7 +6408,7 @@ function AUFTRAG:GetDCSMissionTask()
local param={} local param={}
param.target=self:GetTargetData() param.target=self:GetTargetData()
param.action="Wedge" param.action="Wedge"
param.speed=self.missionSpeed param.speed=self.missionSpeed and UTILS.KmphToMps(self.missionSpeed) or nil
DCStask.params=param DCStask.params=param

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

@ -1269,7 +1269,7 @@ function NAVYGROUP:onafterUpdateRoute(From, Event, To, n, N, Speed, Depth)
if self.verbose>=10 then if self.verbose>=10 then
for i=1,#waypoints do for i=1,#waypoints do
local wp=waypoints[i] --Ops.OpsGroup#OPSGROUP.Waypoint local wp=waypoints[i] --Ops.OpsGroup#OPSGROUP.Waypoint
local text=string.format("%s Waypoint [%d] UID=%d speed=%d", self.groupname, i-1, wp.uid or -1, wp.speed) local text=string.format("%s Waypoint [%d] UID=%d speed=%d m/s", self.groupname, i-1, wp.uid or -1, wp.speed)
self:I(self.lid..text) self:I(self.lid..text)
COORDINATE:NewFromWaypoint(wp):MarkToAll(text) COORDINATE:NewFromWaypoint(wp):MarkToAll(text)
end end

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

@ -4480,7 +4480,7 @@ function OPSGROUP:_UpdateTask(Task, Mission)
-- Set speed. Default max. -- Set speed. Default max.
local speed=self.speedMax and UTILS.KmphToKnots(self.speedMax) or nil local speed=self.speedMax and UTILS.KmphToKnots(self.speedMax) or nil
if Task.dcstask.params.speed then if Task.dcstask.params.speed then
speed=Task.dcstask.params.speed speed=UTILS.MpsToKnots(Task.dcstask.params.speed)
end end
if target then if target then