Update public variables

It makes no sense to rename the identical DayZ PVs to have an E in their
name. I don't see any good reason it was done in the first place. All it
accomplishes is breaking script compatibility between the two mods and
requiring different publicvariable.txt filters. The only time it makes
sense is for custom Epoch variables that aren't used in vanilla.

All admins have to do to update custom scripts is swap the names
according to the change log.

Note I've submitted a pull request to replace PVDZ_veh_Save with
PVDZ_obj_Save in official too because they are duplicates.
This commit is contained in:
ebaydayz
2016-03-18 21:39:22 -04:00
parent 6a6db58291
commit 4bd9a9aa0b
95 changed files with 420 additions and 491 deletions

View File

@@ -1,14 +1,48 @@
[NEW] Fully updated to DayZ 1.8.7 code base @icomrade @ebaydayz
- Blood types system is disabled by default. Set DZE_UseBloodTypes = true; in init.sqf to enable
- New loot table format is incompatible with old loot tables. See CfgLoot\README
- ItemFish, Shotgun ammo and several other item classnames changed. See SQL\1.0.6_Updates
- Mission.sqm and description.ext now use compact format
- Keyboard eventhandler updated, dayz_spaceInterupt is no longer used
- Optional news/rules feed on player login, set dayz_enableRules in init.sqf
- Weapon switch hotkeys added (1 = primary, 2 = pistol, 3 = melee)
- Journal is now functional for displaying stats
- vehicle_handleDamage and vehicle_handleKilled have been renamed to fnc_veh_handleDam and fnc_veh_handleKilled respectively
- ItemFish, Shotgun ammo and several other item classnames changed. See SQL\1.0.6_Updates
- Dupicate functions have been renamed:
- object_setFixServer --> fnc_veh_handleRepair
- vehicle_handleDamage --> fnc_veh_handleDam
- vehicle_handleKilled --> fnc_veh_handleKilled
- Duplicate public variables have been renamed:
- dayzPlayerLogin --> PVCDZ_plr_Login/PVCDZ_plr_PlayerAccepted
- dayzPlayerLogin2 --> PVCDZ_plr_Login2
- norrnRaDrag --> PVDZ_drg_RaDrag
- norrnRaLW --> PVDZ_drg_RaLW
- norrnRLact --> PVDZ_drg_RLact
- PVCDZE_vehSH --> PVCDZ_veh_SH
- PVDZE_obj_Delete --> PVDZ_obj_Destroy (PVDZ_obj_Delete is used for plants and blood trails)
- PVDZE_obj_Fire --> PVDZ_obj_Fire
- PVDZE_obj_Publish --> PVDZ_obj_Publish
- PVDZE_plr_Died --> PVDZ_plr_Death
- PVDZE_plr_GutBody --> PVCDZ_obj_GutBody
- PVDZE_plr_HideBody --> PVCDZ_obj_HideBody
- PVDZE_plr_HumanityChange --> PVCDZ_plr_Humanity
- PVDZE_plr_Login --> PVDZ_plr_Login1
- PVDZE_plr_Login2 --> PVDZ_plr_Login2
- PVDZE_plr_LoginRecord --> PVDZ_plr_LoginRecord
- PVDZE_plr_Save --> PVDZ_plr_Save
- PVDZE_plr_SetDate --> dayzSetDate
- PVDZE_send --> PVDZ_send
- PVDZE_Server_Simulation --> PVDZ_Server_Simulation
- PVDZE_serverStoreVar --> PVDZ_serverStoreVar
- PVDZE_veh_SFix --> PVDZ_veh_SF
- PVDZE_veh_SFuel --> PVCDZ_veh_SetFuel
- PVDZE_veh_Update --> PVDZ_obj_Save
- usecBandage --> PVCDZ_hlt_Bandage
- usecBreakLegs --> PVCDZ_plr_Legs
- usecEpi --> PVCDZ_hlt_Epi
- usecMorphine --> PVCDZ_hlt_Morphine
- usecPainK --> PVCDZ_hlt_PainK
- usecTransfuse --> PVCDZ_hlt_Transfuse
[NEW] RedRyder BB Gun by @arma2WillRobinson
[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
[NEW] DB Backup script. @RimBlock

View File

@@ -22,28 +22,13 @@ REMOVE TOOL BREAKING, IT'S STUPID
player_craftItem_DZV = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItem.sqf";
dayz_serverObjectMonitor = []; IS REPLACED WITH PVDZE_serverObjectMonitor = [];
PVDZ_obj_Publish IS PVDZE_obj_Publish
******REPLACE ALL PVCDZ_ AND PVDZ_ with PVCDZE/PVDZE_
trap_monitor.fsm is no more!
dayzPlayerLogin VARIABLE IS NO MORE!
dayzPlayerLogin2 = []; VARIABLE IS NO MORE! USE PVCDZ_plr_Login2
dayz_authed VARIABLE IS NO MORE???
dayz_gui = [] spawn { IS NO MORE????
PVDZ_drg_RaLW IS norrnRaLW
PVDZ_drg_RLact IS norrnRLact
NEW FNC PVDZE_hlt_Bleed -- THATS AN L change it to an I
PVCDZE_vehSH needs to be changed to PVCDZE_veh_SH
PVDZE_plr_HideBody BECOMES PVCDZE_plr_HideBody
PVDZE_obj_GutBody BECOMES PVCDZE_obj_GutBody
PVDZE_veh_SFuel BECOMES PVCDZE_veh_SetFuel
PVDZ_plr_Death BECOMES PVDZE_plr_Died
PVDZ_plr_Login1 BECOMES PVDZE_plr_Login
PVDZ_obj_Destroy BECOMES PVDZE_obj_Delete //WHO RENAMED THESE VARIABLES IN DAYZ VANILLA, THE COMPILE IT CALLS IS STILL NAMED server_deleteObj WHY CHANGE IT TO DESTROY!!!!???
dayzSetDate BECOMES PVDZE_plr_SetDate
PVDZ_serverStoreVar BECOMES PVDZE_serverStoreVar
player getVariable ["OpenTarget",false]; CHANGE TO
player getVariable ["freeTarget",false];
@@ -54,7 +39,6 @@ SELF ACTIONS VARIABLES
////////////////////////////////////////
s_player_boil = -1; is now a_player_boil = true;
a_player_cooking = true; -- NEW, old -1 var is still used???
PVCDZ_obj_GutBody IS NOW PVDZE_plr_GutBody
MAKE SURE "ItemFuelBarrel" is in refuel can list
////////SERVER STUFF///////

View File

@@ -107,8 +107,8 @@ if(_IsNearVehicle >= 1) then {
[_vehicleSrc,_newFuelSrc] call local_setFuel;
} else {
/* PVS/PVC - Skaronator */
PVDZE_send = [_vehicle,"SFuel",[_vehicleSrc,_newFuelSrc]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_vehicle,"SetFuel",[_vehicleSrc,_newFuelSrc]];
publicVariableServer "PVDZ_send";
};
} else {
_isFillok = false;
@@ -131,8 +131,8 @@ if(_IsNearVehicle >= 1) then {
[_vehicle,_newFuel] call local_setFuel;
} else {
/* PVS/PVC - Skaronator */
PVDZE_send = [_vehicle,"SFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZ_send";
};
// Play sound

View File

@@ -1,2 +1,2 @@
PVDZE_veh_Update = [_this select 3,"all"];
publicVariableServer "PVDZE_veh_Update";
PVDZ_obj_Save = [_this select 3,"all"];
publicVariableServer "PVDZ_obj_Save";

View File

@@ -576,8 +576,8 @@ if (_hasrequireditem) then {
_tmpbuilt setVariable ["CharacterID",_combination,true]; //set combination as a character ID
//call publish precompiled function with given args and send public variable to server to save item to database
PVDZE_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZE_obj_Publish";
PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZ_obj_Publish";
cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5]; //display new combination
systemChat format [(localize "str_epoch_player_140"),_combinationDisplay,_text];
@@ -589,8 +589,8 @@ if (_hasrequireditem) then {
if(_tmpbuilt isKindOf "Land_Fire_DZ") then { //if campfire, then spawn, but do not publish to database
_tmpbuilt spawn player_fireMonitor;
} else {
PVDZE_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZE_obj_Publish";
PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZ_obj_Publish";
};
};
} else { //if magazine was not removed, cancel publish

View File

@@ -74,9 +74,9 @@ if (_build) then {
*/
_object setVariable ["characterID",dayz_characterID,true];
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];
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];
cutText [format [localize "str_build_01",_text], "PLAIN DOWN"];
r_action_count = 0;

View File

@@ -87,9 +87,9 @@ for "_i" from 1 to 20 do {
_realObjectStillThere = false;
_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];
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
diag_log [diag_ticktime, __FILE__, "Networked object, request to destroy", PVDZ_obj_Destroy];
};
["Working",0,[20,40,15,0]] call dayz_NutritionSystem;
@@ -155,9 +155,9 @@ if (!_realObjectStillThere) then {
_object setVariable ["ownerArray",_ownerArray,true];
_variables = [[ "ownerArray", _ownerArray]];
_object setVariable ["characterID",_characterID,true];
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];
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];
/*
//Send maintenance info
PVDZ_veh_Save = [_object,"maintenance"];

View File

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

View File

@@ -209,9 +209,9 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
//publish new tent
//[[[],[]],[[],[]],[[],[]]]
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];
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];
//cutText [localize "str_upgradeDone", "PLAIN DOWN"];
_msg = localize "str_upgradeDone";

View File

@@ -169,11 +169,11 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
//remove old tent
_activatingPlayer = player;
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
if (isServer) then {
PVDZE_obj_Delete call server_deleteObj;
PVDZ_obj_Destroy call server_deleteObj;
};
deleteVehicle _cursorTarget;
@@ -228,9 +228,9 @@ if ((_startUpgrade) AND (isClass(_upgradeConfig))) then {
uiSleep 3;
//publish new tent
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];
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];
//cutText [localize "str_upgradeDone", "PLAIN DOWN"];
_msg = localize "str_upgradeDone";

View File

@@ -145,8 +145,8 @@ _object setVariable ["characterID",_characterID,true];
//remove old object
deleteVehicle _cursorTarget;
_activatingPlayer = player;
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
// create a weaponholder with dismissed parts
_wh = "WeaponHolder" createVehicle (getPosATL player);
@@ -158,9 +158,9 @@ _wh = "WeaponHolder" createVehicle (getPosATL player);
//publish new object
_variables = [["ownerArray", _ownerArray],["padlockCombination", _ownerPasscode]];
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];
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];
/*
//Send maintenance info
PVDZ_veh_Save = [_object,"maintenance"];

View File

@@ -522,8 +522,8 @@ if (_hasrequireditem) then {
_tmpbuilt setVariable ["CharacterID",_combination,true];
PVDZE_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZE_obj_Publish";
PVDZ_obj_Publish = [_combination,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZ_obj_Publish";
cutText [format[(localize "str_epoch_player_140"),_combinationDisplay,_text], "PLAIN DOWN", 5];
systemChat format [(localize "str_epoch_player_140"),_combinationDisplay,_text];
@@ -535,8 +535,8 @@ if (_hasrequireditem) then {
if(_tmpbuilt isKindOf "Land_Fire_DZ") then {
_tmpbuilt spawn player_fireMonitor;
} else {
PVDZE_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZE_obj_Publish";
PVDZ_obj_Publish = [dayz_characterID,_tmpbuilt,[_dir,_location],_classname];
publicVariableServer "PVDZ_obj_Publish";
};
};
} else {

View File

@@ -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
PVDZE_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]]; //update server side only
publicVariableServer "PVDZE_serverStoreVar";
PVDZ_serverStoreVar = [player,"messing",[dayz_hunger,dayz_thirst,dayz_nutrition]]; //update server side only
publicVariableServer "PVDZ_serverStoreVar";
//Play sound and alert zombies
if (_sound != "") then

View File

@@ -62,9 +62,9 @@ if ((count _worldspace) == 2) then {
_stash setVariable ["characterID",dayz_characterID,true];
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];
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];
r_action_count = 0;
cutText [format [localize "str_success_stash_pitch",_stashname], "PLAIN DOWN"];

View File

@@ -85,12 +85,12 @@ _sfx = "tentpack";
uisleep 3;
_activatingPlayer = player;
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
//Send killed for object
if (isServer) then {
PVDZE_obj_Delete call server_deleteObj;
PVDZ_obj_Destroy call server_deleteObj;
} else {
PVDZ_veh_Save = [_obj, "killed"];
publicVariableServer "PVDZ_veh_Save";

View File

@@ -29,9 +29,9 @@ _object setDir (getDir player);
_object setVariable ["armed", false, true];
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];
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];
player reveal _object;

View File

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

View File

@@ -17,7 +17,7 @@ if ((_callerID != "0") && (_targetID != "0")) then {
if !(_callerID in _rfriendlies) then {
titleText [(localize "STR_EPOCH_ACTIONS_8"), "PLAIN DOWN"]; //To Caller
/* PVS/PVC - Skaronator */
PVDZE_send = [_target,"tagFriendly",[_target]]; //To Target
publicVariableServer "PVDZE_send";
PVDZ_send = [_target,"tagFriendly",[_target]]; //To Target
publicVariableServer "PVDZ_send";
};
};

View File

@@ -14,8 +14,8 @@ if (!isNull cursorTarget) then {
_ent setDamage 1;
} else {
/* PVS/PVC - Skaronator */
PVDZE_send = [_ent,"PZ_BreakLegs",[_ent,player]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_ent,"PZ_BreakLegs",[_ent,player]];
publicVariableServer "PVDZ_send";
};
[player,"hit",0,false] call dayz_zombieSpeak;

View File

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

View File

@@ -65,8 +65,8 @@ if (!_fueling) then {
if (local _vehicle) then {
[_vehicle,_newFuel] call local_setFuel;
} else {
PVDZE_send = [_vehicle,"SFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZ_send";
};
cutText [format [localize "str_player_05",_nameType,_canSize], "PLAIN DOWN"];

View File

@@ -176,8 +176,8 @@ if (_proceed) then {
if(!_isWreck) then {
_activatingPlayer = player;
PVDZE_obj_Delete = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID, _activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
};
cutText [format[(localize "str_epoch_player_165"),_nameVehicle], "PLAIN DOWN"];

View File

@@ -115,8 +115,8 @@ if (_isMan or _isAnimal or _isZombie) exitWith { cutText [localize "str_siphon_n
if (local _vehicle) then {
[_vehicle,_newFuel] call local_setFuel;
} else {
PVDZE_send = [_vehicle,"SFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]];
publicVariableServer "PVDZ_send";
};
// Play sound

View File

@@ -206,8 +206,8 @@ if (_finished) then {
//if(_objectID != "0" && _objectUID != "0") then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -164,8 +164,8 @@ if (_qty >= _qty_in) then {
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -195,8 +195,8 @@ if (_finished) then {
if(local _obj && !isNull _obj && alive _obj && !_notSetup) then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -161,8 +161,8 @@ if (_qty >= _qty_in) then {
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -226,8 +226,8 @@ if (_finished) then {
//if(_objectID != "0" && _objectUID != "0") then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -204,8 +204,8 @@ if (_finished) then {
//if(_objectID != "0" && _objectUID != "0") then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -190,8 +190,8 @@ if (_qty >= _qty_in) then {
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
deleteVehicle _obj;

View File

@@ -159,9 +159,9 @@ if(!_cancel) then {
_tent setVariable ["CharacterID",_combination,true];
_tent setVariable ["OEMPos",_location,true];
//["PVDZE_obj_Publish",[_combination,_tent,[_dir,_location],"VaultStorageLocked"]] call callRpcProcedure;
PVDZE_obj_Publish = [_combination,_tent,[_dir,_location],"VaultStorageLocked"];
publicVariableServer "PVDZE_obj_Publish";
//["PVDZ_obj_Publish",[_combination,_tent,[_dir,_location],"VaultStorageLocked"]] call callRpcProcedure;
PVDZ_obj_Publish = [_combination,_tent,[_dir,_location],"VaultStorageLocked"];
publicVariableServer "PVDZ_obj_Publish";
cutText [format[(localize "str_epoch_player_179"),_combination], "PLAIN DOWN", 5];
};

View File

@@ -31,8 +31,8 @@ if (local _animalbody) then {
{
// only send to other players
if(isPlayer _x && _x != player) then {
PVDZE_send = [_x,"HideBody",[_body]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_x,"HideBody",[_body]];
publicVariableServer "PVDZ_send";
};
} count _inRange;

View File

@@ -20,8 +20,8 @@ if (local _zombiebody) then {
_inRange = _pos nearEntities ["CAManBase",100];
{
if(isPlayer _x && _x != player) then {
PVDZE_send = [_x,"HideBody",[_body]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_x,"HideBody",[_body]];
publicVariableServer "PVDZ_send";
};
} count _inRange;

View File

@@ -1,26 +0,0 @@
private ["_unit","_selection","_strH","_damage"];
_unit = _this select 0;
_selection = _this select 1;
_damage = _this select 2;
if (_selection != "" && local _unit) then {
_strH = "hit_" + (_selection);
_unit setHit[_selection,_damage];
//player sidechat str _damage;
_unit setVariable [_strH,_damage,true];
if (_damage == 0) then {
if (isServer) then {
[_unit,"repair"] call server_updateObject;
} else {
PVDZE_veh_Update = [_unit,"repair"];
publicVariableServer "PVDZE_veh_Update";
};
} else {
if (isServer) then {
[_unit,"damage"] call server_updateObject;
} else {
PVDZE_veh_Update = [_unit,"damage"];
publicVariableServer "PVDZE_veh_Update";
};
};
};

View File

@@ -1,23 +0,0 @@
private["_unit","_selection","_damage","_strH","_dam","_total"];
_unit = _this select 0;
_selection = _this select 1;
_damage = _this select 2;
if ((_selection != "") && local _unit) then {
_strH = "hit_" + (_selection);
_dam = _unit getVariable [_strH,0];
_total = (_dam + _damage);
if (_total > 1) then {
_total = 1;
};
_unit setVariable [_strH,_total,true];
if (_damage >= 1) then {
//["PVDZE_veh_Update",[_unit,"damage"]] call callRpcProcedure;
PVDZE_veh_Update = [_unit,"damage"];
publicVariableServer "PVDZE_veh_Update";
};
} else {
_damage = 0;
};
_damage

View File

@@ -35,11 +35,13 @@ if ((count _list) < dayz_maxAnimals) then {
if (((player distance _Pos) < dayz_animalDistance) && {!(surfaceIsWater _Pos)} && {(count _list) <= 1}) then {
if (_type == "DZ_Pastor") then { _agent = createAgent [_type, _Pos, [], 0, "NONE"]; } else { _agent = createAgent [_type, _Pos, [], 0, "FORM"]; };
uiSleep 0.001;
//Disable simulation
PVDZ_Server_Simulation = [_agent, false];
publicVariableServer "PVDZ_Server_Simulation";
_agent setPos _Pos;
_id = [_pos,_agent] execFSM "\z\addons\dayz_code\system\animal_agent.fsm";
PVDZE_zed_Spawn = [_agent];
publicVariableServer "PVDZE_zed_Spawn";
};
uiSleep 1;
};

View File

@@ -32,8 +32,10 @@ _infected = 0;
if (r_player_infected && DZE_PlayerZed) then {
_infected = 1;
};
PVDZE_plr_Died = [dayz_characterID,0,_body,_playerID,_infected, dayz_playerName];
publicVariableServer "PVDZE_plr_Died";
//Send Death Notice
//["PVDZ_plr_Death",[dayz_characterID,0,_body,_playerID,dayz_playerName]] call callRpcProcedure;
PVDZ_plr_Death = [dayz_characterID,0,_body,_playerID,_infected,dayz_playerName];
publicVariableServer "PVDZ_plr_Death";
_id = [player,20,true,getPosATL player] call player_alertZombies;
@@ -68,8 +70,8 @@ if (count _array > 0) then {
_humanityHit = -(2000 - _myKills);
_kills = _source getVariable ["humanKills",0];
_source setVariable ["humanKills",(_kills + 1),true];
PVDZE_send = [_source,"Humanity",[_source,_humanityHit,300]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_source,"Humanity",[_source,_humanityHit,300]];
publicVariableServer "PVDZ_send";
} else {
//i'm "guilty" - kill me as bandit
_killsV = _source getVariable ["banditKills",0];
@@ -154,7 +156,7 @@ for "_x" from 5 to 1 step -1 do {
uiSleep 1;
};
PVDZE_Server_Simulation = [_body, false];
publicVariableServer "PVDZE_Server_Simulation";
PVDZ_Server_Simulation = [_body, false];
publicVariableServer "PVDZ_Server_Simulation";
endMission "END1";

View File

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

View File

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

View File

@@ -66,8 +66,8 @@ if(!isNull _obj && alive _obj) then {
_backpacks = getBackpackCargo _obj;
// Remove from database
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
PVDZ_obj_Destroy = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZ_obj_Destroy";
// Set down vault "take" item
_bag = createVehicle [_packedClass,_pos,[], 0, "CAN_COLLIDE"];

View File

@@ -6,7 +6,7 @@
/***********************************************************
ASSIGN DAMAGE TO A UNIT.
Called by "HandleDamage" vehicle Event Handler
or by "PVCDZE_veh_SH" PV
or by "PVCDZ_veh_SH" PV
or by zombie_attack
- Function fnc_veh_handleDam
@@ -37,8 +37,8 @@ if (local _unit) then {
_unit setHit [_selection, _total];
if (!isServer) then {
PVDZE_veh_Update = [_unit,"damage"];
publicVariableServer "PVDZE_veh_Update";
PVDZ_obj_Save = [_unit,"damage"];
publicVariableServer "PVDZ_obj_Save";
} else {
[_unit, "damage"] call server_updateObject;
};
@@ -47,8 +47,8 @@ if (local _unit) then {
//if ( (count _this > 5) AND {(_this select 5)}) then {
// vehicle is not local to this client, ask the client which vehicle is local to set damage
//_this resize 5; // delete "broadcast" boolean
PVDZE_send = [_unit,"VehHandleDam",_this];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"VehHandleDam",_this];
publicVariableServer "PVDZ_send";
//};
};

View File

@@ -14,11 +14,11 @@ if (isServer) then {
[_unit, "killed"] call server_updateObject;
} else {
if (DZE_Debug_Damage && ((!isPlayer _unit) || ((isPlayer _unit) && (vehicle _unit != _unit) && (_unit != _killer)))) then {
PVDZE_veh_Update = [_unit, "killed",_killer];
PVDZ_obj_Save = [_unit, "killed",_killer];
} else {
PVDZE_veh_Update = [_unit, "killed"];
PVDZ_obj_Save = [_unit, "killed"];
};
publicVariableServer "PVDZE_veh_Update";
publicVariableServer "PVDZ_obj_Save";
};
// everyone removes their EH for this vehicle

View File

@@ -13,17 +13,19 @@ or by action/repair.sqf
- return : 0 :)
broadcast: boolean. if true, then the request will be sent to all players if the vehicle is not local.
************************************************************/
private ["_hitpointnames","_log"];
private ["_hitpointnames","_log","_damage","_action"];
_unit = _this select 0;
_selection = _this select 1;
_damage = _this select 2;
_action = if (_damage == 0) then {"repair"} else {"damage"};
_hitpointnames = [];
{
_hitpointnames set [count _hitpointnames, getText (configFile >> "CfgVehicles" >> (typeOf _unit) >> "HitPoints" >> _x >> "name")];
} forEach (_unit call vehicle_getHitpoints);
if ((isNil "_selection") OR {(!(_selection IN _hitpointnames))}) exitWith {_this select 2};
if ((isNil "_selection") OR {(!(_selection in _hitpointnames))}) exitWith {_this select 2};
_SVname = "hit_" + _selection;
@@ -33,21 +35,20 @@ _selection, _unit getVariable [_SVname, 0] ];
if (local _unit) then {
// only local unit can set the damage of a vehicle part
_unit setVariable [_SVname, 0, true];
_unit setHit [_selection, 0];
_unit setVariable [_SVname, _damage, true];
_unit setHit [_selection, _damage];
_log = format["%1. setH!t[%2,0]", _log, _selection];
if (!isServer) then {
PVDZ_veh_Save = [_unit, "repair"];
publicVariableServer "PVDZ_veh_Save";
PVDZ_obj_Save = [_unit, _action];
publicVariableServer "PVDZ_obj_Save";
_log = _log + ". Requesting server hive write";
}
else {
[_unit, "repair"] call server_updateObject;
} else {
[_unit, _action] call server_updateObject;
_log = _log + ". Writing to hive";
};
}
else {
if ( (count _this > 3) AND {(_this select 3)}) then {
} else {
if ((count _this > 3) && {(_this select 3)}) then {
// vehicle is not local to this client, ask the client which vehicle is local to set damage
_this resize 3; // delete "broadcast" boolean
_log = _log + ". Broadcasting to all";

View File

@@ -56,12 +56,11 @@ if (!isDedicated) then {
player_forceSave = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_forceSave.sqf";
//player_destroyTent = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_destroyTent.sqf";
player_Bubble = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_Bubble.sqf";
vehicle_getOut = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_getOut.sqf";
//Objects
fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";
object_setpitchbank = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_setpitchbank.sqf";
object_monitorGear = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_monitorGear.sqf";
object_dismantle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_dismantle.sqf";
vehicle_getOut = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_getOut.sqf";
//Zombies
zombie_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf";
@@ -92,6 +91,7 @@ if (!isDedicated) then {
} else {
player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_build.sqf";
};
fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";
object_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_build.sqf";
object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf";
player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf";
@@ -177,6 +177,7 @@ if (!isDedicated) then {
player_checkAndRemoveItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_checkAndRemoveItems.sqf";
pz_attack = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\pzombie\pz_attack.sqf";
wild_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\wild_spawnZombies.sqf"; //Server compile, used for loiter behaviour
dayz_losChance = {
private["_agent","_maxDis","_dis","_val","_maxExp","_myExp"];
_agent = _this select 0;
@@ -567,8 +568,6 @@ object_getHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\o
object_setHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setHit.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles)
object_processHit = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_processHit.sqf"; //process the hit in the REVO damage system (records and sets hit)
//object_cargoCheck = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_cargoCheck.sqf"; //Run by the player or server to monitor changes in cargo contents
object_setHitServer = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setHitServer.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles)
object_setFixServer = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_setFixServer.sqf"; //process the hit as a NORMAL damage (useful for persistent vehicles)
fnc_usec_damageHandler = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_damageHandler.sqf"; //Event handler run on damage
// Vehicle damage fix
fnc_veh_handleDam = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\veh_handleDam.sqf";

View File

@@ -1,11 +1,9 @@
private ["_holder","_type","_classname","_name","_actionSet"];
if (player isKindOf "PZombie_VB") exitWith {};
_holder = _this select 0;
_type = _this select 1;
_classname = _this select 2;
_name = getText (configFile >> _type >> _classname >> "displayName");
// Exit if player zombie
if(player isKindOf "PZombie_VB") exitWith {};
_name = getText (configFile >> _type >> _classname >> "displayName");
if ((!isNil "_holder") and {(!isNull _holder)}) then {
_actionSet = _holder getVariable["actionSet", false];

View File

@@ -1,16 +1,19 @@
private["_holder","_type","_classname","_name"];
if (player isKindOf "PZombie_VB") exitWith {};
/*
Created exclusively for ArmA2:OA - DayZMod.
Please request permission to use/alter from R4Z0R49.
*/
//private["_holder","_type","_classname","_name"];
_holder = _this select 0;
_type = _this select 1;
_classname = _this select 2;
_name = getText (configFile >> _type >> _classname >> "displayName");
// Exit if player zombie
if(player isKindOf "PZombie_VB") exitWith {};
pickupInit = true;
actionMonitor = {
private ["_holder","_type","_classname","_name","_action","_distance","_run","_timeout","_null"];
private["_action","_run","_timeout"];
_holder = _this select 0;
_type = _this select 1;
_classname = _this select 2;
@@ -21,6 +24,8 @@ actionMonitor = {
_run = true;
_timeout = 2;
//diag_log format["Holder: %1, Type: %2 Classname: %3, Name: %4",_holder, _type, _classname, _name];
while { _run } do {
if (alive _holder) then {
_distance = player distance _holder;
@@ -37,7 +42,7 @@ actionMonitor = {
_action = -1;
_timeout = 2;
};
// Stop the loop && fall back to old code
// Stop the loop and fall back to old code
if (_distance > 100) then {
null = _holder addAction [format[(localize "str_init_take"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
player reveal _holder;

View File

@@ -1,81 +1,56 @@
//Medical Event Handlers
"norrnRaLW" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\load_wounded.sqf"};
"norrnRLact" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\load\load_wounded.sqf"};
"norrnRDead" addPublicVariableEventHandler {[_this select 1] execVM "\z\addons\dayz_code\medical\publicEH\deadState.sqf"};
//"usecBleed" addPublicVariableEventHandler {_id = (_this select 1) spawn fnc_usec_damageBleed};
//"usecBandage" addPublicVariableEventHandler {(_this select 1) call player_medBandage};
"usecInject" addPublicVariableEventHandler {(_this select 1) call player_medInject};
//"usecEpi" addPublicVariableEventHandler {(_this select 1) call player_medEpi};
//"usecTransfuse" addPublicVariableEventHandler {(_this select 1) call player_medTransfuse};
//"usecMorphine" addPublicVariableEventHandler {(_this select 1) call player_medMorphine};
//"usecPainK" addPublicVariableEventHandler {(_this select 1) call player_medPainkiller};
"PVDZE_plr_Hit" addPublicVariableEventHandler {(_this select 1) call fnc_usec_damageHandler};
//"usecBreakLegs" addPublicVariableEventHandler {(_this select 1) call player_breaklegs};
// Both client and server
"PVDZ_drg_RaLW" addPublicVariableEventHandler {[_this select 1] execVM "\z\addons\dayz_code\medical\publicEH\load_wounded.sqf"};
"PVDZ_drg_RLact" addPublicVariableEventHandler {[_this select 1] execVM "\z\addons\dayz_code\medical\load\load_wounded.sqf"};
"PVDZ_hlt_Bleed" addPublicVariableEventHandler {(_this select 1) spawn fnc_usec_damageBleed};
"PVCDZ_veh_SH" addPublicVariableEventHandler {(_this select 1) call fnc_veh_handleDam}; // set damage to vehicle part
"PVDZ_veh_SF" addPublicVariableEventHandler {(_this select 1) call fnc_veh_handleRepair}; // repair a part from a vehicle
"PVCDZ_obj_HideBody" addPublicVariableEventHandler {hideBody (_this select 1)};
"PVCDZ_obj_GutBody" addPublicVariableEventHandler {(_this select 1) spawn local_gutObject};
"PVCDZ_veh_SetFuel" addPublicVariableEventHandler {(_this select 1) spawn local_setFuel};
"PVCDZ_veh_engineSwitch" addPublicVariableEventHandler {(_this select 1) spawn dayz_engineSwitch};
"PVCDZ_OpenTarget_Reset" addPublicVariableEventHandler { OpenTarget_Time = diag_tickTime; }; //reset OpenTarget timer
//"dayzInfectedCamps" addPublicVariableEventHandler {(_this select 1) call infectedcamps};
//Both
"PVCDZE_veh_SetFuel" addPublicVariableEventHandler {(_this select 1) spawn local_setFuel};
"PVDZE_veh_SFix" addPublicVariableEventHandler {(_this select 1) call object_setFixServer};
"PVCDZE_plr_HideBody" addPublicVariableEventHandler {hideBody (_this select 1)};
"PVDZE_obj_Hide" addPublicVariableEventHandler {hideObject (_this select 1)};
// EPOCH ADDITIONS
"PVDZE_veh_Lock" addPublicVariableEventHandler {(_this select 1) spawn local_lockUnlock};
"PVCDZE_obj_GutBody" addPublicVariableEventHandler {(_this select 1) spawn local_gutObject};
"PVDZE_plr_GutBodyZ" addPublicVariableEventHandler {(_this select 1) spawn local_gutObjectZ};
"PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH};
//"PVDZE_plr_HumanityChange" addPublicVariableEventHandler {(_this select 1) spawn player_humanityChange};
"PVDZE_serverObjectMonitor" addPublicVariableEventHandler {PVDZE_serverObjectMonitor = dayz_safety};
/* PVS/PVC - Skaronator */
"PVCDZE_veh_SH" addPublicVariableEventHandler {(_this select 1) call fnc_veh_handleDam}; // set damage to vehicle part
//reset OpenTarget timer
"PVCDZE_OpenTarget_Reset" addPublicVariableEventHandler { OpenTarget_Time = diag_tickTime; };
"PVCDZE_veh_engineSwitch" addPublicVariableEventHandler {(_this select 1) spawn dayz_engineSwitch};
"PVDZE_Server_Simulation" addPublicVariableEventHandler {
_agent = ((_this select 1) select 0);
_control = ((_this select 1) select 1);
_agent enableSimulation _control;
};
{
private ["_building", "_fckingcode"];
private ["_building","_fckingcode"];
_fckingcode = {
private [ "_building", "_part", "_dmgLvl", "_who", "_ammo", "_dist" ];
private ["_building","_part","_dmgLvl","_who","_ammo","_dist"];
_building = _this select 0;
_part = _this select 1;
_dmgLvl = 1 min (_this select 2);
_who = _this select 3;
_ammo = _this select 4;
if (_part != 'glass' AND _dmgLvl > 0.01) then {
if (_part != 'glass' && _dmgLvl > 0.01) then {
if (isServer) then {
diag_log ['Log building damage', _this];
}
else {
} else {
if (isNull _who) then {
if (_ammo != "" and _ammo isKindOf "HelicopterExploSmall") then {
if (_ammo != "" && _ammo isKindOf "HelicopterExploSmall") then {
_who = player;
_dist = round (_who distance _building);
PVDZ_sec_atp = format [ "UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.",
getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist ];
PVDZ_sec_atp = format ["UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.",
getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist];
publicVariableServer "PVDZ_sec_atp";
};
}
else {
} else {
if (_who == player) then {
_dist = round (_who distance _building);
PVDZ_sec_atp = format [ "UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.",
getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist ];
PVDZ_sec_atp = format ["UID#%1 d4maged %2 %5 to %3pct with ammo %4 at dist4nce %6m.",
getPlayerUID _who, typeOf _building, round (100 * _dmgLvl), _ammo, _part, _dist];
publicVariableServer "PVDZ_sec_atp";
};
};
};
};
if ((!isNull _who) and {(_who distance _building < 150)}) then {_dmgLvl} else {0}
if ((!isNull _who) && {(_who distance _building < 150)}) then {_dmgLvl} else {0}
};
_building = [_x select 0,_x select 1,0] nearestObject (_x select 2);
_building removeAllEventHandlers "handleDamage";
@@ -95,48 +70,47 @@
[10174,1810,366820], [3589,2175,328944]
];
//Server only
// Server only
if (isServer) then {
/* PVS/PVC - Skaronator */
"PVDZE_send" addPublicVariableEventHandler {(_this select 1) call server_sendToClient};
"PVDZE_maintainArea" addPublicVariableEventHandler {(_this select 1) spawn server_maintainArea};
"PVDZE_atp" addPublicVariableEventHandler {
_x = _this select 1;
if (typeName _x == "STRING") then {
diag_log _x;
};
};
"PVDZE_plr_Died" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied};
"PVDZE_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerSync;};
"PVDZE_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj};
"PVDZE_veh_Update" addPublicVariableEventHandler {_id = (_this select 1) spawn server_updateObject};
"PVDZE_plr_Login" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerLogin};
"PVDZE_plr_Login2" addPublicVariableEventHandler {(_this select 1) call server_playerSetup};
"PVDZE_plr_Morph" addPublicVariableEventHandler {(_this select 1) call server_playerMorph};
"PVDZE_plr_LoginRecord" addPublicVariableEventHandler {_id = (_this select 1) spawn dayz_recordLogin};
//Checking
"PVDZE_obj_Delete" addPublicVariableEventHandler {(_this select 1) spawn server_deleteObj};
"PVDZ_plr_Death" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied};
"PVDZ_plr_Save" addPublicVariableEventHandler {_id = (_this select 1) call server_playerSync;};
"PVDZ_obj_Publish" addPublicVariableEventHandler {(_this select 1) call server_publishObj};
"PVDZ_plr_Login1" addPublicVariableEventHandler {_id = (_this select 1) call server_playerLogin};
"PVDZ_plr_Login2" addPublicVariableEventHandler {(_this select 1) call server_playerSetup};
"PVDZ_plr_LoginRecord" addPublicVariableEventHandler {_id = (_this select 1) spawn dayz_recordLogin};
"PVDZ_obj_Destroy" addPublicVariableEventHandler {(_this select 1) call server_deleteObj};
"PVDZ_obj_Save" addPublicVariableEventHandler {(_this select 1) call server_updateObject; diag_log ("PublicEH");};
// upgrade && maintain
"PVDZE_obj_Swap" addPublicVariableEventHandler {(_this select 1) spawn server_swapObject};
// disable zombies server side
"PVDZE_zed_Spawn" addPublicVariableEventHandler {(_this select 1) spawn server_handleZedSpawn};
"PVDZ_send" addPublicVariableEventHandler {(_this select 1) call server_sendToClient};
"PVDZ_dayzCarBomb" addPublicVariableEventHandler {[_this select 1] execVM "\z\addons\dayz_code\actions\detonate_bomb.sqf";};
//[player,[medical Array]];
"PVDZ_playerMedicalSync" addPublicVariableEventHandler { (_this select 1) call server_medicalSync; ((_this select 1) select 0) setVariable["Medical",((_this select 1) select 1),false]; }; //diag_log format["%1 - %2",((_this select 1) select 0),((_this select 1) select 1)]; };
"PVDZ_object_replace" addPublicVariableEventHandler {
// EPOCH ADDITIONS
"PVDZE_maintainArea" addPublicVariableEventHandler {(_this select 1) spawn server_maintainArea};
"PVDZE_obj_Swap" addPublicVariableEventHandler {(_this select 1) spawn server_swapObject};
"PVDZE_veh_Publish" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh};
"PVDZE_veh_Publish2" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh2};
"PVDZE_veh_Upgrade" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh3};
"PVDZE_obj_Trade" addPublicVariableEventHandler {(_this select 1) spawn server_tradeObj};
"PVDZE_plr_TradeMenu" addPublicVariableEventHandler {(_this select 1) spawn server_traders};
"PVDZE_plr_DeathB" addPublicVariableEventHandler {(_this select 1) spawn server_deaths};
"PVDZE_log_lockUnlock" addPublicVariableEventHandler {(_this select 1) spawn server_logUnlockLockEvent};
//Added as part of the maintenance system to allow the server to replace the damaged model with a normal model.
"PVDZ_object_replace" addPublicVariableEventHandler {
_cursorTarget = _this select 1;
_vars = ((_this select 1)select 0) getVariable "MaintenanceVars";
_vars = ((_this select 1) select 0) getVariable "MaintenanceVars";
if (!isnil "_vars" and _cursorTarget isKindOf "DZ_buildables") then {
deleteVehicle ((_this select 1)select 0);
if (!isNil "_vars" && _cursorTarget isKindOf "DZ_buildables") then {
deleteVehicle ((_this select 1) select 0);
_object = createVehicle [(_vars select 0), (_vars select 1), [], 0, if (_type in DayZ_nonCollide) then {"NONE"} else {"CAN_COLLIDE"}];
_object setVariable["Maintenance",false,true];
};
};
"PVDZ_sendUnconscious" addPublicVariableEventHandler {
_owner = ((_this select 1) select 0);
_duration = ((_this select 1) select 1);
_owner = (_this select 1) select 0;
_duration = (_this select 1) select 1;
diag_log format["%1,%2",_owner,_duration];
@@ -145,10 +119,10 @@ if (isServer) then {
};
"PVDZ_gridsActive" addPublicVariableEventHandler {
_gridref = ((_this select 1) select 0);
_gridloc = ((_this select 1) select 1);
_gridref = (_this select 1) select 0;
_gridloc = (_this select 1) select 1;
if (!(_gridref in dayz_gridsActive)) then {
if !(_gridref in dayz_gridsActive) then {
dayz_gridsActive set [count dayz_gridsActive,_gridref];
dayz_seedloot set [count dayz_seedloot,[_gridloc,_gridref]];
};
@@ -156,8 +130,8 @@ if (isServer) then {
};
"PVDZ_gridsRemove" addPublicVariableEventHandler {
_gridref = ((_this select 1) select 0);
_gridloc = ((_this select 1) select 1);
_gridref = (_this select 1) select 0;
_gridloc = (_this select 1) select 1;
if (_gridref in dayz_gridsActive) then {
dayz_gridsActive = dayz_gridsActive - [_gridref];
@@ -168,15 +142,15 @@ if (isServer) then {
"PVDZ_Server_Simulation" addPublicVariableEventHandler {
_agent = ((_this select 1) select 0);
_control = ((_this select 1) select 1);
_agent = (_this select 1) select 0;
_control = (_this select 1) select 1;
_agent enableSimulation _control;
};
"PVDZ_obj_Delete" addPublicVariableEventHandler {
_obj = ((_this select 1) select 0);
_player = ((_this select 1) select 1);
_obj = (_this select 1) select 0;
_player = (_this select 1) select 1;
_type = typeOf _obj;
_dis = _player distance _obj;
@@ -199,8 +173,8 @@ if (isServer) then {
};
"PVDZ_objgather_Knockdown" addPublicVariableEventHandler {
_tree = ((_this select 1) select 0);
_player = ((_this select 1) select 1);
_tree = (_this select 1) select 0;
_player = (_this select 1) select 1;
_dis = _player distance _tree;
if (_dis < 30) then {
@@ -209,20 +183,46 @@ if (isServer) then {
};
};
"PVDZE_serverStoreVar" addPublicVariableEventHandler {
_obj = ((_this select 1) select 0);
_name = ((_this select 1) select 1);
_value = ((_this select 1) select 2);
"PVDZ_serverStoreVar" addPublicVariableEventHandler {
_obj = (_this select 1) select 0;
_name = (_this select 1) select 1;
_value = (_this select 1) select 2;
_obj setVariable [_name, _value];
/*
switch (_name) do {
case "looted": {
_obj = ((_this select 1) select 0);
_name = "looted";
_value = ((_this select 1) select 2);
_obj setVariable [_name, _value];
};
case "zombieSpawn": {
_obj = ((_this select 1) select 0);
_name = "zombieSpawn";
_value = ((_this select 1) select 2);
_obj setVariable [_name, _value];
};
case "USEC_BloodQty": {
_obj = ((_this select 1) select 0);
_name = ((_this select 1) select 1);
_value = ((_this select 1) select 2);
//diag_log format ["%1, %2, %3", _obj, _name, _value];
if (isPlayer _obj) then {
_obj setVariable [_name, _value];
};
};
};
*/
};
"PVDZ_receiveVar" addPublicVariableEventHandler {
_owner = ((_this select 1) select 0);
_object = ((_this select 1) select 1);
_name = ((_this select 1) select 2);
_value = ((_this select 1) select 3);
_owner = (_this select 1) select 0;
_object = (_this select 1) select 1;
_name = (_this select 1) select 2;
_value = (_this select 1) select 3;
switch (_name) do {
case "looted": {
@@ -243,15 +243,15 @@ if (isServer) then {
};
"PVDZ_Server_changeOwner" addPublicVariableEventHandler {
_agent = ((_this select 1) select 0);
_reciever = ((_this select 1) select 1);
_agent = (_this select 1) select 0;
_reciever = (_this select 1) select 1;
_ownerID = owner _agent;
_newownerID = 1; //1 = server
if (typeName _reciever == "OBJECT") then {
_newownerID = owner _reciever;
};
if (isnil ("Owner")) then {
if (isNil ("Owner")) then {
_agent setVariable ["Owner",_ownerID];
};
@@ -260,8 +260,8 @@ if (isServer) then {
};
"PVDZ_Server_LogIt" addPublicVariableEventHandler {
_unitSending = (_this select 0);
_info = (_this select 1);
_unitSending = _this select 0;
_info = _this select 1;
diag_log format["WARNING: %1",_info];
};
@@ -270,9 +270,9 @@ if (isServer) then {
"PVDZ_Server_processSetAccessCode" addPublicVariableEventHandler {
private ["_unitSending","_object","_object","_code"];
_unitSending = ((_this select 1) select 0);
_object = ((_this select 1) select 1);
_code = ((_this select 1) select 2);
_unitSending = (_this select 1) select 0;
_object = (_this select 1) select 1;
_code = (_this select 1) select 2;
//diag_log format["%1, %2-%3",_unitSending,_object,_code];
@@ -301,25 +301,14 @@ if (isServer) then {
};
"PVDZ_Server_buildLock" addPublicVariableEventHandler {
_object = ((_this select 1) select 0);
_object = (_this select 1) select 0;
[_object,"buildLock"] call server_updateObject;
};
// Dayz epoch custom
"PVDZE_veh_Publish" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh};
"PVDZE_veh_Publish2" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh2};
"PVDZE_veh_Upgrade" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh3};
"PVDZE_obj_Trade" addPublicVariableEventHandler {(_this select 1) spawn server_tradeObj};
"PVDZE_plr_TradeMenu" addPublicVariableEventHandler {(_this select 1) spawn server_traders};
"PVDZE_plr_DeathB" addPublicVariableEventHandler {(_this select 1) spawn server_deaths};
"PVDZE_log_lockUnlock" addPublicVariableEventHandler {(_this select 1) spawn server_logUnlockLockEvent};
};
//Client only
if (!isDedicated) then {
"PVDZE_plr_SetDate" addPublicVariableEventHandler {
"dayzSetDate" addPublicVariableEventHandler {
_newdate = _this select 1;
_date = +(date); // [year, month, day, hour, minute].
//diag_log ['Date & time received:', _newdate, 'Local date on this client:', _date];
@@ -330,13 +319,13 @@ if (!isDedicated) then {
};
} forEach _date;
};
"PVDZE_plr_SetSaveTime" addPublicVariableEventHandler {DZE_SaveTime = (_this select 1)};
"PVDZE_obj_RoadFlare" addPublicVariableEventHandler {(_this select 1) spawn object_roadFlare};
"PVDZE_plr_Morph" addPublicVariableEventHandler {(_this select 1) call server_switchPlayer};
"PVDZE_obj_Fire" addPublicVariableEventHandler {nulexp=(_this select 1) spawn BIS_Effects_Burn};
"PVDZE_plr_FriendRQ" addPublicVariableEventHandler {if (player == ((_this select 1) select 0)) then {cutText[localize "str_epoch_player_2","PLAIN DOWN"];};};
"PVDZ_obj_RoadFlare" addPublicVariableEventHandler {(_this select 1) spawn object_roadFlare};
"PVDZ_drg_RaDrag" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\animDrag.sqf"};
"PVDZ_obj_Fire" addPublicVariableEventHandler {(_this select 1) spawn BIS_Effects_Burn};
"PVDZ_dayzFlies" addPublicVariableEventHandler {(_this select 1) call spawn_flies};
"PVCDZ_plr_Humanity" addPublicVariableEventHandler {(_this select 1) spawn player_humanityChange};
"PVDZE_plr_FriendRQ" addPublicVariableEventHandler {if (player == ((_this select 1) select 0)) then {cutText[localize "str_epoch_player_2","PLAIN DOWN"];};};
//Medical
"PVCDZ_hlt_Morphine" addPublicVariableEventHandler {(_this select 1) call player_medMorphine};
"PVCDZ_hlt_Bandage" addPublicVariableEventHandler {(_this select 1) call player_medBandage};
@@ -345,11 +334,8 @@ if (!isDedicated) then {
"PVCDZ_hlt_Transfuse_completed" addPublicVariableEventHandler {player setVariable["TransfusionCompleted",true]; };
"PVCDZ_hlt_PainK" addPublicVariableEventHandler {(_this select 1) call player_medPainkiller};
"PVCDZ_hlt_AntiB" addPublicVariableEventHandler {(_this select 1) call player_medAntiBiotics};
"norrnRaDrag" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\animDrag.sqf"};
"norrnRnoAnim" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\noAnim.sqf"};
"PVCDZ_plr_Humanity" addPublicVariableEventHandler {(_this select 1) spawn player_humanityChange};
"PVCDZ_plr_Legs" addPublicVariableEventHandler {
"PVCDZ_plr_Legs" addPublicVariableEventHandler {
_entity = (_this select 1) select 0;
_entity setHit ["legs", 1];
@@ -359,46 +345,41 @@ if (!isDedicated) then {
};
"PVCDZ_SetVar" addPublicVariableEventHandler {
_object = ((_this select 1) select 0);
_name = ((_this select 1) select 1);
_value = ((_this select 1) select 2);
_object = (_this select 1) select 0;
_name = (_this select 1) select 1;
_value = (_this select 1) select 2;
_object setVariable [_name,_value];
};
"PVDZ_receiveUnconscious" addPublicVariableEventHandler {
_unit = ((_this select 1) select 0);
_duration = ((_this select 1) select 1);
diag_log format["%1,%2",_unit,_duration];
_unit = (_this select 1) select 0;
_duration = (_this select 1) select 1;
diag_log format["%1,%2",_unit,_duration];
[_unit,_duration] call fnc_usec_damageUnconscious;
_unit setVariable ["NORRN_unconscious", true, true];
};
"PVCDZ_Client_processCode" addPublicVariableEventHandler {
// [_object,_result]
_object = ((_this select 1) select 0);
_result = ((_this select 1) select 1);
_codeGuess = ((_this select 1) select 2);
_object = (_this select 1) select 0;
_result = (_this select 1) select 1;
_codeGuess = (_this select 1) select 2;
if (_result) then {
_object setVariable ["dayz_padlockLockStatus", false,true];
_object setVariable ["isOpen", "1", true];
_object setVariable ["dayz_padlockHistory", [], true];
titleText [format["%1 unlocked", (typeof _object)],"PLAIN DOWN"];
}
else
{
titleText [format["%1 unlocked", typeOf _object],"PLAIN DOWN"];
} else {
titleText ["Incorrect combination", "PLAIN DOWN"];
_object setVariable ["dayz_padlockHistory", _codeGuess, true];
};
};
"PVCDZ_Client_processAccessCode" addPublicVariableEventHandler {
_codeGuess = ((_this select 1) select 0);
_codeGuess = (_this select 1) select 0;
titleText [format["You have set the combination to %1", _codeGuess],"PLAIN DOWN"];
};

View File

@@ -578,9 +578,9 @@ dayz_zombieTargetList = [
["Air",500],
["LandVehicle",200]
];
PVDZE_plr_Hit = [];
PVDZE_obj_Publish = []; //used for eventhandler to spawn a mirror of players tent
PVCDZE_plr_HideBody = objNull;
PVDZ_obj_Publish = []; //used for eventhandler to spawn a mirror of players tent
PVCDZ_obj_HideBody = objNull;
dayz_selectedVault = objNull;
dayz_selectedDoor = objNull;
@@ -1126,7 +1126,6 @@ if(!isDedicated) then {
DZE_Quarantine = false;
DZE_InRadiationZone = false;
DZE_SaveTime = 30;
Dayz_constructionContext = [];
Dayz_freefall = [ time, 0, 0.1 ];
autoRunActive = 0;

View File

@@ -32,8 +32,8 @@ if (_hasAntibiotics) then {
_msg = "You have taken antibiotics.";
} else {
//Send request to other player
PVDZE_send = [_unit,"Antibiotics",[_unit,player]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"Antibiotics",[_unit,player]];
publicVariableServer "PVDZ_send";
//Give humnaity for good deeds
[player,20] call player_humanityChange;

View File

@@ -53,8 +53,8 @@ if (_finished) then {
player setVariable ["sepsisStarted", nil];
};
} else {
PVDZE_send = [_unit,"Bandage",[_unit,player]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"Bandage",[_unit,player]];
publicVariableServer "PVDZ_send";
[player,20] call player_humanityChange;
};
} else {

View File

@@ -15,8 +15,8 @@ if (!_isDead) then {
_unit setVariable ["USEC_isCardiac",false,true];
uiSleep 5;
/* PVS/PVC - Skaronator */
PVDZE_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]];
publicVariableServer "PVDZ_send";
};
r_action = false;

View File

@@ -20,10 +20,10 @@ if ((_vcl emptyPositions "cargo") > 0) then
_dragger switchMove "";
_wounded setVariable ["NORRN_LoadVcl", _vcl, true];
uiSleep 1;
//["norrnRLact",_wounded] call broadcastRpcCallAll;
//["PVDZ_drg_RLact",_wounded] call broadcastRpcCallAll;
[_wounded] execVM "\z\addons\dayz_code\medical\load\load_wounded.sqf";
norrnRLact = _wounded;
publicVariable "norrnRLact";
PVDZ_drg_RLact = _wounded;
publicVariable "PVDZ_drg_RLact";
player removeAction NORRN_dropAction;
} else {
cutText [localize "str_dragnospace", "PLAIN DOWN"];//hint "No space left in vehicle";

View File

@@ -14,9 +14,9 @@ _wounded setVariable ["NORRN_unit_dragged", true, true];
_wounded assignAsCargo _vcl;
_wounded moveInCargo _vcl;
uiSleep 1;
//["norrnRaLW",_wounded] call broadcastRpcCallAll;
norrnRaLW = _wounded;
publicVariable "norrnRaLW";
//["PVDZ_drg_RaLW",_wounded] call broadcastRpcCallAll;
PVDZ_drg_RaLW = _wounded;
publicVariable "PVDZ_drg_RaLW";
_wounded switchMove "kia_hmmwv_driver";
if (local _wounded) then

View File

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

View File

@@ -52,8 +52,8 @@ if ((_unit == player) or (vehicle player != player)) then {
//["PVCDZ_hlt_Morphine",[_unit,player]] call broadcastRpcCallAll;
//PVCDZ_hlt_Morphine = [_unit,player];
//publicVariable "PVCDZ_hlt_Morphine";
PVDZE_send = [_unit,"Morphine",[_unit,player]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"Morphine",[_unit,player]];
publicVariableServer "PVDZ_send";
} else {
player addMagazine "ItemMorphine";
r_interrupt = false;

View File

@@ -23,5 +23,5 @@ player removeMagazine "ItemPainkiller";
uiSleep 1;
PVDZE_send = [_unit,"Painkiller",[_unit,player]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"Painkiller",[_unit,player]];
publicVariableServer "PVDZ_send";

View File

@@ -47,8 +47,8 @@ if (_finished) then {
if(_num_removed == 1) then {
/* PVS/PVC - Skaronator */
PVDZE_send = [_unit,"Transfuse",[_unit,player]];
publicVariableServer "PVDZE_send";
PVDZ_send = [_unit,"Transfuse",[_unit,player]];
publicVariableServer "PVDZ_send";
[player,100] call player_humanityChange;
};

View File

@@ -7,6 +7,9 @@ inGameUISetEventHandler ["Action","false"];
Anti-Teleport - Created By Razor / Refactored By Alby & CopyPasted to Epoch by Skaronator
*/
/* Moved to scheduled security
private ["_log","_playerName","_playerUID","_PUID","_al1veOnce","_debug","_lastpos","_lastheight","_lasttime","_lastVehicle","_v","_h","_topv","_toph","_curpos","_distance","_acceptableDistance","_curtime","_difftime","_plant","_curheight","_speed","_topSpeed","_terrainHeight","_differenceCheck","_lastPosVar","_safetyVehicle","_curPos"];
waitUntil {vehicle player == player};
@@ -117,3 +120,4 @@ while {1 == 1} do {
uiSleep 0.1;
};
endMission "LOSER";
*/

View File

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

View File

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

View File

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

View File

@@ -5,9 +5,6 @@ NEW VARS IN SENDTOCLIENT:
OpenTarget
PVCDZ_OpenTarget_Reset
GutBody
PVCDZ_obj_GutBody
SetEngineState
PVCDZ_veh_engineSwitch
@@ -17,23 +14,5 @@ PVCDZ_plr_Legs
Antibiotics
PVCDZ_hlt_AntiB
dayzSetDate
dayzSetDate
Transfuse_completed
PVCDZ_hlt_Transfuse_completed
CHANGE NEW VAR/PV NAMES --> OLD
PVCDZ_veh_SH --> PVCDZE_vehSH
SetFuel --> SFuel
PVCDZ_veh_SetFuel --> PVDZE_veh_SFuel
PVCDZ_obj_HideBody --> PVDZE_plr_HideBody
PVCDZ_plr_Humanity --> PVDZE_plr_HumanityChange
PVCDZ_hlt_Transfuse --> usecTransfuse
PVCDZ_hlt_PainK--> usecPainK
PVCDZ_hlt_Morphine --> usecMorphine
PVCDZ_hlt_Epi --> usecEpi
PVCDZ_hlt_Bandage --> usecBandage
dayzPlayerLogin --> PVCDZ_plr_PlayerAccepted
PVCDZ_plr_PlayerAccepted --> PVCDZE_plr_PlayerAccepted
PVCDZ_hlt_Transfuse_completed

View File

@@ -186,7 +186,6 @@ if (worldName == "chernarus") then {
([4654,9595,0] nearestObject 145260) setDamage 1;
};
//dayzPlayerLogin = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];
PVCDZ_plr_Login = [_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];
#ifdef DZE_SERVER_DEBUG
diag_log format["%1, %2, %3, %4, %5, %6, %7, %8, %9, %10",_charID,_inventory,_backpack,_survival,_isNew,dayz_versionNo,_model,_isHiveOk,_newPlayer,_isInfected];

View File

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

View File

@@ -192,7 +192,7 @@ if (_characterID != "0") then {
_currentState = [[_currentWpn,_currentAnim,_temp],_Achievements];
if(DZE_FriendlySaving) then {
// save only last/most recent 5 entrys as we only have 200 chars in db field && weapon + animation names are sometimes really long 60-70 chars.
// save only last/most recent 5 entrys as we only have 200 chars in db field and weapon + animation names are sometimes really long 60-70 chars.
_friendlies = [(_character getVariable ["friendlies",[]]),5] call array_reduceSizeReverse;
_currentState set [(count _currentState),_friendlies];
};

View File

@@ -103,7 +103,7 @@ PVDZE_serverObjectMonitor set [count PVDZE_serverObjectMonitor,_object];
_selection = _x select 0;
_dam = _x select 1;
if (_selection in dayZ_explosiveParts && _dam > 0.8) then {_dam = 0.8};
[_object,_selection,_dam] call object_setFixServer;
[_object,_selection,_dam] call fnc_veh_handleRepair;
} count _array;
_object setFuel _fuel;

View File

@@ -88,9 +88,9 @@ while {1 == 1} do {
};
if (_spawnFire) then {
//["PVDZE_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZE_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZE_obj_Fire";
//["PVDZ_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZ_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZ_obj_Fire";
_crash setvariable ["fadeFire",_fadeFire,true];
};

View File

@@ -22,14 +22,14 @@ switch (_variable) do {
};
};
case "SFuel": {
case "SetFuel": {
_vehicle = _arraytosend select 0;
_qty = _arraytosend select 1;
if (local _vehicle) then {
_vehicle setFuel _qty;
} else {
PVCDZE_veh_SetFuel = _arraytosend;
_owner publicVariableClient "PVCDZE_veh_SetFuel";
PVCDZ_veh_SetFuel = _arraytosend;
_owner publicVariableClient "PVCDZ_veh_SetFuel";
};
};
@@ -47,23 +47,23 @@ switch (_variable) do {
};
case "GutBody": {
PVCDZE_obj_GutBody = _arraytosend;
_owner publicVariableClient "PVCDZE_obj_GutBody";
PVCDZ_obj_GutBody = _arraytosend;
_owner publicVariableClient "PVCDZ_obj_GutBody";
};
case "HideBody": {
PVCDZE_plr_HideBody = _arraytosend select 0;
_owner publicVariableClient "PVCDZE_plr_HideBody";
PVCDZ_obj_HideBody = _arraytosend select 0;
_owner publicVariableClient "PVCDZ_obj_HideBody";
};
case "Humanity": {
PVDZE_plr_HumanityChange = _arraytosend;
_owner publicVariableClient "PVDZE_plr_HumanityChange";
PVCDZ_plr_Humanity = _arraytosend;
_owner publicVariableClient "PVCDZ_plr_Humanity";
};
case "PZ_BreakLegs": {
usecBreakLegs = _arraytosend;
_owner publicVariableClient "usecBreakLegs";
PVCDZ_plr_Legs = _arraytosend;
_owner publicVariableClient "PVCDZ_plr_Legs";
};
case "Bleed": {
@@ -71,26 +71,21 @@ switch (_variable) do {
_owner publicVariableClient "PVDZ_hlt_Bleed";
};
case "PVDZE_plr_SetDate": {
PVDZE_plr_SetDate = dayz_storeTimeDate;
_owner publicVariableClient "PVDZE_plr_SetDate";
case "dayzSetDate": {
dayzSetDate = dayz_storeTimeDate;
_owner publicVariableClient "dayzSetDate";
//diag_log ("Time and date: " +str (dayz_storeTimeDate));
};
case "HideObj": {
PVDZE_obj_Hide = _arraytosend select 0;
_owner publicVariableClient "PVDZE_obj_Hide";
};
case "RoadFlare": {
PVDZE_obj_RoadFlare = _arraytosend;
_owner publicVariableClient "PVDZE_obj_RoadFlare";
PVDZ_obj_RoadFlare = _arraytosend;
_owner publicVariableClient "PVDZ_obj_RoadFlare";
};
case "Transfuse": {
usecTransfuse = _arraytosend;
_owner publicVariableClient "usecTransfuse";
PVCDZ_hlt_Transfuse = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Transfuse";
_unit setVariable["medForceUpdate",true];
};
@@ -101,29 +96,32 @@ switch (_variable) do {
};
case "Painkiller": {
usecPainK = _arraytosend;
_owner publicVariableClient "usecPainK";
PVCDZ_hlt_PainK = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_PainK";
_unit setVariable["medForceUpdate",true];
};
case "Morphine": {
usecMorphine = _arraytosend;
_owner publicVariableClient "usecMorphine";
PVCDZ_hlt_Morphine = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Morphine";
_unit setVariable ["hit_legs",0,false];
_unit setVariable ["hit_hands",0,false];
_unit setVariable["medForceUpdate",true];
};
case "Epinephrine": {
usecEpi = _arraytosend;
_owner publicVariableClient "usecEpi";
PVCDZ_hlt_Epi = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Epi";
_unit setVariable["medForceUpdate",true];
};
case "Bandage": {
usecBandage = _arraytosend;
_owner publicVariableClient "usecBandage";
PVCDZ_hlt_Bandage = _arraytosend;
_owner publicVariableClient "PVCDZ_hlt_Bandage";
_unit setVariable["medForceUpdate",true];
//diag_log ("Bandage: " +str(PVCDZ_hlt_Bandage));
};
case "Antibiotics": {

View File

@@ -8,11 +8,6 @@ server_updateNearbyObjects = {
} count nearestObjects [_pos, dayz_updateObjects, 10];
}; */
server_handleZedSpawn = {
private["_zed"];
_zed = _this select 0;
_zed enableSimulation false;
};
/*
zombie_findOwner = {
private["_unit"];
@@ -671,8 +666,8 @@ server_timeSync = {
_date = [2012,8,2,_hour,_minute];
};
setDate _date;
PVDZE_plr_SetDate = _date;
publicVariable "PVDZE_plr_SetDate";
dayzSetDate = _date;
publicVariable "dayzSetDate";
diag_log ("TIME SYNC: Local Time set to " + str(_date));
};
};

View File

@@ -69,9 +69,9 @@ _num = _num * 2;
};
if (_spawnFire) then {
//["PVDZE_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZE_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZE_obj_Fire";
//["PVDZ_obj_Fire",[_crash,2,time,false,_fadeFire]] call broadcastRpcCallAll;
PVDZ_obj_Fire = [_crash,2,time,false,_fadeFire];
publicVariable "PVDZ_obj_Fire";
_crash setvariable ["fadeFire",_fadeFire,true];
};

View File

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

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];
setDate _date;
PVDZE_plr_SetDate = _date;
publicVariable "PVDZE_plr_SetDate";
dayzSetDate = _date;
publicVariable "dayzSetDate";
};
// Custom Configs
@@ -263,7 +263,7 @@ if (isServer && isNil "sm_done") then {
_selection = _x select 0;
_dam = _x select 1;
if (_selection in dayZ_explosiveParts && _dam > 0.8) then {_dam = 0.8};
[_object,_selection,_dam] call object_setFixServer;
[_object,_selection,_dam] call fnc_veh_handleRepair;
} count _hitpoints;
_object setFuel _fuel;

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],

View File

@@ -1,7 +1,7 @@
private ["_messages", "_timeout"];
if (isServer) exitWith {};
waitUntil { uiSleep 1; !isNil ("PVDZE_plr_LoginRecord") };
waitUntil { uiSleep 1; !isNil ("PVDZ_plr_LoginRecord") };
_messages = [
["DayZ Epoch", "Welcome "+(name player)],