From efeadcfa356d7c2dd2f6da581e2290068b448478 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Sat, 19 Nov 2016 19:39:08 -0500 Subject: [PATCH] Rename selectPlayer and selectGroupMember functions Fewer scripts.txt exceptions needed --- SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp | 4 ++-- SQF/dayz_code/groups/init.sqf | 4 ++-- SQF/dayz_code/groups/kick.sqf | 2 +- .../groups/{selectGroupMember.sqf => pickGroupMember.sqf} | 0 SQF/dayz_code/groups/{selectPlayer.sqf => pickPlayer.sqf} | 0 Server Files/Battleye/scripts.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename SQF/dayz_code/groups/{selectGroupMember.sqf => pickGroupMember.sqf} (100%) rename SQF/dayz_code/groups/{selectPlayer.sqf => pickPlayer.sqf} (100%) diff --git a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp index a02e2cc16..c5ce0cc97 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscGroups.hpp @@ -160,7 +160,7 @@ class DZ_GroupDialog { class controls { class Players: DZ_GroupListBox { idc = 1; - onLBSelChanged = "call dayz_selectPlayer;"; + onLBSelChanged = "call dayz_pickPlayer;"; x = .04; y = .21; w = .235; @@ -168,7 +168,7 @@ class DZ_GroupDialog { }; class MyGroup: DZ_GroupListBox { idc = 2; - onLBSelChanged = "call dayz_selectGroupMember;"; + onLBSelChanged = "call dayz_pickGroupMember;"; x = .5; y = .21; w = .235; diff --git a/SQF/dayz_code/groups/init.sqf b/SQF/dayz_code/groups/init.sqf index 3f811a126..33cc6b8d1 100644 --- a/SQF/dayz_code/groups/init.sqf +++ b/SQF/dayz_code/groups/init.sqf @@ -37,8 +37,8 @@ dayz_joinGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\j dayz_kickFromGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\kick.sqf"; dayz_leaveGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\leave.sqf"; dayz_openGroupDialog = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\open.sqf"; +dayz_pickGroupMember = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\pickGroupMember.sqf"; +dayz_pickPlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\pickPlayer.sqf"; dayz_promotePlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\promote.sqf"; dayz_rejectGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\reject.sqf"; -dayz_selectGroupMember = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\selectGroupMember.sqf"; -dayz_selectPlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\selectPlayer.sqf"; dayz_groupInit = true; \ No newline at end of file diff --git a/SQF/dayz_code/groups/kick.sqf b/SQF/dayz_code/groups/kick.sqf index 5874ff2c5..10ba156b5 100644 --- a/SQF/dayz_code/groups/kick.sqf +++ b/SQF/dayz_code/groups/kick.sqf @@ -12,4 +12,4 @@ if (isNull _target or _target == player or player != leader group player) exitWi PVDZ_Server_UpdateGroup = [2,player,_targetUID]; publicVariableServer "PVDZ_Server_UpdateGroup"; -call dayz_selectGroupMember; //update lbCurSel change \ No newline at end of file +call dayz_pickGroupMember; //update lbCurSel change \ No newline at end of file diff --git a/SQF/dayz_code/groups/selectGroupMember.sqf b/SQF/dayz_code/groups/pickGroupMember.sqf similarity index 100% rename from SQF/dayz_code/groups/selectGroupMember.sqf rename to SQF/dayz_code/groups/pickGroupMember.sqf diff --git a/SQF/dayz_code/groups/selectPlayer.sqf b/SQF/dayz_code/groups/pickPlayer.sqf similarity index 100% rename from SQF/dayz_code/groups/selectPlayer.sqf rename to SQF/dayz_code/groups/pickPlayer.sqf diff --git a/Server Files/Battleye/scripts.txt b/Server Files/Battleye/scripts.txt index b6af8d9af..2198b31a7 100644 --- a/Server Files/Battleye/scripts.txt +++ b/Server Files/Battleye/scripts.txt @@ -28,7 +28,7 @@ 1 "lbSet" !="_lbUsersControl lbSetColor [_x, [1,0,0,1]];" !="_lbUsersControl lbSetValue [_x, _rating];" !="_control lbSetColor [_x, _color];" !"_weaponsLBSetFocus" !="(_this select 0) displayCtrl 140 lbSetCurSel (profileNamespace getVariable ['streamerMode',0]);" !="(_display displayCtrl 105) lbSetColor [_i, [0.06, 0.05, 0.03, 1]];" !"[Z_AT_BUYABLELIST," !"lbSetPicture [Z_AT_BUYINGLIST, _index" !"lbSetPicture [Z_AT_SELLINGLIST, _index" !"lbSetPicture [Z_AT_SELLABLELIST, _index" !="_userList lbSetData [(lbSize _userList) -1,_friendUID];" !" [TraderDialogItemList, _index, " !"_myGroup lbSetData [_index,getPlayerUID _x];" 5 "onMapSingleClick" 5 "playableUnits" !"for [{_y=0},{_y < count(playableUnits)},{_y=_y+1}] do {" !"typeName player == \"OBJECT\")}) AND {((player in playableUnits) AND {(alive player)" !"(1 max count playableUnits)) min (dayz_maxAnimals - _count))) to 1 step -1 do {" !"AND {((alive _x) AND {((vehicle _x) distance _obj < 150)})}} count playableUnits)}) then {" !="_local = { _unit distance _x < _dis; } count playableUnits <= 1;" !"if (!_isOk) exitWith {false};\nuiSleep 0.001;\n} forEach playableUnits;" !"ManagementMustBeClose) then { player nearEntities [\"CAManBase\", 10] } else { playableUnits };" -5 "selectPlayer" !"dayz_originalPlayer enableSimulation true;\naddSwitchableUnit dayz_originalPlayer;\nsetPlayable dayz_originalPlayer;\nselectPlayer dayz_originalPlayer;" !"addSwitchableUnit _newUnit;\nsetPlayable _newUnit;\nselectPlayer _newUnit;" !="call dayz_selectPlayer;" !"dayz_selectPlayer = compile preprocessFileLineNumbers \"" +5 "selectPlayer" !"dayz_originalPlayer enableSimulation true;\naddSwitchableUnit dayz_originalPlayer;\nsetPlayable dayz_originalPlayer;\nselectPlayer dayz_originalPlayer;" !"addSwitchableUnit _newUnit;\nsetPlayable _newUnit;\nselectPlayer _newUnit;" 5 "serverCommand" !="_character = if (serverCommandAvailable \"#kick\") then { call sched_tg_follow } else { player };" !"serverCommand (\"#kick \" + _selectedName);" 5 "setDamage" !"([4654,9595,0] nearestObject 145259) setDamage 1;\n([4654,9595,0] nearestObject 145260) setDamage 1;" !"if (_entity isKindOf \"Animal\") then {\n_entity setDamage 1;" !"_tree setDamage 1;\ndayz_choppedTrees set [count dayz_choppedTrees,_tree];" !="if ((alive player) && (r_fracture_legs or {player isKindOf 'PZombie_VB'})) then { player SetDamage 1;};" !"_id = [player,20,true,getPosATL player] call player_alertZombies;\nuiSleep 0.5;\nplayer setDamage 1;" !"if(\"\" == typeOf _tree) then {\n_tree setDamage 1;\n};" !"if (_ent isKindOf \"Animal\" || _ent isKindOf \"zZombie_base\") then {\n_ent setDamage 1;" 5 "setDammage"