Merge pull request #10 from EpochModTeam/master

update fork
2025-12-13 19:52:38 +03:00 · 2021-01-31 18:32:48 +03:00
parent b43183c1a6 6bbbacbb71
commit eb2baf3b49
12 changed files with 139 additions and 54 deletions
--- a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
+++ b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
@@ -105,7 +105,9 @@ class SnapBuilding {
 			"Door_DZ",
 			"DoorLocked_DZ",
 			"WoodFloor4x_DZ",
-			"MetalFloor4x_DZ"			
+			"MetalFloor4x_DZ",
+			"MetalPillar_DZ",
+			"WoodPillar_DZ"			
 		};
 		radius = 5;
 	};
@@ -684,6 +686,28 @@ class SnapBuilding {
 	
 	class MetalFloor4x_Preview_DZ: MetalFloor4x_DZ {};
 	
+	class WoodPillar_DZ: FloorsWallsStairs {	
+		points[] = {
+			{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
+			{-0.2,0,1.5,$STR_EPOCH_ACTION_SNAP_LEFT},
+			{0.2,0,1.5,$STR_EPOCH_ACTION_SNAP_RIGHT},
+			{0,0,3.05,$STR_EPOCH_ACTION_SNAP_TOP}
+		};
+	};
+	
+	class Wood_Pillar_Preview_DZ: WoodPillar_DZ {};
+	
+	class MetalPillar_DZ: FloorsWallsStairs {	
+		points[] = {
+			{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
+			{-0.19,0,1.685,$STR_EPOCH_ACTION_SNAP_LEFT},
+			{0.19,0,1.685,$STR_EPOCH_ACTION_SNAP_RIGHT},
+			{0,0,3.05,$STR_EPOCH_ACTION_SNAP_TOP}
+		};
+	};
+	
+	class MetalPillar_Preview_DZ: MetalPillar_DZ {};
+	
 	//Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap
 	class WoodCrate_DZ {
 		snapTo[] = {
@@ -739,10 +763,10 @@ class SnapBuilding {
 		radius = 10;
 		points[] = {
 			{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
-			{0,-1.1,0,$STR_EPOCH_ACTION_SNAP_BACK},
-			{0,1.2,0,$STR_EPOCH_ACTION_SNAP_FRONT},
-			{-1.7,0,0,$STR_EPOCH_ACTION_SNAP_LEFT},
-			{1.7,0,0,$STR_EPOCH_ACTION_SNAP_RIGHT},
+			{0,-1.35,1.5,$STR_EPOCH_ACTION_SNAP_BACK},
+			{0,1.2,1.5,$STR_EPOCH_ACTION_SNAP_FRONT},
+			{-2,0,1.5,$STR_EPOCH_ACTION_SNAP_LEFT},
+			{1.57,0,1.5,$STR_EPOCH_ACTION_SNAP_RIGHT},
 			{0,0,2,$STR_EPOCH_ACTION_SNAP_TOP}
 		};
 	};
@@ -834,13 +858,15 @@ class SnapBuilding {
 			"VaultStorage2",
 			"VaultStorage2Locked",
 			"VaultStorageBroken",
-			"VaultStorageBroken2"
-			
+			"VaultStorageBroken2",
+			"TallSafe",
+			"TallSafeLocked",
+			"TallSafeBroken"			
 		};
 		radius = 5;
 		points[] = {
 			{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
-			{0,0.284,0.615,$STR_EPOCH_ACTION_SNAP_BACK},
+			{0,0.284,0.615,$STR_EPOCH_ACTION_SNAP_FRONT},
 			{0,0,1.23,$STR_EPOCH_ACTION_SNAP_TOP},
 			{-0.362,0,0.615,$STR_EPOCH_ACTION_SNAP_LEFT},
 			{0.362,0,0.615,$STR_EPOCH_ACTION_SNAP_RIGHT}
@@ -851,5 +877,18 @@ class SnapBuilding {
 	class VaultStorage2: VaultStorageLocked {};
 	class VaultStorage2Locked: VaultStorageLocked {};
 	class VaultStorageBroken: VaultStorageLocked {};
-	class VaultStorageBroken2: VaultStorageLocked {};	
+	class VaultStorageBroken2: VaultStorageLocked {};
+
+	class TallSafeLocked: VaultStorageLocked {
+		points[] = {
+			{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
+			{0,0.35,0.615,$STR_EPOCH_ACTION_SNAP_FRONT},
+			{0,0,2,$STR_EPOCH_ACTION_SNAP_TOP},
+			{-0.42,0,0.615,$STR_EPOCH_ACTION_SNAP_LEFT},
+			{0.42,0,0.615,$STR_EPOCH_ACTION_SNAP_RIGHT}
+		};		
+	};
+	
+	class TallSafe: TallSafeLocked {};
+	class TallSafeBroken: TallSafeLocked {};	
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp
@@ -91,6 +91,28 @@ class StorageShed_DZ: Land_Shed_M01
 	constructioncount = 6;
 	GhostPreview = "StorageShed_Preview_DZ";	
 	
+	class UserActions
+	{
+		class CloseDoor
+		{
+			position = "";
+			displayName = $STR_DN_OUT_C_DOOR;
+			radius = 4;
+			onlyForPlayer = 1;
+			condition = "this animationPhase 'open' == 1";
+			statement = "this animate ['open', 0];";
+		};
+		class OpenDoor
+		{
+			position = "";
+			displayName = $STR_DN_OUT_O_DOOR;
+			radius = 4;
+			onlyForPlayer = 1;
+			condition = "this animationPhase 'open' == 0";
+			statement = "this animate ['open', 1];";
+		};
+	};
+	
 	upgradeBuilding[] = {"StorageShed2_DZ",{"ItemToolbox","ItemCrowbar","ItemSledge"},{{"equip_metal_sheet",4},{"ItemMetalSheet",2},{"ItemScrews",2}}};	
 };
 class StorageShed2_DZ: Land_Shed_M01
@@ -105,6 +127,28 @@ class StorageShed2_DZ: Land_Shed_M01
 	transportMaxBackpacks = 30;
 	constructioncount = 12;
 	GhostPreview = "StorageShed_Preview_DZ";	
+	
+	class UserActions
+	{
+		class CloseDoor
+		{
+			position = "";
+			displayName = $STR_DN_OUT_C_DOOR;
+			radius = 4;
+			onlyForPlayer = 1;
+			condition = "this animationPhase 'open' == 1";
+			statement = "this animate ['open', 0];";
+		};
+		class OpenDoor
+		{
+			position = "";
+			displayName = $STR_DN_OUT_O_DOOR;
+			radius = 4;
+			onlyForPlayer = 1;
+			condition = "this animationPhase 'open' == 0";
+			statement = "this animate ['open', 1];";
+		};
+	};	
 };

 class Land_kulna;
--- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Shed_M01.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Shed_M01.hpp
@@ -31,7 +31,7 @@ class Land_Shed_M01: House {
 		{
 			position = "";
 			displayName = $STR_DN_OUT_C_DOOR;
-			radius = 2;
+			radius = 3;
 			onlyForPlayer = 0;
 			condition = "this animationPhase 'open' == 1";
 			statement = "this animate ['open', 0];";
@@ -40,7 +40,7 @@ class Land_Shed_M01: House {
 		{
 			position = "";
 			displayName = $STR_DN_OUT_O_DOOR;
-			radius = 2;
+			radius = 3;
 			onlyForPlayer = 0;
 			condition = "this animationPhase 'open' == 0";
 			statement = "this animate ['open', 1];";
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
@@ -38,18 +38,18 @@ class Remington870_Base : Rifle
 	
 	distanceZoomMin = 100;
 	distanceZoomMax = 100;
-	
+
 	modes[] = {"Single"};
 	
 	class Single : Mode_SemiAuto
 	{
 		dispersion = 0.003;
-		soundContinuous = 0;
-		reloadTime = 0.5;
-		reloadMagazineSound[] = {"\ca\sounds\weapons\rifles\M1014-reload", 0.316228, 1, 20};
-		begin1[] = {"dayz_weapons\sounds\shotgun_0", 1.77828, 1, 1000};
-		begin2[] = {"dayz_weapons\sounds\shotgun_1", 1.77828, 1, 1000};
-		soundBegin[] = {"begin1", 0.5, "begin2", 0.5};
+		soundContinuous = 0;	
+		reloadTime = 0.5;		
+		begin1[] = {"\dayz_epoch_c\sounds\weapons\shotgun_0", 1.77828, 1, 1000};
+		begin2[] = {"\dayz_epoch_c\sounds\weapons\shotgun_1", 1.77828, 1, 1000};
+		begin3[] = {"\dayz_epoch_c\sounds\weapons\shotgun_2", 1.77828, 1, 1000};
+		soundBegin[] = {"begin1", 0.33, "begin2", 0.33, "begin3", 0.33};
 		drySound[] = {"ca\sounds\weapons\rifles\dry", 0.01, 1, 10};
 		recoil = "recoil_single_primary_9outof10";
 		recoilProne = "recoil_single_primary_prone_8outof10";
--- a/SQF/dayz_code/actions/salvage.sqf
+++ b/SQF/dayz_code/actions/salvage.sqf
@@ -52,7 +52,7 @@ if (_hasToolbox) then {
 				/*if ((_hitpoint == "HitEngine") or (_hitpoint == "HitFuel")) then {
 					[_vehicle, _selection, 0.89] call fnc_veh_handleDam;
 				} else {*/
-					[_vehicle, _selection, 1] call fnc_veh_handleDam;
+					[_vehicle, _selection, 1, objNull, objNull, objNull, true] call fnc_veh_handleDam;
 				//};
 				_vehicle call fnc_veh_ResetEH;
 				_vehicle setvelocity [0,0,1];
--- a/SQF/dayz_code/compile/veh_handleDam.sqf
+++ b/SQF/dayz_code/compile/veh_handleDam.sqf
@@ -14,22 +14,23 @@ or by zombie_attack
 - return : updated damage for that part
 broadcast: boolean. if true, then the request will be sent to all players if the vehicle is not local.
 ************************************************************/
-private["_unit","_selection","_total","_damage","_needUpdate","_totalDmg"];
+private["_unit","_selection","_total","_damage","_needUpdate","_totalDmg","_force"];

 _unit = _this select 0;
 _selection = _this select 1;
 _total = _this select 2;
 _totalDmg = if (_selection != "") then {false} else {true};
+_force = [false,true] select (count _this > 6); // Needed to force update salavage

 if (_total >= 0.98) then {
-        _total = 1.0;
+    _total = 1.0;
 };

 if (local _unit) then {
 	if (_total > 0) then {
 		_unit setHit [_selection, _total];

-		PVDZ_veh_Save = [_unit,"damage",false,_totalDmg];
+		PVDZ_veh_Save = [_unit,"damage",_force,_totalDmg];
 		if (!isServer) then {
 			publicVariableServer "PVDZ_veh_Save";
 		} else {
--- a/SQF/dayz_code/compile/veh_handleRepair.sqf
+++ b/SQF/dayz_code/compile/veh_handleRepair.sqf
@@ -34,11 +34,11 @@ if (local _unit) then {
 	_unit setHit [_selection, 0];
 	_log = format["%1. setH!t[%2,0]", _log, _selection];
 	if (!isServer) then {
-		PVDZ_veh_Save = [_unit, "repair"];
+		PVDZ_veh_Save = [_unit, "repair",true];
 		publicVariableServer "PVDZ_veh_Save";
 		_log = _log + ". Requesting server hive write";
 	} else {
-		[_unit, "repair"] call server_updateObject;
+		[_unit, "repair",true] call server_updateObject;
 		_log = _log + ". Writing to hive";
 	};
 }
--- a/Files/DZE_Server_Config/BattlEye/addmagazinecargo.txt
+++ b/Files/DZE_Server_Config/BattlEye/addmagazinecargo.txt
@@ -1,4 +1,4 @@
 //new
-1 "" !^[0-9]+Rnd_|^Item|^Trash|^Food|^Fish|^Part|^Attachment_|^equip|swing$|^Hand|^(whole)?blood|^Skin !=Mosin_Nagant_Ammo|transfusionKit|TrapBear|emptyBloodBag|PipeBomb|5x_22_LR_17_HMR|10x_303|Crossbow_EX_Bolt !=Tranquiliser_Bolt !=Flare(White|Green)_(M203|GP25) !=SmokeShell(Red|Green|Yellow|Orange)? !="" !=(Quiver|WoodenArrow|CA_Magazine|CinderBlocks|MortarBucket|fuel_pump_kit|forest_net_kit|CSGAS|ACR_30Rnd_680x43(_SD)?)
-1 ^[0-9]+Rnd_ !=1Rnd_(((HE|Smoke(Red|Green|Yellow)?)_(M203|GP25))|Arrow_Wood|Bolt_Explosive|Bolt_Tranquilizer) !=2Rnd_12Gauge_(Slug|Buck) !=5Rnd_(762x51_M24|86x70_L115A1|762x54_Mosin|17HMR|762x67_XM2010(_SD)?) !=6Rnd_(45ACP|44Magnum|357Magnum|762x51_WA2000) !=7Rnd_(45ACP_1911(SD)?|86x70_MSR(_SD)?|50AE_Deagle|9x17_PPK) !=75Rnd_(545x39_RPK|762x39_RPK) !=8Rnd_(9x18_Makarov(SD)?|762x25_TT33|9x19_P38|9x19_MK22(SD)?|((12Gauge_|B_Saiga12_)(74Slug|Slug|Pellets|Buck))) !=10Rnd_(303British|762x54_SVD|762x51_CZ750|86x70_MRAD) !=12Rnd_Quiver_Wood !=15Rnd_(9x19_M9(SD)?|W1866_Slug|9x19_P226|10x22_p99(_sd)?|45ACP_USP(SD)?) !=17Rnd_9x19_glock17(SD)? !=20Rnd_(762x51_(DMR(SD)?|FNFAL|(S)?B_SCAR|RSASS(_SD)?|G3|HK417(SD)?)|9x18_APS(SD)?) !=20Rnd_(B_(765x17_Ball|((Usas12_|AA12_)(74Slug|Pellets)))|9x39_(Groza9(SD)?|SP5_VSS)|9x19_(EVO(SD)?|M93R)) !=30Rnd_(556x45_(STANAG|G36|Aug)(SD)?|545x39_AK(SD)?|6x35_KAC) !=30Rnd_(762x39_(AK47|SA58|RK95(SD)?|Groza1(SD)?)|9x19_(MP5(SD)?|UZI(_SD)?|TMP(SD)?)) !=64Rnd_9x19(_SD)?_Bizon !=100Rnd_(762x(51_M240|54_PK)|556x45_BetaCMag) !=[12]00Rnd_556x45_(M249|L110A1) !=50Rnd_(762x54_UK59|57x28_P90(SD)?) !=32Rnd_9x19_(TEC9|STEN|MAT49) !=33Rnd_(9x19_G18|45ACP_KRISS(SD)?) !=18Rnd_9x19_Phantom(SD)? !=40Rnd_46x30(_sd)?_mp7 !=350Rnd_BB_Magazine !=13Rnd_9x19_BHP !=25Rnd_45ACP_UMP(SD)? !=70Rnd_9x19_M31
+1 "" !^[0-9]+Rnd_|^Item|^Trash|^Food|^Fish|^Part|^Attachment_|^equip|swing$|^Hand|^(whole)?blood|^Skin !=Mosin_Nagant_Ammo|transfusionKit|TrapBear|emptyBloodBag|PipeBomb|5x_22_LR_17_HMR|10x_303|Crossbow_EX_Bolt !=Tranquiliser_Bolt|CementBag !=Flare(White|Green)_(M203|GP25) !=SmokeShell(Red|Green|Yellow|Orange)? !="" !=(Quiver|WoodenArrow|CA_Magazine|CinderBlocks|MortarBucket|fuel_pump_kit|forest_net_kit|CSGAS|MAAWS_HEAT) !_kit$|_locked$|_kit2$ !bulk_ !ACR_30Rnd_680x43
+1 ^[0-9]+Rnd_ !=1Rnd_(((HE|Smoke(Red|Green|Yellow)?)_(M203|GP25))|Arrow_Wood|Bolt_Explosive|Bolt_Tranquilizer) !=2Rnd_12Gauge_(Slug|Buck) !=3rnd_Anzio_20x102mm !=5Rnd_(762x51_M24|86x70_L115A1|762x54_Mosin|17HMR|127x108_KSVK|762x67_XM2010(_SD)?) !=6Rnd_(45ACP|44Magnum|357Magnum|762x51_WA2000) !=7Rnd_(45ACP_1911(SD)?|86x70_MSR(_SD)?|50AE_Deagle|9x17_PPK) !=75Rnd_(545x39_RPK|762x39_RPK) !=8Rnd_(9x18_Makarov(SD)?|762x25_TT33|9x19_P38|9x19_MK22(SD)?|((12Gauge_|B_Saiga12_)(74Slug|Slug|Pellets|Buck))) !=10Rnd_(303British|762x54_SVD|762x51_CZ750|86x70_MRAD|127x99_m107) !=12Rnd_Quiver_Wood !=15Rnd_(9x19_M9(SD)?|W1866_Slug|9x19_P226|10x22_p99(_sd)?|45ACP_USP(SD)?) !=17Rnd_9x19_glock17(SD)? !=20Rnd_(762x51_(DMR(SD)?|FNFAL|(S)?B_SCAR|RSASS(_SD)?|G3|HK417(SD)?)|9x18_APS(SD)?) !=20Rnd_(B_(765x17_Ball|((Usas12_|AA12_)(74Slug|Pellets)))|9x39_(Groza9(SD)?|SP5_VSS)|9x19_(EVO(SD)?|M93R)) !=30Rnd_(556x45_(STANAG|G36|Aug)(SD)?|545x39_AK(SD)?|6x35_KAC) !=30Rnd_(762x39_(AK47|SA58|RK95(SD)?|Groza1(SD)?)|9x19_(MP5(SD)?|UZI(_SD)?|TMP(SD)?)) !=64Rnd_9x19(_SD)?_Bizon !=100Rnd_(762x(51_M240|54_PK)|556x45_BetaCMag) !=[12]00Rnd_556x45_(M249|L110A1) !=50Rnd_(762x54_UK59|57x28_P90(SD)?) !=32Rnd_9x19_(TEC9|STEN|MAT49) !=33Rnd_(9x19_G18|45ACP_KRISS(SD)?) !=18Rnd_9x19_Phantom(SD)? !=40Rnd_46x30(_sd)?_mp7 !=350Rnd_BB_Magazine !=13Rnd_9x19_BHP !=25Rnd_45ACP_UMP(SD)? !=70Rnd_9x19_M31 !=2000Rnd_762x51_M134
 1=HandGrenade_Stone
--- a/Files/DZE_Server_Config/BattlEye/attachto.txt
+++ b/Files/DZE_Server_Config/BattlEye/attachto.txt
@@ -1,5 +1,5 @@
 //new
-1 "" !="VaultStorageLocked" !="LockboxStorageLocked" !="Hedgehog_DZ" !="Sandbag1_DZ" !="Fort_RazorWire" !="WoodGate_DZ" !="Land_HBarrier1_DZ"
+1 "" !"VaultStorageLocked" !"LockboxStorageLocked" !"Generator_DZ" !"Hedgehog_DZ" !"Sandbag1_DZ" !"Fort_RazorWirePreview" !"WoodGate_DZ" !"Land_HBarrier1_DZ" !"TallSafeLocked" !"LockboxStorageWinterLocked" !"LockboxStorage2Locked" !"LockboxStorageWinter2Locked" !"VaultStorage2Locked" !"Server_Rack" !"Sign_sphere10cm_EP1"
 5 "Ikarus"
 5 "UH1H_DZE"
 5 "Mi17_Civilian_DZ"
@@ -17,5 +17,6 @@
 5 "MTVR_DES_EP1"
 5 "V3S_Civ"
 5 "Parachute"
-5 "VaultStorage" !"VaultStorageLocked"
-5 "LockboxStorage" !"LockboxStorageLocked"
+5 "VaultStorage" !"VaultStorageLocked" !"VaultStorage2Locked"
+5 "LockboxStorage" !"LockboxStorageLocked" !"LockboxStorageWinterLocked" !"LockboxStorage2Locked" !"LockboxStorageWinter2Locked"
+5 "TallSafe" !"TallSafeLocked"
--- a/Files/DZE_Server_Config/BattlEye/createvehicle.txt
+++ b/Files/DZE_Server_Config/BattlEye/createvehicle.txt
@@ -1,19 +1,19 @@
 //new
-5 !(^DZ_|^z_|^pz_|^WeaponHolder|Box|dog|PZombie_VB|^Smoke|^Chem|^._40mm|_DZ$|^Trap) !=(SeaGull|SmallSecondary|HelicopterExplo(Small|Big)|DesertTentStorage|Stash(Small|Medium)(|[1-4])|(|Dome)TentStorage(|[0-4])) !=(CZ_VestPouch_EP1|R_M136_AT|R_MEEWS_HEAT|Wire_cat1) !=(JackDaniels|(Tin|Soda)Can|RoadFlare|WoodenArrowF|zZombie_Base|Parachute(West|C)|Grenade(_|HandTimed)(West|East)) !=(CMflareAmmo|Pipebomb) !=(WildBoar|Rabbit|Sheep|Sheep(01_EP1|02_EP1)|Goat|Goat(01_EP1|02_EP1)|Hen|Cow0[1234]|Cow01_EP1|Cock) !=Blood_Trail_DZ !^(Wooden|Metal)Fence !^WoodenGate_ !=(ShantyHouse(|Stage[2-7])|SurvivorWorkshop(|Stage2|[ABC]Stage[345])|WorkBench) !=explosive_bolt !"Land_" !=Sign_(arrow_down_large|sphere10cm)_EP1 !="MAP_c_fern" !="Grave" !"VaultStorage" !="LaserTargetW" !Fort_ !Nest !CMflare !="GyroGrenade" !="CraterLong" !="pook_camel_HE" !="Fin" !="Pastor" !_DZE[12]$
+5 !(^DZ_|^z_|^pz_|^WeaponHolder|Box|dog|PZombie_VB|^Smoke|^Chem|^._40mm|_DZ$|^Trap) !=(SeaGull|SmallSecondary|HelicopterExplo(Small|Big)|DesertTentStorage|Stash(Small|Medium)(|[1-4])|(|Dome)TentStorage(|[0-4])) !=(CZ_VestPouch_EP1|R_M136_AT|R_MEEWS_HEAT|Wire_cat1) !=(JackDaniels|(Tin|Soda)Can|RoadFlare|WoodenArrowF|zZombie_Base|Parachute(West|C)|Grenade(_|HandTimed)(West|East)) !=(CMflareAmmo|Pipebomb) !=(WildBoar|Rabbit|Sheep|Sheep(01_EP1|02_EP1)|Goat|Goat(01_EP1|02_EP1)|Hen|Cow0[1234]|Cow01_EP1|Cock) !=Blood_Trail_DZ !^(Wooden|Metal)Fence !^WoodenGate_ !=(ShantyHouse(|Stage[2-7])|SurvivorWorkshop(|Stage2|[ABC]Stage[345])|WorkBench) !=explosive_bolt !"Land_" !=Sign_(arrow_down_large|sphere10cm)_EP1 !="MAP_c_fern" !="Grave" !"VaultStorage" !="LaserTargetW" !Fort_ !Nest !CMflare !="GyroGrenade" !="CraterLong" !="pook_camel_HE" !="Fin" !="Pastor" !_DZE[12]$ !"TallSafe"
 5 SeaGull //set to its own line so we know which kick we have here with out looking in the logs
 1 ^DZ_ !=DZ_(British_ACU|Czech_Vest_Pouch|(TK_Assault_Pack|Patrol_Pack|Assault_Pack|ALICE_Pack|CivilBackpack|Backpack)_EP1) !=DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox)
 1 ^z_ !=z_((|new_)villager[1234]|(|new_)worker[1234]|teacher|hunter|suit[1-6]|soldier(|_pilot|_heavy)|policeman(|2)|doctor|priest) !=z_(citizen[1-4]|profiteer[1-4]|rocker[1-4]|lumberjack[1-4]|hunter[2345]|assistant|pilot|takistani[1-6]) !z_soldier_(usmc|fr|cdf|ru|gue|ins|tk|cz|un|ger|baf|pmc|acr) !=z_(dealer|gardener|mafiaboss|postman[1-4]|prisoner[1-3]|firefighter[1-5]|civilian([1-9]|1[0-5]))
-1 ^WeaponHolder !=WeaponHolder !WeaponHolder_part !=WeaponHolder_(Item(DomeTent|CamoNet|Crowbar|Fuelcan|Hatchet|Jerrycan|Tent)|Melee(BaseBallBat(|Nails)|BatBarbed|Machete)) !=WeaponHolder_Part(Engine|Fueltank|Generic|Glass|VRotor|Wheel) !=WeaponHolder_Item(WorkBench|MetalSheet|ConcreteBlock|RSJ|Pickaxe)
-1 Box !=(DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox)|Item(Match|Tool)box|equip_pvc_box|DebugBoxPlayer_DZ|Lockbox(StorageLocked|Storage)|WeaponHolder_ItemLockbox)
+1 ^WeaponHolder !=WeaponHolder !WeaponHolder_part !=WeaponHolder_(Item(DomeTent|CamoNet|Crowbar|Fuelcan|Hatchet|Jerrycan|Tent)|Melee(BaseBallBat(|Nails)|BatBarbed|Machete)) !=WeaponHolder_Part(Engine|Fueltank|Generic|Glass|VRotor|Wheel) !=WeaponHolder_Item(WorkBench|MetalSheet|ConcreteBlock|RSJ|Pickaxe|Generator)
+1 Box !=(DZ_((AmmoBox|ExplosiveBox)(RU|US)|MedBox|CardboardBox)|Item(Match|Tool)box|equip_pvc_box|DebugBoxPlayer_DZ|WeaponHolder_ItemLockbox) !=LockboxStorage(Locked|WinterLocked|2Locked|Winter2Locked)
 1 ^Smoke !=SmokeShell(|Red|Green|Yellow)
 1 ^Chem !=Chem(Green|Red|Blue)
 1 ^._40mm !=(G_40mm_HE|G_40mm_Smoke|F_40mm_White|F_40mm_Green)
-1 _DZ$ !=(BanditW?[12]|Camo1|Sniper1W?|Soldier1|SurvivorW?([123]|desert|pink|combat|urban)|Blood_Trail)_DZ !=(Land_Fire|Sandbag1|Hedgehog|BearTrap|CamoNet|GrenadeHandTimedWest|flamable)_DZ !=(Priest|Doctor|Assistant|Worker[134]|Soldier_(Crew|TL|Sniper|Bodyguard_AA12)_PMC)_DZ !=((Functionary1|Haris_Press|Pilot|US_Soldier)_EP1|Reporter|MafiaBoss|Dealer)_DZ !=pz_(policeman|suit[12]|worker[123]|doctor|teacher|hunter|villager[123]|priest)_DZ !=(GUE_Soldier_(MG|Sniper|Crew|CO|2)|Apo_Rifleman_0[1-6])_DZ !=(UN_CDF_Soldier(_Guard)?_EP1|BAF_Soldier_(Officer|N)_MTP|CamoWinterW?|Nac_Soldier|Tamika)_DZ !=GhillieFull_(Desert0[1-8]|Snow0[1-5]|Urban01|Wood(0[1-9]|1[1-6]))_DZ !=SG_GRU_(TL|Scout|Sniper|Spotter|Assaultman|Medic|Marksman|Operator|MG)(|_W|_D)_DZ !=(Firefighter([1-5]|_Officer[12])|Postman[1-4]|SchoolTeacher|Civilian([1-9]|1[0-4]))_DZ !=((Drake|Graves)_Light|GUE_Commander|Hunter|Gardener|RUS_(Soldier1|Commander))_DZ !=(RU_(Soldier(|_Officer|_Crew)|Policeman2?)|Ins_(Soldier_(2|GL|Crew)|Commander))_DZ !=(MVD_Soldier|CDF_Soldier|Prisoner[123]|Rocker[1-4]|BusinessMan|Rocket)_DZ !=(INS_(Lopotev|Soldier_(AR|CO)|Bardak|Worker2)|USMC_Soldier_(Officer|MG|Pilot))_DZ !=FR_(TL|R|Marksman|Assault_R|OHara|Rodriguez|Sapper)_DZ !=TK_(Special_Forces_MG|Soldier_Sniper|Commander|GUE_Soldier|CIV_Takistani0[1346]|INS_(Soldier(_AR)?|Warlord))_EP1_DZ !=gsc_(military_helmet_|military_head_)(|wdl|grey)_DZ !=gsc_(scientist[12](_head)?|cloth_loner_head)_DZ !=gsc_eco_stalker_(mask|head)_(camo|neutral|head|fred|duty)_DZ !=CZ_(Soldier_(805|Crew|Officer|Recon|Spec([123]|_Demo)|Sniper|Light)(|_Wdl|_Dst)|Soldier805_DES)_ACR_DZ !=CZ_(Special_Forces_GL_DES|Soldier_Sniper|Soldier_SL_DES)_EP1_DZ !=GER_Soldier(_TL)?_EP1(|_des|_wdl)_DZ
+1 _DZ$ !=(BanditW?[12]|Camo1|Sniper1W?|Soldier1|SurvivorW?([123]|desert|pink|combat|urban)|Blood_Trail)_DZ !=(Land_Fire|Sandbag1|Hedgehog|BearTrap|CamoNet|GrenadeHandTimedWest|flamable)_DZ !=(Priest|Doctor|Assistant|Worker[134]|Soldier_(Crew|TL|Sniper|Bodyguard_AA12)_PMC)_DZ !=((Functionary1|Haris_Press|Pilot|US_Soldier)_EP1|Reporter|MafiaBoss|Dealer)_DZ !=pz_(policeman|suit[12]|worker[123]|doctor|teacher|hunter|villager[123]|priest)_DZ !=(GUE_Soldier_(MG|Sniper|Crew|CO|2)|Apo_Rifleman_0[1-6])_DZ !=(UN_CDF_Soldier(_Guard)?_EP1|BAF_Soldier_(Officer|N)_MTP|CamoWinterW?|Nac_Soldier|Tamika)_DZ !=GhillieFull_(Desert0[1-8]|Snow0[1-5]|Urban01|Wood(0[1-9]|1[1-6]))_DZ !=SG_GRU_(TL|Scout|Sniper|Spotter|Assaultman|Medic|Marksman|Operator|MG)(|_W|_D)_DZ !=(Firefighter([1-5]|_Officer[12])|Postman[1-4]|SchoolTeacher|Civilian([1-9]|1[0-4]))_DZ !=((Drake|Graves)_Light|GUE_Commander|Hunter|Gardener|RUS_(Soldier1|Commander))_DZ !=(RU_(Soldier(|_Officer|_Crew)|Policeman2?)|Ins_(Soldier_(2|GL|Crew)|Commander))_DZ !=(MVD_Soldier|CDF_Soldier|Prisoner[123]|Rocker[1-4]|BusinessMan|Rocket)_DZ !=(INS_(Lopotev|Soldier_(AR|CO)|Bardak|Worker2)|USMC_Soldier_(Officer|MG|Pilot))_DZ !=FR_(TL|R|Marksman|Assault_R|OHara|Rodriguez|Sapper)_DZ !=TK_(Special_Forces_MG|Soldier_Sniper|Commander|GUE_Soldier|CIV_Takistani0[1346]|INS_(Soldier(_AR)?|Warlord))_EP1_DZ !=gsc_(military_helmet_|military_head_)(|wdl|grey)_DZ !=gsc_(scientist[12](_head)?|cloth_loner_head)_DZ !=gsc_eco_stalker_(mask|head)_(camo|neutral|head|fred|duty)_DZ !=CZ_(Soldier_(805|Crew|Officer|Recon|Spec([123]|_Demo)|Sniper|Light)(|_Wdl|_Dst)|Soldier805_DES)_ACR_DZ !=CZ_(Special_Forces_GL_DES|Soldier_Sniper|Soldier_SL_DES)_EP1_DZ !=GER_Soldier(_TL)?_EP1(|_des|_wdl)_DZ !=(Generator|Server_Rack|FuelPump)_DZ
 1 ^Trap Trap(_Cans|Tripwire(Flare|Grenade|Smoke)|BearTrap(Smoke|Flare))
 1=(SmallSecondary|HelicopterExplo(Small|Big)) // log explosions (optional)
 1=(PipeBomb|Grenade(_|HandTimed)(West|East)) // log grenades (optional)
 5 (_ied|_CRV7|_MEEWS|B_|_YakB|_acr|MASH_) !="R_MEEWS_HEAT" !=z_soldier_acr_rifle[12] !=CZ_(Soldier_(805|Crew|Officer|Recon|Spec([123]|_Demo)|Sniper|Light)(|_Wdl|_Dst)|Soldier805_DES)_ACR_DZ
-5 "Land_" !="Land_coneLight" !=Land_(HBarrier1|HBarrier3|HBarrier5|Fire)_DZ !=Land_(fortified_nest_small|HBarrier1|HBarrier3e|HBarrier5)Preview !=Land_DZE_(WoodDoor|LargeWoodDoor|GarageWoodDoor|WoodDoorLocked|LargeWoodDoorLocked|GarageWoodDoorLocked)
+5 "Land_" !="Land_coneLight" !=Land_(HBarrier1|HBarrier3|HBarrier5|Fire)_DZ !=Land_(fortified_nest_small|HBarrier1|HBarrier3e|HBarrier5)Preview !=Land_DZE_(WoodDoor|LargeWoodDoor|GarageWoodDoor|WoodDoorLocked|LargeWoodDoorLocked|GarageWoodDoorLocked|WoodGate|WoodGateLocked|WoodOpenTopGarageDoor|WoodOpenTopGarageLocked)
 5 "Nest_" !="M240Nest_DZ" !="SandNest_DZ" !="Land_fortified_nest_smallPreview" !="WarfareBMGNest_Preview"
 5 "Fort_" !="Fort_RazorWire" !="Fort_RazorWirePreview"
 5 (BasicWeapons|SpecialWeapons|_uav)
--- a/Files/DZE_Server_Config/BattlEye/publicvariableval.txt
+++ b/Files/DZE_Server_Config/BattlEye/publicvariableval.txt
@@ -6,14 +6,14 @@
 5 \+ !e\+0
 5 (commandRadio|directSay|globalRadio|groupRadio|sideRadio|vehicleRadio)
 1 "wrong side" // group hack, ban the first in a row
-1 "(init|set|add|action|all|attach|ATL|ASL|eye|exec|group|unit|clear|create|menu|ctrl|display|text|hint|drop)" !"\"(SetFuel|dayzSetDate|titleText|(|with )MeleeBaseball(|Bat(|Barbed|Nails))|StashSmall|smallboat_[12])\"" !"_Ball " !Attachement !Attachment_ !aslo !ghillie_overall.p3d
+1 "\"\w*?(init|set|add|action|all|attach|ATL|ASL|eye|exec|group|unit|clear|create|menu|ctrl|display|text|hint|drop)\w*?\"" !"\"(SetFuel|dayzSetDate|titleText|(|with )MeleeBaseball(|Bat(|Barbed|Nails))|StashSmall|smallboat_[12])\""
 1 "(entit|exit|able|find|fuel|join|frame|move|team|throw)" !"\"(switchmove|ItemFuelcan(|Empty)|PartFueltank|SetFuel|z_refuel_0|ItemSodaRocketFuel|cable_tie)\"" !Zombie(Feed|StandingAttack)
 1 "\"say\"" !"say\",\[\"z_"
 1 "\"titleText\""
 1 "draw"
 1 "delete"
 1 "copy"
-1 "switch" !="\"switchmove\"" !="\"remExField\" = \[,<NULL-object>,\"switchmove\",\"ActsPercMrunSlowWrflDf_FlipFlopPara\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpsnonwnondnon_zevl\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpslowwrfldnon_gear\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady03\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpsraswpstdnon_player_idlesteady02\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpsraswpstdnon_player_idlesteady03\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aswmpercmstpsnonwnondnon\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpslowwrfldnon_player_idlesteady04\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon\"\]" !"\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpsnonwnondnon\"\]" !"REMOTE,\"switchmove\",\"aovrpercmstpsraswrfldf\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_idlesteady02\"\]" !"REMOTE,\"switchmove\",\"\"\]" !"REMOTE,\"switchmove\",\"AmovPpneMstpSnonWnonDnon_healed\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswpstdnon_player_idlesteady02\"\]" !"\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpslowwrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunsnonwnondf\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon_gear\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_aiming02\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_aiming01\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunsraswrfldf\"\]" !"REMOTE,\"switchmove\",\"amovpercmstpsraswrfldnon_gear\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady02\"\]" !"REMOTE,\"switchmove\",\"amovppnemstpsraswrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpercmstpslowwrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon_amovppnemstpsraswrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon_ainvpknlmstpslaywrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunsraswrfldfl\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunslowwrfldf_amovppnemstpsraswrfldnon\"\]"
+1 "switch" !="\"switchmove\"" !="\"remExField\" = \[,<NULL-object>,\"switchmove\",\"ActsPercMrunSlowWrflDf_FlipFlopPara\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpsnonwnondnon_zevl\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpslowwrfldnon_gear\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady03\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpsraswpstdnon_player_idlesteady02\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpsraswpstdnon_player_idlesteady03\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aswmpercmstpsnonwnondnon\"\]" !="\[<NULL-object>,<NULL-object>,\"switchmove\",\"aidlpercmstpslowwrfldnon_player_idlesteady04\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon\"\]" !"\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpsnonwnondnon\"\]" !"REMOTE,\"switchmove\",\"aovrpercmstpsraswrfldf\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_idlesteady02\"\]" !"REMOTE,\"switchmove\",\"\"\]" !"REMOTE,\"switchmove\",\"AmovPpneMstpSnonWnonDnon_healed\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswpstdnon_player_idlesteady02\"\]" !"\[<NULL-object>,<NULL-object>,\"switchmove\",\"amovpercmstpslowwrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunsnonwnondf\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon_gear\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_aiming02\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_aiming01\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunsraswrfldf\"\]" !"REMOTE,\"switchmove\",\"amovpercmstpsraswrfldnon_gear\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady02\"\]" !"REMOTE,\"switchmove\",\"amovppnemstpsraswrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpercmstpslowwrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon_amovppnemstpsraswrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpknlmstpsraswrfldnon_ainvpknlmstpslaywrfldnon\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunsraswrfldfl\"\]" !"REMOTE,\"switchmove\",\"amovpercmrunslowwrfldf_amovppnemstpsraswrfldnon\"\]" !"REMOTE,\"switchmove\",\"aidlpknlmstpsraswpstdnon_player_idlesteady01\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady03\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsraswrfldnon_idlesteady04\"\]" !"REMOTE,\"switchmove\",\"aidlpknlmstpsraswpstdnon_player_idlesteady02\"\]" !"REMOTE,\"switchmove\",\"amovpercmstpsraswpstdnon_gear\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady04\"\]" !"REMOTE,\"switchmove\",\"aidlpercmstpsnonwnondnon_player_idlesteady01\"\]" !"REMOTE,\"switchmove\",\"aidlpknlmstpsraswpstdnon_player_idlesteady03\"\]" !"REMOTE,\"switchmove\",\"amovppnemstpsnonwnondnon\"\]"
 1 "icon"
 1 "marker"
 1 "server"
@@ -23,7 +23,7 @@
 1 "chat"
 1 "fade"
 5 "mission"
-1 "kb" !="FoodCanFrankBeans" !="\"FoodCanFrankBeans\"" !"kbTell" !"kbReact"
+1 "kb" !"FoodCanFrankBeans" !"kbTell" !"kbReact" !"kbud\.p3d" !"\"ItemLockbox\"" !"\"ItemLockboxWinter\""
 1 "side"
 1 "show"
 1 "task" !"taskHint"
@@ -258,7 +258,7 @@
 5 player_zombiecheck
 5 r_player_removeactions2
 5 PVDZ_
-5 server_
+5 server !"\"server_rack_kit\""
 5 stream_locationcheck
 5 stream_locationdel
 5 stream_locationfill
--- a/Files/DZE_Server_Config/BattlEye/scripts.txt
+++ b/Files/DZE_Server_Config/BattlEye/scripts.txt