mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-22 20:12:20 +03:00
add 2 new vars and fix up variable names
DZE_HeartBeat DZE_UseBloodTypes
This commit is contained in:
@@ -58,8 +58,8 @@ if ((count _knifeArray > 0) and !_hasHarvested) then {
|
||||
if (local _item) then {
|
||||
[_item,_qty] spawn local_gutObject; //leave as spawn (sleeping in loops will work but can freeze the script)
|
||||
} else {
|
||||
PVDZE_plr_GutBody =[_item,_qty];
|
||||
publicVariable "PVDZE_plr_GutBody";
|
||||
PVCDZE_obj_GutBody =[_item,_qty];
|
||||
publicVariable "PVCDZE_obj_GutBody";
|
||||
|
||||
//achievement system
|
||||
if (!achievement_Gut) then {
|
||||
|
||||
@@ -74,9 +74,9 @@ if (_build) then {
|
||||
*/
|
||||
|
||||
_object setVariable ["characterID",dayz_characterID,true];
|
||||
PVDZ_obj_Publish = [dayz_characterID,_object,[round _direction, _location], _variables];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_object,[round _direction, _location], _variables];
|
||||
publicVariableServer "PVDZE_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"];
|
||||
r_action_count = 0;
|
||||
|
||||
@@ -85,9 +85,11 @@ for "_i" from 1 to 20 do {
|
||||
_cursorTarget = objNull;
|
||||
if (_realObjectStillThere) then { // send to server the destroy request
|
||||
_realObjectStillThere = false;
|
||||
PVDZ_obj_Destroy = [_objectID,_objectUID];
|
||||
publicVariableServer "PVDZ_obj_Destroy";
|
||||
diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZ_obj_Destroy];
|
||||
|
||||
_activatingPlayer = player;
|
||||
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;
|
||||
@@ -153,9 +155,9 @@ if (!_realObjectStillThere) then {
|
||||
_object setVariable ["ownerArray",_ownerArray,true];
|
||||
_variables = [[ "ownerArray", _ownerArray]];
|
||||
_object setVariable ["characterID",_characterID,true];
|
||||
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables];
|
||||
publicVariableServer "PVDZE_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
|
||||
/*
|
||||
//Send maintenance info
|
||||
PVDZ_veh_Save = [_object,"maintenance"];
|
||||
|
||||
@@ -155,11 +155,12 @@ if (_proceed) then {
|
||||
|
||||
titleText [format["Dismantled, (%1).", (typeOf _object)], "PLAIN DOWN"];
|
||||
|
||||
PVDZ_obj_Destroy = [_objectID,_objectUID];
|
||||
publicVariableServer "PVDZ_obj_Destroy";
|
||||
_activatingPlayer = player;
|
||||
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
|
||||
publicVariableServer "PVDZE_obj_Delete";
|
||||
|
||||
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
|
||||
|
||||
@@ -209,9 +209,9 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
|
||||
|
||||
//publish new tent
|
||||
//[[[],[]],[[],[]],[[],[]]]
|
||||
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[[[],[]],_magazines,[[],[]]]];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[[[],[]],_magazines,[[],[]]]];
|
||||
publicVariableServer "PVDZE_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"];
|
||||
_msg = localize "str_upgradeDone";
|
||||
|
||||
@@ -168,11 +168,12 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
|
||||
player playActionNow "Medic";
|
||||
|
||||
//remove old tent
|
||||
PVDZ_obj_Destroy = [_objectID,_objectUID];
|
||||
publicVariableServer "PVDZ_obj_Destroy";
|
||||
_activatingPlayer = player;
|
||||
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
|
||||
publicVariableServer "PVDZE_obj_Delete";
|
||||
|
||||
if (isServer) then {
|
||||
PVDZ_obj_Destroy call server_deleteObj;
|
||||
PVDZE_obj_Delete call server_deleteObj;
|
||||
};
|
||||
deleteVehicle _cursorTarget;
|
||||
|
||||
@@ -227,9 +228,9 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
|
||||
sleep 3;
|
||||
|
||||
//publish new tent
|
||||
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[_weapons,_magazines,_backpacks]];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],[_weapons,_magazines,_backpacks]];
|
||||
publicVariableServer "PVDZE_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"];
|
||||
_msg = localize "str_upgradeDone";
|
||||
|
||||
@@ -144,8 +144,9 @@ _object setVariable ["characterID",_characterID,true];
|
||||
|
||||
//remove old object
|
||||
deleteVehicle _cursorTarget;
|
||||
PVDZ_obj_Destroy = [_objectID,_objectUID];
|
||||
publicVariableServer "PVDZ_obj_Destroy";
|
||||
_activatingPlayer = player;
|
||||
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
|
||||
publicVariableServer "PVDZE_obj_Delete";
|
||||
|
||||
// create a weaponholder with dismissed parts
|
||||
_wh = "WeaponHolder" createVehicle (getPosATL player);
|
||||
@@ -157,9 +158,9 @@ _wh = "WeaponHolder" createVehicle (getPosATL player);
|
||||
|
||||
//publish new object
|
||||
_variables = [["ownerArray", _ownerArray],["padlockCombination", _ownerPasscode]];
|
||||
PVDZ_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_object,[_dir, _pos],_variables];
|
||||
publicVariableServer "PVDZE_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
|
||||
/*
|
||||
//Send maintenance info
|
||||
PVDZ_veh_Save = [_object,"maintenance"];
|
||||
|
||||
@@ -102,8 +102,8 @@ if (_infectionChance != 0 && {abs(_infectionChance) > random 1}) then
|
||||
|
||||
//Publish messing
|
||||
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
|
||||
publicVariableServer "PVDZ_serverStoreVar";
|
||||
PVDZE_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]]; //update server side only
|
||||
publicVariableServer "PVDZE_serverStoreVar";
|
||||
|
||||
//Play sound and alert zombies
|
||||
if (_sound != "") then
|
||||
|
||||
@@ -62,9 +62,9 @@ if ((count _worldspace) == 2) then {
|
||||
|
||||
_stash setVariable ["characterID",dayz_characterID,true];
|
||||
|
||||
PVDZ_obj_Publish = [dayz_characterID,_stash,[_dir,_location],[]];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_stash,[_dir,_location],[]];
|
||||
publicVariableServer "PVDZE_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;
|
||||
cutText [format [localize "str_success_stash_pitch",_stashname], "PLAIN DOWN"];
|
||||
|
||||
@@ -82,14 +82,15 @@ _sfx = "tentpack";
|
||||
// Added Nutrition-Factor for work
|
||||
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
|
||||
|
||||
sleep 3;
|
||||
uisleep 3;
|
||||
|
||||
PVDZ_obj_Destroy = [_objectID,_objectUID];
|
||||
publicVariableServer "PVDZ_obj_Destroy";
|
||||
_activatingPlayer = player;
|
||||
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
|
||||
publicVariableServer "PVDZE_obj_Delete";
|
||||
|
||||
//Send killed for object
|
||||
if (isServer) then {
|
||||
PVDZ_obj_Destroy call server_deleteObj;
|
||||
PVDZE_obj_Delete call server_deleteObj;
|
||||
} else {
|
||||
PVDZ_veh_Save = [_obj, "killed"];
|
||||
publicVariableServer "PVDZ_veh_Save";
|
||||
|
||||
@@ -29,9 +29,9 @@ _object setDir (getDir player);
|
||||
|
||||
_object setVariable ["armed", false, true];
|
||||
|
||||
PVDZ_obj_Publish = [dayz_characterID,_object,[getDir _object, getPosATL _object],[["armed", _object getVariable "armed"]]];
|
||||
publicVariableServer "PVDZ_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZ_obj_Publish:", PVDZ_obj_Publish];
|
||||
PVDZE_obj_Publish = [dayz_characterID,_object,[getDir _object, getPosATL _object],[["armed", _object getVariable "armed"]]];
|
||||
publicVariableServer "PVDZE_obj_Publish";
|
||||
diag_log [diag_ticktime, __FILE__, "New Networked object, request to save to hive. PVDZE_obj_Publish:", PVDZE_obj_Publish];
|
||||
|
||||
player reveal _object;
|
||||
|
||||
|
||||
@@ -47,8 +47,8 @@ while {r_doLoop} do {
|
||||
r_player_infected = false;
|
||||
player setVariable["USEC_infected",false,false];
|
||||
|
||||
PVDZ_serverStoreVar = [player,"USEC_infected",false];
|
||||
publicVariableServer "PVDZ_serverStoreVar";
|
||||
PVDZE_serverStoreVar = [player,"USEC_infected",false];
|
||||
publicVariableServer "PVDZE_serverStoreVar";
|
||||
} else {
|
||||
_infectedStatus = if (r_player_infected) then { "Infected" } else { "Cured" };
|
||||
_cureAttempt = _cureAttempt + 0.01;
|
||||
|
||||
@@ -175,7 +175,8 @@ if (_proceed) then {
|
||||
deleteVehicle _obj;
|
||||
|
||||
if(!_isWreck) then {
|
||||
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
|
||||
_activatingPlayer = player;
|
||||
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
|
||||
publicVariableServer "PVDZE_obj_Delete";
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user