diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua index c3de86af6..36a84bfdd 100644 --- a/Moose Development/Moose/Functional/Artillery.lua +++ b/Moose Development/Moose/Functional/Artillery.lua @@ -597,8 +597,15 @@ ARTY={ autorelocateonroad=false, } ---- Weapong type ID. http://wiki.hoggit.us/view/DCS_enum_weapon_flag --- @list WeaponType +--- Weapong type ID. See [here](http://wiki.hoggit.us/view/DCS_enum_weapon_flag). +-- @type ARTY.WeaponType +-- @field #number Auto Automatic selection of weapon type. +-- @field #number Cannon Cannons using conventional shells. +-- @field #number Rockets Unguided rockets. +-- @field #number CruiseMissile Cruise missiles. +-- @field #number TacticalNukes Tactical nuclear shells (simulated). +-- @field #number IlluminationShells Illumination shells (simulated). +-- @field #number SmokeShells Smoke shells (simulated). ARTY.WeaponType={ Auto=1073741822, Cannon=805306368, @@ -610,7 +617,7 @@ ARTY.WeaponType={ } --- Database of common artillery unit properties. --- @list db +-- @type ARTY.db ARTY.db={ ["2B11 mortar"] = { -- type "2B11 mortar" minrange = 500, -- correct? diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua index 8b08881e8..f20098286 100644 --- a/Moose Development/Moose/Functional/Warehouse.lua +++ b/Moose Development/Moose/Functional/Warehouse.lua @@ -606,6 +606,7 @@ -- * "Attacked" --> "Captured" --> "Running" (warehouse was captured by the enemy) -- * "*" --> "AirbaseCaptured" --> "*" (airbase belonging to the warehouse was captured by the enemy) -- * "*" --> "AirbaseRecaptured" --> "*" (airbase was re-captured) +-- * "*" --> "AssetDead" --> "*" (a whole asset group is dead) -- * "*" --> "Destroyed" --> "Destroyed" (warehouse was destroyed) -- * "Running" --> "Pause" --> "Paused" (warehouse is paused) -- * "Paused" --> "Unpause" --> "Running" (warehouse is unpaused) @@ -872,7 +873,7 @@ -- -- -- Big explosion at the warehose. It has a very nice damage model by the way :) -- local function DestroyWarehouse() --- warehouse.Batumi.warehouse:GetCoordinate():Explosion(999) +-- warehouse.Batumi:GetCoordinate():Explosion(999) -- end -- SCHEDULER:New(nil, DestroyWarehouse, {}, 30) -- @@ -935,9 +936,9 @@ -- -- Get Number of ships at Batumi. -- local nships=warehouse.Batumi:GetNumberOfAssets(WAREHOUSE.Descriptor.CATEGORY, Group.Category.SHIP) -- --- -- Send one ship every 5 minutes. +-- -- Send one ship every 3 minutes (ships do not evade each other well, so we need a bit space between them). -- for i=1, nships do --- warehouse.Batumi:__AddRequest(300*(i-1)+10, warehouse.Kobuleti, WAREHOUSE.Descriptor.CATEGORY, Group.Category.SHIP, 1) +-- warehouse.Batumi:__AddRequest(180*(i-1)+10, warehouse.Kobuleti, WAREHOUSE.Descriptor.CATEGORY, Group.Category.SHIP, 1) -- end -- -- ## Example 10: Warehouse on Aircraft Carrier @@ -1000,8 +1001,7 @@ -- warehouse.Stennis:__AddRequest(45, warehouse.Stennis, WAREHOUSE.Descriptor.ATTRIBUTE, WAREHOUSE.Attribute.NAVAL_ARMEDSHIP, 5, nil, nil, nil, "Speedboats Right") -- -- --- Function called after self request --- function warehouse.Stennis:OnAfterSelfRequest(From, Event, To,_groupset, request) --- +-- function warehouse.Stennis:OnAfterSelfRequest(From, Event, To,_groupset, request) -- local groupset=_groupset --Core.Set#SET_GROUP -- local request=request --Functional.Warehouse#WAREHOUSE.Pendingitem -- @@ -1216,15 +1216,14 @@ -- for _,_group in pairs(groupset:GetSet()) do -- local group=_group --Wrapper.Group#GROUP -- +-- -- Start uncontrolled aircraft. -- group:StartUncontrolled() --- group:SmokeBlue() -- -- -- Target coordinate! --- local ToCoord=warehouse.Sukhumi:GetCoordinate() --- ToCoord.y=5000 -- Adjust altitude +-- local ToCoord=warehouse.Sukhumi:GetCoordinate():SetAltitude(5000) -- --- local FoCoord=warehouse.Kobuleti:GetCoordinate() --- FoCoord.y=3000 -- Ajust altitude. +-- -- Home coordinate. +-- local HomeCoord=warehouse.Kobuleti:GetCoordinate():SetAltitude(3000) -- -- -- Task bomb Sukhumi warehouse using all bombs (2032) from direction 180 at altitude 5000 m. -- local task=group:TaskBombing(warehouse.Sukhumi:GetCoordinate():GetVec2(), false, "All", nil , 180, 5000, 2032) @@ -1237,7 +1236,7 @@ -- -- Begin bombing run 20 km south of target. -- WayPoints[2]=ToCoord:Translate(20*1000, 180):WaypointAirTurningPoint(nil, 600, {task}, "Bombing Run") -- -- Return to base. --- WayPoints[3]=FoCoord:WaypointAirTurningPoint() +-- WayPoints[3]=HomeCoord:WaypointAirTurningPoint() -- -- Land at homebase. Bombers are added back to stock and can be employed in later assignments. -- WayPoints[4]=warehouse.Kobuleti:GetCoordinate():WaypointAirLanding() -- @@ -1262,6 +1261,7 @@ -- -- Define a polygon zone as spawn zone at Kobuleti. -- warehouse.Kobuleti:SetSpawnZone(ZONE_POLYGON:New("Warehouse Kobuleti Spawn Zone", GROUP:FindByName("Warehouse Kobuleti Spawn Zone"))) -- +-- -- Add assets. -- warehouse.Kobuleti:AddAsset("M978", 20) -- warehouse.London:AddAsset("M818", 20) --