diff --git a/Addons/logistics.pbo b/Addons/logistics.pbo index 65d6965..1be4ca2 100644 Binary files a/Addons/logistics.pbo and b/Addons/logistics.pbo differ diff --git a/Addons/logistics/CfgEventHandlers.hpp b/Addons/logistics/CfgEventHandlers.hpp index 9b0c4a6..adaa9cc 100644 --- a/Addons/logistics/CfgEventHandlers.hpp +++ b/Addons/logistics/CfgEventHandlers.hpp @@ -1,8 +1,26 @@ +class Extended_PreStart_EventHandlers +{ + class ADDON + { + // init = "call compile preprocessFileLineNumbers 'logistics\\XEH_preInit.sqf'"; + init = QUOTE(call COMPILE_SCRIPT(XEH_preStart)); + }; +}; + class Extended_PreInit_EventHandlers { - class CLF_PreInit + class ADDON { // init = "call compile preprocessFileLineNumbers 'logistics\\XEH_preInit.sqf'"; init = QUOTE(call COMPILE_SCRIPT(XEH_preInit)); - } -} \ No newline at end of file + }; +}; + +class Extended_PostInit_EventHandlers +{ + class ADDON + { + // init = "call compile preprocessFileLineNumbers 'logistics\\XEH_preInit.sqf'"; + init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); + }; +}; \ No newline at end of file diff --git a/Addons/logistics/CfgModuleCategories.hpp b/Addons/logistics/CfgModuleCategories.hpp index e982328..86fa242 100644 --- a/Addons/logistics/CfgModuleCategories.hpp +++ b/Addons/logistics/CfgModuleCategories.hpp @@ -1,6 +1,7 @@ class CfgFactionClasses { - class NO_CATEGORY; - class CLF: NO_CATEGORY { + //class NO_CATEGORY; + class CLF //: NO_CATEGORY + { displayName = "Clarkson's Logi"; priority = 2; side = 7; @@ -8,4 +9,13 @@ class CfgFactionClasses { //class CLF_Logistics: CLF { // displayName = "CLF - Logistics"; //}; + + /* + class GVAR(Logistics) + { + displayName = "Clarkson's Logi"; + priority = 2; + side = 7; + }; + */ }; \ No newline at end of file diff --git a/Addons/logistics/XEH_PREP.hpp b/Addons/logistics/XEH_PREP.hpp index 1fd5a99..2b0a06d 100644 --- a/Addons/logistics/XEH_PREP.hpp +++ b/Addons/logistics/XEH_PREP.hpp @@ -1,3 +1,4 @@ +//diag_log "LOGISTICS XEH_PREP RUNNING"; // Root folder functions PREP(vehicleLoadMateriel); @@ -6,26 +7,26 @@ PREP(vehicleUnloadMateriel); PREP(vehicleUnloadOre); // Init folder functions -PREP_S(initEngineeringBay,init) -PREP_S(initEngineeringBayInteractions,init) -PREP_S(initFactory,init) -PREP_S(initFactoryInteractions,init) -PREP_S(initFOB,init) -PREP_S(initFOBInteractions,init) -PREP_S(initHQ,init) -PREP_S(initHQInteractions,init) -PREP_S(initMaterielDepot,init) -PREP_S(initMaterielDepotInteractions,init) -PREP_S(initOreDepot,init) -PREP_S(initOreDepotInteractions,init) -PREP_S(initSupplyVehicle,init) -PREP_S(initSupplyVehicleInteractions,init) +PREP_S(initEngineeringBay,init); +PREP_S(initEngineeringBayInteractions,init); +PREP_S(initFactory,init); +PREP_S(initFactoryInteractions,init); +PREP_S(initFOB,init); +PREP_S(initFOBInteractions,init); +PREP_S(initHQ,init); +PREP_S(initHQInteractions,init); +PREP_S(initMaterielDepot,init); +PREP_S(initMaterielDepotInteractions,init); +PREP_S(initOreDepot,init); +PREP_S(initOreDepotInteractions,init); +PREP_S(initSupplyVehicle,init); +PREP_S(initSupplyVehicleInteractions,init); // Module folder functions -PREP_S(moduleInitEngineeringBay,modules) -PREP_S(moduleInitFactory,modules) -PREP_S(moduleInitFOB,modules) -PREP_S(moduleInitHQ,modules) -PREP_S(moduleInitMaterielDepot,modules) -PREP_S(moduleInitOreDepot,modules) -PREP_S(moduleInitSupplyVehicle,modules) +PREP_S(moduleInitEngineeringBay,modules); +PREP_S(moduleInitFactory,modules); +PREP_S(moduleInitFOB,modules); +PREP_S(moduleInitHQ,modules); +PREP_S(moduleInitMaterielDepot,modules); +PREP_S(moduleInitOreDepot,modules); +PREP_S(moduleInitSupplyVehicle,modules); \ No newline at end of file diff --git a/Addons/logistics/XEH_preInit.sqf b/Addons/logistics/XEH_preInit.sqf index 5ae1813..03f4828 100644 --- a/Addons/logistics/XEH_preInit.sqf +++ b/Addons/logistics/XEH_preInit.sqf @@ -12,6 +12,8 @@ ] call CBA_settings_fnc_init; */ +#include "XEH_PREP.hpp" + // Setting up for auto-naming of new bases etc. in mission GVAR(baseNames) = [ "Alpha", diff --git a/Addons/logistics/cfgVehicles.hpp b/Addons/logistics/cfgVehicles.hpp index ab6dc08..57e8b36 100644 --- a/Addons/logistics/cfgVehicles.hpp +++ b/Addons/logistics/cfgVehicles.hpp @@ -22,7 +22,7 @@ class CfgVehicles }; // Base module class for any initialisation modules - class CLF_Init_Base: Module_F + class CLF_initBase: Module_F { scope = 2; scopeCurator = 2; @@ -31,18 +31,19 @@ class CfgVehicles isDisposable = 1; // is3DEN = 1; curatorCanAttach = 1; + //curatorInfoType = ""; canSetArea = 0; // Allows for setting the area values in the Attributes menu in 3DEN canSetAreaShape = 0; // Allows for setting "Rectangle" or "Ellipse" in Attributes menu in 3DEN canSetAreaHeight = 0; // Allows for setting height or Z value in Attributes menu in 3DEN }; - class CLF_Init_HQ: CLF_Init_Base + class GVAR(initHQ): CLF_initBase { author = "Clarky"; displayName = "Initialise HQ"; //icon = ""; - category = "CLF" - function = FUNC(moduleInitHQ); + category = "CLF"; + function = QFUNC(moduleInitHQ); functionPriority = 1; class Attributes : AttributesBase @@ -60,7 +61,7 @@ class CfgVehicles class westSide { name = "$STR_WEST"; value = 1; }; class eastSide { name = "$STR_east"; value = 2; }; class indSide { name = "$STR_guerrila"; value = 3; }; - class civSide { name = "$STR_civilian"; value = 4; } + class civSide { name = "$STR_civilian"; value = 4; }; }; }; @@ -69,7 +70,7 @@ class CfgVehicles class ModuleDescription : ModuleDescription { - description = "Initialises HQ object for given side." + description = "Initialises HQ object for given side."; }; }; }; diff --git a/Addons/logistics/config.cpp b/Addons/logistics/config.cpp index 64d66de..84fc6d6 100644 --- a/Addons/logistics/config.cpp +++ b/Addons/logistics/config.cpp @@ -2,12 +2,21 @@ class CfgPatches { - class ClarkonsLogisticsFramework + class ADDON { - units[] = { /*CLF_Init_Base*/ }; + units[] = { + QGVAR(initHQ), + QGVAR(initFOB), + QGVAR(initFactory), + QGVAR(initEngineeringBay), + QGVAR(initMaterielDepot), + QGVAR(initOreDepot), + QGVAR(initSupplyVehicle) + }; weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = { + "A3_Modules_F", "cba_main", "cba_xeh" }; diff --git a/Addons/logistics/fn_template.sqf b/Addons/logistics/fn_template.sqf index 559e7ff..6d1d5a8 100644 --- a/Addons/logistics/fn_template.sqf +++ b/Addons/logistics/fn_template.sqf @@ -1,3 +1,4 @@ +#include "..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/fn_vehicleLoadMateriel.sqf b/Addons/logistics/functions/fnc_vehicleLoadMateriel.sqf similarity index 98% rename from Addons/logistics/functions/fn_vehicleLoadMateriel.sqf rename to Addons/logistics/functions/fnc_vehicleLoadMateriel.sqf index 1e8d64e..0b25368 100644 --- a/Addons/logistics/functions/fn_vehicleLoadMateriel.sqf +++ b/Addons/logistics/functions/fnc_vehicleLoadMateriel.sqf @@ -1,3 +1,4 @@ +#include "..\script_component.hpp" /* Author: Clarky Usage: diff --git a/Addons/logistics/functions/fn_vehicleLoadOre.sqf b/Addons/logistics/functions/fnc_vehicleLoadOre.sqf similarity index 98% rename from Addons/logistics/functions/fn_vehicleLoadOre.sqf rename to Addons/logistics/functions/fnc_vehicleLoadOre.sqf index 37db9ca..7713d0a 100644 --- a/Addons/logistics/functions/fn_vehicleLoadOre.sqf +++ b/Addons/logistics/functions/fnc_vehicleLoadOre.sqf @@ -1,3 +1,4 @@ +#include "..\script_component.hpp" /* Author: Clarky Usage: diff --git a/Addons/logistics/functions/fn_vehicleUnloadMateriel.sqf b/Addons/logistics/functions/fnc_vehicleUnloadMateriel.sqf similarity index 98% rename from Addons/logistics/functions/fn_vehicleUnloadMateriel.sqf rename to Addons/logistics/functions/fnc_vehicleUnloadMateriel.sqf index 212365c..6d7fcdc 100644 --- a/Addons/logistics/functions/fn_vehicleUnloadMateriel.sqf +++ b/Addons/logistics/functions/fnc_vehicleUnloadMateriel.sqf @@ -1,3 +1,4 @@ +#include "..\script_component.hpp" /* Author: Clarky Usage: diff --git a/Addons/logistics/functions/fn_vehicleUnloadOre.sqf b/Addons/logistics/functions/fnc_vehicleUnloadOre.sqf similarity index 98% rename from Addons/logistics/functions/fn_vehicleUnloadOre.sqf rename to Addons/logistics/functions/fnc_vehicleUnloadOre.sqf index 6a98bc7..e9e137a 100644 --- a/Addons/logistics/functions/fn_vehicleUnloadOre.sqf +++ b/Addons/logistics/functions/fnc_vehicleUnloadOre.sqf @@ -1,3 +1,4 @@ +#include "..\script_component.hpp" /* Author: Clarky Usage: diff --git a/Addons/logistics/functions/init/fn_initEngineeringBay.sqf b/Addons/logistics/functions/init/fnc_initEngineeringBay.sqf similarity index 96% rename from Addons/logistics/functions/init/fn_initEngineeringBay.sqf rename to Addons/logistics/functions/init/fnc_initEngineeringBay.sqf index be8f29e..11418aa 100644 --- a/Addons/logistics/functions/init/fn_initEngineeringBay.sqf +++ b/Addons/logistics/functions/init/fnc_initEngineeringBay.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/init/fn_initEngineeringBayInteractions.sqf b/Addons/logistics/functions/init/fnc_initEngineeringBayInteractions.sqf similarity index 74% rename from Addons/logistics/functions/init/fn_initEngineeringBayInteractions.sqf rename to Addons/logistics/functions/init/fnc_initEngineeringBayInteractions.sqf index 55e5f93..4d475a9 100644 --- a/Addons/logistics/functions/init/fn_initEngineeringBayInteractions.sqf +++ b/Addons/logistics/functions/init/fnc_initEngineeringBayInteractions.sqf @@ -1,3 +1,18 @@ +#include "..\..\script_component.hpp" +/* + * Author: Clarky + * Description: + * Describe the function + * + * Arguments: + * 0: Linked HQ + * 1: Engineering Bay + * + * Usage: + * [_object, _integer] call CLF_fnc_template + * + */ + /* * Author: Clarky * Usage: diff --git a/Addons/logistics/functions/init/fn_initFOB.sqf b/Addons/logistics/functions/init/fnc_initFOB.sqf similarity index 96% rename from Addons/logistics/functions/init/fn_initFOB.sqf rename to Addons/logistics/functions/init/fnc_initFOB.sqf index 68e4a5d..30d893c 100644 --- a/Addons/logistics/functions/init/fn_initFOB.sqf +++ b/Addons/logistics/functions/init/fnc_initFOB.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/init/fn_initFOBInteractions.sqf b/Addons/logistics/functions/init/fnc_initFOBInteractions.sqf similarity index 100% rename from Addons/logistics/functions/init/fn_initFOBInteractions.sqf rename to Addons/logistics/functions/init/fnc_initFOBInteractions.sqf diff --git a/Addons/logistics/functions/init/fn_initFactory.sqf b/Addons/logistics/functions/init/fnc_initFactory.sqf similarity index 98% rename from Addons/logistics/functions/init/fn_initFactory.sqf rename to Addons/logistics/functions/init/fnc_initFactory.sqf index 47d1eed..9c58c61 100644 --- a/Addons/logistics/functions/init/fn_initFactory.sqf +++ b/Addons/logistics/functions/init/fnc_initFactory.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/init/fn_initFactoryInteractions.sqf b/Addons/logistics/functions/init/fnc_initFactoryInteractions.sqf similarity index 100% rename from Addons/logistics/functions/init/fn_initFactoryInteractions.sqf rename to Addons/logistics/functions/init/fnc_initFactoryInteractions.sqf diff --git a/Addons/logistics/functions/init/fn_initHQ.sqf b/Addons/logistics/functions/init/fnc_initHQ.sqf similarity index 93% rename from Addons/logistics/functions/init/fn_initHQ.sqf rename to Addons/logistics/functions/init/fnc_initHQ.sqf index 415f08f..95eb9a3 100644 --- a/Addons/logistics/functions/init/fn_initHQ.sqf +++ b/Addons/logistics/functions/init/fnc_initHQ.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: @@ -37,35 +38,35 @@ _hq setVariable [ true ];*/ -private _name = "" +private _name = ""; -switch (_side) +switch (_side) do { - case west: + case 1: { _name = GVAR(baseNames) select GVAR(bluforBaseIndex); _hq setVariable ["baseName", _name, true]; INC(GVAR(bluforBaseIndex)); - } - case east: + }; + case 2: { _name = GVAR(baseNames) select GVAR(opforBaseIndex); _hq setVariable ["baseName", _name, true]; INC(GVAR(opforBaseIndex)); - } - case independent: + }; + case 3: { _name = GVAR(baseNames) select GVAR(independentBaseIndex); _hq setVariable ["baseName", _name, true]; INC(GVAR(independentBaseIndex)); - } - case civilian: + }; + case 4: { _name = GVAR(baseNames) select GVAR(civilianBaseIndex); _hq setVariable ["baseName", _name, true]; INC(GVAR(civilianBaseIndex)); - } -} + }; +}; private _baseMarker = createMarker [format ["%1 [HQ]", _name], _hq]; _baseMarker setMarkerShape "ICON"; diff --git a/Addons/logistics/functions/init/fn_initHQInteractions.sqf b/Addons/logistics/functions/init/fnc_initHQInteractions.sqf similarity index 100% rename from Addons/logistics/functions/init/fn_initHQInteractions.sqf rename to Addons/logistics/functions/init/fnc_initHQInteractions.sqf diff --git a/Addons/logistics/functions/init/fn_initMaterielDepot.sqf b/Addons/logistics/functions/init/fnc_initMaterielDepot.sqf similarity index 98% rename from Addons/logistics/functions/init/fn_initMaterielDepot.sqf rename to Addons/logistics/functions/init/fnc_initMaterielDepot.sqf index 59ae556..6afebdb 100644 --- a/Addons/logistics/functions/init/fn_initMaterielDepot.sqf +++ b/Addons/logistics/functions/init/fnc_initMaterielDepot.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/init/fn_initMaterielDepotInteractions.sqf b/Addons/logistics/functions/init/fnc_initMaterielDepotInteractions.sqf similarity index 100% rename from Addons/logistics/functions/init/fn_initMaterielDepotInteractions.sqf rename to Addons/logistics/functions/init/fnc_initMaterielDepotInteractions.sqf diff --git a/Addons/logistics/functions/init/fn_initOreDepot.sqf b/Addons/logistics/functions/init/fnc_initOreDepot.sqf similarity index 98% rename from Addons/logistics/functions/init/fn_initOreDepot.sqf rename to Addons/logistics/functions/init/fnc_initOreDepot.sqf index baf4281..10ec52d 100644 --- a/Addons/logistics/functions/init/fn_initOreDepot.sqf +++ b/Addons/logistics/functions/init/fnc_initOreDepot.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/init/fn_initOreDepotInteractions.sqf b/Addons/logistics/functions/init/fnc_initOreDepotInteractions.sqf similarity index 100% rename from Addons/logistics/functions/init/fn_initOreDepotInteractions.sqf rename to Addons/logistics/functions/init/fnc_initOreDepotInteractions.sqf diff --git a/Addons/logistics/functions/init/fn_initSupplyVehicle.sqf b/Addons/logistics/functions/init/fnc_initSupplyVehicle.sqf similarity index 95% rename from Addons/logistics/functions/init/fn_initSupplyVehicle.sqf rename to Addons/logistics/functions/init/fnc_initSupplyVehicle.sqf index 1581926..33c9c39 100644 --- a/Addons/logistics/functions/init/fn_initSupplyVehicle.sqf +++ b/Addons/logistics/functions/init/fnc_initSupplyVehicle.sqf @@ -1,3 +1,4 @@ +#include "..\..\script_component.hpp" /* * Author: Clarky * Description: diff --git a/Addons/logistics/functions/init/fn_initSupplyVehicleInteractions.sqf b/Addons/logistics/functions/init/fnc_initSupplyVehicleInteractions.sqf similarity index 100% rename from Addons/logistics/functions/init/fn_initSupplyVehicleInteractions.sqf rename to Addons/logistics/functions/init/fnc_initSupplyVehicleInteractions.sqf diff --git a/Addons/logistics/functions/modules/fn_moduleInitEngineeringBay.sqf b/Addons/logistics/functions/modules/fnc_moduleInitEngineeringBay.sqf similarity index 100% rename from Addons/logistics/functions/modules/fn_moduleInitEngineeringBay.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitEngineeringBay.sqf diff --git a/Addons/logistics/functions/modules/fn_moduleInitFOB.sqf b/Addons/logistics/functions/modules/fnc_moduleInitFOB.sqf similarity index 100% rename from Addons/logistics/functions/modules/fn_moduleInitFOB.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitFOB.sqf diff --git a/Addons/logistics/functions/modules/fn_moduleInitFactory.sqf b/Addons/logistics/functions/modules/fnc_moduleInitFactory.sqf similarity index 100% rename from Addons/logistics/functions/modules/fn_moduleInitFactory.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitFactory.sqf diff --git a/Addons/logistics/functions/modules/fn_moduleInitHQ.sqf b/Addons/logistics/functions/modules/fnc_moduleInitHQ.sqf similarity index 68% rename from Addons/logistics/functions/modules/fn_moduleInitHQ.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitHQ.sqf index e6b0aba..cac7a8a 100644 --- a/Addons/logistics/functions/modules/fn_moduleInitHQ.sqf +++ b/Addons/logistics/functions/modules/fnc_moduleInitHQ.sqf @@ -1,3 +1,5 @@ +#include "..\..\script_component.hpp" + params [ ["_logic", objNull, [objNull]], // Argument 0 is module logic ["_units", [], [[]]], // Argument 1 is a list of affected units (affected by value selected in the 'class Units' argument)) @@ -11,3 +13,18 @@ private _side = _logic getVariable ["Side", -1]; { [_x, _side] remoteExec [QFUNC(initHQ), 2]; } forEach synchronizedObjects _logic; + +diag_log format [ + "Synced objects: %1", + synchronizedObjects _logic +]; + +diag_log format [ + "Synced units: %1", + _units +]; + +diag_log format [ + "Attached objects: %1", + attachedObjects _logic +]; \ No newline at end of file diff --git a/Addons/logistics/functions/modules/fn_moduleInitMaterielDepot.sqf b/Addons/logistics/functions/modules/fnc_moduleInitMaterielDepot.sqf similarity index 100% rename from Addons/logistics/functions/modules/fn_moduleInitMaterielDepot.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitMaterielDepot.sqf diff --git a/Addons/logistics/functions/modules/fn_moduleInitOreDepot.sqf b/Addons/logistics/functions/modules/fnc_moduleInitOreDepot.sqf similarity index 100% rename from Addons/logistics/functions/modules/fn_moduleInitOreDepot.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitOreDepot.sqf diff --git a/Addons/logistics/functions/modules/fn_moduleInitSupplyVehicle.sqf b/Addons/logistics/functions/modules/fnc_moduleInitSupplyVehicle.sqf similarity index 100% rename from Addons/logistics/functions/modules/fn_moduleInitSupplyVehicle.sqf rename to Addons/logistics/functions/modules/fnc_moduleInitSupplyVehicle.sqf diff --git a/Addons/logistics/ui/RscModuleAttributes.hpp b/Addons/logistics/ui/RscModuleAttributes.hpp new file mode 100644 index 0000000..59513bc --- /dev/null +++ b/Addons/logistics/ui/RscModuleAttributes.hpp @@ -0,0 +1,24 @@ +class RscControlsGroup; +class RscControlsGroupNoScrollbars; +class RscText; +class RscListBox; +class RscCombo; +class RscEdit; +class RscXSliderH; +class RscCheckBox; +class RscActivePicture; +class RscPicture; +class ctrlToolbox; +class RscButton; + +class RscDisplayAttributes { + class Controls { + class Background; + class Title; + class Content: RscControlsGroup { + class controls; + }; + class ButtonOK; + class ButtonCancel; + }; +}; \ No newline at end of file