Skip to content

Commit

Permalink
Miscelaneous Fixes and Edits Based on Feedback from the 1.3.47 Potato…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
lambdatiger authored Nov 13, 2024
1 parent ad546b0 commit 89633df
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 8 deletions.
5 changes: 5 additions & 0 deletions addons/aceEdits/README.md
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions addons/aceEdits/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion addons/armor_modifier_ace/functions/fnc_setClassArmor.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
2 changes: 1 addition & 1 deletion addons/armor_modifier_ace/functions/fnc_setUnitArmor.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
5 changes: 1 addition & 4 deletions addons/miscMedical/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/missionTesting/XEH_postInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion addons/safeStart/functions/fnc_initForceEndSafeStart.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit 89633df

Please sign in to comment.