Templates progress, not perfect yet...

issues with smoke
issues with accounting
issues with scoring
minor things, should be solvable.
This commit is contained in:
FlightControl
2016-12-02 14:47:58 +01:00
parent 62b476144a
commit 4034461488
9 changed files with 198 additions and 189 deletions

View File

@@ -102,7 +102,7 @@ do -- PROCESS_ACCOUNT
self:AddEndState( "Accounted" )
self:AddEndState( "Failed" )
self:AddStartState( "Assigned" )
self:SetStartState( "Assigned" )
return self
end
@@ -117,14 +117,7 @@ do -- PROCESS_ACCOUNT
-- @param #string To
function PROCESS_ACCOUNT:onafterStart( ProcessUnit, Event, From, To )
-- TODO: need to generalize the timing.
self.DisplayInterval = 30
self.DisplayCount = 30
self.DisplayMessage = true
self.DisplayTime = 10 -- 10 seconds is the default
self.DisplayCategory = "HQ" -- Targets is the default display category
self:EventOnDead( self.EventDead )
self:EventOnDead( self.onfuncEventDead )
self:__Wait( 1 )
end
@@ -181,23 +174,20 @@ do -- PROCESS_ACCOUNT_DEADS
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ACCOUNT:New() ) -- #PROCESS_ACCOUNT_DEADS
return self, { TargetSetUnit, TaskName }
end
--- Creates a new DESTROY process.
-- @param #PROCESS_ACCOUNT_DEADS self
-- @param Set#SET_UNIT TargetSetUnit
-- @param #string TaskName
-- @return #PROCESS_ACCOUNT_DEADS self
function PROCESS_ACCOUNT_DEADS:Init( TargetSetUnit, TaskName )
self.TargetSetUnit = TargetSetUnit
self.TaskName = TaskName
self:SetParameters( {
TargetSetUnit = TargetSetUnit,
TaskName = TaskName,
DisplayInterval = 30,
DisplayCount = 30,
DisplayMessage = true,
DisplayTime = 10, -- 10 seconds is the default
DisplayCategory = "HQ", -- Targets is the default display category
} )
return self
end
function PROCESS_ACCOUNT_DEADS:_Destructor()
self:E("_Destructor")
@@ -260,7 +250,7 @@ do -- PROCESS_ACCOUNT_DEADS
--- @param #PROCESS_ACCOUNT_DEADS self
-- @param Event#EVENTDATA EventData
function PROCESS_ACCOUNT_DEADS:EventDead( EventData )
function PROCESS_ACCOUNT_DEADS:onfuncEventDead( EventData )
self:T( { "EventDead", EventData } )
if EventData.IniDCSUnit then

View File

@@ -110,7 +110,7 @@ do -- PROCESS_ASSIGN
self:AddEndState( "Rejected" )
self:AddEndState( "Failed" )
self:AddStartState( "UnAssigned" )
self:SetStartState( "UnAssigned" )
return self
end
@@ -136,26 +136,14 @@ do -- PROCESS_ASSIGN_ACCEPT
-- @param #PROCESS_ASSIGN_ACCEPT self
-- @param #string TaskBriefing
function PROCESS_ASSIGN_ACCEPT:New( TaskBriefing )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ASSIGN:New() ) -- #PROCESS_ASSIGN_ACCEPT
return self, { TaskBriefing }
end
--- Creates a new task assignment state machine. The process will accept the task by default, no player intervention accepted.
-- @param #PROCESS_ASSIGN_ACCEPT self
-- @param #string TaskBriefing
-- @return #PROCESS_ASSIGN_ACCEPT The task acceptance process.
function PROCESS_ASSIGN_ACCEPT:Init( TaskBriefing )
self.TaskBriefing = TaskBriefing
self:SetParameters( { TaskBriefing = TaskBriefing } )
return self
end
--- StateMachine callback function
-- @param #PROCESS_ASSIGN_ACCEPT self
-- @param Wrapper.Unit#UNIT ProcessUnit
@@ -178,6 +166,7 @@ do -- PROCESS_ASSIGN_ACCEPT
-- @param #string From
-- @param #string To
function PROCESS_ASSIGN_ACCEPT:onenterAssigned( ProcessUnit, Event, From, To )
env.info( "in here" )
self:E( { ProcessUnit, Event, From, To } )
local ProcessGroup = ProcessUnit:GetGroup()
@@ -211,8 +200,10 @@ do -- PROCESS_ASSIGN_MENU_ACCEPT
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ASSIGN:New() ) -- #PROCESS_ASSIGN_MENU_ACCEPT
self:SetParameters( { TaskName = TaskName, TaskBriefing = TaskBriefing } )
return self, { TaskName, TaskBriefing }
return self
end

View File

@@ -110,7 +110,7 @@ do -- PROCESS_ROUTE
self:AddEndState( "Arrived" )
self:AddEndState( "Failed" )
self:AddStartState( "None" )
self:SetStartState( "None" )
return self
end
@@ -125,11 +125,6 @@ do -- PROCESS_ROUTE
-- @param #string To
function PROCESS_ROUTE:onafterStart( ProcessUnit, Event, From, To )
self.DisplayInterval = 30
self.DisplayCount = 30
self.DisplayMessage = true
self.DisplayTime = 10 -- 10 seconds is the default
self.DisplayCategory = "HQ" -- Route is the default display category
self:__Route( 1 )
end
@@ -138,7 +133,7 @@ do -- PROCESS_ROUTE
-- @param #PROCESS_ROUTE self
-- @param Controllable#CONTROLLABLE ProcessUnit
-- @return #boolean
function PROCESS_ROUTE:HasArrived( ProcessUnit )
function PROCESS_ROUTE:onfuncHasArrived( ProcessUnit )
return false
end
@@ -151,7 +146,7 @@ do -- PROCESS_ROUTE
function PROCESS_ROUTE:onbeforeRoute( ProcessUnit, Event, From, To )
if ProcessUnit:IsAlive() then
local HasArrived = self:HasArrived( ProcessUnit ) -- Polymorphic
local HasArrived = self:onfuncHasArrived( ProcessUnit ) -- Polymorphic
if self.DisplayCount >= self.DisplayInterval then
self:T( { HasArrived = HasArrived } )
if not HasArrived then
@@ -200,26 +195,23 @@ do -- PROCESS_ROUTE_ZONE
function PROCESS_ROUTE_ZONE:New( TargetZone )
local self = BASE:Inherit( self, PROCESS_ROUTE:New() ) -- #PROCESS_ROUTE_ZONE
return self, { TargetZone }
end
--- Creates a new routing state machine. The task will route a controllable to a ZONE until the controllable is within that ZONE.
-- @param #PROCESS_ROUTE_ZONE self
-- @param Zone#ZONE_BASE TargetZone
-- @return #PROCESS_ROUTE_ZONE self
function PROCESS_ROUTE_ZONE:New( TargetZone )
self.TargetZone = TargetZone
self:SetParameters( {
TargetZone = TargetZone,
DisplayInterval = 30,
DisplayCount = 30,
DisplayMessage = true,
DisplayTime = 10, -- 10 seconds is the default
DisplayCategory = "HQ", -- Route is the default display category
} )
return self
end
--- Method override to check if the controllable has arrived.
-- @param #PROCESS_ROUTE self
-- @param Wrapper.Controllable#CONTROLLABLE ProcessUnit
-- @return #boolean
function PROCESS_ROUTE_ZONE:HasArrived( ProcessUnit )
function PROCESS_ROUTE_ZONE:onfuncHasArrived( ProcessUnit )
if ProcessUnit:IsInZone( self.TargetZone ) then
local RouteText = ProcessUnit:GetCallsign() .. ": You have arrived within the zone!"

View File

@@ -92,7 +92,7 @@ do -- PROCESS_SMOKE
self:AddEndState( "Failed" )
self:AddEndState( "Success" )
self:AddStartState( "None" )
self:SetStartState( "None" )
return self
end
@@ -153,7 +153,9 @@ do -- PROCESS_SMOKE_TARGETS_ZONE
function PROCESS_SMOKE_TARGETS_ZONE:New( TargetSetUnit, TargetZone )
local self = BASE:Inherit( self, PROCESS_SMOKE:New() ) -- #PROCESS_SMOKE
return self, { TargetSetUnit, TargetZone }
self:SetParameters( { TargetSetUnit, TargetZone } )
return self
end
--- Creates a new target smoking state machine. The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.