Add Zeus utility modules

addons/zeus/CfgFactionClasses.hpp

@@ -0,0 +1,7 @@
+class CfgFactionClasses {
+    class ACE_UI_Util {
+        displayName = "ACE Util";
+        priority = 2;
+        side = 7;
+    };
+};

addons/zeus/CfgVehicles.hpp

@@ -98,6 +98,12 @@ class CfgVehicles {
         function = QFUNC(moduleAddSpareTrack);
         icon = QPATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa);//@todo
     };
+    class GVAR(moduleAddObjects): GVAR(moduleBase) {
+        curatorCanAttach = 1;
+        category = "ACE_UI_Util";
+        displayName = CSTRING(AddObjectsToCurator);
+        curatorInfoType = QGVAR(RscAddObjects);
+    };
     class GVAR(moduleAddSpareWheel): GVAR(moduleBase) {
         curatorCanAttach = 1;
         displayName = CSTRING(ModuleAddSpareWheel_DisplayName);
@@ -129,6 +135,11 @@ class CfgVehicles {
         displayName = CSTRING(ModulePatrolArea_DisplayName);
         curatorInfoType = QGVAR(RscPatrolArea);
     };
+    class GVAR(moduleRemoveObjects): GVAR(moduleAddObjects) {
+        curatorCanAttach = 1;
+        displayName = CSTRING(RemoveObjectsFromCurator);
+        curatorInfoType = QGVAR(RscRemoveObjects);
+    };
     class GVAR(moduleSearchArea): GVAR(moduleBase) {
         curatorCanAttach = 1;
         displayName = CSTRING(ModuleSearchArea_DisplayName);
@@ -157,6 +168,12 @@ class CfgVehicles {
         function = QFUNC(moduleSetMedicalVehicle);
         icon = QPATHTOF(UI\Icon_Module_Zeus_Medic_ca.paa);
     };
+    class GVAR(moduleSimulation): GVAR(moduleBase) {
+        curatorCanAttach = 1;
+        displayName = CSTRING(ModuleSimulation_DisplayName);
+        function = QFUNC(moduleSimulation);
+        isGlobal = 0;
+    };
     class GVAR(moduleSurrender): GVAR(moduleBase) {
         curatorCanAttach = 1;
         displayName = CSTRING(ModuleSurrender_DisplayName);

addons/zeus/XEH_PREP.hpp

@@ -14,17 +14,20 @@ PREP(moduleSearchNearby);
 PREP(moduleSetMedic);
 PREP(moduleSetMedicalVehicle);
 PREP(moduleSetMedicalFacility);
+PREP(moduleSimulation);
 PREP(moduleSurrender);
 PREP(moduleTeleportPlayers);
 PREP(moduleUnconscious);
 PREP(moduleZeusSettings);
 PREP(ui_attributeCargo);
 //PREP(ui_attributePosition);
+PREP(ui_addObjects);
 PREP(ui_attributeRadius);
 PREP(ui_defendArea);
 PREP(ui_globalSetSkill);
 PREP(ui_groupSide);
 PREP(ui_patrolArea);
+PREP(ui_removeObjects);
 PREP(ui_searchArea);
 PREP(ui_teleportPlayers);
 PREP(zeusAttributes);

addons/zeus/config.cpp

@@ -4,12 +4,15 @@ class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
         units[] = {
+            QGVAR(moduleAddObjects),
             QGVAR(moduleDefendArea),
             QGVAR(moduleGlobalSetSkill),
             QGVAR(moduleGroupSide),
             QGVAR(modulePatrolArea),
+            QGVAR(moduleRemoveObjects),
             QGVAR(moduleSearchArea),
             QGVAR(moduleSearchNearby),
+            QGVAR(moduleSimulation),
             QGVAR(moduleTeleportPlayers)
         };
         weapons[] = {};
@@ -49,6 +52,7 @@ class ACE_Curator {
     GVAR(cargoAndRepair)[] = {"ace_cargo", "ace_repair"};
 };
 
+#include "CfgFactionClasses.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "ACE_Settings.hpp"

addons/zeus/functions/fnc_moduleSimulation.sqf

@@ -0,0 +1,30 @@
+/*
+ * Author: Fisher
+ * Toggle Simulation on object (runs on server only via module framework).
+ *
+ * Arguments:
+ * 0: The module logic <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+
+params ["_logic"];
+
+private _object = attachedTo _logic;
+if (isNull _object) then {
+    [LSTRING(NoObjectSelected)] call EFUNC(common,displayTextStructured);
+} else {
+    if (isMultiplayer) then {
+        _object enableSimulationGlobal !(simulationEnabled _object);
+    } else {
+        _object enableSimulation !(simulationEnabled _object);
+    };
+};
+
+deleteVehicle _logic;
+

addons/zeus/functions/fnc_ui_addObjects.sqf

@@ -0,0 +1,56 @@
+/*
+ * Author: Fisher
+ * Adds all objects in given radius to all curators.
+ *
+ * Arguments:
+ * 0: Dummy controls group <CONTROL>
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+
+disableSerialization;
+
+params ["_control"];
+private _display = ctrlParent _control;
+private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
+
+_control ctrlRemoveAllEventHandlers "setFocus";
+
+scopeName "Main";
+
+private _fnc_onUnload = {
+    private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
+    if (isNull _logic) exitWith {};
+
+    if (_this select 1 == 2) then {
+        deleteVehicle _logic;
+    };
+};
+
+private _fnc_onConfirm = {
+    params [["_ctrlButtonOK", controlNull, [controlNull]]];
+
+    private _display = ctrlparent _ctrlButtonOK;
+    if (isNull _display) exitWith {};
+
+    private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
+    if (isNull _logic) exitWith {};
+
+    private _radius = GETVAR(_display,GVAR(radius),50);
+    private _position = GETVAR(_display,GVAR(position),getPos _logic);
+    private _objectsToAdd = nearestObjects [_position, ["All"], _radius];
+
+    {
+         _x addCuratorEditableObjects [_objectsToAdd, true];
+    } forEach allCurators;
+
+    deleteVehicle _logic;
+};
+
+_display displayAddEventHandler ["unload", _fnc_onUnload];
+_control ctrlAddEventHandler ["buttonClick", _fnc_onConfirm];

addons/zeus/functions/fnc_ui_removeObjects.sqf

@@ -0,0 +1,53 @@
+/*
+ * Author: Fisher
+ * Removes all objects in given radius for all curators.
+ *
+ * Arguments:
+ * 0: Dummy controls group <CONTROL>
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+
+#include "script_component.hpp"
+
+params ["_control"];
+private _display = ctrlParent _control;
+private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
+
+_control ctrlRemoveAllEventHandlers "setFocus";
+
+scopeName "Main";
+private _fnc_onUnload = {
+    private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
+    if (isNull _logic) exitWith {};
+
+    if (_this select 1 == 2) then {
+        deleteVehicle _logic;
+    };
+};
+
+private _fnc_onConfirm = {
+    params [["_ctrlButtonOK", controlNull, [controlNull]]];
+
+    private _display = ctrlparent _ctrlButtonOK;
+    if (isNull _display) exitWith {};
+
+    private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
+    if (isNull _logic) exitWith {};
+
+    private _radius = GETVAR(_display,GVAR(radius),50);
+    private _position = GETVAR(_display,GVAR(position),getPos _logic);
+    private _objectsToAdd = nearestObjects [_position, ["All"], _radius];
+
+    {
+        _x removeCuratorEditableObjects [_objectsToAdd, true]; 
+    } forEach allCurators;
+
+    deleteVehicle _logic;
+};
+
+_display displayAddEventHandler ["unload", _fnc_onUnload];
+_control ctrlAddEventHandler ["buttonClick", _fnc_onConfirm];

addons/zeus/stringtable.xml

@@ -606,6 +606,9 @@
             <Hungarian>Semmi sincs az egér alatt</Hungarian>
             <Italian>Piazza su una unità</Italian>
             <Japanese>ユニットの上に設置</Japanese>
+        </Key>
+		<Key ID="STR_ACE_Zeus_NoObjectSelected">
+            <English>Place on an object</English>
         </Key>
         <Key ID="STR_ACE_Zeus_RequiresAddon">
             <English>Requires an addon that is not present</English>
@@ -643,6 +646,9 @@
             <French>Ajoute n'importe quel objet spawné à tous les curateurs de la mission</French>
             <German>Fügt jedes gespawnte Objekt allen Kuratoren der Mission hinzu</German>
             <Japanese>ミッション内で作成されたオブジェクトに全キュレーターを追加</Japanese>
+        </Key>
+		<Key ID="STR_ACE_Zeus_RemoveObjectsFromCurator">
+            <English>Remove Objects from Curator</English>
         </Key>
         <Key ID="STR_ACE_Zeus_AttributeCargo">
             <English>Cargo:</English>
@@ -694,6 +700,9 @@
             <Japanese>無効な半径が入力されました</Japanese>
             <Polish>Wpisano nieprawidłowy promień</Polish>
             <German>Ungültiger Radius eingegeben</German>
+        </Key>
+		<Key ID="STR_ACE_Zeus_ModuleSimulation_DisplayName">
+            <English>Toggle Simulation</English>
         </Key>
     </Package>
-</Project>
+</Project>

addons/zeus/ui/RscAttributes.hpp

@@ -308,6 +308,42 @@ class GVAR(RscSearchArea): RscDisplayAttributes {
     };
 };
 
+class GVAR(RscAddObjects): RscDisplayAttributes {
+    onLoad = QUOTE([ARR_3('onLoad', _this, QUOTE(QGVAR(RscAddObjects)))] call FUNC(zeusAttributes));
+    onUnload = QUOTE([ARR_3('onUnload', _this, QUOTE(QGVAR(RscAddObjects)))] call FUNC(zeusAttributes));
+    class Controls: Controls {
+        class Background: Background {};
+        class Title: Title {};
+        class Content: Content {
+            class Controls {
+                class radius: GVAR(AttributeRadius) {};
+            };
+        };
+        class ButtonOK: ButtonOK {
+            onSetFocus = QUOTE(_this call FUNC(ui_addObjects));
+        };
+        class ButtonCancel: ButtonCancel {};
+    };
+};
+
+class GVAR(RscRemoveObjects): RscDisplayAttributes {
+    onLoad = QUOTE([ARR_3('onLoad', _this, QUOTE(QGVAR(RscRemoveObjects)))] call FUNC(zeusAttributes));
+    onUnload = QUOTE([ARR_3('onUnload', _this, QUOTE(QGVAR(RscRemoveObjects)))] call FUNC(zeusAttributes));
+    class Controls: Controls {
+        class Background: Background {};
+        class Title: Title {};
+        class Content: Content {
+            class Controls {
+                class radius: GVAR(AttributeRadius) {};
+            };
+        };
+        class ButtonOK: ButtonOK {
+            onSetFocus = QUOTE(_this call FUNC(ui_removeObjects));
+        };
+        class ButtonCancel: ButtonCancel {};
+    };
+};
+
 class GVAR(RscTeleportPlayers): RscDisplayAttributes {
     onLoad = QUOTE([ARR_3('onLoad', _this, QUOTE(QGVAR(RscTeleportPlayers)))] call FUNC(zeusAttributes));
     onUnload = QUOTE([ARR_3('onUnload', _this, QUOTE(QGVAR(RscTeleportPlayers)))] call FUNC(zeusAttributes));