diff --git a/SQF/dayz_code/actions/refuel.sqf b/SQF/dayz_code/actions/refuel.sqf index a916bfa4a..2a6aad7e2 100644 --- a/SQF/dayz_code/actions/refuel.sqf +++ b/SQF/dayz_code/actions/refuel.sqf @@ -110,7 +110,7 @@ _availableCans = ["ItemJerrycan","ItemFuelBarrel"]; if (local _vehicle) then { [_vehicle,_newFuel] call local_setFuel; } else { - PVDZE_send = [_vehicle,"SetFuel",[_vehicle,_newFuel]]; + PVDZE_send = [_vehicle,"SFuel",[_vehicle,_newFuel]]; publicVariableServer "PVDZE_send"; }; diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf index 65379eb0a..751f690c9 100644 --- a/SQF/dayz_code/compile/fn_selfActions.sqf +++ b/SQF/dayz_code/compile/fn_selfActions.sqf @@ -202,8 +202,8 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu if (_canDo && (speed player <= 1) && (_cursorTarget isKindOf "Plastic_Pole_EP1_DZ")) then { if (s_player_maintain_area < 0) then { - s_player_maintain_area = player addAction ["$STR_EPOCH_ACTIONS_MAINTAREA", "\z\addons\dayz_code\actions\maintain_area.sqf", "maintain", 5, false]; - s_player_maintain_area_preview = player addAction ["$STR_EPOCH_ACTIONS_MAINTPREV", "\z\addons\dayz_code\actions\maintain_area.sqf", "preview", 5, false]; + s_player_maintain_area = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MAINTAREA"], "\z\addons\dayz_code\actions\maintain_area.sqf", "maintain", 5, false]; + s_player_maintain_area_preview = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_MAINTPREV"], "\z\addons\dayz_code\actions\maintain_area.sqf", "preview", 5, false]; }; } else { player removeAction s_player_maintain_area; @@ -307,7 +307,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu if(_hasHotwireKit) then { _Unlock = player addAction [format[localize "STR_EPOCH_ACTIONS_HOTWIRE",_text], "\z\addons\dayz_code\actions\hotwire_veh.sqf",_cursorTarget, 2, true, true, "", ""]; } else { - _Unlock = player addAction ["$STR_EPOCH_ACTIONS_VEHLOCKED", "",_cursorTarget, 2, true, true, "", ""]; + _Unlock = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_VEHLOCKED"], "",_cursorTarget, 2, true, true, "", ""]; }; s_player_lockunlock set [count s_player_lockunlock,_Unlock]; s_player_lockUnlock_crtl = 1; @@ -409,7 +409,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu if (_player_butcher) then { if (s_player_butcher < 0) then { if(_isZombie) then { - s_player_butcher = player addAction [localize "STR_EPOCH_ACTIONS_GUTZOMBIE", "\z\addons\dayz_code\actions\gather_zparts.sqf",_cursorTarget, 0, true, true, "", ""]; + s_player_butcher = player addAction [localize "STR_EPOCH_ACTIONS_GUTZOM", "\z\addons\dayz_code\actions\gather_zparts.sqf",_cursorTarget, 0, true, true, "", ""]; } else { s_player_butcher = player addAction [localize "str_actions_self_04", "\z\addons\dayz_code\actions\gather_meat.sqf",_cursorTarget, 3, true, true, "", ""]; }; @@ -537,7 +537,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu }; }; if (s_player_packvault < 0 and (_ownerID == dayz_combination or _ownerID == dayz_playerUID)) then { - s_player_packvault = player addAction [format["$STR_EPOCH_ACTIONS_PACK",_text], "\z\addons\dayz_code\actions\vault_pack.sqf",_cursorTarget, 0, false, true, "",""]; + s_player_packvault = player addAction [format["%1",(format[localize "STR_EPOCH_ACTIONS_PACK",_text])], "\z\addons\dayz_code\actions\vault_pack.sqf",_cursorTarget, 0, false, true, "",""]; }; } else { player removeAction s_player_packvault; @@ -576,7 +576,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu if(_IsNearRunningGen > 0) then { s_player_fuelauto = player addAction [localize "STR_EPOCH_ACTIONS_FILLVEH", "\z\addons\dayz_code\actions\fill_nearestVehicle.sqf",objNull, 0, false, true, "",""]; } else { - s_player_fuelauto = player addAction ["$STR_EPOCH_ACTIONS_NEEDPOWER", "",[], 0, false, true, "",""]; + s_player_fuelauto = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_NEEDPOWER"], "",[], 0, false, true, "",""]; }; }; } else { @@ -591,7 +591,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu if(isEngineOn _cursorTarget) then { s_player_fuelauto2 = player addAction [localize "STR_EPOCH_ACTIONS_FILLVEH", "\z\addons\dayz_code\actions\fill_nearestVehicle.sqf",_cursorTarget, 0, false, true, "",""]; } else { - s_player_fuelauto2 = player addAction ["$STR_EPOCH_ACTIONS_NEEDPOWER", "",[], 0, false, true, "",""]; + s_player_fuelauto2 = player addAction [format["%1",localize "STR_EPOCH_ACTIONS_NEEDPOWER"], "",[], 0, false, true, "",""]; }; }; } else { diff --git a/SQF/dayz_code/compile/object_showPlotRadius.sqf b/SQF/dayz_code/compile/object_showPlotRadius.sqf index 5a15e58b1..42eb39b47 100644 --- a/SQF/dayz_code/compile/object_showPlotRadius.sqf +++ b/SQF/dayz_code/compile/object_showPlotRadius.sqf @@ -3,7 +3,7 @@ private ["_location","_object","_objects","_i","_dir","_nearPlotPole"]; // global vars -_nearPlotPole = nearestObject [player, "Plastic_Pole_EP1_DZ", 3]; +_nearPlotPole = nearestObject [player, "Plastic_Pole_EP1_DZ"]; //"privatized" center variable _BD_radius = DZE_PlotPole select 0; diff --git a/SQF/dayz_server/compile/server_sendToClient.sqf b/SQF/dayz_server/compile/server_sendToClient.sqf index 94eb3191a..a6c57c3bc 100644 --- a/SQF/dayz_server/compile/server_sendToClient.sqf +++ b/SQF/dayz_server/compile/server_sendToClient.sqf @@ -20,7 +20,7 @@ switch (_variable) do { }; }; - case "SetFuel": { + case "SFuel": { _vehicle = _arraytosend select 0; _qty = _arraytosend select 1; if (local _vehicle) then { diff --git a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo index 751a8367d..495232d5f 100644 Binary files a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo and b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo differ diff --git a/Server Files/Battleye/publicvariable.txt b/Server Files/Battleye/publicvariable.txt index 89309d60b..52627e78f 100644 --- a/Server Files/Battleye/publicvariable.txt +++ b/Server Files/Battleye/publicvariable.txt @@ -1,4 +1,4 @@ -5 !="remExField" !="remExFP" !="PVDZE_plr_TradeMenu" !="PVDZE_veh_SFuel" !="PVDZE_veh_Update" !="PVDZE_plr_GutBody" !="PVDZE_plr_GutBodyZ" !="PVDZE_veh_Lock" !="PVDZE_plr_DeathB" !="PVDZE_obj_Publish" !="PVDZE_obj_Swap" !="PVDZE_plr_Save" !="PVDZE_plr_FriendRQ" !="usecBreakLegs" !="PVDZE_obj_Delete" !="PVDZE_veh_SFix" !="PVDZE_obj_Trade" !="PVDZE_veh_Publish2" !="PVDZE_plr_DiscAdd" !="PVDZE_plr_HumanityChange" !="usecBleed" !="usecMorphine" !="usecBandage" !="PVDZE_plr_HideBody" !="PVDZE_plr_Died" !="PVDZE_obj_Hide" !="PVDZE_obj_RoadFlare" !="PVDZE_zed_Spawn" !="drn_DynamicWeather_DebugTextEventArgs" !="drn_AskServerDynamicWeatherEventArgs" !="drn_DynamicWeatherEventArgs" !="drn_var_DynamicWeather_Rain" !="drn_var_DynamicWeather_ServerInitialized" !="norrnRACarUp" !="norrnRAPicUp" !="norrnRaDrag" !="norrnR180" !="norrnRalie" !="usecEpi" !="norrnRLact" !="norrnRALW" !="norrinRAlie" !="usecPainK" !="usecTransfuse" !="atp" !="PVDZE_plr_Login" !="PVDZE_plr_Login2" !="PVDZE_plr_LoginRecord" !="PVDZE_plr_DiscRem" !="BIS_effects_gepv" !="PVDZE_plr_DeathBResult" !="customRemoteMessage" !="dayzPlayerLogin" !="PVDZE_veh_Init" !="PVDZE_obj_Fire" !="dayzTradeResult" !="PVDZE_plr_TradeMenuResult" !="PVDZE_plr_SetDate" !="sm_done" !="PVDZE_plr_Morph2" !="PVDZE_plr_Morph" !="norrnRnoAnim" !="norrnRDead" !="usecInject" !="PVDZE_plr_Hit" !="PVDZE_plr_HitV" !="PVDZE_plr_DelLocal" !="PVDZE_serverObjectMonitor" !="PVDZE_veh_Upgrade" !="maintainArea_log" !"player" !"PVAHR_" !="PVAH_AdminRequest" !="PVAH_WriteLogRequest" +5 !="remExField" !="remExFP" !="PVDZE_plr_TradeMenu" !="PVDZE_veh_SFuel" !="PVDZE_veh_Update" !="PVDZE_plr_GutBody" !="PVDZE_plr_GutBodyZ" !="PVDZE_veh_Lock" !="PVDZE_plr_DeathB" !="PVDZE_obj_Publish" !="PVDZE_obj_Swap" !="PVDZE_plr_Save" !="PVDZE_plr_FriendRQ" !="usecBreakLegs" !="PVDZE_obj_Delete" !="PVDZE_veh_SFix" !="PVDZE_obj_Trade" !="PVDZE_veh_Publish2" !="PVDZE_plr_DiscAdd" !="PVDZE_plr_HumanityChange" !="PVDZE_send" !="usecBleed" !="usecMorphine" !="usecBandage" !="PVDZE_plr_HideBody" !="PVDZE_plr_Died" !="PVDZE_obj_Hide" !="PVDZE_obj_RoadFlare" !="PVDZE_zed_Spawn" !="drn_DynamicWeather_DebugTextEventArgs" !="drn_AskServerDynamicWeatherEventArgs" !="drn_DynamicWeatherEventArgs" !="drn_var_DynamicWeather_Rain" !="drn_var_DynamicWeather_ServerInitialized" !="norrnRACarUp" !="norrnRAPicUp" !="norrnRaDrag" !="norrnR180" !="norrnRalie" !="usecEpi" !="norrnRLact" !="norrnRALW" !="norrinRAlie" !="usecPainK" !="usecTransfuse" !="atp" !="PVDZE_plr_Login" !="PVDZE_plr_Login2" !="PVDZE_plr_LoginRecord" !="PVDZE_plr_DiscRem" !="BIS_effects_gepv" !="PVDZE_plr_DeathBResult" !="customRemoteMessage" !="dayzPlayerLogin" !="PVDZE_veh_Init" !="PVDZE_obj_Fire" !="dayzTradeResult" !="PVDZE_plr_TradeMenuResult" !="PVDZE_plr_SetDate" !="sm_done" !="PVDZE_plr_Morph2" !="PVDZE_plr_Morph" !="norrnRnoAnim" !="norrnRDead" !="usecInject" !="PVDZE_plr_Hit" !="PVDZE_plr_HitV" !="PVDZE_plr_DelLocal" !="PVDZE_serverObjectMonitor" !="PVDZE_veh_Upgrade" !="maintainArea_log" !"player" !"PVAHR_" !="PVAH_AdminRequest" !="PVAH_WriteLogRequest" 5 PVAHR_ !PVAHR_0 !PVAHR_1 !PVAHR_2 !PVAHR_3 !PVAHR_4 !PVAHR_5 !PVAHR_6 !PVAHR_7 !PVAHR_8 !PVAHR_9 5 "HangenderRE" 5 "vilegaming"