From 6718e35b7ab66cef5204af435ea5b9f8790b42af Mon Sep 17 00:00:00 2001 From: Samuele Lorefice Date: Tue, 27 May 2025 22:46:40 +0200 Subject: [PATCH] Revert changes --- .../scripts/client/actions/open_arsenal.sqf | 10 +++++----- .../scripts/client/misc/init_arsenal.sqf | 4 ++-- .../scripts/client/spawn/redeploy_manager.sqf | 4 ++-- .../scripts/shared/fetch_params.sqf | 4 ++-- kp_liberation.brf_sumava/ui/mission_params.hpp | 2 +- kp_liberation.brf_sumava/whitelist.sqf | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/kp_liberation.brf_sumava/scripts/client/actions/open_arsenal.sqf b/kp_liberation.brf_sumava/scripts/client/actions/open_arsenal.sqf index daa03c2..225a5e4 100644 --- a/kp_liberation.brf_sumava/scripts/client/actions/open_arsenal.sqf +++ b/kp_liberation.brf_sumava/scripts/client/actions/open_arsenal.sqf @@ -1,5 +1,5 @@ if (KPLIB_directArsenal) exitWith { - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { ["Open", false] spawn BIS_fnc_arsenal; @@ -17,7 +17,7 @@ private _backpack = backpack player; private ["_loadouts_data"]; // Get loadouts either from ACE or BI arsenals -if (KP_liberation_ace && !KP_liberation_arsenal_type) then { +if (KP_liberation_ace && KP_liberation_arsenal_type) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -82,7 +82,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( load_loadout > 0 ) then { private _loaded_loadout = _loadouts_data select (lbCurSel 201); - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { player setUnitLoadout (_loaded_loadout select 1); } else { [player, [profileNamespace, _loaded_loadout]] call BIS_fnc_loadInventory; @@ -123,7 +123,7 @@ while { dialog && (alive player) && edit_loadout == 0 } do { if ( edit_loadout > 0 ) then { closeDialog 0; waitUntil { !dialog }; - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { [player, player, false] call ace_arsenal_fnc_openBox; } else { [ "Open", false ] spawn BIS_fnc_arsenal; @@ -131,7 +131,7 @@ if ( edit_loadout > 0 ) then { if (KP_liberation_arsenalUsePreset) then { uiSleep 5; - private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KP_liberation_ace && !KP_liberation_arsenal_type); + private _arsenalDisplay = ["RSCDisplayArsenal", "ace_arsenal_display"] select (KP_liberation_ace && KP_liberation_arsenal_type); waitUntil {sleep 1; isNull (uinamespace getvariable [_arsenalDisplay, displayNull])}; [_backpack] call KPLIB_fnc_checkGear; }; diff --git a/kp_liberation.brf_sumava/scripts/client/misc/init_arsenal.sqf b/kp_liberation.brf_sumava/scripts/client/misc/init_arsenal.sqf index 4fc7fcb..b32dbd8 100644 --- a/kp_liberation.brf_sumava/scripts/client/misc/init_arsenal.sqf +++ b/kp_liberation.brf_sumava/scripts/client/misc/init_arsenal.sqf @@ -95,7 +95,7 @@ if (KP_liberation_arsenalUsePreset) then { KP_liberation_allowed_items append KP_liberation_allowed_items_extension; }; - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { [player, KP_liberation_allowed_items, false] call ace_arsenal_fnc_addVirtualItems; }; @@ -107,7 +107,7 @@ if (KP_liberation_arsenalUsePreset) then { [missionNamespace, true] call BIS_fnc_addVirtualItemCargo; [missionNamespace, true] call BIS_fnc_addVirtualBackpackCargo; - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { [player, true, false] call ace_arsenal_fnc_addVirtualItems; }; }; diff --git a/kp_liberation.brf_sumava/scripts/client/spawn/redeploy_manager.sqf b/kp_liberation.brf_sumava/scripts/client/spawn/redeploy_manager.sqf index 628eafa..1a09817 100644 --- a/kp_liberation.brf_sumava/scripts/client/spawn/redeploy_manager.sqf +++ b/kp_liberation.brf_sumava/scripts/client/spawn/redeploy_manager.sqf @@ -67,7 +67,7 @@ while {true} do { // Get loadouts either from ACE or BI arsenals private ["_loadouts_data"]; - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { _loadouts_data = +(profileNamespace getVariable ["ace_arsenal_saved_loadouts", []]); } else { private _saved_loadouts = +(profileNamespace getVariable "bis_fnc_saveInventory_data"); @@ -191,7 +191,7 @@ while {true} do { if ((lbCurSel 203) > 0) then { private _selectedLoadout = _loadouts_data select ((lbCurSel 203) - 1); - if (KP_liberation_ace && !KP_liberation_arsenal_type) then { + if (KP_liberation_ace && KP_liberation_arsenal_type) then { player setUnitLoadout (_selectedLoadout select 1); } else { [player, [profileNamespace, _selectedLoadout]] call BIS_fnc_loadInventory; diff --git a/kp_liberation.brf_sumava/scripts/shared/fetch_params.sqf b/kp_liberation.brf_sumava/scripts/shared/fetch_params.sqf index a839087..0219a20 100644 --- a/kp_liberation.brf_sumava/scripts/shared/fetch_params.sqf +++ b/kp_liberation.brf_sumava/scripts/shared/fetch_params.sqf @@ -51,11 +51,11 @@ if(isServer) then { GET_PARAM_BOOL(GRLIB_blufor_defenders, "BluforDefenders", 1); GET_PARAM_BOOL(GRLIB_autodanger, "Autodanger", 0); GET_PARAM(GRLIB_time_factor, "DayDuration", 12); - GET_PARAM_BOOL(GRLIB_shorter_nights, "ShorterNights", 1); + GET_PARAM_BOOL(GRLIB_shorter_nights, "ShorterNights", 0); GET_PARAM(GRLIB_weather_param, "Weather", 3); GET_PARAM_BOOL(KP_liberation_fog_param, "VanillaFog", 1); GET_PARAM(GRLIB_resources_multiplier, "ResourcesMultiplier", 3); - GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 1); + GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 0); GET_PARAM_BOOL(KPLIB_directArsenal, "DirectArsenal", 0); GET_PARAM_BOOL(KP_liberation_playermenu, "PlayerMenu", 1); GET_PARAM(KP_liberation_victoryCondition, "VictoryCondition", 0); diff --git a/kp_liberation.brf_sumava/ui/mission_params.hpp b/kp_liberation.brf_sumava/ui/mission_params.hpp index e5475a1..a6170d7 100644 --- a/kp_liberation.brf_sumava/ui/mission_params.hpp +++ b/kp_liberation.brf_sumava/ui/mission_params.hpp @@ -117,7 +117,7 @@ class Params { title = $STR_PARAMS_ARSENAL; values[] = {0, 1}; texts[] = {$STR_PARAMS_ARSENAL_BI, $STR_PARAMS_ARSENAL_ACE}; - default = 1; + default = 0; }; class DirectArsenal { title = $STR_PARAMS_DIRECTARSENAL; diff --git a/kp_liberation.brf_sumava/whitelist.sqf b/kp_liberation.brf_sumava/whitelist.sqf index 22c3ab8..e66f2d2 100644 --- a/kp_liberation.brf_sumava/whitelist.sqf +++ b/kp_liberation.brf_sumava/whitelist.sqf @@ -11,7 +11,7 @@ GRLIB_whitelisted_tags = [ // For example: "76561198016642627" // To know that information: https://steamid.io/ GRLIB_whitelisted_steamids = [ - + ]; // Allowed individual player names. Note that this method is not very secure contrary to SteamIDs.