Merge remote-tracking branch 'upstream/master' into move-camera-to-se…

…lection-cqb
zen-mod · Oct 11, 2023 · 7629fa2 · 7629fa2
2 parents 7313e56 + b839ca8
commit 7629fa2
Show file tree

Hide file tree

Showing 103 changed files with 1,494 additions and 354 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/zen-mod/ZEN/master/extras/assets/logo/logo_zen_black.png" width="500">
+    <img src="https://github.com/zen-mod/ZEN/raw/master/extras/assets/logo/black/ZEN-Logo.png#gh-light-mode-only" width="512">
+    <img src="https://github.com/zen-mod/ZEN/raw/master/extras/assets/logo/white/ZEN-Logo.png#gh-dark-mode-only" width="512">
 </p>
 
 <p align="center">
     <a href="https://github.com/zen-mod/ZEN/releases">
-        <img src="https://img.shields.io/badge/Version-1.13.0-blue.svg?style=flat-square" alt="Zeus Enhanced Version">
+        <img src="https://img.shields.io/badge/Version-1.14.0-blue.svg?style=flat-square" alt="Zeus Enhanced Version">
     </a>
     <a href="https://github.com/zen-mod/ZEN/issues">
         <img src="https://img.shields.io/github/issues-raw/zen-mod/ZEN.svg?style=flat-square&label=Issues" alt="Zeus Enhanced Issues">

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.13.0.32
+1.14.0.34
diff --git a/addons/attributes/CfgWaypointTypes.hpp → addons/ai/CfgWaypointTypes.hpp b/addons/attributes/CfgWaypointTypes.hpp → addons/ai/CfgWaypointTypes.hpp
@@ -34,7 +34,7 @@ class ZEN_WaypointTypes {
     class Land {
         displayName = "$STR_A3_CfgWaypoints_Land";
         type = "SCRIPTED";
-        script = QPATHTOEF(ai,functions\fnc_waypointLand.sqf);
+        script = QPATHTOF(functions\fnc_waypointLand.sqf);
     };
     class Hook {
         displayName = "$STR_ac_hook";
@@ -54,19 +54,13 @@ class ZEN_WaypointTypes {
         script = "\a3\functions_f_orange\waypoints\fn_wpDemine.sqf";
     };
     class Paradrop {
-        displayName = ECSTRING(ai,Paradrop);
+        displayName = CSTRING(Paradrop);
         type = "SCRIPTED";
-        script = QPATHTOEF(ai,functions\fnc_waypointParadrop.sqf);
-    };
-    class Fastrope {
-        displayName = ECSTRING(ai,Fastrope);
-        type = "SCRIPTED";
-        script = QPATHTOEF(ai,functions\fnc_waypointFastrope.sqf);
-        condition = QUOTE(isClass (configFile >> 'CfgPatches' >> 'ace_fastroping'));
+        script = QPATHTOF(functions\fnc_waypointParadrop.sqf);
     };
     class SearchBuilding {
-        displayName = ECSTRING(ai,SearchBuilding);
+        displayName = CSTRING(SearchBuilding);
         type = "SCRIPTED";
-        script = QPATHTOEF(ai,functions\fnc_waypointSearchBuilding.sqf);
+        script = QPATHTOF(functions\fnc_waypointSearchBuilding.sqf);
     };
 };
diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp
@@ -17,3 +17,4 @@ class CfgPatches {
 PRELOAD_ADDONS;
 
 #include "CfgEventHandlers.hpp"
+#include "CfgWaypointTypes.hpp"
diff --git a/addons/ai/functions/fnc_unGarrison.sqf b/addons/ai/functions/fnc_unGarrison.sqf
@@ -33,7 +33,7 @@
             group _unit enableAttack true;
         };
 
-        _unit setVariable [QGVAR(garrisonned), false, true];
+        _unit setVariable [QGVAR(garrisoned), false, true];
 
         // End fix for rotating garrisoned units
         _unit doWatch objNull;

diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml
@@ -12,20 +12,6 @@
             <Chinese>降落</Chinese>
             <Italian>Atterrare</Italian>
         </Key>
-        <Key ID="STR_ZEN_AI_Fastrope">
-            <English>Fastrope</English>
-            <Russian>Спуск по тросу</Russian>
-            <French>Corde lisse</French>
-            <German>Schnelles Abseilen</German>
-            <Polish>Zjazd na linach</Polish>
-            <Portuguese>Cabo rápido</Portuguese>
-            <Japanese>ファストロープ</Japanese>
-            <Korean>패스트로프</Korean>
-            <Spanish>Rapel Rapido</Spanish>
-            <Chinesesimp>快速索降</Chinesesimp>
-            <Chinese>快速索降</Chinese>
-            <Italian>Discesa veloce</Italian>
-        </Key>
         <Key ID="STR_ZEN_AI_Paradrop">
             <English>Paradrop</English>
             <Russian>Десант</Russian>

diff --git a/addons/area_markers/CfgContext.hpp b/addons/area_markers/CfgContext.hpp
diff --git a/addons/area_markers/CfgVehicles.hpp b/addons/area_markers/CfgVehicles.hpp
diff --git a/addons/area_markers/XEH_PREP.hpp b/addons/area_markers/XEH_PREP.hpp
@@ -5,7 +5,6 @@ PREP(createMarker);
 PREP(deleteIcon);
 PREP(initDisplayCurator);
 PREP(isEditable);
-PREP(module);
 PREP(onDraw);
 PREP(onKeyDown);
 PREP(onMapToggled);

diff --git a/addons/area_markers/XEH_postInit.sqf b/addons/area_markers/XEH_postInit.sqf
@@ -16,9 +16,4 @@ if (hasInterface) then {
     addMissionEventHandler ["MarkerCreated", {call FUNC(onMarkerCreated)}];
     addMissionEventHandler ["MarkerDeleted", {call FUNC(onMarkerDeleted)}];
     addMissionEventHandler ["MarkerUpdated", {call FUNC(onMarkerUpdated)}];
-
-    // Manually trigger event for 3DEN placed and already existent (JIP) markers
-    {
-        _x call FUNC(onMarkerCreated);
-    } forEach allMapMarkers;
 };
diff --git a/addons/area_markers/XEH_preInit.sqf b/addons/area_markers/XEH_preInit.sqf
@@ -6,6 +6,8 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+#include "initSettings.sqf"
+
 if (isServer) then {
     // Unique ID for creating markers
     GVAR(nextID) = 0;

diff --git a/addons/area_markers/config.cpp b/addons/area_markers/config.cpp
@@ -3,12 +3,10 @@
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
-        units[] = {
-            QGVAR(module)
-        };
+        units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"zen_modules"};
+        requiredAddons[] = {"zen_common"};
         author = ECSTRING(main,Author);
         authors[] = {"mharis001"};
         url = ECSTRING(main,URL);
@@ -19,6 +17,4 @@ class CfgPatches {
 PRELOAD_ADDONS;
 
 #include "CfgEventHandlers.hpp"
-#include "CfgVehicles.hpp"
-#include "CfgContext.hpp"
 #include "gui.hpp"
diff --git a/addons/area_markers/functions/fnc_createMarker.sqf b/addons/area_markers/functions/fnc_createMarker.sqf
@@ -6,20 +6,22 @@
  *
  * Arguments:
  * 0: Position <ARRAY>
+ * 1: Shape <STRING> (default: "RECTANGLE")
+ *   - Should be either "ELLIPSE" or "RECTANGLE".
  *
  * Return Value:
  * None
  *
  * Example:
- * [[0, 0, 0]] call zen_area_markers_fnc_createMarker
+ * [[0, 0, 0], "RECTANGLE"] call zen_area_markers_fnc_createMarker
  *
  * Public: No
  */
 
-params ["_position"];
+params ["_position", ["_shape", "RECTANGLE"]];
 
 private _marker = createMarker [format [QGVAR(%1), GVAR(nextID)], _position];
-_marker setMarkerShape "RECTANGLE";
+_marker setMarkerShape _shape;
 _marker setMarkerSize [50, 50];
 
 GVAR(nextID) = GVAR(nextID) + 1;
diff --git a/addons/area_markers/functions/fnc_deleteIcon.sqf b/addons/area_markers/functions/fnc_deleteIcon.sqf
@@ -18,6 +18,5 @@
 params ["_marker"];
 
 if (_marker in GVAR(icons)) then {
-    ctrlDelete (GVAR(icons) get _marker);
-    GVAR(icons) deleteAt _marker;
+    ctrlDelete (GVAR(icons) deleteAt _marker);
 };
diff --git a/addons/area_markers/functions/fnc_isEditable.sqf b/addons/area_markers/functions/fnc_isEditable.sqf
@@ -17,4 +17,6 @@
 
 params ["_marker"];
 
-markerShape _marker in ["RECTANGLE", "ELLIPSE"] && {GVAR(blacklist) findIf {_x in _marker} == -1}
+markerShape _marker in ["RECTANGLE", "ELLIPSE"]
+&& {GVAR(blacklist) findIf {_x in _marker} == -1}
+&& {GVAR(editableMarkers) == EDITABLE_MARKERS_ALL || {QUOTE(ADDON) in _marker}}
diff --git a/addons/area_markers/functions/fnc_module.sqf b/addons/area_markers/functions/fnc_module.sqf
diff --git a/addons/area_markers/gui.hpp b/addons/area_markers/gui.hpp
@@ -182,8 +182,8 @@ class GVAR(configure): RscControlsGroupNoScrollbars {
                             rows = 1;
                             columns = 2;
                             strings[] = {
-                                "\a3\3DEN\Data\Attributes\Shape\rectangle_ca.paa",
-                                "\a3\3DEN\Data\Attributes\Shape\ellipse_ca.paa"
+                                ICON_RECTANGLE,
+                                ICON_ELLIPSE
                             };
                             tooltips[] = {
                                 "$STR_3den_attributes_shapetrigger_rectangle",

diff --git a/addons/area_markers/initSettings.sqf b/addons/area_markers/initSettings.sqf
@@ -0,0 +1,25 @@
+[
+    QGVAR(editableMarkers),
+    "LIST",
+    [LSTRING(EditableMarkers), LSTRING(EditableMarkers_Description)],
+    [ELSTRING(main,DisplayName), LSTRING(DisplayName)],
+    [
+        [
+            EDITABLE_MARKERS_ALL,
+            EDITABLE_MARKERS_ONLY_ZEUS_CREATED
+        ],
+        [
+            [LSTRING(AllMarkers), LSTRING(AllMarkers_Description)],
+            [LSTRING(OnlyZeusCreated), LSTRING(OnlyZeusCreated_Description)]
+        ],
+        0
+    ],
+    true,
+    {
+        // Manually trigger event to update editability of all markers based on the setting
+        // Also handles 3DEN placed and already existent (JIP) markers
+        {
+            _x call FUNC(onMarkerUpdated);
+        } forEach allMapMarkers;
+    }
+] call CBA_fnc_addSetting;
diff --git a/addons/area_markers/script_component.hpp b/addons/area_markers/script_component.hpp
@@ -26,15 +26,13 @@
 #define POS_H(N) ((N) * GUI_GRID_H)
 
 #define ICON_SIZE 0.6
-
-#define ICON_WIDTH  POS_W(ICON_SIZE)
+#define ICON_WIDTH POS_W(ICON_SIZE)
 #define ICON_HEIGHT POS_H(ICON_SIZE)
 
 #define OFFSET_X POS_W(ICON_SIZE / 2)
 #define OFFSET_Y POS_H(ICON_SIZE / 2)
 
 #define ICON_CENTER "\a3\3den\data\cfg3den\marker\texturecenter_ca.paa"
-#define ICON_MARKERS "\a3\3den\data\displays\display3den\panelright\submode_marker_area_ca.paa"
 #define ICON_ELLIPSE "\a3\3DEN\Data\Attributes\Shape\ellipse_ca.paa"
 #define ICON_RECTANGLE "\a3\3DEN\Data\Attributes\Shape\rectangle_ca.paa"
 
@@ -56,3 +54,6 @@
 #define IDC_CONFIGURE_CANCEL 42881
 
 #define IDCS_CONFIGURE_EDIT_BOXES [IDC_CONFIGURE_SIZE_A, IDC_CONFIGURE_SIZE_B, IDC_CONFIGURE_ROTATION_EDIT, IDC_CONFIGURE_ALPHA_EDIT]
+
+#define EDITABLE_MARKERS_ALL 0
+#define EDITABLE_MARKERS_ONLY_ZEUS_CREATED 1
diff --git a/addons/area_markers/stringtable.xml b/addons/area_markers/stringtable.xml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ZEN">
     <Package name="Area_Markers">
-        <Key ID="STR_ZEN_Area_Markers_CreateAreaMarker">
-            <English>Create Area Marker</English>
-            <Russian>Создать Маркер Области</Russian>
-            <French>Créer un marqueur de zone</French>
-            <German>Bereichsmarkierungen erstellen</German>
-            <Italian>Crea marcatori di area</Italian>
-            <Czech>Vytvořit značku oblasti</Czech>
-            <Polish>Stwórz Marker Obszarowy</Polish>
-            <Portuguese>Criar marcador de área</Portuguese>
-            <Japanese>範囲マーカーを作成</Japanese>
-            <Korean>영역 표시기 생성</Korean>
-            <Chinesesimp>创建区域标记</Chinesesimp>
-            <Chinese>創建區域標記</Chinese>
+        <Key ID="STR_ZEN_Area_Markers_DisplayName">
+            <English>Area Markers</English>
+        </Key>
+        <Key ID="STR_ZEN_Area_Markers_EditableMarkers">
+            <English>Editable Markers</English>
+        </Key>
+        <Key ID="STR_ZEN_Area_Markers_EditableMarkers_Description">
+            <English>Controls which area markers are editable through Zeus.</English>
+        </Key>
+        <Key ID="STR_ZEN_Area_Markers_AllMarkers">
+            <English>All Markers</English>
+        </Key>
+        <Key ID="STR_ZEN_Area_Markers_AllMarkers_Description">
+            <English>All area markers (including those placed in 3DEN or created through script) are editable unless manually blacklisted.</English>
+        </Key>
+        <Key ID="STR_ZEN_Area_Markers_OnlyZeusCreated">
+            <English>Only Zeus Created</English>
+        </Key>
+        <Key ID="STR_ZEN_Area_Markers_OnlyZeusCreated_Description">
+            <English>Only area markers created through Zeus are editable.</English>
         </Key>
         <Key ID="STR_ZEN_Area_Markers_EditAreaMarker">
             <English>EDIT AREA MARKER</English>
@@ -29,19 +36,5 @@
             <Chinesesimp>编辑区域标记</Chinesesimp>
             <Chinese>編輯區域標記</Chinese>
         </Key>
-        <Key ID="STR_ZEN_Area_Markers_PlaceOnMap">
-            <English>Place On Map</English>
-            <Russian>Разместить На Карте</Russian>
-            <French>Placer sur la carte</French>
-            <German>Auf Karte platzieren</German>
-            <Italian>Posiziona sulla mappa</Italian>
-            <Czech>Umístit na mapu</Czech>
-            <Polish>Zaznacz Na Mapie</Polish>
-            <Portuguese>Coloque no mapa</Portuguese>
-            <Japanese>マップ上に設置</Japanese>
-            <Korean>지도에 배치</Korean>
-            <Chinesesimp>标记在地图上</Chinesesimp>
-            <Chinese>標記在地圖上</Chinese>
-        </Key>
     </Package>
 </Project>
diff --git a/addons/attributes/XEH_preInit.sqf b/addons/attributes/XEH_preInit.sqf
@@ -23,5 +23,6 @@ GVAR(previousMarkerColors) = [] call CBA_fnc_createNamespace;
 
 // Initialize the core/default attributes
 #include "initAttributes.sqf"
+#include "initSettings.sqf"
 
 ADDON = true;
diff --git a/addons/attributes/config.cpp b/addons/attributes/config.cpp
@@ -19,5 +19,4 @@ PRELOAD_ADDONS;
 #include "CfgEventHandlers.hpp"
 #include "CfgFunctions.hpp"
 #include "CfgVehicles.hpp"
-#include "CfgWaypointTypes.hpp"
 #include "gui.hpp"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,4 @@ class CfgPatches {
		PRELOAD_ADDONS;

		#include "CfgEventHandlers.hpp"
		#include "CfgWaypointTypes.hpp"