diff --git a/Moose Development/Moose/Mission.lua b/Moose Development/Moose/Mission.lua new file mode 100644 index 000000000..1c6f9f38b --- /dev/null +++ b/Moose Development/Moose/Mission.lua @@ -0,0 +1,2 @@ + +__Moose.Include( __Moose.ProgramPath, 'Mission.lua' ) \ No newline at end of file diff --git a/Moose Development/Moose/Moose.lua b/Moose Development/Moose/Moose.lua index c0484b05f..8f1fa6fcd 100644 --- a/Moose Development/Moose/Moose.lua +++ b/Moose Development/Moose/Moose.lua @@ -11,3 +11,9 @@ _DATABASE = DATABASE:New() -- Core.Database#DATABASE _SETTINGS = SETTINGS:Set() _SETTINGS:SetSystemMenu( nil ) + + +local initconnection = require("debugger") +initconnection( "127.0.0.1", 10000, "dcsserver", nil, nil, "C:\Program Files\Eagle Dynamics\DCS World" ) + +print("hello") diff --git a/Moose Mission Setup/Moose Create Dynamic/Moose_Dynamic_Loader.lua b/Moose Mission Setup/Moose Create Dynamic/Moose_Dynamic_Loader.lua index c0f9b8985..34c2cbc17 100644 --- a/Moose Mission Setup/Moose Create Dynamic/Moose_Dynamic_Loader.lua +++ b/Moose Mission Setup/Moose Create Dynamic/Moose_Dynamic_Loader.lua @@ -3,10 +3,10 @@ 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 diff --git a/Moose Mission Setup/Moose.files b/Moose Mission Setup/Moose.files index e708d9016..ca3b70fc7 100644 --- a/Moose Mission Setup/Moose.files +++ b/Moose Mission Setup/Moose.files @@ -68,3 +68,4 @@ Tasking/Task_A2A.lua Tasking/Task_Cargo.lua Moose.lua +Mission.lua diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 47947b97d..d31014207 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,14 +1,14 @@ env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20170624_1201' ) +env.info( 'Moose Generation Timestamp: 20170628_1556' ) 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 @@ -21,68 +21,78 @@ 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/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/Message.lua' ) -__Moose.Include( 'Core/Fsm.lua' ) -__Moose.Include( 'Core/Radio.lua' ) -__Moose.Include( 'Core/SpawnStatic.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/Spawn.lua' ) -__Moose.Include( 'Functional/Movement.lua' ) -__Moose.Include( 'Functional/Sead.lua' ) -__Moose.Include( 'Functional/Escort.lua' ) -__Moose.Include( 'Functional/MissileTrainer.lua' ) -__Moose.Include( 'Functional/AirbasePolice.lua' ) -__Moose.Include( 'Functional/Detection.lua' ) -__Moose.Include( 'Functional/Designate.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( '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/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/Message.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/Fsm.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/Radio.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Core/SpawnStatic.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/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/Detection.lua' ) +__Moose.Include( __Moose.ProgramPath, 'Functional/Designate.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, 'Moose.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_Create.lua b/Moose Mission Setup/Moose_Create.lua index be10d3aac..23bf446a0 100644 --- a/Moose Mission Setup/Moose_Create.lua +++ b/Moose Mission Setup/Moose_Create.lua @@ -50,7 +50,7 @@ while( MooseSource ) do local MooseFilePath = MooseDevelopmentPath .. "/" .. MooseSource if MooseDynamicStatic == "D" then print( "Load dynamic: " .. MooseSource ) - MooseFile:write( "__Moose.Include( '" .. MooseSource .. "' )\n" ) + MooseFile:write( "__Moose.Include( __Moose.ProgramPath, '" .. MooseSource .. "' )\n" ) end if MooseDynamicStatic == "S" then print( "Load static: " .. MooseSource )