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 develop

Browse Source
This commit is contained in:
Applevangelist 2023-02-26 10:25:21 +01:00
commit 7db7919207
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3546,8 +3546,6 @@ end
function ARTY:onafterRespawn(Controllable, From, Event, To) function ARTY:onafterRespawn(Controllable, From, Event, To)
self:_EventFromTo("onafterRespawn", Event, From, To) self:_EventFromTo("onafterRespawn", Event, From, To)
env.info("FF Respawning arty group")
local group=self.Controllable --Wrapper.Group#GROUP local group=self.Controllable --Wrapper.Group#GROUP
-- Respawn group. -- Respawn group.

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

@ -1059,9 +1059,8 @@ function AUFTRAG:NewORBIT(Coordinate, Altitude, Speed, Heading, Leg)
mission.orbitAltitude=Coordinate.y mission.orbitAltitude=Coordinate.y
end end
-- Orbit speed in m/s. -- Orbit speed in m/s TAS.
--mission.orbitSpeed = UTILS.KnotsToMps(UTILS.KnotsToAltKIAS(Speed or 350, UTILS.MetersToFeet(mission.orbitAltitude))) mission.orbitSpeed = UTILS.IasToTas(UTILS.KnotsToMps(Speed or 350), mission.orbitAltitude)
mission.orbitSpeed = UTILS.TasToIas(UTILS.KnotsToMps(Speed or 350), mission.orbitAltitude)
-- Mission speed in km/h. -- Mission speed in km/h.
mission.missionSpeed = UTILS.KnotsToKmph(Speed or 350) mission.missionSpeed = UTILS.KnotsToKmph(Speed or 350)

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

@ -7094,7 +7094,7 @@ function OPSGROUP:SetLaserTarget(Target)
-- Set coordinate. -- Set coordinate.
self.spot.Coordinate:UpdateFromVec3(self.spot.vec3) self.spot.Coordinate:UpdateFromVec3(self.spot.vec3)
self.spot.Coordinate:MarkToAll("Target Laser",ReadOnly,Text) --self.spot.Coordinate:MarkToAll("Target Laser",ReadOnly,Text)
end end
end end