diff --git a/Missionframework/kp_liberation_config.sqf b/Missionframework/kp_liberation_config.sqf index 9f82da1a..ab00e890 100644 --- a/Missionframework/kp_liberation_config.sqf +++ b/Missionframework/kp_liberation_config.sqf @@ -458,23 +458,6 @@ vehicle_refuel_sources = [ "RHS_Ural_Fuel_VDV_01" ]; -// Classnames of artillery vehicles or statics which should be linked to the support system. (Currently deactivated) -/*KP_liberation_artySupp = [ - "B_Mortar_01_F", - "B_T_Mortar_01_F", - "B_MBT_01_arty_F", - "B_T_MBT_01_arty_F", - "B_MBT_01_mlrs_F", - "B_T_MBT_01_mlrs_F", - "rhsusf_m109_usarmy", - "rhsusf_m109d_usarmy", - "RHS_M252_WD", - "RHS_M252_D", - "RHS_M119_WD", - "RHS_M119_D", - "UK3CB_BAF_Static_L16_Deployed_MTP" -];*/ - // Classnames of boats, so they can be built on water. boats_names = [ "B_Boat_Transport_01_F", diff --git a/Missionframework/scripts/client/remotecall/remote_call_removeSuppReq.sqf b/Missionframework/scripts/client/remotecall/remote_call_removeSuppReq.sqf deleted file mode 100644 index 44a36b40..00000000 --- a/Missionframework/scripts/client/remotecall/remote_call_removeSuppReq.sqf +++ /dev/null @@ -1,5 +0,0 @@ -if (isDedicated) exitWith {}; - -[KP_liberation_suppMod_req, KP_liberation_suppMod_arty] call BIS_fnc_removeSupportLink; -deleteVehicle KP_liberation_suppMod_req; -KP_liberation_suppMod_req = nil; diff --git a/Missionframework/scripts/client/spawn/redeploy_manager.sqf b/Missionframework/scripts/client/spawn/redeploy_manager.sqf index 50a403de..2fb02ac1 100644 --- a/Missionframework/scripts/client/spawn/redeploy_manager.sqf +++ b/Missionframework/scripts/client/spawn/redeploy_manager.sqf @@ -194,32 +194,4 @@ while {true} do { uiSleep 12; hint ""; }; - - // Arty Supp deactivated for now - /*if (KP_liberation_suppMod_enb > 0) then { - waitUntil {sleep 1; (!isNil "KP_liberation_suppMod_grp") && (!isNil "KP_liberation_suppMod_arty")}; - private _access = false; - switch (KP_liberation_suppMod_enb) do { - case 1: {if (player == ([] call F_getCommander)) then {_access = true};}; - case 2: {if ((getPlayerUID player) in KP_liberation_suppMod_whitelist) then {_access = true};}; - default {_access = true;}; - }; - if (_access) then { - if (isNil "KP_liberation_suppMod_handle") then {KP_liberation_suppMod_handle = scriptNull;}; - if (isNull KP_liberation_suppMod_handle) then { - KP_liberation_suppMod_handle = [KP_liberation_suppMod_arty] execVM "A3\modules_f\supports\init_provider.sqf"; - }; - if (isNil "KP_liberation_suppMod_req") then { - KP_liberation_suppMod_req = KP_liberation_suppMod_grp createUnit ["SupportRequester", KP_liberation_suppMod_grp, [], 0, "NONE"]; - //KP_liberation_suppMod_req spawn BIS_fnc_moduleSupportsInitRequester; - [KP_liberation_suppMod_req] execVM "A3\modules_f\supports\init_requester.sqf"; - { - [KP_liberation_suppMod_req, _x, -1] call BIS_fnc_limitSupport; - } forEach ["Artillery","CAS_Heli","CAS_Bombing","UAV","Drop","Transport"]; - }; - if ((count (synchronizedObjects player)) == 0) then { - [player, KP_liberation_suppMod_req, KP_liberation_suppMod_arty] call BIS_fnc_addSupportLink; - }; - }; - };*/ }; diff --git a/Missionframework/scripts/server/base/create_suppMods.sqf b/Missionframework/scripts/server/base/create_suppMods.sqf deleted file mode 100644 index a4272346..00000000 --- a/Missionframework/scripts/server/base/create_suppMods.sqf +++ /dev/null @@ -1,17 +0,0 @@ -if (KP_liberation_suppMod_enb > 0) then { - KP_liberation_suppMod_grp = createGroup [sideLogic, true]; - KP_liberation_suppMod_req = KP_liberation_suppMod_grp createUnit ["SupportRequester", getPos huronspawn, [], 0, "NONE"]; - //KP_liberation_suppMod_req spawn BIS_fnc_moduleSupportsInitRequester; - [KP_liberation_suppMod_req] execVM "A3\modules_f\supports\init_requester.sqf"; - { - [KP_liberation_suppMod_req, _x, -1] call BIS_fnc_limitSupport; - } forEach ["Artillery","CAS_Heli","CAS_Bombing","UAV","Drop","Transport"]; - - KP_liberation_suppMod_arty = KP_liberation_suppMod_grp createUnit ["SupportProvider_Artillery", KP_liberation_suppMod_grp, [], 0, "NONE"]; - //KP_liberation_suppMod_arty spawn BIS_fnc_moduleSupportsInitProvider; - [KP_liberation_suppMod_arty] execVM "A3\modules_f\supports\init_provider.sqf"; - - publicVariable "KP_liberation_suppMod_grp"; - publicVariable "KP_liberation_suppMod_arty"; - KP_liberation_suppMod_created = true; publicVariable "KP_liberation_suppMod_created"; -}; \ No newline at end of file diff --git a/Missionframework/scripts/server/game/arty_monitor.sqf b/Missionframework/scripts/server/game/arty_monitor.sqf deleted file mode 100644 index 4fce5b3a..00000000 --- a/Missionframework/scripts/server/game/arty_monitor.sqf +++ /dev/null @@ -1,42 +0,0 @@ -params ["_vehicle"]; - -if (!isServer) exitWith {}; - -if (isNil "kp_supp_vehicles") then { - kp_supp_vehicles = []; -}; - -if (_vehicle in kp_supp_vehicles) exitWith {}; - -private _id = count kp_supp_vehicles; -private _synced = false; -private _crew_grp = []; - -kp_supp_vehicles pushBack _vehicle; - -while {true} do { - private _crew_old = ({alive _x} count (crew _vehicle)); - - if ((_crew_old > 0) && !_synced) then { - _synced = true; - _vehicle synchronizeObjectsAdd [KP_liberation_suppMod_arty]; - KP_liberation_suppMod_arty synchronizeObjectsAdd [_vehicle]; - _crew_grp = group _vehicle; - } else { - if ((_crew_old == 0) && _synced) then { - _synced = false; - { - _x synchronizeObjectsRemove [KP_liberation_suppMod_arty]; - KP_liberation_suppMod_arty synchronizeObjectsRemove [_x]; - } forEach (units _crew_grp); - }; - }; - - BIS_supp_refresh = TRUE; - publicVariable "BIS_supp_refresh"; - - waitUntil { - sleep 1; - ({alive _x} count (crew _vehicle)) != _crew_old; - }; -}; \ No newline at end of file diff --git a/Missionframework/scripts/server/game/save_manager.sqf b/Missionframework/scripts/server/game/save_manager.sqf index d70241a9..83b1f4af 100644 --- a/Missionframework/scripts/server/game/save_manager.sqf +++ b/Missionframework/scripts/server/game/save_manager.sqf @@ -200,11 +200,6 @@ if (!isNil "greuh_liberation_savegame") then { stats_saves_loaded = stats_saves_loaded + 1; - // Arty Supp deactivated for now - /*if (KP_liberation_suppMod_enb > 0) then { - waitUntil {!isNil "KP_liberation_suppMod_created"}; - };*/ - private _spawnedBuildings = []; { @@ -238,12 +233,6 @@ if (!isNil "greuh_liberation_savegame") then { _hascrew = _x param [4, false]; }; - - // Arty Supp deactivated for now - /*if ((KP_liberation_suppMod_enb > 0) && (_nextclass in KP_liberation_artySupp)) then { - [_nextbuilding] remoteExec ["arty_monitor", 2]; - };*/ - if (_hascrew) then { [ _nextbuilding ] call F_forceBluforCrew; }; diff --git a/Missionframework/scripts/server/game/zeus_synchro.sqf b/Missionframework/scripts/server/game/zeus_synchro.sqf index 1f99e152..75bb6446 100644 --- a/Missionframework/scripts/server/game/zeus_synchro.sqf +++ b/Missionframework/scripts/server/game/zeus_synchro.sqf @@ -14,14 +14,7 @@ while { true } do { _zeusunits = []; { if ((side group _x == GRLIB_side_friendly) && (_x distance startbase > 1000) && alive _x) then { - // Arty Supp deactivated for now - /*if !(isNil "BIS_SUPP_HQ_WEST") then { - if !(_x == BIS_SUPP_HQ_WEST) then { - _zeusunits pushback _x; - }; - } else {*/ - _zeusunits pushback _x; - //}; + _zeusunits pushback _x; }; } foreach allUnits; diff --git a/Missionframework/scripts/shared/init_shared.sqf b/Missionframework/scripts/shared/init_shared.sqf index 33c0e4dc..d516acd5 100644 --- a/Missionframework/scripts/shared/init_shared.sqf +++ b/Missionframework/scripts/shared/init_shared.sqf @@ -30,7 +30,6 @@ remote_call_prisonner = compileFinal preprocessFileLineNumbers "scripts\client\r remote_call_switchmove = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_switchmove.sqf"; remote_call_intel = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_intel.sqf"; remote_call_incoming = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_incoming.sqf"; -// Arty Supp deactivated for now - remote_call_removeSuppReq = compileFinal preprocessFileLineNumbers "scripts\client\remotecall\remote_call_removeSuppReq.sqf"; civinfo_notifications = compileFinal preprocessFileLineNumbers "scripts\client\civinformant\civinfo_notifications.sqf"; civinfo_escort = compileFinal preprocessFileLineNumbers "scripts\client\civinformant\civinfo_escort.sqf"; diff --git a/Missionframework/scripts/shared/kill_manager.sqf b/Missionframework/scripts/shared/kill_manager.sqf index 822fe09f..a6a8f359 100644 --- a/Missionframework/scripts/shared/kill_manager.sqf +++ b/Missionframework/scripts/shared/kill_manager.sqf @@ -65,11 +65,6 @@ if (isServer) then { _unit connectTerminalToUAV objNull; // Eject Player from vehicle if (vehicle _unit != _unit) then {moveOut _unit;}; - // Remove Support Link and delete Requester Module - // Arty Supp deactivated for now - /*if ((count (synchronizedObjects _unit)) > 0) then { - remoteExec ["remote_call_removeSuppReq", _unit]; - };*/ }; if (_unit isKindOf "Man") then { diff --git a/Missionframework/ui/mission_params.hpp b/Missionframework/ui/mission_params.hpp index 7b0fdffd..a6312b80 100644 --- a/Missionframework/ui/mission_params.hpp +++ b/Missionframework/ui/mission_params.hpp @@ -232,13 +232,6 @@ class Params texts[] = {$STR_PARAMS_DISABLED, $STR_PARAMS_ENABLED}; default = 1; }; - // Arty Supp deactivated for now - /*class SuppMod { - title = $STR_PARAMS_SUPPMOD; - values[] = {0, 1, 2, 3}; - texts[] = {$STR_PARAMS_DISABLED, $STR_PARAMS_COMMANDER, $STR_PARAMS_WHITELISTONLY, $STR_PARAMS_EVERYONE}; - default = 0; - };*/ class TeamkillPenalty { title = $STR_PARAM_TEAMKILL_PENALTY; values[] = {1,0}; diff --git a/Missionframework/whitelist.sqf b/Missionframework/whitelist.sqf index 995dfa49..22c3ab81 100644 --- a/Missionframework/whitelist.sqf +++ b/Missionframework/whitelist.sqf @@ -19,9 +19,3 @@ GRLIB_whitelisted_steamids = [ GRLIB_whitelisted_names = [ ]; - -// Array with SteamIDs of players who should be able to access the support module functionality if you set the parameter to "Whitelist only" -// Arty Supp deactivated for now -/*KP_liberation_suppMod_whitelist = [ - -];*/