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

…lection-cqb
zen-mod · Mar 16, 2023 · cba9564 · cba9564
2 parents cb3ae06 + 13b0b82
commit cba9564
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/zen-mod/ZEN/releases">
-        <img src="https://img.shields.io/badge/Version-1.12.2-blue.svg?style=flat-square" alt="Zeus Enhanced Version">
+        <img src="https://img.shields.io/badge/Version-1.13.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.12.2.30
+1.13.0.32
diff --git a/addons/area_markers/CfgContext.hpp b/addons/area_markers/CfgContext.hpp
@@ -3,7 +3,7 @@ class EGVAR(context_menu,actions) {
         displayName = CSTRING(CreateAreaMarker);
         icon = ICON_MARKERS;
         condition = QUOTE(visibleMap);
-        statement = QUOTE([ARR_2(QQGVAR(create),[_position])] call CBA_fnc_serverEvent);
+        statement = QUOTE([ARR_2(QQGVAR(createMarker),[_position])] call CBA_fnc_serverEvent);
         priority = 100;
     };
 };
diff --git a/addons/area_markers/functions/fnc_module.sqf b/addons/area_markers/functions/fnc_module.sqf
@@ -25,5 +25,4 @@ if (!visibleMap) exitWith {
 
 private _ctrlMap = findDisplay IDD_RSCDISPLAYCURATOR displayCtrl IDC_RSCDISPLAYCURATOR_MAINMAP;
 private _position = _ctrlMap ctrlMapScreenToWorld getMousePosition;
-
-[QGVAR(create), [_position]] call CBA_fnc_serverEvent;
+[QGVAR(createMarker), [_position]] call CBA_fnc_serverEvent;
diff --git a/addons/attached_objects/functions/fnc_handleObjectEdited.sqf b/addons/attached_objects/functions/fnc_handleObjectEdited.sqf
@@ -23,7 +23,7 @@ private _parentObject = attachedTo _object;
 
 if (!isNull _parentObject && {isVehicleCargo _object != _parentObject}) then {
     private _offset = _parentObject worldToModel ASLtoAGL getPosWorld _object;
-    private _dirAndUp = [vectorDir _object, vectorUp _object] apply {_parentObject vectorModelToWorld _x};
+    private _dirAndUp = [vectorDir _object, vectorUp _object] apply {_parentObject vectorWorldToModel _x};
 
     // setVectorDirAndUp requires local argument but applying the rotation on a remote object
     // makes editing smoother for Zeus before the target event is processed by the remote machine

diff --git a/addons/common/functions/fnc_canFire.sqf b/addons/common/functions/fnc_canFire.sqf
@@ -24,6 +24,7 @@ private _unit = _unit call FUNC(getEffectiveGunner);
 alive _unit
 && {!isPlayer _unit}
 && {lifeState _unit in ["HEALTHY", "INJURED"]}
+&& {CBA_missionTime >= _unit getVariable [QGVAR(nextFireTime), 0]}
 && {
     private _vehicle = vehicle _unit;
 

diff --git a/addons/common/functions/fnc_fireWeapon.sqf b/addons/common/functions/fnc_fireWeapon.sqf
@@ -16,6 +16,8 @@
  * Public: No
  */
 
+#define LASER_WEAPON_TIMEOUT 1
+
 params [["_unit", objNull, [objNull]], ["_infiniteAmmo", false, [false]]];
 
 if (!local _unit) exitWith {
@@ -61,12 +63,20 @@ switch (true) do {
     // Vehicle gunner
     default {
         private _turretPath = _vehicle unitTurret _unit;
-        weaponState [_vehicle, _turretPath] params ["_weapon", "_muzzle", "_fireMode"];
+        weaponState [_vehicle, _turretPath] params ["_weapon", "_muzzle", "_fireMode", "_magazine"];
 
         if (_weapon isKindOf ["CarHorn", configFile >> "CfgWeapons"]) exitWith {
             _unit forceWeaponFire [_muzzle, _fireMode];
         };
 
+        // Prevent laser weapons from firing too quickly to allow for reliably switching to the desired state
+        private _ammo = getText (configFile >> "CfgMagazines" >> _magazine >> "ammo");
+        private _ammoSimulation = getText (configFile >> "CfgAmmo" >> _ammo >> "simulation");
+
+        if (_ammoSimulation == "laserDesignate") then {
+            _unit setVariable [QGVAR(nextFireTime), CBA_missionTime + LASER_WEAPON_TIMEOUT];
+        };
+
         if (_infiniteAmmo) then {
             _unit setAmmo [_muzzle, 1e6];
         };

diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 1
-#define MINOR 12
-#define PATCHLVL 2
-#define BUILD 30
+#define MINOR 13
+#define PATCHLVL 0
+#define BUILD 32
diff --git a/addons/modules/functions/fnc_moduleSuppressiveFire.sqf b/addons/modules/functions/fnc_moduleSuppressiveFire.sqf
@@ -44,7 +44,7 @@ if !(side group _unit in [west, east, independent, civilian]) exitWith {
     ],
     [
         "COMBO",
-        LSTRING(SuppressiveFire_FireMode_SingleShotSlow),
+        LSTRING(SuppressiveFire_FireMode),
         [
             [],
             [

diff --git a/mod.cpp b/mod.cpp
@@ -1,8 +1,8 @@
-name = "Zeus Enhanced 1.12.2";
+name = "Zeus Enhanced 1.13.0";
 picture = "logo_zen_ca.paa";
 actionName = "GitHub";
 action = "https://github.com/zen-mod/ZEN";
-description = "Zeus Enhanced - Version 1.12.2";
+description = "Zeus Enhanced - Version 1.13.0";
 logo = "logo_zen_small_ca.paa";
 logoOver = "logo_zen_small_ca.paa";
 tooltip = "Zeus Enhanced";