From 8afe42052748bead78689de6749be1e1d5d8282f Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Sun, 21 Apr 2024 18:42:25 -0500 Subject: [PATCH 1/5] versioning update 4.1.2 --- CHANGELOG.md | 7 +++++++ framework/script_version.hpp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd29508..533f747 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.1.2] - 2024-04-21 + +### Changed + +- Fix internal versioning +- Swap resupply box 5.56 magazines due to mod conflict + ## [4.1.1] - 2024-04-19 ### Added diff --git a/framework/script_version.hpp b/framework/script_version.hpp index 7a5fe96..098984e 100644 --- a/framework/script_version.hpp +++ b/framework/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 4 -#define MINOR 0 -#define PATCHLVL 0 +#define MINOR 1 +#define PATCHLVL 2 #define BUILD 0 -- 2.37.3.windows.1 From 5b482b022f701c582d5198d6a066621f8ad01605 Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Sun, 21 Apr 2024 18:42:47 -0500 Subject: [PATCH 2/5] Update SupplyCrates.hpp swap Tier1 5.56 mags to rhs 5.56 mags for mod compatability --- defines/SupplyCrates.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/defines/SupplyCrates.hpp b/defines/SupplyCrates.hpp index 9bf50cd..600e989 100644 --- a/defines/SupplyCrates.hpp +++ b/defines/SupplyCrates.hpp @@ -26,7 +26,7 @@ class SupplyCrates { {"1Rnd_SmokeRed_Grenade_shell",24}, {"1Rnd_SmokeGreen_Grenade_shell",24}, {"1Rnd_SmokeYellow_Grenade_shell",12}, - {"Tier1_30Rnd_556x45_M856A1_EMag",25}, + {"rhs_mag_30Rnd_556x45_M855A1_Stanag",25}, {"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75}, {"SMA_30Rnd_762x35_BLK_EPR",25}, {"SMA_20Rnd_762x51mm_M80A1_EPR",25}, @@ -57,7 +57,7 @@ class SupplyCrates { {"MRAWS_HEAT_F",35}, {"MRAWS_HE_F",15}, {"Tier1_250Rnd_762x51_Belt_M993_AP",50}, - {"Tier1_30Rnd_556x45_M856A1_EMag",25}, + {"rhs_mag_30Rnd_556x45_M855A1_Stanag",25}, {"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50}, {"Titan_AA",10}, {"Titan_AT",10}, -- 2.37.3.windows.1 From cbd8b5963eade3da2bc2b0ab176c21d6eb0c0561 Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Sun, 21 Apr 2024 19:44:19 -0500 Subject: [PATCH 3/5] Update fn_addEmptyGroupCleanupPFH.sqf add more logging as to where the empty group is owned to track down deletion issues --- .../functions/fn_addEmptyGroupCleanupPFH.sqf | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf b/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf index 6dc4a90..9c17f7c 100644 --- a/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf +++ b/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf @@ -12,8 +12,30 @@ GVAR(emptyGroupCleanupPFH) = [ { if (local _x) then { if ((count units _x) == 0) then { + [ + LEVEL_INFO, + QUOTE(COMPONENT), + format["Deleting local empty group %1", groupId _x], + [] + ] call EFUNC(common,log); deleteGroup _x; }; + } else { + if (isServer) then { + [ + LEVEL_INFO, + QUOTE(COMPONENT), + format["Cannot delete group %1 as owner is %2", groupId _x, owner _x], + [] + ] call EFUNC(common,log); + } else { + [ + LEVEL_INFO, + QUOTE(COMPONENT), + format["Cannot delete group %1 as owner is %2", groupId _x, groupOwner _x], + [] + ] call EFUNC(common,log); + }; }; } forEach allGroups; }, -- 2.37.3.windows.1 From 87b6f359c14824ea433201d03db0e0be2dd1ef83 Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Thu, 25 Apr 2024 21:34:34 -0500 Subject: [PATCH 4/5] Update fn_addEmptyGroupCleanupPFH.sqf fix logic order and update logging output --- .../functions/fn_addEmptyGroupCleanupPFH.sqf | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf b/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf index 9c17f7c..8495d3b 100644 --- a/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf +++ b/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf @@ -10,31 +10,39 @@ GVAR(emptyGroupCleanupPFH) = [ { { - if (local _x) then { - if ((count units _x) == 0) then { + if ((count units _x) == 0) then { + if (local _x) then { [ LEVEL_INFO, QUOTE(COMPONENT), - format["Deleting local empty group %1", groupId _x], - [] + "DELETING EMPTY GROUP", + [ + ["groupId", groupId _x], + ["netId", netId _x] + ] ] call EFUNC(common,log); deleteGroup _x; - }; - } else { - if (isServer) then { - [ - LEVEL_INFO, - QUOTE(COMPONENT), - format["Cannot delete group %1 as owner is %2", groupId _x, owner _x], - [] - ] call EFUNC(common,log); } else { - [ - LEVEL_INFO, - QUOTE(COMPONENT), - format["Cannot delete group %1 as owner is %2", groupId _x, groupOwner _x], - [] - ] call EFUNC(common,log); + if (isServer) then { + [ + LEVEL_INFO, + QUOTE(COMPONENT), + "NON LOCAL EMPTY GROUP", + [ + ["groupId", groupId _x], + ["groupOwner", groupOwner _x] + ] + ] call EFUNC(common,log); + } else { + [ + LEVEL_INFO, + QUOTE(COMPONENT), + "EMPTY REMOTE GROUP", + [ + ["groupId", groupId _x] + ] + ] call EFUNC(common,log); + }; }; }; } forEach allGroups; @@ -61,6 +69,3 @@ GVAR(emptyGroupCleanupPFH) = [ { not (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) }, [] ] call CBA_fnc_createPerFrameHandlerObject; - - - -- 2.37.3.windows.1 From fac86f18f041640f90d3edb6046afa1913f4e673 Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Thu, 25 Apr 2024 21:36:48 -0500 Subject: [PATCH 5/5] Update CHANGELOG.md version 4.1.2 release notes --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 533f747..860cc69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [4.1.2] - 2024-04-21 +## [4.1.2] - 2024-04-25 ### Changed - Fix internal versioning - Swap resupply box 5.56 magazines due to mod conflict +- Group deletion handler now properly processes empty groups and logs errors ## [4.1.1] - 2024-04-19 -- 2.37.3.windows.1