From 2e342e4341df2d3e1a9215ad112c7319c4205d3a Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Mon, 22 Mar 2021 11:47:39 +0100 Subject: [PATCH 1/2] Utils - added Convert knots to alitude corrected KIAS Added - Convert knots to alitude corrected KIAS, e.g. for tankers. --- Moose Development/Moose/Utilities/Utils.lua | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index fc2acdd9d..693550719 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -408,6 +408,14 @@ UTILS.hPa2inHg = function( hPa ) return hPa * 0.0295299830714 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). -- @param #number hPa Pressure in hPa. -- @return #number Pressure in mmHg. @@ -1457,4 +1465,4 @@ function UTILS.GetOSTime() end return nil -end \ No newline at end of file +end From 564f95781e32c02cc5f31c6743ae6bf7d65873b0 Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 28 Mar 2021 20:29:15 +0200 Subject: [PATCH 2/2] Update Positionable.lua - Added cargo bay limits for ground (by kappa) and naval units. --- .../Moose/Wrapper/Positionable.lua | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Positionable.lua b/Moose Development/Moose/Wrapper/Positionable.lua index 4c94ed2d1..51a0718c2 100644 --- a/Moose Development/Moose/Wrapper/Positionable.lua +++ b/Moose Development/Moose/Wrapper/Positionable.lua @@ -1457,11 +1457,14 @@ do -- Cargo self:F({Desc=Desc}) local Weights = { - ["Type_071"] = 245000, - ["LHA_Tarawa"] = 500000, - ["Ropucha-class"] = 150000, - ["Dry-cargo ship-1"] = 70000, - ["Dry-cargo ship-2"] = 70000, + ["Type_071"] = 245000, + ["LHA_Tarawa"] = 500000, + ["Ropucha-class"] = 150000, + ["Dry-cargo ship-1"] = 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 ) @@ -1469,40 +1472,47 @@ do -- Cargo local Desc = self:GetDesc() local Weights = { - ["M1126 Stryker ICV"] = 9, - ["M-113"] = 9, ["AAV7"] = 25, - ["M2A1_halftrack"] = 9, - ["BMD-1"] = 9, + ["Bedford_MWD"] = 8, -- new by kappa + ["Blitz_36-6700A"] = 10, -- new by kappa + ["BMD-1"] = 9, -- IRL should be 4 passengers ["BMP-1"] = 8, ["BMP-2"] = 7, - ["BMP-3"] = 8, + ["BMP-3"] = 8, -- IRL should be 7+2 passengers ["Boman"] = 25, - ["BTR-80"] = 9, - ["BTR_D"] = 12, + ["BTR-80"] = 9, -- IRL should be 7 passengers + ["BTR-82A"] = 9, -- new by kappa -- IRL should be 7 passengers + ["BTR_D"] = 12, -- IRL should be 10 passengers ["Cobra"] = 8, + ["Land_Rover_101_FC"] = 11, -- new by kappa + ["Land_Rover_109_S3"] = 7, -- new by kappa ["LAV-25"] = 6, ["M-2 Bradley"] = 6, ["M1043 HMMWV Armament"] = 4, ["M1045 HMMWV TOW"] = 4, ["M1126 Stryker ICV"] = 9, ["M1134 Stryker ATGM"] = 9, + ["M2A1_halftrack"] = 9, + ["M-113"] = 9, -- IRL should be 11 passengers ["Marder"] = 6, - ["MCV-80"] = 9, + ["MCV-80"] = 9, -- IRL should be 7 passengers ["MLRS FDDM"] = 4, - ["MTLB"] = 25, - ["TPZ"] = 10, - ["Ural-4320 APA-5D"] = 10, + ["MTLB"] = 25, -- IRL should be 11 passengers ["GAZ-66"] = 8, ["GAZ-3307"] = 12, ["GAZ-3308"] = 14, - ["Tigr_233036"] = 6, + ["Grad_FDDM"] = 6, -- new by kappa ["KAMAZ Truck"] = 12, ["KrAZ6322"] = 12, ["M 818"] = 12, + ["Tigr_233036"] = 6, + ["TPZ"] = 10, + ["UAZ-469"] = 4, -- new by kappa ["Ural-375"] = 12, ["Ural-4320-31"] = 14, + ["Ural-4320 APA-5D"] = 10, ["Ural-4320T"] = 14, + ["ZBD04A"] = 7, -- new by kappa } local CargoBayWeightLimit = ( Weights[Desc.typeName] or 0 ) * 95