diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 21235b6e2..b68a199c1 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -38,7 +38,7 @@ - PVDZE_serverStoreVar --> PVDZ_serverStoreVar - PVDZE_veh_SFix --> PVDZ_veh_SF - PVDZE_veh_SFuel --> PVCDZ_veh_SetFuel - - PVDZE_veh_Update --> PVDZ_obj_Save + - PVDZE_veh_Update --> PVDZ_veh_Save - usecBandage --> PVCDZ_hlt_Bandage - usecBleed --> PVDZ_hlt_Bleed - usecBreakLegs --> PVCDZ_plr_Legs diff --git a/SQF/dayz_code/NOTE.txt b/SQF/dayz_code/NOTE.txt index b7b635d9f..744b99630 100644 --- a/SQF/dayz_code/NOTE.txt +++ b/SQF/dayz_code/NOTE.txt @@ -12,8 +12,6 @@ REMOVE TOOL BREAKING, IT'S STUPID dayz_serverObjectMonitor = []; IS REPLACED WITH PVDZE_serverObjectMonitor = []; trap_monitor.fsm is no more! -NEW FNC PVDZE_hlt_Bleed -- THATS AN L change it to an I - //////////////////////////////////////// SELF ACTIONS VARIABLES //////////////////////////////////////// diff --git a/SQF/dayz_code/actions/pzombie/pz_attack.sqf b/SQF/dayz_code/actions/pzombie/pz_attack.sqf index 26f9cd96a..ca6b19362 100644 --- a/SQF/dayz_code/actions/pzombie/pz_attack.sqf +++ b/SQF/dayz_code/actions/pzombie/pz_attack.sqf @@ -14,7 +14,7 @@ if (!isNull cursorTarget) then { _ent setDamage 1; } else { /* PVS/PVC - Skaronator */ - PVDZ_send = [_ent,"PZ_BreakLegs",[_ent,player]]; + PVDZ_send = [_ent,"Legs",[_ent,player]]; publicVariableServer "PVDZ_send"; }; diff --git a/SQF/dayz_code/compile/obj_handleDam.sqf b/SQF/dayz_code/compile/obj_handleDam.sqf index 504436acc..01f9fbb5e 100644 --- a/SQF/dayz_code/compile/obj_handleDam.sqf +++ b/SQF/dayz_code/compile/obj_handleDam.sqf @@ -16,8 +16,8 @@ if (_damage > 0) then { _total = (damage _obj) + _damage; if (!isServer) then { - PVDZ_obj_Save = [_obj,"objWallDamage",_total]; - publicVariableServer "PVDZ_obj_Save"; + PVDZ_veh_Save = [_obj,"objWallDamage",_total]; + publicVariableServer "PVDZ_veh_Save"; } else { [_obj,"objWallDamage",_total] call server_updateObject; }; diff --git a/SQF/dayz_code/compile/veh_handleDam.sqf b/SQF/dayz_code/compile/veh_handleDam.sqf index 32a99b98f..8813406c5 100644 --- a/SQF/dayz_code/compile/veh_handleDam.sqf +++ b/SQF/dayz_code/compile/veh_handleDam.sqf @@ -37,8 +37,8 @@ if (local _unit) then { _unit setHit [_selection, _total]; if (!isServer) then { - PVDZ_obj_Save = [_unit,"damage"]; - publicVariableServer "PVDZ_obj_Save"; + PVDZ_veh_Save = [_unit,"damage"]; + publicVariableServer "PVDZ_veh_Save"; } else { [_unit, "damage"] call server_updateObject; }; diff --git a/SQF/dayz_code/compile/veh_handleKilled.sqf b/SQF/dayz_code/compile/veh_handleKilled.sqf index edd9573de..f443d2b3d 100644 --- a/SQF/dayz_code/compile/veh_handleKilled.sqf +++ b/SQF/dayz_code/compile/veh_handleKilled.sqf @@ -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 { - PVDZ_obj_Save = [_unit, "killed",_killer]; + PVDZ_veh_Save = [_unit, "killed",_killer]; } else { - PVDZ_obj_Save = [_unit, "killed"]; + PVDZ_veh_Save = [_unit, "killed"]; }; - publicVariableServer "PVDZ_obj_Save"; + publicVariableServer "PVDZ_veh_Save"; }; // everyone removes their EH for this vehicle diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index b89dde2a9..b5ae05418 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -75,11 +75,11 @@ if (isServer) then { "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_veh_Save" addPublicVariableEventHandler {(_this select 1) call server_updateObject}; "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");}; "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]]; diff --git a/SQF/dayz_server/NOTE.txt b/SQF/dayz_server/NOTE.txt deleted file mode 100644 index 3a5b5bcd5..000000000 --- a/SQF/dayz_server/NOTE.txt +++ /dev/null @@ -1,18 +0,0 @@ - - -NEW VARS IN SENDTOCLIENT: - -OpenTarget -PVCDZ_OpenTarget_Reset - -SetEngineState -PVCDZ_veh_engineSwitch - -Legs (BREAKS LEGS???) -PVCDZ_plr_Legs - -Antibiotics -PVCDZ_hlt_AntiB - -Transfuse_completed -PVCDZ_hlt_Transfuse_completed \ No newline at end of file diff --git a/SQF/dayz_server/eventHandlers/server_sendToClient.sqf b/SQF/dayz_server/eventHandlers/server_sendToClient.sqf index 1d126dfbe..f067dfca9 100644 --- a/SQF/dayz_server/eventHandlers/server_sendToClient.sqf +++ b/SQF/dayz_server/eventHandlers/server_sendToClient.sqf @@ -1,24 +1,20 @@ private ["_unit","_variable","_arraytosend","_owner","_vehicle","_qty"]; //Inbound [_unit,"PVCDZ_hlt_Transfuse",[_unit,player,1000]] _unit = _this select 0; - -//if(isNull _unit) exitWith {diag_log format ["ERROR: sendToClient is Null: %1", _unit]}; - _variable = _this select 1; _arraytosend = _this select 2; _owner = owner _unit; //diag_log format ["%1, %2, %3, %4", _unit, _variable, _arraytosend, _owner]; -//execution switch (_variable) do { case "VehHandleDam": { _vehicle = _arraytosend select 0; if (local _vehicle) then { _arraytosend call fnc_veh_handleDam; } else { - PVCDZE_veh_SH = _arraytosend; - _owner publicVariableClient "PVCDZE_veh_SH"; + PVCDZ_veh_SH = _arraytosend; + _owner publicVariableClient "PVCDZ_veh_SH"; }; }; @@ -32,11 +28,10 @@ switch (_variable) do { _owner publicVariableClient "PVCDZ_veh_SetFuel"; }; }; - + case "SetEngineState": { _vehicle = _arraytosend select 0; - _state = _arraytosend select 1; - + _state = _arraytosend select 1; if (local _vehicle) then { //_vehicle engineOn _state; _vehicle setOwner _owner; @@ -50,7 +45,7 @@ switch (_variable) do { PVCDZ_obj_GutBody = _arraytosend; _owner publicVariableClient "PVCDZ_obj_GutBody"; }; - + case "HideBody": { PVCDZ_obj_HideBody = _arraytosend select 0; _owner publicVariableClient "PVCDZ_obj_HideBody"; @@ -59,91 +54,74 @@ switch (_variable) do { case "Humanity": { PVCDZ_plr_Humanity = _arraytosend; _owner publicVariableClient "PVCDZ_plr_Humanity"; + //diag_log ("Humanity" +str(PVCDZ_plr_Humanity)); }; - case "PZ_BreakLegs": { - PVCDZ_plr_Legs = _arraytosend; - _owner publicVariableClient "PVCDZ_plr_Legs"; - }; - - case "Bleed": { - PVDZ_hlt_Bleed = _arraytosend; - _owner publicVariableClient "PVDZ_hlt_Bleed"; - }; - case "dayzSetDate": { dayzSetDate = dayz_storeTimeDate; _owner publicVariableClient "dayzSetDate"; - //diag_log ("Time and date: " +str (dayz_storeTimeDate)); }; - - case "RoadFlare": { - PVDZ_obj_RoadFlare = _arraytosend; - _owner publicVariableClient "PVDZ_obj_RoadFlare"; - }; - + case "Transfuse": { PVCDZ_hlt_Transfuse = _arraytosend; _owner publicVariableClient "PVCDZ_hlt_Transfuse"; - _unit setVariable["medForceUpdate",true]; + _unit setVariable ["medForceUpdate",true]; }; - + case "Transfuse_completed": { PVCDZ_hlt_Transfuse_completed = true; _owner publicVariableClient "PVCDZ_hlt_Transfuse_completed"; - _unit setVariable["medForceUpdate",true]; + _unit setVariable ["medForceUpdate",true]; }; case "Painkiller": { PVCDZ_hlt_PainK = _arraytosend; _owner publicVariableClient "PVCDZ_hlt_PainK"; - _unit setVariable["medForceUpdate",true]; + _unit setVariable ["medForceUpdate",true]; }; - + case "Morphine": { 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]; + _unit setVariable ["medForceUpdate",true]; }; case "Epinephrine": { PVCDZ_hlt_Epi = _arraytosend; _owner publicVariableClient "PVCDZ_hlt_Epi"; - _unit setVariable["medForceUpdate",true]; + _unit setVariable ["medForceUpdate",true]; }; case "Bandage": { PVCDZ_hlt_Bandage = _arraytosend; _owner publicVariableClient "PVCDZ_hlt_Bandage"; - - _unit setVariable["medForceUpdate",true]; - + _unit setVariable ["medForceUpdate",true]; //diag_log ("Bandage: " +str(PVCDZ_hlt_Bandage)); }; case "Antibiotics": { PVCDZ_hlt_AntiB = _arraytosend; _owner publicVariableClient "PVCDZ_hlt_AntiB"; - _unit setVariable["medForceUpdate",true]; + _unit setVariable ["medForceUpdate",true]; }; - case "tagFriendly": { - PVDZE_plr_FriendRQ = _arraytosend; - _owner publicVariableClient "PVDZE_plr_FriendRQ"; - }; case "Legs": { PVCDZ_plr_Legs = _arraytosend; _owner publicVariableClient "PVCDZ_plr_Legs"; }; - case "OpenTarget": - { - _unit setVariable["OpenTarget",true,true]; - + //reset OpenTarget timer + case "OpenTarget": { + _unit setVariable ["OpenTarget",true,true]; PVCDZ_OpenTarget_Reset = true; _owner publicVariableClient "PVCDZ_OpenTarget_Reset"; }; + + case "tagFriendly": { + PVDZE_plr_FriendRQ = _arraytosend; + _owner publicVariableClient "PVDZE_plr_FriendRQ"; + }; }; \ No newline at end of file