From 73ab04ccf1fd5c271759574a5a61ed25011a97a0 Mon Sep 17 00:00:00 2001 From: A Man Date: Sun, 17 Apr 2022 07:46:53 +0200 Subject: [PATCH] Add global DZE_BuryOnRoad also fix non localized butcher on road message --- SQF/dayz_code/actions/buryActions.sqf | 5 ++--- SQF/dayz_code/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_1.Takistan/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_11.Chernarus/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_12.isladuala/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_13.Tavi/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_15.namalsk/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_16.Panthera2/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_17.Chernarus/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_19.FDF_Isle1_a/configVariables.sqf | 2 ++ .../DayZ_Epoch_2.Chernarus_Winter/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_21.Caribou/configVariables.sqf | 2 ++ .../DayZ_Epoch_22.smd_sahrani_A2/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_23.cmr_ovaron/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_24.Napf/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_25.sauerland/configVariables.sqf | 2 ++ .../DayZ_Epoch_26.sauerland_winter/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_27.ruegen/configVariables.sqf | 2 ++ .../MPMissions/DayZ_Epoch_7.Lingor/configVariables.sqf | 2 ++ 19 files changed, 38 insertions(+), 3 deletions(-) diff --git a/SQF/dayz_code/actions/buryActions.sqf b/SQF/dayz_code/actions/buryActions.sqf index 26c465216..9347a225b 100644 --- a/SQF/dayz_code/actions/buryActions.sqf +++ b/SQF/dayz_code/actions/buryActions.sqf @@ -4,7 +4,7 @@ if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;}; dayz_actionInProgress = true; -private ["_action","_backPackMag","_backPackWpn","_crate","_corpse","_cross","_gain","_isBury","_grave","_name","_playerNear","_backPack","_position","_sound","_notOnRoad"]; +private ["_action","_backPackMag","_backPackWpn","_crate","_corpse","_cross","_gain","_isBury","_grave","_name","_playerNear","_backPack","_position","_sound"]; _corpse = (_this select 3) select 0; if (isNull _corpse) exitWith {dayz_actionInProgress = false; systemChat localize "str_cursorTargetNotFound";}; @@ -13,7 +13,6 @@ _playerNear = {isPlayer _x} count (([_corpse] call FNC_GetPos) nearEntities ["CA if (_playerNear) exitWith {dayz_actionInProgress = false; localize "str_pickup_limit_5" call dayz_rollingMessages;}; _action = (_this select 3) select 1; -_notOnRoad = false; // Restrict burying/butchering on roads? player removeAction s_player_bury_human; s_player_bury_human = -1; @@ -23,7 +22,7 @@ s_player_butcher_human = -1; _position = getPosATL _corpse; _isBury = _action == "bury"; -if (_notOnRoad && {isOnRoad _position}) exitWith {dayz_actionInProgress = false; format[localize "STR_CL_BA_ROAD",if (_isBury) then {localize "STR_CL_BA_BURY1"} else {"STR_CL_BA_BUTCHER1"}] call dayz_rollingMessages;}; +if (!DZE_BuryOnRoad && {isOnRoad _position}) exitWith {dayz_actionInProgress = false; format[localize "STR_CL_BA_ROAD",if (_isBury) then {localize "STR_CL_BA_BURY1"} else {localize "STR_CL_BA_BUTCHER1"}] call dayz_rollingMessages;}; _finished = ["Medic",1] call fn_loopAction; if (!_finished) exitWith {dayz_actionInProgress = false;localize "str_epoch_player_26" call dayz_rollingMessages;}; diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Chernarus_Winter/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_27.ruegen/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_27.ruegen/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/configVariables.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/configVariables.sqf index 0511ccca8..cd7706e2d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/configVariables.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/configVariables.sqf @@ -420,9 +420,11 @@ if (!isDedicated) then { // Bury and Butcher Bodies if (DZE_Bury_Body) then { DZE_Bury_Body_Value = 30;// Amount of humanity to gain for burying a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; if (DZE_Butcher_Body) then { DZE_Butcher_Body_Value = -30;// Amount of humanity to lose for butchering a body. + DZE_BuryOnRoad = false; // Restrict burying/butchering on roads? }; // Take Clothes