From 63866e4aa9a537ca0d369bd8d2910a6acddc6eec Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Sun, 6 Aug 2017 17:37:36 +0200 Subject: [PATCH] Updates of tracing --- Moose Development/Moose/AI/AI_A2A.lua | 6 +++--- Moose Development/Moose/AI/AI_A2A_Cap.lua | 4 ++-- Moose Development/Moose/AI/AI_A2A_Gci.lua | 2 +- Moose Development/Moose/AI/AI_A2A_Patrol.lua | 4 ++-- Moose Development/Moose/Core/ScheduleDispatcher.lua | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Moose Development/Moose/AI/AI_A2A.lua b/Moose Development/Moose/AI/AI_A2A.lua index d38c7c05c..ad72d92f6 100644 --- a/Moose Development/Moose/AI/AI_A2A.lua +++ b/Moose Development/Moose/AI/AI_A2A.lua @@ -512,7 +512,7 @@ end --- @param Wrapper.Group#GROUP AIGroup function AI_A2A.RTBRoute( AIGroup ) - AIGroup:E( { "AI_A2A.RTBRoute:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A.RTBRoute:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A = AIGroup:GetState( AIGroup, "AI_A2A" ) -- #AI_A2A @@ -526,7 +526,7 @@ end --- @param Wrapper.Group#GROUP AIGroup function AI_A2A.RTBHold( AIGroup ) - AIGroup:E( { "AI_A2A.RTBHold:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A.RTBHold:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A = AIGroup:GetState( AIGroup, "AI_A2A" ) -- #AI_A2A _AI_A2A:__RTB( 0.5 ) @@ -642,7 +642,7 @@ end --- @param Wrapper.Group#GROUP AIGroup function AI_A2A.Resume( AIGroup ) - AIGroup:E( { "AI_A2A.Resume:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A.Resume:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A = AIGroup:GetState( AIGroup, "AI_A2A" ) -- #AI_A2A _AI_A2A:__RTB( 0.5 ) diff --git a/Moose Development/Moose/AI/AI_A2A_Cap.lua b/Moose Development/Moose/AI/AI_A2A_Cap.lua index 5377ced12..3be0ffc31 100644 --- a/Moose Development/Moose/AI/AI_A2A_Cap.lua +++ b/Moose Development/Moose/AI/AI_A2A_Cap.lua @@ -350,7 +350,7 @@ end --- @param Wrapper.Group#GROUP AIGroup function AI_A2A_CAP.AttackRoute( AIGroup ) - AIGroup:E( { "AI_A2A_CAP.AttackRoute:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A_CAP.AttackRoute:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A_CAP = AIGroup:GetState( AIGroup, "AI_A2A_CAP" ) -- AI.AI_Cap#AI_A2A_CAP @@ -497,7 +497,7 @@ end --- @param Wrapper.Group#GROUP AIGroup function AI_A2A_CAP.Resume( AIGroup ) - AIGroup:E( { "AI_A2A_CAP.Resume:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A_CAP.Resume:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A = AIGroup:GetState( AIGroup, "AI_A2A" ) -- #AI_A2A _AI_A2A:__Reset( 1 ) diff --git a/Moose Development/Moose/AI/AI_A2A_Gci.lua b/Moose Development/Moose/AI/AI_A2A_Gci.lua index 17107c514..46be6c667 100644 --- a/Moose Development/Moose/AI/AI_A2A_Gci.lua +++ b/Moose Development/Moose/AI/AI_A2A_Gci.lua @@ -313,7 +313,7 @@ end --- @param Wrapper.Group#GROUP AIControllable function AI_A2A_GCI.InterceptRoute( AIGroup ) - AIGroup:E( { "AI_A2A_GCI.InterceptRoute:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A_GCI.InterceptRoute:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A_GCI = AIGroup:GetState( AIGroup, "AI_A2A_GCI" ) -- AI.AI_Cap#AI_A2A_GCI diff --git a/Moose Development/Moose/AI/AI_A2A_Patrol.lua b/Moose Development/Moose/AI/AI_A2A_Patrol.lua index 5bd1e7dbc..a2d682f86 100644 --- a/Moose Development/Moose/AI/AI_A2A_Patrol.lua +++ b/Moose Development/Moose/AI/AI_A2A_Patrol.lua @@ -319,7 +319,7 @@ end -- Note that this method is required, as triggers the next route when patrolling for the Controllable. function AI_A2A_PATROL.PatrolRoute( AIGroup ) - AIGroup:E( { "AI_A2A_PATROL.PatrolRoute:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A_PATROL.PatrolRoute:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A_Patrol = AIGroup:GetState( AIGroup, "AI_A2A_PATROL" ) -- #AI_A2A_PATROL @@ -391,7 +391,7 @@ end --- @param Wrapper.Group#GROUP AIGroup function AI_A2A_PATROL.Resume( AIGroup ) - AIGroup:E( { "AI_A2A_PATROL.Resume:", AIGroup:GetName() } ) + AIGroup:F( { "AI_A2A_PATROL.Resume:", AIGroup:GetName() } ) if AIGroup:IsAlive() then local _AI_A2A = AIGroup:GetState( AIGroup, "AI_A2A" ) -- #AI_A2A _AI_A2A:__Reset( 1 ) diff --git a/Moose Development/Moose/Core/ScheduleDispatcher.lua b/Moose Development/Moose/Core/ScheduleDispatcher.lua index ab5785ff3..9c2da0edc 100644 --- a/Moose Development/Moose/Core/ScheduleDispatcher.lua +++ b/Moose Development/Moose/Core/ScheduleDispatcher.lua @@ -186,7 +186,7 @@ function SCHEDULEDISPATCHER:Start( Scheduler, CallID ) Schedule[CallID].ScheduleID = timer.scheduleFunction( Schedule[CallID].CallHandler, CallID, - timer.getTime() + Schedule[CallID].Start + math.random( - ( Schedule[CallID].Randomize * Schedule[CallID].Repeat / 2 ), ( Schedule[CallID].Randomize * Schedule[CallID].Repeat / 2 ) ) + timer.getTime() + Schedule[CallID].Start ) end else