From 4fb98cf72b5c63f76f491da996cbd94ad7bb0265 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 17 Nov 2022 13:54:43 +0100 Subject: [PATCH 1/2] #CSAR * Make rescued pilot's weight configureable --- Moose Development/Moose/Ops/CSAR.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index 8ae06fb13..da3853223 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -30,7 +30,7 @@ -- @module Ops.CSAR -- @image OPS_CSAR.jpg --- Date: October 2022 +-- Date: November 2022 ------------------------------------------------------------------------- --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM @@ -114,6 +114,7 @@ -- mycsar.countryneutral = country.id.UN_PEACEKEEPERS -- mycsar.topmenuname = "CSAR" -- set the menu entry name -- mycsar.ADFRadioPwr = 1000 -- ADF Beacons sending with 1KW as default +-- mycsar.PilotWeight = 80 -- Loaded pilots weigh 80kgs each -- -- ## 2.1 Experimental Features -- @@ -233,6 +234,7 @@ CSAR = { allheligroupset = nil, topmenuname = "CSAR", ADFRadioPwr = 1000, + PilotWeight = 80, } --- Downed pilots info. @@ -270,7 +272,7 @@ CSAR.AircraftType["Bronco-OV-10A"] = 2 --- CSAR class version. -- @field #string version -CSAR.version="1.0.15" +CSAR.version="1.0.16" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list @@ -278,7 +280,7 @@ CSAR.version="1.0.15" -- DONE: SRS Integration (to be tested) -- TODO: Maybe - add option to smoke/flare closest MASH --- TODO: shagrat Add cargoWeight to helicopter when pilot boarded +-- DONE: shagrat Add cargoWeight to helicopter when pilot boarded ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -418,10 +420,13 @@ function CSAR:New(Coalition, Template, Alias) self.wetfeettemplate = nil self.usewetfeet = false - -- added 0.1.8 + -- added 1.0.15 self.allowbronco = false -- set to true to use the Bronco mod as a CSAR plane self.ADFRadioPwr = 1000 + + -- added 1.0.16 + self.PilotWeight = 80 -- WARNING - here\'ll be dragons -- for this to work you need to de-sanitize your mission environment in \Scripts\MissionScripting.lua @@ -1397,7 +1402,7 @@ end -- @return #CSAR self function CSAR:_UpdateUnitCargoMass(_heliName) self:T(self.lid .. " _UpdateUnitCargoMass") - local calculatedMass = self:_PilotsOnboard(_heliName)*80 + local calculatedMass = self:_PilotsOnboard(_heliName)*(self.PilotWeight or 80) local Unit = UNIT:FindByName(_heliName) if Unit then Unit:SetUnitInternalCargo(calculatedMass) From 5a7a23552d6e72f9f123659c246d417c556cddb4 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 17 Nov 2022 17:13:33 +0100 Subject: [PATCH 2/2] #AIRBASE * Added enumerators for -- * AIRBASE.SouthAtlantic.Puerto_Santa_Cruz -- * AIRBASE.SouthAtlantic.Comandante_Luis_Piedrabuena -- * AIRBASE.SouthAtlantic.Aerodromo_De_Tolhuin -- * AIRBASE.SouthAtlantic.Porvenir_Airfield -- * AIRBASE.SouthAtlantic.Almirante_Schroeders -- * AIRBASE.SouthAtlantic.Rio_Turbio --- Moose Development/Moose/Wrapper/Airbase.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Moose Development/Moose/Wrapper/Airbase.lua b/Moose Development/Moose/Wrapper/Airbase.lua index 5fcc50b4b..f4f658477 100644 --- a/Moose Development/Moose/Wrapper/Airbase.lua +++ b/Moose Development/Moose/Wrapper/Airbase.lua @@ -504,6 +504,12 @@ AIRBASE.MarianaIslands = { -- * AIRBASE.SouthAtlantic.Puerto_Williams -- * AIRBASE.SouthAtlantic.Puerto_Natales -- * AIRBASE.SouthAtlantic.El_Calafate +-- * AIRBASE.SouthAtlantic.Puerto_Santa_Cruz +-- * AIRBASE.SouthAtlantic.Comandante_Luis_Piedrabuena +-- * AIRBASE.SouthAtlantic.Aerodromo_De_Tolhuin +-- * AIRBASE.SouthAtlantic.Porvenir_Airfield +-- * AIRBASE.SouthAtlantic.Almirante_Schroeders +-- * AIRBASE.SouthAtlantic.Rio_Turbio -- --@field MarianaIslands AIRBASE.SouthAtlantic={ @@ -520,6 +526,12 @@ AIRBASE.SouthAtlantic={ ["Puerto_Williams"]="Puerto Williams", ["Puerto_Natales"]="Puerto Natales", ["El_Calafate"]="El Calafate", + ["Puerto_Santa_Cruz"]="Puerto Santa Cruz", + ["Comandante_Luis_Piedrabuena"]="Comandante Luis Piedrabuena", + ["Aerodromo_De_Tolhuin"]="Aerodromo De Tolhuin", + ["Porvenir_Airfield"]="Porvenir Airfield", + ["Almirante_Schroeders"]="Almirante Schroeders", + ["Rio_Turbio"]="Rio Turbio", } --- AIRBASE.ParkingSpot ".Coordinate, ".TerminalID", ".TerminalType", ".TOAC", ".Free", ".TerminalID0", ".DistToRwy".