From 786872db526fdd8f1279169d7607436c664d6370 Mon Sep 17 00:00:00 2001 From: Apricot-ale <50947830+Apricot-ale@users.noreply.github.com> Date: Thu, 2 Mar 2023 20:30:42 +0900 Subject: [PATCH 1/2] Fixing mods not being in full zeus https://github.com/KillahPotatoes/KP-Liberation/pull/875 --- Missionframework/functions/curator/fn_initCuratorHandlers.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/functions/curator/fn_initCuratorHandlers.sqf b/Missionframework/functions/curator/fn_initCuratorHandlers.sqf index db41bcec0..351e39bc1 100644 --- a/Missionframework/functions/curator/fn_initCuratorHandlers.sqf +++ b/Missionframework/functions/curator/fn_initCuratorHandlers.sqf @@ -56,14 +56,14 @@ if (isServer) then { _zeus setCuratorCoef ["Edit", -1e8]; _zeus setCuratorCoef ["Destroy", -1e8]; _zeus setCuratorCoef ["Delete", 0]; + + removeAllCuratorAddons _zeus; } else { _zeus setVariable ["Addons", 3, true]; _zeus setVariable ["BIS_fnc_initModules_disableAutoActivation", false]; _zeus setCuratorCoef ["Place", 0]; _zeus setCuratorCoef ["Delete", 0]; - - removeAllCuratorAddons _zeus; }; _zeus setVariable ["KPLIB_limited", _limited]; From 431f3aee6aa52be256f4fb13f4b3ac9d51742ee0 Mon Sep 17 00:00:00 2001 From: Apricot-ale <50947830+Apricot-ale@users.noreply.github.com> Date: Thu, 2 Mar 2023 20:37:20 +0900 Subject: [PATCH 2/2] Improved AI Spawn and Fix Surrender punishment Fixed: Wounded enemy combatants would be counted as civilians upon surrendering and player would be punished for their death Improved: Enemies now spawn in a wider area https://github.com/rekterakathom/KP-Liberation-Plus/commit/fbb13cedfcb127a6f71211092ef90ca70fe38534 --- Missionframework/functions/fn_spawnRegularSquad.sqf | 2 +- Missionframework/scripts/server/ai/prisonner_ai.sqf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/functions/fn_spawnRegularSquad.sqf b/Missionframework/functions/fn_spawnRegularSquad.sqf index 432352715..6661618af 100644 --- a/Missionframework/functions/fn_spawnRegularSquad.sqf +++ b/Missionframework/functions/fn_spawnRegularSquad.sqf @@ -44,7 +44,7 @@ private _corrected_amount = round ((count _classnames) * ([] call KPLIB_fnc_getO private _grp = createGroup [KPLIB_side_enemy, true]; { if (_forEachIndex < _corrected_amount) then { - [_x, _spawnPos, _grp] call KPLIB_fnc_createManagedUnit; + [_x, _spawnPos, _grp, "PRIVATE", 10] call KPLIB_fnc_createManagedUnit; }; } forEach _classnames; diff --git a/Missionframework/scripts/server/ai/prisonner_ai.sqf b/Missionframework/scripts/server/ai/prisonner_ai.sqf index 8c2c9aa53..324f71680 100644 --- a/Missionframework/scripts/server/ai/prisonner_ai.sqf +++ b/Missionframework/scripts/server/ai/prisonner_ai.sqf @@ -22,7 +22,7 @@ if ((_unit isKindOf "Man") && (alive _unit) && (side group _unit == KPLIB_side_e _unit removeItem "NVGoggles_INDEP"; _unit setUnitPos "UP"; sleep 1; - private _grp = createGroup [KPLIB_side_civilian, true]; + private _grp = createGroup [KPLIB_side_enemy, true]; [_unit] joinSilent _grp; if (KPLIB_ace) then { ["ace_captives_setSurrendered", [_unit, true], _unit] call CBA_fnc_targetEvent;