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

Browse Source
This commit is contained in:
Frank 2021-03-28 20:30:19 +02:00
commit 00ff9a11b8
2 changed files with 159 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,6 +424,14 @@ UTILS.hPa2inHg = function( hPa )
return hPa * 0.0295299830714 return hPa * 0.0295299830714
end end
--- Convert knots to alitude corrected KIAS, e.g. for tankers.
-- @param #number knots Speed in knots.
-- @param #number altitude Altitude in feet
-- @return #number Corrected KIAS
UTILS.KnotsToAltKIAS = function( knots, altitude )
return (knots * 0.018 * (altitude / 1000)) + knots
end
--- Convert pressure from hecto Pascal (hPa) to millimeters of mercury (mmHg). --- Convert pressure from hecto Pascal (hPa) to millimeters of mercury (mmHg).
-- @param #number hPa Pressure in hPa. -- @param #number hPa Pressure in hPa.
-- @return #number Pressure in mmHg. -- @return #number Pressure in mmHg.

44
Moose Development/Moose/Wrapper/Positionable.lua
View File

@ -1458,11 +1458,14 @@ do -- Cargo
self:F({Desc=Desc}) self:F({Desc=Desc})
local Weights = { local Weights = {
["Type_071"] = 245000, ["Type_071"] = 245000,
["LHA_Tarawa"] = 500000, ["LHA_Tarawa"] = 500000,
["Ropucha-class"] = 150000, ["Ropucha-class"] = 150000,
["Dry-cargo ship-1"] = 70000, ["Dry-cargo ship-1"] = 70000,
["Dry-cargo ship-2"] = 70000, ["Dry-cargo ship-2"] = 70000,
["Higgins_boat"] = 3700, -- Higgins Boat can load 3700 kg of general cargo or 36 men (source wikipedia).
["USS_Samuel_Chase"] = 25000, -- Let's say 25 tons for now. Wiki says 33 Higgins boats, which would be 264 tons (can't be right!) and/or 578 troops.
["LST_Mk2"] =2100000, -- Can carry 2100 tons according to wiki source!
} }
self.__.CargoBayWeightLimit = ( Weights[Desc.typeName] or 50000 ) self.__.CargoBayWeightLimit = ( Weights[Desc.typeName] or 50000 )
@ -1470,40 +1473,47 @@ do -- Cargo
local Desc = self:GetDesc() local Desc = self:GetDesc()
local Weights = { local Weights = {
["M1126 Stryker ICV"] = 9,
["M-113"] = 9,
["AAV7"] = 25, ["AAV7"] = 25,
["M2A1_halftrack"] = 9, ["Bedford_MWD"] = 8, -- new by kappa
["BMD-1"] = 9, ["Blitz_36-6700A"] = 10, -- new by kappa
["BMD-1"] = 9, -- IRL should be 4 passengers
["BMP-1"] = 8, ["BMP-1"] = 8,
["BMP-2"] = 7, ["BMP-2"] = 7,
["BMP-3"] = 8, ["BMP-3"] = 8, -- IRL should be 7+2 passengers
["Boman"] = 25, ["Boman"] = 25,
["BTR-80"] = 9, ["BTR-80"] = 9, -- IRL should be 7 passengers
["BTR_D"] = 12, ["BTR-82A"] = 9, -- new by kappa -- IRL should be 7 passengers
["BTR_D"] = 12, -- IRL should be 10 passengers
["Cobra"] = 8, ["Cobra"] = 8,
["Land_Rover_101_FC"] = 11, -- new by kappa
["Land_Rover_109_S3"] = 7, -- new by kappa
["LAV-25"] = 6, ["LAV-25"] = 6,
["M-2 Bradley"] = 6, ["M-2 Bradley"] = 6,
["M1043 HMMWV Armament"] = 4, ["M1043 HMMWV Armament"] = 4,
["M1045 HMMWV TOW"] = 4, ["M1045 HMMWV TOW"] = 4,
["M1126 Stryker ICV"] = 9, ["M1126 Stryker ICV"] = 9,
["M1134 Stryker ATGM"] = 9, ["M1134 Stryker ATGM"] = 9,
["M2A1_halftrack"] = 9,
["M-113"] = 9, -- IRL should be 11 passengers
["Marder"] = 6, ["Marder"] = 6,
["MCV-80"] = 9, ["MCV-80"] = 9, -- IRL should be 7 passengers
["MLRS FDDM"] = 4, ["MLRS FDDM"] = 4,
["MTLB"] = 25, ["MTLB"] = 25, -- IRL should be 11 passengers
["TPZ"] = 10,
["Ural-4320 APA-5D"] = 10,
["GAZ-66"] = 8, ["GAZ-66"] = 8,
["GAZ-3307"] = 12, ["GAZ-3307"] = 12,
["GAZ-3308"] = 14, ["GAZ-3308"] = 14,
["Tigr_233036"] = 6, ["Grad_FDDM"] = 6, -- new by kappa
["KAMAZ Truck"] = 12, ["KAMAZ Truck"] = 12,
["KrAZ6322"] = 12, ["KrAZ6322"] = 12,
["M 818"] = 12, ["M 818"] = 12,
["Tigr_233036"] = 6,
["TPZ"] = 10,
["UAZ-469"] = 4, -- new by kappa
["Ural-375"] = 12, ["Ural-375"] = 12,
["Ural-4320-31"] = 14, ["Ural-4320-31"] = 14,
["Ural-4320 APA-5D"] = 10,
["Ural-4320T"] = 14, ["Ural-4320T"] = 14,
["ZBD04A"] = 7, -- new by kappa
} }
local CargoBayWeightLimit = ( Weights[Desc.typeName] or 0 ) * 95 local CargoBayWeightLimit = ( Weights[Desc.typeName] or 0 ) * 95