Merge pull request #3 from johnb432/dev

1.0.4.0

Author: johnb432

.hemtt/project.toml

@@ -14,3 +14,8 @@ include = [
     "LICENSE",
     "README.md"
 ]
+
+[lints.sqf.var_all_caps]
+options.ignore = [
+    "NSM_JUMPPACK_DAMAGE_*",
+]

CHANGELOG.md

@@ -1,3 +1,10 @@
+# Changelog for Armor Modifier - ACE 8.12.2024
+
+1.0.4.0
+- Fixed bug where units were unkillable in Zeus.
+- Removed backwards compatibility with ACE 3.17.1
+- Upped requirement from Arma 2.16 to Arma 2.18
+
 # Changelog for Armor Modifier - ACE 28.9.2024
 
 1.0.3.0

addons/main/CfgVersioning.hpp

@@ -4,7 +4,7 @@ class CfgSettings {
             class PREFIX {
                 class Dependencies {
                     ACE[] = {"ace_main", {3, 18, 0}, "true"};
-                    CBA[] = {"cba_main", {3, 16, 0}, "true"};
+                    CBA[] = {"cba_main", {3, 18, 0}, "true"};
                 };
             };
         };

addons/main/XEH_PREP.hpp

@@ -1,5 +1 @@
-if (getNumber (configFile >> "CfgPatches" >> "ace_main" >> "version") >= 3.18) then {
-    PREP(handleDamage,handleDamage);
-} else {
-    PREP(handleDamage,handleDamageOld);
-};
+PREP(handleDamage);

addons/main/config.cpp

@@ -20,6 +20,4 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-
-// Don't force ACE version until 3.18.0 has been out for a while
-// #include "CfgVersioning.hpp"
+#include "CfgVersioning.hpp"

addons/main/functions/fnc_handleDamage.sqf

@@ -37,7 +37,11 @@ if (_hitPoint isEqualTo "") then {
 // Damage can be disabled with old variable or via sqf command allowDamage
 if !(isDamageAllowed _unit && {_unit getVariable ["ace_medical_allowDamage", true] || _ignoreAllowDamageACE}) exitWith {_oldDamage};
 
+// Killing units via End key is an edge case (#10375)
+// This didn't matter pre-Arma 3 2.18 but now this goes through the event handler
+// TODO: Structural fire damage >= 1 in a single damage event could still be caught here and we don't want that, but we haven't found a better way to catch this, fire damage should be small most of the time anyway
 private _newDamage = _damage - _oldDamage;
+if (_structuralDamage && {(abs (_newDamage - 1)) < 0.001 && _ammo == "" && isNull _shooter && isNull _instigator}) exitWith {_damage};
 
 // _newDamage == 0 happens occasionally for vehiclehit events (see line 80 onwards), just exit early to save some frametime
 // context 4 is engine "bleeding". For us, it's just a duplicate event for #structural which we can ignore without any issues

addons/main/functions/fnc_handleDamageOld.sqf

@@ -7,10 +7,10 @@
 
 #ifdef DISABLE_COMPILE_CACHE
     #undef PREP
-    #define PREP(fncName,filename) DFUNC(fncName) = compile preprocessFileLineNumbers QPATHTOF(functions\DOUBLES(fnc,filename).sqf)
+    #define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QPATHTOF(functions\DOUBLES(fnc,fncName).sqf)
 #else
     #undef PREP
-    #define PREP(fncName,filename) [QPATHTOF(functions\DOUBLES(fnc,filename).sqf), QFUNC(fncName)] call CBA_fnc_compileFunction
+    #define PREP(fncName) [QPATHTOF(functions\DOUBLES(fnc,fncName).sqf), QFUNC(fncName)] call CBA_fnc_compileFunction
 #endif
 
 // #include "\z\ace\addons\medical_engine\script_component.hpp"

addons/main/script_macros.hpp

@@ -8,6 +8,6 @@
 #define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.16
+#define REQUIRED_VERSION 2.18
 
 #define COMPONENT_NAME QUOTE(Armor Modifier - ACE)

addons/main/script_mod.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 1
 #define MINOR 0
-#define PATCHLVL 3
+#define PATCHLVL 4
 #define BUILD 0