Merge branch 'release/2.1.0'

Crowdedlight · Jul 24, 2024 · 6e8c608 · 6e8c608
2 parents ce4514c + eb2b40a
commit 6e8c608
Show file tree

Hide file tree

Showing 70 changed files with 2,231 additions and 579 deletions.
diff --git a/.hemtt/project.toml b/.hemtt/project.toml
@@ -26,4 +26,20 @@ git_hash = 0 # Disabled
 
 [properties]
 author = "Crowdedlight"
-url = "https://github.com/Crowdedlight/Crows-Zeus-Additions"
+url = "https://github.com/Crowdedlight/Crows-Zeus-Additions"
+
+# Launched with `hemtt launch`
+[hemtt.launch.default]
+workshop = [
+    "450814997",  # CBA_A3's Workshop ID
+    "894678801",  # TFAR Beta
+    "1779063631", # Zeus Enhanced 
+    "2369477168", # Advanced Developer Tools
+    "2018593688", # Zeus Enhanced ACE Compat
+    "463939057",  # ACE
+    #"1645973522", # Intercept Minimal Dev
+    #"1585582292", # Arma Debug Engine
+]
+mission = "dev_mini.Enoch" # Launch into existing Editor Mission
+parameters = [
+]
diff --git a/addons/ace/CfgEventhandlers.hpp b/addons/ace/CfgEventhandlers.hpp
@@ -1,20 +1,20 @@
 class Extended_PreInit_EventHandlers {
 	class ADDON {
 		// This will be executed once in 3DEN, main menu and before briefing has started for every mission
-		init = QUOTE( call COMPILE_FILE(XEH_preInit) );
+		init = QUOTE(call COMPILE_FILE(XEH_preInit));
 	};
 };
 
 class Extended_PostInit_EventHandlers {
 	class ADDON {
 		// This will be executed once for each mission, once the mission has started
-		init = QUOTE( call COMPILE_FILE(XEH_postInit) );
+		init = QUOTE(call COMPILE_FILE(XEH_postInit));
 	};
 };
 
 class Extended_PreStart_EventHandlers {
 	class ADDON {
 		// This will be executed once before entering the main menu.
-		init = QUOTE( call COMPILE_FILE(XEH_preStart) );
+		init = QUOTE(call COMPILE_FILE(XEH_preStart));
 	};
 };
diff --git a/addons/ace/XEH_postInit.sqf b/addons/ace/XEH_postInit.sqf
@@ -8,11 +8,11 @@ if (!EGVAR(main,aceLoaded)) exitWith {};
 
 // zeus modules
 private _moduleList = [
-        ["ACE Add Damage to Unit",{_this call FUNC(aceDamageToUnit)}, QPATHTOF(data\sword.paa)],
-        ["Mass-Unconscious Toggle",{_this call FUNC(massUnconscious)}, "\z\ace\addons\zeus\UI\Icon_Module_Zeus_Unconscious_ca.paa"],
-        ["Capture Player",{_this call FUNC(capturePlayer)}, "\z\ace\addons\captives\UI\captive_ca.paa"],
-        ["Mass-Surrender Toggle",{_this call FUNC(massSurrender)}, "\z\ace\addons\captives\UI\Surrender_ca.paa"],
-        ["Set Supply Vehicle",{_this call FUNC(setSupplyVehicle)}, QPATHTOF(data\rearmvehicle.paa)]
+        [localize "STR_CROWSZA_ACE_module_add_damage",{_this call FUNC(aceDamageToUnit)}, QPATHTOF(data\sword.paa)],
+        [localize "STR_CROWSZA_ACE_module_unconscious_toggle",{_this call FUNC(massUnconscious)}, "\z\ace\addons\zeus\UI\Icon_Module_Zeus_Unconscious_ca.paa"],
+        [localize "STR_CROWSZA_ACE_module_capture_player",{_this call FUNC(capturePlayer)}, "\z\ace\addons\captives\UI\captive_ca.paa"],
+        [localize "STR_CROWSZA_ACE_module_mass_surrender",{_this call FUNC(massSurrender)}, "\z\ace\addons\captives\UI\Surrender_ca.paa"],
+        [localize "STR_CROWSZA_ACE_module_supply_vic",{_this call FUNC(setSupplyVehicle)}, QPATHTOF(data\rearmvehicle.paa)]
 ];
 
 {
@@ -28,7 +28,7 @@ private _moduleList = [
 private _contextActionList = [
     // Action name, Display name, Icon and Icon colour, code, Condition to show, arguments, dynamic children, modifier functions
     [
-        ["jshk_heal","JSHK Heal","\z\ace\addons\medical_gui\ui\cross.paa", 
+        ["jshk_heal",localize "STR_CROWSZA_ACE_module_jshk","\z\ace\addons\medical_gui\ui\cross.paa", 
 		{_hoveredEntity call FUNC(jshkHeal)}, 
 		{[_hoveredEntity] call EFUNC(main,isAliveManUnit) && EGVAR(main,aceLoaded) && EGVAR(main,jshkLoaded) && (_hoveredEntity getVariable ["ACE_isUnconscious", false]) == true}] call zen_context_menu_fnc_createAction,
         ["HealUnits"],

diff --git a/addons/ace/functions/fnc_aceDamageToUnit.sqf b/addons/ace/functions/fnc_aceDamageToUnit.sqf
@@ -88,11 +88,11 @@ private _onConfirm =
 	[_unit, _dmg, _bodyPart, _dmgType, _unit, _damageSelectionArray] remoteExec ["ace_medical_fnc_addDamageToUnit", _unit];
 };
 [
-	"Add ACE Damage to Unit", 
+	localize "STR_CROWSZA_ACE_adddamage_name", 
 	[
-		["COMBO","Body Part",[["head", "body", "leg_l", "leg_r", "hand_l", "hand_r"], ["Head", "Body", "Left Leg", "Right Leg", "Left Hand", "Right Hand"],2]],
-		["COMBO","Projectile Type",[["falling", "ropeburn", "vehiclecrash", "collision", "unknown", "explosive", "grenade", "shell", "bullet", "backblast", "bite", "punch", "stab", "drowning", "burn"],["Falling", "Ropeburn", "Vehiclecrash", "Collision", "Unknown", "Explosive", "Grenade", "Shell", "Bullet", "Backblast", "Bite", "Punch", "Stab", "Drowning", "Burn"],0]],
-		["SLIDER","Damage",[0,5,0.6,1]] //0 to 5, default 0.6 and showing 1 decimal
+		["COMBO",localize "STR_CROWSZA_ACE_adddamage_bodypart",[["head", "body", "leg_l", "leg_r", "hand_l", "hand_r"], [localize "STR_CROWSZA_ACE_adddamage_bodypart_head", localize "STR_CROWSZA_ACE_adddamage_bodypart_body", localize "STR_CROWSZA_ACE_adddamage_bodypart_leg_l", localize "STR_CROWSZA_ACE_adddamage_bodypart_leg_r", localize "STR_CROWSZA_ACE_adddamage_bodypart_hand_l", localize "STR_CROWSZA_ACE_adddamage_bodypart_hand_r"],2]],
+		["COMBO","Projectile Type",[["falling", "ropeburn", "vehiclecrash", "collision", "unknown", "explosive", "grenade", "shell", "bullet", "backblast", "bite", "punch", "stab", "drowning", "burn"],[localize "STR_CROWSZA_ACE_adddamage_falling", localize "STR_CROWSZA_ACE_adddamage_ropeburn", localize "STR_CROWSZA_ACE_adddamage_vehiclecrash", localize "STR_CROWSZA_ACE_adddamage_collision", localize "STR_CROWSZA_ACE_adddamage_unknown", localize "STR_CROWSZA_ACE_adddamage_explosive", localize "STR_CROWSZA_ACE_adddamage_grenade", localize "STR_CROWSZA_ACE_adddamage_shell", localize "STR_CROWSZA_ACE_adddamage_bullet", localize "STR_CROWSZA_ACE_adddamage_backblast", localize "STR_CROWSZA_ACE_adddamage_bite", localize "STR_CROWSZA_ACE_adddamage_punch", localize "STR_CROWSZA_ACE_adddamage_stab", localize "STR_CROWSZA_ACE_adddamage_drowning", localize "STR_CROWSZA_ACE_adddamage_burn"],0]],
+		["SLIDER",localize "STR_CROWSZA_ACE_adddamage_damage",[0,5,0.6,1]] //0 to 5, default 0.6 and showing 1 decimal
 	],
 	_onConfirm,
 	{},

diff --git a/addons/ace/functions/fnc_massSurrender.sqf b/addons/ace/functions/fnc_massSurrender.sqf
@@ -83,10 +83,10 @@ private _onConfirm =
 	} forEach _selectArray;
 };
 [
-	"Mass Surrender/Captive", 
+	localize "STR_CROWSZA_ACE_masssurrender_name", 
 	[
-		["OWNERS","Units",[[],[],[],0], true], //no preselected defaults, and default tab open side. Forcing defaults to deselect.
-		["LIST","Action",[["surrender","captive"],["Surrender", "Captive"],0,2]]
+		["OWNERS",localize "STR_CROWSZA_ACE_massunconscious_units",[[],[],[],0], true], //no preselected defaults, and default tab open side. Forcing defaults to deselect.
+		["LIST",localize "STR_CROWSZA_ACE_masssurrender_action",[["surrender","captive"],[localize "STR_CROWSZA_ACE_masssurrender_surrender", localize "STR_CROWSZA_ACE_masssurrender_captive"],0,2]]
 	],
 	_onConfirm,
 	{},

diff --git a/addons/ace/functions/fnc_massUnconscious.sqf b/addons/ace/functions/fnc_massUnconscious.sqf
@@ -66,9 +66,9 @@ private _onConfirm =
 	} forEach _selectArray;
 };
 [
-	"Mass Unconscious", 
+	localize "STR_CROWSZA_ACE_massunconscious_name", 
 	[
-		["OWNERS","Units",[[],[],[],0], true] //no preselected defaults, and default tab open side. Forcing defaults to deselect.
+		["OWNERS",localize "STR_CROWSZA_ACE_massunconscious_units",[[],[],[],0], true] //no preselected defaults, and default tab open side. Forcing defaults to deselect.
 	],
 	_onConfirm,
 	{},

diff --git a/addons/ace/functions/fnc_setSupplyVehicle.sqf b/addons/ace/functions/fnc_setSupplyVehicle.sqf
@@ -46,12 +46,12 @@ private _onConfirm =
 	};
 };
 [
-	"Set vehicle as...", 
+	localize "STR_CROWSZA_ACE_supplyvic_name", 
 	[
-		["CHECKBOX",["Rearm", "Set vehicle as rearm vehicle"],[false]],
-		["CHECKBOX",["Repair", "Set vehicle as repair vehicle"],[false]],
-		["CHECKBOX",["Refuel", "Set vehicle as refuel vehicle"],[false]],
-		["SLIDER","Refuel Amount [liters]",[0,10000,2000,0]]
+		["CHECKBOX",[localize "STR_CROWSZA_ACE_supplyvic_rearm", localize "STR_CROWSZA_ACE_supplyvic_rearm_tooltip"],[false]],
+		["CHECKBOX",[localize "STR_CROWSZA_ACE_supplyvic_repair", localize "STR_CROWSZA_ACE_supplyvic_repair_tooltip"],[false]],
+		["CHECKBOX",[localize "STR_CROWSZA_ACE_supplyvic_refuel", localize "STR_CROWSZA_ACE_supplyvic_refuel_tooltip"],[false]],
+		["SLIDER",localize "STR_CROWSZA_ACE_supplyvic_refuel_amount",[0,10000,2000,0]]
 	],
 	_onConfirm,
 	{},

diff --git a/addons/ace/stringtable.xml b/addons/ace/stringtable.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="Crows Zeus Additions">
+      <Package name="ace">
+            <Key ID="STR_CROWSZA_ACE_module_add_damage">
+                  <English>ACE Add Damage to Unit</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_module_unconscious_toggle">
+                  <English>Mass-Unconscious Toggle</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_module_capture_player">
+                  <English>Capture Player</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_module_mass_surrender">
+                  <English>Mass-Surrender Toggle</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_module_supply_vic">
+                  <English>Set Supply Vehicle</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_module_jshk">
+                  <English>JSHK Heal</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_name">
+                  <English>Set vehicle as...</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_rearm">
+                  <English>Rearm</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_rearm_tooltip">
+                  <English>Set vehicle as rearm vehicle</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_repair">
+                  <English>Repair</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_repair_tooltip">
+                  <English>Set vehicle as repair vehicle</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_refuel">
+                  <English>Refuel</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_refuel_tooltip">
+                  <English>Set vehicle as refuel vehicle</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_supplyvic_refuel_amount">
+                  <English>Refuel Amount [liters]</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_massunconscious_name">
+                  <English>Mass Unconscious</English>
+            </Key>            
+            <Key ID="STR_CROWSZA_ACE_massunconscious_units">
+                  <English>Units</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_masssurrender_name">
+                  <English>Mass Surrender/Captive</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_masssurrender_action">
+                  <English>Action</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_masssurrender_surrender">
+                  <English>Surrender</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_masssurrender_captive">
+                  <English>Captive</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_name">
+                  <English>Add ACE Damage to Unit</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart">
+                  <English>Body Part</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart_head">
+                  <English>Head</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart_body">
+                  <English>Body</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart_leg_l">
+                  <English>Left Leg</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart_leg_r">
+                  <English>Right Leg</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart_hand_l">
+                  <English>Left Hand</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bodypart_hand_r">
+                  <English>Right Hand</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_falling">
+                  <English>Falling</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_ropeburn">
+                  <English>Ropeburn</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_vehiclecrash">
+                  <English>Vehiclecrash</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_collision">
+                  <English>Collision</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_unknown">
+                  <English>Unkown</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_explosive">
+                  <English>Explosive</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_grenade">
+                  <English>Grenade</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_shell">
+                  <English>Shell</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bullet">
+                  <English>Bullet</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_backblast">
+                  <English>Backblast</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_bite">
+                  <English>Bite</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_punch">
+                  <English>Punch</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_stab">
+                  <English>Stab</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_drowning">
+                  <English>Drowning</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_burn">
+                  <English>Burn</English>
+            </Key>
+            <Key ID="STR_CROWSZA_ACE_adddamage_damage">
+                  <English>Damage</English>
+            </Key>
+      </Package>
+</Project>
diff --git a/addons/drawbuild/CfgEventhandlers.hpp b/addons/drawbuild/CfgEventhandlers.hpp
@@ -1,20 +1,20 @@
 class Extended_PreInit_EventHandlers {
 	class ADDON {
 		// This will be executed once in 3DEN, main menu and before briefing has started for every mission
-		init = QUOTE( call COMPILE_FILE(XEH_preInit) );
+		init = QUOTE(call COMPILE_FILE(XEH_preInit));
 	};
 };
 
 class Extended_PostInit_EventHandlers {
 	class ADDON {
 		// This will be executed once for each mission, once the mission has started
-		init = QUOTE( call COMPILE_FILE(XEH_postInit) );
+		init = QUOTE(call COMPILE_FILE(XEH_postInit));
 	};
 };
 
 class Extended_PreStart_EventHandlers {
 	class ADDON {
 		// This will be executed once before entering the main menu.
-		init = QUOTE( call COMPILE_FILE(XEH_preStart) );
+		init = QUOTE(call COMPILE_FILE(XEH_preStart));
 	};
 };
diff --git a/addons/drawbuild/XEH_postInit.sqf b/addons/drawbuild/XEH_postInit.sqf
@@ -5,7 +5,7 @@ if (!hasInterface) exitWith {};
 
 // register zeus module
 private _moduleList = [
-        ["DrawBuild",{_this call FUNC(drawBuildZeus)}, QPATHTOF(data\drawbuild.paa)]
+        [localize "STR_CROWSZA_Drawbuild_module_name",{_this call FUNC(drawBuildZeus)}, QPATHTOF(data\drawbuild.paa)]
 ];
 
 {
@@ -15,4 +15,39 @@ private _moduleList = [
 		(_x select 1), 
 		(_x select 2)
     ] call zen_custom_modules_fnc_register;
-} forEach _moduleList;
+} forEach _moduleList;
+
+
+// Format - classname : [length, offset, rotation]
+// TODO: include vertical offset (e.g., for trenches)
+GVAR(drawBuildPresets) = createHashMapFromArray [
+    ["Land_HBarrier_3_F", [3.45376, 1.7, 90]],                  // smaller hesco
+    ["Land_HBarrier_Big_F", [8.5, 4.25, 90]],                   // large hesco 
+    ["Land_BagFence_Short_F", [1.6, 0.7, 90]],                  // sandbags
+    ["Land_SandbagBarricade_01_F", [1.7, 1.7, 90]],             // tall sandbags
+    ["Land_ConcreteWall_01_m_4m_F", [4, 2, 90]],                // concrete wall
+    ["Land_HBarrier_01_line_3_green_F", [3.45376, 1.7, 90]],    // smaller hesco - green
+    ["Land_HBarrier_01_big_4_green_F", [8.5, 4.25, 90]],        // big hesco - green 
+    ["Land_BagFence_01_short_green_F", [1.6, 0.7, 90]],         // sandbag wall - green
+    ["Land_Mil_WallBig_4m_F", [4, 2, 90]],                      // military wall big
+    ["Land_Fortress_01_5m_F", [10, 5, 90]],                     // land fortress wall 5m
+    ["Land_Hedge_01_s_2m_F", [2, 0.5, 0]],                      // grass hedge
+    ["Land_NetFence_02_m_4m_F", [4, 2, 90]],                    // net fence
+    ["Land_New_WiredFence_5m_F", [5.20, 2.6, 90]],              // wired fence
+    ["Land_Razorwire_F", [8.46, 4.20, 90]],                     // razorwire
+    ["Land_TyreBarrier_01_line_x4_F", [2.6, 1.2, 90]],          // tire barrier
+    ["PowerCable_01_StraightLong_F", [5.02368, 2.49, 0]],       // power cables
+    ["BloodTrail_01_New_F", [12, 6, 0]],                        // blood trail
+    ["Land_Sign_MinesDanger_Greek_F", [50, 25, 90]]             // minefield sign
+];
+
+if(isClass (configFile >> "CfgPatches" >> "UK3CB_BAF_Weapons")) then {
+    GVAR(drawBuildPresets) set ["UK3CB_ModuleWPSmokeWhite81_F", [40, 20, 0]];
+} else {
+    GVAR(drawBuildPresets) set ["ModuleSmokeWhite_F", [15, 7.5, 0]];
+};
+
+
+if(isClass (configFile >> "CfgPatches" >> "grad_trenches_main")) then {
+    GVAR(drawBuildPresets) set ["fort_envelopebig", [6, 3, 270]]; // trench
+};
diff --git a/addons/drawbuild/config.cpp b/addons/drawbuild/config.cpp
@@ -13,6 +13,3 @@ class CfgPatches {
 };
 
 #include "CfgEventhandlers.hpp"
-
-// gui include
-#include "\z\crowsza\addons\drawbuild\ui\drawbuildGui.hpp"