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

Correct PVDZ_plr_Save for player zombies

Browse Source
This commit is contained in:
ebaydayz
2016-04-20 17:00:38 -04:00
parent 14dacf269c
commit 7da7b9e5dd
9 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.txt
View File

@@ -38,6 +38,7 @@
[CHANGED] All instances of sleep replaced with the more reliable uiSleep @icomrade
[CHANGED] Several getPosATL changed to call FNC_GetPos for water compatibility @icomrade
[CHANGED] Trader city objects are now spawned locally on each machine with simulation disabled for better performance. Admins can still override with custom cities in init.sqf. @ebaydayz
[CHANGED] Player zombies are no longer attacked by other zombies. The respawn button is now enabled for them if they wish to suicide. @ebaydayz
[FIXED] Zombies now target and attack players correctly with 1.8.7 code
[FIXED] Server position sync bug after falling unconscious #1522 @ebaydayz

2
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -381,7 +381,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
class CA_B_Respawn : CA_B_SAVE {
idc = 1010;
//onButtonClick = "hint str (_this select 0);";
onButtonClick = "if ((alive player) && (r_fracture_legs)) then { player SetDamage 1;};";
onButtonClick = "if ((alive player) && (r_fracture_legs or {player isKindOf 'PZombie_VB'})) then { player SetDamage 1;};";
y = 0.2537 + 0.101903 * 2;
text = $STR_DISP_INT_RESPAWN;
default = 0;

2
SQF/dayz_code/actions/pzombie/pz_feed.sqf
View File

@@ -63,7 +63,7 @@ if !(alive _item) then {
dayz_lastMeal = time;
dayz_hunger = 0;
PVDZ_plr_Save = [player,[],true];
PVDZ_plr_Save = [player,nil,true];
publicVariableServer "PVDZ_plr_Save";
[player,"eat",0,false] call dayz_zombieSpeak;

2
SQF/dayz_code/compile/player_death.sqf
View File

@@ -133,7 +133,7 @@ _body setVariable["combattimeout", 0, true];
//dayzFlies = player;
//publicVariable "dayzFlies";
uiSleep 2;
1 cutRsc ["DeathScreen_DZE","BLACK OUT",3];
1 cutRsc [if (DZE_DeathScreen) then {"DeathScreen_DZE"} else {"DeathScreen_DZ"},"BLACK OUT",3];
playMusic "dayz_track_death_1";
uiSleep 2;

2
SQF/dayz_code/compile/player_forceSave.sqf
View File

@@ -7,7 +7,7 @@ Opens player inventory to save
_magazineArray = [] call player_countMagazines;
if ((count _magazineArray) > 0) then {
PVDZ_plr_Save = [player,[_magazineArray,dayz_onBack]];
PVDZ_plr_Save = [player, if (player isKindOf "PZombie_VB") then {nil} else {[_magazineArray,dayz_onBack]}];
publicVariableServer "PVDZ_plr_Save";
};

2
SQF/dayz_code/compile/player_onPause.sqf
View File

@@ -11,7 +11,7 @@ _btnAbort ctrlEnable false;
_btnAbortText = ctrlText _btnAbort;
_isPZombie = player isKindOf "PZombie_VB";
if (r_fracture_legs) then {_btnRespawn ctrlEnable true;};
if (r_fracture_legs or _isPZombie) then {_btnRespawn ctrlEnable true;};
dayz_lastCheckSave = time;
//force gear save

1
SQF/dayz_code/configVariables.sqf
View File

@@ -26,6 +26,7 @@ DZE_DeathMsgDynamicText = false; // Display death messages as dynamicText in the
DZE_DeathMsgGlobal = false; // Display death messages in global chat
DZE_DeathMsgSide = false; // Display death messages in side chat
DZE_DeathMsgTitleText = false; // Display death messages as title text
DZE_DeathScreen = true; // True=Use Epoch death screen (Trade city obituaries have been amended) False=Use DayZ death screen (You are dead)
DZE_HaloJump = true; // Enable halo jumping out of air vehicles above 400m
DZE_modularBuild = true; // Enable Snap building by @raymix
DZE_snapExtraRange = 0; // Increase the default range from which objects can snap by this many meters.

2
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -363,7 +363,7 @@ while {1 == 1} do {
player setVariable["combattimeout", diag_tickTime + 30, true]; // Global used to punish combat log in server_onPlayerDisconnect
player setVariable["startcombattimer", 0, false];
} else {
if (_ZedsNearby) then {
if (_ZedsNearby && !_isPZombie) then {
player setVariable["combattimeout", diag_tickTime + 10, true]; // Global used to punish combat log in server_onPlayerDisconnect
player setVariable["startcombattimer", 0, false];
};

2
SQF/dayz_server/compile/server_playerSync.sqf
View File

@@ -75,7 +75,7 @@ if (_characterID != "0") then {
};
if (_isNewGear) then {
if ((typeName _magazines == "ARRAY") && !(_character isKindOf "PZombie_VB")) then {
if (typeName _magazines == "ARRAY") then {
_playerGear = [weapons _character,_magazines select 0,_magazines select 1];
};
};