W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 2 new vars and fix up variable names

Browse Source 
DZE_HeartBeat
DZE_UseBloodTypes
This commit is contained in:
icomrade
2016-03-01 00:23:14 -05:00
parent a3dac45061
commit bad0a2e461
28 changed files with 112 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
SQF/dayz_code/NOTE.txt
View File

@@ -1,48 +1,28 @@
NEW VAR DZE_HeartBeat
USE TO ENABLE HEARTBEAT SOUND WHEN LOOKING AT BANDIT PLAYER (less than -5000 humanity), DISABLED BY DEFAULT
NEW VAR DZE_UseBloodTypes
DZE_UseBloodTypes, OFF by default - Enables blood type system, and disables universal bloodbags. you can readily turn this system off and on
fn_selfActions.sqf
player_updateGui.sqf
DZE_BloodBags NEEDED ARRAY OF ALL BLOOD BAGS DZE_BloodBags NEEDED ARRAY OF ALL BLOOD BAGS
Create switchable blood system with variable. Create switchable blood system with variable.
Convert (if old system) to ItemBloodbag Convert (if old system) to ItemBloodbag
DZE_UseBloodTypes DZE_UseBloodTypes
replace all of
8Rnd_12Gauge_Buck
8Rnd_12Gauge_Slug
2Rnd_12Gauge_Buck
2Rnd_12Gauge_Slug
with original epoch ammo
CHANGED WEAPON CLASSES
{Loot_WEAPON, 3, Makarov_DZ},
{Loot_WEAPON, 1, MakarovSD},
{Loot_WEAPON, 2, M1911_DZ},
{Loot_WEAPON, 2, M9_DZ},
{Loot_WEAPON, 1, M9SD},
{Loot_WEAPON, 2, G17_DZ},
{Loot_WEAPON, 2, Revolver_DZ},
{Loot_WEAPON, 0.5, revolver_gold_EP1},
fn_selfActions.sqf
player_updateGui.sqf
bloodBagANEG bloodBagAPOS bloodBagBNEG bloodBagBPOS bloodBagONEG bloodBagOPOS bloodBagANEG bloodBagAPOS bloodBagBNEG bloodBagBPOS bloodBagONEG bloodBagOPOS
wholeBloodBagANEG wholeBloodBagAPOS wholeBloodBagBNEG wholeBloodBagBPOS wholeBloodBagONEG wholeBloodBagOPOS wholeBloodBagANEG wholeBloodBagAPOS wholeBloodBagBNEG wholeBloodBagBPOS wholeBloodBagONEG wholeBloodBagOPOS
WEAPONHOLDER_TOOL IS NO LONGER USED! FIX BY REPLACING OCCURENCES
I.E. ItemCrowbar replaces WeaponHolder_MeleeCrowbar
WeaponHolder_ItemHatchet_DZE
WeaponHolder_MeleeCrowbar
REMOVE TOOL BREAKING, IT'S STUPID REMOVE TOOL BREAKING, IT'S STUPID
building_spawnLoot_Legacy building_spawnLoot_Legacy
building_spawnZombies_Legacy building_spawnZombies_Legacy
player_craftItem_DZV = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItem.sqf"; player_craftItem_DZV = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItem.sqf";
COMPILES NOT DONE - LEFT OFF AT LOS_CHECK
dayz_lowHumanity //HEARBEAT SOUND
vehicle_handleDamage = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_handleDamage.sqf"; vehicle_handleDamage = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_handleDamage.sqf";
vehicle_handleKilled = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_handleKilled.sqf"; vehicle_handleKilled = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_handleKilled.sqf";
@@ -54,7 +34,6 @@ fnc_veh_handleKilled = compile preprocessFileLineNumbers "\z\addons\dayz_code\co
dayz_serverObjectMonitor = []; IS REPLACED WITH PVDZE_serverObjectMonitor = []; dayz_serverObjectMonitor = []; IS REPLACED WITH PVDZE_serverObjectMonitor = [];
PVDZ_obj_Publish IS PVDZE_obj_Publish PVDZ_obj_Publish IS PVDZE_obj_Publish
PVCDZ_obj_HideBody IS PVDZE_obj_HideBody
******REPLACE ALL PVCDZ_ AND PVDZ_ with PVCDZE/PVDZE_ ******REPLACE ALL PVCDZ_ AND PVDZ_ with PVCDZE/PVDZE_
trap_monitor.fsm is no more! trap_monitor.fsm is no more!
@@ -88,7 +67,6 @@ s_player_boil = -1; is now a_player_boil = true;
a_player_cooking = true; -- NEW, old -1 var is still used??? a_player_cooking = true; -- NEW, old -1 var is still used???
PVCDZ_obj_GutBody IS NOW PVDZE_plr_GutBody PVCDZ_obj_GutBody IS NOW PVDZE_plr_GutBody
MAKE SURE "ItemFuelBarrel" is in refuel can list MAKE SURE "ItemFuelBarrel" is in refuel can list
PVDZE_obj_Delete is PVDZ_obj_Destroy with 3 array elements
////////SERVER STUFF/////// ////////SERVER STUFF///////
REMOVE PVDZE_SEND PROJECTILE FOR FLARE AND CHEMLIGHT 0 1 REMOVE PVDZE_SEND PROJECTILE FOR FLARE AND CHEMLIGHT 0 1

4
SQF/dayz_code/actions/gather_meat.sqf
View File

@@ -58,8 +58,8 @@ if ((count _knifeArray > 0) and !_hasHarvested) then {
if (local _item) then { if (local _item) then {
[_item,_qty] spawn local_gutObject; //leave as spawn (sleeping in loops will work but can freeze the script) [_item,_qty] spawn local_gutObject; //leave as spawn (sleeping in loops will work but can freeze the script)
} else { } else {
PVDZE_plr_GutBody =[_item,_qty]; PVCDZE_obj_GutBody =[_item,_qty];
publicVariable "PVDZE_plr_GutBody"; publicVariable "PVCDZE_obj_GutBody";
//achievement system //achievement system
if (!achievement_Gut) then { if (!achievement_Gut) then {

6
SQF/dayz_code/actions/object_build.sqf
View File

@@ -74,9 +74,9 @@ if (_build) then {
*/ */
_object setVariable ["characterID",dayz_characterID,true]; _object setVariable ["characterID",dayz_characterID,true];
PVDZ_obj_Publish = [dayz_characterID,_object,[round _direction, _location], _variables]; PVDZE_obj_Publish = [dayz_characterID,_object,[round _direction, _location], _variables];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
cutText [format [localize "str_build_01",_text], "PLAIN DOWN"]; cutText [format [localize "str_build_01",_text], "PLAIN DOWN"];
r_action_count = 0; r_action_count = 0;

14
SQF/dayz_code/actions/object_disassembly.sqf
View File

@@ -85,9 +85,11 @@ for "_i" from 1 to 20 do {
_cursorTarget = objNull; _cursorTarget = objNull;
if (_realObjectStillThere) then { // send to server the destroy request if (_realObjectStillThere) then { // send to server the destroy request
_realObjectStillThere = false; _realObjectStillThere = false;
PVDZ_obj_Destroy = [_objectID,_objectUID];
publicVariableServer "PVDZ_obj_Destroy"; _activatingPlayer = player;
diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZ_obj_Destroy]; PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZE_obj_Delete];
}; };
["Working",0,[20,40,15,0]] call dayz_NutritionSystem; ["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
@@ -153,9 +155,9 @@ if (!_realObjectStillThere) then {
_object setVariable ["ownerArray",_ownerArray,true]; _object setVariable ["ownerArray",_ownerArray,true];
_variables = [[ "ownerArray", _ownerArray]]; _variables = [[ "ownerArray", _ownerArray]];
_object setVariable ["characterID",_characterID,true]; _object setVariable ["characterID",_characterID,true];
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables]; PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
/* /*
//Send maintenance info //Send maintenance info
PVDZ_veh_Save = [_object,"maintenance"]; PVDZ_veh_Save = [_object,"maintenance"];

7
SQF/dayz_code/actions/object_dismantle.sqf
View File

@@ -155,11 +155,12 @@ if (_proceed) then {
titleText [format["Dismantled, (%1).", (typeOf _object)], "PLAIN DOWN"]; titleText [format["Dismantled, (%1).", (typeOf _object)], "PLAIN DOWN"];
PVDZ_obj_Destroy = [_objectID,_objectUID]; _activatingPlayer = player;
publicVariableServer "PVDZ_obj_Destroy"; PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
if (isServer) then { if (isServer) then {
PVDZ_obj_Destroy call server_deleteObj; PVDZE_obj_Delete call server_deleteObj;
}; };
//Need to update for sanity no client should ever create or delete anything //Need to update for sanity no client should ever create or delete anything

6
SQF/dayz_code/actions/object_upgradeFireplace.sqf
View File

@@ -209,9 +209,9 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
//publish new tent //publish new tent
//[[[],[]],[[],[]],[[],[]]] //[[[],[]],[[],[]],[[],[]]]
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[[[],[]],_magazines,[[],[]]]]; PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[[[],[]],_magazines,[[],[]]]];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
//cutText [localize "str_upgradeDone", "PLAIN DOWN"]; //cutText [localize "str_upgradeDone", "PLAIN DOWN"];
_msg = localize "str_upgradeDone"; _msg = localize "str_upgradeDone";

13
SQF/dayz_code/actions/object_upgradeStorage.sqf
View File

@@ -168,11 +168,12 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
player playActionNow "Medic"; player playActionNow "Medic";
//remove old tent //remove old tent
PVDZ_obj_Destroy = [_objectID,_objectUID]; _activatingPlayer = player;
publicVariableServer "PVDZ_obj_Destroy"; PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
if (isServer) then { if (isServer) then {
PVDZ_obj_Destroy call server_deleteObj; PVDZE_obj_Delete call server_deleteObj;
}; };
deleteVehicle _cursorTarget; deleteVehicle _cursorTarget;
@@ -227,9 +228,9 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
sleep 3; sleep 3;
//publish new tent //publish new tent
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[_weapons,_magazines,_backpacks]]; PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[_weapons,_magazines,_backpacks]];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
//cutText [localize "str_upgradeDone", "PLAIN DOWN"]; //cutText [localize "str_upgradeDone", "PLAIN DOWN"];
_msg = localize "str_upgradeDone"; _msg = localize "str_upgradeDone";

11
SQF/dayz_code/actions/object_upgradebuilding.sqf
View File

@@ -144,8 +144,9 @@ _object setVariable ["characterID",_characterID,true];
//remove old object //remove old object
deleteVehicle _cursorTarget; deleteVehicle _cursorTarget;
PVDZ_obj_Destroy = [_objectID,_objectUID]; _activatingPlayer = player;
publicVariableServer "PVDZ_obj_Destroy"; PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
// create a weaponholder with dismissed parts // create a weaponholder with dismissed parts
_wh = "WeaponHolder" createVehicle (getPosATL player); _wh = "WeaponHolder" createVehicle (getPosATL player);
@@ -157,9 +158,9 @@ _wh = "WeaponHolder" createVehicle (getPosATL player);
//publish new object //publish new object
_variables = [["ownerArray", _ownerArray],["padlockCombination", _ownerPasscode]]; _variables = [["ownerArray", _ownerArray],["padlockCombination", _ownerPasscode]];
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables]; PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
/* /*
//Send maintenance info //Send maintenance info
PVDZ_veh_Save = [_object,"maintenance"]; PVDZ_veh_Save = [_object,"maintenance"];

4
SQF/dayz_code/actions/player_consume.sqf
View File

@@ -102,8 +102,8 @@ if (_infectionChance != 0 && {abs(_infectionChance) > random 1}) then
//Publish messing //Publish messing
player setVariable ["messing",[dayz_hunger,dayz_thirst,dayz_nutrition],false]; //No need to be sent to everyplayer player setVariable ["messing",[dayz_hunger,dayz_thirst,dayz_nutrition],false]; //No need to be sent to everyplayer
PVDZ_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]]; //update server side only PVDZE_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]]; //update server side only
publicVariableServer "PVDZ_serverStoreVar"; publicVariableServer "PVDZE_serverStoreVar";
//Play sound and alert zombies //Play sound and alert zombies
if (_sound != "") then if (_sound != "") then

6
SQF/dayz_code/actions/player_createstash.sqf
View File

@@ -62,9 +62,9 @@ if ((count _worldspace) == 2) then {
_stash setVariable ["characterID",dayz_characterID,true]; _stash setVariable ["characterID",dayz_characterID,true];
PVDZ_obj_Publish = [dayz_characterID,_stash,[_dir,_location],[]]; PVDZE_obj_Publish = [dayz_characterID,_stash,[_dir,_location],[]];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
r_action_count = 0; r_action_count = 0;
cutText [format [localize "str_success_stash_pitch",_stashname], "PLAIN DOWN"]; cutText [format [localize "str_success_stash_pitch",_stashname], "PLAIN DOWN"];

9
SQF/dayz_code/actions/player_destroyTent.sqf
View File

@@ -82,14 +82,15 @@ _sfx = "tentpack";
// Added Nutrition-Factor for work // Added Nutrition-Factor for work
["Working",0,[20,40,15,0]] call dayz_NutritionSystem; ["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
sleep 3; uisleep 3;
PVDZ_obj_Destroy = [_objectID,_objectUID]; _activatingPlayer = player;
publicVariableServer "PVDZ_obj_Destroy"; PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
//Send killed for object //Send killed for object
if (isServer) then { if (isServer) then {
PVDZ_obj_Destroy call server_deleteObj; PVDZE_obj_Delete call server_deleteObj;
} else { } else {
PVDZ_veh_Save = [_obj, "killed"]; PVDZ_veh_Save = [_obj, "killed"];
publicVariableServer "PVDZ_veh_Save"; publicVariableServer "PVDZ_veh_Save";

6
SQF/dayz_code/actions/player_setTrap.sqf
View File

@@ -29,9 +29,9 @@ _object setDir (getDir player);
_object setVariable ["armed", false, true]; _object setVariable ["armed", false, true];
PVDZ_obj_Publish = [dayz_characterID,_object,[getDir _object, getPosATL _object],[["armed", _object getVariable "armed"]]]; PVDZE_obj_Publish = [dayz_characterID,_object,[getDir _object, getPosATL _object],[["armed", _object getVariable "armed"]]];
publicVariableServer "PVDZ_obj_Publish"; publicVariableServer "PVDZE_obj_Publish";
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish]; diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
player reveal _object; player reveal _object;

4
SQF/dayz_code/actions/player_sleep.sqf
View File

@@ -47,8 +47,8 @@ while {r_doLoop} do {
r_player_infected = false; r_player_infected = false;
player setVariable["USEC_infected",false,false]; player setVariable["USEC_infected",false,false];
PVDZ_serverStoreVar = [player,"USEC_infected",false]; PVDZE_serverStoreVar = [player,"USEC_infected",false];
publicVariableServer "PVDZ_serverStoreVar"; publicVariableServer "PVDZE_serverStoreVar";
} else { } else {
_infectedStatus = if (r_player_infected) then { "Infected" } else { "Cured" }; _infectedStatus = if (r_player_infected) then { "Infected" } else { "Cured" };
_cureAttempt = _cureAttempt + 0.01; _cureAttempt = _cureAttempt + 0.01;

3
SQF/dayz_code/actions/remove.sqf
View File

@@ -175,7 +175,8 @@ if (_proceed) then {
deleteVehicle _obj; deleteVehicle _obj;
if(!_isWreck) then { if(!_isWreck) then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer]; _activatingPlayer = player;
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete"; publicVariableServer "PVDZE_obj_Delete";
}; };

4
SQF/dayz_code/compile/player_humanityMorph.sqf
View File

@@ -86,8 +86,8 @@ player setVariable["CharacterID",_charID,true];
player setVariable["worldspace",_worldspace,true]; player setVariable["worldspace",_worldspace,true];
player setVariable["friendlies",_friendlies,true]; player setVariable["friendlies",_friendlies,true];
player setVariable["tagList",_tagList,true]; player setVariable["tagList",_tagList,true];
PVDZ_serverStoreVar = [player,"Achievements",_achievements]; PVDZE_serverStoreVar = [player,"Achievements",_achievements];
publicVariableServer "PVDZ_serverStoreVar"; publicVariableServer "PVDZE_serverStoreVar";
call dayz_resetSelfActions; call dayz_resetSelfActions;

7
SQF/dayz_code/compile/player_packTent.sqf
View File

@@ -56,11 +56,12 @@ if(_pickup) then {
_backpacks = getBackpackCargo _obj; _backpacks = getBackpackCargo _obj;
//["PVDZ_obj_Delete",[_objectID,_objectUID]] call callRpcProcedure; //["PVDZ_obj_Delete",[_objectID,_objectUID]] call callRpcProcedure;
PVDZ_obj_Destroy = [_objectID,_objectUID]; _activatingPlayer = player;
publicVariableServer "PVDZ_obj_Destroy"; PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
if (isServer) then { if (isServer) then {
PVDZ_obj_Destroy call server_deleteObj; PVDZE_obj_Delete call server_deleteObj;
}; };
deleteVehicle _obj; deleteVehicle _obj;

2
SQF/dayz_code/init/compiles.sqf
View File

@@ -589,7 +589,7 @@ if (!isDedicated) then {
private "_humanity"; private "_humanity";
_humanity = _unit getVariable["humanity",0]; _humanity = _unit getVariable["humanity",0];
dayz_heartBeat = true; dayz_heartBeat = true;
if (_humanity < -3000) then { if (_humanity < -5000) then {
private "_delay"; private "_delay";
_delay = ((10000 + _humanity) / 5500) + 0.3; _delay = ((10000 + _humanity) / 5500) + 0.3;
playSound "heartbeat_1"; playSound "heartbeat_1";

8
SQF/dayz_code/init/publicEH.sqf
View File

@@ -14,12 +14,12 @@
//"usecBreakLegs" addPublicVariableEventHandler {(_this select 1) call player_breaklegs}; //"usecBreakLegs" addPublicVariableEventHandler {(_this select 1) call player_breaklegs};
//Both //Both
"PVCDZ_veh_SetFuel" addPublicVariableEventHandler {(_this select 1) spawn local_setFuel}; "PVCDZE_veh_SetFuel" addPublicVariableEventHandler {(_this select 1) spawn local_setFuel};
"PVDZE_veh_SFix" addPublicVariableEventHandler {(_this select 1) call object_setFixServer}; "PVDZE_veh_SFix" addPublicVariableEventHandler {(_this select 1) call object_setFixServer};
"PVDZE_plr_HideBody" addPublicVariableEventHandler {hideBody (_this select 1)}; "PVCDZE_plr_HideBody" addPublicVariableEventHandler {hideBody (_this select 1)};
"PVDZE_obj_Hide" addPublicVariableEventHandler {hideObject (_this select 1)}; "PVDZE_obj_Hide" addPublicVariableEventHandler {hideObject (_this select 1)};
"PVDZE_veh_Lock" addPublicVariableEventHandler {(_this select 1) spawn local_lockUnlock}; "PVDZE_veh_Lock" addPublicVariableEventHandler {(_this select 1) spawn local_lockUnlock};
"PVCDZE_plr_GutBody" addPublicVariableEventHandler {(_this select 1) spawn local_gutObject}; "PVCDZE_obj_GutBody" addPublicVariableEventHandler {(_this select 1) spawn local_gutObject};
"PVDZE_plr_GutBodyZ" addPublicVariableEventHandler {(_this select 1) spawn local_gutObjectZ}; "PVDZE_plr_GutBodyZ" addPublicVariableEventHandler {(_this select 1) spawn local_gutObjectZ};
"PVDZE_plr_DelLocal" addPublicVariableEventHandler {(_this select 1) call object_delLocal}; "PVDZE_plr_DelLocal" addPublicVariableEventHandler {(_this select 1) call object_delLocal};
"PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH}; "PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH};
@@ -210,7 +210,7 @@ if (isServer) then {
}; };
}; };
"PVDZ_serverStoreVar" addPublicVariableEventHandler { "PVDZE_serverStoreVar" addPublicVariableEventHandler {
_obj = ((_this select 1) select 0); _obj = ((_this select 1) select 0);
_name = ((_this select 1) select 1); _name = ((_this select 1) select 1);
_value = ((_this select 1) select 2); _value = ((_this select 1) select 2);

8
SQF/dayz_code/init/variables.sqf
View File

@@ -586,7 +586,7 @@ dayz_zombieTargetList = [
]; ];
PVDZE_plr_Hit = []; PVDZE_plr_Hit = [];
PVDZE_obj_Publish = []; //used for eventhandler to spawn a mirror of players tent PVDZE_obj_Publish = []; //used for eventhandler to spawn a mirror of players tent
PVDZE_plr_HideBody = objNull; PVCDZE_plr_HideBody = objNull;
dayz_selectedVault = objNull; dayz_selectedVault = objNull;
dayz_selectedDoor = objNull; dayz_selectedDoor = objNull;
@@ -757,6 +757,12 @@ if(isNil "DZE_PlotPole") then {
if(isNil "DZE_maintainRange") then { if(isNil "DZE_maintainRange") then {
DZE_maintainRange = ((DZE_PlotPole select 0)+20); DZE_maintainRange = ((DZE_PlotPole select 0)+20);
}; };
if(isNil "DZE_HeartBeat") then {
DZE_HeartBeat = false;
};
if(isNil "DZE_UseBloodTypes") then {
DZE_UseBloodTypes = false;
};
if(isNil "dayz_presets") then { dayz_presets = "Vanilla"; }; if(isNil "dayz_presets") then { dayz_presets = "Vanilla"; };

4
SQF/dayz_code/medical/load_wounded.sqf
View File

@@ -17,8 +17,8 @@ _wounded assignAsCargo _vcl;
_wounded moveInCargo _vcl; _wounded moveInCargo _vcl;
sleep 1; sleep 1;
//["PVDZ_drg_RaLW",_wounded] call broadcastRpcCallAll; //["PVDZ_drg_RaLW",_wounded] call broadcastRpcCallAll;
PVDZ_drg_RaLW = _wounded; norrnRaLW = _wounded;
publicVariable "PVDZ_drg_RaLW"; publicVariable "norrnRaLW";
if (local _wounded) then if (local _wounded) then
{ {

20
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -430,10 +430,10 @@ class FSM
"" \n "" \n
"_msg = [];" \n "_msg = [];" \n
"progressLoadingScreen 0.65;" \n "progressLoadingScreen 0.65;" \n
"PVDZ_plr_Login1 = [_playerUID,player];" \n "PVDZE_plr_Login = [_playerUID,player];" \n
"publicVariableServer ""PVDZ_plr_Login1"";" \n "publicVariableServer ""PVDZE_plr_Login"";" \n
"diag_log ['Sent to server: PVDZ_plr_Login1', PVDZ_plr_Login1]; " \n "diag_log ['Sent to server: PVDZE_plr_Login', PVDZE_plr_Login]; " \n
"PVDZ_send = [player,""dayzSetDate"",[player]];" \n "PVDZ_send = [player,""PVDZE_plr_SetDate"",[player]];" \n
"publicVariableServer ""PVDZ_send"";" \n "publicVariableServer ""PVDZ_send"";" \n
"diag_log ['Sent to server: PVDZ_send', PVDZ_send]; " \n "diag_log ['Sent to server: PVDZ_send', PVDZ_send]; " \n
"_myTime = diag_tickTime;" \n "_myTime = diag_tickTime;" \n
@@ -740,9 +740,9 @@ class FSM
"" \n "" \n
"dayz_playerAchievements = _playerAchievements;" \n "dayz_playerAchievements = _playerAchievements;" \n
" " \n " " \n
"PVDZ_serverStoreVar = [player,""Achievements"",_playerAchievements];" \n "PVDZE_serverStoreVar = [player,""Achievements"",_playerAchievements];" \n
"publicVariableServer ""PVDZ_serverStoreVar"";" \n "publicVariableServer ""PVDZE_serverStoreVar"";" \n
"diag_log ['Sent to server: PVDZ_serverStoreVar', PVDZ_serverStoreVar]; " \n "diag_log ['Sent to server: PVDZE_serverStoreVar', PVDZE_serverStoreVar]; " \n
"player setVariable [""Achievements"",_playerAchievements,false];" \n "player setVariable [""Achievements"",_playerAchievements,false];" \n
"" \n "" \n
"" \n "" \n
@@ -1503,9 +1503,9 @@ class FSM
priority = 0.000000; priority = 0.000000;
to="Stream"; to="Stream";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/; precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"!isNil ""dayzSetDate"""/*%FSM</CONDITION""">*/; condition=/*%FSM<CONDITION""">*/"!isNil ""PVDZE_plr_SetDate"""/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/"diag_log ['Date & time received:', dayzSetDate];" \n action=/*%FSM<ACTION""">*/"diag_log ['Date & time received:', PVDZE_plr_SetDate];" \n
"setDate dayzSetDate;" \n "setDate PVDZE_plr_SetDate;" \n
"diag_log ['Local date on this client:', date];"/*%FSM</ACTION""">*/; "diag_log ['Local date on this client:', date];"/*%FSM</ACTION""">*/;
}; };
/*%FSM</LINK>*/ /*%FSM</LINK>*/

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

@@ -329,8 +329,8 @@ dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)
_messTimer = 0; _messTimer = 0;
player setVariable ["messing",[dayz_hunger,dayz_thirst,dayz_nutrition],false]; player setVariable ["messing",[dayz_hunger,dayz_thirst,dayz_nutrition],false];
PVDZ_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]]; PVDZE_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]];
publicVariableServer "PVDZ_serverStoreVar"; publicVariableServer "PVDZE_serverStoreVar";
}; };
//Save Checker //Save Checker
@@ -340,8 +340,8 @@ dayz_myLoad = (((count dayz_myBackpackMags) * 0.2) + (count dayz_myBackpackWpns)
PVDZ_plr_Save = [player,nil,false,dayz_playerAchievements]; PVDZ_plr_Save = [player,nil,false,dayz_playerAchievements];
publicVariableServer "PVDZ_plr_Save"; publicVariableServer "PVDZ_plr_Save";
PVDZ_serverStoreVar = [player,"Achievements",dayz_playerAchievements]; PVDZE_serverStoreVar = [player,"Achievements",dayz_playerAchievements];
publicVariableServer "PVDZ_serverStoreVar"; publicVariableServer "PVDZE_serverStoreVar";
player setVariable ["Achievements",dayz_playerAchievements,false]; player setVariable ["Achievements",dayz_playerAchievements,false];
if (isServer) then { if (isServer) then {

2
SQF/dayz_code/system/scheduler/sched_gui.sqf
View File

@@ -24,7 +24,7 @@ sched_gui = {
}; };
// move this elsewhere, it deals with the menu // move this elsewhere, it deals with the menu
if (!isNull cursorTarget and !dayz_heartBeat) then { if (!isNull cursorTarget and {!dayz_heartBeat} and {DZE_HeartBeat}) then {
if (alive cursorTarget) then { if (alive cursorTarget) then {
cursorTarget spawn dayz_lowHumanity; cursorTarget spawn dayz_lowHumanity;
}; };

4
SQF/dayz_code/system/scheduler/sched_medical.sqf
View File

@@ -8,8 +8,8 @@ sched_medical_slow = { // 10 seconds
player setVariable["USEC_BloodQty", r_player_blood, false]; player setVariable["USEC_BloodQty", r_player_blood, false];
player setVariable["medForceUpdate", true, false]; player setVariable["medForceUpdate", true, false];
//Send only to server //Send only to server
PVDZ_serverStoreVar = [player, "USEC_BloodQty", r_player_blood]; PVDZE_serverStoreVar = [player, "USEC_BloodQty", r_player_blood];
publicVariableServer "PVDZ_serverStoreVar"; publicVariableServer "PVDZE_serverStoreVar";
}; };
objNull objNull

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

@@ -289,5 +289,5 @@ _playerObj setVariable ["lastTime",time];
//diag_log ("LOGIN PUBLISHING: " + str(_playerObj) + " Type: " + (typeOf _playerObj)); //diag_log ("LOGIN PUBLISHING: " + str(_playerObj) + " Type: " + (typeOf _playerObj));
PVDZ_plr_Login1 = null; PVDZE_plr_Login = null;
PVDZ_plr_Login2 = null; PVDZ_plr_Login2 = null;

19
SQF/dayz_server/eventHandlers/server_sendToClient.sqf
View File

@@ -17,8 +17,8 @@ switch (_variable) do {
if (local _vehicle) then { if (local _vehicle) then {
_arraytosend call fnc_veh_handleDam; _arraytosend call fnc_veh_handleDam;
} else { } else {
PVCDZE_vehSH = _arraytosend; PVCDZE_veh_SH = _arraytosend;
_owner publicVariableClient "PVCDZE_vehSH"; _owner publicVariableClient "PVCDZE_veh_SH";
}; };
}; };
@@ -28,8 +28,8 @@ switch (_variable) do {
if (local _vehicle) then { if (local _vehicle) then {
_vehicle setFuel _qty; _vehicle setFuel _qty;
} else { } else {
PVDZE_veh_SFuel = _arraytosend; PVCDZE_veh_SetFuel = _arraytosend;
_owner publicVariableClient "PVDZE_veh_SFuel"; _owner publicVariableClient "PVCDZE_veh_SetFuel";
}; };
}; };
@@ -46,15 +46,14 @@ switch (_variable) do {
}; };
}; };
case "GutBody": { case "GutBody": {
PVCDZ_obj_GutBody = _arraytosend; PVCDZ_obj_GutBody = _arraytosend;
_owner publicVariableClient "PVCDZ_obj_GutBody"; _owner publicVariableClient "PVCDZ_obj_GutBody";
}; };
case "HideBody": { case "HideBody": {
PVDZE_plr_HideBody = _arraytosend select 0; PVCDZE_plr_HideBody = _arraytosend select 0;
_owner publicVariableClient "PVDZE_plr_HideBody"; _owner publicVariableClient "PVCDZE_plr_HideBody";
}; };
case "Humanity": { case "Humanity": {
@@ -72,9 +71,9 @@ switch (_variable) do {
_owner publicVariableClient "usecBleed"; _owner publicVariableClient "usecBleed";
}; };
case "dayzSetDate": { case "PVDZE_plr_SetDate": {
dayzSetDate = dayz_storeTimeDate; PVDZE_plr_SetDate = dayz_storeTimeDate;
_owner publicVariableClient "dayzSetDate"; _owner publicVariableClient "PVDZE_plr_SetDate";
//diag_log ("Time and date: " +str (dayz_storeTimeDate)); //diag_log ("Time and date: " +str (dayz_storeTimeDate));
}; };

4
SQF/dayz_server/system/scheduler/sched_sync.sqf
View File

@@ -16,8 +16,8 @@ sched_sync = {
}; };
setDate _date; setDate _date;
dayzSetDate = _date; PVDZE_plr_SetDate = _date;
publicVariable "dayzSetDate"; publicVariable "PVDZE_plr_SetDate";
diag_log [ __FILE__, "TIME SYNC: Local Time set to:", _date, "Fullmoon:",dayz_ForcefullmoonNights, "Date given by HiveExt.dll:", _result select 1]; diag_log [ __FILE__, "TIME SYNC: Local Time set to:", _date, "Fullmoon:",dayz_ForcefullmoonNights, "Date given by HiveExt.dll:", _result select 1];
}; };

4
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -35,8 +35,8 @@ if(_outcome == "PASS") then {
}; };
diag_log [ "TIME SYNC: Local Time set to:", _date, "Fullmoon:",dayz_ForcefullmoonNights, "Date given by HiveExt.dll:", _result select 1]; diag_log [ "TIME SYNC: Local Time set to:", _date, "Fullmoon:",dayz_ForcefullmoonNights, "Date given by HiveExt.dll:", _result select 1];
setDate _date; setDate _date;
dayzSetDate = _date; PVDZE_plr_SetDate = _date;
publicVariable "dayzSetDate"; publicVariable "PVDZE_plr_SetDate";
}; };
// Custom Configs // Custom Configs