W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rejoin group after dropping and picking back up radio

Browse Source
This commit is contained in:
ebayShopper
2017-04-17 11:49:54 -04:00
parent 3b12dc09d3
commit 75a12ad953
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.2.txt
View File

@@ -5,6 +5,7 @@
[UPDATED] Zombie pathing. Zeds should now run more direct to players. [UPDATED] Zombie pathing. Zeds should now run more direct to players.
[UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB [UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
[UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc [FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
[FIXED] Trees at POIs can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down. [FIXED] Trees at POIs can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down.

15
SQF/dayz_code/groups/groupMarkers.sqf
View File

@@ -1,10 +1,13 @@
private ["_bodyCount","_count","_group","_hasGPS","_index","_inGroup","_marker","_markBody","_markGroup","_markSelf","_name","_pos","_self","_vehicle"]; private ["_bodyCount","_count","_group","_hasGPS","_index","_inGroup","_lastGroup","_marker","_markBody","_markGroup","_markSelf","_name","_oldGroup","_pos","_self","_vehicle"];
_lastGroup = grpNull;
while {true} do { while {true} do {
_group = player call dayz_filterGroup; _group = player call dayz_filterGroup;
_inGroup = count _group > 1; _inGroup = count _group > 1;
if (dayz_requireRadio && {_inGroup} && {!("ItemRadio" in items player)}) then { if (dayz_requireRadio && {_inGroup} && {!("ItemRadio" in items player)}) then {
_lastGroup = group player;
[player] joinSilent grpNull; [player] joinSilent grpNull;
if (!isNull findDisplay 80000) then {findDisplay 80000 closeDisplay 2;}; if (!isNull findDisplay 80000) then {findDisplay 80000 closeDisplay 2;};
terminate dayz_groupTags; terminate dayz_groupTags;
@@ -15,6 +18,16 @@ while {true} do {
dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf"; dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
}; };
if (!isNull _lastGroup && {"ItemRadio" in items player}) then {
_oldGroup = group player;
[player] joinSilent _lastGroup;
if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;};
format[localize "STR_EPOCH_REJOINED_GROUP",name leader _lastGroup] call dayz_rollingMessages;
PVDZ_Server_UpdateGroup = [1,player];
publicVariableServer "PVDZ_Server_UpdateGroup";
_lastGroup = grpNull;
};
if (visibleMap or !isNull (uiNamespace getVariable["BIS_RscMiniMap",displayNull])) then { if (visibleMap or !isNull (uiNamespace getVariable["BIS_RscMiniMap",displayNull])) then {
_hasGPS = "ItemGPS" in items player; _hasGPS = "ItemGPS" in items player;
_markBody = (dayz_markBody == 1 or (dayz_markBody == 2 && _hasGPS)); _markBody = (dayz_markBody == 1 or (dayz_markBody == 2 && _hasGPS));