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/master' into branch

Browse Source
This commit is contained in:
Applevangelist
2025-09-02 14:09:31 +02:00
parent 4d48b42aea a917ee8f1e
commit bfb89e80e0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Ops/Airboss.lua
View File

@@ -39,6 +39,8 @@
-- * [USS America](https://en.wikipedia.org/wiki/USS_America_\(LHA-6\)) (LHA-6) -- * [USS America](https://en.wikipedia.org/wiki/USS_America_\(LHA-6\)) (LHA-6)
-- * [Juan Carlos I](https://en.wikipedia.org/wiki/Spanish_amphibious_assault_ship_Juan_Carlos_I) (L61) -- * [Juan Carlos I](https://en.wikipedia.org/wiki/Spanish_amphibious_assault_ship_Juan_Carlos_I) (L61)
-- * [HMAS Canberra](https://en.wikipedia.org/wiki/HMAS_Canberra_\(L02\)) (L02) -- * [HMAS Canberra](https://en.wikipedia.org/wiki/HMAS_Canberra_\(L02\)) (L02)
-- * BONHOMMERICHARD [VWV Mod]
-- * ENTERPRISE66 [VWV Mod]
-- --
-- **Supported Aircraft:** -- **Supported Aircraft:**
-- --
@@ -1764,7 +1766,7 @@ AIRBOSS.MenuF10Root = nil
--- Airboss class version. --- Airboss class version.
-- @field #string version -- @field #string version
AIRBOSS.version = "1.4.1" AIRBOSS.version = "1.4.2"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list -- TODO list
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

10
Moose Development/Moose/Utilities/Utils.lua
View File

@@ -1586,12 +1586,12 @@ function UTILS.HdgDiff(h1, h2)
return math.abs(delta) return math.abs(delta)
end end
--- Returns the heading from one vec3 to another vec3. --- Returns the heading from one vec2/vec3 to another vec2/vec3.
-- @param DCS#Vec3 a From vec3. -- @param DCS#Vec3 a From Vec2 or Vec3.
-- @param DCS#Vec3 b To vec3. -- @param DCS#Vec3 b To Vec2 or Vec3.
-- @return #number Heading in degrees. -- @return #number Heading in degrees.
function UTILS.HdgTo(a, b) function UTILS.HdgTo(a, b)
local dz=b.z-a.z local dz=(b.z or b.y) - (a.z or a.y)
local dx=b.x-a.x local dx=b.x-a.x
local heading=math.deg(math.atan2(dz, dx)) local heading=math.deg(math.atan2(dz, dx))
if heading < 0 then if heading < 0 then
@@ -4982,7 +4982,7 @@ function UTILS.ValidateAndRepositionGroundUnits(Positions, Anchor, MaxRadius, Sp
end end
end end
--- This function uses Disposition and other fallback logic to find better ground positions for ground units. --- This function uses Disposition and other fallback logic to find better ground positions for statics.
--- NOTE: This is not a spawn randomizer. --- NOTE: This is not a spawn randomizer.
--- It will try to find clear ground locations avoiding trees, water, roads, runways, map scenery, statics and other units in the area and modifies the provided positions table. --- It will try to find clear ground locations avoiding trees, water, roads, runways, map scenery, statics and other units in the area and modifies the provided positions table.
--- Maintains the original layout and unit positions as close as possible by searching for the next closest valid position to each unit. --- Maintains the original layout and unit positions as close as possible by searching for the next closest valid position to each unit.