mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
#PLAYERTASK integration for CSAR and CTLD
This commit is contained in:
Applevangelist
parent
c84e153ff2
commit
bdd40fdf7d
@ -270,7 +270,7 @@ CSAR.AircraftType["Bronco-OV-10A"] = 2
|
||||
|
||||
--- CSAR class version.
|
||||
-- @field #string version
|
||||
CSAR.version="1.0.11"
|
||||
CSAR.version="1.0.13"
|
||||
|
||||
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- ToDo list
|
||||
@ -613,6 +613,19 @@ function CSAR:_DoubleEjection(_unitname)
|
||||
return false
|
||||
end
|
||||
|
||||
--- (User) Add a PLAYERTASK - FSM events will check success
|
||||
-- @param #CSAR self
|
||||
-- @param Ops.PlayerTask#PLAYERTASK PlayerTask
|
||||
-- @return #CSAR self
|
||||
function CSAR:AddPlayerTask(PlayerTask)
|
||||
self:T(self.lid .. " AddPlayerTask")
|
||||
if not self.PlayerTaskQueue then
|
||||
self.PlayerTaskQueue = FIFO:New()
|
||||
end
|
||||
self.PlayerTaskQueue:Push(PlayerTask,PlayerTask.PlayerTaskNr)
|
||||
return self
|
||||
end
|
||||
|
||||
--- (Internal) Spawn a downed pilot
|
||||
-- @param #CSAR self
|
||||
-- @param #number country Country for template.
|
||||
@ -1447,7 +1460,7 @@ function CSAR:_CheckCloseWoundedGroup(_distance, _heliUnit, _heliName, _woundedG
|
||||
end
|
||||
|
||||
if _heliUnit:InAir() and _unitsInHelicopter + 1 <= _maxUnits then
|
||||
-- TODO - make variable
|
||||
-- DONE - make variable
|
||||
if _distance < self.rescuehoverdistance then
|
||||
|
||||
--check height!
|
||||
@ -1455,7 +1468,7 @@ function CSAR:_CheckCloseWoundedGroup(_distance, _heliUnit, _heliName, _woundedG
|
||||
if leaderheight < 0 then leaderheight = 0 end
|
||||
local _height = _heliUnit:GetHeight() - leaderheight
|
||||
|
||||
-- TODO - make variable
|
||||
-- DONE - make variable
|
||||
if _height <= self.rescuehoverheight then
|
||||
|
||||
local _time = self.hoverStatus[_lookupKeyHeli]
|
||||
@ -2282,6 +2295,29 @@ end
|
||||
function CSAR:onbeforeBoarded(From, Event, To, Heliname, Woundedgroupname)
|
||||
self:T({From, Event, To, Heliname, Woundedgroupname})
|
||||
self:_ScheduledSARFlight(Heliname,Woundedgroupname)
|
||||
local Unit = UNIT:FindByName(Heliname)
|
||||
if Unit and Unit:IsPlayer() and self.PlayerTaskQueue then
|
||||
local playername = Unit:GetPlayerName()
|
||||
local dropcoord = Unit:GetCoordinate() or COORDINATE:New(0,0,0)
|
||||
local dropvec2 = dropcoord:GetVec2()
|
||||
self.PlayerTaskQueue:ForEach(
|
||||
function (Task)
|
||||
local task = Task -- Ops.PlayerTask#PLAYERTASK
|
||||
local subtype = task:GetSubType()
|
||||
-- right subtype?
|
||||
if Event == subtype and not task:IsDone() then
|
||||
local targetzone = task.Target:GetObject() -- Core.Zone#ZONE should be a zone in this case ....
|
||||
if (targetzone and targetzone.ClassName and string.match(targetzone.ClassName,"ZONE") and targetzone:IsVec2InZone(dropvec2))
|
||||
or (string.find(task.CSARPilotName,Woundedgroupname)) then
|
||||
if task.Clients:HasUniqueID(playername) then
|
||||
-- success
|
||||
task:__Success(-1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
)
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
@ -2311,6 +2347,23 @@ function CSAR:onbeforeRescued(From, Event, To, HeliUnit, HeliName, PilotsSaved)
|
||||
self:T({From, Event, To, HeliName, HeliUnit})
|
||||
self.rescues = self.rescues + 1
|
||||
self.rescuedpilots = self.rescuedpilots + PilotsSaved
|
||||
local Unit = HeliUnit or UNIT:FindByName(HeliName)
|
||||
if Unit and Unit:IsPlayer() and self.PlayerTaskQueue then
|
||||
local playername = Unit:GetPlayerName()
|
||||
self.PlayerTaskQueue:ForEach(
|
||||
function (Task)
|
||||
local task = Task -- Ops.PlayerTask#PLAYERTASK
|
||||
local subtype = task:GetSubType()
|
||||
-- right subtype?
|
||||
if Event == subtype and not task:IsDone() then
|
||||
if task.Clients:HasUniqueID(playername) then
|
||||
-- success
|
||||
task:__Success(-1)
|
||||
end
|
||||
end
|
||||
end
|
||||
)
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
-- @image OPS_CTLD.jpg
|
||||
|
||||
-- Date: Feb 2022
|
||||
-- Last Update Sep 2022
|
||||
-- Last Update October 2022
|
||||
|
||||
do
|
||||
|
||||
@ -288,8 +288,8 @@ CTLD_ENGINEERING = {
|
||||
|
||||
end
|
||||
|
||||
do
|
||||
|
||||
do
|
||||
------------------------------------------------------
|
||||
--- **CTLD_CARGO** class, extends Core.Base#BASE
|
||||
-- @type CTLD_CARGO
|
||||
@ -308,7 +308,6 @@ do
|
||||
-- @field #string Subcategory Sub-category name.
|
||||
-- @extends Core.Base#BASE
|
||||
|
||||
|
||||
---
|
||||
-- @field CTLD_CARGO
|
||||
CTLD_CARGO = {
|
||||
@ -343,7 +342,7 @@ CTLD_CARGO = {
|
||||
CRATE = "Crate", -- #string crate
|
||||
REPAIR = "Repair", -- #string repair
|
||||
ENGINEERS = "Engineers", -- #string engineers
|
||||
STATIC = "Static", -- #string engineers
|
||||
STATIC = "Static", -- #string statics
|
||||
}
|
||||
|
||||
--- Function to create new CTLD_CARGO object.
|
||||
@ -574,6 +573,10 @@ CTLD_CARGO = {
|
||||
end
|
||||
|
||||
do
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- TODO CTLD
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
-------------------------------------------------------------------------
|
||||
--- **CTLD** class, extends Core.Base#BASE, Core.Fsm#FSM
|
||||
-- @type CTLD
|
||||
@ -1068,7 +1071,7 @@ CTLD.UnitTypes = {
|
||||
|
||||
--- CTLD class version.
|
||||
-- @field #string version
|
||||
CTLD.version="1.0.11"
|
||||
CTLD.version="1.0.14"
|
||||
|
||||
--- Instantiate a new CTLD.
|
||||
-- @param #CTLD self
|
||||
@ -1476,6 +1479,19 @@ function CTLD:SetTroopDropZoneRadius(Radius)
|
||||
return self
|
||||
end
|
||||
|
||||
--- (User) Add a PLAYERTASK - FSM events will check success
|
||||
-- @param #CTLD self
|
||||
-- @param Ops.PlayerTask#PLAYERTASK PlayerTask
|
||||
-- @return #CTLD self
|
||||
function CTLD:AddPlayerTask(PlayerTask)
|
||||
self:T(self.lid .. " AddPlayerTask")
|
||||
if not self.PlayerTaskQueue then
|
||||
self.PlayerTaskQueue = FIFO:New()
|
||||
end
|
||||
self.PlayerTaskQueue:Push(PlayerTask,PlayerTask.PlayerTaskNr)
|
||||
return self
|
||||
end
|
||||
|
||||
--- (Internal) Event handler function
|
||||
-- @param #CTLD self
|
||||
-- @param Core.Event#EVENTDATA EventData
|
||||
@ -4244,7 +4260,7 @@ end
|
||||
end
|
||||
|
||||
-------------------------------------------------------------------
|
||||
-- FSM functions
|
||||
-- TODO FSM functions
|
||||
-------------------------------------------------------------------
|
||||
|
||||
--- (Internal) FSM Function onafterStart.
|
||||
@ -4417,6 +4433,27 @@ end
|
||||
-- @return #CTLD self
|
||||
function CTLD:onbeforeTroopsDeployed(From, Event, To, Group, Unit, Troops)
|
||||
self:T({From, Event, To})
|
||||
if Unit and Unit:IsPlayer() and self.PlayerTaskQueue then
|
||||
local playername = Unit:GetPlayerName()
|
||||
local dropcoord = Troops:GetCoordinate() or COORDINATE:New(0,0,0)
|
||||
local dropvec2 = dropcoord:GetVec2()
|
||||
self.PlayerTaskQueue:ForEach(
|
||||
function (Task)
|
||||
local task = Task -- Ops.PlayerTask#PLAYERTASK
|
||||
local subtype = task:GetSubType()
|
||||
-- right subtype?
|
||||
if Event == subtype and not task:IsDone() then
|
||||
local targetzone = task.Target:GetObject() -- Core.Zone#ZONE should be a zone in this case ....
|
||||
if targetzone and targetzone.ClassName and string.match(targetzone.ClassName,"ZONE") and targetzone:IsVec2InZone(dropvec2) then
|
||||
if task.Clients:HasUniqueID(playername) then
|
||||
-- success
|
||||
task:__Success(-1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
)
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
@ -4444,7 +4481,28 @@ end
|
||||
-- @param Wrapper.Group#GROUP Vehicle The #GROUP object of the vehicle or FOB build.
|
||||
-- @return #CTLD self
|
||||
function CTLD:onbeforeCratesBuild(From, Event, To, Group, Unit, Vehicle)
|
||||
self:T({From, Event, To})
|
||||
self:I({From, Event, To})
|
||||
if Unit and Unit:IsPlayer() and self.PlayerTaskQueue then
|
||||
local playername = Unit:GetPlayerName()
|
||||
local dropcoord = Vehicle:GetCoordinate() or COORDINATE:New(0,0,0)
|
||||
local dropvec2 = dropcoord:GetVec2()
|
||||
self.PlayerTaskQueue:ForEach(
|
||||
function (Task)
|
||||
local task = Task -- Ops.PlayerTask#PLAYERTASK
|
||||
local subtype = task:GetSubType()
|
||||
-- right subtype?
|
||||
if Event == subtype and not task:IsDone() then
|
||||
local targetzone = task.Target:GetObject() -- Core.Zone#ZONE should be a zone in this case ....
|
||||
if targetzone and targetzone.ClassName and string.match(targetzone.ClassName,"ZONE") and targetzone:IsVec2InZone(dropvec2) then
|
||||
if task.Clients:HasUniqueID(playername) then
|
||||
-- success
|
||||
task:__Success(-1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
)
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
@ -4802,7 +4860,9 @@ end -- end do
|
||||
do
|
||||
--- **Hercules Cargo AIR Drop Events** by Anubis Yinepu
|
||||
-- Moose CTLD OO refactoring by Applevangelist
|
||||
--
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- TODO CTLD_HERCULES
|
||||
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||
-- This script will only work for the Herculus mod by Anubis, and only for **Air Dropping** cargo from the Hercules.
|
||||
-- Use the standard Moose CTLD if you want to unload on the ground.
|
||||
-- Payloads carried by pylons 11, 12 and 13 need to be declared in the Herculus_Loadout.lua file
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user