From 31b0226b94d627ed528e5c447548867c8f300cb1 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Sat, 11 Jan 2014 18:58:49 +0100 Subject: [PATCH] Push PVS/PVC files (Outcommit currently) --- SQF/dayz_code/actions/maintain_area.sqf | 3 - SQF/dayz_code/init/publicEH.sqf | 21 +--- .../compile/server_sendToClient.sqf | 103 ++++++++++++++++++ SQF/dayz_server/init/server_functions.sqf | 45 ++++---- 4 files changed, 129 insertions(+), 43 deletions(-) create mode 100644 SQF/dayz_server/compile/server_sendToClient.sqf diff --git a/SQF/dayz_code/actions/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf index e46cc71e4..ab5382184 100644 --- a/SQF/dayz_code/actions/maintain_area.sqf +++ b/SQF/dayz_code/actions/maintain_area.sqf @@ -116,9 +116,6 @@ switch _option do { } forEach _objects; cutText [format[(localize "STR_EPOCH_ACTIONS_4"), _count], "PLAIN DOWN", 5]; - // uncomment the next 2 lines if you want logging of area maintenance to the server report file (Arma2OAserver.RPT) - //maintainArea_log = [player, _target, _count]; - //publicVariableServer "maintainArea_log"; } else { {player addMagazine _x;} forEach _temp_removed_array; cutText [format[(localize "STR_EPOCH_ACTIONS_5"),_removed_total,_tobe_removed_total], "PLAIN DOWN"]; diff --git a/SQF/dayz_code/init/publicEH.sqf b/SQF/dayz_code/init/publicEH.sqf index 56eaf0809..8ea71bb95 100644 --- a/SQF/dayz_code/init/publicEH.sqf +++ b/SQF/dayz_code/init/publicEH.sqf @@ -28,9 +28,10 @@ //Server only if (isServer) then { + //WIP - Skaronator + //"PVDZ_send" addPublicVariableEventHandler {(_this select 1) call server_sendToClient}; + "PVDZE_plr_Died" addPublicVariableEventHandler {_id = (_this select 1) spawn server_playerDied}; - //"PVDZE_plr_DiscAdd" addPublicVariableEventHandler {dayz_disco set [count dayz_disco,(_this select 1)];}; - //"PVDZE_plr_DiscRem" addPublicVariableEventHandler {dayz_disco = dayz_disco - [(_this select 1)];}; "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}; @@ -39,12 +40,9 @@ if (isServer) then { "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}; - // upgrade and 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}; @@ -55,19 +53,6 @@ if (isServer) then { "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}; - - - //Area Maintenance - "maintainArea_log" addPublicVariableEventHandler { - _val = _this select 1; - _player = _val select 0; - _playerName = name _player; - _playerID = getPlayerUID _player; - _target = _val select 1; - _position = position _target; - _count = _val select 2; - diag_log format["MAINTAIN_AREA: Player %1 (%2) has maintained %3 building parts at position %4", _playerName, _playerID, _count, _position]; - }; }; //Client only diff --git a/SQF/dayz_server/compile/server_sendToClient.sqf b/SQF/dayz_server/compile/server_sendToClient.sqf new file mode 100644 index 000000000..a49dbe193 --- /dev/null +++ b/SQF/dayz_server/compile/server_sendToClient.sqf @@ -0,0 +1,103 @@ +private ["_unit","_variable","_arraytosend","_owner","_vehicle","_qty"]; +//Inbound [_unit,"PVCDZ_hlt_Transfuse",[_unit,player,1000]] +_unit = _this select 0; +_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 { + PVCDZ_veh_SH = _arraytosend; + _owner publicVariableClient "PVCDZ_veh_SH"; + }; + }; + + case "SetFuel": { + _vehicle = _arraytosend select 0; + _qty = _arraytosend select 1; + if (local _vehicle) then { + _vehicle setFuel _qty; + } else { + PVCDZ_veh_SetFuel = _arraytosend; + _owner publicVariableClient "PVCDZ_veh_SetFuel"; + }; + }; + + case "GutBody": { + PVCDZ_obj_GutBody = _arraytosend; + _owner publicVariableClient "PVCDZ_obj_GutBody"; + }; + + case "HideBody": { + PVCDZ_obj_HideBody = _arraytosend select 0; + _owner publicVariableClient "PVCDZ_obj_HideBody"; + }; + + case "Humanity": { + PVCDZ_plr_Humanity = _arraytosend; + _owner publicVariableClient "PVCDZ_plr_Humanity"; + + //diag_log ("Humanity" +str(PVCDZ_plr_Humanity)); + }; + + case "dayzSetDate": { + dayzSetDate = dayz_storeTimeDate; + _owner publicVariableClient "dayzSetDate"; + + //diag_log ("Time and date: " +str (dayz_storeTimeDate)); + }; + + case "Transfuse": { + PVCDZ_hlt_Transfuse = _arraytosend; + _owner publicVariableClient "PVCDZ_hlt_Transfuse"; + _unit setVariable["medForceUpdate",true]; + }; + + case "Painkiller": { + PVCDZ_hlt_PainK = _arraytosend; + _owner publicVariableClient "PVCDZ_hlt_PainK"; + _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]; + }; + + case "Epinephrine": { + PVCDZ_hlt_Epi = _arraytosend; + _owner publicVariableClient "PVCDZ_hlt_Epi"; + _unit setVariable["medForceUpdate",true]; + }; + + case "Bandage": { + PVCDZ_hlt_Bandage = _arraytosend; + _owner publicVariableClient "PVCDZ_hlt_Bandage"; + + _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]; + }; + + case "Legs": { + PVCDZ_plr_Legs = _arraytosend; + _owner publicVariableClient "PVCDZ_plr_Legs"; + }; +}; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index 0257599ba..2cfc5a2ad 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -7,30 +7,31 @@ BIS_MPF_remoteExecutionServer = { }; BIS_Effects_Burn = {}; -server_playerLogin = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerLogin.sqf"; -server_playerSetup = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSetup.sqf"; -server_onPlayerDisconnect = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_onPlayerDisconnect.sqf"; -server_updateObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateObject.sqf"; -server_playerDied = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDied.sqf"; -server_publishObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf"; //Creates the object in DB -server_deleteObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf"; //Removes the object from the DB -server_swapObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_swapObject.sqf"; -server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; // Custom to add vehicles -server_publishVeh2 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; // Custom to add vehicles -server_publishVeh3 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf"; // Custom to add vehicles -server_tradeObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf"; -server_traders = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf"; -server_playerSync = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSync.sqf"; -zombie_findOwner = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\zombie_findOwner.sqf"; +server_playerLogin = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerLogin.sqf"; +server_playerSetup = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSetup.sqf"; +server_onPlayerDisconnect = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_onPlayerDisconnect.sqf"; +server_updateObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateObject.sqf"; +server_playerDied = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDied.sqf"; +server_publishObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf"; //Creates the object in DB +server_deleteObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_deleteObj.sqf"; //Removes the object from the DB +server_swapObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_swapObject.sqf"; +server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; // Custom to add vehicles +server_publishVeh2 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; // Custom to add vehicles +server_publishVeh3 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf"; // Custom to add vehicles +server_tradeObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf"; +server_traders = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf"; +server_playerSync = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerSync.sqf"; +zombie_findOwner = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\zombie_findOwner.sqf"; server_updateNearbyObjects = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_updateNearbyObjects.sqf"; -server_spawnCrashSite = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnCrashSite.sqf"; -server_handleZedSpawn = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_handleZedSpawn.sqf"; -server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf"; -//server_weather = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_weather.sqf"; - -fnc_plyrHit = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fnc_plyrHit.sqf"; -server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf"; +server_spawnCrashSite = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnCrashSite.sqf"; +server_handleZedSpawn = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_handleZedSpawn.sqf"; +server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf"; +//server_weather = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_weather.sqf"; +fnc_plyrHit = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fnc_plyrHit.sqf"; +server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf"; +//WIP - Skaronator +//server_sendToClient = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_sendToClient.sqf"; vehicle_handleInteract = { private["_object"];