From 00eee092c347a35fc9eff2508891896e9e47a591 Mon Sep 17 00:00:00 2001 From: Clarky77 Date: Sat, 29 Aug 2026 00:37:37 +1000 Subject: [PATCH] First module now working via 3den placement syncing. Visible in Zeus, but not functional. --- Addons/logistics.pbo | Bin 48135 -> 49952 bytes Addons/logistics/CfgEventHandlers.hpp | 24 ++++++++-- Addons/logistics/CfgModuleCategories.hpp | 14 +++++- Addons/logistics/XEH_PREP.hpp | 43 +++++++++--------- Addons/logistics/XEH_preInit.sqf | 2 + Addons/logistics/cfgVehicles.hpp | 13 +++--- Addons/logistics/config.cpp | 13 +++++- Addons/logistics/fn_template.sqf | 1 + ...teriel.sqf => fnc_vehicleLoadMateriel.sqf} | 1 + ...icleLoadOre.sqf => fnc_vehicleLoadOre.sqf} | 1 + ...riel.sqf => fnc_vehicleUnloadMateriel.sqf} | 1 + ...UnloadOre.sqf => fnc_vehicleUnloadOre.sqf} | 1 + ...ringBay.sqf => fnc_initEngineeringBay.sqf} | 1 + ...=> fnc_initEngineeringBayInteractions.sqf} | 15 ++++++ .../init/{fn_initFOB.sqf => fnc_initFOB.sqf} | 1 + ...ctions.sqf => fnc_initFOBInteractions.sqf} | 0 ...fn_initFactory.sqf => fnc_initFactory.sqf} | 1 + ...ns.sqf => fnc_initFactoryInteractions.sqf} | 0 .../init/{fn_initHQ.sqf => fnc_initHQ.sqf} | 23 +++++----- ...actions.sqf => fnc_initHQInteractions.sqf} | 0 ...ielDepot.sqf => fnc_initMaterielDepot.sqf} | 1 + ... => fnc_initMaterielDepotInteractions.sqf} | 0 ..._initOreDepot.sqf => fnc_initOreDepot.sqf} | 1 + ...s.sqf => fnc_initOreDepotInteractions.sqf} | 0 ...yVehicle.sqf => fnc_initSupplyVehicle.sqf} | 1 + ... => fnc_initSupplyVehicleInteractions.sqf} | 0 ...y.sqf => fnc_moduleInitEngineeringBay.sqf} | 0 ...oduleInitFOB.sqf => fnc_moduleInitFOB.sqf} | 0 ...tFactory.sqf => fnc_moduleInitFactory.sqf} | 0 ..._moduleInitHQ.sqf => fnc_moduleInitHQ.sqf} | 17 +++++++ ...ot.sqf => fnc_moduleInitMaterielDepot.sqf} | 0 ...reDepot.sqf => fnc_moduleInitOreDepot.sqf} | 0 ...le.sqf => fnc_moduleInitSupplyVehicle.sqf} | 0 Addons/logistics/ui/RscModuleAttributes.hpp | 24 ++++++++++ 34 files changed, 154 insertions(+), 45 deletions(-) rename Addons/logistics/functions/{fn_vehicleLoadMateriel.sqf => fnc_vehicleLoadMateriel.sqf} (98%) rename Addons/logistics/functions/{fn_vehicleLoadOre.sqf => fnc_vehicleLoadOre.sqf} (98%) rename Addons/logistics/functions/{fn_vehicleUnloadMateriel.sqf => fnc_vehicleUnloadMateriel.sqf} (98%) rename Addons/logistics/functions/{fn_vehicleUnloadOre.sqf => fnc_vehicleUnloadOre.sqf} (98%) rename Addons/logistics/functions/init/{fn_initEngineeringBay.sqf => fnc_initEngineeringBay.sqf} (96%) rename Addons/logistics/functions/init/{fn_initEngineeringBayInteractions.sqf => fnc_initEngineeringBayInteractions.sqf} (74%) rename Addons/logistics/functions/init/{fn_initFOB.sqf => fnc_initFOB.sqf} (96%) rename Addons/logistics/functions/init/{fn_initFOBInteractions.sqf => fnc_initFOBInteractions.sqf} (100%) rename Addons/logistics/functions/init/{fn_initFactory.sqf => fnc_initFactory.sqf} (98%) rename Addons/logistics/functions/init/{fn_initFactoryInteractions.sqf => fnc_initFactoryInteractions.sqf} (100%) rename Addons/logistics/functions/init/{fn_initHQ.sqf => fnc_initHQ.sqf} (93%) rename Addons/logistics/functions/init/{fn_initHQInteractions.sqf => fnc_initHQInteractions.sqf} (100%) rename Addons/logistics/functions/init/{fn_initMaterielDepot.sqf => fnc_initMaterielDepot.sqf} (98%) rename Addons/logistics/functions/init/{fn_initMaterielDepotInteractions.sqf => fnc_initMaterielDepotInteractions.sqf} (100%) rename Addons/logistics/functions/init/{fn_initOreDepot.sqf => fnc_initOreDepot.sqf} (98%) rename Addons/logistics/functions/init/{fn_initOreDepotInteractions.sqf => fnc_initOreDepotInteractions.sqf} (100%) rename Addons/logistics/functions/init/{fn_initSupplyVehicle.sqf => fnc_initSupplyVehicle.sqf} (95%) rename Addons/logistics/functions/init/{fn_initSupplyVehicleInteractions.sqf => fnc_initSupplyVehicleInteractions.sqf} (100%) rename Addons/logistics/functions/modules/{fn_moduleInitEngineeringBay.sqf => fnc_moduleInitEngineeringBay.sqf} (100%) rename Addons/logistics/functions/modules/{fn_moduleInitFOB.sqf => fnc_moduleInitFOB.sqf} (100%) rename Addons/logistics/functions/modules/{fn_moduleInitFactory.sqf => fnc_moduleInitFactory.sqf} (100%) rename Addons/logistics/functions/modules/{fn_moduleInitHQ.sqf => fnc_moduleInitHQ.sqf} (68%) rename Addons/logistics/functions/modules/{fn_moduleInitMaterielDepot.sqf => fnc_moduleInitMaterielDepot.sqf} (100%) rename Addons/logistics/functions/modules/{fn_moduleInitOreDepot.sqf => fnc_moduleInitOreDepot.sqf} (100%) rename Addons/logistics/functions/modules/{fn_moduleInitSupplyVehicle.sqf => fnc_moduleInitSupplyVehicle.sqf} (100%) create mode 100644 Addons/logistics/ui/RscModuleAttributes.hpp diff --git a/Addons/logistics.pbo b/Addons/logistics.pbo index 65d696575f29b1a5c9485f9b641e4b7663bc24a7..1be4ca20e63333cc59b14dc7229242fa696d5277 100644 GIT binary patch delta 2498 zcmai0ZEO=|9QUp*eZd=>W!)Iyt{r3R>{hmcX03>O>DJ0vw{{>n=2@=SuBE+py(@E0 zLIi|FqFA0qNM@Fb?IcPthI~5M%;Jp={p0k() zU4syscLsvHq?EX(k$7Arx5i0PM^Mbo_jr!kDh3|rD^^3%P8F^-V zDtsS|s9$LLOGd84$A;zsmg1RcJmTXEtFDxj$-;~)F>puSMO?|{*O3Ze0Vd7)(wY!U zN0NSqG&MEtg}-3_^9rChvMY89cmhDZV03?ZO`rh|3?v!v9^Cvv;BnOKf(6P|Cs_VjYB zO|bO2>Xu^H2+8Cs{1Bn@hkQXQ5(|=nSR(4<$sxE3lXsk@89y1@7iMUlvyrvUCJV$l z2#+LUZ0Ie<@0K_cc|$az8-^=+aL}NS8`{+tzw{Eq z(1|DpRPU}5`X?Xb8@#+P!BdU{49h!xtUtmeU==1%^F(|cN49r$x%)u$^wDxrXg0&b zY7fEz{Si9Qa(a_0r#ZPTk4t99n>@q%89&t@<9M_K{{MXr>t$*2orHf*M-;f#3ieMK z4W!j-Bm3M`XZxU|$L-le5;~G3!NZTLfG{;(FJ6(>2I;?)N6)TyPkk@!42}=coVnQW z3f^E9+#lb@l;|V_$Y^?l`z}=A}XEUaXg`{&J$IWGo zFn(#4gyW{H1&({OYvDMSt%KvVh+h}+2U#aXT4rkCxO1i&b%LBv@eyZ{F1R8Ze4?z- z6>xBMW&;fI>x>z*3%bu-SViGo$gLk80w%$I&ZIabb{8z%1gfw2)(#EB@=n0#uGMM> zik}GD6^bGFVPal{Np)LW4R-j(3v@qh9aQ5T@JLC7n27km1ewU+)-=`Al;eV_fU?B{<0*#H0N delta 1492 zcmZuxZA@Eb6z1OBQd+q!jL~6Pp{+!qYu629WGy(PqZTFdq0Udd)b@7VyV5dRJ~q-H ziw;I~8_iKPBU&O8ffnO@vjp9TW|)`_7eBH;Mt``(AG$31!=O&oRzv$^UniJqWW3VI@1=7>>>$FI4a5(Ib36XHrA%umPBN*o3>vyYO z+#Wp;lz7+a41Y`elt^$spTv1OTXPYGas@B0KyY3JP}IZFLY12nY$o>}%p^FU`O?-3 zI6+x=a-@j2J6FS8l!>%C6C%O+kvFJju+o*5FJ-0?*C05L$-(8M5suJS_=wh9Vlv%~ z=>*?}UOHC+6k`P&Q)xNLWOUSEI>C3L-%1%_lCi@X#sjw*7c?q%*Kh-oz;K9f-`JE+ z-fH%@X;DXmS)nh=62V5_3s)62@VBA`oXTbxQyRM)WUUi#O^F2GDUMHZgzp#pA-*Hx z3v>?gxsB7wG1nFkiv(|of!~+P;UA^ib5xaSYwX8^BEcJ2a^|PQq5tLXlcS~{pArcM z-$_0A3mddoGT91du;WSr%on9QldbrWF@Cnq z%XRg%b>#>%^6t}k3TB{D)x@sLmKkhWhr_Ce8urSTqNapMFy5LNKQI{b#qMm%OB9?}LgX;yG{?rIA*hRKTV3TJ*hkjRviH7rI^giW1gJUFh1DttFDB zw{DF#vl>N)D8kEC20oAL;l}YzX!B&50xllfg?7LJ8V2Jf5S*AGUo?BXG3&XYg7dRg z_qaPeT-T5^v+&dG38}36oe%@3=gh3r^h77;e&ngPM>~6-gJ0%W(T?{nQ%W-69Q-@~ zKDuzqPU%Ss$>i;JnsPrtEd+G9J9T!-OwA@VvS6p-)Z$q!al~DCB}*LMUit!hm+kP{ zvH=#B@7J>$G7;R9b>xD;w~&o|>*42ROZf(uw_ElYQ)cK(84Bg!zLX7)r7B@5RSVyy zO!zfGae5O}r@hdhz7JkcS3^2o1?%a0_%mGthLw7n)j<2{YUE$BQfTqRDyGF9@(u0B zS7=9MpAd}+{-|fjH^7fZhW2CKM+5ZA3u*66enY4 oL*JZvgJv8K6AG*@YBt~MEqiAC;O_ac)lYg?FD3s7#g*Uv2YKJ!)Bpeg 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