From 73a1c565325a10d67f0771d8abbe22c639faacfe Mon Sep 17 00:00:00 2001 From: FlightControl_Master Date: Sun, 5 Nov 2017 06:15:06 +0100 Subject: [PATCH] New dynamic loader --- Moose Mission Setup/Moose.lua | 27 +++--- Moose Mission Setup/Moose_.lua | 153 +++++++++++++++++---------------- 2 files changed, 91 insertions(+), 89 deletions(-) diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index d31014207..239bba24b 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170628_1556' ) +env.info( 'Moose Generation Timestamp: 20171105_0612' ) local base = _G @@ -24,6 +24,9 @@ __Moose.Includes = {} __Moose.Include( __Moose.ProgramPath, 'Utilities/Routines.lua' ) __Moose.Include( __Moose.ProgramPath, 'Utilities/Utils.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Base.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/UserFlag.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/UserSound.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/Report.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Scheduler.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/ScheduleDispatcher.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Event.lua' ) @@ -33,10 +36,13 @@ __Moose.Include( __Moose.ProgramPath, 'Core/Zone.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Database.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Set.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Point.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/Velocity.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Message.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Fsm.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Radio.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/Spawn.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/SpawnStatic.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/Goal.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Cargo.lua' ) __Moose.Include( __Moose.ProgramPath, 'Core/Spot.lua' ) __Moose.Include( __Moose.ProgramPath, 'Wrapper/Object.lua' ) @@ -51,14 +57,17 @@ __Moose.Include( __Moose.ProgramPath, 'Wrapper/Airbase.lua' ) __Moose.Include( __Moose.ProgramPath, 'Wrapper/Scenery.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/Scoring.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/CleanUp.lua' ) -__Moose.Include( __Moose.ProgramPath, 'Functional/Spawn.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/Movement.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/Sead.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/Escort.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/MissileTrainer.lua' ) -__Moose.Include( __Moose.ProgramPath, 'Functional/AirbasePolice.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Functional/ATC_Ground.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/Detection.lua' ) __Moose.Include( __Moose.ProgramPath, 'Functional/Designate.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Functional/RAT.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Functional/ZoneGoal.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Functional/ZoneGoalCoalition.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Functional/ZoneCaptureCoalition.lua' ) __Moose.Include( __Moose.ProgramPath, 'AI/AI_Balancer.lua' ) __Moose.Include( __Moose.ProgramPath, 'AI/AI_A2A.lua' ) __Moose.Include( __Moose.ProgramPath, 'AI/AI_A2A_Patrol.lua' ) @@ -83,16 +92,8 @@ __Moose.Include( __Moose.ProgramPath, 'Tasking/Task_A2G.lua' ) __Moose.Include( __Moose.ProgramPath, 'Tasking/Task_A2A_Dispatcher.lua' ) __Moose.Include( __Moose.ProgramPath, 'Tasking/Task_A2A.lua' ) __Moose.Include( __Moose.ProgramPath, 'Tasking/Task_Cargo.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Tasking/TaskZoneCapture.lua' ) __Moose.Include( __Moose.ProgramPath, 'Moose.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Mission.lua' ) BASE:TraceOnOff( true ) - -local info = debug.getinfo( 1, "S" ) -local source = info.source -- #string -local dir = source:match("^(.*)/") -BASE:E( {"source", source}) -BASE:E( { "dir", dir } ) - -__Moose.MissionPath = dir .. "Mission\\l10n\\DEFAULT\\" - - env.info( '*** MOOSE INCLUDE END *** ' ) diff --git a/Moose Mission Setup/Moose_.lua b/Moose Mission Setup/Moose_.lua index f0d710d47..8fad43c60 100644 --- a/Moose Mission Setup/Moose_.lua +++ b/Moose Mission Setup/Moose_.lua @@ -1,11 +1,11 @@ env.info('*** MOOSE DYNAMIC INCLUDE START *** ') -env.info('Moose Generation Timestamp: 20171031_0744') +env.info('Moose Generation Timestamp: 20171105_0612') local base=_G __Moose={} -__Moose.Include=function(IncludeFile) +__Moose.Include=function(LuaPath,IncludeFile) if not __Moose.Includes[IncludeFile]then __Moose.Includes[IncludeFile]=IncludeFile -local f=assert(base.loadfile(__Moose.ProgramPath..IncludeFile)) +local f=assert(base.loadfile(LuaPath..IncludeFile)) if f==nil then error("Moose: Could not load Moose file "..IncludeFile) else @@ -16,78 +16,79 @@ end end __Moose.ProgramPath="Scripts/Moose/" __Moose.Includes={} -__Moose.Include('Utilities/Routines.lua') -__Moose.Include('Utilities/Utils.lua') -__Moose.Include('Core/Base.lua') -__Moose.Include('Core/UserFlag.lua') -__Moose.Include('Core/UserSound.lua') -__Moose.Include('Core/Report.lua') -__Moose.Include('Core/Scheduler.lua') -__Moose.Include('Core/ScheduleDispatcher.lua') -__Moose.Include('Core/Event.lua') -__Moose.Include('Core/Settings.lua') -__Moose.Include('Core/Menu.lua') -__Moose.Include('Core/Zone.lua') -__Moose.Include('Core/Database.lua') -__Moose.Include('Core/Set.lua') -__Moose.Include('Core/Point.lua') -__Moose.Include('Core/Velocity.lua') -__Moose.Include('Core/Message.lua') -__Moose.Include('Core/Fsm.lua') -__Moose.Include('Core/Radio.lua') -__Moose.Include('Core/Spawn.lua') -__Moose.Include('Core/SpawnStatic.lua') -__Moose.Include('Core/Goal.lua') -__Moose.Include('Core/Cargo.lua') -__Moose.Include('Core/Spot.lua') -__Moose.Include('Wrapper/Object.lua') -__Moose.Include('Wrapper/Identifiable.lua') -__Moose.Include('Wrapper/Positionable.lua') -__Moose.Include('Wrapper/Controllable.lua') -__Moose.Include('Wrapper/Group.lua') -__Moose.Include('Wrapper/Unit.lua') -__Moose.Include('Wrapper/Client.lua') -__Moose.Include('Wrapper/Static.lua') -__Moose.Include('Wrapper/Airbase.lua') -__Moose.Include('Wrapper/Scenery.lua') -__Moose.Include('Functional/Scoring.lua') -__Moose.Include('Functional/CleanUp.lua') -__Moose.Include('Functional/Movement.lua') -__Moose.Include('Functional/Sead.lua') -__Moose.Include('Functional/Escort.lua') -__Moose.Include('Functional/MissileTrainer.lua') -__Moose.Include('Functional/ATC_Ground.lua') -__Moose.Include('Functional/Detection.lua') -__Moose.Include('Functional/Designate.lua') -__Moose.Include('Functional/RAT.lua') -__Moose.Include('Functional/ZoneGoal.lua') -__Moose.Include('Functional/ZoneGoalCoalition.lua') -__Moose.Include('Functional/ZoneCaptureCoalition.lua') -__Moose.Include('AI/AI_Balancer.lua') -__Moose.Include('AI/AI_A2A.lua') -__Moose.Include('AI/AI_A2A_Patrol.lua') -__Moose.Include('AI/AI_A2A_Cap.lua') -__Moose.Include('AI/AI_A2A_Gci.lua') -__Moose.Include('AI/AI_A2A_Dispatcher.lua') -__Moose.Include('AI/AI_Patrol.lua') -__Moose.Include('AI/AI_Cap.lua') -__Moose.Include('AI/AI_Cas.lua') -__Moose.Include('AI/AI_Bai.lua') -__Moose.Include('AI/AI_Formation.lua') -__Moose.Include('Actions/Act_Assign.lua') -__Moose.Include('Actions/Act_Route.lua') -__Moose.Include('Actions/Act_Account.lua') -__Moose.Include('Actions/Act_Assist.lua') -__Moose.Include('Tasking/CommandCenter.lua') -__Moose.Include('Tasking/Mission.lua') -__Moose.Include('Tasking/Task.lua') -__Moose.Include('Tasking/DetectionManager.lua') -__Moose.Include('Tasking/Task_A2G_Dispatcher.lua') -__Moose.Include('Tasking/Task_A2G.lua') -__Moose.Include('Tasking/Task_A2A_Dispatcher.lua') -__Moose.Include('Tasking/Task_A2A.lua') -__Moose.Include('Tasking/Task_Cargo.lua') -__Moose.Include('Tasking/TaskZoneCapture.lua') -__Moose.Include('Moose.lua') +__Moose.Include(__Moose.ProgramPath,'Utilities/Routines.lua') +__Moose.Include(__Moose.ProgramPath,'Utilities/Utils.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Base.lua') +__Moose.Include(__Moose.ProgramPath,'Core/UserFlag.lua') +__Moose.Include(__Moose.ProgramPath,'Core/UserSound.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Report.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Scheduler.lua') +__Moose.Include(__Moose.ProgramPath,'Core/ScheduleDispatcher.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Event.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Settings.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Menu.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Zone.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Database.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Set.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Point.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Velocity.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Message.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Fsm.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Radio.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Spawn.lua') +__Moose.Include(__Moose.ProgramPath,'Core/SpawnStatic.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Goal.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Cargo.lua') +__Moose.Include(__Moose.ProgramPath,'Core/Spot.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Object.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Identifiable.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Positionable.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Controllable.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Group.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Unit.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Client.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Static.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Airbase.lua') +__Moose.Include(__Moose.ProgramPath,'Wrapper/Scenery.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/Scoring.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/CleanUp.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/Movement.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/Sead.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/Escort.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/MissileTrainer.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/ATC_Ground.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/Detection.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/Designate.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/RAT.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/ZoneGoal.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/ZoneGoalCoalition.lua') +__Moose.Include(__Moose.ProgramPath,'Functional/ZoneCaptureCoalition.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_Balancer.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_A2A.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_A2A_Patrol.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_A2A_Cap.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_A2A_Gci.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_A2A_Dispatcher.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_Patrol.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_Cap.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_Cas.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_Bai.lua') +__Moose.Include(__Moose.ProgramPath,'AI/AI_Formation.lua') +__Moose.Include(__Moose.ProgramPath,'Actions/Act_Assign.lua') +__Moose.Include(__Moose.ProgramPath,'Actions/Act_Route.lua') +__Moose.Include(__Moose.ProgramPath,'Actions/Act_Account.lua') +__Moose.Include(__Moose.ProgramPath,'Actions/Act_Assist.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/CommandCenter.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Mission.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Task.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/DetectionManager.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Task_A2G_Dispatcher.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Task_A2G.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Task_A2A_Dispatcher.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Task_A2A.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/Task_Cargo.lua') +__Moose.Include(__Moose.ProgramPath,'Tasking/TaskZoneCapture.lua') +__Moose.Include(__Moose.ProgramPath,'Moose.lua') +__Moose.Include(__Moose.ProgramPath,'Mission.lua') BASE:TraceOnOff(true) env.info('*** MOOSE INCLUDE END *** ')