From 4acb24c8b290b5ba0582e7e89745bbc5e32639af Mon Sep 17 00:00:00 2001 From: vbawol Date: Sun, 26 Mar 2017 10:21:26 -0500 Subject: [PATCH] update usage of createGroup to 1.68+ --- Server_Install_Pack/sc/BattlEye/scripts.txt | 2 +- Sources/epoch_code/compile/EPOCH_SpawnTraderMiltia.sqf | 2 +- Sources/epoch_code/compile/EPOCH_unitSpawn.sqf | 4 ++-- Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf | 2 +- .../epoch_code/compile/missions/tasks/mission_spawnUAV.sqf | 2 +- .../compile/epoch_group/EPOCH_server_deleteGroup.sqf | 2 +- .../compile/epoch_group/EPOCH_server_updatePlayerGroup.sqf | 4 ++-- .../compile/epoch_missions/EPOCH_Server_createAirDrop.sqf | 2 +- .../compile/epoch_missions/EPOCH_Server_createObject.sqf | 2 +- .../compile/epoch_player/EPOCH_server_loadPlayer.sqf | 2 +- .../compile/epoch_player/EPOCH_server_revivePlayer.sqf | 4 ++-- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Server_Install_Pack/sc/BattlEye/scripts.txt b/Server_Install_Pack/sc/BattlEye/scripts.txt index 7c9062f3..a8c87592 100644 --- a/Server_Install_Pack/sc/BattlEye/scripts.txt +++ b/Server_Install_Pack/sc/BattlEye/scripts.txt @@ -28,7 +28,7 @@ 7 removeAllItems 7 removeAllActions 7 setViewDistance !="setViewDistance 1600" -7 createGroup !="EPOCH_server_createGroup" !="_grp = createGroup RESISTANCE;" !="if (isserver) then {\n_group = creategroup sidelogic;" !="grpVIPGeneral = createGroup RESISTANCE;" !="_grp = createGroup side _plyr;" !="_grp = createGroup side player;" !="_grp = createGroup _side;" !="_grp = createGroup (side _plyr);" !="createcenter sidelogic;\n_grpLogic = creategroup sidelogic;\nbis_functions_mainscope" !="_group = creategroup west;" +7 createGroup !="EPOCH_server_createGroup" !="_grp = createGroup [RESISTANCE, true];" !="if (isserver) then {\n_group = creategroup sidelogic;" !="grpVIPGeneral = createGroup [RESISTANCE, true];" !="_grp = createGroup side _plyr;" !="_grp = createGroup [_side, true];" !="_grp = createGroup [(side _plyr), true];" !="createcenter sidelogic;\n_grpLogic = creategroup sidelogic;\nbis_functions_mainscope" !="_group = createGroup [west, true];" 7 createVehicleCrew !="createvehiclecrew _x;" 7 createVehicleLocal !="\"#particlesource\" createVehicleLocal" !="\"#lightpoint\" createVehicleLocal" !="\"BloodSplat\" createVehicleLocal" !="[\"lightning1_F\", \"lightning2_F\"] call BIS_fnc_selectRandom;\n_lighting = _class createVehicleLocal" !="SLX_XEH_DUMMY createVehicleLocal [0, 0, 0];" !="CBA_eventHandlers = \"Logic\" createVehicleLocal [0, 0];" 7 createUnit !="_driver = _grp createUnit[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];" !="axeGeneral = grpVIPGeneral createUnit [\"I_officer_F\", axeGeneralPos, [], 1, \"CAN_COLLIDE\"];" !="bis_functions_mainscope = _grpLogic createunit [\"Logic\",[9,9,9],[],0,\"none\"];" !="_unit = _grp createUnit[selectRandom _arrUnits, _pos, [], 0, \"FORM\"];" !="_driver = (group player) createUnit[\"I_UAV_AI\", position axeUAV, [], 0, \"CAN_COLLIDE\"];" diff --git a/Sources/epoch_code/compile/EPOCH_SpawnTraderMiltia.sqf b/Sources/epoch_code/compile/EPOCH_SpawnTraderMiltia.sqf index 8d19e12e..8fafd4b6 100644 --- a/Sources/epoch_code/compile/EPOCH_SpawnTraderMiltia.sqf +++ b/Sources/epoch_code/compile/EPOCH_SpawnTraderMiltia.sqf @@ -18,7 +18,7 @@ private ["_allpositions","_grp","_nrBuilds","_rndHouse","_startPos","_trgt","_un _trgt = player; _nrBuilds = nearestObjects [getPosATL _trgt,["house"],50]; -_grp = createGroup RESISTANCE; +_grp = createGroup [RESISTANCE, true]; for "_i" from 1 to 3 step 1 do { _startPos = []; diff --git a/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf b/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf index 496264b8..2bbca2d0 100644 --- a/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf +++ b/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf @@ -128,7 +128,7 @@ switch _unitClass do { _units pushBack _unit; addToRemainsCollector[_unit]; _unit flyInHeight 600; - _grp = createGroup RESISTANCE; + _grp = createGroup [RESISTANCE, true]; _driver = _grp createUnit["I_UAV_AI", position _unit, [], 0, "CAN_COLLIDE"]; _driver moveInAny _unit; [_unit, _trgt] execFSM "\x\addons\a3_epoch_code\System\Copter_brain.fsm"; @@ -153,7 +153,7 @@ switch _unitClass do { _pos = [_targetPos,80,150,1,true] call EPOCH_fnc_findSafePos; }; _pos set [2,0]; - _grp = createGroup RESISTANCE; + _grp = createGroup [RESISTANCE, true]; _grp setBehaviour "COMBAT"; _grp setCombatMode "RED"; _minAISkill = getNumber (getMissionConfig "CfgEpochSoldier" >> "minAISkill"); diff --git a/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf b/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf index 515c709e..ede68e28 100644 --- a/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf +++ b/Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf @@ -16,7 +16,7 @@ private ["_unit"]; //[[[end]]] for "_i" from 0 to 4 step 1 do { - _unit = createGroup RESISTANCE createUnit ["Epoch_Female_F", getPos player, [], 400, "CAN_COLLIDE"]; + _unit = createGroup [RESISTANCE, true] createUnit ["Epoch_Female_F", getPos player, [], 400, "CAN_COLLIDE"]; _unit addBackPack "B_FieldPack_blk"; _unit addWeapon "Hatchet"; _unit addMagazine "hatchet_swing"; diff --git a/Sources/epoch_code/compile/missions/tasks/mission_spawnUAV.sqf b/Sources/epoch_code/compile/missions/tasks/mission_spawnUAV.sqf index 2aba5dd2..fe500130 100644 --- a/Sources/epoch_code/compile/missions/tasks/mission_spawnUAV.sqf +++ b/Sources/epoch_code/compile/missions/tasks/mission_spawnUAV.sqf @@ -6,7 +6,7 @@ _unit = createVehicle["I_UAV_01_F", _targetPos, [], 0, "FLY"]; _unit disableTIEquipment true; addToRemainsCollector[_unit]; _unit flyInHeight 600; -_grp = createGroup RESISTANCE; +_grp = createGroup [RESISTANCE, true]; _driver = _grp createUnit["I_UAV_AI", position _unit, [], 0, "CAN_COLLIDE"]; _driver moveInAny _unit; [_unit, _trgt] execFSM "\x\addons\a3_epoch_code\System\Copter_brain.fsm"; diff --git a/Sources/epoch_server/compile/epoch_group/EPOCH_server_deleteGroup.sqf b/Sources/epoch_server/compile/epoch_group/EPOCH_server_deleteGroup.sqf index 46e3af33..37b47438 100644 --- a/Sources/epoch_server/compile/epoch_group/EPOCH_server_deleteGroup.sqf +++ b/Sources/epoch_server/compile/epoch_group/EPOCH_server_deleteGroup.sqf @@ -24,7 +24,7 @@ if (_groupID != "") then { { _x setVariable ["GROUP", nil]; [["resetGroup", true], _x] call EPOCH_sendRemoteExecClient; - [_x] joinSilent (createGroup west); + [_x] joinSilent (createGroup [west, true]); } forEach (allPlayers select {(_x getVariable["GROUP", ""]) == _groupID}); _return = ["Group", _groupID] call EPOCH_fnc_server_hiveDEL; diff --git a/Sources/epoch_server/compile/epoch_group/EPOCH_server_updatePlayerGroup.sqf b/Sources/epoch_server/compile/epoch_group/EPOCH_server_updatePlayerGroup.sqf index c64e27db..9bc39d57 100644 --- a/Sources/epoch_server/compile/epoch_group/EPOCH_server_updatePlayerGroup.sqf +++ b/Sources/epoch_server/compile/epoch_group/EPOCH_server_updatePlayerGroup.sqf @@ -48,7 +48,7 @@ if ((_response select 0) == 1 && (_response select 1) isEqualType []) then { } forEach _allPlayers; if (isNull _group) then { - _group = createGroup west; + _group = createGroup [west, true]; }; [_x] joinSilent _group; }; @@ -85,7 +85,7 @@ if ((_response select 0) == 1 && (_response select 1) isEqualType []) then { { _x setVariable ["GROUP", nil]; - [_x] joinSilent (createGroup west); + [_x] joinSilent (createGroup [west, true]); [["resetGroup", true], _x] call EPOCH_sendRemoteExecClient; } forEach (_allPlayers select {getPlayerUID _x == _selectedPlayerUID}); diff --git a/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createAirDrop.sqf b/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createAirDrop.sqf index 0c332737..15c93c02 100644 --- a/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createAirDrop.sqf +++ b/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createAirDrop.sqf @@ -43,7 +43,7 @@ _obj allowdamage false; _obj setPosATL _pos; _obj setFuel 1; _obj flyInHeight 120; -_grp = createGroup RESISTANCE; +_grp = createGroup [RESISTANCE, true]; _unitPos = _pos; _driver = _grp createUnit["I_helipilot_F", _unitPos, [], 0, "CAN_COLLIDE"]; diff --git a/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createObject.sqf b/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createObject.sqf index 6be1a7c2..901a8eaa 100644 --- a/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createObject.sqf +++ b/Sources/epoch_server/compile/epoch_missions/EPOCH_Server_createObject.sqf @@ -161,7 +161,7 @@ if(count _vehicles > 0)then{ _obj allowdamage false; if (_driverType != "" || _gunnerType != "" || _commanderType != "") then { - _grp = createGroup RESISTANCE; + _grp = createGroup [RESISTANCE, true]; }; if (_driverType != "") then { diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 154a4fde..9ca6ec8c 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -159,7 +159,7 @@ if (!isNull _player) then { }; if (isNull _group) then { - _group = createGroup west; + _group = createGroup [west, true]; }; _player setPosATL _location; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf index a3745921..c9eb7e93 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf @@ -100,12 +100,12 @@ if (!local _player) then { }forEach (allPlayers select {alive _x}); if (isNull _group) then { - _group = createGroup west; + _group = createGroup [west, true]; }; diag_log format["DEBUG Group Found: %1", _group]; } else { - _group = createGroup west; + _group = createGroup [west, true]; diag_log format["DEBUG Group Created: %1", _group]; };