From 89633dfb8b26be8ef62d1b13336a1d9a1869698a Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Wed, 13 Nov 2024 16:39:39 -0600 Subject: [PATCH] Miscelaneous Fixes and Edits Based on Feedback from the 1.3.47 Potato Update (#584) * added aceEdits readme * fixed testing checklist SS prompt * skip aceEdits when missing ace * Updated overpressure EH to match ace frag eventhandler * Lower JIP entries for AMA public functions * Made comments clearer for future safe start code changes --- addons/aceEdits/README.md | 5 +++++ addons/aceEdits/config.cpp | 1 + addons/armor_modifier_ace/functions/fnc_setClassArmor.sqf | 2 +- addons/armor_modifier_ace/functions/fnc_setUnitArmor.sqf | 2 +- addons/miscMedical/XEH_postInit.sqf | 5 +---- addons/missionTesting/XEH_postInit.sqf | 2 +- addons/safeStart/functions/fnc_initForceEndSafeStart.sqf | 3 ++- 7 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 addons/aceEdits/README.md diff --git a/addons/aceEdits/README.md b/addons/aceEdits/README.md new file mode 100644 index 000000000..ca2d0c44e --- /dev/null +++ b/addons/aceEdits/README.md @@ -0,0 +1,5 @@ +# ACE Edits (aceEdits) + +A mod that adds changes to ACE that could be a part of ACE, but aren't. Including small feature additions, function overwrites, and other changes. +## Current Items +- Interact to pick up weapons when they are close enough to a body, for when weapon holders get placed in unreachable areas. \ No newline at end of file diff --git a/addons/aceEdits/config.cpp b/addons/aceEdits/config.cpp index 29c7333b4..c56796050 100644 --- a/addons/aceEdits/config.cpp +++ b/addons/aceEdits/config.cpp @@ -6,6 +6,7 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_interaction"}; + skipWhenMissingDependencies = 1; author = "Potato"; authors[] = {"Lambda.Tiger"}; authorUrl = "https://github.com/BourbonWarfare/POTATO"; diff --git a/addons/armor_modifier_ace/functions/fnc_setClassArmor.sqf b/addons/armor_modifier_ace/functions/fnc_setClassArmor.sqf index 5d60c3121..8be53610d 100644 --- a/addons/armor_modifier_ace/functions/fnc_setClassArmor.sqf +++ b/addons/armor_modifier_ace/functions/fnc_setClassArmor.sqf @@ -36,4 +36,4 @@ if (false in (_armorArray apply {_x isEqualType 0})) exitWith { }; _this set [1, _hitPoint]; -[QGVAR(updateClassArmor), _this] call CBA_fnc_globalEventJIP; +[QGVAR(updateClassArmor), _this, "AMA_JIPID_" + _classname + _hitPoint] call CBA_fnc_globalEventJIP; diff --git a/addons/armor_modifier_ace/functions/fnc_setUnitArmor.sqf b/addons/armor_modifier_ace/functions/fnc_setUnitArmor.sqf index 4fd160f65..dfbfcf10a 100644 --- a/addons/armor_modifier_ace/functions/fnc_setUnitArmor.sqf +++ b/addons/armor_modifier_ace/functions/fnc_setUnitArmor.sqf @@ -37,4 +37,4 @@ if (false in (_armorArray apply {_x isEqualType 0})) exitWith { _this set [1, _hitPoint]; private _jipID = [QGVAR(updateUnitArmor), _this] call CBA_fnc_globalEventJIP; -[_jipID, _unit] call CBA_fnc_removeGlobalEventJIP; +[_jipID, _unit, "AMA_JIPID_" + (getObjectID _unit) + _hitPoint] call CBA_fnc_removeGlobalEventJIP; diff --git a/addons/miscMedical/XEH_postInit.sqf b/addons/miscMedical/XEH_postInit.sqf index 6eb834ec4..279960d26 100644 --- a/addons/miscMedical/XEH_postInit.sqf +++ b/addons/miscMedical/XEH_postInit.sqf @@ -395,10 +395,7 @@ DFUNC(generateVisuals) = { if (isServer) then { // add explosion event handler [QACEGVAR(frag,frag_eh), { - params ["_lastPos", "", "_explosive"]; - if (_explosive isEqualType []) then { - _explosive = _this # 1; // frag rewrite uses [_posASL, _ammo, [objNull, _instigator]] - }; + params ["_lastPos", "_explosive"]; private _explosiveConfig = configFile >> "CfgAmmo" >> _explosive; // ACE_frag defines mass as grams, we do as kilograms diff --git a/addons/missionTesting/XEH_postInit.sqf b/addons/missionTesting/XEH_postInit.sqf index 42c36cd70..7eb648526 100644 --- a/addons/missionTesting/XEH_postInit.sqf +++ b/addons/missionTesting/XEH_postInit.sqf @@ -13,7 +13,7 @@ GVAR(MissionTestingChecklistMaster) = [ ,["Take a quick look at the map for terrain imbalances, and make sure the mission maker has taken them into account (I.E. defenders need better gear and/or more people if they're defending a bowl that has sparse cover)",D_CHECK,MISSION_TYPE_APPLIES_TVT] ,["Ensure there is a signals tab, and the channel names make sense for the mission",D_CHECK,MISSION_TYPE_APPLIES_BOTH] ,["Ensure that if it is a night mission it is tagged as such in the mission description on the slotting screen",D_CHECK,MISSION_TYPE_APPLIES_BOTH] - ,["Ensure that if it Safe Start ends automatically, it is clear from the slotting screen or a plan to inform commander(s) before mission start",D_CHECK,MISSION_TYPE_APPLIES_BOTH] + ,["Ensure that if Safe Start ends automatically, it is clear from the slotting screen or a plan exists to inform leadership before mission start",D_CHECK,MISSION_TYPE_APPLIES_BOTH] ],D_PASSFAIL,"",D_NOTEFLAG ] ,["GEAR CHECKLIST", diff --git a/addons/safeStart/functions/fnc_initForceEndSafeStart.sqf b/addons/safeStart/functions/fnc_initForceEndSafeStart.sqf index 68789bf45..26ce3b23c 100644 --- a/addons/safeStart/functions/fnc_initForceEndSafeStart.sqf +++ b/addons/safeStart/functions/fnc_initForceEndSafeStart.sqf @@ -21,7 +21,8 @@ params [["_minTime", 0.001, [0]]]; // We don't need to run this function if we're not on the server, -// or it's not enabled, or +// or safe star is not enabled for the mission, or safe start is not on, +// or if the mission hasn't been configured to force safe start to end if (!(isServer && GVAR(enabled) && GVAR(safeStartEnabled)) || {!(getMissionConfigValue [QEGVAR(missionTesting,SSForceEnd), false])}) exitWith { TRACE_2("Did not initialize force end safe start",isServer,GVAR(enabled));