mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master' into FlightControl-task-cargo-transport
# Conflicts: # Moose Development/Moose/Moose.lua # Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua # Moose Mission Setup/Moose.lua # Moose Test Missions/TAD - Task Dispatching/TAD-100 - A2G Task Dispatching DETECTION_AREAS/TAD-100 - A2G Task Dispatching DETECTION_AREAS.lua
This commit is contained in:
FlightControl
@@ -1,26 +1,21 @@
|
||||
|
||||
local base = _G
|
||||
|
||||
Include = {}
|
||||
__Moose = {}
|
||||
|
||||
Include.File = function( IncludeFile )
|
||||
if not Include.Files[ IncludeFile ] then
|
||||
Include.Files[IncludeFile] = IncludeFile
|
||||
env.info( "Include:" .. IncludeFile .. " from " .. Include.ProgramPath )
|
||||
local f = assert( base.loadfile( Include.ProgramPath .. IncludeFile .. ".lua" ) )
|
||||
__Moose.Include = function( IncludeFile )
|
||||
if not __Moose.Includes[ IncludeFile ] then
|
||||
__Moose.Includes[IncludeFile] = IncludeFile
|
||||
local f = assert( base.loadfile( __Moose.ProgramPath .. IncludeFile ) )
|
||||
if f == nil then
|
||||
error ("Could not load MOOSE file " .. IncludeFile .. ".lua" )
|
||||
error ("Moose: Could not load Moose file " .. IncludeFile )
|
||||
else
|
||||
env.info( "Include:" .. IncludeFile .. " loaded from " .. Include.ProgramPath )
|
||||
env.info( "Moose: " .. IncludeFile .. " dynamically loaded from " .. __Moose.ProgramPath )
|
||||
return f()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Include.ProgramPath = "Scripts/Moose/"
|
||||
__Moose.ProgramPath = "Scripts/Moose/"
|
||||
|
||||
env.info( "Include.ProgramPath = " .. Include.ProgramPath)
|
||||
|
||||
Include.Files = {}
|
||||
|
||||
Include.File( "Moose" )
|
||||
__Moose.Includes = {}
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
|
||||
BASE:TraceOnOff( true )
|
||||
@@ -1,7 +1 @@
|
||||
local base = _G
|
||||
|
||||
Include = {}
|
||||
Include.Files = {}
|
||||
Include.File = function( IncludeFile )
|
||||
end
|
||||
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
|
||||
BASE:TraceOnOff( false )
|
||||
Binary file not shown.
@@ -8,16 +8,16 @@ echo Path to Mission Files: %1
|
||||
rem For /R %1 %%G IN (*.miz) do 7z u "%%G" "l10n\DEFAULT\Moose.lua"
|
||||
For /R %1 %%M IN (*.miz) do (
|
||||
echo off
|
||||
cd
|
||||
cd > NUL:
|
||||
echo "Mission: %%M"
|
||||
mkdir Temp
|
||||
cd Temp
|
||||
mkdir l10n
|
||||
mkdir l10n\DEFAULT
|
||||
copy ..\..\Moose.lua l10n\DEFAULT
|
||||
copy "%%~pM%%~nM.lua" l10n\DEFAULT\*.*
|
||||
dir l10n\DEFAULT
|
||||
7z -bb0 u "%%M" "l10n\DEFAULT\*.lua"
|
||||
copy ..\..\Moose.lua l10n\DEFAULT > NUL:
|
||||
copy "%%~pM%%~nM.lua" l10n\DEFAULT\*.* > NUL:
|
||||
rem dir l10n\DEFAULT
|
||||
7z -bb0 u "%%M" "l10n\DEFAULT\*.lua" > NUL:
|
||||
cd ..
|
||||
rmdir /S /Q Temp
|
||||
)
|
||||
56
Moose Mission Setup/Moose.files
Normal file
56
Moose Mission Setup/Moose.files
Normal file
@@ -0,0 +1,56 @@
|
||||
Utilities/Routines.lua
|
||||
Utilities/Utils.lua
|
||||
|
||||
Core/Base.lua
|
||||
Core/Scheduler.lua
|
||||
Core/ScheduleDispatcher.lua
|
||||
Core/Event.lua
|
||||
Core/Menu.lua
|
||||
Core/Zone.lua
|
||||
Core/Database.lua
|
||||
Core/Set.lua
|
||||
Core/Point.lua
|
||||
Core/Message.lua
|
||||
Core/Fsm.lua
|
||||
Core/Radio.lua
|
||||
|
||||
Wrapper/Object.lua
|
||||
Wrapper/Identifiable.lua
|
||||
Wrapper/Positionable.lua
|
||||
Wrapper/Controllable.lua
|
||||
Wrapper/Group.lua
|
||||
Wrapper/Unit.lua
|
||||
Wrapper/Client.lua
|
||||
Wrapper/Static.lua
|
||||
Wrapper/Airbase.lua
|
||||
Wrapper/Scenery.lua
|
||||
|
||||
Functional/Scoring.lua
|
||||
Functional/CleanUp.lua
|
||||
Functional/Spawn.lua
|
||||
Functional/Movement.lua
|
||||
Functional/Sead.lua
|
||||
Functional/Escort.lua
|
||||
Functional/MissileTrainer.lua
|
||||
Functional/AirbasePolice.lua
|
||||
Functional/Detection.lua
|
||||
|
||||
AI/AI_Balancer.lua
|
||||
AI/AI_Patrol.lua
|
||||
AI/AI_Cap.lua
|
||||
AI/AI_Cas.lua
|
||||
AI/AI_Cargo.lua
|
||||
|
||||
Actions/Act_Assign.lua
|
||||
Actions/Act_Route.lua
|
||||
Actions/Act_Account.lua
|
||||
Actions/Act_Assist.lua
|
||||
|
||||
Tasking/CommandCenter.lua
|
||||
Tasking/Mission.lua
|
||||
Tasking/Task.lua
|
||||
Tasking/DetectionManager.lua
|
||||
Tasking/Task_A2G_Dispatcher.lua
|
||||
Tasking/Task_A2G.lua
|
||||
|
||||
Moose.lua
|
||||
@@ -1,113 +0,0 @@
|
||||
ECHO OFF
|
||||
|
||||
REM Create Moose.lua File
|
||||
|
||||
ECHO Path to Moose *.lua files: %1
|
||||
ECHO Current Date: %2
|
||||
ECHO Path to Update Missions: %3
|
||||
ECHO Dynamic or Static: %4
|
||||
|
||||
DEL Moose.lua
|
||||
|
||||
IF %4 == D GOTO Dynamic
|
||||
IF %4 == S GOTO Static
|
||||
|
||||
GOTO End
|
||||
|
||||
:Dynamic
|
||||
|
||||
ECHO Dynamic Moose.lua
|
||||
|
||||
REM Create a timestamp with is logged in the DCS.log file.
|
||||
ECHO env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' ) > Moose.lua
|
||||
ECHO env.info( 'Moose Generation Timestamp: %2' ) >> Moose.lua
|
||||
|
||||
COPY /b Moose.lua + "Moose Create Dynamic\Moose_Dynamic_Loader.lua" Moose.lua
|
||||
COPY /b Moose.lua + "Moose Create Dynamic\Moose_Trace_On.lua" Moose.lua
|
||||
|
||||
GOTO End
|
||||
|
||||
:Static
|
||||
|
||||
ECHO Static Moose.lua
|
||||
|
||||
REM Create a timestamp with is logged in the DCS.log file.
|
||||
ECHO env.info( '*** MOOSE STATIC INCLUDE START *** ' ) > Moose.lua
|
||||
ECHO env.info( 'Moose Generation Timestamp: %2' ) >> Moose.lua
|
||||
|
||||
COPY /b Moose.lua + "Moose Create Static\Moose_Static_Loader.lua" Moose.lua
|
||||
|
||||
|
||||
rem Core Routines
|
||||
COPY /b Moose.lua + %1\Utilities\Routines.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Utilities\Utils.lua Moose.lua
|
||||
|
||||
rem Core Classes
|
||||
COPY /b Moose.lua + %1\Core\Base.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Scheduler.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\ScheduleDispatcher.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Event.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Menu.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Zone.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Database.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Set.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Point.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Message.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Fsm.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Core\Radio.lua Moose.lua
|
||||
|
||||
rem Wrapper Classes
|
||||
COPY /b Moose.lua + %1\Wrapper\Object.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Identifiable.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Positionable.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Controllable.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Group.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Unit.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Client.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Static.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Airbase.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Wrapper\Scenery.lua Moose.lua
|
||||
|
||||
rem Functional Classes
|
||||
COPY /b Moose.lua + %1\Functional\Scoring.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\CleanUp.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\Spawn.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\Movement.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\Sead.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\Escort.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\MissileTrainer.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\AirbasePolice.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Functional\Detection.lua Moose.lua
|
||||
|
||||
rem AI Classes
|
||||
COPY /b Moose.lua + %1\AI\AI_Balancer.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\AI\AI_Patrol.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\AI\AI_Cas.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\AI\AI_Cap.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\AI\AI_Cargo.lua Moose.lua
|
||||
|
||||
|
||||
rem Actions
|
||||
COPY /b Moose.lua + %1\Actions\Act_Assign.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Actions\Act_Route.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Actions\Act_Account.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Actions\Act_Assist.lua Moose.lua
|
||||
|
||||
rem Task Handling Classes
|
||||
COPY /b Moose.lua + %1\Tasking\CommandCenter.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Tasking\Mission.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Tasking\Task.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Tasking\DetectionManager.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Tasking\Task_A2G_Dispatcher.lua Moose.lua
|
||||
COPY /b Moose.lua + %1\Tasking\Task_A2G.lua Moose.lua
|
||||
|
||||
COPY /b Moose.lua + %1\Moose.lua Moose.lua
|
||||
|
||||
COPY /b Moose.lua + "Moose Create Static\Moose_Trace_Off.lua" Moose.lua
|
||||
|
||||
GOTO End
|
||||
|
||||
:End
|
||||
|
||||
ECHO env.info( '*** MOOSE INCLUDE END *** ' ) >> Moose.lua
|
||||
COPY Moose.lua %3
|
||||
78
Moose Mission Setup/Moose_Create.lua
Normal file
78
Moose Mission Setup/Moose_Create.lua
Normal file
@@ -0,0 +1,78 @@
|
||||
-- This routine is called from the LDT environment to create the Moose.lua file stub for use in .miz files.
|
||||
|
||||
local MooseDynamicStatic = arg[1]
|
||||
local MooseDate = arg[2]
|
||||
local MooseDevelopmentPath = arg[3]
|
||||
local MooseSetupPath = arg[4]
|
||||
|
||||
print( "Moose (D)ynamic (S)tatic : " .. MooseDynamicStatic )
|
||||
print( "Current Date : " .. MooseDate )
|
||||
print( "Moose development path : " .. MooseDevelopmentPath )
|
||||
print( "Moose setup path : " .. MooseSetupPath )
|
||||
|
||||
local MooseSourcesFilePath = MooseSetupPath .. "/Moose.files"
|
||||
local MooseFilePath = MooseSetupPath .. "/Moose.lua"
|
||||
|
||||
print( "Reading Moose source list : " .. MooseSourcesFilePath )
|
||||
|
||||
local MooseFile = io.open( MooseFilePath, "w" )
|
||||
|
||||
if MooseDynamicStatic == "D" then
|
||||
MooseFile:write( "env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )\n" )
|
||||
end
|
||||
if MooseDynamicStatic == "S" then
|
||||
MooseFile:write( "env.info( '*** MOOSE STATIC INCLUDE START *** ' )\n" )
|
||||
end
|
||||
|
||||
MooseFile:write( "env.info( 'Moose Generation Timestamp: " .. MooseDate .. "' )\n" )
|
||||
|
||||
local MooseLoaderPath
|
||||
if MooseDynamicStatic == "D" then
|
||||
MooseLoaderPath = MooseSetupPath .. "/Moose Create Dynamic/Moose_Dynamic_Loader.lua"
|
||||
end
|
||||
if MooseDynamicStatic == "S" then
|
||||
MooseLoaderPath = MooseSetupPath .. "/Moose Create Static/Moose_Static_Loader.lua"
|
||||
end
|
||||
|
||||
local MooseLoader = io.open( MooseLoaderPath, "r" )
|
||||
local MooseLoaderText = MooseLoader:read( "*a" )
|
||||
MooseLoader:close()
|
||||
|
||||
MooseFile:write( MooseLoaderText )
|
||||
|
||||
|
||||
local MooseSourcesFile = io.open( MooseSourcesFilePath, "r" )
|
||||
local MooseSource = MooseSourcesFile:read("*l")
|
||||
|
||||
while( MooseSource ) do
|
||||
|
||||
if MooseSource ~= "" then
|
||||
local MooseFilePath = MooseDevelopmentPath .. "/" .. MooseSource
|
||||
if MooseDynamicStatic == "D" then
|
||||
print( "Load dynamic: " .. MooseSource )
|
||||
MooseFile:write( "__Moose.Include( '" .. MooseSource .. "' )\n" )
|
||||
end
|
||||
if MooseDynamicStatic == "S" then
|
||||
print( "Load static: " .. MooseSource )
|
||||
local MooseSourceFile = io.open( MooseFilePath, "r" )
|
||||
local MooseSourceFileText = MooseSourceFile:read( "*a" )
|
||||
MooseSourceFile:close()
|
||||
|
||||
MooseFile:write( MooseSourceFileText )
|
||||
end
|
||||
end
|
||||
|
||||
MooseSource = MooseSourcesFile:read("*l")
|
||||
end
|
||||
|
||||
if MooseDynamicStatic == "D" then
|
||||
MooseFile:write( "BASE:TraceOnOff( true )\n" )
|
||||
end
|
||||
if MooseDynamicStatic == "S" then
|
||||
MooseFile:write( "BASE:TraceOnOff( false )\n" )
|
||||
end
|
||||
|
||||
MooseFile:write( "env.info( '*** MOOSE INCLUDE END *** ' )\n" )
|
||||
|
||||
MooseSourcesFile:close()
|
||||
MooseFile:close()
|
||||
Reference in New Issue
Block a user