Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch

2025-12-13 19:52:38 +03:00 · 2013-12-11 21:41:32 -08:00
parent 1b83385f9b 25f88d3f5a
commit 90ba54c559
54 changed files with 4112 additions and 771 deletions
--- a/README.md
+++ b/README.md
@@ -22,7 +22,8 @@ Included Custom Addons
 * st_movement by ShackTac https://dev-heaven.net/projects/shacktac/files
 * st_bunnyhop by ShackTac https://dev-heaven.net/projects/shacktac/files
 * Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr and Sahbazz http://www.armaholic.com/page.php?id=13053
-* gdtmod_grass 1.00 by HeinBloed http://www.gdt-server.net/
+* gdtmod_grass 1.00 by HeinBloed - http://www.gdt-server.net/
+* Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143

 --------------------------
 Developers
@@ -43,13 +44,16 @@ Contributors
 * Torndeco - Fixes - https://github.com/Torndeco
 * Armifer - Humanity changes. - https://github.com/Armifer
 * AVendettaForYou - Trader City Tavi - https://github.com/AVendettaForYou
-* Skaronator, krazey - German localization - https://github.com/Skaronator https://github.com/krazey
-* VeryBigBro - Russian localization - https://github.com/VeryBigBro
-* th4z - French localization - https://github.com/th4z
-* JoSchaap - Dutch localization and some typo's - https://github.com/JoSchaap
+* Skaronator, krazey - German Localization - https://github.com/Skaronator https://github.com/krazey
+* VeryBigBro - Russian Localization - https://github.com/VeryBigBro
+* th4z - French Localization - https://github.com/th4z
+* JoSchaap - Dutch Localization and some typo's - https://github.com/JoSchaap
 * Maca134 - Improved Trader Menus, Death Message menu, Experimental hive 999 support - maca134@gmail.com
 * aeinstein - Crafting now supports all can types. - https://github.com/aeinstein
 * vos / Axe Cop - Area Maintenance and ideas - https://github.com/vos
+* GeodarCZ - Czech Localization, correction - https://github.com/Geodar
+* Brovns - Czech Localization - https://github.com/Brovns
+* Doomscythe - Czech Localization, correction - https://github.com/Doomscythe

 --------------------------
 Special thanks
--- a/1.0.3.1.txt
+++ b/1.0.3.1.txt
@@ -1,5 +1,34 @@
 == ROLLING CHANGE LOG 1.0.3.1 ==
-[ADDED] In game clarification on modular removal: you cannot delete locked doors, you must remove the lock first.
+[ADDED] Proper mission file support and bikeys for SMD Sara A2 http://forums.bistudio.com/showthread.php?162282-SMD_Sara_A2-Full-Sahrani-Map-Port-Initial-Release
+[ADDED] In game clarification on modular removal: you cannot delete locked doors, you must remove the lock first. @dayz10k
+[ADDED] Added updated setDamage exception to battleye scripts.txt. @vbawol
+[ADDED] Built in antihack enabled by default via mission init.sqf. @facoptre
+[ADDED] Added Czech localization Credits: GeodarCZ, Brovns, Doomscythe
+[ADDED] DZE_requireplot override variable added. DZE_requireplot = 0; in init.sqf disables plot pole requirement to build. @vbawol
+[ADDED] Bell 47/H-13 Helicopter by hcpookie http://www.armaholic.com/page.php?id=22143

-[FIXED] Incorporated DayZ CE skin changing routines to properly save melee magazines (chainsaw) and add back actions after skin changes. @dayz10k
+[FIXED] Incorporated DayZ CE skin changing routines for melee weapons and add back actions after skin changes. @dayz10k
 [FIXED] Proper stringtables (options) on SkinBase craftables (bandages, canvas) @dayz10k
+[FIXED] Optimized RoadFlare/chemlight JIP code to use only one allMissionObjects call instead of two. @vbawol
+[FIXED] dayz_minpos was incorrectly set to 0 for chernarus and should have been -1 or less. @vbawol
+[FIXED] Fixed some typos in Sahrani mission files. @vbawol
+[FIXED] Removed radar from GAZ Vodnik. @dayz10k
+[FIXED] Incorrect call compile paths for tavi traders.
+[FIXED] Armored SUV DZ had incorrect max weapon count. @vbawol
+[FIXED] Fixed two createvehicle calls for weapon spawn_loot. @Torndeco
+[FIXED] Building count limiter was using wrong position command now uses correct one. @vbawol
+[FIXED] Fire requirement for crafting can now be used off the ground without issues. @vbawol
+
+[CHANGED] setdamage.txt fixes for hatched/chainsaw - scripts.txt and publicVariable.txt updated. @infiSTAR
+[CHANGED] Increased chances for silver and gold mine veins.@vbawol
+[CHANGED] Lower plank pack spawn chance raise sledge handle and fishing pole chances in farm spawns. @vbawol
+[CHANGED] Must drop backpack or filled chainsaw before you can change clothes.  @vbawol
+[CHANGED] Removed 10m check for nearby players when changing clothes.  @vbawol
+[CHANGED] Null cleanup was not working as intended disabled by default needs further testing. @vbawol
+[CHANGED] Lower zombie attack range and made static at 2.5m. @vbawol
+[CHANGED] Restructured server files. @vbawol
+
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://bmrf.me/ for hosting our development server. 
+
+[REMOVED] Many unneeded diag_log calls removed.
--- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp
@@ -337,13 +337,13 @@ class CfgBuildingLoot {
 			0.3,
 			0.18,
 			0.26,
-			0.08,
+			0.06,
 			0.05,
 			0.01,
 			0.03,
-			0.01,
 			0.02,
-			0.01
+			0.02,
+			0.02
 		};
 		itemTypeSmall[] = {
 			{ "","generic" },
--- a/SQF/dayz_code/Configs/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines.hpp
@@ -104,6 +104,70 @@ class CfgMagazines {
 		model = "\ca\CommunityConfigurationProject_E\Gameplay_ActualModelsOfWeaponMagazinesVisibleOnTheGround\p3d\100Rnd_762x51_M240.p3d"; 
 	};

+	// Gems
+	class ItemTopaz : CA_Magazine { 
+		scope = 2; 
+		displayName = "Topaz"; 
+		model = "\z\addons\dayz_epoch\models\topaz.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_topaz_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Topaz"; 
+	};
+	class ItemObsidian : CA_Magazine { 
+		scope = 2; 
+		displayName = "Obsidian"; 
+		model = "\z\addons\dayz_epoch\models\obsidian.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_obsidian_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Obsidian"; 
+	};
+	class ItemSapphire : CA_Magazine { 
+		scope = 2; 
+		displayName = "Sapphire"; 
+		model = "\z\addons\dayz_epoch\models\sapphire.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_sapphire_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Sapphire"; 
+	};
+	class ItemAmethyst : CA_Magazine { 
+		scope = 2; 
+		displayName = "Amethyst"; 
+		model = "\z\addons\dayz_epoch\models\amethyst.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_amethyst_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Amethyst"; 
+	};
+	class ItemEmerald : CA_Magazine { 
+		scope = 2; 
+		displayName = "Emerald"; 
+		model = "\z\addons\dayz_epoch\models\emerald.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_emerald_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Emerald"; 
+	};
+	class ItemCitrine : CA_Magazine { 
+		scope = 2; 
+		displayName = "Citrine"; 
+		model = "\z\addons\dayz_epoch\models\citrine.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_citrine_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Citrine"; 
+	};
+	class ItemRuby : CA_Magazine { 
+		scope = 2; 
+		displayName = "Ruby"; 
+		model = "\z\addons\dayz_epoch\models\ruby.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_ruby_CA.paa";
+		count = 1; 
+		type = "256";
+		descriptionShort = "Ruby"; 
+	};
 	
 	class ItemMixOil : CA_Magazine { 
 		scope = 2; 
--- a/SQF/dayz_code/Configs/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons.hpp
@@ -83,7 +83,7 @@ class CfgWeapons {
 	class ChainSaw: Rifle
 	{
 		scope = 2;
-		melee= "true";
+		//melee= "true";
 		
 		/*
 		bullet1[] = {"ca\sounds\weapons\shells\big_shell_wood_01",0.0707946,1,15};
--- a/SQF/dayz_code/Configs/rscTitles.hpp
+++ b/SQF/dayz_code/Configs/rscTitles.hpp
@@ -872,7 +872,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
 		class CA_B_Abort : CA_B_SAVE {
 			idc = 104;
 			y = 0.2537 + 0.101903 * 4;
-			onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call dayz_forceSave;";
+			onButtonClick = "call dayz_forceSave;";
 			text = $STR_DISP_INT_ABORT;
 			default = 0;
 		};
--- a/SQF/dayz_code/actions/fill_startGenerator.sqf
+++ b/SQF/dayz_code/actions/fill_startGenerator.sqf
@@ -65,7 +65,7 @@ if (_finished) then {

 			// Sound_Generator1
 			// Looks like this was the entended way of making the sound, lets test
-			_soundSource = createSoundSource ["Sound_Generator1", position player, [], 0];
+			_soundSource = createSoundSource ["Sound_Generator1", getPosATL player, [], 0];

 			_vehicle setVariable ["GeneratorSound", _soundSource,true];

@@ -78,7 +78,7 @@ if (_finished) then {

 		// Sound_Generator1
 		// Looks like this was the entended way of making the sound, lets test
-		_soundSource = createSoundSource ["Sound_Generator1", position player, [], 0];
+		_soundSource = createSoundSource ["Sound_Generator1", getPosATL player, [], 0];

 		_vehicle setVariable ["GeneratorSound", _soundSource,true];

--- a/SQF/dayz_code/actions/maintain_area.sqf
+++ b/SQF/dayz_code/actions/maintain_area.sqf
@@ -117,8 +117,8 @@ switch _option do {
 				
 				cutText [format["You have maintained %1 building parts.", _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";
+				//maintainArea_log = [player, _target, _count];
+				//publicVariableServer "maintainArea_log";
 			} else {
 				{player addMagazine _x;} forEach _temp_removed_array;
 				cutText [format["Missing Parts after first check Item: %1 / %2",_removed_total,_tobe_removed_total], "PLAIN DOWN"];
--- a/SQF/dayz_code/actions/player_build.sqf
+++ b/SQF/dayz_code/actions/player_build.sqf
@@ -8,7 +8,7 @@ if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_40") ,
 DZE_ActionInProgress = true;

 // disallow building if too many objects are found within 30m
-if((count ((position player) nearObjects ["All",30])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_41"), "PLAIN DOWN"];};
+if((count ((getPosATL player) nearObjects ["All",30])) >= DZE_BuildingLimit) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_41"), "PLAIN DOWN"];};

 _onLadder =		(getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
 _isWater = 		dayz_isSwimming;
@@ -57,7 +57,7 @@ _needNear = 	getArray (configFile >> "CfgMagazines" >> _item >> "ItemActions" >>
 	switch(_need) do{
 		case "fire":
 		{
-			_isNear = {inflamed _x} count (position player nearObjects _distance);
+			_isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
 			if(_isNear == 0) then {  
 				_abort = true;
 				_reason = "fire";
@@ -99,7 +99,7 @@ if(isNumber (configFile >> "CfgVehicles" >> _classname >> "lockable")) then {
 	_lockable = getNumber(configFile >> "CfgVehicles" >> _classname >> "lockable");
 };

-_requireplot = 1;
+_requireplot = DZE_requireplot;
 if(isNumber (configFile >> "CfgVehicles" >> _classname >> "requireplot")) then {
 	_requireplot = getNumber(configFile >> "CfgVehicles" >> _classname >> "requireplot");
 };
--- a/SQF/dayz_code/actions/player_copyKey.sqf
+++ b/SQF/dayz_code/actions/player_copyKey.sqf
@@ -16,7 +16,7 @@ if (!_haskey) exitWith {DZE_ActionInProgress = false; cutText [format[(localize
 _hastoolweapon = "ItemKeyKit" in weapons player;
 if (!_hastoolweapon) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_57") , "PLAIN DOWN"]};

-_isNear = {inflamed _x} count (position player nearObjects 3);
+_isNear = {inflamed _x} count (getPosATL player nearObjects 3);
 if(_isNear == 0) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_58") , "PLAIN DOWN"]};

 call gear_ui_init;
--- a/SQF/dayz_code/actions/player_countmagazines.sqf
+++ b/SQF/dayz_code/actions/player_countmagazines.sqf
@@ -10,8 +10,8 @@ _dialog = findDisplay 106;
 _created = false;
 if ( isNull _dialog ) then { 
 	//startLoadingScreen [""];
-createGearDialog [player, "RscDisplayGear"];
-_dialog = 			findDisplay 106;
+	createGearDialog [player, "RscDisplayGear"];
+	_dialog = 			findDisplay 106;
 	_created = true;
 };

--- a/SQF/dayz_code/actions/player_craftItem.sqf
+++ b/SQF/dayz_code/actions/player_craftItem.sqf
@@ -1,6 +1,6 @@
 /*
 	DayZ Epoch Crafting 0.3
-	Made for DayZ Unleashed by [VB]AWOL please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
+	Made for DayZ Epoch and Unleashed by [VB]AWOL please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
 	Thanks to thevisad for help with the spawn call fixes.

 USAGE EXAMPLE:
@@ -42,7 +42,7 @@ _canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
 // Need Near Requirements
 _needNear = getArray (configFile >> _baseClass >> _item >> "ItemActions" >> _crafting >> "neednearby");
 if("fire" in _needNear) then {
-	_isNear = {inflamed _x} count (position player nearObjects _distance);
+	_isNear = {inflamed _x} count (getPosATL player nearObjects _distance);
 	if(_isNear == 0) then {  
 		_abort = true;
 		_reason = "fire";
--- a/SQF/dayz_code/actions/player_drink.sqf
+++ b/SQF/dayz_code/actions/player_drink.sqf
@@ -53,9 +53,11 @@ if (_hasoutput and !_invehicle) then {
    _itemtodrop = drink_output select (drink_with_output find _itemorignal);

    sleep 3;
-    _nearByPile= nearestObjects [(position player), ["WeaponHolder","WeaponHolderBase"],2];
+    _nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2];
    if (count _nearByPile ==0) then { 
-        _item = createVehicle ["WeaponHolder", position player, [], 0.0, "CAN_COLLIDE"];
+		_iPos = getPosATL player;
+		_radius = 0.0;
+		_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
    } else {
        _item = _nearByPile select 0;
    };
--- a/SQF/dayz_code/actions/player_eat.sqf
+++ b/SQF/dayz_code/actions/player_eat.sqf
@@ -53,9 +53,11 @@ if (_hasoutput and !_invehicle) then {
    _itemtodrop = food_output select (food_with_output find _itemorignal);

    sleep 3;
-    _nearByPile= nearestObjects [(position player), ["WeaponHolder","WeaponHolderBase"],2];
+    _nearByPile= nearestObjects [(getposATL player), ["WeaponHolder","WeaponHolderBase"],2];
    if (count _nearByPile ==0) then { 
-        _item = createVehicle ["WeaponHolder", position player, [], 0.0, "CAN_COLLIDE"];
+        _iPos = getPosATL player;
+		_radius = 0.0;
+		_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
    } else {
        _item = _nearByPile select 0;
    };
--- a/SQF/dayz_code/actions/player_loadCrate.sqf
+++ b/SQF/dayz_code/actions/player_loadCrate.sqf
@@ -1,4 +1,4 @@
-private ["_dir","_classname","_box","_location","_item","_config","_create_raw","_create","_qty","_type","_hasCrate","_hasTool"];
+private ["_dir","_classname","_b0x1337","_location","_item","_config","_create_raw","_create","_qty","_type","_hasCrate","_hasTool"];

 if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_75") , "PLAIN DOWN"]; };
 DZE_ActionInProgress = true;
@@ -40,23 +40,23 @@ player addMagazine "bulk_empty";
 player playActionNow "Medic";
 sleep 6;
 		
-_box = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
-_box setDir _dir;
+_b0x1337 = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
+_b0x1337 setDir _dir;

 // Fill box with Items from config.
 if(_type == "magazine") then {
-	_box addMagazineCargoGlobal [_create,_qty];
+	_b0x1337 addMagazineCargoGlobal [_create,_qty];
 };
 if(_type == "weapon") then {
-	_box addWeaponCargoGlobal [_create,_qty];
+	_b0x1337 addWeaponCargoGlobal [_create,_qty];
 };
 if(_type == "backpack") then {
-	_box addBackpackCargoGlobal  [_create,_qty];
+	_b0x1337 addBackpackCargoGlobal  [_create,_qty];
 };

-player reveal _box;
+player reveal _b0x1337;

-player action ["Gear", _box];
+player action ["Gear", _b0x1337];
 		
 cutText [(localize "str_epoch_player_78"), "PLAIN DOWN"];
 	
--- a/SQF/dayz_code/actions/player_wearClothes.sqf
+++ b/SQF/dayz_code/actions/player_wearClothes.sqf
@@ -7,10 +7,6 @@ private ["_item","_onLadder","_hasclothesitem","_config","_text","_myModel","_it
 if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_83") , "PLAIN DOWN"] };
 DZE_ActionInProgress = true;

-// cannot change clothes when another player is nearby
-_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
-if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_84") , "PLAIN DOWN"];  };
-
 _item = _this;
 call gear_ui_init;

@@ -21,9 +17,13 @@ _hasclothesitem = _this in magazines player;
 _config = configFile >> "CfgMagazines";
 _text = getText (_config >> _item >> "displayName");

-if (!_hasclothesitem) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_player_31"),_text,"wear"] , "PLAIN DOWN"]};
+if (!_hasclothesitem) exitWith { DZE_ActionInProgress = false; cutText [format[(localize "str_player_31"),_text,"wear"] , "PLAIN DOWN"]};

-if (vehicle player != player) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_85"), "PLAIN DOWN"]};
+if (vehicle player != player) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_85"), "PLAIN DOWN"]};
+
+if (!isNull (unitBackpack player)) exitWith { DZE_ActionInProgress = false; cutText ["\n\nUnable to change clothes while wearing backpack.", "PLAIN DOWN"] };
+
+if ("CSGAS" in (magazines player)) exitWith { DZE_ActionInProgress = false; cutText ["\n\nUnable to change clothes while carrying a filled chainsaw.", "PLAIN DOWN"] };

 _myModel = (typeOf player);
 _itemNew = "Skin_" + _myModel;
--- a/SQF/dayz_code/compile/player_lockVault.sqf
+++ b/SQF/dayz_code/compile/player_lockVault.sqf
@@ -43,11 +43,11 @@ _pos = _obj getVariable["OEMPos",(getposATL _obj)];

 if(!isNull _obj) then {

-	// force vault save just before locking
+	//force vault save just before locking
 	PVDZE_veh_Update = [_obj,"gear"];
 	publicVariableServer "PVDZE_veh_Update";

-	//place tent (local)
+	//place vault
 	_holder = createVehicle [_lockedClass,_pos,[], 0, "CAN_COLLIDE"];
 	_holder setdir _dir;
 	_holder setPosATL _pos;
@@ -79,4 +79,4 @@ if(!isNull _obj) then {
 	cutText [format[(localize "str_epoch_player_117"),_text], "PLAIN DOWN"];
 };
 s_player_lockvault = -1;
-DZE_ActionInProgress = false;
+DZE_ActionInProgress = false;
--- a/SQF/dayz_code/compile/player_onPause.sqf
+++ b/SQF/dayz_code/compile/player_onPause.sqf
@@ -1,52 +1,60 @@
 private ["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax","_btnAbortText"];
-		disableSerialization;
-		waitUntil {
-			_display = findDisplay 49;
-			!isNull _display;
-		};
-		_btnRespawn = _display displayCtrl 1010;
-		_btnAbort = _display displayCtrl 104;
-		_btnRespawn ctrlEnable false;
-		_btnAbort ctrlEnable false;
-		_btnAbortText = ctrlText _btnAbort;
-		_timeOut = 0;
-		_timeMax = diag_tickTime+10;
-		dayz_lastCheckBit = time;
+disableSerialization;
+waitUntil {
+	_display = findDisplay 49;
+	!isNull _display;
+};
+_btnRespawn = _display displayCtrl 1010;
+_btnAbort = _display displayCtrl 104;
+_btnRespawn ctrlEnable false;
+_btnAbort ctrlEnable false;
+_btnAbortText = ctrlText _btnAbort;
+_timeOut = 0;
+_timeMax = diag_tickTime+10;
+dayz_lastCheckBit = time;
 		
-		// if(r_player_dead) exitWith {_btnAbort ctrlEnable true;};
-		if(r_fracture_legs) then {_btnRespawn ctrlEnable true;};
+// if(r_player_dead) exitWith {_btnAbort ctrlEnable true;};
+if(r_fracture_legs) then {_btnRespawn ctrlEnable true;};
 		
-		//force gear save
-		if (!r_player_dead and time - dayz_lastCheckBit > 10) then {
-			call dayz_forceSave;
-		};			
-				
-		while {!isNull _display} do {
-			switch true do {
-				case (!r_player_dead and {isPlayer _x} count (player nearEntities ["AllVehicles", 12]) > 1) : {
-					_btnAbort ctrlEnable false;
-					cutText [localize "str_abort_playerclose", "PLAIN DOWN"];
-				};
-				case (!r_player_dead and !canbuild) : {
-					_btnAbort ctrlEnable false;
-					cutText [(localize "str_epoch_player_12"), "PLAIN DOWN"];
-				};
-				case (!r_player_dead and player getVariable["combattimeout", 0] >= time) : {
-					_btnAbort ctrlEnable false;
-					//cutText ["Cannot Abort while in combat!", "PLAIN DOWN"];
-					cutText [localize "str_abort_playerincombat", "PLAIN DOWN"];					
-				};
-				case (_timeOut < _timeMax) : {
-					_btnAbort ctrlEnable false;
-					_btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeMax - diag_tickTime)];
-				};
-				default {
-					_btnAbort ctrlEnable true;
-					_btnAbort ctrlSetText _btnAbortText;
-					cutText ["", "PLAIN DOWN"];				
-				};
-			};
-			sleep 1;
-			_timeOut = diag_tickTime;
+//force gear save
+if (!r_player_dead and time - dayz_lastCheckBit > 10) then {
+	call dayz_forceSave;
+};			
+		
+_sleep = 1;
+
+while {!isNull _display} do {
+	switch true do {
+		case (!r_player_dead and {isPlayer _x} count (player nearEntities ["AllVehicles", 12]) > 1) : {
+			_btnAbort ctrlEnable false;
+			cutText [localize "str_abort_playerclose", "PLAIN DOWN"];
+			_sleep = 1;
 		};
-		cutText ["", "PLAIN DOWN"];
+		case (!r_player_dead and !canbuild) : {
+			_btnAbort ctrlEnable false;
+			cutText [(localize "str_epoch_player_12"), "PLAIN DOWN"];
+			_sleep = 1;
+		};
+		case (!r_player_dead and player getVariable["combattimeout", 0] >= time) : {
+			_btnAbort ctrlEnable false;
+			//cutText ["Cannot Abort while in combat!", "PLAIN DOWN"];
+			cutText [localize "str_abort_playerincombat", "PLAIN DOWN"];
+			_sleep = 1;
+		};
+		case (_timeOut < _timeMax) : {
+			_btnAbort ctrlEnable false;
+			_btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, (ceil ((_timeMax - diag_tickTime)*10)/10)];
+			cutText ["", "PLAIN DOWN"];	
+			_sleep = 0.1;
+		};
+		default {
+			_btnAbort ctrlEnable true;
+			_btnAbort ctrlSetText _btnAbortText;
+			cutText ["", "PLAIN DOWN"];	
+			_sleep = 1;
+		};
+	};
+	sleep _sleep;
+	_timeOut = diag_tickTime;
+};
+cutText ["", "PLAIN DOWN"];
--- a/SQF/dayz_code/compile/player_packVault.sqf
+++ b/SQF/dayz_code/compile/player_packVault.sqf
@@ -6,7 +6,7 @@ private ["_activatingPlayer","_obj","_ownerID","_objectID","_objectUID","_alread
 if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_15") , "PLAIN DOWN"]; };
 DZE_ActionInProgress = true;

-_activatingPlayer = getPlayerUID player;
+_activatingPlayer = player;

 _obj = _this;

--- a/SQF/dayz_code/compile/player_switchModel.sqf
+++ b/SQF/dayz_code/compile/player_switchModel.sqf
@@ -1,4 +1,4 @@
-private ["_class","_position","_dir","_group","_oldUnit","_newUnit","_currentWpn","_muzzles","_currentAnim","_playerUID","_weapons","_magazines","_primweapon","_secweapon","_newBackpackType","_backpackWpn","_backpackMag","_backpackWpnTypes","_backpackWpnQtys","_countr","_backpackmagTypes","_backpackmagQtys","_playerObjName"];
+private ["_class","_position","_dir","_group","_oldUnit","_newUnit","_currentWpn","_muzzles","_currentAnim","_playerUID","_weapons","_magazines","_primweapon","_secweapon","_playerObjName","_wpnType","_ismelee","_tagSetting"];
 _class 			= _this;

 _position 		= getPosATL player;
@@ -6,61 +6,45 @@ _dir 			= getDir player;
 _currentAnim 	= animationState player;
 //_currentCamera	= cameraView;

+_tagSetting = player getVariable["DZE_display_name",false];

 //Get PlayerID
-private ["_playerUID"];
-	_playerUID = "";
-	if (count playableUnits == 0 and isServer) then {
-		//In Single Player
-		isSinglePlayer = true;
-		player sidechat "Single player Mode detected!";
-		//_id = [42,"SinglePlayer"] spawn server_onPlayerConnect;
-		_playerUID = "42";
-	} else {
-		_playerUID = getPlayerUID player;
-	};
+_playerUID = "";
+if (count playableUnits == 0 and isServer) then {
+	//In Single Player
+	isSinglePlayer = true;
+	player sidechat "Single player Mode detected!";
+	//_id = [42,"SinglePlayer"] spawn server_onPlayerConnect;
+	_playerUID = "42";
+} else {
+	_playerUID = getPlayerUID player;
+};

 //BackUp Weapons and Mags
-private ["_weapons","_magazines","_primweapon","_secweapon"];
-	_weapons 	= weapons player;
-	_magazines	= call player_countmagazines; //magazines player;

-	if ( (_playerUID == dayz_playerUID) && (count _magazines == 0) && (count (magazines player) > 0 )) exitWith {cutText [(localize "str_epoch_player_17"), "PLAIN DOWN"]};
+_weapons 	= weapons player;
+_magazines	= call player_countmagazines; //magazines player;

+if ( (_playerUID == dayz_playerUID) && (count _magazines == 0) && (count (magazines player) > 0 )) exitWith {cutText [(localize "str_epoch_player_17"), "PLAIN DOWN"]};

-//	if ( count _magazines == 0 ) exitWith {cutText [(localize "str_epoch_player_17"), "PLAIN DOWN"]};
+_primweapon	= primaryWeapon player;
+_secweapon	= secondaryWeapon player;

-	_primweapon	= primaryWeapon player;
-	_secweapon	= secondaryWeapon player;
+//Checks
+if(!(_primweapon in _weapons) && _primweapon != "") then {
+	_weapons = _weapons + [_primweapon];
+};

-	//Checks
-	if(!(_primweapon in _weapons) && _primweapon != "") then {
-		_weapons = _weapons + [_primweapon];
-	};
-
-	if(!(_secweapon in _weapons) && _secweapon != "") then {
-		_weapons = _weapons + [_secweapon];
-	};
-	
-//	if(count _magazines == 0) then {
-//		_magazines = magazines player;
-//	};
-
-//BackUp Backpack
-private ["_newBackpackType","_backpackWpn","_backpackMag"];
-	dayz_myBackpack = unitBackpack player;
-	_newBackpackType = (typeOf dayz_myBackpack);
-	if(_newBackpackType != "") then {
-		_backpackWpn = getWeaponCargo unitBackpack player;
-		_backpackMag = getMagazineCargo unitBackpack player;
-	};
+if(!(_secweapon in _weapons) && _secweapon != "") then {
+	_weapons = _weapons + [_secweapon];
+};

 //Get Muzzle
-	_currentWpn = currentWeapon player;
-	_muzzles = getArray(configFile >> "cfgWeapons" >> _currentWpn >> "muzzles");
-	if (count _muzzles > 1) then {
-		_currentWpn = currentMuzzle player;
-	};
+_currentWpn = currentWeapon player;
+_muzzles = getArray(configFile >> "cfgWeapons" >> _currentWpn >> "muzzles");
+if (count _muzzles > 1) then {
+	_currentWpn = currentMuzzle player;
+};

 //Debug Message
 /*
@@ -70,112 +54,75 @@ diag_log str(_magazines);
 diag_log (str(_backpackWpn));
 diag_log (str(_backpackMag));
 */
+
 //Secure Player for Transformation
-	player setPosATL dayz_spawnPos;
+player setPosATL dayz_spawnPos;

 //BackUp Player Object
-	_oldUnit = player;
+_oldUnit = player;
 	
 /***********************************/
 //DONT USE player AFTER THIS POINT
 /***********************************/

 //Create New Character
-	//[player] joinSilent grpNull;
-	_group 		= createGroup west;
-	_newUnit 	= _group createUnit [_class,dayz_spawnPos,[],0,"NONE"];
+//[player] joinSilent grpNull;
+_group 		= createGroup west;
+_newUnit 	= _group createUnit [_class,dayz_spawnPos,[],0,"NONE"];

-	_newUnit 	setPosATL _position;
-	_newUnit 	setDir _dir;
+_newUnit 	setPosATL _position;
+_newUnit 	setDir _dir;

-	//Clear New Character
-	{_newUnit removeMagazine _x;} forEach  magazines _newUnit;
-	removeAllWeapons _newUnit;	
+//Clear New Character
+{_newUnit removeMagazine _x;} forEach  magazines _newUnit;
+removeAllWeapons _newUnit;	

-	//Equip New Charactar
-	{
-		if (typeName _x == "ARRAY") then {_newUnit addMagazine [_x select 0,_x select 1] } else { _newUnit addMagazine _x };
-		//sleep 0.05;
-	} forEach _magazines;
+//Equip New Charactar
+{
+	if (typeName _x == "ARRAY") then {_newUnit addMagazine [_x select 0,_x select 1] } else { _newUnit addMagazine _x };
+} forEach _magazines;
 	
-	{
-		_newUnit addWeapon _x;
-		//sleep 0.05;
-	} forEach _weapons;
+{
+	_newUnit addWeapon _x;
+} forEach _weapons;

 //Check and Compare it
-	if(str(_weapons) != str(weapons _newUnit)) then {
-		//Get Differecnce
-		{
-			_weapons = _weapons - [_x];
-		} forEach (weapons _newUnit);
+if(str(_weapons) != str(weapons _newUnit)) then {
+	//Get Differecnce
+	{
+		_weapons = _weapons - [_x];
+	} forEach (weapons _newUnit);
 	
-		//Add the Missing
-		{
-			_newUnit addWeapon _x;
-			//sleep 0.2;
-		} forEach _weapons;
-	};
+	//Add the Missing
+	{
+		_newUnit addWeapon _x;
+	} forEach _weapons;
+};
 	
-	if(_primweapon !=  (primaryWeapon _newUnit)) then {
-		_newUnit addWeapon _primweapon;		
-	};
+if(_primweapon !=  (primaryWeapon _newUnit)) then {
+	_newUnit addWeapon _primweapon;		
+};

-	if (_primweapon == "MeleeCrowbar") then {
-		_newUnit addMagazine 'crowbar_swing';
-	};
-	if (_primweapon == "MeleeSledge") then {
-		_newUnit addMagazine 'sledge_swing';
-	};
-	if (_primweapon == "MeleeHatchet_DZE") then {
-		_newUnit addMagazine 'Hatchet_Swing';
-	};
-	if (_primweapon == "MeleeMachete") then {
-		_newUnit addMagazine 'Machete_swing';
-	};
-	if (_primweapon == "MeleeFishingPole") then {
-		_newUnit addMagazine 'Fishing_Swing';
-	};
+if (_primweapon == "MeleeCrowbar") then {
+	_newUnit addMagazine 'crowbar_swing';
+};
+if (_primweapon == "MeleeSledge") then {
+	_newUnit addMagazine 'sledge_swing';
+};
+if (_primweapon == "MeleeHatchet_DZE") then {
+	_newUnit addMagazine 'Hatchet_Swing';
+};
+if (_primweapon == "MeleeMachete") then {
+	_newUnit addMagazine 'Machete_swing';
+};
+if (_primweapon == "MeleeFishingPole") then {
+	_newUnit addMagazine 'Fishing_Swing';
+};

-	if(_secweapon != (secondaryWeapon _newUnit) && _secweapon != "") then {
-		_newUnit addWeapon _secweapon;		
-	};
+if(_secweapon != (secondaryWeapon _newUnit) && _secweapon != "") then {
+	_newUnit addWeapon _secweapon;		
+};

-//Add and Fill BackPack
-	if (!isNil "_newBackpackType") then {
-		if (_newBackpackType != "") then {
-			_newUnit addBackpack _newBackpackType;
-			//_oldBackpack = dayz_myBackpack;
-			dayz_myBackpack = unitBackpack _newUnit;
-
-
-			//Fill backpack contents
-			//Weapons
-			_backpackWpnTypes = [];
-			_backpackWpnQtys = [];
-			if (count _backpackWpn > 0) then {
-				_backpackWpnTypes = _backpackWpn select 0;
-				_backpackWpnQtys = 	_backpackWpn select 1;
-			};
-			_countr = 0;
-			{
-				dayz_myBackpack addWeaponCargoGlobal [_x,(_backpackWpnQtys select _countr)];
-				_countr = _countr + 1;
-			} forEach _backpackWpnTypes;
-			//magazines
-			_backpackmagTypes = [];
-			_backpackmagQtys = [];
-			if (count _backpackmag > 0) then {
-				_backpackmagTypes = _backpackMag select 0;
-				_backpackmagQtys = 	_backpackMag select 1;
-			};
-			_countr = 0;
-			{
-				dayz_myBackpack addmagazineCargoGlobal [_x,(_backpackmagQtys select _countr)];
-				_countr = _countr + 1;
-			} forEach _backpackmagTypes;
-		};
-	};
 //Debug Message
 /*
 diag_log "Swichtable Unit Created. Equipment:";
@@ -185,38 +132,41 @@ diag_log str(getWeaponCargo unitBackpack _newUnit);
 diag_log str(getMagazineCargo unitBackpack _newUnit);
 */
 //Make New Unit Playable
-	addSwitchableUnit _newUnit;
-	setPlayable _newUnit;
-	selectPlayer _newUnit;
+addSwitchableUnit _newUnit;
+setPlayable _newUnit;
+selectPlayer _newUnit;

 //Clear and delete old Unit
-	removeAllWeapons _oldUnit;
-	{_oldUnit removeMagazine _x;} forEach  magazines _oldUnit;
+removeAllWeapons _oldUnit;
+{_oldUnit removeMagazine _x;} forEach  magazines _oldUnit;
 		
-	deleteVehicle _oldUnit;
+deleteVehicle _oldUnit;

 //Move player inside

 //	player switchCamera = _currentCamera;
-	if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
-	[objNull, player, rSwitchMove,_currentAnim] call RE;
-	//dayz_originalPlayer attachTo [_newUnit];
-	player disableConversation true;
+if(_currentWpn != "") then {_newUnit selectWeapon _currentWpn;};
+[objNull, player, rSwitchMove,_currentAnim] call RE;
+//dayz_originalPlayer attachTo [_newUnit];
+player disableConversation true;
 	
-	player setVariable ["bodyName",dayz_playerName,true];
+player setVariable ["bodyName",dayz_playerName,true];

-	_playerUID=getPlayerUID player;
-	_playerObjName = format["player%1",_playerUID];
-	call compile format["%1 = player;",_playerObjName];
-	publicVariable _playerObjName;
+if (_tagSetting) then {
+	DZE_ForceNameTags = true;
+};
+
+_playerUID=getPlayerUID player;
+_playerObjName = format["player%1",_playerUID];
+call compile format["%1 = player;",_playerObjName];
+publicVariable _playerObjName;
 	
 //melee check
-        _wpnType = primaryWeapon player;
-        _ismelee = (gettext (configFile >> "CfgWeapons" >> _wpnType >> "melee"));
-        if (_ismelee == "true") then {
-                call dayz_meleeMagazineCheck;
-        };
+_wpnType = primaryWeapon player;
+_ismelee = (gettext (configFile >> "CfgWeapons" >> _wpnType >> "melee"));
+if (_ismelee == "true") then {
+	call dayz_meleeMagazineCheck; 
+};
        
-//reveal all near objects.
-        {player reveal _x} forEach (nearestObjects [getPosATL player, ["All"], 75]);
-        //All is arbitrary and will need to be changed to ["AllVehicles","WeaponHolder","tentStorage"] ++ others (stashes etc.)
+//reveal the same objects we do on login
+{player reveal _x} forEach (nearestObjects [getPosATL player, dayz_reveal, 50]);
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -614,7 +614,7 @@ if(!isDedicated) then {
 	dayz_clientPreload = 	false;
 	dayz_authed = 			false;
 	dayz_panicCooldown = 	0;
-	dayz_areaAffect =		3.5;
+	dayz_areaAffect =		2.5;
 	dayz_heartBeat = 		false;
 	dayzClickTime =			0;
 	dayz_spawnDelay =		120;
@@ -659,6 +659,10 @@ if(!isDedicated) then {
 	if(isNil "DZE_AntiWallLimit") then {
 		DZE_AntiWallLimit = 1;
 	};
+	if(isNil "DZE_requireplot") then {
+		DZE_requireplot = 1;
+	};
+	
 	
 	DZE_AntiWallCounter = 0;

--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -1,4 +1,4 @@
-/*%FSM<COMPILE "D:\Programme\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Player Monitor">*/
+/*%FSM<COMPILE "F:\Program Files (x86)\Bohemia Interactive\Tools\FSM Editor Personal Edition\scriptedFSM.cfg, DayZ Player Monitor">*/
 /*%FSM<HEAD>*/
 /*
 item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"};
@@ -24,11 +24,11 @@ item19[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.00000
 item20[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"};
 item21[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"};
 item22[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"};
-item23[] = {"ERROR__Player_Already",2,4346,175.000000,700.000000,275.000000,750.000000,0.000000,"ERROR:" \n "Player Already" \n "Dead"};
+item23[] = {"ERROR__Player_Already",2,250,175.000000,700.000000,275.000000,750.000000,0.000000,"ERROR:" \n "Player Already" \n "Dead"};
 item24[] = {"Alive",4,218,-175.000000,750.000000,-75.000000,800.000000,0.000000,"Alive"};
 item25[] = {"Position",2,250,-75.000000,800.000000,25.000000,850.000000,0.000000,"Position"};
 item26[] = {"Version_Ok",4,218,-175.000000,850.000000,-75.000000,900.000000,0.000000,"Version" \n "Ok"};
-item27[] = {"Load_In",2,250,-75.000000,1000.000000,25.000000,1050.000000,0.000000,"Load In"};
+item27[] = {"Load_In",2,4346,-75.000000,1000.000000,25.000000,1050.000000,0.000000,"Load In"};
 item28[] = {"Bad_Version",4,218,50.000000,800.000000,150.000000,850.000000,0.000000,"Bad" \n "Version"};
 item29[] = {"ERROR__Bad_Versi",2,250,175.000000,800.000000,275.000000,850.000000,0.000000,"ERROR:" \n "Bad Version"};
 item30[] = {"Display_Ready",4,218,-175.000000,1050.000000,-75.000000,1100.000000,0.000000,"Display" \n "Ready"};
@@ -147,8 +147,8 @@ link74[] = {64,57};
 link75[] = {65,13};
 link76[] = {66,67};
 link77[] = {67,18};
-globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-472.070313,354.276123,1027.252686,179.503510,573,613,1};
-window[] = {2,-1,-1,-32000,-32000,979,376,1654,221,1,591};
+globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-472.070313,354.276123,1514.247314,631.657410,581,630,1};
+window[] = {2,-1,-1,-1,-1,793,-39,1239,35,3,599};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -978,8 +978,13 @@ class FSM
       "0 fadeMusic 0.5;" \n
       "" \n
       "//Check mission objects" \n
-       "{ _id = [_x,0] spawn object_roadFlare } forEach (entities ""RoadFlare"");" \n
-       "{ _id = [_x,1] spawn object_roadFlare } forEach (entities ""ChemLight"");"/*%FSM</STATEINIT""">*/;
+       "{ " \n
+       "	if (typeOf _x == ""RoadFlare"") then { " \n
+       "		_id = [_x,0] spawn object_roadFlare " \n
+       "	} else {" \n
+       "		 _id = [_x,1] spawn object_roadFlare " \n
+       "	};" \n
+       " } forEach (allMissionObjects ""LitObject"");"/*%FSM</STATEINIT""">*/;
      precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
      class Links
      {
--- a/SQF/dayz_code/system/player_spawn_2.sqf
+++ b/SQF/dayz_code/system/player_spawn_2.sqf
@@ -18,11 +18,11 @@ while {true} do {
 	_refObj = 	vehicle player;
 	_factor = 0.6;
 	_inVehicle = (_refObj != player);
-	_size = 	(sizeOf typeOf _refObj) * _factor;
+	// _size = 	(sizeOf typeOf _refObj) * _factor;
 	_vel = 		velocity player;
 	_speed = 	round((_vel distance [0,0,0]) * 3.5);
 	
-	dayz_areaAffect = _size;
+	// dayz_areaAffect = _size;
 	
 	//Record Check
 	_lastUpdate = 	time - dayZ_lastPlayerUpdate;
@@ -150,17 +150,14 @@ while {true} do {
 		if(_radTimer > 5 AND _radTimer < 10) then {
 			_radsound = "radzone2";
 			_bloodloss = 20;
-			playSound "breath_1";
 		};
 		if(_radTimer > 10) then {
 			_radsound = "radzone3";
 			_bloodloss = 30;
-			addCamShake [2, 1, 25];
 		};
 		if(_radTimer > 15) then {
 			_radsound = "radzone4";
 			_bloodloss = 50;
-			[player,"cough",_rnd,false,9] call dayz_zombieSpeak;
 		};
 		_result = r_player_blood - _bloodloss;
 		if (_result < 0) then {
@@ -168,7 +165,7 @@ while {true} do {
 		} else {
 			r_player_blood = _result;
 		};
-		
+		addCamShake [2, 1, 25];
 		[player,_radsound,0,true] call dayz_zombieSpeak;
 		_radTimer = _radTimer + 1;
 	} else {
@@ -177,7 +174,7 @@ while {true} do {
 	
 	// Health uptick when healty not thirsty or hungry
 	if (_foodVal >= 0.9 and _thirstVal >= 0.9) then {
-		if (!r_player_infected and !r_player_inpain and !r_player_injured) then {
+		if (!r_player_infected and !r_player_inpain and !r_player_injured and !DZE_InRadiationZone) then {
 			_result = r_player_blood + 10;
 			if (_result >= r_player_bloodTotal) then {
 				r_player_blood = r_player_bloodTotal;
@@ -220,14 +217,14 @@ while {true} do {
 	// If in combat, display counter and restrict logout
 	_startcombattimer      = player getVariable["startcombattimer",0];
 	if (_startcombattimer == 1) then {
-		player setVariable["combattimeout", diag_tickTime + 30, true];
+		player setVariable["combattimeout", time + 30, true];
 		player setVariable["startcombattimer", 0, true];
 		dayz_combat = 1;
 	};

 	_combattimeout = player getVariable["combattimeout",0];
 	if (_combattimeout > 0) then {
-		_timeleft = _combattimeout - diag_tickTime;
+		_timeleft = _combattimeout - time;
 		if (_timeleft > 0) then {
 			//hintSilent format["In Combat: %1",round(_timeleft)];
 		} else {
--- a/SQF/dayz_epoch_b/stringtable.xml
+++ b/SQF/dayz_epoch_b/stringtable.xml
--- a/SQF/dayz_server/init/server_functions.sqf
+++ b/SQF/dayz_server/init/server_functions.sqf
@@ -450,7 +450,7 @@ spawn_mineveins = {

 			if(isOnRoad _position) exitWith { diag_log("DEBUG VEIN: on road " + str(_position)); };
 			
-			_spawnveh = ["Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Gold_Vein_DZE"] call BIS_fnc_selectRandom;
+			_spawnveh = ["Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Iron_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Silver_Vein_DZE","Gold_Vein_DZE","Gold_Vein_DZE"] call BIS_fnc_selectRandom;

 			if(DZEdebug) then {
 				_marker = createMarker [str(_position) , _position];
--- a/SQF/dayz_server/missions/DayZ_Epoch_22.smd_sahrani_A2/dynamic_vehicle.sqf
+++ b/SQF/dayz_server/missions/DayZ_Epoch_22.smd_sahrani_A2/dynamic_vehicle.sqf
@@ -0,0 +1,114 @@
+AllowedVehiclesList = [
+["AH6X_DZ",3],
+["AN2_DZ",3],
+["ArmoredSUV_PMC_DZE",1],
+["ATV_CZ_EP1",3],
+["ATV_US_EP1",3],
+["C130J_US_EP1",1],
+["car_hatchback",3],
+["car_sedan",3],
+["CH_47F_EP1_DZE",1],
+["CSJ_GyroC",3],
+["CSJ_GyroCover",3],
+["CSJ_GyroP",3],
+["datsun1_civil_1_open",3],
+["datsun1_civil_2_covered",3],
+["datsun1_civil_3_open",3],
+["Fishing_Boat",3],
+["GAZ_Vodnik_DZE",1],
+["GAZ_Vodnik_MedEvac",1],
+["GLT_M300_LT",3],
+["GLT_M300_ST",3],
+["GNT_C185",1],
+["GNT_C185C",1],
+["GNT_C185R",1],
+["GNT_C185U",1],
+["hilux1_civil_1_open",3],
+["hilux1_civil_2_covered",3],
+["hilux1_civil_3_open_EP1",3],
+["HMMWV_Ambulance",1],
+["HMMWV_Ambulance_CZ_DES_EP1",1],
+["HMMWV_DES_EP1",3],
+["HMMWV_DZ",3],
+["HMMWV_M1035_DES_EP1",1],
+["HMMWV_M1151_M2_CZ_DES_EP1_DZE",1],
+["HMMWV_M998A2_SOV_DES_EP1_DZE",1],
+["Ikarus",3],
+["Ikarus_TK_CIV_EP1",3],
+["JetSkiYanahui_Case_Blue",1],
+["JetSkiYanahui_Case_Green",1],
+["JetSkiYanahui_Case_Red",1],
+["JetSkiYanahui_Case_Yellow",1],
+["Kamaz",3],
+["KamazRefuel_DZ",1],
+["Lada1",3],
+["Lada1_TK_CIV_EP1",3],
+["Lada2",3],
+["Lada2_TK_CIV_EP1",3],
+["LadaLM",3],
+["LandRover_CZ_EP1",3],
+["LandRover_MG_TK_EP1_DZE",1],
+["LandRover_Special_CZ_EP1_DZE",1],
+["LandRover_TK_CIV_EP1",3],
+["M1030_US_DES_EP1",3],
+["MH6J_DZ",3],
+["Mi17_Civilian_DZ",3],
+["Mi17_DZE",3],
+["MMT_Civ",6],
+["MtvrRefuel_DES_EP1_DZ",1],
+["MTVR_DES_EP1",3],
+["MV22_DZ",1],
+["Offroad_DSHKM_Gue_DZE",3],
+["Old_bike_TK_INS_EP1",3],
+["Old_moto_TK_Civ_EP1",3],
+["PBX",3],
+["Pickup_PK_GUE_DZE",3],
+["Pickup_PK_INS_DZE",3],
+["Pickup_PK_TK_GUE_EP1_DZE",3],
+["RHIB",3],
+["S1203_ambulance_EP1",3],
+["S1203_TK_CIV_EP1",3],
+["Skoda",3],
+["SkodaBlue",3],
+["SkodaGreen",3],
+["SkodaRed",3],
+["Smallboat_1",3],
+["Smallboat_2",3],
+["SUV_Blue",1],
+["SUV_Camo",1],
+["SUV_Charcoal",1],
+["SUV_Green",1],
+["SUV_Orange",1],
+["SUV_Pink",1],
+["SUV_Red",1],
+["SUV_Silver",1],
+["SUV_TK_CIV_EP1",1],
+["SUV_White",1],
+["SUV_Yellow",1],
+["tractor",3],
+["TT650_Civ",3],
+["TT650_Ins",3],
+["TT650_TK_CIV_EP1",3],
+["UAZ_CDF",3],
+["UAZ_INS",3],
+["UAZ_MG_TK_EP1_DZE",3],
+["UAZ_RU",3],
+["UAZ_Unarmed_TK_CIV_EP1",3],
+["UAZ_Unarmed_TK_EP1",3],
+["UAZ_Unarmed_UN_EP1",3],
+["UH1H_DZE",2],
+["UH1Y_DZE",2],
+["UH60M_EP1_DZE",1],
+["UralRefuel_TK_EP1_DZ",1],
+["Ural_CDF",3],
+["Ural_TK_CIV_EP1",3],
+["Ural_UN_EP1",3],
+["V3S_Open_TK_CIV_EP1",3],
+["V3S_Open_TK_EP1",3],
+["V3S_Refuel_TK_GUE_EP1_DZ",1],
+["VolhaLimo_TK_CIV_EP1",3],
+["Volha_1_TK_CIV_EP1",3],
+["Volha_2_TK_CIV_EP1",3],
+["VWGolf",3],
+["Zodiac",3]
+];
--- a/SQF/dayz_server/missions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqf
+++ b/SQF/dayz_server/missions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqf
--- a/Files/@DayZ_Epoch_Server/addons/dayz_server.pbo
+++ b/Files/@DayZ_Epoch_Server/addons/dayz_server.pbo
--- a/Files/Battleye/publicvariable.txt
+++ b/Files/Battleye/publicvariable.txt
@@ -1,4 +1,47 @@
-1 "" !"PVDZE_" !="drn_AskServerDynamicWeatherEventArgs" !="usecTransfuse" !="usecBandage" !="usecBleed" !="usecPainK" !="usecEpi" !="usecMorphine" !="norrnRaDrag" !="norrnR180" !="norrnRalie" !="norrnRALW" !="norrnRACarUp" !="norrnRAPicUp" !="norrnRnoAnim" !="remExField" !="BIS_MPF_logic" !="remExFP" !="player" !="rsay" !="rland" !="rsetdir" !="_this spawn fnc_plyrHit;"
+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 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"
+5 "v.i.l.e"
+5 "Lystic"
+5 "Rustler"
+5 "BattleFieldClearance"
+5 "BIS_MPF_logic"
+5 "BIS_MPF_dummygroup"
+5 "PVAH_filluLog_arr"
+5 "PVDZ_"
+5="player"
+5="server"
+5 "teleported"
+5 "remExFP" !="\"remExFP\" = [,,\"per\",\"execVM\",\"ca\Modules\Functions\init.sqf\"]" !"[,,\"per\",\"execVM\",\"ca\Modules\Functions\init.sqf\"]"
+5 "dayzSetDate"
+5 "rsay"
+5 "rland"
+5 "rsetdir"
+5 "local_sefFuel"
+5 "hiveupdateresu"
+5 "eh_localCleanup"
+5 "vehicle_handleInteract"
+5 "server_characterSync"
+5 "fnc_buildWeightedArray"
+5 "server_hiveWrite"
+5 "server_hiveReadWrite"
+5 "spawn_heliCrash"
+5 "server_getDiff"
+5 "server_getDiff2"
+5 "dayz_objectUID"
+5 "dayz_objectUID2"
+5 "dayz_recordLogin"
+5 "adminrq"
+5 "rpcCodeVarName"
+5 "rpcDirectCall"
+5 "broadcastRpcCallAll"
+5 "broadcastRpcCallIfLocal"
+5 "callRpcProcedure"
+5 "registerBroadcastRpc"
+5 "drn_DynamicWeatherEventArgs"
+5 "monkymonitor"
+5 "mmonitor"
 5 "dayzSpawnZed" 
 5 "dayzLogin"
 5 "dayzLogin2"
@@ -22,51 +65,4 @@
 5 "changeCharacter" 
 5 "dayzSwitch" 
 5 "dayzFire" 
-5 "dayzDeath"
-5 "drn_DynamicWeatherEventArgs" 
-5 "dayzSetDate" 
-5 "teleported"
-1 "nil"
-1 "true"
-1" false"
-5 "remExFP"
-//1 "remExField"
-5 "BIS_MPF_logic"
-1 "JIPrequest"
-1 "JIPexec"
-//1 "dayzDeath" 
-//1 "player"
-1 "alive"
-5 "dayzSetDate"
-5 "rsay"
-5 "rland"
-5 "rsetdir"
-5 "local_sefFuel"
-1 "spawn" !="PVDZE_zed_Spawn" !="_this spawn fnc_plyrHit;"
-1 "BIS_Effects"
-5 "hiveupdateresu"
-5 "eh_localCleanup"
-5 "vehicle_handleInteract"
-5 "server_characterSync"
-5 "fnc_buildWeightedArray"
-5 "server_hiveWrite"
-5 "server_hiveReadWrite"
-5 "spawn_heliCrash"
-5 "server_getDiff"
-5 "server_getDiff2"
-5 "dayz_objectUID"
-5 "dayz_objectUID2"
-5 "dayz_recordLogin"
-5 "monkymonitor"
-5 "mmonitor"
-5 "monky" 
-5 "adminrq"
-5 "rpcCodeVarName"
-5 "rpcDirectCall"
-5 "broadcastRpcCallAll"
-5 "broadcastRpcCallIfLocal"
-5 "callRpcProcedure"
-5 "registerBroadcastRpc"
-//1 "norrnRACarUp"
-//1 "norrnRAPicUp"
-//1 ""
+5 "dayzDeath"
--- a/Files/Battleye/remoteexec.txt
+++ b/Files/Battleye/remoteexec.txt
@@ -1,4 +1,4 @@
-5 "" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="[this] spawn BIS_Effects_AirDestruction" !"spawn BIS_Effects_AirDestructionStage2" !="_this spawn fnc_plyrHit;"
+5 "" !="this enableSimulation false;this allowDammage false;this disableAI 'FSM';this disableAI 'ANIM';this disableAI 'MOVE';" !="[this] spawn BIS_Effects_AirDestruction" !"spawn BIS_Effects_Burn" !"spawn BIS_Effects_AirDestructionStage2" !="_this spawn fnc_plyrHit;"
 1="[this] spawn BIS_Effects_AirDestruction"

 // ban for empty patterns, such:
--- a/Files/Battleye/scripts.txt
+++ b/Files/Battleye/scripts.txt
@@ -1,9 +1,80 @@
-5 addMagazine !"addMagazine _" !"addMagazine \"" !"addMagazine '" !"\"addMagazine\"" !addMagazineCargo !="raddMagazine = 'addMagazine'"  !="raddMagazinecode={diag_log(\"WARNING illegal RE raddMagazinecode with args:\"+str(_this));};" !="raddMagazinecode = compile PreprocessFile (BIS_PathMPscriptCommands + 'addMagazine.sqf')" !"ate_ammo_rest != 0) then {\nplayer addMagazine [_create,_qtynew_create_ammo_rest]" !"if (_ammo > 0) then {\nplayer removeMagazines \"Quiver\";\nplayer addMagazine [\"Quiver\", _ammo];" !"mmo_rest != 0) then {\nplayer addMagazine [_consume,_qtynew_consume_ammo_res" !"ume_ammo_rest != 0) then {\nplayer addMagazine [_consume,_qtynew_consume_ammo_res" !"o_rest != 0) then {\nplayer addMagazine [_create,_qtynew_create_ammo_rest]" !"Magazine \"WoodenArrow\";\n};\nplayer addMagazine [\"Quiver\",_qty_quiverarrows+_qty_a" !"ame _x == \"ARRAY\") then {_newUnit addMagazine [_x select 0,_x select 1] } else {" !"n {\nif (_val != -1) then {\nplayer addMagazine [_item,_val];\n} else {\nplayer " !"{\n_vehicle removeMagazineTurret [_ammo,_turret];\n_vehicle addMagazineTurret [_ammo,_turret];\nplayer removeMagazine _ammo;\n\ncutText [for" !"_item = createVehicle [\"WeaponHolder\", getPosATL player, [], 1, \"CAN_COLLIDE\"];\n_item addMagazineCargoGlobal [_itemOut,_countOut];" !"if (typeName _countOut == "ARRAY") then {\n_countOut = round((random (_countOut select 1)) + (_countOut select 0));\n};\n_item addMagazineCargoGlobal [_itemOut,_countOut];\n} forEach _selectedRemoveOutput;"
-5 "addMagazine _" !"addMagazine _c" !"addMagazine _x" !"addMagazine _i" !"addMagazine _p" !"_invRemove);\nfor \"_x\" from 1 to _removed do {\nplayer addMagazine _meatcooked;\n};" !if (local _animalbody) then {\nfor \"_x\" from 1 to _qty do {\n_animalbody addMagazine _rawfoodtype;\n};\n" !"_selectRandomWeighted;\nif(!isNil \"_array\") then {\n_agent addMagazine _loot;\n};\n" !"\nfor \"_x\" from 1 to _third_parts_out do {\nplayer addMagazine _third_highest_bar;\n};\n" !"\nfor \"_x\" from 1 to _remainder do {\nplayer addMagazine _next_highest_bar;\n};\n"
-5 "addMagazine _p" !"alive _obj) then {\n\nif(_okToSell) then {\n\nfor "_x" from 1 to _qty_out do {\nplayer addMagazine _part_out;" !"alive _obj) then {\n\nfor \"_x\" from 1 to _qty_out do {\nplayer addMagazine _part_out;\n};" !"removeBackpack player;\nfor \"_x\" from 1 to _qty_out do {\nplayer addMagazine _part_out;\n};" !"\nfor \"_x\" from 1 to _removed do {\nplayer addMagazine _part_in;\n};\n" !"\nfor \"_x\" from 1 to _remainder do {\nplayer addMagazine _part_out;\n};\n" !"\nfor \"_x\" from 1 to _total_parts_out do {\nplayer addMagazine _part_out;\n};" !"do {\nplayer addMagazine _part_out;\nif(_part_out == \"FoodBioMeat\") then {\n_humanityGain = _humanityGain + 20;\n};" !"if(_buy_o_sell == \"buy\") then {\nplayer addWeapon _part_out;\n} else {\nplayer addMagazine _part_out;\n};"
-5 "addMagazine _i" !"\nfor \"_x\" from 1 to _countOut do {\nplayer addMagazine _itemOut;\n};" !"drop,1];\n} else {\nplayer addMagazine _itemOut;\n};" !"_invRemove) == 1) then {\nplayer addMagazine _itemNew;\n[dayz_playerUID,dayz_c" !"\nif (_isOK) then {\nif (_val != -1) then {\nplayer addMagazine [_item,_val];\n} else {\nplayer addMagazine _item;\n};\n" !"s (configfile >> \"cfgmagazines\" >> (_item))) then {_unit addMagazine _item;};"  
-5 "addMagazine _c" !"ynew_create_mags_full do {\nplayer addMagazine _create;\n};\nif (_qtynew_create_amm" !"new_consume_mags_full do {\nplayer addMagazine _consume;\n};\nif (_qtynew_consume_a" !"[player,\"refuel\",0,false] call dayz_zombieSpeak;\nplayer addMagazine _canName;\ncutText " !"[player,\"refuel\",0,false] call dayz_zombieSpeak;\nplayer addMagazine _canName+\"Empty\";\ncutText "
-5 "addMagazine _x" !"{player addMagazine _x;} forEach _temp_removed_array;\n\ncutText" !" 0,_x select 1] } else { _newUnit addMagazine _x };\n\n} forEach _magazines;\n\n{\n_n" !" >> _x);\nif (_isOK) then {\nplayer addMagazine _x;\n};\n} forEach _wpns;" !"gFile >> "CfgMagazines" >> _x);if (_isOK) then {\nplayer addMagazine _x;\n};\n} forEach _mags;\n{\n_isOK = isClass(configFile >> "C"
-5 "addMagazine \"" !"for \"_x\" from 1 to _removed do {\nplayer addMagazine \"ItemWaterbottleBoiled\";\n};" !"Jerrycan\"] call BIS_fnc_invRemove) == 1) then {\nplayer addMagazine \"ItemJerrycanEmpty\";\n" !"if(([player,_x] call BIS_fnc_invRemove) == 1) then {\nif (_x == ItemFuelBarrelEmpty) then {\nplayer addMagazine "ItemFuelBarrel";\n} else {\nplayer addMagazine "ItemJerrycan";\n};" !"n player_alertZombies;\nplayer addMagazine \"ItemWaterbottleUnfilled\";" !"WaterbottleUnfilled\"] call BIS_fnc_invRemove) == 1) then {\nplayer addMagazine \"ItemWaterbottle\";\n};" !"Waterbottle\"] call BIS_fnc_invRemove) == 1) then {\nplayer addMagazine \"ItemWaterbottleUnfilled\";\n};" !"if (local _zombiebody) then {\n_zombiebody addMagazine \"ItemZombieParts\";" !"ayer playActionNow \"stop\";\n};\nplayer addMagazine \"ItemBandage\";\n};" 
-5 "addMagazine '" !" addMagazine 'crowbar_swing';" !" addMagazine 'hatchet_swing';" !" addMagazine 'Machete_swing';" !" addMagazine 'Fishing_Swing';"
-5 "setDamage" !"player setdamage 0;" !"player setDamage 1;" !"_vehicle setDamage 0; "!"if("""" == typeOf _tree) then {\n_tree setDamage 1;\n};" !"if("""" == typeOf _tree) then {\n_tree setDamage 0.99;\n};" !"if (_ent isKindOf ""Animal"") then {\n_ent setDamage 1;\n" !"if (_ent isKindOf ""Animal"" or _isZombie) then {\n_ent setDamage 1;"
+1 "addBackpackCargoGlobal" !"_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];"
+1 HelicopterExplo !"_expl=createVehicle [\"HelicopterExploSmall\",(getPosATL _v),[],0,\"CAN_COLLIDE\"];"
+5 "Logic" !"\"Logic\" createVehicleLocal" !"sideLogic" !"BIS_MPF_clientJIPlogic" !"_humanity_logic"
+5 "FunctionsManager"
+5 BattleFieldClearance
+5 "BIS_MPF_logic" !"BIS_MPF_logic = BIS_MPF_dummygroup createUnit"
+5 "BIS_MPF_dummygroup" !="BIS_MPF_dummygroup = createGroup sideLogic;" !"BIS_MPF_logic = BIS_MPF_dummygroup createUnit"
+5 _codeAHOFF
+5 "_first in"
+5 "_commands"
+5 "_agent setDamage 1"
+5 "_unit createUnit"
+5 "createUnit _array"
+5 "[_pos, _grp, \";\" +"
+5 "+ \";\""
+5 "+\";\""
+5 "+ \";\"]"
+5 "+\";\"]"
+5 "], \"FunctionsManager\"]"
+5 "],\"FunctionsManager\"]"
+5 "], \"Logic\"]"
+5 "],\"Logic\"]"
+5 "hint \"Server Anti-Hack is OFF. Rejoin Server Now\""
+5 "closeDisplay ="
+5 "rJIPrequest =" !"rJIPrequest = 'JIPrequest'"
+5 "{rJIPREQUEST" !"!isNil {rJIPREQUEST}"
+5 RUSTLER
+5 Ruslter
+5 "Systems Online"
+5 HangenderRE
+5 vilegaming
+5 v.i.l.e
+5 Lystic
+5 setDammage
+5 "compile toString"
+5 @TheWarZ
+5 beeeh
+5 dayz-injector-menu
+5 Shadowy_NONRE
+5 "lol\car.sqf"
+5 _cute
+5 _stuff
+5 _vgmenu
+5 _func4
+5 _genVar
+5 _rand60
+5 _first_term
+5 _skarmory
+5 _salamence
+5 "Init RE"
+5 Nigger
+5 "\"You\""
+5 "selectedItemCountLeft = lnbText"
+5 "vehicle player addaction [(\"<t color=\"\"#B0C4DE\"\">\" + (\"ET\") +\"</t>\"),"
+5 "\"HelicopterExplobig\", \"HelicopterExploSmall\" createVehicleLocal"
+5 "\"HelicopterExploSmall\", \"HelicopterExplobig\" createVehicleLocal"
+5 "\"HelicopterExplobig\", \"HelicopterExploSmall\" createVehicle"
+5 "\"HelicopterExploSmall\", \"HelicopterExplobig\" createVehicle"
+5 "\"HelicopterExplobig\" createvehiclelocal (position "
+5 "_classname = \"HelicopterExploBig\";"
+5 "(getPosATL player) nearObjects [\"Man\", 15000]"
+5 "[[\"Man\",\"Air\",\"Car\",\"Motorcycle\",\"Tank\",\"Ship\",\"StaticWeapon\"],250000]"
+5 action_crate1
+5 _dummyveh
+5 "case \"CODE\":"
+5 "], 40000])"
+5 "nearestObjects [player, [\"TentStorage\", \"TentStorageDomed\", \"TentStorageDomed2\", \"VaultStorage\", \"VaultStorageLocked\", \"LockboxStorageLocked\", \"LockboxStorage\", \"Land_A_tent\", \"WeaponHolder_ItemTent\"], 5];"
+5 "(getPosATL player) nearObjects [\"Man\", 200];"
+5 "(nearestObject [player, \"Rabbit\"])"
+5 "try saving"
+5 "addMagazineCargoGlobal[\"ItemSilverBar\",50];"
+5 "addMagazineCargoGlobal[\"ItemSilverBar10oz\",50];"
+5 "addMagazineCargoGlobal[\"ItemGoldBar\",50];"
+5 "addMagazineCargoGlobal[\"ItemGoldBar10oz\",50];"
+5 "addMagazineCargoGlobal[\"ItemBriefcase100oz\",50];"
+5 "addMagazineCargoGlobal[\"ItemSilverBar\",500];"
+5 "addMagazineCargoGlobal[\"ItemSilverBar10oz\",500];"
+5 "addMagazineCargoGlobal[\"ItemGoldBar\",500];"
+5 "addMagazineCargoGlobal[\"ItemGoldBar10oz\",500];"
+5 "addMagazineCargoGlobal[\"ItemBriefcase100oz\",500];"
--- a/Files/Battleye/setdamage.txt
+++ b/Files/Battleye/setdamage.txt
@@ -1,2 +1,2 @@
 1 ""
-1 "1.000000"
+5 !="0.000000" !="0.990000" !="1.000000" !="2.000000"
--- a/Files/Configs/instance_11_Chernarus/config.cfg
+++ b/Files/Configs/instance_11_Chernarus/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Chernarus Server (1.0.3/103718)";
+hostName = "DayZ Epoch Chernarus Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_12_duala/config.cfg
+++ b/Files/Configs/instance_12_duala/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Isla Duala Server (1.0.3/103718)";
+hostName = "DayZ Epoch Isla Duala Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_13_tavi/config.cfg
+++ b/Files/Configs/instance_13_tavi/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Taviana Server (1.0.3/103718)";
+hostName = "DayZ Epoch Taviana Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_15_namalsk/config.cfg
+++ b/Files/Configs/instance_15_namalsk/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Namalsk Server (1.0.3/103718)";
+hostName = "DayZ Epoch Namalsk Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_16_panthera/config.cfg
+++ b/Files/Configs/instance_16_panthera/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Panthera Server (1.0.3/103718)";
+hostName = "DayZ Epoch Panthera Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_18_sahrani/config.cfg
+++ b/Files/Configs/instance_18_sahrani/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Sahrani Server (1.0.3/103718)";
+hostName = "DayZ Epoch Sahrani Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_19_poda/config.cfg
+++ b/Files/Configs/instance_19_poda/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Podagorsk Server (1.0.3/103718)";
+hostName = "DayZ Epoch Podagorsk Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_1_takistan/config.cfg
+++ b/Files/Configs/instance_1_takistan/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Takistan Server (1.0.3/103718)";
+hostName = "DayZ Epoch Takistan Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_20_fapovo/config.cfg
+++ b/Files/Configs/instance_20_fapovo/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Fapovo Server (1.0.3/103718)";
+hostName = "DayZ Epoch Fapovo Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_21_caribou/config.cfg
+++ b/Files/Configs/instance_21_caribou/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Caribou Server (1.0.3/103718)";
+hostName = "DayZ Epoch Caribou Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_2_utes/config.cfg
+++ b/Files/Configs/instance_2_utes/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Utes Server (1.0.3/103718/No Traders)";
+hostName = "DayZ Epoch Utes Server (1.0.3.1/103718/No Traders)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_3_shapur_baf/config.cfg
+++ b/Files/Configs/instance_3_shapur_baf/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Shapur BAF Server (1.0.3/103718/No Traders)";
+hostName = "DayZ Epoch Shapur BAF Server (1.0.3.1/103718/No Traders)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 24;
--- a/Files/Configs/instance_4_zargabad/config.cfg
+++ b/Files/Configs/instance_4_zargabad/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Zargabad Server (1.0.3/103718)";
+hostName = "DayZ Epoch Zargabad Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_6_Dingor/config.cfg
+++ b/Files/Configs/instance_6_Dingor/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Dingor Server (1.0.3/103718)";
+hostName = "DayZ Epoch Dingor Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_7_Lingor/config.cfg
+++ b/Files/Configs/instance_7_Lingor/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch Lingor Server (1.0.3/103718)";
+hostName = "DayZ Epoch Lingor Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Configs/instance_8_ProvingGrounds_PMC/config.cfg
+++ b/Files/Configs/instance_8_ProvingGrounds_PMC/config.cfg
@@ -1,4 +1,4 @@
-hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.3/103718)";
+hostName = "DayZ Epoch ProvingGrounds_PMC Server (1.0.3.1/103718)";
 password = "";
 passwordAdmin = "changeme";
 maxPlayers = 50;
--- a/Files/Keys/SMD_Sara_A2.bikey
+++ b/Files/Keys/SMD_Sara_A2.bikey
--- a/Files/MPMissions/DayZ_Epoch_18.Sara/description.ext
+++ b/Files/MPMissions/DayZ_Epoch_18.Sara/description.ext
@@ -1,7 +1,7 @@
 respawn = "BASE";
 respawndelay = 5;
-onLoadMission= "DayZ Epoch Chernarus";
-OnLoadIntro = "Welcome to DayZ Epoch Chernarus";
+onLoadMission= "DayZ Epoch Sahrani";
+OnLoadIntro = "Welcome to DayZ Epoch Sahrani";
 OnLoadIntroTime = False;
 OnLoadMissionTime = False;
 disabledAI = true;
--- a/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext
+++ b/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/description.ext
@@ -0,0 +1,150 @@
+respawn = "BASE";
+respawndelay = 5;
+onLoadMission= "DayZ Epoch SMD Sahrani";
+OnLoadIntro = "Welcome to DayZ Epoch SMD Sahrani";
+OnLoadIntroTime = False;
+OnLoadMissionTime = False;
+disabledAI = true;
+disableChannels[]={0,2,6};
+enableItemsDropping = 0;
+
+briefing = 0;
+debriefing = 0;
+
+onPauseScript = "";
+loadScreen = "\z\addons\dayz_code\gui\dayz_logo_ca.paa";
+
+class Header
+{
+ gameType = COOP;            //DM, Team, Coop, ...
+ minPlayers = 1;             //min # of players the mission supports
+ maxPlayers = 100;            //Max # of players the mission supports
+};
+
+aiKills = 1;
+diagRadio = 1;
+diagHit = 1;
+
+class RscText
+{
+	type = 0;
+	idc = -1;
+	x = 0;
+	y = 0;
+	h = 0.037;
+	w = 0.3;
+	style = 0x100; 
+	font = Zeppelin32;
+	SizeEx = 0.03921;
+	colorText[] = {1,1,1,1};
+	colorBackground[] = {0, 0, 0, 0};
+	linespacing = 1;
+};
+class RscPicture
+{
+	access=0;
+	type=0;
+	idc=-1;
+	style=48;
+	colorBackground[]={0,0,0,0};
+	colorText[]={1,1,1,1};
+	font="TahomaB";
+	sizeEx=0;
+	lineSpacing=0;
+	text="";
+};
+class RscLoadingText : RscText
+{
+	style = 2;
+	x = 0.323532;
+	y = 0.666672;
+	w = 0.352944;
+	h = 0.039216;
+	sizeEx = 0.03921;
+	colorText[] = {0.543,0.5742,0.4102,1.0};
+};
+class RscProgress
+{
+	x = 0.344;
+	y = 0.619;
+	w = 0.313726;
+	h = 0.0261438;
+	texture = "\ca\ui\data\loadscreen_progressbar_ca.paa";
+	colorFrame[] = {0,0,0,0};
+	colorBar[] = {1,1,1,1};
+};
+class RscProgressNotFreeze
+{
+	idc = -1;
+	type = 45;
+	style = 0;
+	x = 0.022059;
+	y = 0.911772;
+	w = 0.029412;
+	h = 0.039216;
+	texture = "#(argb,8,8,3)color(0,0,0,0)";
+};
+//
+// the loading screen itself
+//
+class DayZ_loadingScreen
+{ 
+	idd = -1;
+	duration = 10e10;
+	fadein = 0;
+	fadeout = 0;
+	name = "loading screen";
+	class controlsBackground
+	{
+		class blackBG : RscText
+		{
+			x = safezoneX;
+			y = safezoneY;
+			w = safezoneW;
+			h = safezoneH;
+			text = "";
+			colorText[] = {0,0,0,0};
+			colorBackground[] = {0,0,0,1};
+		};
+		/*
+		class nicePic : RscPicture
+		{
+			style = 48 + 0x800; // ST_PICTURE + ST_KEEP_ASPECT_RATIO
+			x = safezoneX + safezoneW/2 - 0.25;
+			y = safezoneY + safezoneH/2 - 0.2;
+			w = 0.5;
+			h = 0.4;
+			text = "img\nicePic.paa";
+		};
+		*/
+	};
+	class controls
+	{
+		class Title1 : RscLoadingText
+		{
+			text = "$STR_LOADING"; // "Loading" text in the middle of the screen
+		};
+		class CA_Progress : RscProgress // progress bar, has to have idc 104
+		{
+			idc = 104;
+			type = 8; // CT_PROGRESS
+			style = 0; // ST_SINGLE
+			texture = "\ca\ui\data\loadscreen_progressbar_ca.paa";
+		};
+		class CA_Progress2 : RscProgressNotFreeze // progress bar that will go reverse
+		{
+			idc = 103;
+		};
+		class Name2: RscText // the text on the top-left
+		{
+			idc = 101;
+			x = 0.05;
+			y = 0.029412;
+			w = 0.9;
+			h = 0.04902;
+			text = "";
+			sizeEx = 0.05;
+			colorText[] = {0.543,0.5742,0.4102,1.0};
+		};
+	};
+};
--- a/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf
+++ b/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf
@@ -0,0 +1,88 @@
+/*	
+	For DayZ Epoch
+	Addons Credits: Jetski Yanahui by Kol9yN, Zakat, Gerasimow9, YuraPetrov, zGuba, A.Karagod, IceBreakr, Sahbazz
+*/
+startLoadingScreen ["","RscDisplayLoadCustom"];
+cutText ["","BLACK OUT"];
+enableSaving [false, false];
+
+//REALLY IMPORTANT VALUES
+dayZ_instance =	22;					//The instance
+dayzHiveRequest = [];
+initialized = false;
+dayz_previousID = 0;
+
+//disable greeting menu 
+player setVariable ["BIS_noCoreConversations", true];
+//disable radio messages to be heard and shown in the left lower corner of the screen
+enableRadio false;
+// May prevent "how are you civillian?" messages from NPC
+enableSentences false;
+
+// DayZ Epoch config
+spawnShoremode = 1; // Default = 1 (on shore)
+spawnArea= 1500; // Default = 1500
+MaxHeliCrashes= 5; // Default = 5
+MaxVehicleLimit = 300; // Default = 50
+MaxDynamicDebris = 350; // Default = 100
+dayz_MapArea = 12000; // Default = 10000
+dayz_maxLocalZombies = 40; // Default = 40 
+
+dayz_paraSpawn = false;
+
+dayz_sellDistance_vehicle = 10;
+dayz_sellDistance_boat = 30;
+dayz_sellDistance_air = 40;
+
+dayz_maxAnimals = 8; // Default: 8
+dayz_tameDogs = true;
+DynamicVehicleDamageLow = 0; // Default: 0
+DynamicVehicleDamageHigh = 100; // Default: 100
+
+EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]];
+dayz_fullMoonNights = true;
+
+//Load in compiled functions
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\variables.sqf";				//Initilize the Variables (IMPORTANT: Must happen very early)
+progressLoadingScreen 0.1;
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\publicEH.sqf";				//Initilize the publicVariable event handlers
+progressLoadingScreen 0.2;
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\medical\setup_functions_med.sqf";	//Functions used by CLIENT for medical
+progressLoadingScreen 0.4;
+call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\compiles.sqf";				//Compile regular functions
+progressLoadingScreen 0.5;
+call compile preprocessFileLineNumbers "server_traders.sqf";				//Compile trader configs
+progressLoadingScreen 1.0;
+
+"filmic" setToneMappingParams [0.153, 0.357, 0.231, 0.1573, 0.011, 3.750, 6, 4]; setToneMapping "Filmic";
+
+if (isServer) then {
+	call compile preprocessFileLineNumbers "\z\addons\dayz_server\missions\DayZ_Epoch_22.smd_sahrani_A2\dynamic_vehicle.sqf";
+	//Compile vehicle configs
+	
+	// Add trader citys
+	_nil = [] execVM "\z\addons\dayz_server\missions\DayZ_Epoch_22.smd_sahrani_A2\mission.sqf";
+	_serverMonitor = 	[] execVM "\z\addons\dayz_code\system\server_monitor.sqf";
+};
+
+if (!isDedicated) then {
+	//Conduct map operations
+	0 fadeSound 0;
+	waitUntil {!isNil "dayz_loadScreenMsg"};
+	dayz_loadScreenMsg = (localize "STR_AUTHENTICATING");
+	
+	//Run the player monitor
+	_id = player addEventHandler ["Respawn", {_id = [] spawn player_death;}];
+	_playerMonitor = 	[] execVM "\z\addons\dayz_code\system\player_monitor.sqf";	
+	
+	
+	//anti Hack
+	[] execVM "\z\addons\dayz_code\system\antihack.sqf";
+
+	//Lights
+	//[0,0,true,true,true,58,280,600,[0.698, 0.556, 0.419],"Generator_DZ",0.1] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
+};
+#include "\z\addons\dayz_code\system\REsec.sqf"
+//Start Dynamic Weather
+execVM "\z\addons\dayz_code\external\DynamicWeatherEffects.sqf";
+#include "\z\addons\dayz_code\system\BIS_Effects\init.sqf"
--- a/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm
+++ b/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/mission.sqm
--- a/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf
+++ b/Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf
@@ -0,0 +1,164 @@
+// DayZ Epoch TRADERS for 11
+serverTraders = ["RU_Functionary1","RU_Citizen3","Rocker4","Profiteer4","Rita_Ensler_EP1","CIV_EuroMan01_EP1","CIV_EuroMan02_EP1","TK_GUE_Soldier_5_EP1","GUE_Soldier_MG","Worker2","Worker3","Soldier_GL_M16A2_PMC","Woodlander1","UN_CDF_Soldier_Pilot_EP1","RU_WorkWoman1","Dr_Annie_Baker_EP1","RU_Citizen4","RU_WorkWoman5","RU_Citizen1","RU_Villager3","TK_CIV_Takistani04_EP1","Pilot_EP1","RU_Profiteer4","Woodlander3","Dr_Hladik_EP1","Doctor","HouseWife1"];
+// Hero Vendor
+menu_RU_Functionary1 = [
+	[["Ammunition",478],["Clothes",476],["Helicopter Armed",493],["Military Armed",562],["Trucks Armed",479],["Weapons",477]],
+	[],
+	"hero"
+];
+// Ammunition Friendly
+menu_RU_Citizen3 = [
+	[["Assault Rifle Ammo",480],["Light Machine Gun Ammo",481],["Pistol Ammo",484],["Shotguns and Single-shot Ammo",573],["Sniper Rifle Ammo",482],["Submachine Gun Ammo",483]],
+	[],
+	"friendly"
+];
+// Weapons Friendly
+menu_Rocker4 = [
+	[["Assault Rifle",485],["Light Machine Gun",486],["Pistols",489],["Shotguns and Single-shot",574],["Sniper Rifle",487],["Submachine Guns",488]],
+	[],
+	"friendly"
+];
+// Friendly Vehicles
+menu_Profiteer4 = [
+	[["Bikes and ATV",608],["Buses and Vans",563],["Cargo Trucks",564],["Fuel Trucks",492],["Military Unarmed",491],["Trucks",495],["Used Cars",585],["Utility Vehicles",565]],
+	[],
+	"friendly"
+];
+// General Store
+menu_Rita_Ensler_EP1 = [
+	[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
+	[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
+	"neutral"
+];
+// Weapons neutral
+menu_CIV_EuroMan01_EP1 = [
+	[["Assault Rifle",602],["Light Machine Gun",603],["Pistols",606],["Shotguns and Single-shot",607],["Sniper Rifle",605],["Submachine Guns",604]],
+	[],
+	"neutral"
+];
+// Ammunition Neutral
+menu_CIV_EuroMan02_EP1 = [
+	[["Assault Rifle Ammo",609],["Light Machine Gun Ammo",610],["Pistol Ammo",611],["Shotguns and Single-shot Ammo",613],["Sniper Rifle Ammo",614],["Submachine Gun Ammo",612]],
+	[],
+	"neutral"
+];
+// Neutral Building/Parts
+menu_TK_GUE_Soldier_5_EP1 = [
+	[["Building Supplies",508],["Toolbelt Items",510],["Vehicle Parts",509]],
+	[],
+	"neutral"
+];
+// Bandit Trader
+menu_GUE_Soldier_MG = [
+	[["Ammunition",577],["Clothing",575],["Helicopter Armed",512],["Military Armed",569],["Trucks Armed",534],["Weapons",627]],
+	[],
+	"hostile"
+];
+// Aircraft Dealer
+menu_Worker2 = [
+	[["Airplanes",517],["Helicopter Unarmed",519]],
+	[],
+	"friendly"
+];
+// Vehicles Neutral
+menu_Worker3 = [
+	[["Bikes and ATV",587],["Buses and Vans",588],["Cargo Trucks",586],["Fuel Trucks",589],["Military Unarmed",598],["Trucks",590],["Used Cars",520],["Utility Vehicles",591]],
+	[],
+	"neutral"
+];
+// Black Market Vendor
+menu_Soldier_GL_M16A2_PMC = [
+	[["Black Market Ammo",527],["Black Market Weapons",526],["Explosives",529]],
+	[],
+	"neutral"
+];
+// Friendly Building/Parts
+menu_Woodlander1 = [
+	[["Building Supplies",530],["Toolbelt Items",532],["Vehicle Parts",531]],
+	[],
+	"friendly"
+];
+// Friendly Vehicles 2
+menu_UN_CDF_Soldier_Pilot_EP1 = [
+	[["Bikes and ATV",536],["Buses and Vans",592],["Cargo Trucks",570],["Fuel Trucks",595],["Military Unarmed",599],["Trucks Unarmed",535],["Used Cars",600],["Utility Vehicles",568]],
+	[],
+	"friendly"
+];
+// General Store 2
+menu_RU_WorkWoman1 = [
+	[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
+	[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
+	"friendly"
+];
+// Medical Supplies
+menu_Dr_Annie_Baker_EP1 = [
+	[["Chem-lites/Flares",542],["Medical Supplies",541],["Smoke Grenades",543]],
+	[["FoodBioMeat","ItemZombieParts",1,1,"buy","Zombie Parts","Bio Meat",101]],
+	"friendly"
+];
+// East Wholesaler
+menu_RU_Citizen4 = [
+	[["Wholesale",555]],
+	[],
+	"neutral"
+];
+// General Store 3
+menu_RU_WorkWoman5 = [
+	[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
+	[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
+	"neutral"
+];
+// West Wholesaler
+menu_RU_Citizen1 = [
+	[["Wholesale",636]],
+	[],
+	"neutral"
+];
+// Boat Vendor
+menu_RU_Villager3 = [
+	[["Boats Armed",558],["Boats Unarmed",557]],
+	[],
+	"neutral"
+];
+// Weapons neutral 2
+menu_TK_CIV_Takistani04_EP1 = [
+	[["Assault Rifle",637],["Light Machine Gun",638],["Pistols",674],["Shotguns and Single-shot",641],["Sniper Rifle",640],["Submachine Guns",642]],
+	[],
+	"neutral"
+];
+// Ammunition Neutral 2
+menu_Pilot_EP1 = [
+	[["Assault Rifle Ammo",643],["Light Machine Gun Ammo",644],["Pistol Ammo",646],["Shotguns and Single-shot Ammo",649],["Sniper Rifle Ammo",647],["Submachine Gun Ammo",648]],
+	[],
+	"neutral"
+];
+// Vehicles Neutral 2
+menu_RU_Profiteer4 = [
+	[["Bikes and ATV",650],["Buses and Vans",651],["Cargo Trucks",653],["Fuel Trucks",655],["Military Unarmed",658],["Trucks",659],["Used Cars",660],["Utility Vehicles",661]],
+	[],
+	"neutral"
+];
+// Neutral Building/Parts
+menu_Woodlander3 = [
+	[["Building Supplies",662],["Toolbelt Items",663],["Vehicle Parts",664]],
+	[],
+	"neutral"
+];
+// Medical Supplies 2
+menu_Dr_Hladik_EP1 = [
+	[["Chem-lites/Flares",666],["Medical Supplies",665],["Smoke Grenades",668]],
+	[],
+	"neutral"
+];
+// Medical Supplies 3
+menu_Doctor = [
+	[["Chem-lites/Flares",669],["Medical Supplies",670],["Smoke Grenades",671]],
+	[],
+	"neutral"
+];
+// Boat Trader 2
+menu_HouseWife1 = [
+	[["Boats Armed",673],["Boats Unarmed",672]],
+	[],
+	"neutral"
+];