From 381a3337f4eeb039f4fcb018729c440c03c9d2b5 Mon Sep 17 00:00:00 2001 From: mharis001 Date: Sat, 11 Mar 2023 23:11:06 -0400 Subject: [PATCH 1/6] Prep 1.13.0 Build 31 --- README.md | 2 +- VERSION | 2 +- addons/main/script_version.hpp | 6 +++--- mod.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2e9cf9443..ed1c1061a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- Zeus Enhanced Version + Zeus Enhanced Version Zeus Enhanced Issues diff --git a/VERSION b/VERSION index c64d43e98..4b5ad4e40 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.12.2.30 +1.13.0.31 diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 6c953139f..4350f1ab9 100644 --- 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 31 diff --git a/mod.cpp b/mod.cpp index 0bd3f36a3..42d0a76e6 100644 --- 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"; From 1ce33fdda422e2d2e2ab9fc5c9b7e8d5ec63bfe7 Mon Sep 17 00:00:00 2001 From: Ampersand Date: Tue, 14 Mar 2023 13:31:52 -0400 Subject: [PATCH 2/6] Fix attached object rotation (#713) --- addons/attached_objects/functions/fnc_handleObjectEdited.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/attached_objects/functions/fnc_handleObjectEdited.sqf b/addons/attached_objects/functions/fnc_handleObjectEdited.sqf index 6ce2ed68c..f7a6697b4 100644 --- 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 From ad983111643bc8a015e2ce5eaa577150332f2a15 Mon Sep 17 00:00:00 2001 From: mharis001 <34453221+mharis001@users.noreply.github.com> Date: Tue, 14 Mar 2023 13:32:03 -0400 Subject: [PATCH 3/6] Fix Suppressive Fire module fire mode string (#714) --- addons/modules/functions/fnc_moduleSuppressiveFire.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/modules/functions/fnc_moduleSuppressiveFire.sqf b/addons/modules/functions/fnc_moduleSuppressiveFire.sqf index d539e6916..169599865 100644 --- 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), [ [], [ From e460e94bd867f7cb295b0dddddbc4d5007984333 Mon Sep 17 00:00:00 2001 From: Ampersand Date: Tue, 14 Mar 2023 14:27:12 -0400 Subject: [PATCH 4/6] Fix laser cycling too quickly (#712) * Fix laser cycling too quickly https://www.youtube.com/watch?v=LMWf6TOveJE * Update addons/common/functions/fnc_canFire.sqf Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> * nextFireTime after reload * check magazine too * Check ammo simulation and fire time for all units --------- Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com> Co-authored-by: mharis001 --- addons/common/functions/fnc_canFire.sqf | 1 + addons/common/functions/fnc_fireWeapon.sqf | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/addons/common/functions/fnc_canFire.sqf b/addons/common/functions/fnc_canFire.sqf index 0c1d333d6..882006716 100644 --- 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 index 82181c706..052d382e1 100644 --- 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]; }; From 1b188c81b8d1e95cade47427b312f236c4e8e506 Mon Sep 17 00:00:00 2001 From: mharis001 <34453221+mharis001@users.noreply.github.com> Date: Wed, 15 Mar 2023 00:54:12 -0400 Subject: [PATCH 5/6] Area Markers - Fix module and context menu action (#715) --- addons/area_markers/CfgContext.hpp | 2 +- addons/area_markers/functions/fnc_module.sqf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/area_markers/CfgContext.hpp b/addons/area_markers/CfgContext.hpp index 339c789d3..b0e50bb1f 100644 --- 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 index b0cac3b0a..382544d79 100644 --- 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; From 13b0b82f7ad102c4ef5abc1eea63f8a03774d4e5 Mon Sep 17 00:00:00 2001 From: mharis001 Date: Wed, 15 Mar 2023 01:10:50 -0400 Subject: [PATCH 6/6] Prep 1.13.0 Build 32 --- VERSION | 2 +- addons/main/script_version.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4b5ad4e40..dcc5f763b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.0.31 +1.13.0.32 diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 4350f1ab9..0b03653ee 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 13 #define PATCHLVL 0 -#define BUILD 31 +#define BUILD 32