#Controllable

* Added Aerobtics tasks
Update Enums.lua
2025-08-15 10:47:21 +00:00 · 2023-08-22 10:24:40 +02:00 · 2023-08-21 11:35:01 +02:00 · 2023-08-20 15:22:49 +02:00 · 2023-08-20 15:12:47 +02:00 · 2023-08-20 13:41:20 +02:00
16 changed files with 2974 additions and 247 deletions
--- a/Development/Moose/Core/Database.lua
+++ b/Development/Moose/Core/Database.lua
@@ -32,10 +32,12 @@
 -- @image Core_Database.JPG


--- @type DATABASE
+--- DATABASE class.
+-- @type DATABASE
 -- @field #string ClassName Name of the class.
 -- @field #table Templates Templates: Units, Groups, Statics, ClientsByName, ClientsByID.
 -- @field #table CLIENTS Clients.
+-- @field #table STORAGES DCS warehouse storages.
 -- @extends Core.Base#BASE

 --- Contains collections of wrapper objects defined within MOOSE that reflect objects within the simulator.
@@ -50,6 +52,7 @@
 --  * PLAYERSJOINED
 --  * PLAYERS
 --  * CARGOS
+--  * STORAGES (DCS warehouses)
 --
 -- On top, for internal MOOSE administration purposes, the DATABASE administers the Unit and Group TEMPLATES as defined within the Mission Editor.
 --
@@ -90,6 +93,7 @@ DATABASE = {
  FLIGHTCONTROLS = {},
  OPSZONES = {},
  PATHLINES = {},
+  STORAGES = {},
 }

 local _DATABASECoalition =
@@ -246,6 +250,38 @@ function DATABASE:FindAirbase( AirbaseName )
 end


+
+--- Adds a STORAGE (DCS warehouse wrapper) based on the Airbase Name to the DATABASE.
+-- @param #DATABASE self
+-- @param #string AirbaseName The name of the airbase.
+-- @return Wrapper.Storage#STORAGE Storage object.
+function DATABASE:AddStorage( AirbaseName )
+
+  if not self.STORAGES[AirbaseName] then
+    self.STORAGES[AirbaseName] = STORAGE:New( AirbaseName )
+  end
+
+  return self.STORAGES[AirbaseName]
+end
+
+
+--- Deletes a STORAGE from the DATABASE based on the name of the associated airbase.
+-- @param #DATABASE self
+-- @param #string AirbaseName The name of the airbase.
+function DATABASE:DeleteStorage( AirbaseName )
+  self.STORAGES[AirbaseName] = nil
+end
+
+
+--- Finds an STORAGE based on the name of the associated airbase.
+-- @param #DATABASE self
+-- @param #string AirbaseName Name of the airbase.
+-- @return Wrapper.Storage#STORAGE The found STORAGE.
+function DATABASE:FindStorage( AirbaseName )
+  local storage = self.STORAGES[AirbaseName]
+  return storage
+end
+
 do -- Zones and Pathlines

  --- Finds a @{Core.Zone} based on the zone name.
--- a/Development/Moose/Core/Point.lua
+++ b/Development/Moose/Core/Point.lua
@@ -2389,7 +2389,6 @@ do -- COORDINATE
    end

    --- Creates a free form shape on the F10 map. The first point is the current COORDINATE. The remaining points need to be specified.
-    -- **NOTE**: A free form polygon must have **at least three points** in total and currently only **up to 15 points** in total are supported.
    -- @param #COORDINATE self
    -- @param #table Coordinates Table of coordinates of the remaining points of the shape.
    -- @param #number Coalition Coalition: All=-1, Neutral=0, Red=1, Blue=2. Default -1=All.
@@ -2463,9 +2462,30 @@ do -- COORDINATE
                                                         vecs[11], vecs[12], vecs[13], vecs[14], vecs[15],
                                                         Color, FillColor, LineType, ReadOnly, Text or "")
      else
-        self:E("ERROR: Currently a free form polygon can only have 15 points in total!")
+        
        -- Unfortunately, unpack(vecs) does not work! So no idea how to generalize this :(
-        trigger.action.markupToAll(7, Coalition, MarkID, unpack(vecs), Color, FillColor, LineType, ReadOnly, Text or "")
+        --trigger.action.markupToAll(7, Coalition, MarkID, unpack(vecs), Color, FillColor, LineType, ReadOnly, Text or "")
+        
+        -- Write command as string and execute that. Idea by Grimes https://forum.dcs.world/topic/324201-mark-to-all-function/#comment-5273793
+        local s=string.format("trigger.action.markupToAll(7, %d, %d,", Coalition, MarkID)
+        for _,vec in pairs(vecs) do
+          s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
+        end
+        s=s..string.format("%s, %s, %s, %s", UTILS._OneLineSerialize(Color), UTILS._OneLineSerialize(FillColor), tostring(LineType), tostring(ReadOnly))
+        if Text and Text~="" then
+          s=s..string.format(", \"%s\"", Text)
+        end
+        s=s..")"
+        
+        
+        -- Execute string command
+        local success=UTILS.DoString(s)
+                
+        if not success then
+          self:E("ERROR: Could not draw polygon")
+          env.info(s)
+        end
+        
      end

      return MarkID
--- a/Development/Moose/Core/Set.lua
+++ b/Development/Moose/Core/Set.lua
@@ -47,7 +47,8 @@

 do -- SET_BASE
  
-  --- @type SET_BASE
+  ---
+  -- @type SET_BASE
  -- @field #table Filter Table of filters.
  -- @field #table Set Table of objects.
  -- @field #table Index Table of indices.
@@ -242,7 +243,7 @@ do -- SET_BASE
  function SET_BASE:Add( ObjectName, Object )
  
    -- Debug info.
-    self:T( { ObjectName = ObjectName, Object = Object } )
+    self:T2( { ObjectName = ObjectName, Object = Object } )

    -- Ensure that the existing element is removed from the Set before a new one is inserted to the Set
    if self.Set[ObjectName] then
@@ -257,6 +258,8 @@ do -- SET_BASE

    -- Trigger Added event.
    self:Added( ObjectName, Object )
+    
+    return self
  end

  --- Adds a @{Core.Base#BASE} object in the @{Core.Set#SET_BASE}, using the Object Name as the index.
@@ -578,8 +581,8 @@ do -- SET_BASE
  end

  ----- Private method that registers all alive players in the mission.
-  ---- @param #SET_BASE self
-  ---- @return #SET_BASE self
+  -- @param #SET_BASE self
+  -- @return #SET_BASE self
  -- function SET_BASE:_RegisterPlayers()
  --
  --  local CoalitionsData = { AlivePlayersRed = coalition.getPlayers( coalition.side.RED ), AlivePlayersBlue = coalition.getPlayers( coalition.side.BLUE ) }
@@ -796,8 +799,8 @@ do -- SET_BASE


  ----- Iterate the SET_BASE and call an iterator function for each **alive** unit, providing the Unit and optional parameters.
-  ---- @param #SET_BASE self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive unit in the SET_BASE. The function needs to accept a UNIT parameter.
+  -- @param #SET_BASE self
+  -- @param #function IteratorFunction The function that will be called when there is an alive unit in the SET_BASE. The function needs to accept a UNIT parameter.
  ---- @return #SET_BASE self
  -- function SET_BASE:ForEachDCSUnitAlive( IteratorFunction, ... )
  --  self:F3( arg )
@@ -808,8 +811,8 @@ do -- SET_BASE
  -- end
  --
  ----- Iterate the SET_BASE and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
-  ---- @param #SET_BASE self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a UNIT parameter.
+  -- @param #SET_BASE self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a UNIT parameter.
  ---- @return #SET_BASE self
  -- function SET_BASE:ForEachPlayer( IteratorFunction, ... )
  --  self:F3( arg )
@@ -821,8 +824,8 @@ do -- SET_BASE
  --
  --
  ----- Iterate the SET_BASE and call an iterator function for each client, providing the Client to the function and optional parameters.
-  ---- @param #SET_BASE self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a CLIENT parameter.
+  -- @param #SET_BASE self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_BASE. The function needs to accept a CLIENT parameter.
  ---- @return #SET_BASE self
  -- function SET_BASE:ForEachClient( IteratorFunction, ... )
  --  self:F3( arg )
@@ -901,9 +904,12 @@ do -- SET_BASE

 end

-do -- SET_GROUP
+do 

-  --- @type SET_GROUP #SET_GROUP
+  -- SET_GROUP
+  
+  ---
+  -- @type SET_GROUP #SET_GROUP
  -- @field Core.Timer#TIMER ZoneTimer
  -- @field #number ZoneTimerInterval
  -- @extends Core.Set#SET_BASE
@@ -1568,7 +1574,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsCompletelyInZone( ZoneObject ) then
@@ -1590,7 +1596,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsPartlyInZone( ZoneObject ) then
@@ -1612,7 +1618,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsNotInZone( ZoneObject ) then
@@ -1659,7 +1665,7 @@ do -- SET_GROUP
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Group#GROUP GroupObject
      function( ZoneObject, GroupObject )
        if GroupObject:IsAnyInZone( ZoneObject ) then
@@ -1857,8 +1863,8 @@ do -- SET_GROUP
  end

  ----- Iterate the SET_GROUP and call an iterator function for each **alive** player, providing the Group of the player and optional parameters.
-  ---- @param #SET_GROUP self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a GROUP parameter.
+  -- @param #SET_GROUP self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a GROUP parameter.
  ---- @return #SET_GROUP self
  -- function SET_GROUP:ForEachPlayer( IteratorFunction, ... )
  --  self:F2( arg )
@@ -1870,8 +1876,8 @@ do -- SET_GROUP
  --
  --
  ----- Iterate the SET_GROUP and call an iterator function for each client, providing the Client to the function and optional parameters.
-  ---- @param #SET_GROUP self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a CLIENT parameter.
+  -- @param #SET_GROUP self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_GROUP. The function needs to accept a CLIENT parameter.
  ---- @return #SET_GROUP self
  -- function SET_GROUP:ForEachClient( IteratorFunction, ... )
  --  self:F2( arg )
@@ -1945,7 +1951,7 @@ do -- SET_GROUP
    if self.Filter.Zones then
      local MGroupZone = false
      for ZoneName, Zone in pairs( self.Filter.Zones ) do
-        --self:I( "Zone:", ZoneName )
+        --self:T( "Zone:", ZoneName )
        if MGroup:IsInZone(Zone) then
          MGroupZone = true
        end
@@ -2012,7 +2018,8 @@ end

 do -- SET_UNIT
  
-  --- @type SET_UNIT
+  ---
+  -- @type SET_UNIT
  -- @field Core.Timer#TIMER ZoneTimer
  -- @field #number ZoneTimerInterval
  -- @extends Core.Set#SET_BASE
@@ -2672,7 +2679,7 @@ do -- SET_UNIT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Unit#UNIT UnitObject
      function( ZoneObject, UnitObject )
        if UnitObject:IsInZone( ZoneObject ) then
@@ -2694,7 +2701,7 @@ do -- SET_UNIT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Unit#UNIT UnitObject
      function( ZoneObject, UnitObject )
        if UnitObject:IsNotInZone( ZoneObject ) then
@@ -3011,8 +3018,8 @@ do -- SET_UNIT


  ----- Iterate the SET_UNIT and call an iterator function for each **alive** player, providing the Unit of the player and optional parameters.
-  ---- @param #SET_UNIT self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a UNIT parameter.
+  -- @param #SET_UNIT self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a UNIT parameter.
  ---- @return #SET_UNIT self
  -- function SET_UNIT:ForEachPlayer( IteratorFunction, ... )
  --  self:F2( arg )
@@ -3024,8 +3031,8 @@ do -- SET_UNIT
  --
  --
  ----- Iterate the SET_UNIT and call an iterator function for each client, providing the Client to the function and optional parameters.
-  ---- @param #SET_UNIT self
-  ---- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a CLIENT parameter.
+  -- @param #SET_UNIT self
+  -- @param #function IteratorFunction The function that will be called when there is an alive player in the SET_UNIT. The function needs to accept a CLIENT parameter.
  ---- @return #SET_UNIT self
  -- function SET_UNIT:ForEachClient( IteratorFunction, ... )
  --  self:F2( arg )
@@ -3040,7 +3047,7 @@ do -- SET_UNIT
  -- @param Wrapper.Unit#UNIT MUnit
  -- @return #SET_UNIT self
  function SET_UNIT:IsIncludeObject( MUnit )
-    self:F2( MUnit )
+    self:F2( {MUnit} )

    local MUnitInclude = false

@@ -3192,7 +3199,8 @@ end

 do -- SET_STATIC
  
-  --- @type SET_STATIC
+  ---
+  -- @type SET_STATIC
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the SET_STATIC class to build sets of Statics belonging to certain:
@@ -3612,7 +3620,7 @@ do -- SET_STATIC
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Static#STATIC StaticObject
      function( ZoneObject, StaticObject )
        if StaticObject:IsInZone( ZoneObject ) then
@@ -3634,7 +3642,7 @@ do -- SET_STATIC
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Static#STATIC StaticObject
      function( ZoneObject, StaticObject )
        if StaticObject:IsNotInZone( ZoneObject ) then
@@ -3946,7 +3954,8 @@ end

 do -- SET_CLIENT
  
-  --- @type SET_CLIENT
+  ---
+  -- @type SET_CLIENT
  -- @field Core.Timer#TIMER ZoneTimer
  -- @field #number ZoneTimerInterval
  -- @extends Core.Set#SET_BASE
@@ -4008,8 +4017,8 @@ do -- SET_CLIENT
      Countries = nil,
      ClientPrefixes = nil,
      Zones = nil,
-      Playernames = nil,
-      Callsigns = nil,
+  	  Playernames = nil,
+  	  Callsigns = nil,
    },
    FilterMeta = {
      Coalitions = {
@@ -4059,7 +4068,7 @@ do -- SET_CLIENT

  --- Remove CLIENT(s) from SET_CLIENT.
  -- @param Core.Set#SET_CLIENT self
-  -- @param Wrapper.Client#CLIENT RemoveClientNames A single name or an array of CLIENT names.
+  -- @param Wrapper.Client#CLIENT RemoveClientNames A single object or an array of CLIENT objects.
  -- @return self
  function SET_CLIENT:RemoveClientsByName( RemoveClientNames )

@@ -4369,7 +4378,7 @@ do -- SET_CLIENT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsInZone( ZoneObject ) then
@@ -4391,7 +4400,7 @@ do -- SET_CLIENT
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsNotInZone( ZoneObject ) then
@@ -4459,7 +4468,7 @@ do -- SET_CLIENT
        if self.Filter.Active == false or (self.Filter.Active == true and MClient:IsActive() == true and MClient:IsAlive() == true) then
          MClientActive = true
        end
-        --self:I( { "Evaluated Active", MClientActive } )
+        --self:T( { "Evaluated Active", MClientActive } )
        MClientInclude = MClientInclude and MClientActive
      end

@@ -4526,45 +4535,45 @@ do -- SET_CLIENT
        MClientInclude = MClientInclude and MClientPrefix
      end

-    if self.Filter.Zones then
-      local MClientZone = false
-      for ZoneName, Zone in pairs( self.Filter.Zones ) do
-      self:T3( "Zone:", ZoneName )
-      local unit = MClient:GetClientGroupUnit()
-      if unit and unit:IsInZone(Zone) then
-        MClientZone = true
-      end
-      end
-      MClientInclude = MClientInclude and MClientZone
-    end
+		if self.Filter.Zones then
+		  local MClientZone = false
+		  for ZoneName, Zone in pairs( self.Filter.Zones ) do
+			self:T3( "Zone:", ZoneName )
+			local unit = MClient:GetClientGroupUnit()
+			if unit and unit:IsInZone(Zone) then
+			  MClientZone = true
+			end
+		  end
+		  MClientInclude = MClientInclude and MClientZone
+		end
 		
-    if self.Filter.Playernames then
-      local MClientPlayername = false
-      local playername = MClient:GetPlayerName() or "Unknown"
-      --self:I(playername)
-      for _,_Playername in pairs(self.Filter.Playernames) do
-        if playername and string.find(playername,_Playername) then
-          MClientPlayername = true
-        end
-      end
-      self:T( { "Evaluated Playername", MClientPlayername } )
-      MClientInclude = MClientInclude and MClientPlayername
-    end
+		if self.Filter.Playernames then
+			local MClientPlayername = false
+			local playername = MClient:GetPlayerName() or "Unknown"
+			--self:T(playername)
+			for _,_Playername in pairs(self.Filter.Playernames) do
+				if playername and string.find(playername,_Playername) then
+					MClientPlayername = true
+				end
+			end
+			self:T( { "Evaluated Playername", MClientPlayername } )
+			MClientInclude = MClientInclude and MClientPlayername
+		end
 		
-    if self.Filter.Callsigns then
-      local MClientCallsigns = false
-      local callsign = MClient:GetCallsign()
-      --self:I(callsign)
-      for _,_Callsign in pairs(self.Filter.Callsigns) do
-        if callsign and string.find(callsign,_Callsign) then
-          MClientCallsigns = true
-        end
-      end
-      self:T( { "Evaluated Callsign", MClientCallsigns } )
-      MClientInclude = MClientInclude and MClientCallsigns
-    end
+		if self.Filter.Callsigns then
+			local MClientCallsigns = false
+			local callsign = MClient:GetCallsign()
+			--self:T(callsign)
+			for _,_Callsign in pairs(self.Filter.Callsigns) do
+				if callsign and string.find(callsign,_Callsign) then
+					MClientCallsigns = true
+				end
+			end
+			self:T( { "Evaluated Callsign", MClientCallsigns } )
+			MClientInclude = MClientInclude and MClientCallsigns
+		end
 		
-  end
+	end
    self:T2( MClientInclude )
    return MClientInclude
  end
@@ -4573,7 +4582,8 @@ end

 do -- SET_PLAYER

-  --- @type SET_PLAYER
+  ---
+  -- @type SET_PLAYER
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_PLAYER} class to build sets of units belonging to alive players:
@@ -4868,7 +4878,7 @@ do -- SET_PLAYER
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsInZone( ZoneObject ) then
@@ -4890,7 +4900,7 @@ do -- SET_PLAYER
    self:F2( arg )

    self:ForEach( IteratorFunction, arg, self:GetSet(),
-      --- @param Core.Zone#ZONE_BASE ZoneObject
+      -- @param Core.Zone#ZONE_BASE ZoneObject
      -- @param Wrapper.Client#CLIENT ClientObject
      function( ZoneObject, ClientObject )
        if ClientObject:IsNotInZone( ZoneObject ) then
@@ -4999,7 +5009,8 @@ end

 do -- SET_AIRBASE
  
-  --- @type SET_AIRBASE
+  ---
+  -- @type SET_AIRBASE
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_AIRBASE} class to build sets of airbases optionally belonging to certain:
@@ -5342,7 +5353,8 @@ end

 do -- SET_CARGO
  
-  --- @type SET_CARGO
+  ---
+  -- @type SET_CARGO
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_CARGO} class to build sets of cargos optionally belonging to certain:
@@ -5768,7 +5780,8 @@ end

 do -- SET_ZONE
  
-  --- @type SET_ZONE
+  ---
+  -- @type SET_ZONE
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_ZONE} class to build sets of zones of various types.
@@ -6136,7 +6149,8 @@ end

 do -- SET_ZONE_GOAL
  
-  --- @type SET_ZONE_GOAL
+  ---
+  -- @type SET_ZONE_GOAL
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_ZONE_GOAL} class to build sets of zones of various types.
@@ -6447,7 +6461,8 @@ end

 do -- SET_OPSZONE
  
-  --- @type SET_OPSZONE
+  ---
+  -- @type SET_OPSZONE
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_OPSZONE} class to build sets of zones of various types.
@@ -6904,7 +6919,8 @@ end

 do -- SET_OPSGROUP
  
-  --- @type SET_OPSGROUP
+  ---
+  -- @type SET_OPSGROUP
  -- @extends Core.Set#SET_BASE

  --- Mission designers can use the @{Core.Set#SET_OPSGROUP} class to build sets of OPS groups belonging to certain:
@@ -7571,6 +7587,7 @@ do -- SET_SCENERY
    Scenerys = {},
    Filter = {
      SceneryPrefixes = nil,
+      SceneryRoles = nil,
      Zones = nil,
    },
  }
@@ -7593,7 +7610,7 @@ do -- SET_SCENERY
    
    if ZoneSet then
      for _,_zone in pairs(ZoneSet.Set) do
-         self:T("Zone type handed: "..tostring(_zone.ClassName))
+        self:T("Zone type handed: "..tostring(_zone.ClassName))
        table.insert(zonenames,_zone:GetName())
      end   
      self:AddSceneryByName(zonenames)
@@ -7617,7 +7634,7 @@ do -- SET_SCENERY
  
  --- Add SCENERY(s) to SET_SCENERY.
  -- @param #SET_SCENERY self
-  -- @param #string AddScenery A single SCENERY.
+  -- @param Wrapper.Scenery#SCENERY AddScenery A single SCENERY object.
  -- @return #SET_SCENERY self
  function SET_SCENERY:AddScenery( AddScenery )
    self:F2( AddScenery:GetName() )
@@ -7687,6 +7704,7 @@ do -- SET_SCENERY
    end
    for _,Zone in pairs( zones ) do
      local zonename = Zone:GetName()
+      self:T(zonename)
      self.Filter.Zones[zonename] = Zone
    end
    return self
@@ -7705,11 +7723,30 @@ do -- SET_SCENERY
      Prefixes = { Prefixes }
    end
    for PrefixID, Prefix in pairs( Prefixes ) do
+      --self:T(Prefix)
      self.Filter.SceneryPrefixes[Prefix] = Prefix
    end
    return self
  end
  
+  --- Builds a set of SCENERYs that **contain** an exact match of the "ROLE" property.
+  -- @param #SET_SCENERY self
+  -- @param #string Role The string pattern(s) that needs to exactly match the scenery "ROLE" property from the ME quad-zone properties. Can also be passed as a `#table` of strings.
+  -- @return #SET_SCENERY self
+  function SET_SCENERY:FilterRoles( Role )
+    if not self.Filter.SceneryRoles then
+      self.Filter.SceneryRoles = {}
+    end
+    if type( Role ) ~= "table" then
+      Role = { Role }
+    end
+    for PrefixID, Prefix in pairs( Role ) do
+      --self:T(Prefix)
+      self.Filter.SceneryRoles[Prefix] = Prefix
+    end
+    return self
+  end
+  
  --- Iterate the SET_SCENERY and count how many SCENERYSs are alive.
  -- @param #SET_SCENERY self
  -- @return #number The number of SCENERYSs alive.
@@ -7802,10 +7839,76 @@ do -- SET_SCENERY
  -- @param Wrapper.Scenery#SCENERY MScenery
  -- @return #SET_SCENERY self
  function SET_SCENERY:IsIncludeObject( MScenery )
-    self:F2( MScenery )
-  return true
+    self:T( MScenery.SceneryName )
+
+    local MSceneryInclude = true
+    
+    if MScenery then
+      local MSceneryName = MScenery:GetName()
+      
+      -- Filter Prefixes
+      if self.Filter.Prefixes then
+        local MSceneryPrefix = false
+        for ZonePrefixId, ZonePrefix in pairs( self.Filter.Prefixes ) do
+          self:T( { "Prefix:", string.find( MSceneryName, ZonePrefix, 1 ), ZonePrefix } )
+          if string.find( MSceneryName, ZonePrefix, 1 ) then
+            MSceneryPrefix = true
+          end
+        end
+        self:T( { "Evaluated Prefix", MSceneryPrefix } )
+        MSceneryInclude = MSceneryInclude and MSceneryPrefix
+      end
+      
+      if self.Filter.Zones then
+        local MSceneryZone = false
+        for ZoneName, Zone in pairs( self.Filter.Zones ) do
+          --self:T( "Zone:", ZoneName )
+          local coord = MScenery:GetCoordinate()
+          if coord and Zone:IsCoordinateInZone(coord) then
+            MSceneryZone = true
+          end
+          self:T( { "Evaluated Zone", MSceneryZone } )
+        end
+        MSceneryInclude = MSceneryInclude and MSceneryZone
+      end
+
+      -- Filter Roles
+      if self.Filter.SceneryRoles then
+        local MSceneryRole = false
+        local Role = MScenery:GetProperty("ROLE") or "none"
+        for ZoneRoleId, ZoneRole in pairs( self.Filter.SceneryRoles ) do
+          self:T( { "Role:", ZoneRole, Role } )
+          if ZoneRole == Role then
+            MSceneryRole = true
+          end
+        end
+        self:T( { "Evaluated Role ", MSceneryRole } )
+        MSceneryInclude = MSceneryInclude and MSceneryRole
+      end
+    end
+
+    self:T2( MSceneryInclude )
+    return MSceneryInclude
  end
  
+  --- Filters for the defined collection.
+  -- @param #SET_SCENERY self
+  -- @return #SET_SCENERY self
+  function SET_SCENERY:FilterOnce()
+
+    for ObjectName, Object in pairs( self:GetSet() ) do
+      self:T(ObjectName)
+      if self:IsIncludeObject( Object ) then
+        self:Add( ObjectName, Object )
+      else
+        self:Remove(ObjectName, true)
+      end
+    end
+
+    return self --FilteredSet
+  end
+  
+  
  --- Count overall initial (Life0) lifepoints of the SET objects.
  -- @param #SET_SCENERY self
  -- @return #number LIfe0Points
@@ -7843,7 +7946,7 @@ do -- SET_SCENERY
  function SET_SCENERY:GetRelativeLife()
    local life = self:GetLife()
    local life0 = self:GetLife0()
-    self:T3(string.format("Set Lifepoints: %d life0 | %d life",life0,life))
+    self:T2(string.format("Set Lifepoints: %d life0 | %d life",life0,life))
    local rlife = math.floor((life / life0) * 100)
    return rlife
  end
--- a/Development/Moose/DCS.lua
+++ b/Development/Moose/DCS.lua
@@ -794,10 +794,111 @@ do -- Airbase
  -- @param self
  -- @return #Airbase.Desc

+  --- Returns the warehouse object associated with the airbase object. Can then be used to call the warehouse class functions to modify the contents of the warehouse.
+  -- @function [parent=#Airbase] getWarehouse
+  -- @param self
+  -- @return #Warehouse The DCS warehouse object of this airbase.
+
+  --- Enables or disables the airbase and FARP auto capture game mechanic where ownership of a base can change based on the presence of ground forces or the 
+  -- default setting assigned in the editor.
+  -- @function [parent=#Airbase] autoCapture
+  -- @param self
+  -- @param #boolean setting `true` : enables autoCapture behavior, `false` : disables autoCapture behavior
+
+  --- Returns the current autoCapture setting for the passed base.
+  -- @function [parent=#Airbase] autoCaptureIsOn
+  -- @param self
+  -- @return #boolean `true` if autoCapture behavior is enabled and `false` otherwise.
+
+  --- Changes the passed airbase object's coalition to the set value. Must be used with Airbase.autoCapture to disable auto capturing of the base, 
+  -- otherwise the base can revert back to a different coalition depending on the situation and built in game capture rules.
+  -- @function [parent=#Airbase] setCoalition
+  -- @param self
+  -- @param #number coa The new owner coalition: 0=neutra, 1=red, 2=blue.
+
+  --- Returns the wsType of every object that exists in DCS. A wsType is a table consisting of 4 entries indexed numerically. 
+  -- It can be used to broadly categorize object types. The table can be broken down as: {mainCategory, subCat1, subCat2, index}
+  -- @function [parent=#Airbase] getResourceMap
+  -- @param self
+  -- @return #table wsType of every object that exists in DCS.
+
  Airbase = {} --#Airbase

 end -- Airbase

+
+do -- Warehouse
+
+  --- [DCS Class Warehouse](https://wiki.hoggitworld.com/view/DCS_Class_Warehouse)
+  -- The warehouse class gives control over warehouses that exist in airbase objects. These warehouses can limit the aircraft, munitions, and fuel available to coalition aircraft.
+  -- @type Warehouse
+
+  --- Adds the passed amount of a given item to the warehouse.
+  -- itemName is the typeName associated with the item: "weapons.missiles.AIM_54C_Mk47"
+  -- A wsType table can also be used, however the last digit with wsTypes has been known to change. {4, 4, 7, 322}
+  -- @function [parent=#Warehouse] addItem
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @param #number count Number of items to add.
+
+  --- Returns the number of the passed type of item currently in a warehouse object.
+  -- @function [parent=#Warehouse] getItemCount
+  -- @param self
+  -- @param #string itemName Name of the item.
+
+  --- Sets the passed amount of a given item to the warehouse.
+  -- @function [parent=#Warehouse] setItem
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @param #number count Number of items to add.
+
+  --- Removes the amount of the passed item from the warehouse.
+  -- @function [parent=#Warehouse] removeItem
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @param #number count Number of items to be removed.
+
+  --- Adds the passed amount of a liquid fuel into the warehouse inventory.
+  -- @function [parent=#Warehouse] addLiquid
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @param #number count Amount of liquid to add.
+
+  --- Returns the amount of the passed liquid type within a given warehouse.
+  -- @function [parent=#Warehouse] getLiquidAmount
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @return #number Amount of liquid.
+
+  --- Sets the passed amount of a liquid fuel into the warehouse inventory.
+  -- @function [parent=#Warehouse] setLiquidAmount
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @param #number count Amount of liquid.
+
+  --- Removes the set amount of liquid from the inventory in a warehouse.
+  -- @function [parent=#Warehouse] setLiquidAmount
+  -- @param self
+  -- @param #number liquidType Type of liquid to add: 0=jetfuel, 1=aviation gasoline, 2=MW50, 3=Diesel.
+  -- @param #number count Amount of liquid.
+
+  --- Returns the airbase object associated with the warehouse object.
+  -- @function [parent=#Warehouse] getOwner
+  -- @param self
+  -- @return #Airbase The airbase object owning this warehouse.
+
+  --- Returns a full itemized list of everything currently in a warehouse. If a category is set to unlimited then the table will be returned empty.
+  -- Aircraft and weapons are indexed by strings. Liquids are indexed by number.
+  -- @function [parent=#Warehouse] getInventory
+  -- @param self
+  -- @param #string itemName Name of the item.
+  -- @return #table Itemized list of everything currently in a warehouse
+
+
+  Warehouse = {} --#Warehouse 
+
+end
+
 do -- Spot

  --- [DCS Class Spot](https://wiki.hoggitworld.com/view/DCS_Class_Spot)
--- a/Development/Moose/Functional/Range.lua
+++ b/Development/Moose/Functional/Range.lua
@@ -591,7 +591,7 @@ RANGE.MenuF10Root = nil

 --- Range script version.
 -- @field #string version
-RANGE.version = "2.7.0"
+RANGE.version = "2.7.1"

 -- TODO list:
 -- TODO: Verbosity level for messages.
@@ -2044,6 +2044,7 @@ function RANGE:OnEventShot( EventData )
    -- Attack parameters.
    local attackHdg=_unit:GetHeading()
    local attackAlt=_unit:GetHeight()
+    attackAlt = UTILS.MetersToFeet(attackAlt)
    local attackVel=_unit:GetVelocityKNOTS()    

    -- Tracking info and init of last bomb position.
--- a/Development/Moose/Functional/Scoring.lua
+++ b/Development/Moose/Functional/Scoring.lua
@@ -1420,7 +1420,7 @@ function SCORING:ReportDetailedPlayerHits( PlayerName )
          Penalty = Penalty + UnitData.Penalty
          PenaltyHit = UnitData.PenaltyHit
        end
-        local ScoreMessageHit = string.format( "%s:%d  ", CategoryName, Score - Penalty )
+        local ScoreMessageHit = string.format( "%s: %d  ", CategoryName, Score - Penalty )
        self:T( ScoreMessageHit )
        ScoreMessageHits = ScoreMessageHits .. ScoreMessageHit
        PlayerScore = PlayerScore + Score
@@ -1476,7 +1476,7 @@ function SCORING:ReportDetailedPlayerDestroys( PlayerName )
          end
        end

-        local ScoreMessageDestroy = string.format( "  %s:%d  ", CategoryName, Score - Penalty )
+        local ScoreMessageDestroy = string.format( "  %s: %d  ", CategoryName, Score - Penalty )
        self:T( ScoreMessageDestroy )
        ScoreMessageDestroys = ScoreMessageDestroys .. ScoreMessageDestroy

--- a/Development/Moose/Modules.lua
+++ b/Development/Moose/Modules.lua
@@ -48,6 +48,7 @@ __Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Weapon.lua' )
 __Moose.Include( 'Scripts/Moose/Wrapper/Net.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Storage.lua' )

 __Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' )
 __Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' )
--- a/Development/Moose/Ops/ATIS.lua
+++ b/Development/Moose/Ops/ATIS.lua
@@ -46,6 +46,7 @@
 -- ===
 --
 -- ### Author: **funkyfranky**
+-- ### Additions for SRS and FARP: **applevangelist**
 --
 -- @module Ops.ATIS
 -- @image OPS_ATIS.png
@@ -615,7 +616,7 @@ _ATIS = {}

 --- ATIS class version.
 -- @field #string version
-ATIS.version = "0.9.15"
+ATIS.version = "0.9.16"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1278,7 +1279,8 @@ end
 -- @param #string Event Event.
 -- @param #string To To state.
 function ATIS:onafterStart( From, Event, To )
-  self:I("Airbase category is "..self.airbase:GetAirbaseCategory())
+  self:T({From, Event, To})
+  self:T("Airbase category is "..self.airbase:GetAirbaseCategory())
  
  -- Check that this is an airdrome.
  if self.airbase:GetAirbaseCategory() == Airbase.Category.SHIP then
@@ -1340,7 +1342,7 @@ end
 -- @param #string Event Event.
 -- @param #string To To state.
 function ATIS:onafterStatus( From, Event, To )
-
+  self:T({From, Event, To})
  -- Get FSM state.
  local fsmstate = self:GetState()

@@ -1362,7 +1364,7 @@ function ATIS:onafterStatus( From, Event, To )
  self:T( self.lid .. text )
  
  if not self:Is("Stopped") then
-    self:__Status( -60 )
+    self:__Status( 60 )
  end
 end

@@ -1376,25 +1378,26 @@ end
 -- @param #string Event Event.
 -- @param #string To To state.
 function ATIS:onafterCheckQueue( From, Event, To )
+  self:T({From, Event, To})
+  if not self:Is("Stopped") then
+    if self.useSRS then

-  if self.useSRS then
-
-    self:Broadcast()
-
-  else
-
-    if #self.radioqueue.queue == 0 then
-      self:T( self.lid .. string.format( "Radio queue empty. Repeating message." ) )
      self:Broadcast()
+
    else
-      self:T2( self.lid .. string.format( "Radio queue %d transmissions queued.", #self.radioqueue.queue ) )
+
+      if #self.radioqueue.queue == 0 then
+        self:T( self.lid .. string.format( "Radio queue empty. Repeating message." ) )
+        self:Broadcast()
+      else
+        self:T2( self.lid .. string.format( "Radio queue %d transmissions queued.", #self.radioqueue.queue ) )
+      end
+
    end
  
-  end

-  if not self:Is("Stopped") then
    -- Check back in 5 seconds.  
-    self:__CheckQueue( -math.abs( self.dTQueueCheck ) )
+    self:__CheckQueue( math.abs( self.dTQueueCheck ) )
  end
 end

@@ -1404,7 +1407,7 @@ end
 -- @param #string Event Event.
 -- @param #string To To state.
 function ATIS:onafterBroadcast( From, Event, To )
-
+  self:T({From, Event, To})
  -- Get current coordinate.
  local coord = self.airbase:GetCoordinate()

@@ -2156,8 +2159,9 @@ function ATIS:onafterBroadcast( From, Event, To )

  if not self.ATISforFARPs then
    -- Active runway.
+    local subtitle
    if runwayLanding then
-      local subtitle=string.format("Active runway %s", runwayLanding)
+      subtitle=string.format("Active runway %s", runwayLanding)
      if rwyLandingLeft==true then
        subtitle=subtitle.." Left"
      elseif rwyLandingLeft==false then
@@ -2417,6 +2421,7 @@ end
 -- @param #string To To state.
 -- @param #string Text Report text.
 function ATIS:onafterReport( From, Event, To, Text )
+  self:T({From, Event, To})
  self:T( self.lid .. string.format( "Report:\n%s", Text ) )

  if self.useSRS and self.msrs then
--- a/Development/Moose/Utilities/Enums.lua
+++ b/Development/Moose/Utilities/Enums.lua
@@ -28,11 +28,11 @@ ENUMS = {}

 --- Rules of Engagement.
 -- @type ENUMS.ROE
-- @field #number WeaponFree AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target.
-- @field #number OpenFireWeaponFree AI will engage any enemy group it detects, but will prioritize targets specified in the groups tasking.
-- @field #number OpenFire AI will engage only targets specified in its taskings.
-- @field #number ReturnFire AI will only engage threats that shoot first.
-- @field #number WeaponHold AI will hold fire under all circumstances.
+-- @field #number WeaponFree [AIR] AI will engage any enemy group it detects. Target prioritization is based based on the threat of the target.
+-- @field #number OpenFireWeaponFree [AIR] AI will engage any enemy group it detects, but will prioritize targets specified in the groups tasking.
+-- @field #number OpenFire [AIR, GROUND, NAVAL] AI will engage only targets specified in its taskings.
+-- @field #number ReturnFire [AIR, GROUND, NAVAL] AI will only engage threats that shoot first.
+-- @field #number WeaponHold [AIR, GROUND, NAVAL] AI will hold fire under all circumstances.
 ENUMS.ROE = {
  WeaponFree=0,
  OpenFireWeaponFree=1,
@@ -236,6 +236,7 @@ ENUMS.WeaponType.Any={
 -- @field #string ESCORT Escort another group.
 -- @field #string FIGHTERSWEEP Fighter sweep.
 -- @field #string GROUNDATTACK Ground attack.
+-- @field #string GROUNDESCORT Ground escort another group.
 -- @field #string INTERCEPT Intercept.
 -- @field #string PINPOINTSTRIKE Pinpoint strike.
 -- @field #string RECONNAISSANCE Reconnaissance mission.
@@ -251,6 +252,7 @@ ENUMS.MissionTask={
  CAP="CAP",
  CAS="CAS",
  ESCORT="Escort",
+  GROUNDESCORT="Ground escort",
  FIGHTERSWEEP="Fighter Sweep",
  GROUNDATTACK="Ground Attack",
  INTERCEPT="Intercept",
@@ -560,3 +562,578 @@ ENUMS.ReportingName =
    Predator = "MQ-1A",
  }
 }
+
+
+
+--- Enums for the STORAGE class for stores - which need to be in ""
+-- @type ENUMS.Storage
+-- @type ENUMS.Storage.weapons
+ENUMS.Storage = {
+  weapons = {
+    missiles = {}, -- Missiles
+    bombs = {}, -- Bombs
+    nurs = {}, --  Rockets and unguided
+    containers = {}, -- Containers
+    droptanks = {}, -- Droptanks
+    adapters = {}, -- Adapter
+    torpedoes = {}, -- Torpedoes
+  }
+}
+
+ENUMS.Storage.weapons.nurs.SNEB_TYPE253_F1B = "weapons.nurs.SNEB_TYPE253_F1B" 
+ENUMS.Storage.weapons.missiles.P_24T = "weapons.missiles.P_24T" 
+ENUMS.Storage.weapons.bombs.BLU_3B_OLD = "weapons.bombs.BLU-3B_OLD" 
+ENUMS.Storage.weapons.missiles.AGM_154 = "weapons.missiles.AGM_154" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M151_M433 = "weapons.nurs.HYDRA_70_M151_M433" 
+ENUMS.Storage.weapons.bombs.SAM_Avenger_M1097_Skid_7090lb = "weapons.bombs.SAM Avenger M1097 Skid [7090lb]" 
+ENUMS.Storage.weapons.bombs.British_GP_250LB_Bomb_Mk5 = "weapons.bombs.British_GP_250LB_Bomb_Mk5" 
+ENUMS.Storage.weapons.containers.OV10_SMOKE = "weapons.containers.{OV10_SMOKE}" 
+ENUMS.Storage.weapons.bombs.BLU_4B_OLD = "weapons.bombs.BLU-4B_OLD" 
+ENUMS.Storage.weapons.bombs.FAB_500M54 = "weapons.bombs.FAB-500M54" 
+ENUMS.Storage.weapons.bombs.GBU_38 = "weapons.bombs.GBU_38" 
+ENUMS.Storage.weapons.containers.F_15E_AXQ_14_DATALINK = "weapons.containers.F-15E_AXQ-14_DATALINK" 
+ENUMS.Storage.weapons.bombs.BEER_BOMB = "weapons.bombs.BEER_BOMB" 
+ENUMS.Storage.weapons.bombs.P_50T = "weapons.bombs.P-50T" 
+ENUMS.Storage.weapons.nurs.C_8CM_GN = "weapons.nurs.C_8CM_GN" 
+ENUMS.Storage.weapons.bombs.FAB_500SL = "weapons.bombs.FAB-500SL" 
+ENUMS.Storage.weapons.bombs.KAB_1500Kr = "weapons.bombs.KAB_1500Kr" 
+ENUMS.Storage.weapons.bombs.two50_2 = "weapons.bombs.250-2" 
+ENUMS.Storage.weapons.droptanks.Spitfire_tank_1 = "weapons.droptanks.Spitfire_tank_1" 
+ENUMS.Storage.weapons.missiles.AGM_65G = "weapons.missiles.AGM_65G" 
+ENUMS.Storage.weapons.missiles.AGM_65A = "weapons.missiles.AGM_65A" 
+ENUMS.Storage.weapons.containers.Hercules_JATO = "weapons.containers.Hercules_JATO" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M259 = "weapons.nurs.HYDRA_70_M259" 
+ENUMS.Storage.weapons.missiles.AGM_84E = "weapons.missiles.AGM_84E" 
+ENUMS.Storage.weapons.bombs.AN_M30A1 = "weapons.bombs.AN_M30A1" 
+ENUMS.Storage.weapons.nurs.C_25 = "weapons.nurs.C_25" 
+ENUMS.Storage.weapons.containers.AV8BNA_ALQ164 = "weapons.containers.AV8BNA_ALQ164" 
+ENUMS.Storage.weapons.containers.lav_25 = "weapons.containers.lav-25" 
+ENUMS.Storage.weapons.missiles.P_60 = "weapons.missiles.P_60" 
+ENUMS.Storage.weapons.bombs.FAB_1500 = "weapons.bombs.FAB_1500" 
+ENUMS.Storage.weapons.droptanks.FuelTank_350L = "weapons.droptanks.FuelTank_350L" 
+ENUMS.Storage.weapons.bombs.AAA_Vulcan_M163_Skid_21577lb = "weapons.bombs.AAA Vulcan M163 Skid [21577lb]" 
+ENUMS.Storage.weapons.missiles.Kormoran = "weapons.missiles.Kormoran" 
+ENUMS.Storage.weapons.droptanks.HB_F14_EXT_DROPTANK_EMPTY = "weapons.droptanks.HB_F14_EXT_DROPTANK_EMPTY" 
+ENUMS.Storage.weapons.droptanks.FuelTank_150L = "weapons.droptanks.FuelTank_150L" 
+ENUMS.Storage.weapons.missiles.Rb_15F_for_A_I = "weapons.missiles.Rb 15F (for A.I.)" 
+ENUMS.Storage.weapons.missiles.RB75T = "weapons.missiles.RB75T" 
+ENUMS.Storage.weapons.missiles.Vikhr_M = "weapons.missiles.Vikhr_M" 
+ENUMS.Storage.weapons.nurs.FFAR_M156_WP = "weapons.nurs.FFAR M156 WP" 
+ENUMS.Storage.weapons.nurs.British_HE_60LBSAPNo2_3INCHNo1 = "weapons.nurs.British_HE_60LBSAPNo2_3INCHNo1" 
+ENUMS.Storage.weapons.missiles.DWS39_MJ2 = "weapons.missiles.DWS39_MJ2" 
+ENUMS.Storage.weapons.bombs.HEBOMBD = "weapons.bombs.HEBOMBD" 
+ENUMS.Storage.weapons.missiles.CATM_9M = "weapons.missiles.CATM_9M" 
+ENUMS.Storage.weapons.bombs.Mk_81 = "weapons.bombs.Mk_81" 
+ENUMS.Storage.weapons.droptanks.Drop_Tank_300_Liter = "weapons.droptanks.Drop_Tank_300_Liter" 
+ENUMS.Storage.weapons.containers.HMMWV_M1025 = "weapons.containers.HMMWV_M1025" 
+ENUMS.Storage.weapons.bombs.SAM_CHAPARRAL_Air_21624lb = "weapons.bombs.SAM CHAPARRAL Air [21624lb]" 
+ENUMS.Storage.weapons.missiles.AGM_154A = "weapons.missiles.AGM_154A" 
+ENUMS.Storage.weapons.bombs.Mk_84AIR_TP = "weapons.bombs.Mk_84AIR_TP" 
+ENUMS.Storage.weapons.bombs.GBU_31_V_3B = "weapons.bombs.GBU_31_V_3B" 
+ENUMS.Storage.weapons.nurs.C_8CM_WH = "weapons.nurs.C_8CM_WH" 
+ENUMS.Storage.weapons.missiles.Matra_Super_530D = "weapons.missiles.Matra Super 530D" 
+ENUMS.Storage.weapons.nurs.ARF8M3TPSM = "weapons.nurs.ARF8M3TPSM" 
+ENUMS.Storage.weapons.missiles.TGM_65H = "weapons.missiles.TGM_65H" 
+ENUMS.Storage.weapons.nurs.M8rocket = "weapons.nurs.M8rocket" 
+ENUMS.Storage.weapons.bombs.GBU_27 = "weapons.bombs.GBU_27" 
+ENUMS.Storage.weapons.missiles.AGR_20A = "weapons.missiles.AGR_20A" 
+ENUMS.Storage.weapons.missiles.LS_6_250 = "weapons.missiles.LS-6-250" 
+ENUMS.Storage.weapons.droptanks.M2KC_RPL_522_EMPTY = "weapons.droptanks.M2KC_RPL_522_EMPTY" 
+ENUMS.Storage.weapons.droptanks.M2KC_02_RPL541 = "weapons.droptanks.M2KC_02_RPL541" 
+ENUMS.Storage.weapons.missiles.AGM_45 = "weapons.missiles.AGM_45" 
+ENUMS.Storage.weapons.missiles.AGM_84A = "weapons.missiles.AGM_84A" 
+ENUMS.Storage.weapons.bombs.APC_BTR_80_Air_23936lb = "weapons.bombs.APC BTR-80 Air [23936lb]" 
+ENUMS.Storage.weapons.missiles.P_33E = "weapons.missiles.P_33E" 
+ENUMS.Storage.weapons.missiles.Ataka_9M120 = "weapons.missiles.Ataka_9M120" 
+ENUMS.Storage.weapons.bombs.MK76 = "weapons.bombs.MK76" 
+ENUMS.Storage.weapons.bombs.AB_250_2_SD_2 = "weapons.bombs.AB_250_2_SD_2" 
+ENUMS.Storage.weapons.missiles.Rb_05A = "weapons.missiles.Rb 05A" 
+ENUMS.Storage.weapons.bombs.ART_GVOZDIKA_34720lb = "weapons.bombs.ART GVOZDIKA [34720lb]" 
+ENUMS.Storage.weapons.bombs.Generic_Crate_20000lb = "weapons.bombs.Generic Crate [20000lb]" 
+ENUMS.Storage.weapons.bombs.FAB_100SV = "weapons.bombs.FAB_100SV" 
+ENUMS.Storage.weapons.bombs.BetAB_500 = "weapons.bombs.BetAB_500" 
+ENUMS.Storage.weapons.droptanks.M2KC_02_RPL541_EMPTY = "weapons.droptanks.M2KC_02_RPL541_EMPTY" 
+ENUMS.Storage.weapons.droptanks.PTB600_MIG15 = "weapons.droptanks.PTB600_MIG15" 
+ENUMS.Storage.weapons.missiles.Rb_24J = "weapons.missiles.Rb 24J" 
+ENUMS.Storage.weapons.nurs.C_8CM_BU = "weapons.nurs.C_8CM_BU" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE259E_F1B = "weapons.nurs.SNEB_TYPE259E_F1B" 
+ENUMS.Storage.weapons.nurs.WGr21 = "weapons.nurs.WGr21" 
+ENUMS.Storage.weapons.bombs.SAMP250HD = "weapons.bombs.SAMP250HD" 
+ENUMS.Storage.weapons.containers.alq_184long = "weapons.containers.alq-184long" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE259E_H1 = "weapons.nurs.SNEB_TYPE259E_H1" 
+ENUMS.Storage.weapons.bombs.British_SAP_250LB_Bomb_Mk5 = "weapons.bombs.British_SAP_250LB_Bomb_Mk5" 
+ENUMS.Storage.weapons.bombs.Transport_UAZ_469_Air_3747lb = "weapons.bombs.Transport UAZ-469 Air [3747lb]" 
+ENUMS.Storage.weapons.bombs.Mk_83CT = "weapons.bombs.Mk_83CT" 
+ENUMS.Storage.weapons.missiles.AIM_7P = "weapons.missiles.AIM-7P" 
+ENUMS.Storage.weapons.missiles.AT_6 = "weapons.missiles.AT_6" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_H1_GREEN = "weapons.nurs.SNEB_TYPE254_H1_GREEN" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE250_F1B = "weapons.nurs.SNEB_TYPE250_F1B" 
+ENUMS.Storage.weapons.containers.U22A = "weapons.containers.U22A" 
+ENUMS.Storage.weapons.bombs.British_GP_250LB_Bomb_Mk1 = "weapons.bombs.British_GP_250LB_Bomb_Mk1" 
+ENUMS.Storage.weapons.bombs.CBU_105 = "weapons.bombs.CBU_105" 
+ENUMS.Storage.weapons.droptanks.FW_190_Fuel_Tank = "weapons.droptanks.FW-190_Fuel-Tank" 
+ENUMS.Storage.weapons.missiles.X_58 = "weapons.missiles.X_58" 
+ENUMS.Storage.weapons.missiles.BK90_MJ1_MJ2 = "weapons.missiles.BK90_MJ1_MJ2" 
+ENUMS.Storage.weapons.missiles.TGM_65D = "weapons.missiles.TGM_65D" 
+ENUMS.Storage.weapons.containers.BRD_4_250 = "weapons.containers.BRD-4-250" 
+ENUMS.Storage.weapons.missiles.P_73 = "weapons.missiles.P_73" 
+ENUMS.Storage.weapons.bombs.AN_M66 = "weapons.bombs.AN_M66" 
+ENUMS.Storage.weapons.bombs.APC_LAV_25_Air_22520lb = "weapons.bombs.APC LAV-25 Air [22520lb]" 
+ENUMS.Storage.weapons.missiles.AIM_7MH = "weapons.missiles.AIM-7MH" 
+ENUMS.Storage.weapons.containers.MB339_TravelPod = "weapons.containers.MB339_TravelPod" 
+ENUMS.Storage.weapons.bombs.GBU_12 = "weapons.bombs.GBU_12" 
+ENUMS.Storage.weapons.bombs.SC_250_T3_J = "weapons.bombs.SC_250_T3_J" 
+ENUMS.Storage.weapons.missiles.KD_20 = "weapons.missiles.KD-20" 
+ENUMS.Storage.weapons.missiles.AGM_86C = "weapons.missiles.AGM_86C" 
+ENUMS.Storage.weapons.missiles.X_35 = "weapons.missiles.X_35" 
+ENUMS.Storage.weapons.bombs.MK106 = "weapons.bombs.MK106" 
+ENUMS.Storage.weapons.bombs.BETAB_500S = "weapons.bombs.BETAB-500S" 
+ENUMS.Storage.weapons.nurs.C_5 = "weapons.nurs.C_5" 
+ENUMS.Storage.weapons.nurs.S_24B = "weapons.nurs.S-24B" 
+ENUMS.Storage.weapons.bombs.British_MC_500LB_Bomb_Mk2 = "weapons.bombs.British_MC_500LB_Bomb_Mk2" 
+ENUMS.Storage.weapons.containers.ANAWW_13 = "weapons.containers.ANAWW_13" 
+ENUMS.Storage.weapons.droptanks.droptank_108_gal = "weapons.droptanks.droptank_108_gal" 
+ENUMS.Storage.weapons.droptanks.DFT_300_GAL_A4E_LR = "weapons.droptanks.DFT_300_GAL_A4E_LR" 
+ENUMS.Storage.weapons.bombs.CBU_87 = "weapons.bombs.CBU_87" 
+ENUMS.Storage.weapons.missiles.GAR_8 = "weapons.missiles.GAR-8" 
+ENUMS.Storage.weapons.bombs.BELOUGA = "weapons.bombs.BELOUGA" 
+ENUMS.Storage.weapons.containers.EclairM_33 = "weapons.containers.{EclairM_33}" 
+ENUMS.Storage.weapons.bombs.ART_2S9_NONA_Air_19140lb = "weapons.bombs.ART 2S9 NONA Air [19140lb]" 
+ENUMS.Storage.weapons.bombs.BR_250 = "weapons.bombs.BR_250" 
+ENUMS.Storage.weapons.bombs.IAB_500 = "weapons.bombs.IAB-500" 
+ENUMS.Storage.weapons.containers.AN_ASQ_228 = "weapons.containers.AN_ASQ_228" 
+ENUMS.Storage.weapons.missiles.P_27P = "weapons.missiles.P_27P" 
+ENUMS.Storage.weapons.bombs.SD_250_Stg = "weapons.bombs.SD_250_Stg" 
+ENUMS.Storage.weapons.missiles.R_530F_IR = "weapons.missiles.R_530F_IR" 
+ENUMS.Storage.weapons.bombs.British_SAP_500LB_Bomb_Mk5 = "weapons.bombs.British_SAP_500LB_Bomb_Mk5" 
+ENUMS.Storage.weapons.bombs.FAB_250M54 = "weapons.bombs.FAB-250M54" 
+ENUMS.Storage.weapons.containers.M2KC_AAF = "weapons.containers.{M2KC_AAF}" 
+ENUMS.Storage.weapons.missiles.CM_802AKG_AI = "weapons.missiles.CM-802AKG_AI" 
+ENUMS.Storage.weapons.bombs.CBU_103 = "weapons.bombs.CBU_103" 
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_RED = "weapons.containers.{US_M10_SMOKE_TANK_RED}" 
+ENUMS.Storage.weapons.missiles.X_29T = "weapons.missiles.X_29T" 
+ENUMS.Storage.weapons.bombs.HEMTT_TFFT_34400lb = "weapons.bombs.HEMTT TFFT [34400lb]" 
+ENUMS.Storage.weapons.missiles.C_701IR = "weapons.missiles.C-701IR" 
+ENUMS.Storage.weapons.containers.fullCargoSeats = "weapons.containers.fullCargoSeats" 
+ENUMS.Storage.weapons.bombs.GBU_15_V_31_B = "weapons.bombs.GBU_15_V_31_B" 
+ENUMS.Storage.weapons.bombs.APC_M1043_HMMWV_Armament_Air_7023lb = "weapons.bombs.APC M1043 HMMWV Armament Air [7023lb]" 
+ENUMS.Storage.weapons.missiles.PL_5EII = "weapons.missiles.PL-5EII" 
+ENUMS.Storage.weapons.bombs.SC_250_T1_L2 = "weapons.bombs.SC_250_T1_L2" 
+ENUMS.Storage.weapons.torpedoes.mk46torp_name = "weapons.torpedoes.mk46torp_name" 
+ENUMS.Storage.weapons.containers.F_15E_AAQ_33_XR_ATP_SE = "weapons.containers.F-15E_AAQ-33_XR_ATP-SE" 
+ENUMS.Storage.weapons.missiles.AIM_7 = "weapons.missiles.AIM_7" 
+ENUMS.Storage.weapons.missiles.AGM_122 = "weapons.missiles.AGM_122" 
+ENUMS.Storage.weapons.bombs.HEBOMB = "weapons.bombs.HEBOMB" 
+ENUMS.Storage.weapons.bombs.CBU_97 = "weapons.bombs.CBU_97" 
+ENUMS.Storage.weapons.bombs.MK_81SE = "weapons.bombs.MK-81SE" 
+ENUMS.Storage.weapons.nurs.Zuni_127 = "weapons.nurs.Zuni_127" 
+ENUMS.Storage.weapons.containers.M2KC_AGF = "weapons.containers.{M2KC_AGF}" 
+ENUMS.Storage.weapons.droptanks.Hercules_ExtFuelTank = "weapons.droptanks.Hercules_ExtFuelTank" 
+ENUMS.Storage.weapons.containers.SMOKE_WHITE = "weapons.containers.{SMOKE_WHITE}" 
+ENUMS.Storage.weapons.droptanks.droptank_150_gal = "weapons.droptanks.droptank_150_gal" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_WTU1B = "weapons.nurs.HYDRA_70_WTU1B" 
+ENUMS.Storage.weapons.missiles.GB_6_SFW = "weapons.missiles.GB-6-SFW" 
+ENUMS.Storage.weapons.missiles.KD_63 = "weapons.missiles.KD-63" 
+ENUMS.Storage.weapons.bombs.GBU_28 = "weapons.bombs.GBU_28" 
+ENUMS.Storage.weapons.nurs.C_8CM_YE = "weapons.nurs.C_8CM_YE" 
+ENUMS.Storage.weapons.droptanks.HB_F14_EXT_DROPTANK = "weapons.droptanks.HB_F14_EXT_DROPTANK" 
+ENUMS.Storage.weapons.missiles.Super_530F = "weapons.missiles.Super_530F" 
+ENUMS.Storage.weapons.missiles.Ataka_9M220 = "weapons.missiles.Ataka_9M220" 
+ENUMS.Storage.weapons.bombs.BDU_33 = "weapons.bombs.BDU_33" 
+ENUMS.Storage.weapons.bombs.British_GP_250LB_Bomb_Mk4 = "weapons.bombs.British_GP_250LB_Bomb_Mk4" 
+ENUMS.Storage.weapons.missiles.TOW = "weapons.missiles.TOW" 
+ENUMS.Storage.weapons.bombs.ATGM_M1045_HMMWV_TOW_Air_7183lb = "weapons.bombs.ATGM M1045 HMMWV TOW Air [7183lb]" 
+ENUMS.Storage.weapons.missiles.X_25MR = "weapons.missiles.X_25MR" 
+ENUMS.Storage.weapons.droptanks.fueltank230 = "weapons.droptanks.fueltank230" 
+ENUMS.Storage.weapons.droptanks.PTB_490C_MIG21 = "weapons.droptanks.PTB-490C-MIG21" 
+ENUMS.Storage.weapons.bombs.M1025_HMMWV_Air_6160lb = "weapons.bombs.M1025 HMMWV Air [6160lb]" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_F1B_GREEN = "weapons.nurs.SNEB_TYPE254_F1B_GREEN" 
+ENUMS.Storage.weapons.missiles.R_550 = "weapons.missiles.R_550" 
+ENUMS.Storage.weapons.bombs.KAB_1500LG = "weapons.bombs.KAB_1500LG" 
+ENUMS.Storage.weapons.missiles.AGM_84D = "weapons.missiles.AGM_84D" 
+ENUMS.Storage.weapons.missiles.YJ_83K = "weapons.missiles.YJ-83K" 
+ENUMS.Storage.weapons.missiles.AIM_54C_Mk47 = "weapons.missiles.AIM_54C_Mk47" 
+ENUMS.Storage.weapons.missiles.BRM_1_90MM = "weapons.missiles.BRM-1_90MM" 
+ENUMS.Storage.weapons.missiles.Ataka_9M120F = "weapons.missiles.Ataka_9M120F" 
+ENUMS.Storage.weapons.droptanks.Eleven00L_Tank = "weapons.droptanks.1100L Tank" 
+ENUMS.Storage.weapons.bombs.BAP_100 = "weapons.bombs.BAP_100" 
+ENUMS.Storage.weapons.adapters.lau_88 = "weapons.adapters.lau-88" 
+ENUMS.Storage.weapons.missiles.P_40T = "weapons.missiles.P_40T" 
+ENUMS.Storage.weapons.missiles.GB_6 = "weapons.missiles.GB-6" 
+ENUMS.Storage.weapons.bombs.FAB_250M54TU = "weapons.bombs.FAB-250M54TU" 
+ENUMS.Storage.weapons.missiles.DWS39_MJ1 = "weapons.missiles.DWS39_MJ1" 
+ENUMS.Storage.weapons.missiles.CM_802AKG = "weapons.missiles.CM-802AKG" 
+ENUMS.Storage.weapons.bombs.FAB_250 = "weapons.bombs.FAB_250" 
+ENUMS.Storage.weapons.missiles.C_802AK = "weapons.missiles.C_802AK" 
+ENUMS.Storage.weapons.bombs.SD_500_A = "weapons.bombs.SD_500_A" 
+ENUMS.Storage.weapons.bombs.GBU_32_V_2B = "weapons.bombs.GBU_32_V_2B" 
+ENUMS.Storage.weapons.containers.marder = "weapons.containers.marder" 
+ENUMS.Storage.weapons.missiles.ADM_141B = "weapons.missiles.ADM_141B" 
+ENUMS.Storage.weapons.bombs.ROCKEYE = "weapons.bombs.ROCKEYE" 
+ENUMS.Storage.weapons.missiles.BK90_MJ1 = "weapons.missiles.BK90_MJ1" 
+ENUMS.Storage.weapons.containers.BTR_80 = "weapons.containers.BTR-80" 
+ENUMS.Storage.weapons.bombs.SAM_ROLAND_ADS_34720lb = "weapons.bombs.SAM ROLAND ADS [34720lb]" 
+ENUMS.Storage.weapons.containers.wmd7 = "weapons.containers.wmd7" 
+ENUMS.Storage.weapons.missiles.C_701T = "weapons.missiles.C-701T" 
+ENUMS.Storage.weapons.missiles.AIM_7E_2 = "weapons.missiles.AIM-7E-2" 
+ENUMS.Storage.weapons.nurs.HVAR = "weapons.nurs.HVAR" 
+ENUMS.Storage.weapons.containers.HMMWV_M1043 = "weapons.containers.HMMWV_M1043" 
+ENUMS.Storage.weapons.droptanks.PTB_800_MIG21 = "weapons.droptanks.PTB-800-MIG21" 
+ENUMS.Storage.weapons.missiles.AGM_114 = "weapons.missiles.AGM_114" 
+ENUMS.Storage.weapons.bombs.APC_M1126_Stryker_ICV_29542lb = "weapons.bombs.APC M1126 Stryker ICV [29542lb]" 
+ENUMS.Storage.weapons.bombs.APC_M113_Air_21624lb = "weapons.bombs.APC M113 Air [21624lb]" 
+ENUMS.Storage.weapons.bombs.M_117 = "weapons.bombs.M_117" 
+ENUMS.Storage.weapons.missiles.AGM_65D = "weapons.missiles.AGM_65D" 
+ENUMS.Storage.weapons.droptanks.MB339_TT320_L = "weapons.droptanks.MB339_TT320_L" 
+ENUMS.Storage.weapons.missiles.AGM_86 = "weapons.missiles.AGM_86" 
+ENUMS.Storage.weapons.bombs.BDU_45LGB = "weapons.bombs.BDU_45LGB" 
+ENUMS.Storage.weapons.missiles.AGM_65H = "weapons.missiles.AGM_65H" 
+ENUMS.Storage.weapons.nurs.RS_82 = "weapons.nurs.RS-82" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE252_F1B = "weapons.nurs.SNEB_TYPE252_F1B" 
+ENUMS.Storage.weapons.bombs.BL_755 = "weapons.bombs.BL_755" 
+ENUMS.Storage.weapons.containers.F_15E_AAQ_28_LITENING = "weapons.containers.F-15E_AAQ-28_LITENING" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE256_F1B = "weapons.nurs.SNEB_TYPE256_F1B" 
+ENUMS.Storage.weapons.missiles.AGM_84H = "weapons.missiles.AGM_84H" 
+ENUMS.Storage.weapons.missiles.AIM_54 = "weapons.missiles.AIM_54" 
+ENUMS.Storage.weapons.missiles.X_31A = "weapons.missiles.X_31A" 
+ENUMS.Storage.weapons.bombs.KAB_500Kr = "weapons.bombs.KAB_500Kr" 
+ENUMS.Storage.weapons.containers.SPS_141_100 = "weapons.containers.SPS-141-100" 
+ENUMS.Storage.weapons.missiles.BK90_MJ2 = "weapons.missiles.BK90_MJ2" 
+ENUMS.Storage.weapons.missiles.Super_530D = "weapons.missiles.Super_530D" 
+ENUMS.Storage.weapons.bombs.CBU_52B = "weapons.bombs.CBU_52B" 
+ENUMS.Storage.weapons.droptanks.PTB_450 = "weapons.droptanks.PTB-450" 
+ENUMS.Storage.weapons.bombs.IFV_MCV_80_34720lb = "weapons.bombs.IFV MCV-80 [34720lb]" 
+ENUMS.Storage.weapons.containers.Two_c9 = "weapons.containers.2-c9" 
+ENUMS.Storage.weapons.missiles.AIM_9JULI = "weapons.missiles.AIM-9JULI" 
+ENUMS.Storage.weapons.droptanks.MB339_TT500_R = "weapons.droptanks.MB339_TT500_R" 
+ENUMS.Storage.weapons.nurs.C_8CM = "weapons.nurs.C_8CM" 
+ENUMS.Storage.weapons.containers.BARAX = "weapons.containers.BARAX" 
+ENUMS.Storage.weapons.missiles.P_40R = "weapons.missiles.P_40R" 
+ENUMS.Storage.weapons.missiles.YJ_12 = "weapons.missiles.YJ-12" 
+ENUMS.Storage.weapons.missiles.CM_802AKG = "weapons.missiles.CM_802AKG" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_H1_YELLOW = "weapons.nurs.SNEB_TYPE254_H1_YELLOW" 
+ENUMS.Storage.weapons.bombs.Durandal = "weapons.bombs.Durandal" 
+ENUMS.Storage.weapons.droptanks.i16_eft = "weapons.droptanks.i16_eft" 
+ENUMS.Storage.weapons.droptanks.AV8BNA_AERO1D_EMPTY = "weapons.droptanks.AV8BNA_AERO1D_EMPTY" 
+ENUMS.Storage.weapons.containers.Hercules_Battle_Station_TGP = "weapons.containers.Hercules_Battle_Station_TGP" 
+ENUMS.Storage.weapons.nurs.C_8CM_VT = "weapons.nurs.C_8CM_VT" 
+ENUMS.Storage.weapons.missiles.PL_12 = "weapons.missiles.PL-12" 
+ENUMS.Storage.weapons.missiles.R_3R = "weapons.missiles.R-3R" 
+ENUMS.Storage.weapons.bombs.GBU_54_V_1B = "weapons.bombs.GBU_54_V_1B" 
+ENUMS.Storage.weapons.droptanks.MB339_TT320_R = "weapons.droptanks.MB339_TT320_R" 
+ENUMS.Storage.weapons.bombs.RN_24 = "weapons.bombs.RN-24" 
+ENUMS.Storage.weapons.containers.Twoc6m = "weapons.containers.2c6m" 
+ENUMS.Storage.weapons.bombs.ARV_BRDM_2_Air_12320lb = "weapons.bombs.ARV BRDM-2 Air [12320lb]" 
+ENUMS.Storage.weapons.bombs.ARV_BRDM_2_Skid_12210lb = "weapons.bombs.ARV BRDM-2 Skid [12210lb]" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE251_F1B = "weapons.nurs.SNEB_TYPE251_F1B" 
+ENUMS.Storage.weapons.missiles.X_41 = "weapons.missiles.X_41" 
+ENUMS.Storage.weapons.containers.MIG21_SMOKE_WHITE = "weapons.containers.{MIG21_SMOKE_WHITE}" 
+ENUMS.Storage.weapons.bombs.MK_82AIR = "weapons.bombs.MK_82AIR" 
+ENUMS.Storage.weapons.missiles.R_530F_EM = "weapons.missiles.R_530F_EM" 
+ENUMS.Storage.weapons.bombs.SAMP400LD = "weapons.bombs.SAMP400LD" 
+ENUMS.Storage.weapons.bombs.FAB_50 = "weapons.bombs.FAB_50" 
+ENUMS.Storage.weapons.bombs.AB_250_2_SD_10A = "weapons.bombs.AB_250_2_SD_10A" 
+ENUMS.Storage.weapons.missiles.ADM_141A = "weapons.missiles.ADM_141A" 
+ENUMS.Storage.weapons.containers.KBpod = "weapons.containers.KBpod" 
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk4 = "weapons.bombs.British_GP_500LB_Bomb_Mk4" 
+ENUMS.Storage.weapons.missiles.AGM_65E = "weapons.missiles.AGM_65E" 
+ENUMS.Storage.weapons.containers.sa342_dipole_antenna = "weapons.containers.sa342_dipole_antenna" 
+ENUMS.Storage.weapons.bombs.OFAB_100_Jupiter = "weapons.bombs.OFAB-100 Jupiter" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE257_F1B = "weapons.nurs.SNEB_TYPE257_F1B" 
+ENUMS.Storage.weapons.missiles.Rb_04E_for_A_I = "weapons.missiles.Rb 04E (for A.I.)" 
+ENUMS.Storage.weapons.bombs.AN_M66A2 = "weapons.bombs.AN-M66A2" 
+ENUMS.Storage.weapons.missiles.P_27T = "weapons.missiles.P_27T" 
+ENUMS.Storage.weapons.droptanks.LNS_VIG_XTANK = "weapons.droptanks.LNS_VIG_XTANK" 
+ENUMS.Storage.weapons.missiles.R_55 = "weapons.missiles.R-55" 
+ENUMS.Storage.weapons.torpedoes.YU_6 = "weapons.torpedoes.YU-6" 
+ENUMS.Storage.weapons.bombs.British_MC_250LB_Bomb_Mk2 = "weapons.bombs.British_MC_250LB_Bomb_Mk2" 
+ENUMS.Storage.weapons.droptanks.PTB_120_F86F35 = "weapons.droptanks.PTB_120_F86F35" 
+ENUMS.Storage.weapons.missiles.PL_8B = "weapons.missiles.PL-8B" 
+ENUMS.Storage.weapons.droptanks.F_15E_Drop_Tank_Empty = "weapons.droptanks.F-15E_Drop_Tank_Empty" 
+ENUMS.Storage.weapons.nurs.British_HE_60LBFNo1_3INCHNo1 = "weapons.nurs.British_HE_60LBFNo1_3INCHNo1" 
+ENUMS.Storage.weapons.missiles.P_77 = "weapons.missiles.P_77" 
+ENUMS.Storage.weapons.torpedoes.LTF_5B = "weapons.torpedoes.LTF_5B" 
+ENUMS.Storage.weapons.missiles.R_3S = "weapons.missiles.R-3S" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE253_H1 = "weapons.nurs.SNEB_TYPE253_H1" 
+ENUMS.Storage.weapons.missiles.PL_8A = "weapons.missiles.PL-8A" 
+ENUMS.Storage.weapons.bombs.APC_BTR_82A_Skid_24888lb = "weapons.bombs.APC BTR-82A Skid [24888lb]" 
+ENUMS.Storage.weapons.containers.Sborka = "weapons.containers.Sborka" 
+ENUMS.Storage.weapons.missiles.AGM_65L = "weapons.missiles.AGM_65L" 
+ENUMS.Storage.weapons.missiles.X_28 = "weapons.missiles.X_28" 
+ENUMS.Storage.weapons.missiles.TGM_65G = "weapons.missiles.TGM_65G" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE257_H1 = "weapons.nurs.SNEB_TYPE257_H1" 
+ENUMS.Storage.weapons.missiles.RB75B = "weapons.missiles.RB75B" 
+ENUMS.Storage.weapons.missiles.X_25ML = "weapons.missiles.X_25ML" 
+ENUMS.Storage.weapons.droptanks.FPU_8A = "weapons.droptanks.FPU_8A" 
+ENUMS.Storage.weapons.bombs.BLG66 = "weapons.bombs.BLG66" 
+ENUMS.Storage.weapons.nurs.C_8CM_RD = "weapons.nurs.C_8CM_RD" 
+ENUMS.Storage.weapons.containers.EclairM_06 = "weapons.containers.{EclairM_06}" 
+ENUMS.Storage.weapons.bombs.RBK_500AO = "weapons.bombs.RBK_500AO" 
+ENUMS.Storage.weapons.missiles.AIM_9P = "weapons.missiles.AIM-9P" 
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk4_Short = "weapons.bombs.British_GP_500LB_Bomb_Mk4_Short" 
+ENUMS.Storage.weapons.containers.MB339_Vinten = "weapons.containers.MB339_Vinten" 
+ENUMS.Storage.weapons.missiles.Rb_15F = "weapons.missiles.Rb 15F" 
+ENUMS.Storage.weapons.nurs.ARAKM70BHE = "weapons.nurs.ARAKM70BHE" 
+ENUMS.Storage.weapons.bombs.AAA_Vulcan_M163_Air_21666lb = "weapons.bombs.AAA Vulcan M163 Air [21666lb]" 
+ENUMS.Storage.weapons.missiles.X_29L = "weapons.missiles.X_29L" 
+ENUMS.Storage.weapons.containers.F14_LANTIRN_TP = "weapons.containers.{F14-LANTIRN-TP}" 
+ENUMS.Storage.weapons.bombs.FAB_250_M62 = "weapons.bombs.FAB-250-M62" 
+ENUMS.Storage.weapons.missiles.AIM_120C = "weapons.missiles.AIM_120C" 
+ENUMS.Storage.weapons.bombs.EWR_SBORKA_Air_21624lb = "weapons.bombs.EWR SBORKA Air [21624lb]" 
+ENUMS.Storage.weapons.bombs.SAMP250LD = "weapons.bombs.SAMP250LD" 
+ENUMS.Storage.weapons.droptanks.Spitfire_slipper_tank = "weapons.droptanks.Spitfire_slipper_tank" 
+ENUMS.Storage.weapons.missiles.LS_6_500 = "weapons.missiles.LS-6-500" 
+ENUMS.Storage.weapons.bombs.GBU_31_V_4B = "weapons.bombs.GBU_31_V_4B" 
+ENUMS.Storage.weapons.droptanks.PTB400_MIG15 = "weapons.droptanks.PTB400_MIG15" 
+ENUMS.Storage.weapons.containers.m_113 = "weapons.containers.m-113" 
+ENUMS.Storage.weapons.bombs.SPG_M1128_Stryker_MGS_33036lb = "weapons.bombs.SPG M1128 Stryker MGS [33036lb]" 
+ENUMS.Storage.weapons.missiles.AIM_9L = "weapons.missiles.AIM-9L" 
+ENUMS.Storage.weapons.missiles.AIM_9X = "weapons.missiles.AIM_9X" 
+ENUMS.Storage.weapons.nurs.C_8 = "weapons.nurs.C_8" 
+ENUMS.Storage.weapons.bombs.SAM_CHAPARRAL_Skid_21516lb = "weapons.bombs.SAM CHAPARRAL Skid [21516lb]" 
+ENUMS.Storage.weapons.missiles.P_27TE = "weapons.missiles.P_27TE" 
+ENUMS.Storage.weapons.bombs.ODAB_500PM = "weapons.bombs.ODAB-500PM" 
+ENUMS.Storage.weapons.bombs.MK77mod1_WPN = "weapons.bombs.MK77mod1-WPN" 
+ENUMS.Storage.weapons.droptanks.PTB400_MIG19 = "weapons.droptanks.PTB400_MIG19" 
+ENUMS.Storage.weapons.torpedoes.Mark_46 = "weapons.torpedoes.Mark_46" 
+ENUMS.Storage.weapons.containers.rightSeat = "weapons.containers.rightSeat" 
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_ORANGE = "weapons.containers.{US_M10_SMOKE_TANK_ORANGE}" 
+ENUMS.Storage.weapons.bombs.SAB_100MN = "weapons.bombs.SAB_100MN" 
+ENUMS.Storage.weapons.nurs.FFAR_Mk5_HEAT = "weapons.nurs.FFAR Mk5 HEAT" 
+ENUMS.Storage.weapons.bombs.IFV_TPZ_FUCH_33440lb = "weapons.bombs.IFV TPZ FUCH [33440lb]" 
+ENUMS.Storage.weapons.bombs.IFV_M2A2_Bradley_34720lb = "weapons.bombs.IFV M2A2 Bradley [34720lb]" 
+ENUMS.Storage.weapons.bombs.MK77mod0_WPN = "weapons.bombs.MK77mod0-WPN" 
+ENUMS.Storage.weapons.containers.ASO_2 = "weapons.containers.ASO-2" 
+ENUMS.Storage.weapons.bombs.Mk_84AIR_GP = "weapons.bombs.Mk_84AIR_GP" 
+ENUMS.Storage.weapons.nurs.S_24A = "weapons.nurs.S-24A" 
+ENUMS.Storage.weapons.bombs.RBK_250_275_AO_1SCH = "weapons.bombs.RBK_250_275_AO_1SCH" 
+ENUMS.Storage.weapons.bombs.Transport_Tigr_Skid_15730lb = "weapons.bombs.Transport Tigr Skid [15730lb]" 
+ENUMS.Storage.weapons.missiles.AIM_7F = "weapons.missiles.AIM-7F" 
+ENUMS.Storage.weapons.bombs.CBU_99 = "weapons.bombs.CBU_99" 
+ENUMS.Storage.weapons.bombs.LUU_2B = "weapons.bombs.LUU_2B" 
+ENUMS.Storage.weapons.bombs.FAB_500TA = "weapons.bombs.FAB-500TA" 
+ENUMS.Storage.weapons.missiles.AGR_20_M282 = "weapons.missiles.AGR_20_M282" 
+ENUMS.Storage.weapons.droptanks.MB339_FT330 = "weapons.droptanks.MB339_FT330" 
+ENUMS.Storage.weapons.bombs.SAMP125LD = "weapons.bombs.SAMP125LD" 
+ENUMS.Storage.weapons.missiles.X_25MP = "weapons.missiles.X_25MP" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE252_H1 = "weapons.nurs.SNEB_TYPE252_H1" 
+ENUMS.Storage.weapons.missiles.AGM_65F = "weapons.missiles.AGM_65F" 
+ENUMS.Storage.weapons.missiles.AIM_9P5 = "weapons.missiles.AIM-9P5" 
+ENUMS.Storage.weapons.bombs.Transport_Tigr_Air_15900lb = "weapons.bombs.Transport Tigr Air [15900lb]" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_H1_RED = "weapons.nurs.SNEB_TYPE254_H1_RED" 
+ENUMS.Storage.weapons.nurs.FFAR_Mk1_HE = "weapons.nurs.FFAR Mk1 HE" 
+ENUMS.Storage.weapons.nurs.SPRD_99 = "weapons.nurs.SPRD-99" 
+ENUMS.Storage.weapons.bombs.BIN_200 = "weapons.bombs.BIN_200" 
+ENUMS.Storage.weapons.bombs.BLU_4B_GROUP = "weapons.bombs.BLU_4B_GROUP" 
+ENUMS.Storage.weapons.bombs.GBU_24 = "weapons.bombs.GBU_24" 
+ENUMS.Storage.weapons.missiles.Rb_04E = "weapons.missiles.Rb 04E" 
+ENUMS.Storage.weapons.missiles.Rb_74 = "weapons.missiles.Rb 74" 
+ENUMS.Storage.weapons.containers.leftSeat = "weapons.containers.leftSeat" 
+ENUMS.Storage.weapons.bombs.LS_6_100 = "weapons.bombs.LS-6-100" 
+ENUMS.Storage.weapons.bombs.Transport_URAL_375_14815lb = "weapons.bombs.Transport URAL-375 [14815lb]" 
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_GREEN = "weapons.containers.{US_M10_SMOKE_TANK_GREEN}" 
+ENUMS.Storage.weapons.missiles.X_22 = "weapons.missiles.X_22" 
+ENUMS.Storage.weapons.containers.FAS = "weapons.containers.FAS" 
+ENUMS.Storage.weapons.nurs.S_25_O = "weapons.nurs.S-25-O" 
+ENUMS.Storage.weapons.droptanks.para = "weapons.droptanks.para" 
+ENUMS.Storage.weapons.droptanks.F_15E_Drop_Tank = "weapons.droptanks.F-15E_Drop_Tank" 
+ENUMS.Storage.weapons.droptanks.M2KC_08_RPL541_EMPTY = "weapons.droptanks.M2KC_08_RPL541_EMPTY" 
+ENUMS.Storage.weapons.missiles.X_31P = "weapons.missiles.X_31P" 
+ENUMS.Storage.weapons.bombs.RBK_500U = "weapons.bombs.RBK_500U" 
+ENUMS.Storage.weapons.missiles.AIM_54A_Mk47 = "weapons.missiles.AIM_54A_Mk47" 
+ENUMS.Storage.weapons.droptanks.oiltank = "weapons.droptanks.oiltank" 
+ENUMS.Storage.weapons.missiles.AGM_154B = "weapons.missiles.AGM_154B" 
+ENUMS.Storage.weapons.containers.MB339_SMOKE_POD = "weapons.containers.MB339_SMOKE-POD" 
+ENUMS.Storage.weapons.containers.ECM_POD_L_175V = "weapons.containers.{ECM_POD_L_175V}" 
+ENUMS.Storage.weapons.droptanks.PTB_580G_F1 = "weapons.droptanks.PTB_580G_F1" 
+ENUMS.Storage.weapons.containers.EclairM_15 = "weapons.containers.{EclairM_15}" 
+ENUMS.Storage.weapons.containers.F_15E_AAQ_13_LANTIRN = "weapons.containers.F-15E_AAQ-13_LANTIRN" 
+ENUMS.Storage.weapons.droptanks.Eight00L_Tank_Empty = "weapons.droptanks.800L Tank Empty" 
+ENUMS.Storage.weapons.containers.One6c_hts_pod = "weapons.containers.16c_hts_pod" 
+ENUMS.Storage.weapons.bombs.AN_M81 = "weapons.bombs.AN-M81" 
+ENUMS.Storage.weapons.droptanks.Mosquito_Drop_Tank_100gal = "weapons.droptanks.Mosquito_Drop_Tank_100gal" 
+ENUMS.Storage.weapons.droptanks.Mosquito_Drop_Tank_50gal = "weapons.droptanks.Mosquito_Drop_Tank_50gal" 
+ENUMS.Storage.weapons.droptanks.DFT_150_GAL_A4E = "weapons.droptanks.DFT_150_GAL_A4E" 
+ENUMS.Storage.weapons.missiles.AIM_9 = "weapons.missiles.AIM_9" 
+ENUMS.Storage.weapons.bombs.IFV_BTR_D_Air_18040lb = "weapons.bombs.IFV BTR-D Air [18040lb]" 
+ENUMS.Storage.weapons.containers.EclairM_42 = "weapons.containers.{EclairM_42}" 
+ENUMS.Storage.weapons.bombs.KAB_1500T = "weapons.bombs.KAB_1500T" 
+ENUMS.Storage.weapons.droptanks.PTB_490_MIG21 = "weapons.droptanks.PTB-490-MIG21" 
+ENUMS.Storage.weapons.droptanks.PTB_200_F86F35 = "weapons.droptanks.PTB_200_F86F35" 
+ENUMS.Storage.weapons.droptanks.PTB760_MIG19 = "weapons.droptanks.PTB760_MIG19" 
+ENUMS.Storage.weapons.bombs.GBU_43_B_MOAB = "weapons.bombs.GBU-43/B(MOAB)" 
+ENUMS.Storage.weapons.torpedoes.G7A_T1 = "weapons.torpedoes.G7A_T1" 
+ENUMS.Storage.weapons.bombs.IFV_BMD_1_Air_18040lb = "weapons.bombs.IFV BMD-1 Air [18040lb]" 
+ENUMS.Storage.weapons.bombs.SAM_LINEBACKER_34720lb = "weapons.bombs.SAM LINEBACKER [34720lb]" 
+ENUMS.Storage.weapons.containers.ais_pod_t50_r = "weapons.containers.ais-pod-t50_r" 
+ENUMS.Storage.weapons.containers.CE2_SMOKE_WHITE = "weapons.containers.{CE2_SMOKE_WHITE}" 
+ENUMS.Storage.weapons.droptanks.fuel_tank_230 = "weapons.droptanks.fuel_tank_230" 
+ENUMS.Storage.weapons.droptanks.M2KC_RPL_522 = "weapons.droptanks.M2KC_RPL_522" 
+ENUMS.Storage.weapons.missiles.AGM_130 = "weapons.missiles.AGM_130" 
+ENUMS.Storage.weapons.droptanks.Eight00L_Tank = "weapons.droptanks.800L Tank" 
+ENUMS.Storage.weapons.bombs.IFV_BTR_D_Skid_17930lb = "weapons.bombs.IFV BTR-D Skid [17930lb]" 
+ENUMS.Storage.weapons.containers.bmp_1 = "weapons.containers.bmp-1" 
+ENUMS.Storage.weapons.bombs.GBU_31 = "weapons.bombs.GBU_31" 
+ENUMS.Storage.weapons.containers.aaq_28LEFT_litening = "weapons.containers.aaq-28LEFT litening" 
+ENUMS.Storage.weapons.missiles.Kh_66_Grom = "weapons.missiles.Kh-66_Grom" 
+ENUMS.Storage.weapons.containers.MIG21_SMOKE_RED = "weapons.containers.{MIG21_SMOKE_RED}" 
+ENUMS.Storage.weapons.containers.U22 = "weapons.containers.U22" 
+ENUMS.Storage.weapons.bombs.IFV_BMD_1_Skid_17930lb = "weapons.bombs.IFV BMD-1 Skid [17930lb]" 
+ENUMS.Storage.weapons.droptanks.Bidon = "weapons.droptanks.Bidon" 
+ENUMS.Storage.weapons.bombs.GBU_31_V_2B = "weapons.bombs.GBU_31_V_2B" 
+ENUMS.Storage.weapons.bombs.Mk_82Y = "weapons.bombs.Mk_82Y" 
+ENUMS.Storage.weapons.containers.pl5eii = "weapons.containers.pl5eii" 
+ENUMS.Storage.weapons.bombs.RBK_500U_OAB_2_5RT = "weapons.bombs.RBK_500U_OAB_2_5RT" 
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk5 = "weapons.bombs.British_GP_500LB_Bomb_Mk5" 
+ENUMS.Storage.weapons.containers.Eclair = "weapons.containers.{Eclair}" 
+ENUMS.Storage.weapons.nurs.S5MO_HEFRAG_FFAR = "weapons.nurs.S5MO_HEFRAG_FFAR" 
+ENUMS.Storage.weapons.bombs.BETAB_500M = "weapons.bombs.BETAB-500M" 
+ENUMS.Storage.weapons.bombs.Transport_M818_16000lb = "weapons.bombs.Transport M818 [16000lb]" 
+ENUMS.Storage.weapons.bombs.British_MC_250LB_Bomb_Mk1 = "weapons.bombs.British_MC_250LB_Bomb_Mk1" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE251_H1 = "weapons.nurs.SNEB_TYPE251_H1" 
+ENUMS.Storage.weapons.bombs.TYPE_200A = "weapons.bombs.TYPE-200A" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M151 = "weapons.nurs.HYDRA_70_M151" 
+ENUMS.Storage.weapons.bombs.IFV_BMP_3_32912lb = "weapons.bombs.IFV BMP-3 [32912lb]" 
+ENUMS.Storage.weapons.bombs.APC_MTLB_Air_26400lb = "weapons.bombs.APC MTLB Air [26400lb]" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M229 = "weapons.nurs.HYDRA_70_M229" 
+ENUMS.Storage.weapons.bombs.BDU_45 = "weapons.bombs.BDU_45" 
+ENUMS.Storage.weapons.bombs.OFAB_100_120TU = "weapons.bombs.OFAB-100-120TU" 
+ENUMS.Storage.weapons.missiles.AIM_9J = "weapons.missiles.AIM-9J" 
+ENUMS.Storage.weapons.nurs.ARF8M3API = "weapons.nurs.ARF8M3API" 
+ENUMS.Storage.weapons.bombs.BetAB_500ShP = "weapons.bombs.BetAB_500ShP" 
+ENUMS.Storage.weapons.nurs.C_8OFP2 = "weapons.nurs.C_8OFP2" 
+ENUMS.Storage.weapons.bombs.GBU_10 = "weapons.bombs.GBU_10" 
+ENUMS.Storage.weapons.bombs.APC_MTLB_Skid_26290lb = "weapons.bombs.APC MTLB Skid [26290lb]" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_F1B_RED = "weapons.nurs.SNEB_TYPE254_F1B_RED" 
+ENUMS.Storage.weapons.missiles.X_65 = "weapons.missiles.X_65" 
+ENUMS.Storage.weapons.missiles.R_550_M1 = "weapons.missiles.R_550_M1" 
+ENUMS.Storage.weapons.missiles.AGM_65K = "weapons.missiles.AGM_65K" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE254_F1B_YELLOW = "weapons.nurs.SNEB_TYPE254_F1B_YELLOW" 
+ENUMS.Storage.weapons.missiles.AGM_88 = "weapons.missiles.AGM_88" 
+ENUMS.Storage.weapons.nurs.C_8OM = "weapons.nurs.C_8OM" 
+ENUMS.Storage.weapons.bombs.SAM_ROLAND_LN_34720b = "weapons.bombs.SAM ROLAND LN [34720b]" 
+ENUMS.Storage.weapons.missiles.AIM_120 = "weapons.missiles.AIM_120" 
+ENUMS.Storage.weapons.missiles.HOT3_MBDA = "weapons.missiles.HOT3_MBDA" 
+ENUMS.Storage.weapons.missiles.R_13M = "weapons.missiles.R-13M" 
+ENUMS.Storage.weapons.missiles.AIM_54C_Mk60 = "weapons.missiles.AIM_54C_Mk60" 
+ENUMS.Storage.weapons.bombs.AAA_GEPARD_34720lb = "weapons.bombs.AAA GEPARD [34720lb]" 
+ENUMS.Storage.weapons.missiles.R_13M1 = "weapons.missiles.R-13M1" 
+ENUMS.Storage.weapons.bombs.APC_Cobra_Air_10912lb = "weapons.bombs.APC Cobra Air [10912lb]" 
+ENUMS.Storage.weapons.bombs.RBK_250 = "weapons.bombs.RBK_250" 
+ENUMS.Storage.weapons.bombs.SC_500_J = "weapons.bombs.SC_500_J" 
+ENUMS.Storage.weapons.missiles.AGM_114K = "weapons.missiles.AGM_114K" 
+ENUMS.Storage.weapons.missiles.ALARM = "weapons.missiles.ALARM" 
+ENUMS.Storage.weapons.bombs.Mk_83 = "weapons.bombs.Mk_83" 
+ENUMS.Storage.weapons.missiles.AGM_65B = "weapons.missiles.AGM_65B" 
+ENUMS.Storage.weapons.bombs.MK_82SNAKEYE = "weapons.bombs.MK_82SNAKEYE" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_MK1 = "weapons.nurs.HYDRA_70_MK1" 
+ENUMS.Storage.weapons.bombs.BLG66_BELOUGA = "weapons.bombs.BLG66_BELOUGA" 
+ENUMS.Storage.weapons.containers.EclairM_51 = "weapons.containers.{EclairM_51}" 
+ENUMS.Storage.weapons.missiles.AIM_54A_Mk60 = "weapons.missiles.AIM_54A_Mk60" 
+ENUMS.Storage.weapons.droptanks.DFT_300_GAL_A4E = "weapons.droptanks.DFT_300_GAL_A4E" 
+ENUMS.Storage.weapons.bombs.ATGM_M1134_Stryker_30337lb = "weapons.bombs.ATGM M1134 Stryker [30337lb]" 
+ENUMS.Storage.weapons.bombs.BAT_120 = "weapons.bombs.BAT-120" 
+ENUMS.Storage.weapons.missiles.DWS39_MJ1_MJ2 = "weapons.missiles.DWS39_MJ1_MJ2" 
+ENUMS.Storage.weapons.containers.SPRD = "weapons.containers.SPRD" 
+ENUMS.Storage.weapons.bombs.BR_500 = "weapons.bombs.BR_500" 
+ENUMS.Storage.weapons.bombs.British_GP_500LB_Bomb_Mk1 = "weapons.bombs.British_GP_500LB_Bomb_Mk1" 
+ENUMS.Storage.weapons.bombs.BDU_50HD = "weapons.bombs.BDU_50HD" 
+ENUMS.Storage.weapons.missiles.RS2US = "weapons.missiles.RS2US" 
+ENUMS.Storage.weapons.bombs.IFV_BMP_2_25168lb = "weapons.bombs.IFV BMP-2 [25168lb]" 
+ENUMS.Storage.weapons.bombs.SAMP400HD = "weapons.bombs.SAMP400HD" 
+ENUMS.Storage.weapons.containers.Hercules_Battle_Station = "weapons.containers.Hercules_Battle_Station" 
+ENUMS.Storage.weapons.bombs.AN_M64 = "weapons.bombs.AN_M64" 
+ENUMS.Storage.weapons.containers.rearCargoSeats = "weapons.containers.rearCargoSeats" 
+ENUMS.Storage.weapons.bombs.Mk_82 = "weapons.bombs.Mk_82" 
+ENUMS.Storage.weapons.missiles.AKD_10 = "weapons.missiles.AKD-10" 
+ENUMS.Storage.weapons.bombs.BDU_50LGB = "weapons.bombs.BDU_50LGB" 
+ENUMS.Storage.weapons.missiles.SD_10 = "weapons.missiles.SD-10" 
+ENUMS.Storage.weapons.containers.IRDeflector = "weapons.containers.IRDeflector" 
+ENUMS.Storage.weapons.bombs.FAB_500 = "weapons.bombs.FAB_500" 
+ENUMS.Storage.weapons.bombs.KAB_500 = "weapons.bombs.KAB_500" 
+ENUMS.Storage.weapons.nurs.S_5M = "weapons.nurs.S-5M" 
+ENUMS.Storage.weapons.missiles.MICA_R = "weapons.missiles.MICA_R" 
+ENUMS.Storage.weapons.missiles.X_59M = "weapons.missiles.X_59M" 
+ENUMS.Storage.weapons.nurs.UG_90MM = "weapons.nurs.UG_90MM" 
+ENUMS.Storage.weapons.bombs.LYSBOMB = "weapons.bombs.LYSBOMB" 
+ENUMS.Storage.weapons.nurs.R4M = "weapons.nurs.R4M" 
+ENUMS.Storage.weapons.containers.dlpod_akg = "weapons.containers.dlpod_akg" 
+ENUMS.Storage.weapons.missiles.LD_10 = "weapons.missiles.LD-10" 
+ENUMS.Storage.weapons.bombs.SC_50 = "weapons.bombs.SC_50" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_MK5 = "weapons.nurs.HYDRA_70_MK5" 
+ENUMS.Storage.weapons.bombs.FAB_100M = "weapons.bombs.FAB_100M" 
+ENUMS.Storage.weapons.missiles.Rb_24 = "weapons.missiles.Rb 24" 
+ENUMS.Storage.weapons.bombs.BDU_45B = "weapons.bombs.BDU_45B" 
+ENUMS.Storage.weapons.missiles.GB_6_HE = "weapons.missiles.GB-6-HE" 
+ENUMS.Storage.weapons.missiles.KD_63B = "weapons.missiles.KD-63B" 
+ENUMS.Storage.weapons.missiles.P_27PE = "weapons.missiles.P_27PE" 
+ENUMS.Storage.weapons.droptanks.PTB300_MIG15 = "weapons.droptanks.PTB300_MIG15" 
+ENUMS.Storage.weapons.bombs.Two50_3 = "weapons.bombs.250-3" 
+ENUMS.Storage.weapons.bombs.SC_500_L2 = "weapons.bombs.SC_500_L2" 
+ENUMS.Storage.weapons.containers.HMMWV_M1045 = "weapons.containers.HMMWV_M1045" 
+ENUMS.Storage.weapons.bombs.FAB_500M54TU = "weapons.bombs.FAB-500M54TU" 
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_YELLOW = "weapons.containers.{US_M10_SMOKE_TANK_YELLOW}" 
+ENUMS.Storage.weapons.containers.EclairM_60 = "weapons.containers.{EclairM_60}" 
+ENUMS.Storage.weapons.bombs.SAB_250_200 = "weapons.bombs.SAB_250_200" 
+ENUMS.Storage.weapons.bombs.FAB_100 = "weapons.bombs.FAB_100" 
+ENUMS.Storage.weapons.bombs.KAB_500S = "weapons.bombs.KAB_500S" 
+ENUMS.Storage.weapons.missiles.AGM_45A = "weapons.missiles.AGM_45A" 
+ENUMS.Storage.weapons.missiles.Kh25MP_PRGS1VP = "weapons.missiles.Kh25MP_PRGS1VP" 
+ENUMS.Storage.weapons.nurs.S5M1_HEFRAG_FFAR = "weapons.nurs.S5M1_HEFRAG_FFAR" 
+ENUMS.Storage.weapons.containers.kg600 = "weapons.containers.kg600" 
+ENUMS.Storage.weapons.bombs.AN_M65 = "weapons.bombs.AN_M65" 
+ENUMS.Storage.weapons.bombs.AN_M57 = "weapons.bombs.AN_M57" 
+ENUMS.Storage.weapons.bombs.BLU_3B_GROUP = "weapons.bombs.BLU_3B_GROUP" 
+ENUMS.Storage.weapons.bombs.BAP_100 = "weapons.bombs.BAP-100" 
+ENUMS.Storage.weapons.containers.HEMTT = "weapons.containers.HEMTT" 
+ENUMS.Storage.weapons.bombs.British_MC_500LB_Bomb_Mk1_Short = "weapons.bombs.British_MC_500LB_Bomb_Mk1_Short" 
+ENUMS.Storage.weapons.nurs.ARAKM70BAP = "weapons.nurs.ARAKM70BAP" 
+ENUMS.Storage.weapons.missiles.AGM_119 = "weapons.missiles.AGM_119" 
+ENUMS.Storage.weapons.missiles.MMagicII = "weapons.missiles.MMagicII" 
+ENUMS.Storage.weapons.bombs.AB_500_1_SD_10A = "weapons.bombs.AB_500_1_SD_10A" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M282 = "weapons.nurs.HYDRA_70_M282" 
+ENUMS.Storage.weapons.droptanks.DFT_400_GAL_A4E = "weapons.droptanks.DFT_400_GAL_A4E" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M257 = "weapons.nurs.HYDRA_70_M257" 
+ENUMS.Storage.weapons.droptanks.AV8BNA_AERO1D = "weapons.droptanks.AV8BNA_AERO1D" 
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_BLUE = "weapons.containers.{US_M10_SMOKE_TANK_BLUE}" 
+ENUMS.Storage.weapons.nurs.ARF8M3HEI = "weapons.nurs.ARF8M3HEI" 
+ENUMS.Storage.weapons.bombs.RN_28 = "weapons.bombs.RN-28" 
+ENUMS.Storage.weapons.bombs.Squad_30_x_Soldier_7950lb = "weapons.bombs.Squad 30 x Soldier [7950lb]" 
+ENUMS.Storage.weapons.containers.uaz_469 = "weapons.containers.uaz-469" 
+ENUMS.Storage.weapons.containers.Otokar_Cobra = "weapons.containers.Otokar_Cobra" 
+ENUMS.Storage.weapons.bombs.APC_BTR_82A_Air_24998lb = "weapons.bombs.APC BTR-82A Air [24998lb]" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M274 = "weapons.nurs.HYDRA_70_M274" 
+ENUMS.Storage.weapons.missiles.P_24R = "weapons.missiles.P_24R" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_MK61 = "weapons.nurs.HYDRA_70_MK61" 
+ENUMS.Storage.weapons.missiles.Igla_1E = "weapons.missiles.Igla_1E" 
+ENUMS.Storage.weapons.missiles.C_802AK = "weapons.missiles.C-802AK" 
+ENUMS.Storage.weapons.nurs.C_24 = "weapons.nurs.C_24" 
+ENUMS.Storage.weapons.droptanks.M2KC_08_RPL541 = "weapons.droptanks.M2KC_08_RPL541" 
+ENUMS.Storage.weapons.nurs.C_13 = "weapons.nurs.C_13" 
+ENUMS.Storage.weapons.droptanks.droptank_110_gal = "weapons.droptanks.droptank_110_gal" 
+ENUMS.Storage.weapons.bombs.Mk_84 = "weapons.bombs.Mk_84" 
+ENUMS.Storage.weapons.missiles.Sea_Eagle = "weapons.missiles.Sea_Eagle" 
+ENUMS.Storage.weapons.droptanks.PTB_1200_F1 = "weapons.droptanks.PTB_1200_F1" 
+ENUMS.Storage.weapons.nurs.SNEB_TYPE256_H1 = "weapons.nurs.SNEB_TYPE256_H1" 
+ENUMS.Storage.weapons.containers.MATRA_PHIMAT = "weapons.containers.MATRA-PHIMAT" 
+ENUMS.Storage.weapons.containers.smoke_pod = "weapons.containers.smoke_pod" 
+ENUMS.Storage.weapons.containers.F_15E_AAQ_14_LANTIRN = "weapons.containers.F-15E_AAQ-14_LANTIRN" 
+ENUMS.Storage.weapons.containers.EclairM_24 = "weapons.containers.{EclairM_24}" 
+ENUMS.Storage.weapons.bombs.GBU_16 = "weapons.bombs.GBU_16" 
+ENUMS.Storage.weapons.nurs.HYDRA_70_M156 = "weapons.nurs.HYDRA_70_M156" 
+ENUMS.Storage.weapons.missiles.R_60 = "weapons.missiles.R-60" 
+ENUMS.Storage.weapons.containers.zsu_23_4 = "weapons.containers.zsu-23-4" 
+ENUMS.Storage.weapons.missiles.RB75 = "weapons.missiles.RB75" 
+ENUMS.Storage.weapons.missiles.Mistral = "weapons.missiles.Mistral" 
+ENUMS.Storage.weapons.droptanks.MB339_TT500_L = "weapons.droptanks.MB339_TT500_L" 
+ENUMS.Storage.weapons.bombs.SAM_SA_13_STRELA_21624lb = "weapons.bombs.SAM SA-13 STRELA [21624lb]" 
+ENUMS.Storage.weapons.bombs.SAM_Avenger_M1097_Air_7200lb = "weapons.bombs.SAM Avenger M1097 Air [7200lb]" 
+ENUMS.Storage.weapons.droptanks.Eleven00L_Tank_Empty = "weapons.droptanks.1100L Tank Empty" 
+ENUMS.Storage.weapons.bombs.AN_M88 = "weapons.bombs.AN-M88" 
+ENUMS.Storage.weapons.missiles.S_25L = "weapons.missiles.S_25L" 
+ENUMS.Storage.weapons.nurs.British_AP_25LBNo1_3INCHNo1 = "weapons.nurs.British_AP_25LBNo1_3INCHNo1" 
+ENUMS.Storage.weapons.bombs.BDU_50LD = "weapons.bombs.BDU_50LD"
+ENUMS.Storage.weapons.bombs.AGM_62 = "weapons.bombs.AGM_62"
+ENUMS.Storage.weapons.containers.US_M10_SMOKE_TANK_WHITE = "weapons.containers.{US_M10_SMOKE_TANK_WHITE}" 
+ENUMS.Storage.weapons.missiles.MICA_T = "weapons.missiles.MICA_T" 
+ENUMS.Storage.weapons.containers.HVAR_rocket = "weapons.containers.HVAR_rocket" 
--- a/Development/Moose/Utilities/Utils.lua
+++ b/Development/Moose/Utilities/Utils.lua
@@ -295,8 +295,9 @@ UTILS.DeepCopy = function(object)
 end


--- Porting in Slmod's serialize_slmod2.
+--- Serialize a given table.
 -- @param #table tbl Input table.
+-- @return #string Table as a string.
 UTILS.OneLineSerialize = function( tbl )  -- serialization of a table all on a single line, no comments, made to replace old get_table_string function

 local  lookup_table = {}
@@ -373,7 +374,54 @@ local  lookup_table = {}
  return objectreturn
 end

--porting in Slmod's "safestring" basic serialize
+--- Serialize a table to a single line string.
+-- @param #table tbl table to serialize.
+-- @return #string string containing serialized table.
+function UTILS._OneLineSerialize(tbl)
+
+  if type(tbl) == 'table' then --function only works for tables!
+
+    local tbl_str = {}
+
+    tbl_str[#tbl_str + 1] = '{ '
+
+    for ind,val in pairs(tbl) do -- serialize its fields
+      if type(ind) == "number" then
+        tbl_str[#tbl_str + 1] = '['
+        tbl_str[#tbl_str + 1] = tostring(ind)
+        tbl_str[#tbl_str + 1] = '] = '
+      else --must be a string
+        tbl_str[#tbl_str + 1] = '['
+        tbl_str[#tbl_str + 1] = UTILS.BasicSerialize(ind)
+        tbl_str[#tbl_str + 1] = '] = '
+      end
+
+      if ((type(val) == 'number') or (type(val) == 'boolean')) then
+        tbl_str[#tbl_str + 1] = tostring(val)
+        tbl_str[#tbl_str + 1] = ', '
+      elseif type(val) == 'string' then
+        tbl_str[#tbl_str + 1] = UTILS.BasicSerialize(val)
+        tbl_str[#tbl_str + 1] = ', '
+      elseif type(val) == 'nil' then -- won't ever happen, right?
+        tbl_str[#tbl_str + 1] = 'nil, '
+      elseif type(val) == 'table' then
+        tbl_str[#tbl_str + 1] = UTILS._OneLineSerialize(val)
+        tbl_str[#tbl_str + 1] = ', '   --I think this is right, I just added it
+      else
+        --log:warn('Unable to serialize value type $1 at index $2', mist.utils.basicSerialize(type(val)), tostring(ind))
+      end
+
+    end
+    
+      tbl_str[#tbl_str + 1] = '}'
+      return table.concat(tbl_str)
+    else
+      return  UTILS.BasicSerialize(tbl)
+  end
+end
+
+--- Basic serialize (porting in Slmod's "safestring" basic serialize).
+-- @param #string s Table to serialize.
 UTILS.BasicSerialize = function(s)
  if s == nil then
    return "\"\""
@@ -404,6 +452,114 @@ function UTILS.PrintTableToLog(table, indent)
  end
 end

+--- Returns table in a easy readable string representation.
+-- @param tbl table to show
+-- @param loc
+-- @param indent
+-- @param tableshow_tbls
+-- @return Human readable string representation of given table.
+function UTILS.TableShow(tbl, loc, indent, tableshow_tbls)
+  tableshow_tbls = tableshow_tbls or {} --create table of tables
+  loc = loc or ""
+  indent = indent or ""
+  if type(tbl) == 'table' then --function only works for tables!
+    tableshow_tbls[tbl] = loc
+
+    local tbl_str = {}
+
+    tbl_str[#tbl_str + 1] = indent .. '{\n'
+
+    for ind,val in pairs(tbl) do -- serialize its fields
+      if type(ind) == "number" then
+        tbl_str[#tbl_str + 1] = indent
+        tbl_str[#tbl_str + 1] = loc .. '['
+        tbl_str[#tbl_str + 1] = tostring(ind)
+        tbl_str[#tbl_str + 1] = '] = '
+      else
+        tbl_str[#tbl_str + 1] = indent
+        tbl_str[#tbl_str + 1] = loc .. '['
+        tbl_str[#tbl_str + 1] = UTILS.BasicSerialize(ind)
+        tbl_str[#tbl_str + 1] = '] = '
+      end
+
+      if ((type(val) == 'number') or (type(val) == 'boolean')) then
+        tbl_str[#tbl_str + 1] = tostring(val)
+        tbl_str[#tbl_str + 1] = ',\n'
+      elseif type(val) == 'string' then
+        tbl_str[#tbl_str + 1] = UTILS.BasicSerialize(val)
+        tbl_str[#tbl_str + 1] = ',\n'
+      elseif type(val) == 'nil' then -- won't ever happen, right?
+        tbl_str[#tbl_str + 1] = 'nil,\n'
+      elseif type(val) == 'table' then
+        if tableshow_tbls[val] then
+          tbl_str[#tbl_str + 1] = tostring(val) .. ' already defined: ' .. tableshow_tbls[val] .. ',\n'
+        else
+          tableshow_tbls[val] = loc ..  '[' .. UTILS.BasicSerialize(ind) .. ']'
+          tbl_str[#tbl_str + 1] = tostring(val) .. ' '
+          tbl_str[#tbl_str + 1] = UTILS.TableShow(val, loc .. '[' .. UTILS.BasicSerialize(ind).. ']', indent .. '    ', tableshow_tbls)
+          tbl_str[#tbl_str + 1] = ',\n'
+        end
+      elseif type(val) == 'function' then
+        if debug and debug.getinfo then
+          local fcnname = tostring(val)
+          local info = debug.getinfo(val, "S")
+          if info.what == "C" then
+            tbl_str[#tbl_str + 1] = string.format('%q', fcnname .. ', C function') .. ',\n'
+          else
+            if (string.sub(info.source, 1, 2) == [[./]]) then
+              tbl_str[#tbl_str + 1] = string.format('%q', fcnname .. ', defined in (' .. info.linedefined .. '-' .. info.lastlinedefined .. ')' .. info.source) ..',\n'
+            else
+              tbl_str[#tbl_str + 1] = string.format('%q', fcnname .. ', defined in (' .. info.linedefined .. '-' .. info.lastlinedefined .. ')') ..',\n'
+            end
+          end
+
+        else
+          tbl_str[#tbl_str + 1] = 'a function,\n'
+        end
+      else
+        tbl_str[#tbl_str + 1] = 'unable to serialize value type ' .. UTILS.BasicSerialize(type(val)) .. ' at index ' .. tostring(ind)
+      end
+    end
+
+    tbl_str[#tbl_str + 1] = indent .. '}'
+    return table.concat(tbl_str)
+  end
+end
+
+--- Dumps the global table _G.
+-- This dumps the global table _G to a file in the DCS\Logs directory.
+-- This function requires you to disable script sanitization in $DCS_ROOT\Scripts\MissionScripting.lua to access lfs and io libraries.
+-- @param #string fname File name.
+function UTILS.Gdump(fname)
+  if lfs and io then
+  
+    local fdir = lfs.writedir() .. [[Logs\]] .. fname
+    
+    local f = io.open(fdir, 'w')
+    
+    f:write(UTILS.TableShow(_G))
+    
+    f:close()
+    
+    env.info(string.format('Wrote debug data to $1', fdir))
+  else
+    env.error("WARNING: lfs and/or io not de-sanitized - cannot dump _G!")
+  end
+end
+
+--- Executes the given string.
+-- borrowed from Slmod
+-- @param #string s string containing LUA code.
+-- @return #boolean `true` if successfully executed, `false` otherwise.
+function UTILS.DoString(s)
+  local f, err = loadstring(s)
+  if f then
+    return true, f()
+  else
+    return false, err
+  end
+end
+

 UTILS.ToDegree = function(angle)
  return angle*180/math.pi
--- a/Development/Moose/Wrapper/Airbase.lua
+++ b/Development/Moose/Wrapper/Airbase.lua
@@ -30,6 +30,7 @@
 -- @field #table runways Runways of airdromes.
 -- @field #AIRBASE.Runway runwayLanding Runway used for landing.
 -- @field #AIRBASE.Runway runwayTakeoff Runway used for takeoff.
+-- @field Wrapper.Storage#STORAGE storage The DCS warehouse storage.
 -- @extends Wrapper.Positionable#POSITIONABLE

 --- Wrapper class to handle the DCS Airbase objects:
@@ -833,6 +834,9 @@ function AIRBASE:Register(AirbaseName)
  -- Init coordinate.
  self:GetCoordinate()
  
+  -- Storage.
+  self.storage=_DATABASE:AddStorage(AirbaseName)
+
  if vec2 then
    if self.isShip then
      local unit=UNIT:FindByName(AirbaseName)
@@ -919,6 +923,87 @@ function AIRBASE:GetZone()
  return self.AirbaseZone
 end

+--- Get the DCS warehouse.
+-- @param #AIRBASE self
+-- @return DCS#Warehouse The DCS warehouse object.
+function AIRBASE:GetWarehouse()
+  local warehouse=nil --DCS#Warehouse
+  local airbase=self:GetDCSObject()
+  if airbase then
+    warehouse=airbase:getWarehouse()
+  end
+  return warehouse
+end
+
+--- Get the warehouse storage of this airbase. The returned `STORAGE` object is the wrapper of the DCS warehouse. 
+-- This allows you to add and remove items such as aircraft, liquids, weapons and other equipment.
+-- @param #AIRBASE self
+-- @return Wrapper.Storage#STORAGE The storage.
+function AIRBASE:GetStorage()
+  return self.storage
+end
+
+--- Enables or disables automatic capturing of the airbase.
+-- @param #AIRBASE self
+-- @param #boolean Switch If `true`, enable auto capturing. If `false`, disable it.
+-- @return #AIRBASE self
+function AIRBASE:SetAutoCapture(Switch)
+
+  local airbase=self:GetDCSObject()
+  
+  if airbase then
+    airbase:autoCapture(Switch)
+  end
+
+  return self
+end
+
+--- Enables automatic capturing of the airbase.
+-- @param #AIRBASE self
+-- @return #AIRBASE self
+function AIRBASE:SetAutoCaptureON()
+  self:SetAutoCapture(true)
+  return self
+end
+
+--- Disables automatic capturing of the airbase.
+-- @param #AIRBASE self
+-- @return #AIRBASE self
+function AIRBASE:SetAutoCaptureOFF()
+  self:SetAutoCapture(false)
+  return self
+end
+
+--- Returns whether auto capturing of the airbase is on or off.
+-- @param #AIRBASE self
+-- @return #boolean Returns `true` if auto capturing is on, `false` if off and `nil` if the airbase object cannot be retrieved. 
+function AIRBASE:IsAutoCapture()
+
+  local airbase=self:GetDCSObject()
+  
+  local auto=nil
+  if airbase then
+    auto=airbase:autoCaptureIsOn()
+  end
+
+  return auto
+end
+
+--- Sets the coalition of the airbase.
+-- @param #AIRBASE self
+-- @param #number Coal Coalition that the airbase should have (0=Neutral, 1=Red, 2=Blue).
+-- @return #AIRBASE self
+function AIRBASE:SetCoalition(Coal)
+
+  local airbase=self:GetDCSObject()
+  
+  if airbase then
+    airbase:setCoalition(Coal)
+  end
+  
+  return self
+end
+
 --- Get all airbases of the current map. This includes ships and FARPS.
 -- @param DCS#Coalition coalition (Optional) Return only airbases belonging to the specified coalition. By default, all airbases of the map are returned.
 -- @param #number category (Optional) Return only airbases of a certain category, e.g. Airbase.Category.FARP
--- a/Development/Moose/Wrapper/Controllable.lua
+++ b/Development/Moose/Wrapper/Controllable.lua
--- a/Development/Moose/Wrapper/Positionable.lua
+++ b/Development/Moose/Wrapper/Positionable.lua
@@ -591,10 +591,10 @@ function POSITIONABLE:GetRandomVec3( Radius )

    if Radius then
      local PositionableRandomVec3 = {}
-      local angle = math.random() * math.pi * 2;
-      PositionableRandomVec3.x = PositionablePointVec3.x + math.cos( angle ) * math.random() * Radius;
+      local angle = math.random() * math.pi * 2
+      PositionableRandomVec3.x = PositionablePointVec3.x + math.cos( angle ) * math.random() * Radius
      PositionableRandomVec3.y = PositionablePointVec3.y
-      PositionableRandomVec3.z = PositionablePointVec3.z + math.sin( angle ) * math.random() * Radius;
+      PositionableRandomVec3.z = PositionablePointVec3.z + math.sin( angle ) * math.random() * Radius

      self:T3( PositionableRandomVec3 )
      return PositionableRandomVec3
@@ -1769,6 +1769,93 @@ do -- Cargo
    return self.__.CargoBayWeightLimit - CargoWeight
  end
  
+  ---
+  -- @field DefaultInfantryWeight
+  -- Abstract out the "XYZ*95" calculation in the Ground POSITIONABLE case, where the table 
+  -- holds number of infantry that the vehicle could carry, instead of actual cargo weights.
+  POSITIONABLE.DefaultInfantryWeight = 95
+
+  ---
+  -- @field CargoBayCapacityValues
+  -- @field CargoBayCapacityValues.Air
+  -- @field CargoBayCapacityValues.Naval
+  -- @field CargoBayCapacityValues.Ground
+  POSITIONABLE.CargoBayCapacityValues = {
+    ["Air"] = {
+      -- C-17A
+      -- Wiki says: max=265,352, empty=128,140, payload=77,516 (134 troops, 1 M1 Abrams tank, 2 M2 Bradley or 3 Stryker)
+      -- DCS  says: max=265,350, empty=125,645, fuel=132,405 ==> Cargo Bay=7300 kg with a full fuel load (lot of fuel!) and 73300 with half a fuel load.
+      --["C-17A"] = 35000,   --77519 cannot be used, because it loads way too much apcs and infantry.
+      -- C-130:
+      -- DCS  says: max=79,380, empty=36,400, fuel=10,415 kg ==> Cargo Bay=32,565 kg with fuel load.
+      -- Wiki says: max=70,307, empty=34,382, payload=19,000 kg (92 passengers, 2-3 Humvees or 2 M113s), max takeoff weight 70,037 kg.
+      -- Here we say two M113s should be transported. Each one weights 11,253 kg according to DCS. So the cargo weight should be 23,000 kg with a full load of fuel.
+      -- This results in a max takeoff weight of 69,815 kg (23,000+10,415+36,400), which is very close to the Wiki value of 70,037 kg.
+      ["C_130"] = 70000,
+    },
+    ["Naval"] = {
+      ["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!
+      ["speedboat"]        =      500, -- 500 kg ~ 5 persons
+      ["Seawise_Giant"]    =261000000, -- Gross tonnage is 261,000 tonns.
+    },
+    ["Ground"] = {
+      ["AAV7"] = 25*POSITIONABLE.DefaultInfantryWeight,
+      ["Bedford_MWD"] = 8*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["Blitz_36_6700A"] = 10*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["BMD_1"] = 9*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 4 passengers
+      ["BMP_1"] = 8*POSITIONABLE.DefaultInfantryWeight,
+      ["BMP_2"] = 7*POSITIONABLE.DefaultInfantryWeight,
+      ["BMP_3"] = 8*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 7+2 passengers
+      ["Boman"] = 25*POSITIONABLE.DefaultInfantryWeight,
+      ["BTR_80"] = 9*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 7 passengers
+      ["BTR_82A"] = 9*POSITIONABLE.DefaultInfantryWeight, -- new by kappa -- IRL should be 7 passengers
+      ["BTR_D"] = 12*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 10 passengers
+      ["Cobra"] = 8*POSITIONABLE.DefaultInfantryWeight,
+      ["Land_Rover_101_FC"] = 11*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["Land_Rover_109_S3"] = 7*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["LAV_25"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["M_2_Bradley"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["M1043_HMMWV_Armament"] = 4*POSITIONABLE.DefaultInfantryWeight,
+      ["M1045_HMMWV_TOW"] = 4*POSITIONABLE.DefaultInfantryWeight,
+      ["M1126_Stryker_ICV"] = 9*POSITIONABLE.DefaultInfantryWeight,
+      ["M1134_Stryker_ATGM"] = 9*POSITIONABLE.DefaultInfantryWeight,
+      ["M2A1_halftrack"] = 9*POSITIONABLE.DefaultInfantryWeight,
+      ["M_113"] = 9*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 11 passengers
+      ["Marder"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["MCV_80"] = 9*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 7 passengers
+      ["MLRS_FDDM"] = 4*POSITIONABLE.DefaultInfantryWeight,
+      ["MTLB"] = 25*POSITIONABLE.DefaultInfantryWeight, -- IRL should be 11 passengers
+      ["GAZ_66"] = 8*POSITIONABLE.DefaultInfantryWeight,
+      ["GAZ_3307"] = 12*POSITIONABLE.DefaultInfantryWeight,
+      ["GAZ_3308"] = 14*POSITIONABLE.DefaultInfantryWeight,
+      ["Grad_FDDM"] = 6*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["KAMAZ_Truck"] = 12*POSITIONABLE.DefaultInfantryWeight,
+      ["KrAZ6322"] = 12*POSITIONABLE.DefaultInfantryWeight,
+      ["M_818"] = 12*POSITIONABLE.DefaultInfantryWeight,
+      ["Tigr_233036"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["TPZ"] = 10*POSITIONABLE.DefaultInfantryWeight, -- Fuchs
+      ["UAZ_469"] = 4*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["Ural_375"] = 12*POSITIONABLE.DefaultInfantryWeight,
+      ["Ural_4320_31"] = 14*POSITIONABLE.DefaultInfantryWeight,
+      ["Ural_4320_APA_5D"] = 10*POSITIONABLE.DefaultInfantryWeight,
+      ["Ural_4320T"] = 14*POSITIONABLE.DefaultInfantryWeight,
+      ["ZBD04A"] = 7*POSITIONABLE.DefaultInfantryWeight, -- new by kappa
+      ["VAB_Mephisto"] = 8*POSITIONABLE.DefaultInfantryWeight, -- new by Apple
+      ["tt_KORD"] = 6*POSITIONABLE.DefaultInfantryWeight, -- 2.7.1 HL/TT
+      ["tt_DSHK"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["HL_KORD"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["HL_DSHK"] = 6*POSITIONABLE.DefaultInfantryWeight,
+      ["CCKW_353"] = 16*POSITIONABLE.DefaultInfantryWeight, --GMC CCKW 2½-ton 6×6 truck, estimating 16 soldiers,
+    }
+  }
+
  --- Set Cargo Bay Weight Limit in kg.
  -- @param #POSITIONABLE self
  -- @param #number WeightLimit (Optional) Weight limit in kg. If not given, the value is taken from the descriptors or hard coded. 
@@ -1792,23 +1879,13 @@ do -- Cargo
      
      -- Unit type name.
      local TypeName=Desc.typeName or "Unknown Type"
+      TypeName = string.gsub(TypeName,"[%p%s]","_")
      
      -- When an airplane or helicopter, we calculate the WeightLimit based on the descriptor.
      if self:IsAir() then

        -- Max takeoff weight if DCS descriptors have unrealstic values.
-        local Weights = {
-          -- C-17A
-          -- Wiki says: max=265,352, empty=128,140, payload=77,516 (134 troops, 1 M1 Abrams tank, 2 M2 Bradley or 3 Stryker)
-          -- DCS  says: max=265,350, empty=125,645, fuel=132,405 ==> Cargo Bay=7300 kg with a full fuel load (lot of fuel!) and 73300 with half a fuel load.
-          --["C-17A"] = 35000,   --77519 cannot be used, because it loads way too much apcs and infantry.
-          -- C-130:
-          -- DCS  says: max=79,380, empty=36,400, fuel=10,415 kg ==> Cargo Bay=32,565 kg with fuel load.
-          -- Wiki says: max=70,307, empty=34,382, payload=19,000 kg (92 passengers, 2-3 Humvees or 2 M113s), max takeoff weight 70,037 kg.
-          -- Here we say two M113s should be transported. Each one weights 11,253 kg according to DCS. So the cargo weight should be 23,000 kg with a full load of fuel.
-          -- This results in a max takeoff weight of 69,815 kg (23,000+10,415+36,400), which is very close to the Wiki value of 70,037 kg.
-          ["C-130"] = 70000,
-        }
+        local Weights = POSITIONABLE.CargoBayCapacityValues.Air
        
        -- Max (takeoff) weight (empty+fuel+cargo weight).
        local massMax= Desc.massMax or 0
@@ -1843,75 +1920,16 @@ do -- Cargo
      elseif self:IsShip() then

        -- Hard coded cargo weights in kg.
-        local Weights = {
-          ["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!
-          ["speedboat"]        =      500, -- 500 kg ~ 5 persons
-          ["Seawise_Giant"]    =261000000, -- Gross tonnage is 261,000 tonns.
-        }
+        local Weights = POSITIONABLE.CargoBayCapacityValues.Naval
        self.__.CargoBayWeightLimit = ( Weights[TypeName] or 50000 )

      else

        -- Hard coded number of soldiers.
-        local Weights = {
-          ["AAV7"] = 25,
-          ["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, -- IRL should be 7+2 passengers
-          ["Boman"] = 25,
-          ["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, -- IRL should be 7 passengers
-          ["MLRS FDDM"] = 4,
-          ["MTLB"] = 25, -- IRL should be 11 passengers
-          ["GAZ-66"] = 8,
-          ["GAZ-3307"] = 12,
-          ["GAZ-3308"] = 14,
-          ["Grad_FDDM"] = 6, -- new by kappa
-          ["KAMAZ Truck"] = 12,
-          ["KrAZ6322"] = 12,
-          ["M 818"] = 12,
-          ["Tigr_233036"] = 6,
-          ["TPZ"] = 10, -- Fuchs
-          ["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
-          ["VAB_Mephisto"] = 8, -- new by Apple
-          ["tt_KORD"] = 6, -- 2.7.1 HL/TT
-          ["tt_DSHK"] = 6,
-          ["HL_KORD"] = 6,
-          ["HL_DSHK"] = 6,
-          ["CCKW_353"] = 16, --GMC CCKW 2½-ton 6×6 truck, estimating 16 soldiers
-        }
+        local Weights = POSITIONABLE.CargoBayCapacityValues.Ground

        -- Assuming that each passenger weighs 95 kg on average.
-        local CargoBayWeightLimit = ( Weights[TypeName] or 0 ) * 95
+        local CargoBayWeightLimit = ( Weights[TypeName] or 0 )

        self.__.CargoBayWeightLimit = CargoBayWeightLimit
      end
--- a/Development/Moose/Wrapper/Scenery.lua
+++ b/Development/Moose/Wrapper/Scenery.lua
@@ -18,6 +18,7 @@
 -- @field #string SceneryName Name of the scenery object.
 -- @field DCS#Object SceneryObject DCS scenery object.
 -- @field #number Life0 Initial life points.
+-- @field #table Properties
 -- @extends Wrapper.Positionable#POSITIONABLE


@@ -43,7 +44,7 @@ function SCENERY:Register( SceneryName, SceneryObject )

  local self = BASE:Inherit( self, POSITIONABLE:New( SceneryName ) )
  
-  self.SceneryName = SceneryName
+  self.SceneryName = tostring(SceneryName)
  
  self.SceneryObject = SceneryObject
  
@@ -52,9 +53,43 @@ function SCENERY:Register( SceneryName, SceneryObject )
  else
    self.Life0 = 0
  end
+  
+  self.Properties = {}
+  
  return self
 end

+--- Returns the Value of the zone with the given PropertyName, or nil if no matching property exists.
+-- @param #SCENERY self
+-- @param #string PropertyName The name of a the QuadZone Property from the scenery assignment to be retrieved.
+-- @return #string The Value of the QuadZone Property from the scenery assignment with the given PropertyName, or nil if absent.
+function SCENERY:GetProperty(PropertyName)
+  return self.Properties[PropertyName]
+end
+
+--- Returns the scenery Properties table.
+-- @param #SCENERY self
+-- @return #table The Key:Value table of QuadZone properties of the zone from the scenery assignment .
+function SCENERY:GetAllProperties()
+  return self.Properties
+end
+
+--- Set a scenery property
+-- @param #SCENERY self
+-- @param #string PropertyName
+-- @param #string PropertyValue
+-- @return #SCENERY self
+function SCENERY:SetProperty(PropertyName, PropertyValue)
+  self.Properties[PropertyName] = PropertyValue
+  return self
+end
+--- Obtain object name.
+--@param #SCENERY self
+--@return #string Name
+function SCENERY:GetName()
+  return self.SceneryName
+end
+
 --- Obtain DCS Object from the SCENERY Object.
 --@param #SCENERY self
 --@return DCS#Object DCS scenery object.
@@ -115,26 +150,28 @@ end
 --@param Core.Point#COORDINATE Coordinate Where to find the scenery object
 --@param #number Radius (optional) Search radius around coordinate, defaults to 100
 --@return #SCENERY Scenery Object or `nil` if it cannot be found
-function SCENERY:FindByName(Name, Coordinate, Radius)
+function SCENERY:FindByName(Name, Coordinate, Radius, Role)

  local radius = Radius or 100
  local name = Name or "unknown"
  local scenery = nil
  
-  BASE:T({name, radius, Coordinate:GetVec2()})
-  
  ---
  -- @param Core.Point#COORDINATE coordinate
  -- @param #number radius
  -- @param #string name
-  local function SceneryScan(coordinate, radius, name)
-    if coordinate ~= nil then
-      local scenerylist = coordinate:ScanScenery(radius)
-      local rscenery = nil
-      for _,_scenery in pairs(scenerylist) do
+  local function SceneryScan(scoordinate, sradius, sname)
+    if scoordinate ~= nil then
+      local Vec2 = scoordinate:GetVec2()
+      local scanzone = ZONE_RADIUS:New("Zone-"..sname,Vec2,sradius,true)
+      scanzone:Scan({Object.Category.SCENERY})
+      local scanned = scanzone:GetScannedSceneryObjects()
+      local rscenery = nil -- Wrapper.Scenery#SCENERY
+      for _,_scenery in pairs(scanned) do
        local scenery = _scenery -- Wrapper.Scenery#SCENERY
-        if tostring(scenery.SceneryName) == tostring(name) then
+        if tostring(scenery.SceneryName) == tostring(sname) then
          rscenery = scenery
+          if Role then rscenery:SetProperty("ROLE",Role) end
          break
        end
      end
@@ -144,6 +181,7 @@ function SCENERY:FindByName(Name, Coordinate, Radius)
  end
  
  if Coordinate then
+    --BASE:I("Coordinate Scenery Scan")
    scenery = SceneryScan(Coordinate, radius, name)
  end

@@ -154,7 +192,7 @@ end
 -- to find the correct object.
 --@param #SCENERY self
 --@param #string Name The name or id of the scenery object as taken from the ME. Ex. '595785449'
--@param Core.Zone#ZONE Zone Where to find the scenery object. Can be handed as zone name.
+--@param Core.Zone#ZONE_BASE Zone Where to find the scenery object. Can be handed as zone name.
 --@param #number Radius (optional) Search radius around coordinate, defaults to 100
 --@return #SCENERY Scenery Object or `nil` if it cannot be found
 function SCENERY:FindByNameInZone(Name, Zone, Radius)   
@@ -164,7 +202,7 @@ function SCENERY:FindByNameInZone(Name, Zone, Radius)
    Zone = ZONE:FindByName(Zone)
  end
  local coordinate = Zone:GetCoordinate()
-  return self:FindByName(Name,coordinate,Radius)  
+  return self:FindByName(Name,coordinate,Radius,Zone:GetProperty("ROLE"))
 end

 --- Find a SCENERY object from its zone name. Since SCENERY isn't registered in the Moose database (just too many objects per map), we need to do a scan first
@@ -173,38 +211,34 @@ end
 --@param #string ZoneName The name of the scenery zone as created with a right-click on the map in the mission editor and select "assigned to...". Can be handed over as ZONE object.
 --@return #SCENERY First found Scenery Object or `nil` if it cannot be found
 function SCENERY:FindByZoneName( ZoneName )
-  local zone = ZoneName -- Core.Zone#ZONE
+  local zone = ZoneName -- Core.Zone#ZONE_BASE
  if type(ZoneName) == "string" then
-  zone = ZONE:FindByName(ZoneName) 
+    zone = ZONE:FindByName(ZoneName)  -- Core.Zone#ZONE_POLYGON
  end
  local _id = zone:GetProperty('OBJECT ID')
-  BASE:T("Object ID ".._id)
+  --local properties = zone:GetAllProperties() or {}
+  --BASE:I(string.format("Object ID is: %s",_id or "none"))
+  --BASE:T("Object ID ".._id)
  if not _id then
    -- this zone has no object ID
    BASE:E("**** Zone without object ID: "..ZoneName.." | Type: "..tostring(zone.ClassName))
    if string.find(zone.ClassName,"POLYGON") then
      zone:Scan({Object.Category.SCENERY})
-      local scanned = zone:GetScannedScenery()
+      local scanned = zone:GetScannedSceneryObjects()
      for _,_scenery in (scanned) do
        local scenery = _scenery -- Wrapper.Scenery#SCENERY
        if scenery:IsAlive() then
+          local role = zone:GetProperty("ROLE")
+          if role then scenery:SetProperty("ROLE",role) end
          return scenery
        end
      end
      return nil
    else
-      local coordinate = zone:GetCoordinate()
-      local scanned = coordinate:ScanScenery()
-      for _,_scenery in (scanned) do
-        local scenery = _scenery -- Wrapper.Scenery#SCENERY
-        if scenery:IsAlive() then
-          return scenery
-        end
-      end
-      return nil
+      return self:FindByName(_id, zone:GetCoordinate(),nil,zone:GetProperty("ROLE"))
    end
  else
-    return self:FindByName(_id, zone:GetCoordinate())
+    return self:FindByName(_id, zone:GetCoordinate(),nil,zone:GetProperty("ROLE"))
  end
 end

@@ -219,6 +253,7 @@ function SCENERY:FindAllByZoneName( ZoneName )
    zone = ZONE:FindByName(ZoneName) 
  end
  local _id = zone:GetProperty('OBJECT ID')
+  --local properties = zone:GetAllProperties() or {}
  if not _id then
    -- this zone has no object ID
    --BASE:E("**** Zone without object ID: "..ZoneName.." | Type: "..tostring(zone.ClassName))
@@ -230,7 +265,7 @@ function SCENERY:FindAllByZoneName( ZoneName )
      return nil
    end
  else
-    local obj = self:FindByName(_id, zone:GetCoordinate())
+    local obj = self:FindByName(_id, zone:GetCoordinate(),nil,zone:GetProperty("ROLE"))
    if obj then
      return {obj}
    else
--- a/Development/Moose/Wrapper/Storage.lua
+++ b/Development/Moose/Wrapper/Storage.lua
@@ -0,0 +1,359 @@
+--- **Wrapper** - Warehouse storage of DCS airbases.
+--
+-- ## Main Features:
+--
+--    * Convenient access to DCS API functions
+--
+-- ===
+--
+-- ## Example Missions:
+--
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Wrapper%20-%20Storage).
+--
+-- ===
+--
+-- ### Author: **funkyfranky**
+--
+-- ===
+-- @module Wrapper.Storage
+-- @image Wrapper_Storage.png
+
+
+--- STORAGE class.
+-- @type STORAGE
+-- @field #string ClassName Name of the class.
+-- @field #number verbose Verbosity level.
+-- @field #string lid Class id string for output to DCS log file.
+-- @field DCS#Warehouse warehouse The DCS warehouse object.
+-- @field DCS#Airbase airbase The DCS airbase object.
+-- @extends Core.Base#BASE
+
+--- *The capitalist cannot store labour-power in warehouses after he has bought it, as he may do with the raw material.* -- Karl Marx
+--
+-- ===
+--
+-- # The STORAGE Concept
+-- 
+-- The STORAGE class offers an easy-to-use wrapper interface to all DCS API functions of DCS warehouses. 
+-- We named the class STORAGE, because the name WAREHOUSE is already taken by another MOOSE class.
+-- 
+-- This class allows you to add and remove items to a DCS warehouse, such as aircraft, liquids, weapons and other equipment.
+-- 
+-- # Constructor
+-- 
+-- A DCS warehouse is associated with an airbase. Therefore, a `STORAGE` instance is automatically created, once an airbase is registered and added to the MOOSE database.
+-- 
+-- You can get the `STORAGE` object from the 
+-- 
+--     -- Create a STORAGE instance of the Batumi warehouse  
+--     local storage=STORAGE:FindByName("Batumi")
+-- 
+-- An other way to get the `STORAGE` object is to retrieve it from the AIRBASE function `AIRBASE:GetStorage()`
+-- 
+--     -- Get storage instance of Batumi airbase
+--     local Batumi=AIRBASE:FindByName("Batumi")
+--     local storage=Batumi:GetStorage()
+-- 
+-- # Aircraft, Weapons and Equipment
+-- 
+-- ## Adding Items
+-- 
+-- To add aircraft, weapons and/or othe equipment, you can use the @{#STORAGE.AddItem}() function
+-- 
+--     storage:AddItem("A-10C", 3)
+--     storage:AddItem("weapons.missiles.AIM_120C", 10)
+--     
+-- This will add three A-10Cs and ten AIM-120C missiles to the warehouse inventory.
+-- 
+-- ## Setting Items
+-- 
+-- You can also explicitly set, how many items are in the inventory with the @{#STORAGE.SetItem}() function.
+-- 
+-- ## Removing Items
+-- 
+-- Items can be removed from the inventory with the @{#STORAGE.RemoveItem}() function.
+-- 
+-- ## Getting Amount
+-- 
+-- The number of items currently in the inventory can be obtained with the @{#STORAGE.GetItemAmount}() function
+-- 
+--     local N=storage:GetItemAmount("A-10C")
+--     env.info(string.format("We currently have %d A-10Cs available", N))
+-- 
+-- # Liquids
+-- 
+-- Liquids can be added and removed by slightly different functions as described below. Currently there are four types of liquids
+-- 
+-- * Jet fuel `STORAGE.Liquid.JETFUEL`
+-- * Aircraft gasoline `STORAGE.Liquid.GASOLINE`
+-- * MW 50 `STORAGE.Liquid.MW50`
+-- * Diesel `STORAGE.Liquid.DIESEL`
+-- 
+-- ## Adding Liquids
+-- 
+-- To add a certain type of liquid, you can use the @{#STORAGE.AddItem}(Type, Amount) function
+-- 
+--     storage:AddLiquid(STORAGE.Liquid.JETFUEL, 10000)
+--     storage:AddLiquid(STORAGE.Liquid.DIESEL, 20000)
+-- 
+-- This will add 10,000 kg of jet fuel and 20,000 kg of diesel to the inventory.
+-- 
+-- ## Setting Liquids
+-- 
+-- You can also explicitly set the amount of liquid with the @{#STORAGE.SetLiquid}(Type, Amount) function.
+-- 
+-- ## Removing Liquids
+-- 
+-- Liquids can be removed with @{#STORAGE.RemoveLiquid}(Type, Amount) function.
+-- 
+-- ## Getting Amount
+-- 
+-- The current amount of a certain liquid can be obtained with the @{#STORAGE.GetLiquidAmount}(Type) function
+-- 
+--     local N=storage:GetLiquidAmount(STORAGE.Liquid.DIESEL)
+--     env.info(string.format("We currently have %d kg of Diesel available", N))
+--     
+-- 
+-- # Inventory
+-- 
+-- The current inventory of the warehouse can be obtained with the @{#STORAGE.GetInventory}() function. This returns three tables with the aircraft, liquids and weapons:
+-- 
+--     local aircraft, liquids, weapons=storage:GetInventory()
+--     
+--     UTILS.PrintTableToLog(aircraft)
+--     UTILS.PrintTableToLog(liquids)
+--     UTILS.PrintTableToLog(weapons)
+--
+-- @field #STORAGE
+STORAGE = {
+  ClassName          = "STORAGE",
+  verbose            =     0,
+}
+
+--- Liquid types.
+-- @type STORAGE.Liquid
+-- @field #number JETFUEL Jet fuel (0).
+-- @field #number GASOLINE Aviation gasoline (1).
+-- @field #number MW50 MW50 (2).
+-- @field #number DIESEL Diesel (3).
+STORAGE.Liquid = {
+  JETFUEL = 0,
+  GASOLINE = 1,
+  MW50 = 2,
+  DIESEL = 3,
+}
+
+--- STORAGE class version.
+-- @field #string version
+STORAGE.version="0.0.1"
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- TODO list
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- TODO: A lot...
+-- TODO: Persistence
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Constructor
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Create a new STORAGE object from the DCS weapon object.
+-- @param #STORAGE self
+-- @param #string AirbaseName Name of the airbase.
+-- @return #STORAGE self
+function STORAGE:New(AirbaseName)
+
+  -- Inherit everything from BASE class.
+  local self=BASE:Inherit(self, BASE:New()) -- #STORAGE
+
+  self.airbase=Airbase.getByName(AirbaseName)
+
+  self.warehouse=self.airbase:getWarehouse()
+
+  self.lid = string.format("STORAGE %s", AirbaseName)
+
+  return self
+end
+
+
+--- Find a STORAGE in the **_DATABASE** using the name associated airbase.
+-- @param #STORAGE self
+-- @param #string AirbaseName The Airbase Name.
+-- @return #STORAGE self
+function STORAGE:FindByName( AirbaseName )
+  local storage = _DATABASE:FindStorage( AirbaseName )
+  return storage
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- User API Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Set verbosity level.
+-- @param #STORAGE self
+-- @param #number VerbosityLevel Level of output (higher=more). Default 0.
+-- @return #STORAGE self
+function STORAGE:SetVerbosity(VerbosityLevel)
+  self.verbose=VerbosityLevel or 0
+  return self
+end
+
+
+--- Adds the passed amount of a given item to the warehouse.
+-- @param #STORAGE self
+-- @param #string Name Name of the item to add.
+-- @param #number Amount Amount of items to add.
+-- @return #STORAGE self
+function STORAGE:AddItem(Name, Amount)
+
+  self:T(self.lid..string.format("Adding %d items of %s", Amount, UTILS.OneLineSerialize(Name)))
+
+  self.warehouse:addItem(Name, Amount)
+
+  return self
+end
+
+
+--- Sets the specified amount of a given item to the warehouse.
+-- @param #STORAGE self
+-- @param #string Name Name of the item.
+-- @param #number Amount Amount of items.
+-- @return #STORAGE self
+function STORAGE:SetItem(Name, Amount)
+
+  self:T(self.lid..string.format("Setting item %s to N=%d", UTILS.OneLineSerialize(Name), Amount))
+
+  self.warehouse:setItem(Name, Amount)
+
+  return self
+end
+
+--- Gets the amount of a given item currently present the warehouse.
+-- @param #STORAGE self
+-- @param #string Name Name of the item.
+-- @return #number Amount of items.
+function STORAGE:GetItemAmount(Name)
+
+  local N=self.warehouse:getItemCount(Name)
+
+  return N
+end
+
+
+
+--- Removes the amount of the passed item from the warehouse.
+-- @param #STORAGE self
+-- @param #string Name Name of the item.
+-- @param #number Amount Amount of items.
+-- @return #STORAGE self
+function STORAGE:RemoveItem(Name, Amount)
+
+  self:T(self.lid..string.format("Removing N=%d of item %s", Amount, Name))
+
+  self.warehouse:removeItem(Name, Amount)
+
+  return self
+end
+
+
+
+
+--- Adds the passed amount of a given liquid to the warehouse.
+-- @param #STORAGE self
+-- @param #number Type Type of liquid.
+-- @param #number Amount Amount of liquid to add.
+-- @return #STORAGE self
+function STORAGE:AddLiquid(Type, Amount)
+
+  self:T(self.lid..string.format("Adding %d liquids of %s", Amount, self:GetLiquidName(Type)))
+
+  self.warehouse:addLiquid(Type, Amount)
+
+  return self
+end
+
+
+--- Sets the specified amount of a given liquid to the warehouse.
+-- @param #STORAGE self
+-- @param #number Type Type of liquid.
+-- @param #number Amount Amount of liquid.
+-- @return #STORAGE self
+function STORAGE:SetLiquid(Type, Amount)
+
+  self:T(self.lid..string.format("Setting liquid %s to N=%d", self:GetLiquidName(Type), Amount))
+
+  self.warehouse:setLiquid(Type, Amount)
+
+  return self
+end
+
+--- Removes the amount of the given liquid type from the warehouse.
+-- @param #STORAGE self
+-- @param #number Type Type of liquid.
+-- @param #number Amount Amount of liquid in kg to be removed.
+-- @return #STORAGE self
+function STORAGE:RemoveLiquid(Type, Amount)
+
+  self:T(self.lid..string.format("Removing N=%d of liquid %s", Amount, self:GetLiquidName(Type)))
+
+  self.warehouse:removeLiquid(Type, Amount)
+
+  return self
+end
+
+--- Gets the amount of a given liquid currently present the warehouse.
+-- @param #STORAGE self
+-- @param #number Type Type of liquid.
+-- @return #number Amount of liquid in kg.
+function STORAGE:GetLiquidAmount(Type)
+
+  local N=self.warehouse:getLiquidAmount(Type)
+
+  return N
+end
+
+--- Returns the name of the liquid from its numeric type.
+-- @param #STORAGE self
+-- @param #number Type Type of liquid.
+-- @return #string Name of the liquid.
+function STORAGE:GetLiquidName(Type)
+
+  local name="Unknown"
+  
+  if Type==STORAGE.Liquid.JETFUEL then
+    name = "Jet fuel"
+  elseif Type==STORAGE.Liquid.GASOLINE then
+    name = "Aircraft gasoline"
+  elseif Type==STORAGE.Liquid.MW50 then
+    name = "MW 50"
+  elseif Type==STORAGE.Liquid.DIESEL then
+    name = "Diesel"
+  else
+    self:E(self.lid..string.format("ERROR: Unknown liquid type %s", tostring(Type)))
+  end
+
+  return name
+end
+
+
+--- Returns a full itemized list of everything currently in a warehouse. If a category is set to unlimited then the table will be returned empty.
+-- @param #STORAGE self
+-- @param #string Item Name of item as #string or type of liquid as #number.
+-- @return #table Table of aircraft. Table is emtpy `{}` if number of aircraft is set to be unlimited.
+-- @return #table Table of liquids. Table is emtpy `{}` if number of liquids is set to be unlimited.
+-- @return #table Table of weapons and other equipment. Table is emtpy `{}` if number of liquids is set to be unlimited.
+function STORAGE:GetInventory(Item)
+
+  local inventory=self.warehouse:getInventory(Item)
+  
+  return inventory.aircraft, inventory.liquids, inventory.weapon
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Private Functions
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- a/Setup/Moose.files
+++ b/Setup/Moose.files
@@ -49,6 +49,7 @@ Wrapper/Scenery.lua
 Wrapper/Marker.lua
 Wrapper/Weapon.lua
 Wrapper/Net.lua
+Wrapper/Storage.lua

 Cargo/Cargo.lua
 Cargo/CargoUnit.lua
Author	SHA1	Message	Date
Applevangelist	cf824b912d	#Controllable * Added Aerobtics tasks	2023-08-22 10:24:40 +02:00
Thomas	8d2e291deb	Update Enums.lua Error in ENUM	2023-08-21 11:35:01 +02:00
Applevangelist	3a432782b2	Storages Enum	2023-08-20 15:22:49 +02:00
Applevangelist	bda1fac923	#ENUMS * Added enumerator for ENUMS.Storage.weapons	2023-08-20 15:12:47 +02:00
Thomas	ef40b1c524	Range fix for #1984 (#1992 ) Range fix for #1984	2023-08-20 13:41:20 +02:00
Applevangelist	045c49679d	#ATIS * Fix explicitly set RWY not reported via SRS	2023-08-20 11:18:58 +02:00
Applevangelist	f40442d309	#POSITIONABLE * Make cargo weights an enumerator	2023-08-18 11:07:43 +02:00
Frank	fe7acecdd3	Merge pull request #1991 from FlightControl-Master/FF/MasterDevel STORAGE - DCS Warehouse	2023-08-17 19:11:01 +02:00
Frank	4471ec9b96	DCS Warehouse	2023-08-17 18:46:09 +02:00
Frank	32e1d4f8fa	DCS Warehouse	2023-08-16 23:58:32 +02:00
Frank	747e5d801a	Merge pull request #1986 from FlightControl-Master/FF/MasterDevel COORDINATE	2023-08-13 18:19:16 +02:00
Frank	29ed630536	COORDINATE - Generalized MarkupToAllFreeForm UTILS - Added some functions from MIST	2023-08-13 17:40:28 +02:00
Applevangelist	c5757ffd22	#CONTROLLABLE * Added EnRouteTaskCAP()	2023-08-02 18:02:34 +02:00
Applevangelist	9cc08cb088	#	2023-08-01 16:26:29 +02:00
Applevangelist	2771e7f856	#SCENERY, SET_SCENERY * Reworked COORDINATE scan as this doesn't seem to work * Added SET_SCENERY Filters, and FilterOnce() to apply them	2023-08-01 16:18:23 +02:00
Thomas	7c4dd8160d	Update Set.lua (#1982 ) Intellisense updates	2023-08-01 11:53:00 +02:00
Thomas	1fdc50b0da	Update Scenery.lua (#1980 ) _id might be nil in :FindByZoneName()	2023-08-01 10:00:42 +02:00
Thomas	f87a676e4b	Update Scoring.lua (#1976 ) Add report Spaces	2023-07-29 16:45:00 +02:00