Merge pull request #1534 from raymix/master

updated stringtable compatibility with modular build
Merge remote-tracking branch 'upstream/master'
2025-12-13 19:52:38 +03:00 · 2014-08-18 00:59:52 -05:00 · 2014-08-18 04:08:14 +01:00 · 2014-08-18 04:03:11 +01:00 · 2014-08-17 14:04:00 -05:00 · 2014-08-17 14:03:31 -05:00
566 changed files with 80199 additions and 17463 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@
 /SQF/dayz_equip
 /SQF/dayz_vehicles
 /SQF/dayz_weapons
-*.rtm
-*.p3d
+#*.rtm
+#*.p3d
 *.komodoproject
--- a/1.0.5.2.txt
+++ b/1.0.5.2.txt
@@ -0,0 +1,35 @@
+[NEW] RedRyder BB Gun by @arma2WillRobinson
+[NEW] DB Backup script. @RimBlock
+[NEW] Use DayZ_UseSteamID = false; in your init.sqf to use the old PlayerUID, instead of SteamID @icomrade
+[NEW] UI Update - Graphical and code changes, enable using Dayz_Dark_UI = true; in init.sqf. @hogscraper http://epochmod.com/forum/index.php?/topic/13654-proposed-ui-change/
+[NOTE] It's recommend to convert to the new SteamID system if possible, new servers should not use DayZ_UseSteamID = false;
+[NEW] Snap building (disabled by default), use DZE_modularBuild = true; in your init.sqf to enable. @raymix
+[NEW] Modular/Function based player_build for addon makers and modders. @raymix (more info and concepts - http://epochmod.com/forum/index.php?/topic/14628-modular-function-based-player-buildsqf/ )
+
+[CHANGED] An infection chance of -1 disables self-transfusion infection. 0 is always infected. (DZE_selfTransfuse_Values) @icomrade
+[CHANGED] Removed weapons from Traders hands and made them stand with arms by their side. @SilvDev
+[CHANGED] Tweaked fuel capacity variables for vehicles. @RimBlock
+
+[FIXED] Backpack wipes when changing clothes. #1361 @icomrade
+[FIXED] CH53 gear when locked #1364 @icomrade
+[FIXED] Infinite loop when crafting ore into bars #1351 @icomrade
+[FIXED] Only first kill showing on death boards #1362 #1124 @vbawol @icomrade
+[FIXED] Crossbow quivers not working #1355 @icomrade
+[FIXED] Crash_spawner & Supply_drop modules spawning inaccessible loot piles #1408 #1390 @Uro1
+[FIXED] Undefined variable "_weapon" in fnc_plyrHit.sqf when killer is driving a vehicle #1420 @ebaydayz
+[FIXED] Fire cleanup diag_log error in server_functions.sqf #1421 @ebaydayz
+[FIXED] NearestObjects position error in server_playerSync.sqf #1425 @ebaydayz
+[FIXED] Corrected ClassName type for CH53_DZE and BAF_Merlin_DZE. @Cinjun
+[FIXED] Some counts reverted to forEach - count loops can not be nested inside other count loops #1491-#1495 @ebaydayz
+[FIXED] Safes empty when opening after restart #1467 @ebaydayz
+[FIXED] Dynamic_vehicle spawning non-upgradable classes of hilux1 & datsun1.  @Uro1
+
+[UPDATED] .hpp files updated in dayz_epoch_b CfgLootPos > CfgBuildingPos. @Uro1
+[UPDATED] .bat files updated in Config-Examples @Raziel23x
+[UPDATED] Updated all config.cfg in Config-Examples, Added Default Steam Ports and Updated Layout. @Namindu
+[UPDATED] Epoch.sql & 1.0.5_Updates.sql with correct classnames for upgradable hilux1 & datsun1 versions. @Uro1
+
+[INFO] (EXTREMELY IMPORTANT) Server owners MUST update their required build and beta to 125548
+[INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing.
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/Documents/CHANGE
+++ b/Documents/CHANGE
--- a/Documents/CHANGE
+++ b/Documents/CHANGE
@@ -0,0 +1,20 @@
+[ADDED] BTR90 HQ ride in back option. @Fank
+[ADDED] Version check for dayz.pbo. @Skaronator
+[ADDED] Updated dayZ Lighting by Axeman disabled by default, uncomment line in init.sqf to enable. @andgregor
+[ADDED] Added upgrade in place option for stairs with railings. @Sequisha @vbawol
+
+[FIXED] Fix server startup issues when using "CA folder fix" on some A2 and A2 free installs. @icomrade
+[FIXED] Geomety of wood walls changed to fix players phasing though the wood walls. @Sequisha
+[FIXED] Completed trade counter was incorrectly returning output count instead of actual number of trades. @vbawol 
+[FIXED] Incremental water bottle had a typo in the picture path. fixes: https://github.com/vbawol/DayZ-Epoch/issues/1084 @vbawol
+[FIXED] second attempt at fixing <NULL> kill messages from vehicles. @icomrade
+[FIXED] remove setdamage 0 on godmode/indestructible base objects so they can be maintained. @vbawol
+[FIXED] Fixed error in expression when removing buildings. @Fank
+[FIXED] Was possible to fill a mixed gas with an empty jerry can. @Fank
+[FIXED] Fixed undefined variables s_player_tamedog and dayz_myLiftVehicle. @Fank @vbawol
+[FIXED] Typo in server_traders.sqf for Napf, Sauerland, and panthera. @vbawol
+
+[REMOVED] Old Towngenerator Config. @Skaronator
+
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/Documents/CHANGE
+++ b/Documents/CHANGE
@@ -0,0 +1,9 @@
+[ADDED] Updated Sauerland map V1.80.04 by Falconsan http://epochmod.com/forum/index.php?/topic/6365-dayz-epoch-sauerland-changelog
+[ADDED] Configure AH6J for DZ + DZE @icomrade
+
+[FIXED] Fixed client crash when player has chainsaw due to corrupt RTM file. @vbawol
+
+[INFO] dayz_epoch1051.bikey found in client files "Keys" folder.
+[INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing.
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/Documents/CHANGE
+++ b/Documents/CHANGE
@@ -0,0 +1,35 @@
+[ADDED] Updated Sauerland map V1.80.01 by Falconsan http://epochmod.com/forum/index.php?/topic/6365-dayz-epoch-sauerland-changelog
+[ADDED] More enterable buildings thanks to @Tansien and the DayZero crew.
+[ADDED] Latest version of Napf 1.0.1 by Momo
+[ADDED] Classname C130J_US_EP1_DZ Weapon: 50 Magazine: 400 Backpack: 10 @Fank
+[ADDED] Variable DZE_ForceNameTagsInTrader to force name tags in traders. @Skaronator @Fank
+[ADDED] Switch seats in all vehicles. @icomrade
+[ADDED] Self transfusions (works in vehicles) must be enabled in mission using DZE_SelfTransfuse. @icomrade
+[NOTE]  You may customize transfusion settings for self transfusions using DZE_selfTransfuse_Values = [blood amount, infection chance, cool-down (seconds)]; @icomrade
+[ADDED] Default player skin for fresh spawns, selected randomly DZE_defaultSkin = [["Male skin1","Male skin2"],["Female skin1","Female skin2"]]. @icomrade
+[ADDED] The USEC CH53 Super Stallion to the dynamic vehicle lists & trader. @Namindu @raginruffalo
+[ADDED] The BAF Merlin has been added to the neutral aircraft trader under Unarmed Helicopters. @raginruffalo
+[ADDED] Added CH53 Super Stallion to Allowed to Tow Heli array in "variables.sqf" @Namindu
+
+[FIXED] Instance already initialized error in server_monitor.sqf @vbawol
+[FIXED] Fixed infinite chainsaw fuel when put into vaults/lockboxes. @SilvDev
+[FIXED] Cargo Check overlapping. @SilvDev
+[FIXED] The Makarov SD now only accepts SD clips @raginruffalo
+[FIXED] Load patient into vehicle now working. @SilvDev
+[FIXED] Fix invalid str format for player skin class. @Sandbird https://github.com/vbawol/DayZ-Epoch/commit/55d49c279bfd1e03d3802bfe4fdf55f2335f8f47
+[FIXED] Check trade requirements before animation. @Cornyfisch
+[FIXED] Undefined variable in expression in "fill_nearestVehicle.sqf" @Namindu
+[FIXED] Fix infinite knockout @icomrade
+[FIXED] Fixed typo in "player_tagFriendly.sqf" @Namindu
+
+[CHANGED] Crafting lumber or plywood packs no longer require workbench. @vbawol
+[CHANGED] Force mouse to center of screen on gear open. @vbawol
+[CHANGED] Backend lootsystem based on DayZ 1.8. @vbawol @Skaronator @Fank
+[CHANGED] Consume Eat/Drink in vehicle will add empty food/drink cans into vehicle inventory. @SilvDev @Fank
+[CHANGED] SQL Removed empty fuel barrel from vehicle parts trader and moved to wholesaler as increased buy/sell price. @Fank
+[CHANGED] You may again switch skins while wearing a backpack. @icomrade
+[CHANGED] Replaced variable DefaultBackpackWeapon = ""; with DefaultBackpackItems = [""]; which accepts both weapons and magazines. @icomrade
+
+[INFO] Server admins should add requiredSecureId = 2; to their server.cfg to prevent uid spoofing.
+[INFO] Models/textures by Paul Tomany. @Sequisha.
+[INFO] Special thanks to http://verthosting.com for hosting our development server.
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Based on DayZ Mod Community edition
 https://github.com/DayZMod/DayZ/blob/Release_1.8/Documentation/Credits.md
 http://dayzmod.com 

+
 --------------------------
 Included Custom Addons
 --------------------------
@@ -25,6 +26,8 @@ Included Custom Addons
 * 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/
 * Bell 47/H-13 Helicopter by hcpookie - http://www.armaholic.com/page.php?id=22143
+* USEC CH53 by Rocket - http://dayz.com
+* More enterable buildings - Dayzero - https://zombies.nu/

 --------------------------
 Included Custom Islands
@@ -37,35 +40,63 @@ Included Custom Islands
 * | German Town - and waysigns http://www.armaholic.com/page.php?id=9658

 --------------------------
-Developers
+Initial Developers
 --------------------------
 * [VB]AWOL - Lead Developer - http://www.twitch.tv/vbawol
-* Axle - Beta Tester, Lead Trader City Designer, Ideas. - http://www.twitch.tv/axles
-* Paul Tomany - Models, Textures, Ideas, Beta Tester. - ptomany@gmail.com
-* Axeman - Developer - Light system - axeman@thefreezer.co.uk
-* Harlan (dayz10k) - Developer - https://github.com/dayz10k
-* Skaronator - Developer - Help with many things https://github.com/Skaronator
-* [VB]GREEN - Graphics, Beta Tester, Ideas. http://www.twitch.tv/vbgreen
-* Zabn - Locked gear on vehicles when locked, reworked loot position code to support small items.  https://github.com/Zabn
+* Axle - Tester, Trader City Designer - http://www.twitch.tv/axles
+* Paul Tomany - Models, Textures - ptomany@gmail.com - http://www.twitch.tv/sequisha
+* [VB]GREEN - Graphics - http://www.twitch.tv/vbgreen

 --------------------------
-Contributors
+GitHub Collaborators (In order of most commits)
 --------------------------
-* facoptere - Extra Security - https://github.com/facoptere
-* 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
-* Maca134 - Improved Trader Menus, Death Message menu, Experimental hive 999 support - maca134@gmail.com
-* Tansien - Hive Update to visual studio 2013, added 396 and 397 CHILD for Maintain - https://github.com/Tansien
-* 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
+* vbawol - https://github.com/vbawol
+* eltexonline - https://github.com/eltexonline
+* zabn - https://github.com/zabn
+* Sequisha - https://github.com/Sequisha
+* andgregor - https://github.com/andgregor
+* facoptere - https://github.com/facoptere
+* dayz10k - https://github.com/dayz10k
+* Skaronator - https://github.com/Skaronator
+* icomrade - https://github.com/icomrade
+* Axles - https://github.com/Axles
+* Armifer - https://github.com/Armifer
+
+--------------------------
+GitHub Contributors (In order of most commits)
+--------------------------
+* vbawol - https://github.com/vbawol
+* dayz10k - https://github.com/dayz10k
+* Skaronator - https://github.com/Skaronator
+* Fank - https://github.com/Fank
+* andgregor - https://github.com/andgregor
+* Axles - https://github.com/Axles
+* zabn - https://github.com/zabn
+* eltexonline - https://github.com/eltexonline
+* icomrade - https://github.com/icomrade
+* Namindu - https://github.com/Namindu
+* raginruffalo - https://github.com/raginruffalo
+* Adaptivity - https://github.com/Adaptivity
+* facoptere - https://github.com/facoptere
+* ctcDNightmare - https://github.com/ctcDNightmare
+* SGanthony - https://github.com/SGanthony
+* Geodar - https://github.com/Geodar
+* Sandbird - https://github.com/Sandbird
+* krazey - https://github.com/krazey
+* jostster - https://github.com/jostster
+* SilvDev - https://github.com/SilvDev
+* AVendettaForYou - https://github.com/AVendettaForYou
+* Sequisha - https://github.com/Sequisha
+* Armifer - https://github.com/Armifer
+* infiSTAR - https://github.com/infiSTAR
+* Cornyfisch - https://github.com/Cornyfisch
+* JoSchaap - https://github.com/JoSchaap
+* maca134 - https://github.com/maca134
+* Schmoopiie - https://github.com/Schmoopiie
+* nahkiss - https://github.com/nahkiss
+* BlackLA - https://github.com/BlackLA
+* Hogscraper - https://github.com/hogscraper
+* Raziel23x - https://github.com/Raziel23x

 --------------------------
 Special thanks
--- a/SQF/dayz/$PBOPREFIX$
+++ b/SQF/dayz/$PBOPREFIX$
@@ -0,0 +1 @@
+dayz
--- a/SQF/dayz/characters/annie_original.p3d
+++ b/SQF/dayz/characters/annie_original.p3d
--- a/SQF/dayz/characters/man_bandit.p3d
+++ b/SQF/dayz/characters/man_bandit.p3d
--- a/SQF/dayz/characters/man_hero.p3d
+++ b/SQF/dayz/characters/man_hero.p3d
--- a/SQF/dayz/characters/man_survivor.p3d
+++ b/SQF/dayz/characters/man_survivor.p3d
--- a/SQF/dayz/characters/woman_bandit.p3d
+++ b/SQF/dayz/characters/woman_bandit.p3d
--- a/SQF/dayz/config.cpp
+++ b/SQF/dayz/config.cpp
--- a/SQF/dayz/credits.txt
+++ b/SQF/dayz/credits.txt
@@ -0,0 +1 @@
+Musical Sound Samples		Dan Oberbauer		http://www.freesound.org/people/DJ%20Chronos/
--- a/SQF/dayz/model/BasicColide.p3d
+++ b/SQF/dayz/model/BasicColide.p3d
--- a/SQF/dayz/objects/Barbedwire.p3d
+++ b/SQF/dayz/objects/Barbedwire.p3d
--- a/SQF/dayz/objects/dead_soldier_0.p3d
+++ b/SQF/dayz/objects/dead_soldier_0.p3d
--- a/SQF/dayz/objects/dead_soldier_1.p3d
+++ b/SQF/dayz/objects/dead_soldier_1.p3d
--- a/SQF/dayz/objects/dead_soldier_template.p3d
+++ b/SQF/dayz/objects/dead_soldier_template.p3d
--- a/SQF/dayz/objects/dog.p3d
+++ b/SQF/dayz/objects/dog.p3d
--- a/SQF/dayz/objects/proxy_man.p3d
+++ b/SQF/dayz/objects/proxy_man.p3d
--- a/SQF/dayz/texHeaders.bin
+++ b/SQF/dayz/texHeaders.bin
--- a/SQF/dayz/textures/capb.rvmat
+++ b/SQF/dayz/textures/capb.rvmat
--- a/SQF/dayz/textures/capb_black_co.paa
+++ b/SQF/dayz/textures/capb_black_co.paa
--- a/SQF/dayz/textures/capb_nohq.paa
+++ b/SQF/dayz/textures/capb_nohq.paa
--- a/SQF/dayz/textures/capb_ti_ca.paa
+++ b/SQF/dayz/textures/capb_ti_ca.paa
--- a/SQF/dayz/textures/clothes/bandit_tex1_co.paa
+++ b/SQF/dayz/textures/clothes/bandit_tex1_co.paa
--- a/SQF/dayz/textures/clothes/doctor_co.paa
+++ b/SQF/dayz/textures/clothes/doctor_co.paa
--- a/SQF/dayz/textures/clothes/teacher_co.paa
+++ b/SQF/dayz/textures/clothes/teacher_co.paa
--- a/SQF/dayz/textures/faces/zombie_01_co.paa
+++ b/SQF/dayz/textures/faces/zombie_01_co.paa
--- a/SQF/dayz/textures/faces/zombie_02_co.paa
+++ b/SQF/dayz/textures/faces/zombie_02_co.paa
--- a/SQF/dayz/textures/faces/zombie_03_co.paa
+++ b/SQF/dayz/textures/faces/zombie_03_co.paa
--- a/SQF/dayz/ui/screen_death_ca.paa
+++ b/SQF/dayz/ui/screen_death_ca.paa
--- a/SQF/dayz/ui/screen_title_ca.paa
+++ b/SQF/dayz/ui/screen_title_ca.paa
--- a/SQF/dayz_anim/PboPrefix.txt
+++ b/SQF/dayz_anim/PboPrefix.txt
@@ -1 +0,0 @@
-dayz_anim
--- a/SQF/dayz_anim/config.cpp
+++ b/SQF/dayz_anim/config.cpp
--- a/SQF/dayz_anim/dog/model.cfg
+++ b/SQF/dayz_anim/dog/model.cfg
@@ -87,7 +87,7 @@ class CfgSkeletons
 			"rightUpLeg","spine",
 			"spine","",
 			"spine1","spine",
-			"tail","Hips",
+			"tail","Hips"
 		};
 	};
 	class CfgMovesButterfly: Default
--- a/SQF/dayz_code/Configs/CfgArma.hpp
+++ b/SQF/dayz_code/Configs/CfgArma.hpp
@@ -314,6 +314,7 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWpink_DZ";
 		};
+		/*
 		class Skin_SurvivorWsequisha_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWsequisha_DZ";
@@ -322,6 +323,7 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWsequishaD_DZ";
 		};
+		*/
 		class Skin_SurvivorWcombat_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWcombat_DZ";
--- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp
--- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp
+++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp
@@ -1,563 +0,0 @@
-class CfgLootSmall {
-	trash[] = {
-		{
-			"TrashTinCan",
-			"TrashJackDaniels",
-			"ItemSodaEmpty",
-			"ItemTrashToiletpaper",
-			"ItemTrashRazor"
-		},
-		{
-			0.5,
-			0.05,
-			0.25,
-			0.10,
-			0.1
-		}
-	};
-	civilian[] = {
-		{
-			"FoodCanUnlabeled",
-			"TrashJackDaniels",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"FoodCanBakedBeans",
-			"FoodCanSardines",
-			"FoodCanFrankBeans",
-			"FoodCanPasta",
-			"8Rnd_9x18_Makarov",
-			"7Rnd_45ACP_1911",
-			"2Rnd_shotgun_74Slug",
-			"2Rnd_shotgun_74Pellets",
-			"ItemBandage",
-			"ItemPainkiller",
-			"FoodBioMeat",
-			"8Rnd_9x18_MakarovSD"
-		},
-		{
-			0.07,
-			0.09,
-			0.09,
-			0.1,
-			0.09,
-			0.05,
-			0.05,
-			0.05,
-			0.05,
-			0.07,
-			0.05,
-			0.05,
-			0.05,
-			0.06,
-			0.06,
-			0.01,
-			0.01
-		}
-	};
-	office2[] = {
-		{
-			"FoodCanUnlabeled",
-			"TrashJackDaniels",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"FoodCanBakedBeans",
-			"FoodCanSardines",
-			"FoodCanFrankBeans",
-			"FoodCanPasta",
-			"8Rnd_9x18_Makarov",
-			"7Rnd_45ACP_1911",
-			"2Rnd_shotgun_74Slug",
-			"2Rnd_shotgun_74Pellets",
-			"ItemBandage",
-			"ItemPainkiller",
-			"FoodBioMeat",
-			"8Rnd_9x18_MakarovSD"
-		},
-		{
-			0.07,
-			0.09,
-			0.09,
-			0.09,
-			0.09,
-			0.05,
-			0.05,
-			0.05,
-			0.05,
-			0.07,
-			0.05,
-			0.05,
-			0.05,
-			0.06,
-			0.06,
-			0.01,
-			0.01
-		}
-	};
-	food[] = {
-		{
-			//trash
-			"TrashTinCan",
-			"TrashJackDaniels",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"FoodCanBakedBeans",
-			"FoodCanSardines",
-			"FoodCanFrankBeans",
-			"FoodCanPasta",
-			"FoodCanUnlabeled",
-			// food Bags
-			"FoodPistachio",
-			"FoodNutmix"
-		},
-		{
-			//trash
-			0.09,
-			0.12,
-			0.12,
-			0.09,
-			0.11,
-			0.07,
-			0.07,
-			0.07,
-			0.07,
-			0.1,
-			// food Bags
-			0.05,
-			0.04
-		}
-	};
-	office[] = {
-		{
-			"FoodCanUnlabeled",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"TrashJackDaniels",
-			"FoodCanBakedBeans",
-			"FoodCanSardines",
-			"FoodCanFrankBeans",
-			"FoodCanPasta",
-			"ItemWaterbottleUnfilled",
-			"ItemWaterbottle",
-			"ItemBandage",
-			"7Rnd_45ACP_1911",
-			"5x_22_LR_17_HMR",
-			"10x_303",
-			"6Rnd_45ACP",
-			"2Rnd_shotgun_74Slug",
-			"2Rnd_shotgun_74Pellets",
-			"8Rnd_9x18_Makarov",
-			"15Rnd_W1866_Slug",
-			"WoodenArrow",
-			"HandRoadFlare",
-			"ItemPainkiller",
-			"HandChemGreen",
-			"HandChemBlue",
-			"HandChemRed",
-			"ItemHeatPack"
-		},
-		{
-			0.06,
-			0.06,
-			0.06,
-			0.04,
-			0.04,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.08,
-			0.03,
-			0.01,
-			0.04,
-			0.04,
-			0.05,
-			0.05,
-			0.09,
-			0.02,
-			0.04,
-			0.07,
-			0.02,
-			0.01,
-			0.03,
-			0.03,
-			0.03
-		}
-	};
-	generic[] = {
-		{
-			"FoodCanUnlabeled",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"TrashJackDaniels",
-			"FoodCanBakedBeans",
-			"FoodCanSardines",
-			"FoodCanFrankBeans",
-			"FoodCanPasta",
-			"ItemWaterbottleUnfilled",
-			"ItemWaterbottle",
-			"ItemBandage",
-			"7Rnd_45ACP_1911",
-			"5x_22_LR_17_HMR",
-			"10x_303",
-			"6Rnd_45ACP",
-			"2Rnd_shotgun_74Slug",
-			"2Rnd_shotgun_74Pellets",
-			"8Rnd_9x18_Makarov",
-			"15Rnd_W1866_Slug",
-			"WoodenArrow",
-			"HandRoadFlare",
-			"ItemPainkiller",
-			"HandChemGreen",
-			"HandChemBlue",
-			"HandChemRed",
-			"ItemHeatPack"
-		},
-		{
-			0.06,
-			0.06,
-			0.06,
-			0.04,
-			0.04,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.11,
-			0.03,
-			0.01,
-			0.04,
-			0.04,
-			0.05,
-			0.05,
-			0.09,
-			0.02,
-			0.04,
-			0.07,
-			0.02,
-			0.01,
-			0.03,
-			0.03,
-			0.04
-		}
-	};
-	medical[] = {
-		{
-			"ItemBandage",
-			"ItemPainkiller",
-			"ItemMorphine",
-			"ItemEpinephrine",
-			"ItemAntibiotic",
-			"ItemHeatPack"
-		},
-		{
-			0.4,
-			0.15,
-			0.2,
-			0.1,
-			0.1,
-			0.05
-		}
-	};
-	hospital[] = {
-		{
-			"ItemBandage",
-			"ItemPainkiller",
-			"ItemMorphine",
-			"ItemEpinephrine",
-			"ItemBloodbag",
-			"ItemAntibiotic"
-		},
-		{
-			0.33,
-			0.16,
-			0.13,
-			0.09,
-			0.17,
-			0.12
-		}
-	};
-	military[] = {
-		{
-			"FoodCanUnlabeled",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"ItemBandage",
-			"ItemAntibiotic",
-			"ItemPainkiller",
-			"ItemMorphine",
-			"30Rnd_556x45_Stanag",
-			"20Rnd_762x51_DMR",
-			"17Rnd_9x19_glock17",
-			"15Rnd_9x19_M9SD",
-			"15Rnd_9x19_M9",
-			"30Rnd_762x39_AK47",
-			"30Rnd_545x39_AK",
-			"5Rnd_762x51_M24",
-			"5Rnd_86x70_L115A1",
-			"8Rnd_B_Beneli_74Slug",
-			"1Rnd_HE_M203",
-			"FlareWhite_M203",
-			"FlareGreen_M203",
-			"1Rnd_Smoke_M203",		
-			"200Rnd_556x45_M249",
-			"HandGrenade_west",
-			"HandGrenade_east",
-			"SmokeShell",
-			"SmokeShellRed",
-			"SmokeShellGreen",
-			"8Rnd_B_Beneli_Pellets",
-			"30Rnd_556x45_StanagSD",
-			"30Rnd_9x19_MP5",
-			"30Rnd_9x19_MP5SD",
-			"100Rnd_762x51_M240",
-			"HandChemGreen",
-			"HandChemBlue",
-			"HandChemRed",
-			"ItemHeatPack",
-			"8Rnd_9x18_MakarovSD",
-			"20Rnd_B_765x17_Ball",
-			"30Rnd_9x19_UZI_SD"
-		},
-		{
-			0.09,
-			0.04,
-			0.01,
-			0.01,
-			0.04,
-			0.04,
-			0.04,
-			0.01,
-			0.04,
-			0.04,
-			0.05,
-			0.01,
-			0.02,
-			0.04,
-			0.04,
-			0.01,
-			0.01,
-			0.04,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.01,
-			0.04,
-			0.02,
-			0.02,
-			0.04,
-			0.01,
-			0.02,
-			0.01,
-			0.01,
-			0.02,
-			0.02,
-			0.02,
-			0.04,
-			0.01,
-			0.04,
-			0.01
-		}
-	};
-	policeman[] = {
-		{
-			"ItemBandage",
-			"7Rnd_45ACP_1911",
-			"6Rnd_45ACP",
-			"15Rnd_W1866_Slug",
-			"8Rnd_B_Beneli_Pellets",
-			"HandRoadFlare",
-			"8Rnd_9x18_MakarovSD",
-			"ItemComboLock",
-			"SmokeShell",
-			"ItemHotwireKit"
-		},
-		{
-			0.3,
-			0.08,
-			0.08,
-			0.14,
-			0.17,
-			0.08,
-			0.01,
-			0.05,
-			0.04,
-			0.01
-		}
-	};
-	hunter[] = {
-		{
-			"FoodMRE"
-		},
-		{
-			0.01
-		}
-	};
-
-	worker[] = {
-		{
-			"FoodCanUnlabeled",
-			"TrashJackDaniels",
-			"ItemSodaEmpty",
-			"ItemSodaCoke",
-			"ItemSodaPepsi",
-			"FoodCanBakedBeans",
-			"FoodCanSardines",
-			"FoodCanFrankBeans",
-			"FoodCanPasta",
-			"ItemBandage",
-			"ItemPainkiller",
-			"ItemComboLock",
-			"ItemSledgeHead"
-		},
-		{
-			0.09,
-			0.10,
-			0.10,
-			0.11,
-			0.10,
-			0.06,
-			0.06,
-			0.06,
-			0.06,
-			0.1,
-			0.06,
-			0.04,
-			0.02
-		}
-	};
-	clothes[] = {
-		{
-			"Skin_RU_Policeman_DZ",
-			"Skin_Pilot_EP1_DZ",
-			"Skin_Functionary1_EP1_DZ",
-			"Skin_Priest_DZ",
-			"Skin_Rocker1_DZ",
-			"Skin_Rocker2_DZ",
-			"Skin_Rocker3_DZ",
-			"Skin_Rocker4_DZ",
-			"Skin_SurvivorW3_DZ",
-			"Skin_SurvivorWpink_DZ",
-			"Skin_SurvivorWurban_DZ"
-			//"Skin_SurvivorWsequisha_DZ",
-			//"Skin_SurvivorWsequishaD_DZ",
-		},
-		{
-			0.13,
-			0.12,
-			0.1,
-			0.1,
-			0.07,
-			0.07,
-			0.08,
-			0.08,
-			0.09,
-			0.09,
-			0.07
-			//0.04,
-			//0.02
-		}
-	};
-	militaryclothes[] = {
-		{
-			"Skin_Camo1_DZ",
-			"Skin_Sniper1_DZ",
-			"Skin_Rocket_DZ",
-			"Skin_Soldier1_DZ",
-			"Skin_Drake_Light_DZ",
-			"Skin_Soldier_TL_PMC_DZ",
-			"Skin_Soldier_Sniper_PMC_DZ",
-			"Skin_Soldier_Bodyguard_AA12_PMC_DZ",
-			"Skin_CZ_Special_Forces_GL_DES_EP1_DZ",
-			"Skin_FR_OHara_DZ",
-			"Skin_FR_Rodriguez_DZ",
-			"Skin_CZ_Soldier_Sniper_EP1_DZ",
-			"Skin_Graves_Light_DZ"
-		},
-		{
-			0.1,
-			0.08,
-			0.05,
-			0.13,
-			0.07,
-			0.07,
-			0.05,
-			0.07,
-			0.08,
-			0.08,
-			0.09,
-			0.04,
-			0.09
-		}
-	};
-	specialclothes[] = {
-		{
-			"Skin_Ins_Soldier_GL_DZ",
-			"Skin_GUE_Commander_DZ",
-			"Skin_Bandit1_DZ",
-			"Skin_Bandit2_DZ",
-			"Skin_BanditW1_DZ",
-			"Skin_BanditW2_DZ",
-			"Skin_TK_INS_Soldier_EP1_DZ",
-			"Skin_TK_INS_Warlord_EP1_DZ",
-			"Skin_SurvivorWcombat_DZ",
-			"Skin_SurvivorWdesert_DZ",
-			"Skin_GUE_Soldier_MG_DZ",
-			"Skin_GUE_Soldier_Sniper_DZ",
-			"Skin_GUE_Soldier_Crew_DZ",
-			"Skin_GUE_Soldier_CO_DZ",
-			"Skin_GUE_Soldier_2_DZ"
-		},
-		{
-			0.1,
-			0.08,
-			0.13,
-			0.06,
-			0.07,
-			0.07,
-			0.05,
-			0.07,
-			0.08,
-			0.08,
-			0.05,
-			0.04,
-			0.04,
-			0.04,
-			0.04
-		}
-	};
-	machinegunammoexpl[] = {
-		{
-			"100Rnd_556x45_BetaCMag",
-			"75Rnd_545x39_RPK",
-			"100Rnd_556x45",
-			"100Rnd_762x51_M240",
-			"100Rnd_762x54_PK",
-			"200Rnd_556x45_M249",
-			"MAAWS_HEAT",
-			"PipeBomb"
-		},
-		{
-			0.20,
-			0.20,
-			0.15,
-			0.15,
-			0.14,
-			0.14,
-			0.01,
-			0.01,
-		}
-	};
-};
--- a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp
--- a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
+++ b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
@@ -0,0 +1,406 @@
+/*
+Created by Raymix
+*/
+
+
+class SnapBuilding {
+	//Barriers whitelist
+	class Barrier {
+		snapTo[] = {
+			"Land_HBarrier5_DZ",
+			"Land_HBarrier3_DZ",
+			"Land_HBarrier1_DZ",
+			"Sandbag1_DZ",
+			"BagFenceRound_DZ",
+			"Fort_RazorWire"
+		};
+		radius = 5;
+	};
+	//snap points
+	class Land_HBarrier5Preview: Barrier{ //fix for broken offsets in ghost
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-0.75,0.1,"Back"},
+		{0,0.75,0.1,"Front"},
+		{-2.85,0,0.1,"Left"},
+		{2.85,0,0.1,"Right"},
+		{0,0,0.9,"Top"}
+		};
+	};
+	class Land_HBarrier5_DZ: Land_HBarrier5Preview {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-0.75,0,"Back"},
+		{0,0.75,0,"Front"},
+		{-2.85,0,0,"Left"},
+		{2.85,0,0,"Right"},
+		{0,0,0.9,"Top"}
+		};
+	}; 
+	
+	class Land_HBarrier3ePreview: Barrier { //whitelist inheritance
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-0.75,0,"Back"},
+		{0,0.75,0,"Front"},
+		{-1.7,0,0,"Left"},
+		{1.7,0,0,"Right"},
+		{0,0,0.9,"Top"}
+		};
+	};
+	class Land_HBarrier3_DZ: Land_HBarrier3ePreview{}; //point inheritance
+
+	class Land_HBarrier1Preview: Barrier {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-0.75,0,"Back"},
+		{0,0.75,0,"Front"},
+		{-0.6,0,0,"Left"},
+		{0.6,0,0,"Right"},
+		{0,0,0.9,"Top"}
+		};
+	};
+	class Land_HBarrier1_DZ: Land_HBarrier1Preview{};
+		
+	class Fort_RazorWirePreview: Barrier {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-0.95,-0.3,"Back"},
+		{0,0.95,-0.3,"Front"},
+		{-4.1,0,-0.3,"Left"},
+		{4.1,0,-0.3,"Right"},
+		{0,0,1,"Top"}
+		};
+	};
+	class Fort_RazorWire: Fort_RazorWirePreview {};
+	
+	class Sandbag1_DZ: Barrier {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-1.5,0,0,"Left"},
+		{1.5,0,0,"Right"},
+		{0,0,0.4,"Top"}
+		};
+	};
+	
+	class BagFenceRound_DZ: Barrier {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-1.295,0.38,0,"Left"},
+		{1.295,0.38,0,"Right"},
+		{0,0,0.4,"Top"}
+		};
+	};
+	
+	//Snapping whitelists for Floors, walls and stairs
+	class FloorsWallsStairs {
+		snapTo[] = {
+			"WoodFloorQuarter_DZ",
+			"WoodFloorHalf_DZ",
+			"WoodFloor_DZ",
+			"WoodStairs_DZ",
+			"WoodStairsSans_DZ",
+			"WoodSmallWallDoor_DZ",
+			"WoodSmallWall_DZ",
+			"WoodSmallWallWin_DZ",
+			"Land_DZE_WoodDoor",
+			"Land_DZE_WoodDoorLocked",
+			"WoodLargeWall_DZ",
+			"Land_DZE_LargeWoodDoor",
+			"WoodLargeWallWin_DZ",
+			"WoodLargeWallDoor_DZ",
+			"Land_DZE_GarageWoodDoor",
+			"Land_DZE_GarageWoodDoorLocked",
+			"Land_DZE_LargeWoodDoorLocked",
+			"WoodSmallWallThird_DZ",
+			"CinderWall_DZ",
+			"CinderWallDoorway_DZ",
+			"CinderWallDoorLocked_DZ",
+			"CinderWallDoor_DZ",
+			"CinderWallSmallDoorway_DZ",
+			"CinderWallDoorSmallLocked_DZ",
+			"CinderWallHalf_DZ",
+			"CinderWallDoorSmall_DZ",
+			"MetalFloor_DZ"
+		};
+		radius = 7;
+	};
+	
+	class WoodFloorQuarter_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-1.23,0,"Back"},
+		{0,1.23,0,"Front"},
+		{-1.24,0,0,"Left"},
+		{1.24,0,0,"Right"}
+		};
+	};
+	
+	class WoodFloorQuarter_DZ: FloorsWallsStairs { 
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-1.23,0.137726,"Back"},
+		{0,1.23,0.137726,"Front"},
+		{-1.24,0,0.137726,"Left"},
+		{1.24,0,0.137726,"Right"}
+		};
+	};
+	
+	class WoodFloorHalf_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-2.34,0,"Back"},
+		{0,2.34,0,"Front"},
+		{-1.25,0,0,"Left"},
+		{1.25,0,0,"Right"}
+		};
+	};
+	class WoodFloorHalf_DZ: FloorsWallsStairs{
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-2.34,0.1407,"Back"},
+		{0,2.34,0.1407,"Front"},
+		{-1.25,0,0.1407,"Left"},
+		{1.25,0,0.1407,"Right"}
+		};
+	};
+	
+	class WoodFloor_Preview_DZ: FloorsWallsStairs {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-2.33,0.130,"Back"},
+		{0,2.33,0.130,"Front"},
+		{-2.45,0,0.130,"Left"},
+		{2.45,0,0.130,"Right"}
+		};
+		radius = 10;
+	};
+	class WoodFloor_DZ: WoodFloor_Preview_DZ{};
+	
+	class Stairs_DZE: FloorsWallsStairs {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{1.56055,-0.78,1.5,"Back"},
+		{1.56055,0.78,1.5,"Front"},
+		{1.73926,0.05,2.9,"Top"},
+		{-1.73926,0.05,0,"Bottom"}
+		};
+	};
+	class WoodStairs_DZ: Stairs_DZE {};
+	class WoodStairs_Preview_DZ: Stairs_DZE {};
+	class WoodStairsSans_Preview_DZ: Stairs_DZE {};
+	class WoodStairsSans_DZ: Stairs_DZE {};
+
+	class WoodSmall_DZE: FloorsWallsStairs { // Small wood walls
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.285, 0, 1.5,"Left"},
+		{2.285, 0, 1.5,"Right"},
+		{0, 0, 3,"Top"}
+		};
+	};
+	class WoodSmallWallDoor_Preview_DZ: WoodSmall_DZE {};
+	class WoodSmallWall_Preview_DZ: WoodSmall_DZE {};
+	class WoodSmallWallWin_Preview_DZ: WoodSmall_DZE {};
+	class WoodSmallWallDoor_DZ: WoodSmall_DZE {};
+	class WoodSmallWall_DZ: WoodSmall_DZE {};
+	class WoodSmallWallWin_DZ: WoodSmall_DZE {};
+	class Land_DZE_WoodDoor: WoodSmall_DZE {};
+	class Land_DZE_WoodDoorLocked: WoodSmall_DZE {};
+	class WoodDoor_Preview_DZ: WoodSmall_DZE{};
+	
+	class WoodLarge_DZE: FloorsWallsStairs { //Large wood walls
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.45, 0, 1.5,"Left"},
+		{2.45, 0, 1.5,"Right"},
+		{0, 0, 3,"Top"}
+		};
+	};
+	class WoodLargeWall_Preview_DZ: WoodLarge_DZE {};
+	class WoodLargeWallWin_Preview_DZ: WoodLarge_DZE {};
+	class WoodLargeWallDoor_Preview_DZ: WoodLarge_DZE {};
+	class WoodSmallWallThird_Preview_DZ: WoodLarge_DZE {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.445, 0, 1.5,"Left"},
+		{2.445, 0, 1.5,"Right"},
+		{0, 0, 1.17,"Top"}
+		};
+	};
+	class WoodSmallWallThird_DZ: WoodSmallWallThird_Preview_DZ{};
+	class WoodLargeWall_DZ: WoodLarge_DZE {};
+	class Land_DZE_LargeWoodDoor: WoodLarge_DZE {};
+	class WoodLargeWallWin_DZ: WoodLarge_DZE {};
+	class WoodLargeWallDoor_DZ: WoodLarge_DZE {};
+	class Land_DZE_GarageWoodDoor: WoodLarge_DZE {};
+	class GarageWoodDoor_Preview_DZ: WoodLarge_DZE {};
+	class Land_DZE_GarageWoodDoorLocked: WoodLarge_DZE {};
+	class Land_DZE_LargeWoodDoorLocked: WoodLarge_DZE {};
+	class LargeWoodDoor_Preview_DZ: WoodLarge_DZE {};
+	
+	class Cinder_DZE: FloorsWallsStairs { //All cinder walls and doors
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.752, 0, 1.5,"Left"},
+		{2.752, 0, 1.5,"Right"},
+		{0, 0, 3.37042,"Top"}
+		};
+		radius = 10;
+	};
+	class CinderWall_Preview_DZ: Cinder_DZE {};
+	class CinderWallDoorway_Preview_DZ: Cinder_DZE {};
+	class CinderWallSmallDoorway_Preview_DZ: Cinder_DZE {}; 
+	class CinderWallHalf_Preview_DZ: Cinder_DZE {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.752, 0, 1.5,"Left"},
+		{2.752, 0, 1.5,"Right"},
+		{0, 0, 1.5,"Top"}
+		};
+	};
+	class CinderWall_DZ: Cinder_DZE {};
+	class CinderWallDoorway_DZ: Cinder_DZE {};
+	class CinderWallDoorLocked_DZ: Cinder_DZE {};
+	class CinderWallDoor_DZ: Cinder_DZE {};
+	class CinderWallSmallDoorway_DZ: Cinder_DZE {};
+	class CinderWallDoorSmallLocked_DZ: Cinder_DZE {};
+	class CinderWallHalf_DZ: Cinder_DZE {
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.752, 0, 1.5,"Left"},
+		{2.752, 0, 1.5,"Right"},
+		{0, 0, 1.5,"Top"}
+		};
+	};
+	class CinderWallDoorSmall_DZ: Cinder_DZE {};
+	
+	class MetalFloor_Preview_DZ: FloorsWallsStairs { //fix for broken offsets in ghost
+		points[] = {
+		{0,0,0.011,"Pivot"},
+		{0, -2.64, 0.009,"Back"},
+		{0, 2.64, 0.009,"Front"},
+		{-2.64, 0, 0.009,"Left"},
+		{2.64, 0, 0.009,"Right"}
+		};
+		radius = 12;
+	};
+	class MetalFloor_DZ: FloorsWallsStairs{
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0, -2.64, 0.15,"Back"},
+		{0, 2.64, 0.15,"Front"},
+		{-2.64, 0, 0.15,"Left"},
+		{2.64, 0, 0.15,"Right"}
+		};
+		radius = 12;
+	};
+	
+	
+	//Non essential Items that only snap to themselves, do whitelist inheritance if you want these to snap
+	class WoodCrate_DZ {
+		snapTo[] = {
+			"WoodCrate_DZ"
+		};
+		radius = 5;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,-0.47,0,"Back"},
+		{0,0.47,0,"Front"},
+		{-0.47,0,0,"Left"},
+		{0.47,0,0,"Right"},
+		{0,0,0.47,"Top"}
+		};
+	};
+		
+	class MetalPanel_DZ {
+		snapTo[] = {
+			"MetalPanel_DZ"
+		};
+		radius = 5;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-1.5,0,0,"Left"},
+		{1.5,0,0,"Right"}
+		};
+	};
+	
+		class MetalGate_DZ {
+		snapTo[] = {
+			"MetalGate_DZ"
+		};
+		radius = 5;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-4.1,0,0,"Left"}
+		};
+	};
+	
+	class StickFence_DZ {
+		snapTo[] = {
+			"StickFence_DZ"
+		};
+		radius = 10;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-2.95,0,0.3,"Left"},
+		{2.95,0,0.3,"Right"}
+		};
+	};
+	
+	class Fence_corrugated_DZ {
+		snapTo[] = {
+			"Fence_corrugated_DZ"
+		};
+		radius = 10;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-1.95,0,0.88,"Left"},
+		{1.95,0,0.88,"Right"}
+		};
+	};
+	
+	class WoodRamp_Preview_DZ {
+		snapTo[] = {
+			"WoodRamp_DZ"
+		};
+		radius = 7;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0.65,-1.7,1.2,"Back"},
+		{0.65,1.5,1.2,"Front"},
+		{3.34,-0.115,2.82,"Top"}
+		};
+	};
+	class WoodRamp_DZ: WoodRamp_Preview_DZ{};
+	
+	class WoodLadder_Preview_DZ {
+		snapTo[] = {
+			"WoodLadder_DZ"
+		};
+		radius = 5;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{-0.4,0,1.725,"Left"},
+		{0.4,0,1.725,"Right"}
+		};
+	};
+	class WoodLadder_DZ: WoodLadder_Preview_DZ{};
+	
+	class VaultStorageLocked {
+		snapTo[] = {
+			"VaultStorageLocked",
+			"VaultStorage"
+		};
+		radius = 5;
+		points[] = {
+		{0,0,0,"Pivot"},
+		{0,0.284,0.615,"Back"},
+		{0,0,1.23,"Top"},
+		{-0.362,0,0.615,"Left"},
+		{0.362,0,0.615,"Right"}
+		};
+		
+	};
+	class VaultStorage: VaultStorageLocked {};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
@@ -0,0 +1,696 @@
+#include "CfgLoot.hpp"
+
+class CfgBuildingLoot {
+	class Default {
+		zombieChance = 0.2;
+		minRoaming = 0;
+		maxRoaming = 2;
+		zombieClass[] = {"zZombie_Base","z_hunter","z_teacher","z_suit1","z_suit2","z_worker1","z_worker2","z_worker3","z_villager1","z_villager2","z_villager3"};
+		lootChance = 0;
+		lootPos[] = {};
+
+		lootPosSmall[] = {};
+		lootPosZombie[] = {};
+		
+		itemType[] = {};
+
+		itemChance[] = {};
+		lootTypeSmall[] = {};
+		itemChanceSmall[] = {};
+
+		hangPos[] = {};
+		vehPos[] = {};
+	};
+	
+	class Castle: Default {
+		lootChance = 0.2;
+		lootPos[] = {};
+		lootType[] = {
+		//one spawn
+		//tools
+			//{"ItemMatchbox","weapon",0.01},
+			{"ItemKnife","weapon",0.01},
+			{"ItemMap","generic",0.01},
+			{"ItemCompass","weapon",0.01},
+			{"ItemFlashlight","weapon",0.01},
+		//weapons
+			{"WeaponHolder_ItemHatchet","object",0.01},
+		//special
+			{"WeaponHolder_ItemTent","object",0.01},
+			//{"WeaponHolder_DomeTentStorage","object",0.01},
+		//mags special
+			{"PartWoodPile","magazine",0.04},
+		//bags
+			//{"DZ_Patrol_Pack_EP1","object",0.01},
+		//Multiple spawns
+			//{"","Residential",0.60},
+			{"","generic",0.40}
+		};
+	};
+	class Residential: Default {
+		zombieChance = 0.3;
+		maxRoaming = 2;
+		zombieClass[] = {"zZombie_Base","z_hunter","z_teacher","z_villager1","z_villager2","z_villager3"};
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{"ItemWatch","generic",0.04},
+			{"ItemCompass","generic",0.03},
+			{"ItemMap","weapon",0.02},
+			{"ItemFlashlight","generic",0.01},
+			{"ItemKnife","generic",0.04},
+			{"ItemMatchbox_DZE","generic",0.01},
+			{"","generic",0.32},
+			{"backpacks","backpacks",0.04},
+			{"tents","tents",0.01},
+			{"","military",0.02},
+			{"","trash",0.17},
+			{"Binocular","weapon",0.02},
+			{"PartPlywoodPack","magazine",0.02},
+			{"clothes","clothes",0.01},
+			{"specialclothes","specialclothes",0.01},
+			{"WeaponHolder_MeleeCrowbar","object",0.03},
+			{"pistols", "cfglootweapon", 0.04 },
+			{"shotgunsingleshot", "cfglootweapon", 0.04 }
+		};
+		lootTypeSmall[] = {
+			{ "ItemSodaMdew","magazine",0.01 },
+			{ "ItemSodaRbull","magazine",0.01 },
+			{ "ItemSodaOrangeSherbet","magazine",0.02 },
+			{ "ItemWatch","weapon",0.05 },
+			{ "ItemCompass","weapon",0.04 },
+			{ "ItemMap","weapon",0.03 },
+			{ "pistols","cfglootweapon",0.12 },
+			{ "ItemFlashlight","weapon",0.02 },
+			{ "ItemKnife","weapon",0.04 },
+			{ "ItemMatchbox_DZE","weapon",0.03 },
+			{ "","generic",0.38 },
+			{ "","military",0.04 },
+			{ "","trash",0.17 },
+			{ "Binocular","weapon",0.02 },
+			{ "clothes","single",0.01},
+			{ "specialclothes","single",0.01 }
+		};
+	};
+	class Office: Default {
+		maxRoaming = 3;
+		zombieClass[] = {"z_suit1","z_suit2"};
+		zombieChance = 0.3;
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{"ItemWatch","generic",0.04},
+			{"ItemCompass","generic",0.03},
+			{"ItemMap","weapon",0.02},
+			{"ItemFlashlight","generic",0.01},
+			{"ItemKnife","generic",0.04},
+			{"ItemMatchbox_DZE","generic",0.01},
+			{"","generic",0.31},
+			{"backpacks","backpacks",0.04},
+			{"tents","tents",0.01},
+			{"","military",0.02},
+			{"","trash",0.21},
+			{"Binocular","weapon",0.02},
+			{"PartPlywoodPack","magazine",0.02},
+			{"clothes","clothes",0.01},
+			{"specialclothes","specialclothes",0.01},
+			{"WeaponHolder_MeleeCrowbar","object",0.03},
+			{"ItemBriefcaseEmpty","magazine",0.01},
+			{ "shotgunsingleshot", "cfglootweapon", 0.05}
+		};
+		lootTypeSmall[] = {
+			{ "ItemSodaMdew","magazine",0.01 },
+			{ "ItemSodaRbull","magazine",0.01 },
+			{ "ItemSodaOrangeSherbet","magazine",0.02 },
+			{ "ItemWatch","weapon",0.05 },
+			{ "ItemCompass","weapon",0.04 },
+			{ "ItemMap","weapon",0.03 },
+			{ "pistols","cfglootweapon",0.15 },
+			{ "ItemFlashlight","weapon",0.02 },
+			{ "ItemKnife","weapon",0.05 },
+			{ "ItemMatchbox_DZE","weapon",0.03 },
+			{ "","generic",0.31 },			
+			{ "","military",0.04 },
+			{ "","trash",0.03 },
+			{ "Binocular","weapon",0.02 },
+			{ "clothes","single",0.16 },
+			{ "specialclothes","single",0.02 },
+			{ "ItemDocument","magazine",0.01 }
+		};
+	};
+	class Industrial: Default {
+		zombieChance = 0.4;
+		zombieClass[] = {"z_worker1","z_worker2","z_worker3"};
+		maxRoaming = 2;
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{"ItemGenerator","magazine",0.01},
+			{"ItemFuelBarrelEmpty","magazine",0.01},
+			{"","generic",0.17},
+			{"","trash",0.25},
+			{"","military",0.04},
+			{"PartGeneric","magazine",0.04},
+			{"PartWheel","magazine",0.05},
+			{"PartFueltank","magazine",0.02},
+			{"PartEngine","magazine",0.02},
+			{"PartGlass","magazine",0.04},
+			{"PartVRotor","magazine",0.01},
+			{"ItemJerrycan","magazine",0.04},
+			{"WeaponHolder_ItemHatchet_DZE","object",0.07},
+			{"ItemKnife","military",0.07},
+			{"ItemToolbox","weapon",0.06},
+			{"ItemWire","magazine",0.01},
+			{"ItemTankTrap","magazine",0.04},
+			{"ItemKeyKit","weapon",0.01},
+			{"CinderBlocks","magazine",0.03},
+			{"MortarBucket","magazine",0.01}
+		};
+		lootTypeSmall[] = {
+			{ "","generic",0.5 },
+			{ "","trash",0.28 },
+			{ "","military",0.14 },
+			{ "ItemKnife","weapon",0.07 },
+			{ "ItemKeyKit","weapon",0.01 }
+		};
+	};
+	class IndustrialFuel: Default {
+		zombieChance = 0.4;
+		zombieClass[] = {"z_worker1","z_worker2","z_worker3"};
+		maxRoaming = 2;
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{"ItemGenerator","magazine",0.01},
+			{"fuel_pump_kit","magazine",0.01},
+			{"","generic",0.18},
+			{"","trash",0.28},
+			{"","military",0.04},
+			{"PartGeneric","magazine",0.04},
+			{"PartWheel","magazine",0.05},
+			{"PartFueltank","magazine",0.02},
+			{"PartEngine","magazine",0.02},
+			{"PartGlass","magazine",0.04},
+			{"PartVRotor","magazine",0.01},
+			{"ItemJerrycan","magazine",0.04},
+			{"WeaponHolder_ItemHatchet_DZE","object",0.07},
+			{"ItemKnife","military",0.07},
+			{"ItemToolbox","weapon",0.06},
+			{"ItemWire","magazine",0.01},
+			{"ItemTankTrap","magazine",0.04},
+			{"ItemKeyKit","weapon",0.01}
+		};
+		lootTypeSmall[] = {
+			{ "","generic",0.5 },
+			{ "","trash",0.28 },
+			{ "","military",0.14 },
+			{ "ItemKnife","weapon",0.07 },
+			{ "ItemKeyKit","weapon",0.01 }
+		};
+	};
+	class Farm: Default {
+		zombieChance = 0.3;
+		maxRoaming = 3;
+		zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3"};
+		lootChance = 0.5;
+		lootPos[] = {};
+		lootType[] = {
+			{"ItemJerrycan","magazine",0.05},
+			{"","generic",0.3},
+			{"","trash",0.11},
+			{"PartPlankPack","magazine",0.06},
+			{"WeaponHolder_ItemHatchet_DZE","object",0.05},
+			{"ItemFuelBarrelEmpty","magazine",0.01},
+			{"WeaponHolder_ItemMachete","object",0.03},
+			{"ItemFishingPole","weapon",0.02},
+			{"ItemLightBulb","magazine",0.02},
+			{"ItemSledgeHandle","magazine",0.02},
+			{ "farmweapons", "cfglootweapon", 0.15}
+		};
+		lootTypeSmall[] = {
+			{ "","generic", 0.79},
+			{ "","trash",0.14 },
+			{ "","military",0.05},
+			{ "ItemLightBulb","magazine",0.01},
+			{ "ItemSledgeHead","magazine",0.01}
+		};
+	};
+	class Supermarket: Default {
+		lootChance = 0.6;
+		minRoaming = 2;
+		maxRoaming = 6;
+		zombieChance = 0.3;
+		zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
+		lootType[] = {
+			{"ItemSodaMdew","magazine",0.01},
+			{"ItemSodaRbull","magazine",0.01},
+			{"ItemSodaOrangeSherbet","magazine",0.03},
+			{"ItemWatch","generic",0.07},
+			{"ItemCompass","generic",0.02},
+			{"ItemMap","weapon",0.04},
+			{"ItemFlashlight","generic",0.01},
+			{"ItemKnife","generic",0.02},
+			{"ItemMatchbox_DZE","generic",0.04},
+			{"","generic",0.04},
+			{"backpacks","backpacks",0.07},
+			{"tents","tents",0.01},
+			{"","food",0.3},
+			{"","trash",0.17},
+			{"Binocular","weapon",0.05},
+			{"PartPlywoodPack","magazine",0.02},
+			{ "pistols", "cfglootweapon", 0.04},
+			{ "shotgunsingleshot", "cfglootweapon", 0.04}
+		};
+		lootTypeSmall[] = {
+			{ "ItemSodaMdew","magazine",0.01 },
+			{ "ItemSodaRbull","magazine",0.01 },
+			{ "ItemSodaOrangeSherbet","magazine",0.03 },
+			{ "ItemWatch","weapon",0.07 },
+			{ "ItemCompass","weapon",0.03 },
+			{ "ItemMap","weapon",0.05 },
+			{ "pistols","cfglootweapon",0.08 },
+			{ "ItemFlashlight","weapon",0.01 },
+			{ "ItemKnife","weapon",0.02 },
+			{ "ItemMatchbox_DZE","weapon",0.04 },
+			{ "","generic",0.21 },
+			{ "","food",0.24 },
+			{ "","trash",0.16 },
+			{ "Binocular","weapon",0.02 },
+			{ "ItemMixOil", "magazine",0.02}
+		};
+	};
+	class HeliCrash: Default {
+		zombieChance = 0.4;
+		maxRoaming = 2;
+		zombieClass[] = {"z_soldier_pilot"};
+		lootChance = 0.5;
+		lootPos[] = {};
+		lootType[] = {
+			{ "assaultrifles", "cfglootweapon", 0.10 },
+			{ "submachinegun", "cfglootweapon", 0.04 },
+			{ "sniperrifles", "cfglootweapon", 0.07 },
+			{ "machineguns", "cfglootweapon", 0.06 },
+			{"","military",0.3},
+			{"","medical",0.18},
+			{"MAAWS","weapon",0.02},
+			{"MedBox0","object",0.05},
+			{"NVGoggles","weapon",0.01},
+			{"AmmoBoxSmall_556","object",0.03},
+			{"AmmoBoxSmall_762","object",0.03},
+			{"militaryclothes","militaryclothes",0.05},
+			{"militaryammo","militaryammo",0.06}
+		};
+	};
+	class HeliCrash_No50s: Default {
+		zombieChance = 0.4;
+		maxRoaming = 2;
+		zombieClass[] = {"z_soldier_pilot"};
+		lootChance = 0.5;
+		lootPos[] = {};
+		lootType[] = {
+			{ "assaultrifles", "cfglootweapon", 0.10 },
+			{ "submachinegun", "cfglootweapon", 0.04 },
+			{ "sniperrifles", "cfglootweapon", 0.07 },
+			{ "machineguns", "cfglootweapon", 0.06 },
+			{ "", "military", 0.3 },
+			{ "", "medical", 0.18 },
+			{ "MAAWS", "weapon", 0.02 },
+			{ "MedBox0", "object", 0.05 },
+			{ "NVGoggles", "weapon", 0.01 },
+			{ "AmmoBoxSmall_556", "object", 0.03 },
+			{ "AmmoBoxSmall_762", "object", 0.03 },
+			{ "militaryclothes", "militaryclothes", 0.05 },
+			{ "militaryammo", "militaryammo", 0.06 }
+		};
+	};
+	class Hospital: Default {
+		zombieChance = 0.4;
+		minRoaming = 2;
+		maxRoaming = 6;
+		zombieClass[] = {"z_doctor","z_doctor","z_doctor"};
+		lootChance = 1;
+		lootPos[] = {};
+		lootType[] = {
+			{"","trash",0.1},
+			{"","hospital",0.7},
+			{"MedBox0","object",0.2}
+		};
+		lootTypeSmall[] = {
+			{ "","trash",0.1 },
+			{ "","hospital",0.9 }
+		};
+	};
+	class Military: Default {
+		zombieChance = 0.3;
+		maxRoaming = 6;
+		zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman"};
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{ "pistols", "cfglootweapon", 0.04},
+			{ "assaultrifles", "cfglootweapon", 0.13 },
+			{ "sniperrifles", "cfglootweapon", 0.04 },
+			{ "shotgunsingleshot", "cfglootweapon", 0.06 },
+			{ "submachinegun", "cfglootweapon", 0.07 },
+			{"Binocular","weapon",0.03},
+			{"ItemFlashlightRed","military",0.04},
+			{"ItemKnife","military",0.01},
+			{"ItemGPS","weapon",0.01},
+			{"ItemMap","military",0.02},
+			{"militarybackpacks","militarybackpacks",0.05},
+			{"","medical",0.03},
+			{"","generic",0.1},
+			{"","military",0.3},
+			{"ItemEtool","weapon",0.02},
+			{"ItemSandbag","magazine",0.02},
+			{ "machineguns", "cfglootweapon", 0.03 }
+		};
+		lootTypeSmall[] = {
+			{ "pistols", "cfglootweapon", 0.14 },
+			{ "Binocular", "weapon", 0.05 },
+			{ "ItemFlashlightRed", "weapon", 0.03 },
+			{ "ItemKnife", "weapon", 0.04 },
+			{ "ItemGPS", "weapon", 0.02 },
+			{ "", "medical", 0.12 },
+			{ "", "generic", 0.22 },
+			{ "", "military", 0.35 },
+			{ "ItemEtool", "weapon", 0.03 }
+		};
+	};
+	class MilitaryIndustrial: Default {
+		zombieChance = 0.3;
+		maxRoaming = 6;
+		zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"};
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{ "pistols", "cfglootweapon", 0.02 },
+			{ "assaultrifles", "cfglootweapon", 0.05 },
+			{ "PartGeneric", "magazine", 0.03 },
+			{ "sniperrifles", "cfglootweapon", 0.01 },
+			{ "shotgunsingleshot", "cfglootweapon", 0.05 },
+			{ "ItemGenerator", "magazine", 0.01 },
+			{ "submachinegun", "cfglootweapon", 0.05 },
+			{"PartGeneric","magazine",0.03},
+			{"ItemGenerator","magazine",0.01},
+			{"PartWheel","magazine",0.02},
+			{"Binocular","weapon",0.01},
+			{"ItemFlashlightRed","military",0.03},
+			{"ItemKnife","military",0.04},
+			{"ItemGPS","weapon",0.01},
+			{"PartVRotor","magazine",0.01},
+			{"militarybackpacks","militarybackpacks",0.03},
+			{"","medical",0.05},
+			{"","generic",0.35},
+			{"","military",0.07},
+			{"ItemEtool","weapon",0.03},
+			{"ItemSandbag","magazine",0.02},
+			{"ItemFuelBarrelEmpty","magazine",0.03},
+			{"fuel_pump_kit","magazine",0.01},
+			{ "machineguns", "cfglootweapon", 0.01 }
+		};
+		lootTypeSmall[] = {
+			{ "pistols", "cfglootweapon", 0.14 },
+			{ "Binocular", "weapon", 0.05 },
+			{ "ItemFlashlightRed", "weapon", 0.03 },
+			{ "ItemKnife", "weapon", 0.04 },
+			{ "ItemGPS", "weapon", 0.02 },
+			{ "", "medical", 0.12 },
+			{ "", "generic", 0.22 },
+			{ "", "military", 0.35 },
+			{ "ItemEtool", "weapon", 0.03 }
+		};
+	};
+	class IndustrialMilitary: Default {
+		zombieChance = 0.4;
+		maxRoaming = 6;
+		zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"};
+		lootChance = 0.5;
+		lootPos[] = {};
+		lootType[] = {
+			{ "pistols", "cfglootweapon", 0.02 },
+			{ "assaultrifles", "cfglootweapon", 0.05 },
+			{ "PartGeneric", "magazine", 0.03 },
+			{ "sniperrifles", "cfglootweapon", 0.01 },
+			{ "shotgunsingleshot", "cfglootweapon", 0.05 },
+			{ "ItemGenerator", "magazine", 0.01 },
+			{ "submachinegun", "cfglootweapon", 0.05 },
+			{"PartGeneric","magazine",0.03},
+			{"ItemGenerator","magazine",0.01},
+			{"PartWheel","magazine",0.02},
+			{"Binocular","weapon",0.01},
+			{"ItemFlashlightRed","military",0.03},
+			{"ItemKnife","military",0.04},
+			{"ItemGPS","weapon",0.01},
+			{"PartVRotor","magazine",0.01},
+			{"PartFueltank","magazine",0.03},
+			{"PartEngine","magazine",0.04},
+			{"PartGlass","magazine",0.05},
+			{"militarybackpacks","militarybackpacks",0.03},
+			{"","medical",0.05},
+			{"","generic",0.25},
+			{"","military",0.07},
+			{"ItemEtool","weapon",0.03},
+			
+			{"ItemSandbag","magazine",0.02},
+
+			{"ItemFuelBarrelEmpty","magazine",0.03},
+			{"fuel_pump_kit","magazine",0.01},
+			{ "machineguns", "cfglootweapon", 0.01 }
+		};
+		lootTypeSmall[] = {
+			{ "pistols", "cfglootweapon", 0.14 },
+			{ "Binocular", "weapon", 0.05 },
+			{ "ItemFlashlightRed", "weapon", 0.03 },
+			{ "ItemKnife", "weapon", 0.04 },
+			{ "ItemGPS", "weapon", 0.02 },
+			{ "", "medical", 0.12 },
+			{ "", "generic", 0.22 },
+			{ "", "military", 0.35 },
+			{ "ItemEtool", "weapon", 0.03 }
+		};
+	};
+	class MilitarySpecial: Default {
+		zombieChance = 0.4;
+		minRoaming = 2;
+		maxRoaming = 6;
+		zombieClass[] = {"z_soldier_heavy"};
+		lootChance = 0.4;
+		lootPos[] = {};
+		lootType[] = {
+			{ "assaultrifles", "cfglootweapon", 0.1 },
+			{ "machineguns", "cfglootweapon", 0.04 },
+			{ "pistols", "cfglootweapon", 0.08 },
+			{ "sniperrifles", "cfglootweapon", 0.03 },
+			{ "militaryshotguns", "cfglootweapon", 0.05 },
+			{ "submachinegun", "cfglootweapon", 0.06 },
+			{"AmmoBoxSmall_556","object",0.01},
+			{"AmmoBoxSmall_762","object",0.02},
+			{"Binocular","weapon",0.01},
+			{"ItemFlashlightRed","military",0.02},
+			{"ItemKnife","military",0.01},
+			{"ItemGPS","weapon",0.01},
+			{"ItemMap","military",0.01},
+			{"Binocular_Vector","military",0.01},
+			{"militarybackpacks","militarybackpacks",0.04},
+			{"","medical",0.08},
+			{"","generic",0.3},
+			{"","military",0.01},
+			{"machinegunammo","machinegunammo",0.05},
+			{"militaryclothes","militaryclothes",0.05},
+			{"NVGoggles","weapon",0.01}
+		};
+		lootTypeSmall[] = {
+			{ "pistols","cfglootweapon",0.10 },
+			{ "AmmoBoxSmall_556","object",0.02 },
+			{ "AmmoBoxSmall_762","object",0.02 },
+			{ "Binocular","weapon",0.02 },
+			{ "ItemFlashlightRed","military",0.01 },
+			{ "ItemKnife","military",0.02 },
+			{ "ItemGPS","weapon",0.02 },
+			{ "ItemMap","weapon",0.01 },
+			{ "Binocular_Vector","weapon",0.03},
+			{ "","medical",0.08},
+			{ "","generic",0.15},
+			{ "","military",0.33 },
+			{ "5Rnd_86x70_L115A1","magazine",0.03},
+			{ "10Rnd_127x99_m107","magazine",0.02},
+			{ "machinegunammoexpl","single",0.02 },
+			{ "militaryclothes","single",0.05 },
+			{ "NVGoggles","weapon",0.04 },
+			{ "100Rnd_762x54_PK","magazine",0.02 }
+		};
+	};
+	class Hunting: Default {
+		zombieChance = 0.4;
+		minRoaming = 1;
+		maxRoaming = 3;
+		zombieClass[] = {"z_hunter","z_hunter","z_hunter"};
+		lootChance = 1;
+		lootPos[] = {};
+		lootType[] = {
+			{"ItemMap","weapon",0.02},
+			{"ItemFlashlight","generic",0.01},
+			{"ItemKnife","generic",0.01},
+			{"ItemMatchbox_DZE","generic",0.03},
+			{ "farmweapons", "cfglootweapon", 0.03 },
+			{"","military",0.38},
+			{"WeaponHolder_ItemMachete","object",0.02},
+			{"","hunter",0.5}
+		};
+		lootTypeSmall[] =	{
+			{"ItemMap","weapon",0.02},
+			{"ItemFlashlight","weapon",0.02},
+			{"ItemKnife","weapon",0.02},
+			{"ItemMatchbox_DZE","weapon",0.04},
+			{"","military",0.4},
+			{"","hunter",0.5}
+		};
+	};
+	class DynamicDebris: Default
+	{
+		lootChance = 0.4;
+		minRoaming = 0;
+		maxRoaming = 2;
+		zombieChance = 0.3;
+		zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
+		lootType[] = {
+			{ "ItemWatch", "generic", 0.19 },
+			{ "ItemCompass", "generic", 0.01 },
+			{ "ItemMap", "weapon", 0.06 },
+			{ "Makarov", "weapon", 0.02 },
+			{ "Colt1911", "weapon", 0.02 },
+			{ "ItemFlashlight", "generic", 0.06 },
+			{ "ItemKnife", "generic", 0.06 },
+			{ "ItemMatchbox_DZE", "generic", 0.06 },
+			{ "ItemToolbox", "weapon", 0.02 },
+			{ "", "generic", 0.17 },
+			{ "", "food", 0.06 },
+			{ "PartGeneric", "magazine", 0.07 },
+			{ "PartWheel", "magazine", 0.06 },
+			{ "PartFueltank", "magazine", 0.03 },
+			{ "PartEngine", "magazine", 0.01 },
+			{ "PartGlass", "magazine", 0.08 },
+			{ "WeaponHolder_ItemJerrycan", "object", 0.03 }
+		};
+	};
+	class DynamicDebrisMilitary: Default
+	{
+		lootChance = 0.4;
+		minRoaming = 0;
+		maxRoaming = 2;
+		zombieChance = 0.3;
+		zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
+		lootType[] = {
+			{ "ItemEtool", "weapon", 0.05 },
+			{ "ItemSandbag", "magazine", 0.1 },
+			{ "", "military", 0.08 },
+			{ "ItemWatch", "generic", 0.1 },
+			{ "ItemCompass", "generic", 0.02 },
+			{ "ItemMap", "weapon", 0.05 },
+			{ "MakarovSD", "weapon", 0.01 },
+			{ "Colt1911", "weapon", 0.02 },
+			{ "ItemFlashlight", "generic", 0.01 },
+			{ "ItemKnife", "generic", 0.05 },
+			{ "ItemMatchbox_DZE", "generic", 0.05 },
+			{ "ItemToolbox", "weapon", 0.02 },
+			{ "", "generic", 0.15 },
+			{ "", "food", 0.05 },
+			{ "PartGeneric", "magazine", 0.06 },
+			{ "PartWheel", "magazine", 0.05 },
+			{ "PartFueltank", "magazine", 0.03 },
+			{ "PartEngine", "magazine", 0.02 },
+			{ "PartGlass", "magazine", 0.03 },
+			{ "PartVRotor", "magazine", 0.02 },
+			{ "WeaponHolder_ItemJerrycan", "object", 0.03 }
+		};
+	};
+	class SupplyDrop: Default {
+		zombieChance = 1;
+		maxRoaming = 3;
+		zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3","z_doctor","z_soldier_pilot","z_soldier_heavy"};
+		lootChance = 1;
+		lootPos[] = {};
+		lootType[] = {
+			{ "PartPlywoodPack", "magazine", 0.1 },
+			{ "PartPlankPack", "magazine", 0.2 },
+			{ "CinderBlocks", "magazine", 0.1 },
+			{ "MortarBucket", "magazine", 0.1 },
+			{ "bulk_PartGeneric", "magazine", 0.2 },
+			{ "bulk_ItemSandbag", "magazine", 0.1 },
+			{ "bulk_ItemTankTrap", "magazine", 0.1 },
+			{ "ItemSledge", "weapon", 0.1 }
+		};
+	};
+	class MassGrave: Default {
+		zombieChance = 1;
+		maxRoaming = 3;
+		zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3","z_doctor","z_soldier_pilot","z_soldier_heavy"};
+		lootChance = 1;
+		lootPos[] = {};
+		lootType[] = {
+			{ "M16A2", "weapon", 0.03 },
+			{ "M16A2GL", "weapon", 0.01 },
+			{ "M249_EP1_DZ", "weapon", 0.01 },
+			{ "M9SD", "weapon", 0.02 },
+			{ "Pecheneg_DZ", "weapon", 0.02 },
+			{ "PK_DZ", "weapon", 0.01 },
+			{ "AK_74", "weapon", 0.02 },
+			{ "M4A1_Aim", "weapon", 0.01 },
+			{ "AKS_74_kobra", "weapon", 0.01 },
+			{ "AKS_74_U", "weapon", 0.02 },
+			{ "AK_47_M", "weapon", 0.02 },
+			{ "M24", "weapon", 0.01 },
+			{ "SVD_CAMO", "weapon", 0.01 },
+			{ "M1014", "weapon", 0.02 },
+			{ "BAF_LRR_scoped", "weapon", 0.01 },
+			{ "M4SPR", "weapon", 0.01 },
+			{ "M4A1", "weapon", 0.01 },
+			{ "M14_EP1", "weapon", 0.02 },
+			{ "UZI_EP1", "weapon", 0.03 },
+			{ "Remington870_lamp", "weapon", 0.01 },
+			{ "glock17_EP1", "weapon", 0.02 },
+			{ "M240_DZ", "weapon", 0.02 },
+			{ "M4A1_AIM_SD_camo", "weapon", 0.01 },
+			{ "M16A4_ACG", "weapon", 0.01 },
+			{ "M4A1_HWS_GL_camo", "weapon", 0.01 },
+			{ "Mk_48_DZ", "weapon", 0.01 },
+			{ "M4A3_CCO_EP1", "weapon", 0.01 },
+			{ "AmmoBoxSmall_556", "object", 0.03 },
+			{ "AmmoBoxSmall_762", "object", 0.03 },
+			{ "Binocular", "weapon", 0.01 },
+			{ "ItemFlashlightRed", "military", 0.02 },
+			{ "ItemKnife", "military", 0.01 },
+			{ "ItemGPS", "weapon", 0.01 },
+			{ "ItemMap", "military", 0.01 },
+			{ "Binocular_Vector", "military", 0.01 },
+			{ "DZ_ALICE_Pack_EP1", "object", 0.03 },
+			{ "DZ_TK_Assault_Pack_EP1", "object", 0.02 },
+			{ "DZ_British_ACU", "object", 0.02 },
+			{ "DZ_CivilBackpack_EP1", "object", 0.02 },
+			{ "DZ_Backpack_EP1", "object", 0.01 },
+			{ "DZ_LargeGunBag_EP1", "object", 0.01 },
+			{ "", "medical", 0.05 },
+			{ "", "generic", 0.05 },
+			{ "", "military", 0.13 },
+			{ "PipeBomb", "magazine", 0.01 },
+			{ "Sa58V_RCO_EP1", "weapon", 0.01 },
+			{ "Sa58V_CCO_EP1", "weapon", 0.01 },
+			{ "G36_C_SD_camo", "weapon", 0.01 },
+			{ "M40A3", "weapon", 0.01 },
+			{ "100Rnd_762x54_PK", "magazine", 0.01 },
+			{ "", "militaryclothes", 0.05 },
+			{ "WeaponHolder_ItemMachete", "object", 0.02 },
+			{ "SCAR_H_LNG_Sniper_SD", "weapon", 0.01 },
+			{ "2000Rnd_762x51_M134", "magazine", 0.01 },
+			{ "KSVK_DZE", "weapon", 0.01 },
+			{ "m240_scoped_EP1_DZE", "weapon", 0.01 }
+		};
+	};
+
+	#include "CfgBuildingPos.hpp"
+	//If you want to copypast your loottable to your mission w/o
+	//changing something on the lootPos then use the a include instead of copypasting the CfgBuildingPos.hpp
+
+	//#include "\dayz_epoch_b\CfgBuildingPos.hpp"
+};
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
@@ -71,7 +71,20 @@ class Land_A_GeneralStore_01: Supermarket {
 };
 class Land_Farm_Cowshed_a: Farm {
 	lootPos[] = {{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}};
+	lootPosZombie[] = {{-7.52783,0.260742,-2.21265},{4.53271,-5.17969,-2.21265}};
+	lootPosSmall[] = {{-6.74829,-2.98145,-3.03766},{1.34399,3.79199,-3.03766}};
 };
+class Land_Farm_Cowshed_b: Farm {
+	lootPos[] = {{-3.26782,2.71875,-3.0311},{5.41699,-2.57813,-3.04111}};
+	lootPosZombie[] = {{-2.55957,0.0683594,-2.2261}};
+	lootPosSmall[] = {{3.46802,3.36621,-3.05112},{-9.98511,-3.2793,-3.09109}};
+};
+class Land_Farm_Cowshed_c: Farm {
+	lootPos[] = {{0.625,-2.61133,-3.06583}};
+	lootPosZombie[] = {{-2.09741,0.564453,-2.25082}};
+	lootPosSmall[] = {{-2.82446,3.18457,-3.11581}};
+};
+
 class Land_stodola_open: Farm {
 	lootPos[] = {{-3.77881,6.2478,-4.11348},{1.59106,6.31494,-4.10928},{-3.94727,-1.95605,-4.15359},{-0.440918,-3.91187,-4.1938}};
 	lootPosZombie[] = {{1.66333,4.70776,-3.24809},{1.57202,-6.3313,-3.23413}};
@@ -131,12 +144,12 @@ class Land_HouseB_Tenement: Office {
 	lootPosZombie[] = {{-10.75,5.90088,-19.9095},{-9.99756,5.92529,-19.9095},{-8.12207,5.97852,-19.9095},{-7.31445,6.00879,-19.9095},{5.53882,10.6328,-19.9095},{4.28247,8.729,-19.9095}};
 	lootPosSmall[] = {{-1.7771,4.57861,-19.8245},{-0.338623,4.80322,-19.8245},{-11.0986,-0.365234,-20.3445},{2.38574,5.15869,-20.2245},{14.2202,4.91895,-20.3945},{6.7251,11.6895,-20.3445},{3.2915,-1.90088,-20.3445},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}};
 };
-class Land_A_Hospital: hospital {
-	lootChance = 0.8;
-	lootPos[] = {{6.34253,-2.0498,-7.34966},{1.20044,-3.17676,-7.34966},{-6.09375,-1.32227,-7.34966},{-12.1106,-1.1416,-7.34966}};
-	lootPosZombie[] = {{-1.05542,-7.77393,-6.57103},{1.37695,-7.51074,-6.57103},{-18.5427,-3.37891,-6.57896},{-1.56226,3.03711,-6.57103},{13.3225,3.51172,-6.57103},{20.2839,-3.38281,-6.58154}};
-	lootPosSmall[] = {{-13.2749,-1.99512,-7.34966},{-11.0256,-2.84473,-6.89966},{-14.729,-1.21484,-7.34966},{-4.55444,-3.34229,-6.35966},{-1.68921,-4.03125,-6.35966},{2.29761,-3.49756,-6.75966},{2.92163,-0.976074,-6.89966},{4.47095,-0.858887,-7.34966},{7.62231,-0.94873,-7.34966},{9.41187,-0.902832,-6.89966},{16.623,-3.96729,-6.89966},{-15.7454,-0.918945,-6.89966}};
+class land_a_hospital: hospital {
+	lootPos[] = {{17.665,-4.67188,-7.2566},{-20.7139,-1.48047,-7.2566},{-15.6924,8.60889,-7.2566},{-15.6064,1.95557,-6.8266},{-16.2139,2.27051,-7.2566},{-8.68652,4.19189,-3.7576},{14.2441,-3.98535,-3.7576},{21.5693,5.16455,1.19051},{18.3779,2.40869,6.2524},{-15.3359,-1.25439,3.40458},{-20.3252,0.410156,-3.82761}};
+	lootPosZombie[] = {{9.84473,0.953613,-6.3816},{0.540039,1.20801,-6.3816},{-20.7822,1.93555,-6.3816},{-9.54004,8.61279,-6.3816},{15.8838,3.41699,-2.8826},{-8.08691,1.40674,-2.8826},{11.0088,-1.44775,-2.8826}};
+	lootPosSmall[] = {{9.97754,-0.814453,-7.2566},{-19.6143,1.83887,-7.1666},{-19.6055,1.6084,-6.7866},{-19.583,4.91748,-6.7866},{-19.5576,4.7417,-6.0266},{-22.1982,9.59033,-7.2566},{-12.3379,9.53857,-6.8266},{-3.23438,6.01758,-6.8266},{-13.626,3.04248,-6.0466},{2.86426,-1.68604,-6.6466},{-5.58594,1.38232,-3.7576},{-4.05762,-2.48584,-3.7576},{-11.8428,5.15576,-2.5976},{-5.57129,-3.17236,-2.5976},{-5.65332,5.01416,-2.5976},{-12.5439,-2.33838,-3.6876},{-12.5801,-1.32617,-3.3076},{-12.5928,-1.56299,-2.9276},{-12.6162,-2.24805,-2.1676},{-12.5654,2.4126,-2.5476},{14.8721,3.96875,3.66054},{16.9033,-1.33838,4.01669},{21.3174,4.88916,6.2524},{-4.00488,7.89893,-3.82761}};
 };
+
 class Land_Panelak: Office {
 	lootPos[] = {{-3.76709,-5.5791,0.0714226},{-6,-5.1709,0.0714226},{-4.86719,-3.30518,0.0714226},{-5.75098,1.51172,0.0714226},{3.95483,-4.83008,2.77144},{4.8728,1.51855,2.77144},{6.07324,-5.4668,2.77144}};
 	lootPosZombie[] = {{0.657227,-3.12109,0.946423},{-2.28564,-6.88281,0.946423},{-6.31055,-5.41943,0.946423},{-4.51709,3.01758,0.946423},{-0.828613,-3.01465,3.64644},{2.23975,-6.20801,3.64644},{6.84961,-4.8125,3.64644},{4.64917,2.84668,3.64644},{4.59229,-2.55957,3.64644}};
@@ -244,10 +257,12 @@ class Land_Mil_Barracks_i: MilitarySpecial {
 class Land_A_TVTower_Base: Industrial {
 	lootPos[] = {{-0.982422,-1.92627,-2.21573},{-2.01782,-4.2417,-2.21918},{-0.759277,1.42139,-2.21573}};
 };
-class Land_Mil_House: Military {
-	vehPos[] = {{13.439,3.25244,-5.71244,84}};
-	lootPos[] = {{12.457,1.4248,-5.81439},{11.0391,4.85278,-5.81439},{13.667,4.42139,-5.81439}};
+class land_mil_house: Military {
+	lootPos[] = {{-14.3345,1.24414,-4.94623},{-7.87842,1.45117,-4.15622},{-7.77686,-5.34277,-0.88623},{-4.43506,-5.33594,-0.88623}};
+	lootPosZombie[] = {{-11.2925,2.85059,-4.03122},{-9.33154,-1.83496,-4.03122},{-10.5005,-4.77051,-0.0112305},{-2.37695,-1.71973,-0.0112305}};
+	lootPosSmall[] = {{-10.4692,4.4082,-4.94623},{-10.3696,1.2627,-4.46622},{-6.47998,4.92871,-4.98621},{-13.3208,-0.803711,-4.98621},{-13.791,-6.27832,-0.88623},{-13.2046,-5.36426,-0.196228},{-9.45166,-6.02832,-0.88623},{-0.253418,-4.12402,-0.88623},{-4.75635,-0.0224609,-0.88623},{-6.02002,-0.0410156,-0.426239},{-2.28857,0.575195,-0.876221}};
 };
+
 class Land_Misc_Cargo1Ao: Industrial {
 	lootPos[] = {{0.48877,-1.61377,-1.09224},{0.012207,2.19263,-1.09224},{0.00976563,0.19043,-1.09224}};
 };
@@ -292,8 +307,9 @@ class Land_A_Castle_Gate: Residential {
 	lootPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
 }; // Qty: 3
 class Land_Mil_Barracks: Military {
-	lootPos[] = {};
-	lootPosZombie[] = {{9.02515,-0.694336,-1.16602},{9.01538,0.856445,-1.16602}};
+	lootPos[] = {{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}};
+	lootPosZombie[] = {{-2.15845,-3.12793,-1.06134},{2.13281,3.24316,-1.06134},{-6.20679,-0.125,-1.06134},{2.09521,-3.36719,-1.06134}};
+	lootPosSmall[] = {{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}};
 }; // Qty: 8
 class Land_Mil_Barracks_L: Military {
 	lootPos[] = {};
@@ -527,28 +543,33 @@ class GraveCrossHelmet: Military {
 	maxRoaming = 4;
 };

-class Land_HouseV_1L2: Residential {
-	maxRoaming = 3;
-	lootPosZombie[] = {{-2.88257,4.3457,-2.1376},{2.77734,-5.9126,-2.14038}};
-	lootPosSmall[] = {{0.183594,-5.47998,-1.08436}};
-}; // Qty: 101
-
-class Land_Misc_PowerStation: Industrial {
-	lootPos[] = {{4.22314,1.09888,-1.2678}};
-	lootPosZombie[] = {{3.88232,-2.35083,-0.393564},{-6.12842,3.4292,-1.1761}};
-	lootPosSmall[] = {{3.67725,4.86694,-1.2576}};
+class land_housev_1l2: Residential  {
+	lootPos[] = {{-2.58887,-4.8584,-0.789368},{-2.58887,-4.8584,-0.789368},{-2.37646,0.373047,-0.799377}};
+	lootPosZombie[] = {{1.88721,-3.35938,0.0856323},{1.88721,-3.35938,0.0856323},{1.68408,-0.298828,0.0856323}};
+	lootPosSmall[] = {{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{-1.37354,-3.26465,-0.789368},{4.48389,-3.06348,0.0406189},{4.53271,-3.61328,0.590637},{4.29126,-1.02441,0.0606384},{-0.199707,3.28711,-2.9292}};
 };

-class Land_HouseV_3I3: HouseRoaming{
-	lootPosZombie[] = {{0.915527,3.53455,-1.24826},{4.38135,3.39111,-1.36197}};
+class land_misc_powerstation: Industrial  {
+	lootPos[] = {{2.98767,-5.02051,1.54777},{3.67371,5.62207,-2.04407}};
+	lootPosZombie[] = {{-1.06372,6.63672,-1.11913},{0.224365,-2.4873,-0.377583},{-0.857544,3.08789,-1.11905}};
+	lootPosSmall[] = {{4.92017,6.24707,-1.26179},{1.62573,-6.4541,-1.13445},{1.33667,-6.37207,-0.374413},{-3.20825,-6.50195,0.315748},{-3.84949,-6.2627,-1.16402},{-1.35608,-6.3877,-0.374122},{-0.895142,-6.39453,-0.37413},{2.30383,2.21387,-2.04394},{0.0808105,-0.0566406,-1.204},{1.98657,3.49121,-0.623982}};
 };

-class Land_Mil_Guardhouse: Military {
-	lootPos[] = {{-2.43457,3.06396,-1.69939},{-2.36816,-0.151855,-1.69939}};
-	lootPosZombie[] = {{-2.56885,0.749512,-0.794393},{5.69531,0.884766,-1.12091}};
-	lootPosSmall[] = {{-2.14746,1.94531,-1.69939}};
+
+class land_housev_3i3: Residential  {
+	lootPos[] = {{-4.2334,0.291992,-1.47064},{1.10059,-2.99854,-0.790649},{3.53027,-2.34033,-1.74265}};
+	lootPosZombie[] = {{-4.18457,-1.68164,-0.525635},{0.419922,-1.00781,-0.525635},{4.35059,-1.37939,-0.98764}};
+	lootPosSmall[] = {{-4.85645,0.550293,-0.340637},{2.21289,0.783691,-0.160645},{-0.833008,0.554199,-0.620636},{1.79785,-2.99902,-1.09064},{5.06055,-2.68164,-1.56265}};
 };

+
+class land_mil_guardhouse: Military {
+	lootPos[] = {{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}};
+	lootPosZombie[] = {{-1.73193,-1.90625,-0.56778},{3.26025,-1.55859,-0.56778}};
+	lootPosSmall[] = {{-0.798828,-3.51758,-1.46277},{3.73047,-3.95996,-1.32278},{-0.283203,-3.15723,-1.32278},{-0.996582,3.81445,-1.14279},{-1.33008,2.26563,-0.762787},{0.289063,3.66211,-0.0827942},{-1.17383,-0.112305,-1.48279}};
+};
+
+
 // DAYZ AMP More buildings
 class Land_Shed_W02_EP1: FarmRoaming{};
 class Land_MBG_ApartmentsOne_W: HouseRoaming{};
@@ -674,10 +695,12 @@ class Land_Mil_Repair_center_EP1: Industrial
 class Land_Ind_PowerStation_EP1: Industrial {
 	lootPos[] = {{4.04248,-3.4917,-1.26547},{3.8645,3.5249,-1.28112}};
 };
-class land_repair_center: Industrial {
-	lootPosZombie[] = {{0.629883,-3.35498,-1.64651},{-2.61719,3.68213,-0.653473}};
-	lootPosSmall[] = {{-2.52832,1.68213,-1.54846}};
+class land_repair_center: Industrial  {
+	lootPos[] = {{0.327148,1.65479,-2.37888},{-2.35547,-0.163574,-1.71927},{-2.41016,4.45654,-1.71927}};
+	lootPosZombie[] = {{0.982422,-0.634277,-1.51389}};
+	lootPosSmall[] = {{1.80469,2.01709,-1.6489},{1.60352,4.57178,-0.862885},{0.771484,4.55713,-0.48288},{1.56348,4.50439,-1.24289}};
 };
+
 class Land_Ind_TankBig: Industrial
 {
 	lootChance = 0.1;
@@ -1089,6 +1112,34 @@ class Land_MBG_Shanty_BIG: Residential
 		{ 23.2319,11.6201,27.9672 },
 		{ -33.3779,-11.3564,5.81198 }};
 };
+class land_mbg_apartments_big_04: Office {
+	lootPos[] = {{10.1953,-2.47656,-3.19898},{3.14453,-0.197266,-3.19898},{0.949219,5.58789,5.94502},{-0.888672,2.47461,2.69382},{3.99414,-0.273438,2.89702},{10.7344,-0.351563,2.89702},{-10.4961,-5.46484,2.89702},{-3.25391,0.669922,2.89702},{10.6816,-2.26367,-0.15098},{-3.48828,0.31543,-0.15098},{-2.97461,-2.35547,-0.15098}};
+	lootPosZombie[] = {{-0.0898438,4.67773,-7.08873},{0.890625,-5.13965,-6.90238}};
+	lootPosSmall[] = {{4.52734,1.46289,-3.19898},{2.90234,5.90918,2.89702},{5.46875,-0.703125,2.89702},{-4.46875,-0.686523,2.89702},{5.17383,-1.80566,-0.15098},{-7.44531,5.68359,-0.15098}};
+};
+class land_mbg_killhouse_4: Residential {
+	lootPos[] = {{7.22266,-4.10205,-3.84318},{-2.04883,0.195313,-3.84318},{-6.33398,2.08691,-3.84318},{3.6582,0.32666,-3.84318},{7.24805,6.55469,-3.84318},{6.74023,2.40967,-0.543176},{-1.83203,2.08301,-0.543176},{6.85742,0.0131836,-0.543176},{-1.89258,-0.352051,-0.543176}};
+	lootPosZombie[] = {{0.597656,-6.93311,-3.62662},{-8.15625,1.8877,-3.62662}};
+	lootPosSmall[] = {{2.41992,-4.59082,-3.84318},{-1.61133,-4.5249,-3.84318},{2.61719,3.53076,-3.84318},{7.63867,6.79102,-0.543176},{2.54883,6.95605,-0.543176},{-1.70898,6.92188,-0.543176},{2.70313,-1.13672,-0.543176},{-6.58008,-4.49268,-0.543176}};
+};
+class land_mbg_ger_estate_2: Office {
+	lootPos[] = {{-0.847656,-5.23291,-2.13187},{-0.615234,3.95996,-1.55187},{8.30859,0.642578,-2.02187},{7.60547,6.6792,-2.13187},{6.38867,-5.31396,-2.13187},{-4.74023,3.71582,-2.13187}};
+	lootPosZombie[] = {{2.12695,-8.60791,-1.5208},{1.33984,9.18945,-1.25071}};
+	lootPosSmall[] = {{-6.3125,-6.48145,-1.43187},{-4.81445,-2.0293,-1.43187},{-3.47852,4.58789,-2.13187},{0.107422,3.45947,-1.55187},{4.23438,-1.42188,-1.83187},{4.97461,1.09229,-1.30187},{6.53711,-2.07227,-1.29187},{6.35547,-4.70117,-1.65187},{-7.55273,3.99268,-1.65187}};
+};
+class land_mbg_ger_rhus_1: Residential {
+	lootChance = 0.3;
+	lootPos[] = {{-1.85156,3.59961,-0.0356913},{3.04688,1.85254,-0.465693},{3.36328,0.257813,-0.465693},{-2.74023,-3.26465,-0.465693},{1.23828,-4.19531,-2.38569},{1.56055,2.37012,-2.86569},{-10.4941,3.8916,-0.454963},{-9.91797,-4.14453,-0.454963},{-5.84375,0.373047,-0.174962},{-4.50977,0.0859375,-3.35496}};
+	lootPosZombie[] = {{-2.03125,6.38867,-2.93606},{-8.33398,-5.82813,-2.73209}};
+	lootPosSmall[] = {{-1.4707,4.39844,-0.0356913},{1.56055,0.314453,-0.185692},{2.53516,0.682617,-3.25569},{3.62695,0.696289,-2.50569},{-3.34375,3.22852,-2.43569},{-3.32031,2.38086,-1.95569},{-4.81055,1.39453,-0.454963},{-6.64844,-4.29102,-0.454963},{-4.32617,-1.61035,-2.51496},{-6.30664,-4.11328,-2.37496}};
+};
+class land_mbg_garage_single_b: Industrial {
+	lootPos[] = {{2.54492,3.97607,-1.03899},{4.13672,-0.0625,-1.03899}};
+	lootPosZombie[] = {{2.96094,6.3374,-0.133815}};
+	lootPosSmall[] = {{4.50586,2.56982,-1.03899}};
+};
+
+
 class Land_dum_istan3_hromada2: Residential
 {
 	lootPos[] = {
--- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp
@@ -0,0 +1,501 @@
+#include "CfgLootSmall.hpp"
+class CfgLoot {
+	trash[] = {
+		{"TrashTinCan",0.5}
+		,{"TrashJackDaniels",0.05}
+		,{"ItemSodaEmpty",0.25}
+		,{"ItemTrashToiletpaper",0.1}
+		,{"ItemTrashRazor",0.1}
+	};
+	civilian[] = {
+		{"FoodCanUnlabeled",0.07}
+		,{"TrashJackDaniels",0.08}
+		,{"ItemSodaEmpty",0.08}
+		,{"ItemSodaCoke",0.09}
+		,{"ItemSodaPepsi",0.09}
+		,{"FoodCanBakedBeans",0.05}
+		,{"FoodCanSardines",0.05}
+		,{"FoodCanFrankBeans",0.05}
+		,{"FoodCanPasta",0.05}
+		,{"8Rnd_9x18_Makarov",0.07}
+		,{"7Rnd_45ACP_1911",0.05}
+		,{"2Rnd_shotgun_74Slug",0.05}
+		,{"2Rnd_shotgun_74Pellets",0.05}
+		,{"ItemBandage",0.06}
+		,{"ItemPainkiller",0.06}
+		,{"FoodBioMeat",0.01}
+		,{"8Rnd_9x18_MakarovSD",0.01}
+		,{"ItemDocument",0.03}
+	};
+	office2[] = {
+		{"FoodCanUnlabeled",0.07}
+		,{"TrashJackDaniels",0.08}
+		,{"ItemSodaEmpty",0.08}
+		,{"ItemSodaCoke",0.09}
+		,{"ItemSodaPepsi",0.09}
+		,{"FoodCanBakedBeans",0.05}
+		,{"FoodCanSardines",0.05}
+		,{"FoodCanFrankBeans",0.05}
+		,{"FoodCanPasta",0.05}
+		,{"8Rnd_9x18_Makarov",0.07}
+		,{"7Rnd_45ACP_1911",0.05}
+		,{"2Rnd_shotgun_74Slug",0.05}
+		,{"2Rnd_shotgun_74Pellets",0.05}
+		,{"ItemBandage",0.06}
+		,{"ItemPainkiller",0.06}
+		,{"FoodBioMeat",0.01}
+		,{"8Rnd_9x18_MakarovSD",0.01}
+		,{"ItemBriefcaseEmpty",0.01}
+		,{"ItemDocument",0.02}
+	};
+	food[] = {
+		{"TrashTinCan",0.09}
+		,{"TrashJackDaniels",0.12}
+		,{"ItemSodaEmpty",0.12}
+		,{"ItemSodaCoke",0.09}
+		,{"ItemSodaPepsi",0.11}
+		,{"FoodCanBakedBeans",0.07}
+		,{"FoodCanSardines",0.07}
+		,{"FoodCanFrankBeans",0.07}
+		,{"FoodCanPasta",0.07}
+		,{"FoodCanUnlabeled",0.1}
+		,{"FoodPistachio",0.05}
+		,{"FoodNutmix",0.04}
+	};
+	office[] = {
+		{"FoodCanUnlabeled",0.06}
+		,{"ItemSodaEmpty",0.06}
+		,{"ItemSodaCoke",0.06}
+		,{"ItemSodaPepsi",0.04}
+		,{"TrashJackDaniels",0.04}
+		,{"FoodCanBakedBeans",0.01}
+		,{"FoodCanSardines",0.01}
+		,{"FoodCanFrankBeans",0.01}
+		,{"FoodCanPasta",0.01}
+		,{"ItemWaterbottleUnfilled",0.01}
+		,{"ItemWaterbottle",0.01}
+		,{"ItemBandage",0.07}
+		,{"7Rnd_45ACP_1911",0.03}
+		,{"5x_22_LR_17_HMR",0.01}
+		,{"10x_303",0.04}
+		,{"6Rnd_45ACP",0.04}
+		,{"2Rnd_shotgun_74Slug",0.05}
+		,{"2Rnd_shotgun_74Pellets",0.05}
+		,{"8Rnd_9x18_Makarov",0.08}
+		,{"15Rnd_W1866_Slug",0.02}
+		,{"WoodenArrow",0.04}
+		,{"HandRoadFlare",0.07}
+		,{"ItemPainkiller",0.02}
+		,{"HandChemGreen",0.01}
+		,{"HandChemBlue",0.03}
+		,{"HandChemRed",0.03}
+		,{"ItemHeatPack",0.03}
+		,{"ItemLockbox",0.04}
+		,{"ItemDocument",0.02}
+	};
+	generic[] = {
+		{"FoodCanUnlabeled",0.06}
+		,{"ItemSodaEmpty",0.06}
+		,{"ItemSodaCoke",0.06}
+		,{"ItemSodaPepsi",0.04}
+		,{"TrashJackDaniels",0.04}
+		,{"FoodCanBakedBeans",0.01}
+		,{"FoodCanSardines",0.01}
+		,{"FoodCanFrankBeans",0.01}
+		,{"FoodCanPasta",0.01}
+		,{"ItemWaterbottleUnfilled",0.01}
+		,{"ItemWaterbottle",0.01}
+		,{"ItemBandage",0.11}
+		,{"7Rnd_45ACP_1911",0.03}
+		,{"5x_22_LR_17_HMR",0.01}
+		,{"10x_303",0.04}
+		,{"6Rnd_45ACP",0.04}
+		,{"2Rnd_shotgun_74Slug",0.05}
+		,{"2Rnd_shotgun_74Pellets",0.05}
+		,{"8Rnd_9x18_Makarov",0.09}
+		,{"15Rnd_W1866_Slug",0.02}
+		,{"WoodenArrow",0.04}
+		,{"HandRoadFlare",0.07}
+		,{"ItemPainkiller",0.02}
+		,{"HandChemGreen",0.01}
+		,{"HandChemBlue",0.03}
+		,{"HandChemRed",0.03}
+		,{"ItemHeatPack",0.04}
+	};
+	medical[] = {
+		{"ItemBandage",0.4}
+		,{"ItemPainkiller",0.15}
+		,{"ItemMorphine",0.2}
+		,{"ItemEpinephrine",0.1}
+		,{"ItemAntibiotic",0.1}
+		,{"ItemHeatPack",0.05}
+	};
+	hospital[] = {
+		{"ItemBandage",0.33}
+		,{"ItemPainkiller",0.16}
+		,{"ItemMorphine",0.13}
+		,{"ItemEpinephrine",0.09}
+		,{"ItemBloodbag",0.17}
+		,{"ItemAntibiotic",0.12}
+	};
+	military[] = {
+		{"FoodCanUnlabeled",0.07}
+		,{"ItemSodaEmpty",0.04}
+		,{"ItemSodaCoke",0.01}
+		,{"ItemSodaPepsi",0.01}
+		,{"ItemBandage",0.04}
+		,{"ItemAntibiotic",0.04}
+		,{"ItemPainkiller",0.04}
+		,{"ItemMorphine",0.01}
+		,{"30Rnd_556x45_Stanag",0.04}
+		,{"20Rnd_762x51_DMR",0.04}
+		,{"17Rnd_9x19_glock17",0.05}
+		,{"15Rnd_9x19_M9SD",0.01}
+		,{"15Rnd_9x19_M9",0.02}
+		,{"30Rnd_762x39_AK47",0.04}
+		,{"30Rnd_545x39_AK",0.04}
+		,{"5Rnd_762x51_M24",0.01}
+		,{"5Rnd_86x70_L115A1",0.01}
+		,{"8Rnd_B_Beneli_74Slug",0.04}
+		,{"1Rnd_HE_M203",0.01}
+		,{"FlareWhite_M203",0.01}
+		,{"FlareGreen_M203",0.01}
+		,{"1Rnd_Smoke_M203",0.01}
+		,{"200Rnd_556x45_M249",0.01}
+		,{"HandGrenade_west",0.01}
+		,{"HandGrenade_east",0.01}
+		,{"SmokeShell",0.04}
+		,{"SmokeShellRed",0.02}
+		,{"SmokeShellGreen",0.02}
+		,{"8Rnd_B_Beneli_Pellets",0.04}
+		,{"30Rnd_556x45_StanagSD",0.01}
+		,{"30Rnd_9x19_MP5",0.02}
+		,{"30Rnd_9x19_MP5SD",0.01}
+		,{"100Rnd_762x51_M240",0.01}
+		,{"HandChemGreen",0.02}
+		,{"HandChemBlue",0.02}
+		,{"HandChemRed",0.02}
+		,{"ItemHeatPack",0.04}
+		,{"FoodMRE",0.03}
+		,{"8Rnd_9x18_MakarovSD",0.01}
+		,{"20Rnd_B_765x17_Ball",0.04}
+		,{"30Rnd_9x19_UZI_SD",0.01}
+		,{"ItemDocument",0.02}
+	};
+	militarypilot[] = {
+		{"FoodCanUnlabeled",0.06}
+		,{"ItemSodaEmpty",0.04}
+		,{"ItemSodaCoke",0.01}
+		,{"ItemSodaPepsi",0.01}
+		,{"ItemBandage",0.04}
+		,{"ItemAntibiotic",0.04}
+		,{"ItemPainkiller",0.04}
+		,{"ItemMorphine",0.01}
+		,{"30Rnd_556x45_Stanag",0.04}
+		,{"20Rnd_762x51_DMR",0.04}
+		,{"17Rnd_9x19_glock17",0.05}
+		,{"15Rnd_9x19_M9SD",0.01}
+		,{"15Rnd_9x19_M9",0.02}
+		,{"30Rnd_762x39_AK47",0.04}
+		,{"30Rnd_545x39_AK",0.04}
+		,{"5Rnd_762x51_M24",0.01}
+		,{"5Rnd_86x70_L115A1",0.01}
+		,{"8Rnd_B_Beneli_74Slug",0.04}
+		,{"1Rnd_HE_M203",0.01}
+		,{"FlareWhite_M203",0.01}
+		,{"FlareGreen_M203",0.01}
+		,{"1Rnd_Smoke_M203",0.01}
+		,{"200Rnd_556x45_M249",0.01}
+		,{"HandGrenade_west",0.01}
+		,{"HandGrenade_east",0.01}
+		,{"SmokeShell",0.04}
+		,{"SmokeShellRed",0.02}
+		,{"SmokeShellGreen",0.02}
+		,{"8Rnd_B_Beneli_Pellets",0.04}
+		,{"30Rnd_556x45_StanagSD",0.01}
+		,{"30Rnd_9x19_MP5",0.02}
+		,{"30Rnd_9x19_MP5SD",0.01}
+		,{"100Rnd_762x51_M240",0.01}
+		,{"HandChemGreen",0.02}
+		,{"HandChemBlue",0.02}
+		,{"HandChemRed",0.02}
+		,{"ItemHeatPack",0.04}
+		,{"FoodMRE",0.03}
+		,{"8Rnd_9x18_MakarovSD",0.01}
+		,{"20Rnd_B_765x17_Ball",0.04}
+		,{"30Rnd_9x19_UZI_SD",0.01}
+		,{"ItemHotwireKit",0.03}
+	};
+	policeman[] = {
+		{"ItemBandage",0.3}
+		,{"7Rnd_45ACP_1911",0.08}
+		,{"6Rnd_45ACP",0.08}
+		,{"15Rnd_W1866_Slug",0.14}
+		,{"8Rnd_B_Beneli_Pellets",0.16}
+		,{"HandRoadFlare",0.07}
+		,{"8Rnd_9x18_MakarovSD",0.01}
+		,{"ItemComboLock",0.05}
+		,{"SmokeShell",0.04}
+		,{"FoodMRE",0.04}
+		,{"ItemHotwireKit",0.03}
+		,{"ItemDocument",0.02}
+	};
+	hunter[] = {
+		{"ItemBandage",0.4}
+		,{"5x_22_LR_17_HMR",0.15}
+		,{"7Rnd_45ACP_1911",0.03}
+		,{"10x_303",0.1}
+		,{"ItemWaterbottleUnfilled",0.05}
+		,{"WoodenArrow",0.2}
+		,{"ItemHeatPack",0.02}
+		,{"FoodMRE",0.01}
+		,{"FoodNutmix",0.02}
+		,{"ItemDocument",0.01}
+		,{"ItemMixOil",0.01}
+	};
+	worker[] = {
+		{"FoodCanUnlabeled",0.09}
+		,{"TrashJackDaniels",0.09}
+		,{"ItemSodaEmpty",0.1}
+		,{"ItemSodaCoke",0.1}
+		,{"ItemSodaPepsi",0.1}
+		,{"FoodCanBakedBeans",0.06}
+		,{"FoodCanSardines",0.06}
+		,{"FoodCanFrankBeans",0.06}
+		,{"FoodCanPasta",0.06}
+		,{"ItemBandage",0.1}
+		,{"ItemPainkiller",0.06}
+		,{"ItemWire",0.01}
+		,{"ItemTankTrap",0.03}
+		,{"ItemComboLock",0.04}
+		,{"ItemSledgeHead",0.02}
+		,{"ItemDocument",0.02}
+	};
+	clothes[] = {
+		{"Skin_RU_Policeman_DZ",0.11}
+		,{"Skin_Pilot_EP1_DZ",0.1}
+		,{"Skin_Functionary1_EP1_DZ",0.1}
+		,{"Skin_Priest_DZ",0.1}
+		,{"Skin_Rocker1_DZ",0.07}
+		,{"Skin_Rocker2_DZ",0.07}
+		,{"Skin_Rocker3_DZ",0.08}
+		,{"Skin_Rocker4_DZ",0.08}
+		,{"Skin_SurvivorW3_DZ",0.09}
+		,{"Skin_SurvivorWpink_DZ",0.09}
+		,{"Skin_SurvivorWurban_DZ",0.07}
+		,{"Skin_INS_Bardak_DZ",0.02}
+		,{"Skin_INS_Worker2_DZ",0.02}
+	};
+	militaryclothes[] = {
+		{"Skin_Camo1_DZ",0.09}
+		,{"Skin_Sniper1_DZ",0.08}
+		,{"Skin_Rocket_DZ",0.05}
+		,{"Skin_Soldier1_DZ",0.5}
+		,{"Skin_Drake_Light_DZ",0.07}
+		,{"Skin_Soldier_TL_PMC_DZ",0.07}
+		,{"Skin_Soldier_Sniper_PMC_DZ",0.05}
+		,{"Skin_Soldier_Bodyguard_AA12_PMC_DZ",0.07}
+		,{"Skin_CZ_Special_Forces_GL_DES_EP1_DZ",0.08}
+		,{"Skin_FR_OHara_DZ",0.08}
+		,{"Skin_FR_Rodriguez_DZ",0.09}
+		,{"Skin_CZ_Soldier_Sniper_EP1_DZ",0.04}
+		,{"Skin_Graves_Light_DZ",0.09}
+		,{"Skin_INS_Soldier_AR_DZ",0.05}
+		,{"Skin_INS_Soldier_CO_DZ",0.04}
+	};
+	specialclothes[] = {
+		{"Skin_Ins_Soldier_GL_DZ",0.05}
+		,{"Skin_GUE_Commander_DZ",0.08}
+		,{"Skin_Bandit1_DZ",0.08}
+		,{"Skin_Bandit2_DZ",0.06}
+		,{"Skin_BanditW1_DZ",0.07}
+		,{"Skin_BanditW2_DZ",0.07}
+		,{"Skin_TK_INS_Soldier_EP1_DZ",0.05}
+		,{"Skin_TK_INS_Warlord_EP1_DZ",0.07}
+		,{"Skin_SurvivorWcombat_DZ",0.08}
+		,{"Skin_SurvivorWdesert_DZ",0.08}
+		,{"Skin_GUE_Soldier_MG_DZ",0.05}
+		,{"Skin_GUE_Soldier_Sniper_DZ",0.04}
+		,{"Skin_GUE_Soldier_Crew_DZ",0.04}
+		,{"Skin_GUE_Soldier_CO_DZ",0.04}
+		,{"Skin_GUE_Soldier_2_DZ",0.04}
+		,{"Skin_TK_Special_Forces_MG_EP1_DZ",0.02}
+		,{"Skin_TK_Soldier_Sniper_EP1_DZ",0.02}
+		,{"Skin_TK_Commander_EP1_DZ",0.02}
+		,{"Skin_RU_Soldier_Crew_DZ",0.02}
+		,{"Skin_INS_Lopotev_DZ",0.02}
+	};
+	tents[] = {
+		{"WeaponHolder_ItemTentOld",0.34}
+		,{"WeaponHolder_ItemTentDomed",0.33}
+		,{"WeaponHolder_ItemTentDomed2",0.33}
+	};
+	backpacks[] = {
+		{"DZ_Assault_Pack_EP1",0.22}
+		,{"DZ_Czech_Vest_Puch",0.2}
+		,{"DZ_TerminalPack_EP1",0.18}
+		,{"DZ_ALICE_Pack_EP1",0.16}
+		,{"DZ_TK_Assault_Pack_EP1",0.13}
+		,{"DZ_CompactPack_EP1",0.11}
+	};
+	militarybackpacks[] = {
+		{"DZ_British_ACU",0.3}
+		,{"DZ_GunBag_EP1",0.25}
+		,{"DZ_CivilBackpack_EP1",0.2}
+		,{"DZ_Backpack_EP1",0.15}
+		,{"DZ_LargeGunBag_EP1",0.1}
+	};
+	militaryammo[] = {
+		{"2000Rnd_762x51_M134",0.1}
+		,{"29Rnd_30mm_AGS30",0.2}
+		,{"50Rnd_127x107_DSHKM",0.2}
+		,{"48Rnd_40mm_MK19",0.2}
+		,{"100Rnd_127x99_M2",0.3}
+	};
+	pistols[] = {
+		{"Makarov",0.25}
+		,{"Colt1911",0.23}
+		,{"revolver_EP1",0.2}
+		,{"glock17_EP1",0.1}
+		,{"MakarovSD",0.1}
+		,{"M9",0.07}
+		,{"M9SD",0.04}
+		,{"revolver_gold_EP1",0.01}
+	};
+	shotgunsingleshot[] = {
+		{"Winchester1866",0.25}
+		,{"LeeEnfield",0.2}
+		,{"MR43",0.2}
+		,{"Saiga12K",0.13}
+		,{"Remington870_lamp",0.1}
+		,{"Crossbow_DZ",0.07}
+		,{"M1014",0.05}
+	};
+	farmweapons[] = {
+		{"Winchester1866",0.25}
+		,{"LeeEnfield",0.2}
+		,{"MR43",0.19}
+		,{"Saiga12K",0.13}
+		,{"Remington870_lamp",0.1}
+		,{"Crossbow_DZ",0.07}
+		,{"huntingrifle",0.05}
+		,{"Chainsaw",0.01}
+	};
+	sniperrifles[] = {
+		{"AK_107_PSO",0.1}
+		,{"M4SPR",0.09}
+		,{"M40A3",0.09}
+		,{"SVD_CAMO",0.07}
+		,{"SVD_des_EP1",0.07}
+		,{"SVD",0.07}
+		,{"huntingrifle",0.09}
+		,{"M24_des_EP1",0.08}
+		,{"M24",0.07}
+		,{"BAF_LRR_scoped",0.07}
+		,{"M107_DZ",0.05}
+		,{"KSVK_DZE",0.05}
+		,{"VSS_vintorez",0.04}
+		,{"SCAR_H_LNG_Sniper_SD",0.03}
+		,{"M14_EP1",0.02}
+		,{"DMR",0.01}
+	};
+	sniperriflesammo[] = {
+		{"30Rnd_545x39_AKSD",0.18}
+		,{"5Rnd_127x108_KSVK",0.08}
+		,{"5Rnd_86x70_L115A1",0.07}
+		,{"10Rnd_127x99_m107",0.15}
+		,{"10Rnd_762x54_SVD",0.2}
+		,{"20Rnd_762x51_DMR",0.1}
+		,{"5Rnd_762x51_M24",0.15}
+		,{"5x_22_LR_17_HMR",0.1}
+		,{"20Rnd_762x51_SB_SCAR",0.07}
+		,{"20Rnd_9x39_SP5_VSS",0.05}
+	};
+	submachinegun[] = {
+		{"UZI_EP1",0.25}
+		,{"bizon",0.2}
+		,{"Sa61_EP1",0.2}
+		,{"MP5A5",0.13}
+		,{"bizon_silenced",0.1}
+		,{"UZI_SD_EP1",0.07}
+		,{"MP5SD",0.05}
+	};
+	assaultrifles[] = {
+		{"AKS_74_kobra",0.05}
+		,{"AKS_74_U",0.05}
+		,{"AKS_GOLD",0.01}
+		,{"AK_47_M",0.05}
+		,{"AK_74",0.05}
+		,{"FN_FAL",0.03}
+		,{"FN_FAL_ANPVS4",0.01}
+		,{"G36A_camo",0.05}
+		,{"G36C",0.05}
+		,{"G36C_camo",0.05}
+		,{"G36K_camo",0.05}
+		,{"G36_C_SD_camo",0.03}
+		,{"M16A2",0.05}
+		,{"M16A2GL",0.02}
+		,{"M16A4_ACG",0.01}
+		,{"M4A1",0.05}
+		,{"M4A1_Aim",0.04}
+		,{"M4A1_AIM_SD_camo",0.01}
+		,{"M4A1_HWS_GL_camo",0.01}
+		,{"M4A3_CCO_EP1",0.04}
+		,{"Sa58P_EP1",0.02}
+		,{"Sa58V_CCO_EP1",0.04}
+		,{"Sa58V_EP1",0.02}
+		,{"Sa58V_RCO_EP1",0.04}
+		,{"m8_compact",0.03}
+		,{"m8_sharpshooter",0.04}
+		,{"m8_holo_sd",0.02}
+		,{"m8_carbine",0.05}
+		,{"BAF_L85A2_RIS_SUSAT",0.02}
+		,{"BAF_L85A2_RIS_Holo",0.01}
+		,{"M4A1_HWS_GL_SD_Camo",0.01}
+	};
+	assaultrifleammo[] = {
+		{"30Rnd_762x39_SA58",0.25}
+		,{"30Rnd_762x39_AK47",0.2}
+		,{"30Rnd_556x45_Stanag",0.2}
+		,{"30Rnd_545x39_AK",0.11}
+		,{"30Rnd_556x45_StanagSD",0.12}
+		,{"20Rnd_762x51_FNFAL",0.07}
+	};
+	machineguns[] = {
+		{"RPK_74",0.11}
+		,{"M8_SAW",0.11}
+		,{"Pecheneg_DZ",0.1}
+		,{"PK_DZ",0.1}
+		,{"MG36_camo",0.1}
+		,{"M60A4_EP1_DZE",0.1}
+		,{"MG36",0.1}
+		,{"M249_m145_EP1_DZE",0.1}
+		,{"m240_scoped_EP1_DZE",0.1}
+		,{"M240_DZ",0.08}
+		,{"M249_EP1_DZ",0.05}
+		,{"Mk_48_DZ",0.05}
+	};
+	machinegunammo[] = {
+		{"100Rnd_556x45_BetaCMag",0.2}
+		,{"75Rnd_545x39_RPK",0.2}
+		,{"100Rnd_556x45_M249",0.15}
+		,{"100Rnd_762x51_M240",0.15}
+		,{"100Rnd_762x54_PK",0.15}
+		,{"200Rnd_556x45_M249",0.15}
+	};
+	machinegunammoexpl[] = {
+		{"100Rnd_556x45_BetaCMag",0.2}
+		,{"75Rnd_545x39_RPK",0.2}
+		,{"100Rnd_556x45_M249",0.15}
+		,{"100Rnd_762x51_M240",0.15}
+		,{"100Rnd_762x54_PK",0.14}
+		,{"200Rnd_556x45_M249",0.14}
+		,{"MAAWS_HEAT",0.01}
+		,{"PipeBomb",0.01}
+	};
+	militaryshotguns[] = {
+		{"Saiga12K",0.25}
+		,{"Remington870_lamp",0.35}
+		,{"M1014",0.4}
+	};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp
@@ -0,0 +1,276 @@
+class CfgLootSmall {
+	trash[] = {		
+		{"TrashTinCan",0.5},
+		{"TrashJackDaniels",0.05},
+		{"ItemSodaEmpty",0.25},
+		{"ItemTrashToiletpaper",0.1},
+		{"ItemTrashRazor",0.1}
+	};
+	civilian[] = {
+		{"FoodCanUnlabeled",0.07},
+		{"TrashJackDaniels",0.09},
+		{"ItemSodaEmpty",0.09},
+		{"ItemSodaCoke",0.1},
+		{"ItemSodaPepsi",0.09},
+		{"FoodCanBakedBeans",0.05},
+		{"FoodCanSardines",0.05},
+		{"FoodCanFrankBeans",0.05},
+		{"FoodCanPasta",0.05},
+		{"8Rnd_9x18_Makarov",0.07},
+		{"7Rnd_45ACP_1911",0.05},
+		{"2Rnd_shotgun_74Slug",0.05},
+		{"2Rnd_shotgun_74Pellets",0.05},
+		{"ItemBandage",0.06},
+		{"ItemPainkiller",0.06},
+		{"FoodBioMeat",0.01},
+		{"8Rnd_9x18_MakarovSD",0.01}
+	};
+	office2[] = {
+		{"FoodCanUnlabeled",0.07},
+		{"TrashJackDaniels",0.09},
+		{"ItemSodaEmpty",0.09},
+		{"ItemSodaCoke",0.09},
+		{"ItemSodaPepsi",0.09},
+		{"FoodCanBakedBeans",0.05},
+		{"FoodCanSardines",0.05},
+		{"FoodCanFrankBeans",0.05},
+		{"FoodCanPasta",0.05},
+		{"8Rnd_9x18_Makarov",0.07},
+		{"7Rnd_45ACP_1911",0.05},
+		{"2Rnd_shotgun_74Slug",0.05},
+		{"2Rnd_shotgun_74Pellets",0.05},
+		{"ItemBandage",0.06},
+		{"ItemPainkiller",0.06},
+		{"FoodBioMeat",0.01},
+		{"8Rnd_9x18_MakarovSD",0.01}
+	};
+	food[] = {	
+		//trash
+		{"TrashTinCan",0.09},
+		{"TrashJackDaniels",0.12},
+		{"ItemSodaEmpty",0.12},
+		{"ItemSodaCoke",0.09},
+		{"ItemSodaPepsi",0.11},
+		{"FoodCanBakedBeans",0.07},
+		{"FoodCanSardines",0.07},
+		{"FoodCanFrankBeans",0.07},
+		{"FoodCanPasta",0.07},
+		{"FoodCanUnlabeled",0.1},
+		// food Bags
+		{"FoodPistachio",0.05},
+		{"FoodNutmix",0.04}
+	};
+	office[] = {
+		{"FoodCanUnlabeled",0.06},
+		{"ItemSodaEmpty",0.06},
+		{"ItemSodaCoke",0.06},
+		{"ItemSodaPepsi",0.04},
+		{"TrashJackDaniels",0.04},
+		{"FoodCanBakedBeans",0.01},
+		{"FoodCanSardines",0.01},
+		{"FoodCanFrankBeans",0.01},
+		{"FoodCanPasta",0.01},
+		{"ItemWaterbottleUnfilled",0.01},
+		{"ItemWaterbottle",0.01},
+		{"ItemBandage",0.08},
+		{"7Rnd_45ACP_1911",0.03},
+		{"5x_22_LR_17_HMR",0.01},
+		{"10x_303",0.04},
+		{"6Rnd_45ACP",0.04},
+		{"2Rnd_shotgun_74Slug",0.05},
+		{"2Rnd_shotgun_74Pellets",0.05},
+		{"8Rnd_9x18_Makarov",0.09},
+		{"15Rnd_W1866_Slug",0.02},
+		{"WoodenArrow",0.04},
+		{"HandRoadFlare",0.07},
+		{"ItemPainkiller",0.02},
+		{"HandChemGreen",0.01},
+		{"HandChemBlue",0.03},
+		{"HandChemRed",0.03},
+		{"ItemHeatPack",0.03}
+	};
+	generic[] = {
+		{"FoodCanUnlabeled",0.06},
+		{"ItemSodaEmpty",0.06},
+		{"ItemSodaCoke",0.06},
+		{"ItemSodaPepsi",0.04},
+		{"TrashJackDaniels",0.04},
+		{"FoodCanBakedBeans",0.01},
+		{"FoodCanSardines",0.01},
+		{"FoodCanFrankBeans",0.01},
+		{"FoodCanPasta",0.01},
+		{"ItemWaterbottleUnfilled",0.01},
+		{"ItemWaterbottle",0.01},
+		{"ItemBandage",0.11},
+		{"7Rnd_45ACP_1911",0.03},
+		{"5x_22_LR_17_HMR",0.01},
+		{"10x_303",0.04},
+		{"6Rnd_45ACP",0.04},
+		{"2Rnd_shotgun_74Slug",0.05},
+		{"2Rnd_shotgun_74Pellets",0.05},
+		{"8Rnd_9x18_Makarov",0.09},
+		{"15Rnd_W1866_Slug",0.02},
+		{"WoodenArrow",0.04},
+		{"HandRoadFlare",0.07},
+		{"ItemPainkiller",0.02},
+		{"HandChemGreen",0.01},
+		{"HandChemBlue",0.03},
+		{"HandChemRed",0.03},
+		{"ItemHeatPack",0.04}
+	};
+	medical[] = {
+		{"ItemBandage",0.4},
+		{"ItemPainkiller",0.15},
+		{"ItemMorphine",0.2},
+		{"ItemEpinephrine",0.1},
+		{"ItemAntibiotic",0.1},
+		{"ItemHeatPack",0.05}
+	};
+	hospital[] = {
+		{"ItemBandage",0.33},
+		{"ItemPainkiller",0.16},
+		{"ItemMorphine",0.13},
+		{"ItemEpinephrine",0.09},
+		{"ItemBloodbag",0.17},
+		{"ItemAntibiotic",0.12}
+	};
+	military[] = {
+		{"FoodCanUnlabeled",0.09},
+		{"ItemSodaEmpty",0.04},
+		{"ItemSodaCoke",0.01},
+		{"ItemSodaPepsi",0.01},
+		{"ItemBandage",0.04},
+		{"ItemAntibiotic",0.04},
+		{"ItemPainkiller",0.04},
+		{"ItemMorphine",0.01},
+		{"30Rnd_556x45_Stanag",0.04},
+		{"20Rnd_762x51_DMR",0.04},
+		{"17Rnd_9x19_glock17",0.05},
+		{"15Rnd_9x19_M9SD",0.01},
+		{"15Rnd_9x19_M9",0.02},
+		{"30Rnd_762x39_AK47",0.04},
+		{"30Rnd_545x39_AK",0.04},
+		{"5Rnd_762x51_M24",0.01},
+		{"5Rnd_86x70_L115A1",0.01},
+		{"8Rnd_B_Beneli_74Slug",0.04},
+		{"1Rnd_HE_M203",0.01},
+		{"FlareWhite_M203",0.01},
+		{"FlareGreen_M203",0.01},
+		{"1Rnd_Smoke_M203",0.01},
+		{"200Rnd_556x45_M249",0.01},
+		{"HandGrenade_west",0.01},
+		{"HandGrenade_east",0.01},
+		{"SmokeShell",0.04},
+		{"SmokeShellRed",0.02},
+		{"SmokeShellGreen",0.02},
+		{"8Rnd_B_Beneli_Pellets",0.04},
+		{"30Rnd_556x45_StanagSD",0.01},
+		{"30Rnd_9x19_MP5",0.02},
+		{"30Rnd_9x19_MP5SD",0.01},
+		{"100Rnd_762x51_M240",0.01},
+		{"HandChemGreen",0.02},
+		{"HandChemBlue",0.02},
+		{"HandChemRed",0.02},
+		{"ItemHeatPack",0.04},
+		{"8Rnd_9x18_MakarovSD",0.01},
+		{"20Rnd_B_765x17_Ball",0.04},
+		{"30Rnd_9x19_UZI_SD",0.01}
+	};
+	policeman[] = {
+		{"ItemBandage",0.3},
+		{"7Rnd_45ACP_1911",0.08},
+		{"6Rnd_45ACP",0.08},
+		{"15Rnd_W1866_Slug",0.14},
+		{"8Rnd_B_Beneli_Pellets",0.17},
+		{"HandRoadFlare",0.08},
+		{"8Rnd_9x18_MakarovSD",0.01},
+		{"ItemComboLock",0.05},
+		{"SmokeShell",0.04},
+		{"ItemHotwireKit",0.01}
+	};
+
+	hunter[] = {
+		{"FoodMRE",0.01}
+	};
+
+	worker[] = {
+		{"FoodCanUnlabeled",0.09},
+		{"TrashJackDaniels",0.10},
+		{"ItemSodaEmpty",0.10},
+		{"ItemSodaCoke",0.11},
+		{"ItemSodaPepsi",0.10},
+		{"FoodCanBakedBeans",0.06},
+		{"FoodCanSardines",0.06},
+		{"FoodCanFrankBeans",0.06},
+		{"FoodCanPasta",0.06},
+		{"ItemBandage",0.1},
+		{"ItemPainkiller",0.06},
+		{"ItemComboLock",0.04},
+		{"ItemSledgeHead",0.02}
+	};
+	clothes[] = {
+		{"Skin_RU_Policeman_DZ",0.13},
+		{"Skin_Pilot_EP1_DZ",0.12},
+		{"Skin_Functionary1_EP1_DZ",0.1},
+		{"Skin_Priest_DZ",0.1},
+		{"Skin_Rocker1_DZ",0.07},
+		{"Skin_Rocker2_DZ",0.07},
+		{"Skin_Rocker3_DZ",0.08},
+		{"Skin_Rocker4_DZ",0.08},
+		{"Skin_SurvivorW3_DZ",0.09},
+		{"Skin_SurvivorWpink_DZ",0.09},
+		{"Skin_SurvivorWurban_DZ",0.07}
+	};
+	militaryclothes[] = {
+		{"Skin_Camo1_DZ",0.1},
+		{"Skin_Sniper1_DZ",0.08},
+		{"Skin_Rocket_DZ",0.05},
+		{"Skin_Soldier1_DZ",0.13},
+		{"Skin_Drake_Light_DZ",0.07},
+		{"Skin_Soldier_TL_PMC_DZ",0.07},
+		{"Skin_Soldier_Sniper_PMC_DZ",0.05},
+		{"Skin_Soldier_Bodyguard_AA12_PMC_DZ",0.07},
+		{"Skin_CZ_Special_Forces_GL_DES_EP1_DZ",0.08},
+		{"Skin_FR_OHara_DZ",0.08},
+		{"Skin_FR_Rodriguez_DZ",0.09},
+		{"Skin_CZ_Soldier_Sniper_EP1_DZ",0.04},
+		{"Skin_Graves_Light_DZ",0.09}
+	};
+	specialclothes[] = {
+		{"Skin_Ins_Soldier_GL_DZ",0.1},
+		{"Skin_GUE_Commander_DZ",0.08},
+		{"Skin_Bandit1_DZ",0.13},
+		{"Skin_Bandit2_DZ",0.06},
+		{"Skin_BanditW1_DZ",0.07},
+		{"Skin_BanditW2_DZ",0.07},
+		{"Skin_TK_INS_Soldier_EP1_DZ",0.05},
+		{"Skin_TK_INS_Warlord_EP1_DZ",0.07},
+		{"Skin_SurvivorWcombat_DZ",0.08},
+		{"Skin_SurvivorWdesert_DZ",0.08},
+		{"Skin_GUE_Soldier_MG_DZ",0.05},
+		{"Skin_GUE_Soldier_Sniper_DZ",0.04},
+		{"Skin_GUE_Soldier_Crew_DZ",0.04},
+		{"Skin_GUE_Soldier_CO_DZ",0.04},
+		{"Skin_GUE_Soldier_2_DZ",0.04}
+	};
+	machinegunammoexpl[] = {
+		{"100Rnd_556x45_BetaCMag",0.20},
+		{"75Rnd_545x39_RPK",0.20},
+		{"100Rnd_556x45_M249",0.15},
+		{"100Rnd_762x51_M240",0.15},
+		{"100Rnd_762x54_PK",0.14},
+		{"200Rnd_556x45_M249",0.14},
+		{"MAAWS_HEAT",0.01},
+		{"PipeBomb",0.01}
+	};
+	pistols[] = {
+		{"Makarov",0.25},
+		{"Colt1911",0.23},
+		{"revolver_EP1",0.20},
+		{"glock17_EP1",0.10},
+		{"MakarovSD",0.10},
+		{"M9",0.07},
+		{"M9SD",0.04},
+		{"revolver_gold_EP1",0.01}
+	};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines.hpp
@@ -7,6 +7,7 @@ class CfgMagazines {

 	// Gems
 	#include "CfgMagazines\DZE\Gems.hpp"
+	#include "CfgMagazines\DZE\Ores.hpp"
 	// Items
 	#include "CfgMagazines\DZE\Items.hpp"
 	#include "CfgMagazines\DZE\Bulk.hpp"
@@ -263,7 +264,7 @@ class CfgMagazines {
        {
            class Build
            {
-                    text = $STR_ACTIONS_BUILD;
+                    text = $STR_ACTIONS_BUILD_EPOCH;
                    script = "spawn player_build;";
                    require[] = {"ItemToolbox"};
                    create = "GunRack_DZ";
@@ -284,7 +285,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemToolbox"};
 				create = "WoodCrate_DZ";
@@ -348,7 +349,7 @@ class CfgMagazines {
            {
                class Build
                {
-                    text = $STR_ACTIONS_BUILD;
+                    text = $STR_ACTIONS_BUILD_EPOCH;
                    script = "spawn player_build;";
                    require[] = {"ItemToolbox"};
                    create = "FireBarrel_DZ";
@@ -389,7 +390,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemToolbox"};
 				create = "WorkBench_DZ";
@@ -411,7 +412,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "WoodRamp_DZ";
@@ -431,7 +432,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "Plastic_Pole_EP1_DZ";
@@ -453,7 +454,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "MetalPanel_DZ";
@@ -483,7 +484,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "DeerStand_DZ";
@@ -504,7 +505,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "DesertLargeCamoNet_DZ";
@@ -525,7 +526,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "ForestLargeCamoNet_DZ";
@@ -546,7 +547,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "DesertCamoNet_DZ";
@@ -576,7 +577,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "ForestCamoNet_DZ";
@@ -606,7 +607,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "FuelPump_DZ";
@@ -627,7 +628,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "LightPole_DZ";
@@ -648,7 +649,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "StickFence_DZ";
@@ -669,7 +670,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "Wooden_shed_DZ";
@@ -690,7 +691,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "WoodShack_DZ";
@@ -711,7 +712,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "M240Nest_DZ";
@@ -732,7 +733,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "CanvasHut_DZ";
@@ -753,7 +754,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "ParkBench_DZ";
@@ -774,7 +775,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "MetalGate_DZ";
@@ -795,7 +796,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "SandNest_DZ";
@@ -816,7 +817,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "OutHouse_DZ";
@@ -837,7 +838,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "StorageShed_DZ";
@@ -859,35 +860,14 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemToolbox"};
 				create = "Generator_DZ";
 			};
 		};
 	};
-	class ItemFuelPump: CA_Magazine
-	{
-		scope = 2;
-		count = 1;
-		type = 256;
-		displayName = "Fuel Pump";
-		model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-		picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-		descriptionShort = "Fuel Pumps can be used to create a refuel station";
-		weight = 25;
-		class ItemActions
-		{
-			class Build
-			{
-				text = $STR_ACTIONS_BUILD;
-				script = "spawn player_build;";
-				require[] = {"ItemToolbox"};
-				create = "FuelPump_DZ";
-				neednearby[] = {"fueltank"};
-			};
-		};
-	};
+	
 	class ItemScaffoldingKit: CA_Magazine
 	{
 		scope = 2;
@@ -902,7 +882,7 @@ class CfgMagazines {
 		{
 			class Build
 			{
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemEtool","ItemToolbox"};
 				create = "Scaffolding_DZ";
@@ -1184,7 +1164,7 @@ class CfgMagazines {
        		{
 			        text = $STR_EPOCH_PLAYER_259;
 			        Script = ";['Crafting5','CfgMagazines', _id] spawn player_craftItem;";
-			        neednearby[] = {"workshop"};
+			        neednearby[] = {"sawmill"};
 			        requiretools[] = {"ItemToolbox"};
 			        output[] = {{"PartPlankPack",1}};
 			        input[] = {{"PartWoodLumber",3}};
@@ -1258,82 +1238,16 @@ class CfgMagazines {
 			};
 			class Crafting4
 		        {
-		                text = $STR_EPOCH_PLAYER_264;
-		                Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
-		                neednearby[] = {"workshop"};
-		                requiretools[] = {"ItemToolbox"};
-		                output[] = {{"PartPlywoodPack",1}};
-		                input[] = {{"PartWoodPlywood",3}};
+		            text = $STR_EPOCH_PLAYER_264;
+		            Script = ";['Crafting4','CfgMagazines', _id] spawn player_craftItem;";
+		            neednearby[] = {"sawmill"};
+		            requiretools[] = {"ItemToolbox"};
+		            output[] = {{"PartPlywoodPack",1}};
+		            input[] = {{"PartWoodPlywood",3}};
 		        };

 		};
 	};
-	class PartOre: CA_Magazine
-	{
-		scope = 2;
-		count = 1;
-		type = 256;
-		displayName = "Iron Ore";
-		model = "\z\addons\dayz_epoch\models\iron_ore.p3d";
-		picture="\z\addons\dayz_epoch\pictures\equip_iron_ore_CA.paa";
-		descriptionShort = "Used for crafting scrap metal. Can be mined from rocks using a sledgehammer.";
-		weight = 1;
-		class ItemActions {
-			class Crafting
-			{
-				text = $STR_EPOCH_PLAYER_265;
-				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
-				neednearby[] = {"fire"};
-				requiretools[] = {"ItemSledge"};
-				output[] = {{"PartGeneric",1},{"ItemWaterbottleUnfilled",1}};
-				input[] = {{"PartOre",4},{"ItemWaterbottle",1}};
-			};
-		};
-	};
-	class PartOreSilver: CA_Magazine
-	{
-		scope = 2;
-		count = 1;
-		type = 256;
-		displayName = "Silver Ore";
-		model = "\z\addons\dayz_epoch\models\silver_ore.p3d";
-		picture="\z\addons\dayz_epoch\pictures\equip_silver_ore_CA.paa";
-		descriptionShort = "Can be mined from rocks using a sledgehammer.";
-		weight = 1;
-		class ItemActions {
-			class Crafting
-			{
-				text = $STR_EPOCH_PLAYER_266;
-				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
-				neednearby[] = {"fire"};
-				requiretools[] = {"ItemSledge"};
-				output[] = {{"ItemSilverBar",1},{"ItemWaterbottleUnfilled",1}};
-				input[] = {{"PartOreSilver",1},{"ItemWaterbottle",1}};
-			};
-		};
-	};
-	class PartOreGold: CA_Magazine
-	{
-		scope = 2;
-		count = 1;
-		type = 256;
-		displayName = "Gold Ore";
-		model = "\z\addons\dayz_epoch\models\gold_ore.p3d";
-		picture="\z\addons\dayz_epoch\pictures\equip_gold_ore_CA.paa";
-		descriptionShort = "Can be mined from rocks using a sledgehammer.";
-		weight = 1;
-		class ItemActions {
-			class Crafting
-			{
-				text = $STR_EPOCH_PLAYER_267;
-				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
-				neednearby[] = {"fire"};
-				requiretools[] = {"ItemSledge"};
-				output[] = {{"ItemGoldBar",1},{"ItemWaterbottleUnfilled",1}};
-				input[] = {{"PartOreGold",1},{"ItemWaterbottle",1}};
-			};
-		};
-	};
 	class PartVRotor: CA_Magazine
 	{
 		scope = 2;
@@ -1696,7 +1610,7 @@ class CfgMagazines {

 		class ItemActions {
 			class Build {
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemToolbox"};
 				create = "Hedgehog_DZ";
@@ -1734,7 +1648,7 @@ class CfgMagazines {

 		class ItemActions {
 			class Build {
-				text = $STR_ACTIONS_BUILD;
+				text = $STR_ACTIONS_BUILD_EPOCH;
 				script = "spawn player_build;";
 				require[] = {"ItemToolbox"};
 				create = "Fort_RazorWire";
@@ -1752,6 +1666,8 @@ class CfgMagazines {

 	#include "CfgMagazines\MeleeSwing.hpp"

+	#include "CfgMagazines\Planting.hpp"
+
 	class HandGrenade_Stone;
 	class ItemTrashToiletpaper : HandGrenade_Stone {
 		scope = public;
@@ -1786,13 +1702,22 @@ class CfgMagazines {
 		{
 			class Crafting
 			{
-				text = $STR_EPOCH_PLAYER_269;
+				text = $STR_EPOCH_PLAYER_269b;
 				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 				neednearby[] = {"workshop"};
 				requiretools[] = {"ItemToolbox","ItemKnife"};
 				output[] = {{"ItemCanvas",1}};
 				input[] = {{"ItemKiloHemp",1}};
 			};
+			class Crafting1
+			{
+				text = "Craft Hemp Seeds";
+				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {""};
+				requiretools[] = {"ItemKnife"};
+				output[] = {{"ItemHempSeed",5}};
+				input[] = {{"ItemKiloHemp",1}};
+			};
 		};
 	};
 };
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/Briefcase.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/Briefcase.hpp
@@ -4,8 +4,9 @@ class ItemBriefcase_Base: CA_Magazine {
 	type = 256;
 	displayName = "Briefcase";
 	model = "\z\addons\dayz_epoch\models\briefcase.p3d";
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_CA.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
 };
+// Gold
 class ItemBriefcaseEmpty: ItemBriefcase_Base {
 	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
 	descriptionShort = "Empty Briefcase";
@@ -413,9 +414,13 @@ class ItemBriefcase100oz: ItemBriefcase_Base {
 		};
 	};
 };
-// Silver 
-class ItemBriefcaseS10oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa";
+// Silver
+class ItemSilvercase_Base: ItemBriefcase_Base {
+	model = "\z\addons\dayz_epoch\models\silvercase.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_E_CA.paa";
+};
+class ItemBriefcaseS10oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_10oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 1 x 10oz Silver Bar)";
 	weight = 1.2;
 	worth = 10;
@@ -446,8 +451,8 @@ class ItemBriefcaseS10oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS20oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa";
+class ItemBriefcaseS20oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_20oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 2 x 10oz Silver Bar)";
 	weight = 1.5;
 	worth = 20;
@@ -486,8 +491,8 @@ class ItemBriefcaseS20oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS30oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa";
+class ItemBriefcaseS30oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_30oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 3 x 10oz Silver Bar)";
 	weight = 1.8;
 	worth = 30;
@@ -526,8 +531,8 @@ class ItemBriefcaseS30oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS40oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa";
+class ItemBriefcaseS40oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_40oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 4 x 10oz Silver Bar)";
 	weight = 2.1;
 	worth = 40;
@@ -566,8 +571,8 @@ class ItemBriefcaseS40oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS50oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa";
+class ItemBriefcaseS50oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_50oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 5 x 10oz Silver Bar)";
 	weight = 2.4;
 	worth = 50;
@@ -606,8 +611,8 @@ class ItemBriefcaseS50oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS60oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa";
+class ItemBriefcaseS60oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_60oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 6 x 10oz Silver Bar)";
 	weight = 2.7;
 	worth = 60;
@@ -646,8 +651,8 @@ class ItemBriefcaseS60oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS70oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa";
+class ItemBriefcaseS70oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_70oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 7 x 10oz Silver Bar)";
 	weight = 2.9;
 	worth = 70;
@@ -686,8 +691,8 @@ class ItemBriefcaseS70oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS80oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa";
+class ItemBriefcaseS80oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_80oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 8 x 10oz Silver Bar)";
 	weight = 3.2;
 	worth = 80;
@@ -726,8 +731,8 @@ class ItemBriefcaseS80oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS90oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa";
+class ItemBriefcaseS90oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_90oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 9 x 10oz Silver Bar)";
 	weight = 3.5;
 	worth = 90;
@@ -758,8 +763,8 @@ class ItemBriefcaseS90oz: ItemBriefcase_Base {
 		};
 	};
 };
-class ItemBriefcaseS100oz: ItemBriefcase_Base {
-	picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa";
+class ItemBriefcaseS100oz: ItemSilvercase_Base {
+	picture = "\z\addons\dayz_epoch\pictures\equip_silvercase_100oz_CA.paa";
 	descriptionShort = "Briefcase (Contains: 10 x 10oz Silver Bar)";
 	weight = 3.8;
 	worth = 100;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp
@@ -64,6 +64,18 @@ class FoodPumpkin : FoodEdible {
 	weight = 1;
 	model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
+	class ItemActions
+	{
+		class Crafting
+		{
+		text = "Craft Pumpkin Seeds";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {""};
+			requiretools[] = {"ItemKnife"};
+			output[] = {{"ItemPumpkinSeed",5}};
+			input[] = {{"FoodPumpkin",1}};
+		};
+	};
 };
 class FoodSunFlowerSeed : FoodEdible {
 	scope = public;
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
@@ -1,7 +1,7 @@
 class ItemWaterbottle1oz : ItemWaterbottle {
 	displayName = "Water Bottle (1oz)";
 	descriptionShort = "Watter Bottle with 1oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle1oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
 	wateroz = 1;
 	class ItemActions {
 		class Fill {
@@ -13,7 +13,7 @@ class ItemWaterbottle1oz : ItemWaterbottle {
 class ItemWaterbottle2oz : ItemWaterbottle {
 	displayName = "Water Bottle (2oz)";
 	descriptionShort = "Watter Bottle with 2oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle2oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
 	wateroz = 2;
 	class ItemActions {
 		class Fill {
@@ -25,7 +25,7 @@ class ItemWaterbottle2oz : ItemWaterbottle {
 class ItemWaterbottle3oz : ItemWaterbottle {
 	displayName = "Water Bottle (3oz)";
 	descriptionShort = "Watter Bottle with 3oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle3oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
 	wateroz = 3;
 	class ItemActions {
 		class Fill {
@@ -37,7 +37,7 @@ class ItemWaterbottle3oz : ItemWaterbottle {
 class ItemWaterbottle4oz : ItemWaterbottle {
 	displayName = "Water Bottle (4oz)";
 	descriptionShort = "Watter Bottle with 4oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle4oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
 	wateroz = 4;
 	class ItemActions {
 		class Fill {
@@ -49,7 +49,7 @@ class ItemWaterbottle4oz : ItemWaterbottle {
 class ItemWaterbottle5oz : ItemWaterbottle {
 	displayName = "Water Bottle (5oz)";
 	descriptionShort = "Watter Bottle with 5oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle5oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
 	wateroz = 5;
 	class ItemActions {
 		class Fill {
@@ -61,7 +61,7 @@ class ItemWaterbottle5oz : ItemWaterbottle {
 class ItemWaterbottle6oz : ItemWaterbottle {
 	displayName = "Water Bottle (6oz)";
 	descriptionShort = "Watter Bottle with 6oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle6oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
 	wateroz = 6;
 	class ItemActions {
 		class Fill {
@@ -73,7 +73,7 @@ class ItemWaterbottle6oz : ItemWaterbottle {
 class ItemWaterbottle7oz : ItemWaterbottle {
 	displayName = "Water Bottle (7oz)";
 	descriptionShort = "Watter Bottle with 7oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle7oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
 	wateroz = 7;
 	class ItemActions {
 		class Fill {
@@ -85,7 +85,7 @@ class ItemWaterbottle7oz : ItemWaterbottle {
 class ItemWaterbottle8oz : ItemWaterbottle {
 	displayName = "Water Bottle (8oz)";
 	descriptionShort = "Watter Bottle with 8oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle8oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
 	wateroz = 8;
 	class ItemActions {
 		class Fill {
@@ -97,7 +97,7 @@ class ItemWaterbottle8oz : ItemWaterbottle {
 class ItemWaterbottle9oz : ItemWaterbottle {
 	displayName = "Water Bottle (9oz)";
 	descriptionShort = "Watter Bottle with 9oz of water";
-	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle9oz_ca.paa";
+	picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
 	wateroz = 9;
 	class ItemActions {
 		class Fill {
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
@@ -16,6 +16,7 @@ class ItemMixOil : CA_Magazine {
 			requiretools[] = {};
 			output[] = {{"ItemJerryMixed",1}};
 			input[] = {{"ItemMixOil",1},{"ItemJerrycan",1}};
+			inputstrict = true;
 		};
 	};
 };
@@ -178,7 +179,6 @@ class ItemORP: CA_Magazine {
 			script = "spawn player_upgradeVehicle;";
 		};
 	};
-
 };
 class ItemAVE: CA_Magazine {
 	scope = 2;
@@ -196,7 +196,6 @@ class ItemAVE: CA_Magazine {
 			script = "spawn player_upgradeVehicle;";
 		};
 	};
-
 };
 class ItemLRK: CA_Magazine {
 	scope = 2;
@@ -214,7 +213,6 @@ class ItemLRK: CA_Magazine {
 			script = "spawn player_upgradeVehicle;";
 		};
 	};
-
 };
 class ItemTNK: CA_Magazine {
 	scope = 2;
@@ -232,7 +230,23 @@ class ItemTNK: CA_Magazine {
 			script = "spawn player_upgradeVehicle;";
 		};
 	};
-
+};
+class ItemARM: CA_Magazine {
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_VEHUP_ARM;
+	model = "\z\addons\dayz_epoch\models\doc_Up4.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_docup4_ca.paa";
+	descriptionShort = $STR_EPOCH_VEHUP_ARM_DESC;
+	weight = 0.1;
+	sfx = "document";
+	class ItemActions {
+		class Upgrades {
+			text = $STR_EPOCH_PLAYER_UPGRADEV;
+			script = "spawn player_upgradeVehicle;";
+		};
+	};
 };

 // Documents
@@ -376,4 +390,21 @@ class ItemHotwireKit: CA_Magazine {
 	picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa";
 	descriptionShort = "Used to temporarily unlock and start a vehicle has a chance of failure and is consumed on use.";
 	weight = 2;
+};
+
+class ItemBloodbag: CA_Magazine
+{
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "$STR_EQUIP_NAME_16";
+	model = "\dayz_equip\models\bloodbag.p3d";
+	picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
+	descriptionShort = "$STR_EQUIP_DESC_16";
+	class ItemActions {
+		class use {
+			text = "Self transfusion";
+			script = "spawn player_useMeds;";
+		};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/ModularBuilding.hpp
@@ -9,7 +9,7 @@ class metal_floor_kit: CA_Magazine {
 	weight = 325;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "MetalFloor_DZ";
@@ -28,7 +28,7 @@ class cinder_wall_kit: CA_Magazine {
 	weight = 325;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "CinderWallHalf_DZ";
@@ -46,7 +46,7 @@ class cinder_door_kit: CA_Magazine {
 	weight = 325;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "CinderWallSmallDoorway_DZ";
@@ -64,7 +64,7 @@ class cinder_garage_kit: CA_Magazine {
 	weight = 325;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "CinderWallDoorway_DZ";
@@ -83,7 +83,7 @@ class ItemWoodFloor: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodFloor_DZ";
@@ -101,7 +101,7 @@ class ItemWoodFloorHalf: CA_Magazine {
 	weight = 15;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodFloorHalf_DZ";
@@ -128,7 +128,7 @@ class ItemWoodFloorQuarter: CA_Magazine {
 	weight = 10;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodFloorQuarter_DZ";
@@ -156,7 +156,7 @@ class ItemWoodStairs: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodStairsSans_DZ";
@@ -183,7 +183,7 @@ class ItemWoodStairsSupport: CA_Magazine {
 	weight = 30;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodStairs_DZ";
@@ -202,7 +202,7 @@ class ItemWoodLadder: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodLadder_DZ";
@@ -221,7 +221,7 @@ class ItemWoodWall: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodSmallWall_DZ";
@@ -263,7 +263,7 @@ class ItemWoodWallThird: CA_Magazine {
 	weight = 7;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodSmallWallThird_DZ";
@@ -289,7 +289,7 @@ class ItemWoodWallWindow: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodSmallWallWin_DZ";
@@ -308,7 +308,7 @@ class ItemWoodWallDoor: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodSmallWallDoor_DZ";
@@ -334,7 +334,7 @@ class ItemWoodWallWithDoor: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "Land_DZE_WoodDoor";
@@ -360,7 +360,7 @@ class ItemWoodWallWithDoorLocked: CA_Magazine {
 	weight = 30;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "Land_DZE_WoodDoorLocked";
@@ -379,7 +379,7 @@ class ItemWoodWallGarageDoor: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "Land_DZE_GarageWoodDoor";
@@ -405,7 +405,7 @@ class ItemWoodWallGarageDoorLocked: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "Land_DZE_GarageWoodDoorLocked";
@@ -424,7 +424,7 @@ class ItemWoodWallLg: CA_Magazine {
 	weight = 25;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodLargeWall_DZ";
@@ -466,7 +466,7 @@ class ItemWoodWallWindowLg: CA_Magazine {
 	weight = 30;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodLargeWallWin_DZ";
@@ -485,7 +485,7 @@ class ItemWoodWallDoorLg: CA_Magazine {
 	weight = 30;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "WoodLargeWallDoor_DZ";
@@ -511,7 +511,7 @@ class ItemWoodWallWithDoorLg: CA_Magazine {
 	weight = 30;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "Land_DZE_LargeWoodDoor";
@@ -537,7 +537,7 @@ class ItemWoodWallWithDoorLgLocked: CA_Magazine {
 	weight = 35;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_BUILD;
+			text = $STR_ACTIONS_BUILD_EPOCH;
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			create = "Land_DZE_LargeWoodDoorLocked";
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Ores.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Ores.hpp
@@ -0,0 +1,60 @@
+class PartOre: CA_Magazine {
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "Iron Ore";
+	model = "\z\addons\dayz_epoch\models\iron_ore.p3d";
+	picture="\z\addons\dayz_epoch\pictures\equip_iron_ore_CA.paa";
+	descriptionShort = "Used for crafting scrap metal. Can be mined from rocks using a sledgehammer.";
+	weight = 1;
+	class ItemActions {
+		class Crafting {
+			text = $STR_EPOCH_PLAYER_265;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"fire"};
+			requiretools[] = {"ItemSledge"};
+			output[] = {{"PartGeneric",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"PartOre",4},{"ItemWaterbottle",1}};
+		};
+	};
+};
+class PartOreSilver: CA_Magazine {
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "Silver Ore";
+	model = "\z\addons\dayz_epoch\models\silver_ore.p3d";
+	picture="\z\addons\dayz_epoch\pictures\equip_silver_ore_CA.paa";
+	descriptionShort = "Can be mined from rocks using a sledgehammer.";
+	weight = 1;
+	class ItemActions {
+		class Crafting {
+			text = $STR_EPOCH_PLAYER_266;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"fire"};
+			requiretools[] = {"ItemSledge"};
+			output[] = {{"ItemSilverBar",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"PartOreSilver",1},{"ItemWaterbottle",1}};
+		};
+	};
+};
+class PartOreGold: CA_Magazine {
+	scope = 2;
+	count = 1;
+	type = 256;
+	displayName = "Gold Ore";
+	model = "\z\addons\dayz_epoch\models\gold_ore.p3d";
+	picture="\z\addons\dayz_epoch\pictures\equip_gold_ore_CA.paa";
+	descriptionShort = "Can be mined from rocks using a sledgehammer.";
+	weight = 1;
+	class ItemActions {
+		class Crafting {
+			text = $STR_EPOCH_PLAYER_267;
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {"fire"};
+			requiretools[] = {"ItemSledge"};
+			output[] = {{"ItemGoldBar",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"PartOreGold",1},{"ItemWaterbottle",1}};
+		};
+	};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Planting.hpp
@@ -0,0 +1,93 @@
+class ItemFertilizer: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "Fertilizer";
+	descriptionShort = "Fertilizer";
+	weight = 0.1;
+	model = "z\addons\dayz_communityassets\models\mre.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_communityassets\pictures\equip_mre_CA.paa";
+	type = 256;
+};
+
+class ItemPumpkinSeed: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Pumpkin Seed";
+	descriptionShort = "A Pumpkin Seed";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Crafting
+		{
+			text = "Craft Pumpkin Plant";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {""};
+			requiretools[] = {"ItemKnife"};
+			output[] = {{"ItemPumpkinPlant",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"ItemPumpkinSeed",1},{"ItemFertilizer",1},{"ItemWaterbottle",1}};
+		};
+	};
+};
+
+class ItemPumpkinPlant: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Pumpkin Plant";
+	descriptionShort = "A Pumpkin Plant";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child1.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child1_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Build {
+			text = "Plant Pumpkin";
+			script = "spawn player_build;";
+			require[] = {"ItemEtool"};
+			create = "Grave";			// TODO: model for Pumpkin Stage 1
+		};
+	};
+};
+
+class ItemHempSeed: CA_Magazine {
+	scope = public;
+	count = 1;
+	displayName = "A Hemp Seed";
+	descriptionShort = "A Hemp Seed";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Crafting
+		{
+			text = "Craft Hemp Plant";
+			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+			neednearby[] = {""};
+			requiretools[] = {"ItemKnife"};
+			output[] = {{"ItemHempPlant",1},{"ItemWaterbottleUnfilled",1}};
+			input[] = {{"ItemHempSeed",1},{"ItemFertilizer",1},{"ItemWaterbottle",1}};
+		};
+	};
+};
+
+class ItemHempPlant: CA_Magazine {
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = "A Hemp Plant";
+	descriptionShort = "A Hemp Plant";
+	weight = 0.1;
+	model = "\z\addons\dayz_epoch\models\doc_child2.p3d";	// TODO: model + icon
+	picture = "\z\addons\dayz_epoch\pictures\equip_child2_ca.paa";
+	type = 256;
+	class ItemActions {
+		class Build {
+			text = "Plant Hemp";
+			script = "spawn player_build;";
+			require[] = {"ItemEtool"};
+			create = "MAP_c_fern";			// TODO: model for Hemp Stage 1
+		};
+	};
+};
--- a/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp
@@ -155,6 +155,7 @@ class Skin_SurvivorWpink_DZ: SkinBase {
 	displayName = "Melly (female)";
 	descriptionShort = "Purple top with blue pants.";
 };
+/*
 class Skin_SurvivorWsequisha_DZ: SkinBase {
 	scope = 2;
 	displayName = "Maria (female)";
@@ -165,6 +166,7 @@ class Skin_SurvivorWsequishaD_DZ: SkinBase {
 	displayName = "Sequisha (female)";
 	descriptionShort = "Sequisha Clothes (female)";
 };
+*/
 class Skin_SurvivorWcombat_DZ: SkinBase {
 	scope = 2;
 	displayName = "Alejandria";
--- a/SQF/dayz_code/Configs/CfgPlayerStats/defines.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/defines.hpp
@@ -0,0 +1,108 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Defines
+/********************************************************************************************************************/
+
+#define CT_STATIC           0
+#define CT_BUTTON           1
+#define CT_COMBO            4
+#define CT_STRUCTURED_TEXT  13
+
+#define ST_LEFT           0x00
+#define ST_RIGHT          0x01
+#define ST_CENTER         0x02
+#define ST_PICTURE        0x30
+#define ST_ROUNDED1        128
+#define ST_MULTI          0x10
+
+/********************************************************************************************************************/
+//  Base Classes
+/********************************************************************************************************************/
+
+class horde_RscPicture
+{
+    access = 0;
+    type = CT_STATIC;
+    style = ST_PICTURE;
+    idc = -1;
+    colorBackground[] = {0,0,0,1};
+    colorText[] = {1,1,1,1};
+    font = "Zeppelin33";
+    sizeEx = 0;
+    lineSpacing = 0;
+    text = "";
+    fixedWidth = 0;
+    shadow = 0;
+    x = 0;
+    y = 0;
+    w = 0;
+    h = 0;
+};
+
+class horde_RscText
+{
+	type = CT_STATIC;
+	text = "";
+	idc = -1;
+	style = ST_CENTER;
+	h = 0.04;
+	colorBackground[] = {0, 0, 0, 0};
+	colorText[] = {0, 0, 0, 1};
+	font = "Zeppelin33";
+	sizeEx = 0.01 * safezoneH;
+	shadow = 0;
+};
+ 
+class horde_RscStructuredText
+{
+    access = 0;
+    type = CT_STRUCTURED_TEXT;
+    style = ST_CENTER;
+	font = "Zeppelin33";
+    idc = -1;
+    colorBackground[] = {0,0,0,0};
+    colorText[] = {0,0,0,0};
+    x = 0;
+    y = 0;
+    h = 0;
+    w = 0;
+    text = "";
+    size = 0.0146 * safezoneH;
+    shadow = 0;
+};
+
+class horde_RscButton
+{
+	access = 0;
+	type = CT_BUTTON;
+	style = ST_LEFT;
+	x = 0;
+	y = 0;
+	w = 0;
+	h = 0;
+	text = "";
+	font = "Zeppelin33";
+	sizeEx = 0.04;
+	colorText[] = {0, 0, 0, 0};
+	colorDisabled[] = {0, 0, 0, 0};
+	colorBackground[] = {0, 0, 0, 0};
+	colorBackgroundDisabled[] = {0, 0, 0, 0};
+	colorBackgroundActive[] = {0, 0, 0, 0};
+	offsetX = 0;
+	offsetY = 0;
+	offsetPressedX = 0;
+	offsetPressedY = 0;
+	colorFocused[] = {0, 0, 0, 0};
+	colorShadow[] = {0, 0, 0, 0};
+	shadow = 0;
+	colorBorder[] = {0, 0, 0, 0};
+	borderSize = 0;
+	soundEnter[] = {"",0.1,1};
+	soundPush[] = {"",0.1,1};
+	soundClick[] = {"",0.1,1};
+	soundEscape[] = {"",0.1,1};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp
@@ -0,0 +1,99 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_front_cover
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"open_craft",
+		"open_book",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4"
+	};
+	
+	// background
+	
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\cover.paa";
+		x = 0.199197 * safezoneW + safezoneX;
+		y = -0.0250695 * safezoneH + safezoneY;
+		w = 0.601605 * safezoneW;
+		h = 1.05014 * safezoneH;
+
+	};
+	
+	// buttons
+	
+	class open_craft: RscIGUIShortcutButton {
+		idc = -1;
+		x = 0.48 * safezoneW + safezoneX;
+		y = 0.8 * safezoneH + safezoneY;
+		text = $STR_UI_CRAFT_OPEN;
+		action = "closeDialog 0; createDialog 'RscDisplayCraftingMenu';";
+	};
+	
+	class open_book: horde_RscButton
+	{
+		idc = 1900;
+		text = "#(argb,8,8,3)color(1,1,1,0.5)";
+		x = 0.5 * safezoneW + safezoneX;
+		y = 0.149954 * safezoneH + safezoneY;
+		w = 0.291687 * safezoneW;
+		h = 0.68259 * safezoneH;
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_journal_humanity';";
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1901;
+		x = -0.0195684 * safezoneW + safezoneX;
+		y = -0.0600741 * safezoneH + safezoneY;
+		w = 1.03914 * safezoneW;
+		h = 0.210028 * safezoneH;
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1902;
+		x = 0.791687 * safezoneW + safezoneX;
+		y = 0.149954 * safezoneH + safezoneY;
+		w = 1.04825 * safezoneW;
+		h = 0.892618 * safezoneH;
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1903;
+		x = -0.0013379 * safezoneW + safezoneX;
+		y = 0.832544 * safezoneH + safezoneY;
+		w = 1.04825 * safezoneW;
+		h = 0.892618 * safezoneH;
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.110721 * safezoneW + safezoneX;
+		y = 0.0624421 * safezoneH + safezoneY;
+		w = 0.610721 * safezoneW;
+		h = 0.822609 * safezoneH;
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+};
+
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p_bandits_killed.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p_bandits_killed.hpp
@@ -0,0 +1,458 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_pages_bandits
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "uiNamespace setVariable ['horde_myDisplay', (_this select 0)];  [player getVariable['banditKills', 0]] call horde_epeen_setText_stats_fnc;";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"header_one",
+		"header_two",
+		"main_image",
+		"t11",
+		"t12",
+		"t13",
+		"t14",
+		"t15",
+		"t21",
+		"t22",
+		"t23",
+		"t24",
+		"t25",
+		"t31",
+		"t32",
+		"t33",
+		"t34",
+		"t35",
+		"t41",
+		"t42",
+		"t43",
+		"t44",
+		"t45",
+		"t51",
+		"t52",
+		"t53",
+		"t54",
+		"t55",
+		"t61",
+		"t62",
+		"t63",
+		"t64",
+		"t65",
+		"t75",
+		"t71",
+		"t72",
+		"t73",
+		"t74",
+		"t75",
+		"add_kills",
+		"click_for_prev_page",
+		"click_for_next_page",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4"
+	};
+
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\pages_2.paa";
+		x = 0.199165 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 0.601429 * safezoneW;
+		h = 1.01491 * safezoneH;
+	};
+	class header_one: horde_RscPicture
+	{
+		idc = 1700;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\bandit.paa";
+		x = 0.253926 * safezoneW + safezoneX;
+		y = 0.219948 * safezoneH + safezoneY;
+		w = 0.200505 * safezoneW;
+		h = 0.0700129 * safezoneH;
+	};
+	class header_two: horde_RscPicture
+	{
+		idc = 1701;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\killed.paa";
+		x = 0.244842 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class main_image: horde_RscPicture
+	{
+		idc = 1702;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\illus\bandit.paa";
+		x = 0.281293 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.173143 * safezoneW;
+		h = 0.489934 * safezoneH;
+	};
+	class t11: horde_RscStructuredText
+	{
+		idc = 1204;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t12: horde_RscStructuredText
+	{
+		idc = 1205;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t13: horde_RscStructuredText
+	{
+		idc = 1206;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t14: horde_RscStructuredText
+	{
+		idc = 1207;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t15: horde_RscStructuredText
+	{
+		idc = 1208;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t21: horde_RscStructuredText
+	{
+		idc = 1209;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t22: horde_RscStructuredText
+	{
+		idc = 1210;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t23: horde_RscStructuredText
+	{
+		idc = 1211;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t24: horde_RscStructuredText
+	{
+		idc = 1212;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t25: horde_RscStructuredText
+	{
+		idc = 1213;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t31: horde_RscStructuredText
+	{
+		idc = 1214;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t32: horde_RscStructuredText
+	{
+		idc = 1215;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t33: horde_RscStructuredText
+	{
+		idc = 1216;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t34: horde_RscStructuredText
+	{
+		idc = 1217;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t35: horde_RscStructuredText
+	{
+		idc = 1218;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t41: horde_RscStructuredText
+	{
+		idc = 1219;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t42: horde_RscStructuredText
+	{
+		idc = 1220;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t43: horde_RscStructuredText
+	{
+		idc = 1221;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t44: horde_RscStructuredText
+	{
+		idc = 1222;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t45: horde_RscStructuredText
+	{
+		idc = 1223;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t51: horde_RscStructuredText
+	{
+		idc = 1224;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t52: horde_RscStructuredText
+	{
+		idc = 1225;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t53: horde_RscStructuredText
+	{
+		idc = 1226;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t54: horde_RscStructuredText
+	{
+		idc = 1227;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t55: horde_RscStructuredText
+	{
+		idc = 1228;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t61: horde_RscStructuredText
+	{
+		idc = 1229;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t62: horde_RscStructuredText
+	{
+		idc = 1230;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t63: horde_RscStructuredText
+	{
+		idc = 1231;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t64: horde_RscStructuredText
+	{
+		idc = 1232;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t65: horde_RscStructuredText
+	{
+		idc = 1233;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t71: horde_RscStructuredText
+	{
+		idc = 1234;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t72: horde_RscStructuredText
+	{
+		idc = 1235;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t73: horde_RscStructuredText
+	{
+		idc = 1236;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t74: horde_RscStructuredText
+	{
+		idc = 1237;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t75: horde_RscStructuredText
+	{
+		idc = 1238;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class add_kills: horde_RscStructuredText
+	{
+		idc = 1239;
+		x = 0.536451 * safezoneW + safezoneX;
+		y = 0.709972 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	
+	//********************************************************************************************************************/
+	// Buttons
+	//********************************************************************************************************************/
+	
+	class click_for_prev_page: horde_RscButton
+	{
+		idc = 1900;
+		x = 0.217398 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_headshots';";		
+	};
+	class click_for_next_page: horde_RscButton
+	{
+		idc = 1901;
+		x = 0.5 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\page",0.7,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_murders';";
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1902;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 1.03925 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1903;
+		x = 0.791719 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.832515 * safezoneH + safezoneY;
+		w = 1.0119 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1905;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p_headshots.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p_headshots.hpp
@@ -0,0 +1,450 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_pages_headshots
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "uiNamespace setVariable ['horde_myDisplay', (_this select 0)];  [player getVariable['headShots', 0]] call horde_epeen_setText_stats_fnc;";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"header_one",
+		"main_image",
+		"t11",
+		"t12",
+		"t13",
+		"t14",
+		"t15",
+		"t21",
+		"t22",
+		"t23",
+		"t24",
+		"t25",
+		"t31",
+		"t32",
+		"t33",
+		"t34",
+		"t35",
+		"t41",
+		"t42",
+		"t43",
+		"t44",
+		"t45",
+		"t51",
+		"t52",
+		"t53",
+		"t54",
+		"t55",
+		"t61",
+		"t62",
+		"t63",
+		"t64",
+		"t65",
+		"t75",
+		"t71",
+		"t72",
+		"t73",
+		"t74",
+		"t75",
+		"add_kills",
+		"click_for_prev_page",
+		"click_for_next_page",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4"
+	};
+		
+	// picture of blank book pages
+
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\pages_2.paa";
+		x = 0.199165 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 0.601429 * safezoneW;
+		h = 1.01491 * safezoneH;
+	};
+	class header_one: horde_RscPicture
+	{
+		idc = 1700;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\headshots.paa";
+		x = 0.244842 * safezoneW + safezoneX;
+		y = 0.237536 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class main_image: horde_RscPicture
+	{
+		idc = 1701;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\illus\headshots.paa";
+		x = 0.208391 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.309835 * safezoneW;
+		h = 0.507431 * safezoneH;
+	};
+	class t11: horde_RscStructuredText
+	{
+		idc = 1204;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t12: horde_RscStructuredText
+	{
+		idc = 1205;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t13: horde_RscStructuredText
+	{
+		idc = 1206;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t14: horde_RscStructuredText
+	{
+		idc = 1207;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t15: horde_RscStructuredText
+	{
+		idc = 1208;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t21: horde_RscStructuredText
+	{
+		idc = 1209;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t22: horde_RscStructuredText
+	{
+		idc = 1210;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t23: horde_RscStructuredText
+	{
+		idc = 1211;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t24: horde_RscStructuredText
+	{
+		idc = 1212;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t25: horde_RscStructuredText
+	{
+		idc = 1213;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t31: horde_RscStructuredText
+	{
+		idc = 1214;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t32: horde_RscStructuredText
+	{
+		idc = 1215;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t33: horde_RscStructuredText
+	{
+		idc = 1216;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t34: horde_RscStructuredText
+	{
+		idc = 1217;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t35: horde_RscStructuredText
+	{
+		idc = 1218;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t41: horde_RscStructuredText
+	{
+		idc = 1219;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t42: horde_RscStructuredText
+	{
+		idc = 1220;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t43: horde_RscStructuredText
+	{
+		idc = 1221;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t44: horde_RscStructuredText
+	{
+		idc = 1222;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t45: horde_RscStructuredText
+	{
+		idc = 1223;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t51: horde_RscStructuredText
+	{
+		idc = 1224;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t52: horde_RscStructuredText
+	{
+		idc = 1225;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t53: horde_RscStructuredText
+	{
+		idc = 1226;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t54: horde_RscStructuredText
+	{
+		idc = 1227;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t55: horde_RscStructuredText
+	{
+		idc = 1228;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t61: horde_RscStructuredText
+	{
+		idc = 1229;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t62: horde_RscStructuredText
+	{
+		idc = 1230;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t63: horde_RscStructuredText
+	{
+		idc = 1231;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t64: horde_RscStructuredText
+	{
+		idc = 1232;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t65: horde_RscStructuredText
+	{
+		idc = 1233;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t71: horde_RscStructuredText
+	{
+		idc = 1234;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t72: horde_RscStructuredText
+	{
+		idc = 1235;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t73: horde_RscStructuredText
+	{
+		idc = 1236;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t74: horde_RscStructuredText
+	{
+		idc = 1237;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t75: horde_RscStructuredText
+	{
+		idc = 1238;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class add_kills: horde_RscStructuredText
+	{
+		idc = 1239;
+		x = 0.536451 * safezoneW + safezoneX;
+		y = 0.709972 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	
+	/********************************************************************************************************************/
+	// Buttons
+	//********************************************************************************************************************/
+	
+	class click_for_prev_page: horde_RscButton
+	{
+		idc = 1900;
+		x = 0.217398 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_zombies';";		
+	};
+	class click_for_next_page: horde_RscButton
+	{
+		idc = 1901;
+		x = 0.5 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\page",0.7,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_bandits';";
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1902;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 1.03925 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1903;
+		x = 0.791719 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.832515 * safezoneH + safezoneY;
+		w = 1.0119 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1905;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p_humanity_art.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p_humanity_art.hpp
@@ -0,0 +1,148 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_pages_humanity_art
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "uiNamespace setVariable ['horde_myDisplay', (_this select 0)]; [] call horde_epeen_setText_humanity_fnc;";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"left_page_middle",
+		"left_page_bottom",
+		"left_page_top",
+		"right_page_picture",
+		"click_for_prev_page",
+		"click_for_next_page",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4"
+	};
+	
+	// background
+	
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\pages_2.paa";
+		x = 0.199165 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 0.601429 * safezoneW;
+		h = 1.01491 * safezoneH;
+	};
+	
+	//left page
+
+	class left_page_middle: horde_RscPicture
+	{
+		idc = 1201;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_middle_1.paa";
+		x = 0.209053 * safezoneW + safezoneX;
+		y = 0.27261 * safezoneH + safezoneY;
+		w = 0.282496 * safezoneW;
+		h = 0.419943 * safezoneH;
+	};
+	class left_page_bottom: horde_RscPicture
+	{
+		idc = 1202;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_bottom_1.paa";
+		x = 0.203156 * safezoneW + safezoneX;
+		y = 0.468726 * safezoneH + safezoneY;
+		w = 0.291609 * safezoneW;
+		h = 0.419943 * safezoneH;
+	};
+	class left_page_top: horde_RscPicture
+	{
+		idc = 1203;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_top_1.paa";
+		x = 0.209111 * safezoneW + safezoneX;
+		y = 0.0901794 * safezoneH + safezoneY;
+		w = 0.291609 * safezoneW;
+		h = 0.419943 * safezoneH;
+	};
+	
+	// right page
+	
+	class right_page_picture: horde_RscPicture
+	{
+		idc = 1204;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_3.paa";
+		x = 0.43621 * safezoneW + safezoneX;
+		y = 0.167545 * safezoneH + safezoneY;
+		w = 0.419188 * safezoneW;
+		h = 0.647412 * safezoneH;
+	};
+	
+	// buttons
+	
+	class click_for_prev_page: horde_RscButton
+	{
+		idc = 1900;
+		x = 0.217398 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_journal_humanity';";		
+	};
+	class click_for_next_page: horde_RscButton
+	{
+		idc = 1901;
+		x = 0.5 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_zombies';";
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1902;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 1.03925 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1903;
+		x = 0.791719 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.832515 * safezoneH + safezoneY;
+		w = 1.0119 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1905;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p_journal_humanity.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p_journal_humanity.hpp
@@ -0,0 +1,249 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_pages_journal_humanity
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "uiNamespace setVariable ['horde_myDisplay', (_this select 0)]; [] call horde_epeen_setText_journal_fnc;";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"journal_header",
+		"journal_text_on_left_hand_page",
+		"humanity_header",
+		"playing_card_blank",
+		"playing_card_face_down",
+		"playing_card_top_value",
+		"playing_card_bottom_value",
+		"playing_card_top_suit",
+		"playing_card_bottom_suit",
+		"playing_card_top_joker",
+		"playing_card_bottom_joker",
+		"playing_card_face_image",
+		"playing_card_player_name",
+		"playing_card_humanity_readout",
+		"click_to_go_back_to_cover",
+		"click_for_next_page",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4",
+		"click_for_humanity"
+	};
+	
+	// background
+	
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\pages_2.paa";
+		x = 0.199165 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 0.601429 * safezoneW;
+		h = 1.01491 * safezoneH;
+	};
+	
+	//left page
+
+	class journal_header: horde_RscPicture
+	{
+		idc = 1700;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\journal.paa";
+		x = 0.268972 * safezoneW + safezoneX;
+		y = 0.236464 * safezoneH + safezoneY;
+		w = 0.173462 * safezoneW;
+		h = 0.0648851 * safezoneH;
+	};
+	class journal_text_on_left_hand_page: horde_RscStructuredText
+	{
+		idc = 1800;
+		x = 0.23563 * safezoneW + safezoneX;
+		y = 0.324992 * safezoneH + safezoneY;
+		w = 0.237021 * safezoneW;
+		h = 0.45502 * safezoneH;
+	};
+	
+	//right page
+
+	class humanity_header: horde_RscPicture
+	{
+		idc = 1701;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\humanity.paa";
+		x = 0.554697 * safezoneW + safezoneX;
+		y = 0.237488 * safezoneH + safezoneY;
+		w = 0.181084 * safezoneW;
+		h = 0.0731088 * safezoneH;
+	};
+	class playing_card_blank: horde_RscPicture
+	{
+		idc = 1702;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\cards\card\face_up.paa";
+		x = 0.51466 * safezoneW + safezoneX;
+		y = 0.324981 * safezoneH + safezoneY;
+		w = 0.26437 * safezoneW;
+		h = 0.45502 * safezoneH;
+	};
+	class playing_card_face_down: horde_RscPicture
+	{
+		idc = 1906;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\cards\card\face_down.paa";
+		x = 0.51466 * safezoneW + safezoneX;
+		y = 0.324981 * safezoneH + safezoneY;
+		w = 0.26437 * safezoneW;
+		h = 0.45502 * safezoneH;
+	};
+	class playing_card_top_value: horde_RscStructuredText
+	{
+		idc = 1801;
+		x = 0.547127 * safezoneW + safezoneX;
+		y = 0.316785 * safezoneH + safezoneY;
+		w = 0.0546973 * safezoneW;
+		h = 0.0875038 * safezoneH;
+	};
+	class playing_card_bottom_value: horde_RscStructuredText
+	{
+		idc = 1802;
+		x = 0.695821 * safezoneW + safezoneX;
+		y = 0.694556 * safezoneH + safezoneY;
+		w = 0.0546973 * safezoneW;
+		h = 0.0875038 * safezoneH;
+	};
+	class playing_card_top_suit: horde_RscStructuredText
+	{
+		idc = 1803;
+		x = 0.556331 * safezoneW + safezoneX;
+		y = 0.382642 * safezoneH + safezoneY;
+		w = 0.0364649 * safezoneW;
+		h = 0.0525023 * safezoneH;
+	};
+	class playing_card_bottom_suit: horde_RscStructuredText
+	{
+		idc = 1804;
+		x = 0.704365 * safezoneW + safezoneX;
+		y = 0.663569 * safezoneH + safezoneY;
+		w = 0.0364649 * safezoneW;
+		h = 0.0525023 * safezoneH;
+	};
+	class playing_card_top_joker: horde_RscStructuredText
+	{
+		idc = 1805;
+		x = 0.56105 * safezoneW + safezoneX;
+		y = 0.329086 * safezoneH + safezoneY;
+		w = 0.0273486 * safezoneW;
+		h = 0.192508 * safezoneH;
+	};
+	class playing_card_bottom_joker: horde_RscStructuredText
+	{
+		idc = 1806;
+		x = 0.707647 * safezoneW + safezoneX;
+		y = 0.584446 * safezoneH + safezoneY;
+		w = 0.0273486 * safezoneW;
+		h = 0.192508 * safezoneH;
+	};
+	class playing_card_face_image: horde_RscStructuredText
+	{
+		idc = 1807;
+		x = 0.586685 * safezoneW + safezoneX;
+		y = 0.425475 * safezoneH + safezoneY;
+		w = 0.127627 * safezoneW;
+		h = 0.22751 * safezoneH;
+	};
+	class playing_card_player_name: horde_RscStructuredText
+	{
+		idc = 1808;
+		x = 0.594 * safezoneW + safezoneX; // 0.591162
+		y = 0.640006 * safezoneH + safezoneY;
+		w = 0.115412 * safezoneW;
+		h = 0.0360368 * safezoneH;
+	};
+	class playing_card_humanity_readout: horde_RscStructuredText
+	{
+		idc = 1809;
+		x = 0.602 * safezoneW + safezoneX; // 0.598569
+		y = 0.680074 * safezoneH + safezoneY;
+		w = 0.099588 * safezoneW;
+		h = 0.0360251 * safezoneH;
+	};
+	
+	// buttons
+	
+	class click_to_go_back_to_cover: horde_RscButton
+	{
+		idc = 1900;
+		x = 0.217398 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0; createDialog 'horde_journal_front_cover';";		
+	};
+	class click_for_next_page: horde_RscButton
+	{
+		idc = 1901;
+		x = 0.5 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\page",0.7,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_humanity_art';";
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1902;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 1.03925 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1903;
+		x = 0.791719 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.832515 * safezoneH + safezoneY;
+		w = 1.0119 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1905;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_for_humanity: horde_RscButton
+	{
+		idc = 1907;
+		x = 0.554688 * safezoneW + safezoneX;
+		y = 0.325 * safezoneH + safezoneY;
+		w = 0.182292 * safezoneW;
+		h = 0.455 * safezoneH;
+		action = "playSound 'horde_sound_turning_page'; [] call horde_epeen_show_humanity_fnc;";
+	};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p_murders.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p_murders.hpp
@@ -0,0 +1,439 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_pages_murders
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "uiNamespace setVariable ['horde_myDisplay', (_this select 0)];  [player getVariable['humanKills', 0]] call horde_epeen_setText_stats_fnc;";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"header_one",
+		"main_image",
+		"t11",
+		"t12",
+		"t13",
+		"t14",
+		"t15",
+		"t21",
+		"t22",
+		"t23",
+		"t24",
+		"t25",
+		"t31",
+		"t32",
+		"t33",
+		"t34",
+		"t35",
+		"t41",
+		"t42",
+		"t43",
+		"t44",
+		"t45",
+		"t51",
+		"t52",
+		"t53",
+		"t54",
+		"t55",
+		"t61",
+		"t62",
+		"t63",
+		"t64",
+		"t65",
+		"t75",
+		"t71",
+		"t72",
+		"t73",
+		"t74",
+		"t75",
+		"add_kills",
+		"click_for_prev_page",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4"
+	};
+		
+	// picture of blank book pages
+
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\pages_2.paa";
+		x = 0.199165 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 0.601429 * safezoneW;
+		h = 1.01491 * safezoneH;
+	};
+	class header_one: horde_RscPicture
+	{
+		idc = 1700;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\murders.paa";
+		x = 0.244842 * safezoneW + safezoneX;
+		y = 0.237536 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class main_image: horde_RscPicture
+	{
+		idc = 1701;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\illus\murders.paa";
+		x = 0.226616 * safezoneW + safezoneX;
+		y = 0.325024 * safezoneH + safezoneY;
+		w = 0.264271 * safezoneW;
+		h = 0.454938 * safezoneH;
+	};
+	class t11: horde_RscStructuredText
+	{
+		idc = 1204;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t12: horde_RscStructuredText
+	{
+		idc = 1205;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t13: horde_RscStructuredText
+	{
+		idc = 1206;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t14: horde_RscStructuredText
+	{
+		idc = 1207;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t15: horde_RscStructuredText
+	{
+		idc = 1208;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t21: horde_RscStructuredText
+	{
+		idc = 1209;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t22: horde_RscStructuredText
+	{
+		idc = 1210;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t23: horde_RscStructuredText
+	{
+		idc = 1211;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t24: horde_RscStructuredText
+	{
+		idc = 1212;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t25: horde_RscStructuredText
+	{
+		idc = 1213;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t31: horde_RscStructuredText
+	{
+		idc = 1214;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t32: horde_RscStructuredText
+	{
+		idc = 1215;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t33: horde_RscStructuredText
+	{
+		idc = 1216;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t34: horde_RscStructuredText
+	{
+		idc = 1217;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t35: horde_RscStructuredText
+	{
+		idc = 1218;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t41: horde_RscStructuredText
+	{
+		idc = 1219;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t42: horde_RscStructuredText
+	{
+		idc = 1220;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t43: horde_RscStructuredText
+	{
+		idc = 1221;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t44: horde_RscStructuredText
+	{
+		idc = 1222;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t45: horde_RscStructuredText
+	{
+		idc = 1223;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t51: horde_RscStructuredText
+	{
+		idc = 1224;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t52: horde_RscStructuredText
+	{
+		idc = 1225;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t53: horde_RscStructuredText
+	{
+		idc = 1226;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t54: horde_RscStructuredText
+	{
+		idc = 1227;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t55: horde_RscStructuredText
+	{
+		idc = 1228;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t61: horde_RscStructuredText
+	{
+		idc = 1229;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t62: horde_RscStructuredText
+	{
+		idc = 1230;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t63: horde_RscStructuredText
+	{
+		idc = 1231;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t64: horde_RscStructuredText
+	{
+		idc = 1232;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t65: horde_RscStructuredText
+	{
+		idc = 1233;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t71: horde_RscStructuredText
+	{
+		idc = 1234;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t72: horde_RscStructuredText
+	{
+		idc = 1235;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t73: horde_RscStructuredText
+	{
+		idc = 1236;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t74: horde_RscStructuredText
+	{
+		idc = 1237;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t75: horde_RscStructuredText
+	{
+		idc = 1238;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class add_kills: horde_RscStructuredText
+	{
+		idc = 1239;
+		x = 0.536451 * safezoneW + safezoneX;
+		y = 0.709972 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	
+	/********************************************************************************************************************/
+	// Buttons
+	//********************************************************************************************************************/
+	
+	class click_for_prev_page: horde_RscButton
+	{
+		idc = 1900;
+		x = 0.217398 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_bandits';";		
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1901;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 1.03925 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1902;
+		x = 0.791719 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1903;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.832515 * safezoneH + safezoneY;
+		w = 1.0119 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/p_zombies_killed.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/p_zombies_killed.hpp
@@ -0,0 +1,461 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+/********************************************************************************************************************/
+//  Set up dialog
+/********************************************************************************************************************/
+
+class horde_journal_pages_zombies
+{
+	idd = -1;
+	movingEnable = false;
+	onLoad = "uiNamespace setVariable ['horde_myDisplay', (_this select 0)];  [player getVariable['zombieKills', 0]] call horde_epeen_setText_stats_fnc;";
+	enableSimulation = true;
+	controlsBackground[] = {};
+	objects[] = {};
+	controls[] =
+	{
+		"book_page_image",
+		"header_one",
+		"header_two",
+		"main_image",
+		"t11",
+		"t12",
+		"t13",
+		"t14",
+		"t15",
+		"t21",
+		"t22",
+		"t23",
+		"t24",
+		"t25",
+		"t31",
+		"t32",
+		"t33",
+		"t34",
+		"t35",
+		"t41",
+		"t42",
+		"t43",
+		"t44",
+		"t45",
+		"t51",
+		"t52",
+		"t53",
+		"t54",
+		"t55",
+		"t61",
+		"t62",
+		"t63",
+		"t64",
+		"t65",
+		"t75",
+		"t71",
+		"t72",
+		"t73",
+		"t74",
+		"t75",
+		"add_kills",
+		"click_for_prev_page",
+		"click_for_next_page",
+		"click_here_to_close_book_1",
+		"click_here_to_close_book_2",
+		"click_here_to_close_book_3",
+		"click_here_to_close_book_4"
+	};
+		
+	// picture of blank book pages
+	
+	// classhorde_RscStructuredText;
+	class book_page_image: horde_RscPicture
+	{
+		idc = 1200;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\book\pages_2.paa";
+		x = 0.199165 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 0.601429 * safezoneW;
+		h = 1.01491 * safezoneH;
+	};
+	class header_one: horde_RscPicture
+	{
+		idc = 1700;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\zombie.paa";
+		x = 0.253926 * safezoneW + safezoneX;
+		y = 0.219948 * safezoneH + safezoneY;
+		w = 0.200505 * safezoneW;
+		h = 0.0700129 * safezoneH;
+	};
+	class header_two: horde_RscPicture
+	{
+		idc = 1701;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\headers\killed.paa";
+		x = 0.244842 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class main_image: horde_RscPicture
+	{
+		idc = 1702;
+		text = "\z\addons\dayz_communityassets\pictures\playerstats\illus\zombie.paa";
+		x = 0.281293 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.136692 * safezoneW;
+		h = 0.437441 * safezoneH;
+	};
+	class t11: horde_RscStructuredText
+	{
+		idc = 1204;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t12: horde_RscStructuredText
+	{
+		idc = 1205;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t13: horde_RscStructuredText
+	{
+		idc = 1206;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t14: horde_RscStructuredText
+	{
+		idc = 1207;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t15: horde_RscStructuredText
+	{
+		idc = 1208;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.220038 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t21: horde_RscStructuredText
+	{
+		idc = 1209;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t22: horde_RscStructuredText
+	{
+		idc = 1210;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t23: horde_RscStructuredText
+	{
+		idc = 1211;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t24: horde_RscStructuredText
+	{
+		idc = 1212;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t25: horde_RscStructuredText
+	{
+		idc = 1213;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.290028 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t31: horde_RscStructuredText
+	{
+		idc = 1214;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t32: horde_RscStructuredText
+	{
+		idc = 1215;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t33: horde_RscStructuredText
+	{
+		idc = 1216;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t34: horde_RscStructuredText
+	{
+		idc = 1217;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t35: horde_RscStructuredText
+	{
+		idc = 1218;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.360019 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t41: horde_RscStructuredText
+	{
+		idc = 1219;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t42: horde_RscStructuredText
+	{
+		idc = 1220;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t43: horde_RscStructuredText
+	{
+		idc = 1221;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t44: horde_RscStructuredText
+	{
+		idc = 1222;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t45: horde_RscStructuredText
+	{
+		idc = 1223;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.43001 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t51: horde_RscStructuredText
+	{
+		idc = 1224;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t52: horde_RscStructuredText
+	{
+		idc = 1225;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t53: horde_RscStructuredText
+	{
+		idc = 1226;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t54: horde_RscStructuredText
+	{
+		idc = 1227;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t55: horde_RscStructuredText
+	{
+		idc = 1228;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.5 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t61: horde_RscStructuredText
+	{
+		idc = 1229;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t62: horde_RscStructuredText
+	{
+		idc = 1230;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t63: horde_RscStructuredText
+	{
+		idc = 1231;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t64: horde_RscStructuredText
+	{
+		idc = 1232;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t65: horde_RscStructuredText
+	{
+		idc = 1233;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.569991 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t71: horde_RscStructuredText
+	{
+		idc = 1234;
+		x = 0.527338 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t72: horde_RscStructuredText
+	{
+		idc = 1235;
+		x = 0.572902 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t73: horde_RscStructuredText
+	{
+		idc = 1236;
+		x = 0.618466 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t74: horde_RscStructuredText
+	{
+		idc = 1237;
+		x = 0.66403 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class t75: horde_RscStructuredText
+	{
+		idc = 1238;
+		x = 0.709594 * safezoneW + safezoneX;
+		y = 0.639981 * safezoneH + safezoneY;
+		w = 0.0546767 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	class add_kills: horde_RscStructuredText
+	{
+		idc = 1239;
+		x = 0.536451 * safezoneW + safezoneX;
+		y = 0.709972 * safezoneH + safezoneY;
+		w = 0.218707 * safezoneW;
+		h = 0.0699905 * safezoneH;
+	};
+	
+	/********************************************************************************************************************/
+	// Buttons
+	//********************************************************************************************************************/
+	
+	class click_for_prev_page: horde_RscButton
+	{
+		idc = 1900;
+		x = 0.217398 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_humanity_art';";		
+	};
+	class click_for_next_page: horde_RscButton
+	{
+		idc = 1901;
+		x = 0.5 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.282602 * safezoneW;
+		h = 0.665029 * safezoneH;
+		// soundPush[] = {"sounds\page",0.7,1};
+		action = "playSound 'horde_sound_turning_page'; closeDialog 0; createDialog 'horde_journal_pages_headshots';";
+	};
+	class click_here_to_close_book_1: horde_RscButton
+	{
+		idc = 1902;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = -0.00752226 * safezoneH + safezoneY;
+		w = 1.03925 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_2: horde_RscButton
+	{
+		idc = 1903;
+		x = 0.791719 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_3: horde_RscButton
+	{
+		idc = 1904;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.832515 * safezoneH + safezoneY;
+		w = 1.0119 * safezoneW;
+		h = 0.175008 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+	class click_here_to_close_book_4: horde_RscButton
+	{
+		idc = 1905;
+		x = -0.00139144 * safezoneW + safezoneX;
+		y = 0.167485 * safezoneH + safezoneY;
+		w = 0.209673 * safezoneW;
+		h = 0.68253 * safezoneH;
+		// soundPush[] = {"sounds\close",1,1};
+		action = "playSound 'horde_sound_close_book'; closeDialog 0;";
+	};
+};
--- a/SQF/dayz_code/Configs/CfgPlayerStats/sound.hpp
+++ b/SQF/dayz_code/Configs/CfgPlayerStats/sound.hpp
@@ -0,0 +1,22 @@
+/********************************************************************************************************************/
+// Config file for [DayZ]
+// Created by: [Horde/Das Attorney]
+//********************************************************************************************************************/
+
+
+class CfgSounds
+{	
+	class Vas_yessir;	
+	class horde_sound_turning_page: Vas_yessir
+	{
+		name = "horde_sound_turning_page";
+		sound[] = {"\z\addons\dayz_communityassets\sounds\page.wss", 0.5, 1};
+		titles[] = {};
+	};
+	class horde_sound_close_book: Vas_yessir
+	{
+		name = "horde_sound_close_book";
+		sound[] = {"\z\addons\dayz_communityassets\sounds\close.wss", 1, 1};
+		titles[] = {};
+	};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp
@@ -1,4 +1,49 @@
 class AH6_Base_EP1;
+class AH6J_EP1_DZ: AH6_Base_EP1
+{
+	scope = 2;
+	side = 2;
+	displayName = "AH6J_DZ";
+	crew = "";
+	typicalCargo[] = {};
+	weapons[] = {"TwinM134","CMFlareLauncher"};
+	magazines[] = {"4000Rnd_762x51_M134","60Rnd_CMFlareMagazine"};
+	threat[] = {0.6,0.4,0.1};
+	gunBeg[] = {"muzzle_1","muzzle_2"};
+	gunEnd[] = {"chamber_1","chamber_2"};
+	radarType = 0;
+	class TransportMagazines {};
+	class TransportWeapons {};
+	class Turrets {};
+	class AnimationSources
+	{
+		class Gatling_1
+		{
+			source = "revolving";
+			weapon = "TwinM134";
+		};
+		class Gatling_2
+		{
+			source = "revolving";
+			weapon = "TwinM134";
+		};
+	};
+	hiddenSelections[] = {"camo1","camo2"};
+	hiddenSelectionsTextures[] = {"ca\air_e\ah6j\data\ah6_merge1_co.paa","ca\air_e\ah6j\data\default_co.paa"};
+	commanderCanSee = 2+16+32;
+	gunnerCanSee = 2+16+32;
+	driverCanSee = 2+16+32;
+	transportMaxWeapons = 3;
+	transportMaxMagazines = 10;
+	transportmaxbackpacks = 2;
+};
+class AH6J_EP1_DZE: AH6J_EP1_DZ
+{
+	scope = 2;
+	side = 2;
+	displayName = "AH6J_DZE";
+	magazines[] = {"60Rnd_CMFlareMagazine"};
+};
 class AH6X_DZ: AH6_Base_EP1 {
 	displayname = "AH6X Little Bird";
 	displaynameshort = "AH6X_DZ";
@@ -25,6 +70,7 @@ class AH6X_DZ: AH6_Base_EP1 {
 	transportMaxWeapons = 3;
 	transportMaxMagazines = 10;
 	transportmaxbackpacks = 2;
+	fuelCapacity = 242;
 	class Turrets {};
 };
 class MH6J_DZ: AH6_Base_EP1 {
@@ -53,4 +99,4 @@ class MH6J_DZ: AH6_Base_EP1 {
 	transportMaxMagazines = 20;
 	transportmaxbackpacks = 5;
 	class Turrets {};
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/AN2.hpp
@@ -20,4 +20,5 @@ class AN2_DZ: An2_Base_EP1
 	transportMaxWeapons = 10;
 	transportMaxMagazines = 80;
 	transportmaxbackpacks = 15;
-};
+	fuelCapacity = 757;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/BAF_Merlin.hpp
@@ -9,4 +9,5 @@ class BAF_Merlin_DZE : BAF_Merlin_HC3_D {
 	transportMaxWeapons = 15;
 	transportMaxMagazines = 150;
 	transportmaxbackpacks = 5;
-};
+	fuelCapacity = 3222;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/C130.hpp
@@ -0,0 +1,7 @@
+class C130J_US_EP1;
+class C130J_US_EP1_DZ: C130J_US_EP1 {
+	transportMaxWeapons = 50;
+	transportMaxMagazines = 400;
+	transportmaxbackpacks = 20;
+	fuelCapacity = 34095;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH47.hpp
@@ -117,6 +117,7 @@ class CH47_base_EP1: Helicopter
 	irScanRangeMin = 100;
 	irScanRangeMax = 1000;
 	irScanToEyeFactor = 2;
+	fuelCapacity = 4043;
 };

 class CH_47F_EP1;
@@ -278,4 +279,4 @@ class CH_47F_EP1_DZE: CH47_base_EP1
 			weapon = "M134_2";
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
@@ -0,0 +1,31 @@
+class USEC_ch53_E;
+class CH53_DZE : USEC_ch53_E {
+	scope = 2;
+	side = 2;
+	displayname = "USEC CH53E DZE";
+	displaynameshort = "CH53_DZE";
+	destrType = "DestructWreck";
+	enablemanualfire = 0;
+	crew = "";
+	soundGetIn[] = {"\ca\Sounds\Air\Noises\heli_door_01",0.316228,1};
+	soundGetOut[] = {"\ca\Sounds\Air\Noises\heli_door_01",0.316228,1,30};
+	soundEnviron[] = {"",0.0316228,1};
+	soundEngineOnInt[] = {"ca\sounds\Air\UH1Y\int\int-start-final",0.1,1};
+	soundEngineOnExt[] = {"ca\sounds\Air\UH1Y\ext\ext-motor-start",1,1,800};
+	soundEngineOffInt[] = {"ca\sounds\Air\UH1Y\int\int-stop-final",0.1,1};
+	soundEngineOffExt[] = {"ca\sounds\Air\UH1Y\ext\ext-motor-stop",1,1,800};
+	soundGear[] = {"\usec_ch53\sound\ch53_gear", db10, 1, 100};
+	soundDammage[] = {"\usec_ch53\sound\dws_warning_beeps", 3.16228, 1, 20};
+	typicalCargo[] = {};
+	hiddenSelections[] = {};
+	radartype = 0;
+	class TransportMagazines{};
+	class TransportWeapons{};
+	commanderCanSee = 2+16+32;
+	gunnerCanSee = 2+16+32;
+	driverCanSee = 2+16+32;
+	transportMaxWeapons = 25;
+	transportMaxMagazines = 80;
+	transportmaxbackpacks = 15;
+	fuelCapacity = 3849;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/MV22.hpp
@@ -11,4 +11,5 @@ class MV22_DZ : MV22 {
 	transportMaxWeapons = 20;
 	transportMaxMagazines = 400;
 	transportmaxbackpacks = 10;
-};
+	fuelCapacity = 6513;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/Mi17.hpp
@@ -26,6 +26,7 @@ class Mi17_DZ: Mi17_base	 {
 	transportMaxWeapons = 10;
 	transportMaxMagazines = 50;
 	transportmaxbackpacks = 10;
+	fuelCapacity = 1870;

 	class Turrets : Turrets  {
 		class MainTurret : MainTurret  {
@@ -64,4 +65,4 @@ class Mi17_Civilian_DZ: Mi17_Civilian	 {
 	transportMaxWeapons = 10;
 	transportMaxMagazines = 50;
 	transportmaxbackpacks = 10;
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/UH1.hpp
@@ -28,6 +28,7 @@ class UH1Y_DZ: UH1_Base {
 	transportmaxbackpacks = 4;
 	weapons[] = {};
 	magazines[] = {};
+	fuelCapacity = 1333;
 	class Turrets : Turrets {
 		class MainTurret : MainTurret {
 			magazines[] = {"2000Rnd_762x51_M134"};
@@ -73,6 +74,7 @@ class UH1H_DZ: UH1H_base {
 	transportMaxWeapons = 5;
 	transportMaxMagazines = 25;
 	transportmaxbackpacks = 4;
+	fuelCapacity = 1333;
 	class Turrets : Turrets {
 		class MainTurret : MainTurret {
 			magazines[] = {"100Rnd_762x51_M240"};
@@ -91,4 +93,4 @@ class UH1H_DZE: UH1H_DZ {
 			magazines[] = {};
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/UH60.hpp
@@ -11,6 +11,7 @@ class UH60_Base: Helicopter {
 	magazines[] = {"60Rnd_CMFlareMagazine"};
 	lockDetectionSystem = "8 + 4";
 	incommingMisslieDetectionSystem = 0;
+	fuelCapacity = 2760;
 };
 class MH60S_DZ : UH60_Base {
 	crew = "";
@@ -247,14 +248,13 @@ class UH60M_base_EP1: UH60_Base {
 	icon = "\ca\air_e\data\UI\Icon_uh60m_CA.paa";
 	mapSize = 17;
 	class Library {
-		libTextDesc = "The Blackhawk is the US Army<6D>s front-line utility helicopter used for transport roles, medical evacuation and even air support.<br />It is capable of carrying 11 combat-equipped soldiers. Easy to maintain in the field, the Blackhawk performs well in a variety of roles including air assault and medical evacuation.";
+		libTextDesc = "The Blackhawk is the US Army<6D>s front-line utility helicopter used for transport roles, medical evacuation and even air support.<br />It is capable of carrying 11 combat-equipped soldiers. Easy to maintain in the field, the Blackhawk performs well in a variety of roles including air assault and medical evacuation.";
 	};
 	crew = "US_Soldier_Pilot_EP1";
 	typicalCargo[] = {"US_Soldier_Pilot_EP1","US_Soldier_Pilot_EP1"};
 	gunnerAction = "ManActTestDriver";
 	transportMaxBackpacks = 10;
 	transportSoldier = 13;
-	fuelCapacity = 600;
 	maxSpeed = 295;
 	mainRotorSpeed = 1.2;
 	backRotorSpeed = 6.1;
@@ -549,4 +549,4 @@ class UH60M_EP1_DZE: UH60M_US_base_EP1 {
 			weapon = "M134_2";
 		};
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/LockboxStorage.hpp
@@ -29,10 +29,5 @@ class LockboxStorage: Land_A_tent {
 class WeaponHolder_ItemLockbox: WeaponHolder {
 	scope = 2;
 	displayName = "Lockbox";
-	class transportmagazines {
-		class _xx_ItemLockbox {
-			magazine = "ItemLockbox";
-			count = 1;
-		};
-	};
+	seedItem = "ItemLockbox";
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/ModularBuilding.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/ModularBuilding.hpp
@@ -434,6 +434,7 @@ class WoodStairs_DZ: ModularItems {
 	displayName = "Wood Stairs";
 	vehicleClass = "Fortifications";
 	maintainBuilding[] = {{"PartWoodLumber",1}};
+	upgradeBuilding[] = {"WoodStairsRails_DZ",{{"PartWoodLumber",2}}};
 	GhostPreview = "WoodStairs_Preview_DZ";
 };
 class WoodLadder_DZ: ModularItems {
@@ -452,6 +453,21 @@ class WoodLadder_DZ: ModularItems {
 	ladders[] = {{"start1","end1"}};
 };

+class WoodStairsRails_DZ: ModularItems {
+	scope = 2;
+	destrType = "DestructBuilding";
+	cost = 100;
+	offset[] = {0,1.5,0};
+	model="\z\addons\dayz_epoch\models\wood_stairs_rail.p3d";
+	icon = "\ca\data\data\Unknown_object.paa";
+	mapSize = 2;
+	armor = 700;
+	displayName = "Wood Stairs Rail";
+	vehicleClass = "Fortifications";
+	maintainBuilding[] = {{"PartWoodLumber",1}};
+	GhostPreview = "WoodStairs_Preview_DZ";
+};
+
 class WoodStairsSans_DZ: ModularItems {
 	scope = 2;
 	destrType = "DestructBuilding";
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp
@@ -31,10 +31,5 @@ class VaultStorageLocked: Land_A_tent {
 class WeaponHolder_ItemVault: WeaponHolder {
 	scope = 2;
 	displayName = "Safe";
-	class transportmagazines {
-		class _xx_ItemVault {
-			magazine = "ItemVault";
-			count = 1;
-		};
-	};
+	seedItem = "ItemVault";
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp
@@ -33,6 +33,8 @@ class BTR90_HQ_DZ: BTR90_HQ {
 	typicalCargo[] = {};
 	class TransportMagazines{};

+	transportSoldier = 6;
+
 	transportMaxMagazines = 100; // Default: 100
 	transportMaxWeapons = 10; // Default: 10
 	//transportmaxbackpacks = ; // Default:
@@ -45,7 +47,7 @@ class BTR90_HQ_DZ: BTR90_HQ {
 class BTR90_DZE: BTR90_DZ {
 	displayName = "BTR-90 AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};
@@ -53,7 +55,7 @@ class BTR90_DZE: BTR90_DZ {
 class BTR90_HQ_DZE: BTR90_HQ_DZ {
 	displayName = "BTR-90 (HQ) AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Kamaz.hpp
@@ -24,5 +24,5 @@ class KamazRefuel_DZ: KamazRefuel {
 	class TransportMagazines{};
 	class TransportWeapons{};
 	transportFuel = 0;
-	fuelCapacity = 10000;
-};
+	fuelCapacity = 10400;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp
@@ -33,6 +33,8 @@ class LAV25_HQ_DZ: LAV25_HQ {
 	typicalCargo[] = {};
 	class TransportMagazines{};

+	transportSoldier = 6;
+
 	transportMaxMagazines = 100; // Default: 100
 	transportMaxWeapons = 10; // Default: 10
 	//transportmaxbackpacks = ; // Default:
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp
@@ -46,7 +46,7 @@ class M113_TK_EP1_DZ: M113_TK_EP1 {
 class M113_UN_EP1_DZE: M113_UN_EP1_DZ {
 	displayName = "M113 AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};
@@ -54,7 +54,7 @@ class M113_UN_EP1_DZE: M113_UN_EP1_DZ {
 class M113_TK_EP1_DZE: M113_TK_EP1_DZ {
 	displayName = "M113 AL";
 	class Turrets: Turrets {
-		class MainTurret : MainTurret {
+		class MainTurret: MainTurret {
 			magazines[] = {};
 		};
 	};
@@ -63,8 +63,8 @@ class M113_TK_EP1_DZE: M113_TK_EP1_DZ {
 // Unarmed
 class M113Ambul_UN_EP1;
 class M113Ambul_UN_EP1_DZ: M113Ambul_UN_EP1 {
-	scope = 2;
-	side = 2;
+	scope = public;
+	side = TGuerrila;
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
@@ -79,8 +79,8 @@ class M113Ambul_UN_EP1_DZ: M113Ambul_UN_EP1 {
 };
 class M113Ambul_TK_EP1;
 class M113Ambul_TK_EP1_DZ: M113Ambul_TK_EP1 {
-	scope = 2;
-	side = 2;
+	scope = public;
+	side = TGuerrila;
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Mtvr.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Mtvr.hpp
@@ -1,16 +1,26 @@
-class MtvrRefuel_DES_EP1;
-class MtvrRefuel_DES_EP1_DZ: MtvrRefuel_DES_EP1 {
+class MtvrRefuel;
+class MtvrRefuel_base : MtvrRefuel
+{
+	scope = 0;
+	side = 4;
+	expansion = 1;
+	crew = "Civilian";
+	typicalCargo[] = {};
+};
+
+class MtvrRefuel_DES_EP1_DZ : MtvrRefuel_base {
 	scope = 2;
 	side = 2;
 	crew = "";
+	displayName = "MTVR (Fuel)";
 	typicalCargo[] = {};
-	hiddenSelections[] = {};
+	hiddenSelectionsTextures[] = { "\CA\wheeled_E\MTVR\Data\MTVR_body_desert_co.paa", "\CA\wheeled_E\MTVR\Data\MTVR_body2_desert_co.paa", "\CA\wheeled_E\MTVR\Data\MTVR_interier_desert_co.paa", "\CA\wheeled_E\MTVR\Data\MTVR_Fuel_desert_CO.paa" };
 	class TransportMagazines{};
 	class TransportWeapons{};
 	transportFuel = 0;
 	fuelCapacity = 10000;
 };
-class MtvrRefuel;
+
 class MtvrRefuel_DZ: MtvrRefuel {
 	scope = 2;
 	side = 2;
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Offroad_DSHKM.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Offroad_DSHKM.hpp
@@ -333,25 +333,112 @@ class Offroad_DSHKM_Gue_DZE: Offroad_DSHKM_base
 			gunnerCompartments = "Compartment2";
 		};
 	};
+	class Upgrades
+	{
+		ItemORP[] = {"Offroad_DSHKM_Gue_DZE1",
+		{  },
+		{ 
+			{ "ItemORP",1 },
+			{ "PartEngine",2 } }};
+	};
 };

 // Performance 1
 class Offroad_DSHKM_Gue_DZE1: Offroad_DSHKM_Gue_DZE
 {
 	maxspeed = 170; // Offroad_DSHKM_base 150 | car 100
+	class Upgrades
+	{
+		ItemLRK[] = {"Offroad_DSHKM_Gue_DZE2",
+		{  },
+		{ 
+			{ "ItemLRK",1 },
+			{ "PartGeneric",2 },
+			{ "ItemTent",1 } }};
+	};
 };
 // Armmor 2
 class Offroad_DSHKM_Gue_DZE2: Offroad_DSHKM_Gue_DZE1
 {
 	armor = 50; // car 20
+	class HitPoints: HitPoints
+	{
+		class HitLFWheel: HitLFWheel
+		{
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel
+		{
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel
+		{
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel
+		{
+			armor = 0.3;
+		};
+		class HitFuel
+		{
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine
+		{
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1
+		{
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2
+		{
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3
+		{
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4
+		{
+			armor = 0.1;
+		};
+	};
+	class Upgrades
+	{
+		ItemLRK[] = {"Offroad_DSHKM_Gue_DZE3",
+		{  },
+		{ 
+			{ "ItemLRK",1 },
+			{ "PartGeneric",2 },
+			{ "ItemTent",1 } }};
+	};
+
 };
 // Cargo 3
 class Offroad_DSHKM_Gue_DZE3: Offroad_DSHKM_Gue_DZE2
 {
 	transportMaxWeapons = 20;  // car 10
 	transportMaxMagazines = 100; // car 50 
-    transportmaxbackpacks = 4; // car 2
+        transportmaxbackpacks = 4; // car 2
+        class Upgrades
+	{
+		ItemTNK[] = {"Offroad_DSHKM_Gue_DZE4",
+		{  },
+		{ 
+			{ "ItemTNK",1 },
+			{ "PartFueltank",2 } }};
+	};
 };
+
 // Fuel 4
 class Offroad_DSHKM_Gue_DZE4: Offroad_DSHKM_Gue_DZE3
 {
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Pickup_PK.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Pickup_PK.hpp
@@ -1,527 +1,328 @@
-class Pickup_PK_base: Car
-{
-	displayName = "Pickup (PK)";
-	scope = 0;
-	wheelCircumference = 2.199;
-	Picture = "\Ca\wheeled\data\ico\datsun_PK_CA.paa";
-	Icon = "\Ca\wheeled\data\map_ico\icomap_datsun_PK_CA.paa";
-	mapSize = 5;
-	maxSpeed = 150;
-	turnCoef = 2.5;
-	steerAheadPlan = 0.15;
-	terrainCoef = 4;
-	soundGear[] = {"",0.000562341,1};
-	SoundGetIn[] = {"\ca\sounds\vehicles\wheeled\offroad\ext\ext-offroad-getout-1",0.251189,1};
-	SoundGetOut[] = {"\ca\sounds\vehicles\wheeled\offroad\ext\ext-offroad-getout-1",0.251189,1,30};
-	soundEngineOnInt[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-start-1",0.316228,1};
-	soundEngineOnExt[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-start-1",0.316228,1,200};
-	soundEngineOffInt[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-stop-1",0.316228,1};
-	soundEngineOffExt[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-stop-1",0.316228,1,200};
-	buildCrash0[] = {"Ca\sounds\Vehicles\Crash\crash_building_01",0.707946,1,200};
-	buildCrash1[] = {"Ca\sounds\Vehicles\Crash\crash_building_02",0.707946,1,200};
-	buildCrash2[] = {"Ca\sounds\Vehicles\Crash\crash_building_03",0.707946,1,200};
-	buildCrash3[] = {"Ca\sounds\Vehicles\Crash\crash_building_04",0.707946,1,200};
-	soundBuildingCrash[] = {"buildCrash0",0.25,"buildCrash1",0.25,"buildCrash2",0.25,"buildCrash3",0.25};
-	WoodCrash0[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_01",0.707946,1,200};
-	WoodCrash1[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_02",0.707946,1,200};
-	WoodCrash2[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_03",0.707946,1,200};
-	WoodCrash3[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_04",0.707946,1,200};
-	WoodCrash4[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_05",0.707946,1,200};
-	WoodCrash5[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_06",0.707946,1,200};
-	soundWoodCrash[] = {"woodCrash0",0.166,"woodCrash1",0.166,"woodCrash2",0.166,"woodCrash3",0.166,"woodCrash4",0.166,"woodCrash5",0.166};
-	ArmorCrash0[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_01",0.707946,1,200};
-	ArmorCrash1[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_02",0.707946,1,200};
-	ArmorCrash2[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_03",0.707946,1,200};
-	ArmorCrash3[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_04",0.707946,1,200};
-	soundArmorCrash[] = {"ArmorCrash0",0.25,"ArmorCrash1",0.25,"ArmorCrash2",0.25,"ArmorCrash3",0.25};
-	class SoundEvents
-	{
-		class AccelerationIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-acce-1",0.316228,1};
-			limit = "0.7";
-			expression = "(engineOn*(1-camPos))*gmeterZ*(speed factor[2.5, 4])";
-		};
-		class AccelerationOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-acce-1",0.316228,1,250};
-			limit = "0.7";
-			expression = "(engineOn*camPos)*gmeterZ*(speed factor[2.5, 4])";
-		};
-	};
-	class Sounds
-	{
-		class Engine
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-low-1",0.398107,1,300};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "camPos*engineOn*((rpm factor[0.21, 0.5]) min (rpm factor[0.7, 0.3]))";
-		};
-		class EngineHighOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-high-2",0.398107,1,400};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "camPos*engineOn*(rpm factor[0.5, 0.85])";
-		};
-		class IdleOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-idle-5",0.223872,1,200};
-			frequency = "1";
-			volume = "camPos*engineOn*(rpm factor[0.4, 0])";
-		};
-		class TiresRockOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*rock*(speed factor[2, 20])";
-		};
-		class TiresSandOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*sand*(speed factor[2, 20])";
-		};
-		class TiresGrassOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*grass*(speed factor[2, 20])";
-		};
-		class TiresMudOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*mud*(speed factor[2, 20])";
-		};
-		class TiresGravelOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*gravel*(speed factor[2, 20])";
-		};
-		class TiresAsphaltOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*asphalt*(speed factor[2, 20])";
-		};
-		class NoiseOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\UAZ\ext\ext-noise",0.316228,1,30};
-			frequency = "1";
-			volume = "camPos*(damper0 max 0.02)*(speed factor[0, 8])";
-		};
-		class EngineLowIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-low-1",0.562341,1};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "(1-camPos)*engineOn*((rpm factor[0.2, 0.4]) min (rpm factor[0.7, 0.3]))";
-		};
-		class EngineHighIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-high-2",0.562341,1};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "(1-camPos)*engineOn*(rpm factor[0.56, 0.8])";
-		};
-		class IdleIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-idle-5",0.398107,1};
-			frequency = "1";
-			volume = "(1-camPos)*engineOn*(rpm factor[0.4, 0])";
-		};
-		class TiresRockIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2",0.316228,1};
-			frequency = "1";
-			volume = "(1-camPos)*rock*(speed factor[2, 20])";
-		};
-		class TiresSandIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2",0.316228,1};
-			frequency = "1";
-			volume = "(1-camPos)*sand*(speed factor[2, 20])";
-		};
-		class TiresGrassIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3",0.316228,1};
-			frequency = "1";
-			volume = "(1-camPos)*grass*(speed factor[2, 20])";
-		};
-		class TiresMudIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2",0.316228,1};
-			frequency = "1";
-			volume = "(1-camPos)*mud*(speed factor[2, 20])";
-		};
-		class TiresGravelIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2",0.316228,1};
-			frequency = "1";
-			volume = "(1-camPos)*gravel*(speed factor[2, 20])";
-		};
-		class TiresAsphaltIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3",0.316228,1};
-			frequency = "1";
-			volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
-		};
-		class NoiseIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-noise-1",0.316228,1};
-			frequency = "1";
-			volume = "(damper0 max 0.03)*(speed factor[0, 8])*(1-camPos)";
-		};
-		class Movement
-		{
-			sound = "soundEnviron";
-			frequency = "1";
-			volume = "0";
-		};
-	};
-	class TransportMagazines
-	{
-	};
-	transportSoldier = 3;
-	unitInfoType = "UnitInfoSoldier";
-	driverAction = "datsun_driver";
-	cargoAction[] = {"Hilux_cargo01","datsun_cargo02","MH6_Cargo03"};
-	driverCompartments = "Compartment1";
-	cargoCompartments[] = {"Compartment1"};
-	gunnerOpticsShowCursor = 1;
-	threat[] = {0.6,0.4,0.1};
-	class AnimationSources: AnimationSources
-	{
-		class ReloadAnim
-		{
-			source = "reload";
-			weapon = "PKT";
-		};
-		class ReloadMagazine
-		{
-			source = "reloadmagazine";
-			weapon = "PKT";
-		};
-		class Revolving
-		{
-			source = "revolving";
-			weapon = "PKT";
-		};
-	};
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
-			magazines[] = {"100Rnd_762x54_PK","100Rnd_762x54_PK","100Rnd_762x54_PK","100Rnd_762x54_PK","100Rnd_762x54_PK","100Rnd_762x54_PK"};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
-		};
-	};
-	class Library
-	{
-		libTextDesc = "A pickup truck which was very popular in the United States in the 1970s.";
-	};
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"Ca\wheeled_E\Datsun_Armed\Data\datsun_trup.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_trup_damage.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_trup_destruct.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_interier.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_interier_damage.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_interier_destruct.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_trup_b.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_trup_b_damage.rvmat","Ca\wheeled_E\Datsun_Armed\Data\datsun_trup_b_destruct.rvmat","Ca\wheeled_E\Data\auta_skla_in.rvmat","Ca\wheeled_E\Data\auta_skla_in_damage.rvmat","Ca\wheeled_E\Data\auta_skla_in_damage.rvmat","Ca\wheeled_E\Data\auta_skla.rvmat","Ca\wheeled_E\Data\auta_skla_damage.rvmat","Ca\wheeled_E\Data\auta_skla_damage.rvmat","Ca\Ca_E\data\default.rvmat","Ca\Ca_E\data\default.rvmat","Ca\Ca_E\data\default_destruct.rvmat"};
-	};
-	hiddenSelections[] = {"Camo"};
-	outsideSoundFilter = 1;
-	insideSoundCoef = 0.8;
-	brakeDistance = 13;
-	model = "ca\wheeled_E\Datsun_Armed\datsun_PK";
-};
-
-class Pickup_PK_TK_GUE_EP1_DZ: Pickup_PK_base
-{
-	htMin = 60;
-	htMax = 1800;
-	afMax = 200;
-	mfMax = 100;
-	mFact = 1;
-	tBody = 250;
-	expansion = 1;
-	scope = 2;
-	side = 2;
-	faction = "BIS_TK_GUE";
+class Pickup_PK_GUE;
+class Pickup_PK_GUE_DZ: Pickup_PK_GUE {
+	scope = public;
+	side = TGuerrila;
 	displayName = "Pickup (PK) DZ";
+
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelectionsTextures[] = {"\CA\wheeled_E\Datsun_Armed\Data\datsun_trup1_EINS_CO.paa"};
-	class EventHandlers: Eventhandlers
-	{
-		init = "(_this select 0) setObjectTexture [0,[""\CA\wheeled_E\Datsun_Armed\Data\datsun_trup1_EINS_CO"",""\CA\wheeled_E\Datsun_Armed\Data\datsun_trup2_EINS_CO"",""\CA\wheeled_E\Datsun_Armed\Data\datsun_trup3_EINS_CO""] select floor random 3]";
-	};
 	class TransportMagazines {};
 	class TransportWeapons {};
-	
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
-			magazines[] = {"100Rnd_762x54_PK"};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
-		};
-	};
-};

-class Pickup_PK_TK_GUE_EP1_DZE: Pickup_PK_base
-{
-	htMin = 60;
-	htMax = 1800;
-	afMax = 200;
-	mfMax = 100;
-	mFact = 1;
-	tBody = 250;
-	expansion = 1;
-	scope = 2;
-	side = 2;
-	faction = "BIS_TK_GUE";
-	displayName = "Pickup (PK) AL";
+	terrainCoef = 2.5;
+
+	class Turrets; // External class reference
+	class MainTurret; // External class reference
+};
+class Pickup_PK_TK_GUE_EP1;
+class Pickup_PK_TK_GUE_EP1_DZ: Pickup_PK_TK_GUE_EP1 {
+	scope = public;
+	side = TGuerrila;
+	displayName = "Pickup (PK) DZ";
+
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelectionsTextures[] = {"\CA\wheeled_E\Datsun_Armed\Data\datsun_trup1_EINS_CO.paa"};
-	class EventHandlers: Eventhandlers
-	{
-		init = "(_this select 0) setObjectTexture [0,[""\CA\wheeled_E\Datsun_Armed\Data\datsun_trup1_EINS_CO"",""\CA\wheeled_E\Datsun_Armed\Data\datsun_trup2_EINS_CO"",""\CA\wheeled_E\Datsun_Armed\Data\datsun_trup3_EINS_CO""] select floor random 3]";
-	};
 	class TransportMagazines {};
 	class TransportWeapons {};
-	
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
-			magazines[] = {};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
-		};
-	};
-};

-class Pickup_PK_GUE_DZ: Pickup_PK_base
-{
-	scope = 2;
-	side = 2;
-	faction = "GUE";
+	terrainCoef = 2.5;
+
+	class Turrets; // External class reference
+	class MainTurret; // External class reference
+};
+class Pickup_PK_INS;
+class Pickup_PK_INS_DZ: Pickup_PK_INS {
+	scope = public;
+	side = TGuerrila;
 	displayName = "Pickup (PK) DZ";
+
 	crew = "";
 	typicalCargo[] = {};
-	hiddenSelectionsTextures[] = {"\ca\wheeled\datsun_armed\data\datsun_trup2_CO.paa"};
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed_destruct.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk_destruct.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\wheeled\hilux_armed\data\detailmapy\tripod_dshk_destruct.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm_destruct.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trupb_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
-			magazines[] = {"100Rnd_762x54_PK"};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
-		};
-	};
+	class TransportMagazines {};
+	class TransportWeapons {};
+
+	terrainCoef = 2.5;
+
+	class Turrets; // External class reference
+	class MainTurret; // External class reference
 };

-class Pickup_PK_GUE_DZE: Pickup_PK_base
-{
-	scope = 2;
-	side = 2;
-	faction = "GUE";
+// Ammo Less
+class Pickup_PK_GUE_DZE: Pickup_PK_GUE_DZ {
 	displayName = "Pickup (PK) AL";
-	crew = "";
-	typicalCargo[] = {};
-	hiddenSelectionsTextures[] = {"\ca\wheeled\datsun_armed\data\datsun_trup2_CO.paa"};
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed_destruct.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk_destruct.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\wheeled\hilux_armed\data\detailmapy\tripod_dshk_destruct.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm_destruct.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trupb_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
+	class Turrets: Turrets {
+		class MainTurret : MainTurret {
 			magazines[] = {};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
 		};
 	};
-};
+	class HitPoints; // External class reference
+	class HitLFWheel; // External class reference
+	class HitLBWheel; // External class reference
+	class HitRFWheel; // External class reference
+	class HitRBWheel; // External class reference
+	class HitFuel; // External class reference
+	class HitEngine; // External class reference
+	class HitGlass1; // External class reference
+	class HitGlass2; // External class reference
+	class HitGlass3; // External class reference
+	class HitGlass4; // External class reference

-class Pickup_PK_INS_DZ: Pickup_PK_base
-{
-	scope = 2;
-	side = 2;
-	faction = "INS";
-	displayName = "Pickup (PK) DZ";
-	crew = "";
-	typicalCargo[] = {};
-	hiddenSelectionsTextures[] = {"\ca\wheeled\datsun_armed\data\datsun_trup3_CO.paa"};
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed_destruct.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk_destruct.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\wheeled\hilux_armed\data\detailmapy\tripod_dshk_destruct.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm_destruct.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trupb_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
-			magazines[] = {"100Rnd_762x54_PK"};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
-		};
+	class Upgrades {
+		ItemORP[] = {"Pickup_PK_GUE_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
 	};
 };
-
-class Pickup_PK_INS_DZE: Pickup_PK_base
-{
-	scope = 2;
-	side = 2;
-	faction = "INS";
+class Pickup_PK_TK_GUE_EP1_DZE: Pickup_PK_TK_GUE_EP1_DZ {
 	displayName = "Pickup (PK) AL";
-	crew = "";
-	typicalCargo[] = {};
-	hiddenSelectionsTextures[] = {"\ca\wheeled\datsun_armed\data\datsun_trup3_CO.paa"};
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed.rvmat","ca\wheeled\hilux_armed\data\detailmapy\coyota_armed_destruct.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk.rvmat","ca\weapons\data\dshk_destruct.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\weapons\data\tripod_dshk.rvmat","ca\wheeled\hilux_armed\data\detailmapy\tripod_dshk_destruct.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm.rvmat","ca\weapons\data\pkm_destruct.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier.rvmat","ca\wheeled\data\detailmapy\datsun_interier_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_destruct.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trup_b.rvmat","ca\wheeled\datsun_armed\data\detailmapy\datsun_trupb_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	class Turrets: Turrets
-	{
-		class MainTurret: MainTurret
-		{
-			body = "mainTurret";
-			gun = "mainGun";
-			outGunnerMayFire = 1;
-			forceHideGunner = 1;
-			castGunnerShadow = 1;
-			viewGunnerInExternal = 1;
-			gunnerOpticsModel = "\ca\Weapons\optika_empty";
-			gunnerForceOptics = 0;
-			weapons[] = {"PKT"};
-			soundServo[] = {};
-			stabilizedInAxes = 0;
+	class Turrets: Turrets {
+		class MainTurret : MainTurret {
 			magazines[] = {};
-			gunnerAction = "datsun_Gunner01";
-			gunnerInAction = "datsun_Gunner01";
-			ejectDeadGunner = 1;
-			minElev = -18;
-			maxElev = 40;
-			minTurn = -45;
-			maxTurn = 45;
-			initTurn = 0;
-			gunnerCompartments = "Compartment2";
 		};
 	};
+	class HitPoints; // External class reference
+	class HitLFWheel; // External class reference
+	class HitLBWheel; // External class reference
+	class HitRFWheel; // External class reference
+	class HitRBWheel; // External class reference
+	class HitFuel; // External class reference
+	class HitEngine; // External class reference
+	class HitGlass1; // External class reference
+	class HitGlass2; // External class reference
+	class HitGlass3; // External class reference
+	class HitGlass4; // External class reference
+
+	class Upgrades {
+		ItemORP[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
+};
+class Pickup_PK_INS_DZE: Pickup_PK_INS_DZ {
+	displayName = "Pickup (PK) AL";
+	class Turrets: Turrets {
+		class MainTurret : MainTurret {
+			magazines[] = {};
+		};
+	};
+	class HitPoints; // External class reference
+	class HitLFWheel; // External class reference
+	class HitLBWheel; // External class reference
+	class HitRFWheel; // External class reference
+	class HitRBWheel; // External class reference
+	class HitFuel; // External class reference
+	class HitEngine; // External class reference
+	class HitGlass1; // External class reference
+	class HitGlass2; // External class reference
+	class HitGlass3; // External class reference
+	class HitGlass4; // External class reference
+
+	class Upgrades {
+		ItemORP[] = {"Pickup_PK_INS_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
+};
+
+// Performance 1
+class Pickup_PK_GUE_DZE1: Pickup_PK_GUE_DZE {
+	maxspeed = 150; // max engine limit 125-130
+	terrainCoef = 1.8;
+
+	class Upgrades {
+		ItemAVE[] = {"Pickup_PK_GUE_DZE1",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+class Pickup_PK_TK_GUE_EP1_DZE1: Pickup_PK_TK_GUE_EP1_DZE {
+	maxspeed = 150; // max engine limit 125-130
+	terrainCoef = 1.8;
+
+	class Upgrades {
+		ItemAVE[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+class Pickup_PK_INS_DZE1: Pickup_PK_INS_DZE {
+	maxspeed = 150; // max engine limit 125-130
+	terrainCoef = 1.8;
+
+	class Upgrades {
+		ItemAVE[] = {"Pickup_PK_INS_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+
+// Armor 2
+class Pickup_PK_GUE_DZE2: Pickup_PK_GUE_DZE1 {
+	armor = 50; // car 20
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"Pickup_PK_GUE_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}};
+	};
+};
+class Pickup_PK_TK_GUE_EP1_DZE2: Pickup_PK_TK_GUE_EP1_DZE1 {
+	armor = 50; // car 20
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}};
+	};
+};
+class Pickup_PK_INS_DZE2: Pickup_PK_INS_DZE1 {
+	armor = 50; // car 20
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"Pickup_PK_INS_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}};
+	};
+};
+
+// Cargo 3
+class Pickup_PK_GUE_DZE3: Pickup_PK_GUE_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"Pickup_PK_GUE_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+class Pickup_PK_TK_GUE_EP1_DZE3: Pickup_PK_TK_GUE_EP1_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+class Pickup_PK_INS_DZE3: Pickup_PK_INS_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"Pickup_PK_INS_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+
+// Fuel 4
+class Pickup_PK_GUE_DZE4: Pickup_PK_GUE_DZE3 {
+	fuelCapacity = 210; // car 100
+};
+class Pickup_PK_TK_GUE_EP1_DZE4: Pickup_PK_TK_GUE_EP1_DZE3 {
+	fuelCapacity = 210; // car 100
+};
+class Pickup_PK_INS_DZE4: Pickup_PK_INS_DZE3 {
+	fuelCapacity = 210; // car 100
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/SUV.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/SUV.hpp
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Skoda.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Skoda.hpp
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/UAZ.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/UAZ.hpp
@@ -1,33 +1,27 @@
-class UAZ_Unarmed_Base : UAZ_Base
-  {
-    class HitPoints : HitPoints
-    {
-      class HitGlass1
-      {
+class UAZ_Unarmed_Base : UAZ_Base {
+    class HitPoints : HitPoints {
+      class HitGlass1 {
        armor = 0.05;
        material = -1;
        name = "glass1";
        visual = "glass1";
        passThrough = 0;
      };
-      class HitGlass2
-      {
+      class HitGlass2 {
        armor = 0.05;
        material = -1;
        name = "glass2";
        visual = "glass2";
        passThrough = 0;
      };
-      class HitGlass3
-      {
+      class HitGlass3 {
        armor = 0.05;
        material = -1;
        name = "glass3";
        visual = "glass3";
        passThrough = 0;
      };
-      class HitGlass4
-      {
+      class HitGlass4 {
        armor = 0.05;
        material = -1;
        name = "glass4";
@@ -58,11 +52,9 @@ class UAZ_Unarmed_Base : UAZ_Base
      0,
      0
    };
-    class Turrets
-    {
+    class Turrets {
    };
-    class Damage
-    {
+    class Damage {
      tex[] = {
      };
      mat[] = {
@@ -88,8 +80,7 @@ class UAZ_Unarmed_Base : UAZ_Base
    };
  };

-class UAZ_CDF: UAZ_Unarmed_Base
-{
+class UAZ_CDF: UAZ_Unarmed_Base {
 	scope = 2;
 	side = 1;
 	faction = "CDF";
@@ -97,10 +88,12 @@ class UAZ_CDF: UAZ_Unarmed_Base
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelectionsTextures[] = {"\ca\wheeled\data\Uaz_main_002_CO.paa"};
-	upgradeVehicle[] = {"UAZ_CDF_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"UAZ_CDF_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class UAZ_INS: UAZ_Unarmed_Base
-{
+class UAZ_INS: UAZ_Unarmed_Base {
 	scope = 2;
 	side = 0;
 	faction = "INS";
@@ -108,20 +101,24 @@ class UAZ_INS: UAZ_Unarmed_Base
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelectionsTextures[] = {"\ca\wheeled\data\Uaz_main_001_CO.paa"};
-	upgradeVehicle[] = {"UAZ_INS_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"UAZ_INS_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class UAZ_RU: UAZ_Unarmed_Base
-{
+class UAZ_RU: UAZ_Unarmed_Base {
 	scope = 2;
 	side = 0;
 	faction = "RU";
 	crew = "";
 	typicalCargo[] = {};
 	hiddenSelectionsTextures[] = {"\ca\wheeled\data\Uaz_main_CO.paa"};
-	upgradeVehicle[] = {"UAZ_RU_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"UAZ_RU_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class UAZ_Unarmed_TK_EP1: UAZ_Unarmed_Base
-{
+class UAZ_Unarmed_TK_EP1: UAZ_Unarmed_Base {
 	expansion = 1;
 	scope = 2;
 	side = 0;
@@ -132,10 +129,12 @@ class UAZ_Unarmed_TK_EP1: UAZ_Unarmed_Base
 	hiddenSelectionsTextures[] = {"\CA\wheeled_E\UAZ\Data\Uaz_main_IND_CO.paa"};
 	class TransportMagazines {};
 	class TransportWeapons {};
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"UAZ_Unarmed_TK_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class UAZ_Unarmed_UN_EP1: UAZ_Unarmed_Base
-{
+class UAZ_Unarmed_UN_EP1: UAZ_Unarmed_Base {
 	expansion = 1;
 	scope = 2;
 	side = 2;
@@ -146,10 +145,12 @@ class UAZ_Unarmed_UN_EP1: UAZ_Unarmed_Base
 	hiddenSelectionsTextures[] = {"\CA\wheeled_E\UAZ\Data\Uaz_main_UN_CO.paa"};
 	class TransportMagazines {};
 	class TransportWeapons {};
-	upgradeVehicle[] = {"UAZ_Unarmed_UN_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"UAZ_Unarmed_UN_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class UAZ_Unarmed_TK_CIV_EP1: UAZ_Unarmed_Base
-{
+class UAZ_Unarmed_TK_CIV_EP1: UAZ_Unarmed_Base {
 	expansion = 1;
 	scope = 2;
 	side = 3;
@@ -160,464 +161,424 @@ class UAZ_Unarmed_TK_CIV_EP1: UAZ_Unarmed_Base
 	hiddenSelectionsTextures[] = {"\CA\wheeled_E\UAZ\Data\Uaz_main_CIVIL_CO.paa"};
 	class TransportMagazines {};
 	class TransportWeapons {};
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
-};

+	class Upgrades {
+		ItemORP[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
+};

 // Performance 1
-class UAZ_CDF_DZE1: UAZ_CDF
-{
+class UAZ_CDF_DZE1: UAZ_CDF {
 	maxspeed = 150; // max engine limit 125-130
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"UAZ_CDF_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
-};
-class UAZ_INS_DZE1: UAZ_INS
-{
-	maxspeed = 150; // car 100
-	terrainCoef = 2.5;
-	upgradeVehicle[] = {"UAZ_INS_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
-};
-class UAZ_RU_DZE1: UAZ_RU
-{
-	maxspeed = 150; // car 100
-	terrainCoef = 2.5;
-	upgradeVehicle[] = {"UAZ_RU_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
-};

-class UAZ_Unarmed_TK_EP1_DZE1: UAZ_Unarmed_TK_EP1
-{
+	class Upgrades {
+		ItemAVE[] = {"UAZ_CDF_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+class UAZ_INS_DZE1: UAZ_INS {
+	maxspeed = 150; // car 100
+	terrainCoef = 2.5;
+
+	class Upgrades {
+		ItemAVE[] = {"UAZ_INS_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+class UAZ_RU_DZE1: UAZ_RU {
+	maxspeed = 150; // car 100
+	terrainCoef = 2.5;
+
+	class Upgrades {
+		ItemAVE[] = {"UAZ_RU_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
+};
+class UAZ_Unarmed_TK_EP1_DZE1: UAZ_Unarmed_TK_EP1 {
 	maxspeed = 150; // max engine limit 125-130
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"UAZ_Unarmed_TK_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };
-class UAZ_Unarmed_UN_EP1_DZE1: UAZ_Unarmed_UN_EP1
-{
+class UAZ_Unarmed_UN_EP1_DZE1: UAZ_Unarmed_UN_EP1 {
 	maxspeed = 150; // car 100
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"UAZ_Unarmed_UN_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"UAZ_Unarmed_UN_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };
-class UAZ_Unarmed_TK_CIV_EP1_DZE1: UAZ_Unarmed_TK_CIV_EP1
-{
+class UAZ_Unarmed_TK_CIV_EP1_DZE1: UAZ_Unarmed_TK_CIV_EP1 {
 	maxspeed = 150; // car 100
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };

-
-
-
-
 // Armor 2
-class UAZ_CDF_DZE2: UAZ_CDF_DZE1
-{
-	armor = 50; // car 20
-	upgradeVehicle[] = {"UAZ_CDF_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
-};
-class UAZ_INS_DZE2: UAZ_INS_DZE1
-{
-	armor = 50; // car 20
-	upgradeVehicle[] = {"UAZ_INS_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
-			armor = 0.3;
-		};
-		class HitLBWheel: HitLBWheel
-		{
-			armor = 0.3;
-		};
-		class HitRFWheel: HitRFWheel
-		{
-			armor = 0.3;
-		};
-		class HitRBWheel: HitRBWheel
-		{
-			armor = 0.3;
-		};
-		class HitFuel
-		{
-			armor = 0.28;
-			material = -1;
-			name = "palivo";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitEngine
-		{
-			armor = 1;
-			material = -1;
-			name = "motor";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitGlass1: HitGlass1
-		{
-			armor = 0.1;
-		};
-		class HitGlass2: HitGlass2
-		{
-			armor = 0.1;
-		};
-		class HitGlass3: HitGlass3
-		{
-			armor = 0.1;
-		};
-		class HitGlass4: HitGlass4
-		{
-			armor = 0.1;
-		};
-	};
-};
-class UAZ_RU_DZE2: UAZ_RU_DZE1
-{
-	armor = 50; // car 20
-	upgradeVehicle[] = {"UAZ_RU_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
-			armor = 0.3;
-		};
-		class HitLBWheel: HitLBWheel
-		{
-			armor = 0.3;
-		};
-		class HitRFWheel: HitRFWheel
-		{
-			armor = 0.3;
-		};
-		class HitRBWheel: HitRBWheel
-		{
-			armor = 0.3;
-		};
-		class HitFuel
-		{
-			armor = 0.28;
-			material = -1;
-			name = "palivo";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitEngine
-		{
-			armor = 1;
-			material = -1;
-			name = "motor";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitGlass1: HitGlass1
-		{
-			armor = 0.1;
-		};
-		class HitGlass2: HitGlass2
-		{
-			armor = 0.1;
-		};
-		class HitGlass3: HitGlass3
-		{
-			armor = 0.1;
-		};
-		class HitGlass4: HitGlass4
-		{
-			armor = 0.1;
-		};
-	};
-};

-class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1
-{
-	armor = 50; // car 20
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	class Upgrades {
+		ItemLRK[] = {"UAZ_CDF_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};
+class UAZ_INS_DZE2: UAZ_INS_DZE1 {
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
-};
-class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1
-{
-	armor = 50; // car 20
-	upgradeVehicle[] = {"UAZ_Unarmed_UN_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
-			armor = 0.3;
-		};
-		class HitLBWheel: HitLBWheel
-		{
-			armor = 0.3;
-		};
-		class HitRFWheel: HitRFWheel
-		{
-			armor = 0.3;
-		};
-		class HitRBWheel: HitRBWheel
-		{
-			armor = 0.3;
-		};
-		class HitFuel
-		{
-			armor = 0.28;
-			material = -1;
-			name = "palivo";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitEngine
-		{
-			armor = 1;
-			material = -1;
-			name = "motor";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitGlass1: HitGlass1
-		{
-			armor = 0.1;
-		};
-		class HitGlass2: HitGlass2
-		{
-			armor = 0.1;
-		};
-		class HitGlass3: HitGlass3
-		{
-			armor = 0.1;
-		};
-		class HitGlass4: HitGlass4
-		{
-			armor = 0.1;
-		};
-	};
-};
-class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1
-{
-	armor = 50; // car 20
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
-			armor = 0.3;
-		};
-		class HitLBWheel: HitLBWheel
-		{
-			armor = 0.3;
-		};
-		class HitRFWheel: HitRFWheel
-		{
-			armor = 0.3;
-		};
-		class HitRBWheel: HitRBWheel
-		{
-			armor = 0.3;
-		};
-		class HitFuel
-		{
-			armor = 0.28;
-			material = -1;
-			name = "palivo";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitEngine
-		{
-			armor = 1;
-			material = -1;
-			name = "motor";
-			visual = "";
-			passThrough = 1;
-		};
-		class HitGlass1: HitGlass1
-		{
-			armor = 0.1;
-		};
-		class HitGlass2: HitGlass2
-		{
-			armor = 0.1;
-		};
-		class HitGlass3: HitGlass3
-		{
-			armor = 0.1;
-		};
-		class HitGlass4: HitGlass4
-		{
-			armor = 0.1;
-		};
-	};
-};

+	class Upgrades {
+		ItemLRK[] = {"UAZ_INS_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};
+class UAZ_RU_DZE2: UAZ_RU_DZE1 {
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};

+	class Upgrades {
+		ItemLRK[] = {"UAZ_RU_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};
+class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"UAZ_Unarmed_TK_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};
+class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"UAZ_Unarmed_UN_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};
+class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1 {
+	armor = 100; // UAZ 40
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
+			armor = 0.3;
+		};
+		class HitLBWheel: HitLBWheel {
+			armor = 0.3;
+		};
+		class HitRFWheel: HitRFWheel {
+			armor = 0.3;
+		};
+		class HitRBWheel: HitRBWheel {
+			armor = 0.3;
+		};
+		class HitFuel {
+			armor = 0.28;
+			material = -1;
+			name = "palivo";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitEngine {
+			armor = 1;
+			material = -1;
+			name = "motor";
+			visual = "";
+			passThrough = 1;
+		};
+		class HitGlass1: HitGlass1 {
+			armor = 0.1;
+		};
+		class HitGlass2: HitGlass2 {
+			armor = 0.1;
+		};
+		class HitGlass3: HitGlass3 {
+			armor = 0.1;
+		};
+		class HitGlass4: HitGlass4 {
+			armor = 0.1;
+		};
+	};
+
+	class Upgrades {
+		ItemLRK[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
+};

 // Cargo 3
-class UAZ_CDF_DZE3: UAZ_CDF_DZE2
-{
+class UAZ_CDF_DZE3: UAZ_CDF_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"UAZ_CDF_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
-};
-class UAZ_INS_DZE3: UAZ_INS_DZE2
-{
-	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
-    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"UAZ_INS_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
-};
-class UAZ_RU_DZE3: UAZ_RU_DZE2
-{
-	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
-    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"UAZ_RU_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
-};

-class UAZ_Unarmed_TK_EP1_DZE3: UAZ_Unarmed_TK_EP1_DZE2
-{
-	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
-    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+	class Upgrades {
+		ItemTNK[] = {"UAZ_CDF_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
 };
-class UAZ_Unarmed_UN_EP1_DZE3: UAZ_Unarmed_UN_EP1_DZE2
-{
+class UAZ_INS_DZE3: UAZ_INS_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"UAZ_Unarmed_UN_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
-};
-class UAZ_Unarmed_TK_CIV_EP1_DZE3: UAZ_Unarmed_TK_CIV_EP1_DZE2
-{
-	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
-    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
-};

+	class Upgrades {
+		ItemTNK[] = {"UAZ_INS_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+class UAZ_RU_DZE3: UAZ_RU_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2

+	class Upgrades {
+		ItemTNK[] = {"UAZ_RU_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+class UAZ_Unarmed_TK_EP1_DZE3: UAZ_Unarmed_TK_EP1_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"UAZ_Unarmed_TK_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+class UAZ_Unarmed_UN_EP1_DZE3: UAZ_Unarmed_UN_EP1_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"UAZ_Unarmed_UN_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};
+class UAZ_Unarmed_TK_CIV_EP1_DZE3: UAZ_Unarmed_TK_CIV_EP1_DZE2 {
+	transportMaxWeapons = 20;  // car 10
+	transportMaxMagazines = 100; // car 50
+    transportmaxbackpacks = 4; // car 2
+
+	class Upgrades {
+		ItemTNK[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
+};

 // Fuel 4
-class UAZ_CDF_DZE4: UAZ_CDF_DZE3
-{
+class UAZ_CDF_DZE4: UAZ_CDF_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-class UAZ_INS_DZE4: UAZ_INS_DZE3
-{
+class UAZ_INS_DZE4: UAZ_INS_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-class UAZ_RU_DZE4: UAZ_RU_DZE3
-{
+class UAZ_RU_DZE4: UAZ_RU_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-
-class UAZ_Unarmed_TK_EP1_DZE4: UAZ_Unarmed_TK_EP1_DZE3
-{
+class UAZ_Unarmed_TK_EP1_DZE4: UAZ_Unarmed_TK_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-class UAZ_Unarmed_UN_EP1_DZE4: UAZ_Unarmed_UN_EP1_DZE3
-{
+class UAZ_Unarmed_UN_EP1_DZE4: UAZ_Unarmed_UN_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-class UAZ_Unarmed_TK_CIV_EP1_DZE4: UAZ_Unarmed_TK_CIV_EP1_DZE3
-{
+class UAZ_Unarmed_TK_CIV_EP1_DZE4: UAZ_Unarmed_TK_CIV_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/VWGolf.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/VWGolf.hpp
@@ -1,23 +1,17 @@
-class VWGolf : Car
-{
-	class HitPoints : HitPoints
-	{
-		class HitLFWheel : HitLFWheel
-		{
+class VWGolf : Car {
+	class HitPoints : HitPoints {
+		class HitLFWheel : HitLFWheel {
 		armor = 0.3;
 		name = "wheel_1_1_steering";
 		};
-		class HitLBWheel : HitLBWheel
-		{
+		class HitLBWheel : HitLBWheel {
 		armor = 0.3;
 		};
-		class HitRFWheel : HitRFWheel
-		{
+		class HitRFWheel : HitRFWheel {
 		armor = 0.3;
 		name = "wheel_2_1_steering";
 		};
-		class HitRBWheel : HitRBWheel
-		{
+		class HitRBWheel : HitRBWheel {
 		armor = 0.3;
 		};
 	};
@@ -27,8 +21,7 @@ class VWGolf : Car
 	icon = "\ca\wheeled2\data\UI\Icon_VWGolf_CA.paa";
 	picture = "\ca\wheeled2\data\UI\Picture_VWGolf_CA.paa";
 	displayname = "Hatchback";
-	class Library
-	{
+	class Library {
 		libTextDesc = "The Wolkie is a German-made small family car, sold in US as the Bunny.";
 	};
 	side = 3;
@@ -46,8 +39,7 @@ class VWGolf : Car
 	};
 	magazines[] = {
 	};
-	class Turrets
-	{
+	class Turrets {
 	};
 	armor = 20;
 	damageResistance = 0.01511;
@@ -232,10 +224,8 @@ class VWGolf : Car
 		"ArmorCrash3",
 		0.25
 	};
-	class SoundEvents
-	{
-		class AccelerationIn
-		{
+	class SoundEvents {
+		class AccelerationIn {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\int\int-golf-acce-1",
 			0.891251,
@@ -244,8 +234,7 @@ class VWGolf : Car
 		limit = "0.15";
 		expression = "engineOn*(1-camPos)*2*gmeterZ*((speed factor[1.5, 5]) min (speed factor[5, 1.5]))";
 		};
-		class AccelerationOut
-		{
+		class AccelerationOut {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\ext\ext-golf-acce-1",
 			0.562341,
@@ -256,10 +245,8 @@ class VWGolf : Car
 		expression = "engineOn*camPos*2*gmeterZ*((speed factor[1.5, 5]) min (speed factor[5, 1.5]))";
 		};
 	};
-	class Sounds
-	{
-		class Engine
-		{
+	class Sounds {
+		class Engine {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\ext\ext-golf-low-1",
 			0.398107,
@@ -269,8 +256,7 @@ class VWGolf : Car
 		frequency = "(randomizer*0.05+1.25)*rpm";
 		volume = "camPos*engineOn*((rpm factor[0.25, 0.4]) min (rpm factor[0.6, 0.45]))";
 		};
-		class EngineHighOut
-		{
+		class EngineHighOut {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\ext\ext-golf-high-1",
 			0.398107,
@@ -280,8 +266,7 @@ class VWGolf : Car
 		frequency = "(randomizer*0.05+1.1)*rpm";
 		volume = "camPos*engineOn*(rpm factor[0.5, 0.9])";
 		};
-		class IdleOut
-		{
+		class IdleOut {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\ext\ext-golf-idle-1",
 			0.316228,
@@ -291,8 +276,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "engineOn*camPos*(rpm factor[0.4, 0])";
 		};
-		class TiresRockOut
-		{
+		class TiresRockOut {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2",
 			0.0562341,
@@ -302,8 +286,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*rock*(speed factor[4, 20])";
 		};
-		class TiresSandOut
-		{
+		class TiresSandOut {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2",
 			0.0562341,
@@ -313,8 +296,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*sand*(speed factor[4, 20])";
 		};
-		class TiresGrassOut
-		{
+		class TiresGrassOut {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3",
 			0.0562341,
@@ -324,8 +306,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*grass*(speed factor[4, 20])";
 		};
-		class TiresMudOut
-		{
+		class TiresMudOut {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2",
 			0.0562341,
@@ -335,8 +316,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*mud*(speed factor[4, 20])";
 		};
-		class TiresGravelOut
-		{
+		class TiresGravelOut {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2",
 			0.0562341,
@@ -346,8 +326,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*gravel*(speed factor[4, 20])";
 		};
-		class TiresAsphaltOut
-		{
+		class TiresAsphaltOut {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3",
 			0.0562341,
@@ -357,8 +336,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*asphalt*(speed factor[4, 20])";
 		};
-		class NoiseOut
-		{
+		class NoiseOut {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\Noises\ext\noise2",
 			0.0562341,
@@ -368,8 +346,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "camPos*(damper0 max 0.036)*(speed factor[0, 8])";
 		};
-		class EngineLowIn
-		{
+		class EngineLowIn {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\int\int-golf-low-1",
 			0.707946,
@@ -378,8 +355,7 @@ class VWGolf : Car
 		frequency = "(randomizer*0.05+1.3)*rpm";
 		volume = "(1-camPos)*engineOn*((rpm factor[0.3, 0.5]) min (rpm factor[0.7, 0.52]))";
 		};
-		class EngineHighIn
-		{
+		class EngineHighIn {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\int\int-golf-high-1",
 			0.707946,
@@ -388,8 +364,7 @@ class VWGolf : Car
 		frequency = "(randomizer*0.05+1.2)*rpm";
 		volume = "(1-camPos)*engineOn*(rpm factor[0.6, 1.0])";
 		};
-		class IdleIn
-		{
+		class IdleIn {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\GOLF\int\int-golf-idle-1",
 			0.562341,
@@ -398,8 +373,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*engineOn*(rpm factor[0.4, 0])";
 		};
-		class TiresRockIn
-		{
+		class TiresRockIn {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2",
 			0.0707946,
@@ -408,8 +382,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*rock*(speed factor[2, 20])";
 		};
-		class TiresSandIn
-		{
+		class TiresSandIn {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2",
 			0.0707946,
@@ -418,8 +391,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*sand*(speed factor[2, 20])";
 		};
-		class TiresGrassIn
-		{
+		class TiresGrassIn {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3",
 			0.0707946,
@@ -428,8 +400,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*grass*(speed factor[2, 20])";
 		};
-		class TiresMudIn
-		{
+		class TiresMudIn {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2",
 			0.0707946,
@@ -438,8 +409,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*mud*(speed factor[2, 20])";
 		};
-		class TiresGravelIn
-		{
+		class TiresGravelIn {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2",
 			0.0707946,
@@ -448,8 +418,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*gravel*(speed factor[2, 20])";
 		};
-		class TiresAsphaltIn
-		{
+		class TiresAsphaltIn {
 		sound[] = {
 			"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3",
 			0.0562341,
@@ -458,8 +427,7 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
 		};
-		class NoiseIn
-		{
+		class NoiseIn {
 		sound[] = {
 			"ca\sounds\Vehicles\Wheeled\Noises\int\int-noise2",
 			0.1,
@@ -468,15 +436,13 @@ class VWGolf : Car
 		frequency = "1";
 		volume = "(damper0 max 0.03)*(speed factor[0, 8])*(1-camPos)";
 		};
-		class Movement
-		{
+		class Movement {
 		sound = "soundEnviron";
 		frequency = "1";
 		volume = "0";
 		};
 	};
-	class Damage
-	{
+	class Damage {
 		tex[] = {
 		};
 		mat[] = {
@@ -520,84 +486,83 @@ class VWGolf : Car
 	dammageFull[] = {
 	};
 	rarityUrban = 0.9;
-	upgradeVehicle[] = {"VWGolf_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"VWGolf_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };

 // Performance 1
-class VWGolf_DZE1: VWGolf
-{
+class VWGolf_DZE1: VWGolf {
 	maxspeed = 150; // max engine limit 125-130
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"VWGolf_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"VWGolf_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };
+
 // Armor 2
-class VWGolf_DZE2: VWGolf_DZE1
-{
+class VWGolf_DZE2: VWGolf_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"VWGolf_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"VWGolf_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
 };
+
 // Cargo 3
-class VWGolf_DZE3: VWGolf_DZE2
-{
+class VWGolf_DZE3: VWGolf_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"VWGolf_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"VWGolf_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
 };
+
 // Fuel 4
-class VWGolf_DZE4: VWGolf_DZE3
-{
+class VWGolf_DZE4: VWGolf_DZE3 {
 	fuelCapacity = 210; // car 100
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp
@@ -1,5 +1,4 @@
-class Volha_TK_CIV_Base_EP1: Car
-{
+class Volha_TK_CIV_Base_EP1: Car {
 	brakeDistance = 12;
 	htMin = 60;
 	htMax = 1800;
@@ -28,59 +27,47 @@ class Volha_TK_CIV_Base_EP1: Car
 	driverAction = "Volha_Driver_EP1";
 	cargoAction[] = {"Volha_Cargo_EP1","Volha_Cargo02_EP1","Volha_Cargo01_EP1"};
 	cargoIsCoDriver[] = {1,0};
-	class Damage
-	{
+	class Damage {
 		tex[] = {};
 		mat[] = {"Ca\wheeled_E\Volha\Data\Volha_ECIV.rvmat","Ca\wheeled_E\Volha\Data\Volha_ECIV_damage.rvmat","Ca\wheeled_E\Volha\Data\Volha_ECIV_destruct.rvmat","Ca\wheeled_E\Volha\Data\Volha_Glass_ECIV.rvmat","Ca\wheeled_E\Volha\Data\Volha_Glass_ECIV_damage.rvmat","Ca\wheeled_E\Volha\Data\Volha_Glass_ECIV_destruct.rvmat","Ca\wheeled_E\Volha\Data\Volha_Chrome_ECIV.rvmat","Ca\wheeled_E\Volha\Data\Volha_Chrome_ECIV_damage.rvmat","Ca\wheeled_E\Volha\Data\Volha_Chrome_ECIV_destruct.rvmat","Ca\Ca_E\data\default.rvmat","Ca\Ca_E\data\default.rvmat","Ca\Ca_E\data\default_destruct.rvmat"};
 	};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.15;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.15;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.15;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.15;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.14;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 0.5;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.05;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.05;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.05;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.05;
 		};
 	};
@@ -108,404 +95,371 @@ class Volha_TK_CIV_Base_EP1: Car
 	ArmorCrash2[] = {"Ca\sounds\Vehicles\Crash\tank_vehicle_03",0.707946,1,150};
 	ArmorCrash3[] = {"Ca\sounds\Vehicles\Crash\tank_vehicle_04",0.707946,1,150};
 	soundArmorCrash[] = {"ArmorCrash0",0.25,"ArmorCrash1",0.25,"ArmorCrash2",0.25,"ArmorCrash3",0.25};
-	class SoundEvents
-	{
-		class AccelerationIn
-		{
+	class SoundEvents {
+		class AccelerationIn {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_acceleration",0.562341,1};
 			limit = "0.15";
 			expression = "engineOn*(1-camPos)*2*gmeterZ*((speed factor[1.5, 5]) min (speed factor[5, 1.5]))";
 		};
-		class AccelerationOut
-		{
+		class AccelerationOut {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_acceleration",0.562341,1,300};
 			limit = "0.15";
 			expression = "engineOn*camPos*2*gmeterZ*((speed factor[1.5, 5]) min (speed factor[5, 1.5]))";
 		};
 	};
-	class Sounds
-	{
-		class Engine
-		{
+	class Sounds {
+		class Engine {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_low",1.41254,0.6,200};
 			frequency = "(randomizer*0.05+0.95)*rpm";
 			volume = "camPos*engineOn*((rpm factor[0.3, 0.4]) min (rpm factor[0.7, 0.5]))";
 		};
-		class EngineHighOut
-		{
+		class EngineHighOut {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_mid",1.41254,0.6,300};
 			frequency = "(randomizer*0.05+0.95)*rpm";
 			volume = "camPos*engineOn*(rpm factor[0.5, 0.8])";
 		};
-		class IdleOut
-		{
+		class IdleOut {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_idle",0.562341,1,100};
 			frequency = "1";
 			volume = "engineOn*camPos*(rpm factor[0.4, 0])";
 		};
-		class TiresRockOut
-		{
+		class TiresRockOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2",0.1,1,50};
 			frequency = "1";
 			volume = "camPos*rock*(speed factor[2, 20])";
 		};
-		class TiresSandOut
-		{
+		class TiresSandOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2",0.1,1,50};
 			frequency = "1";
 			volume = "camPos*sand*(speed factor[2, 20])";
 		};
-		class TiresGrassOut
-		{
+		class TiresGrassOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3",0.1,1,50};
 			frequency = "1";
 			volume = "camPos*grass*(speed factor[2, 20])";
 		};
-		class TiresMudOut
-		{
+		class TiresMudOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2",0.1,1,50};
 			frequency = "1";
 			volume = "camPos*mud*(speed factor[2, 20])";
 		};
-		class TiresGravelOut
-		{
+		class TiresGravelOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2",0.1,1,50};
 			frequency = "1";
 			volume = "camPos*gravel*(speed factor[2, 20])";
 		};
-		class TiresAsphaltOut
-		{
+		class TiresAsphaltOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3",0.1,1,50};
 			frequency = "1";
 			volume = "camPos*asphalt*(speed factor[2, 20])";
 		};
-		class NoiseOut
-		{
+		class NoiseOut {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Noises\ext\noise3",0.562341,1,50};
 			frequency = "1";
 			volume = "camPos*(damper0 max 0.04)*(speed factor[0, 8])";
 		};
-		class EngineLowIn
-		{
+		class EngineLowIn {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_low",1.41254,0.6};
 			frequency = "(randomizer*0.05+0.95)*rpm";
 			volume = "(1-camPos)*engineOn*((rpm factor[0.3, 0.4]) min (rpm factor[0.7, 0.5]))";
 		};
-		class EngineHighIn
-		{
+		class EngineHighIn {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_mid",1.41254,0.6};
 			frequency = "(randomizer*0.05+0.95)*rpm";
 			volume = "(1-camPos)*engineOn*(rpm factor[0.5, 0.8])";
 		};
-		class IdleIn
-		{
+		class IdleIn {
 			sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_idle",0.794328,1};
 			frequency = "1";
 			volume = "engineOn*(rpm factor[0.4, 0])*(1-camPos)";
 		};
-		class TiresRockIn
-		{
+		class TiresRockIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2",0.1,1};
 			frequency = "1";
 			volume = "(1-camPos)*rock*(speed factor[2, 20])";
 		};
-		class TiresSandIn
-		{
+		class TiresSandIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2",0.1,1};
 			frequency = "1";
 			volume = "(1-camPos)*sand*(speed factor[2, 20])";
 		};
-		class TiresGrassIn
-		{
+		class TiresGrassIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3",0.1,1};
 			frequency = "1";
 			volume = "(1-camPos)*grass*(speed factor[2, 20])";
 		};
-		class TiresMudIn
-		{
+		class TiresMudIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2",0.1,1};
 			frequency = "1";
 			volume = "(1-camPos)*mud*(speed factor[2, 20])";
 		};
-		class TiresGravelIn
-		{
+		class TiresGravelIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2",0.1,1};
 			frequency = "1";
 			volume = "(1-camPos)*gravel*(speed factor[2, 20])";
 		};
-		class TiresAsphaltIn
-		{
+		class TiresAsphaltIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3",0.1,1};
 			frequency = "1";
 			volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
 		};
-		class NoiseIn
-		{
+		class NoiseIn {
 			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Noises\int\noise4",0.316228,1};
 			frequency = "1";
 			volume = "(damper0 max 0.04)*(speed factor[0, 8])*(1-camPos)";
 		};
-		class Movement
-		{
+		class Movement {
 			sound = "soundEnviron";
 			frequency = "1";
 			volume = "0";
 		};
 	};
-	class Library
-	{
+	class Library {
 		libTextDesc = "The Vloha GAZ-24 is a Russia automobile produced since 1968 to 1977. It is still famous for fantastic roadworthiness and durability. Many of this cars have more that 1.000.000 km on their odometer while still functional.";
 	};
-	class Turrets
-	{
+	class Turrets {
 	};
 };
-class Volha_1_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
-{
+class Volha_1_TK_CIV_EP1: Volha_TK_CIV_Base_EP1 {
 	scope = 2;
 	accuracy = 1000;
 	displayname = "GAZ (blue)";
-	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"Volha_1_TK_CIV_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class Volha_2_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
-{
+class Volha_2_TK_CIV_EP1: Volha_TK_CIV_Base_EP1 {
 	scope = 2;
 	accuracy = 1000;
 	displayname = "GAZ (grey)";
 	hiddenSelections[] = {"Camo1"};
 	hiddenSelectionsTextures[] = {"ca\wheeled_E\Volha\Data\Volha_Gray_ECIV_CO"};
-	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"Volha_2_TK_CIV_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };
-class VolhaLimo_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
-{
+class VolhaLimo_TK_CIV_EP1: Volha_TK_CIV_Base_EP1 {
 	scope = 2;
 	accuracy = 1000;
 	displayname = "GAZ Limo";
 	hiddenSelections[] = {"Camo1"};
 	hiddenSelectionsTextures[] = {"ca\wheeled_E\Volha\Data\Volha_Black_ECIV_CO"};
-	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+
+	class Upgrades {
+		ItemORP[] = {"VolhaLimo_TK_CIV_EP1_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+	};
 };

 // Performance 1
-class VolhaLimo_TK_CIV_EP1_DZE1: VolhaLimo_TK_CIV_EP1
-{
+class VolhaLimo_TK_CIV_EP1_DZE1: VolhaLimo_TK_CIV_EP1 {
 	maxspeed = 150; // max engine limit 125-130
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"VolhaLimo_TK_CIV_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };
-class Volha_1_TK_CIV_EP1_DZE1: Volha_1_TK_CIV_EP1
-{
+class Volha_1_TK_CIV_EP1_DZE1: Volha_1_TK_CIV_EP1 {
 	maxspeed = 150; // car 100
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"Volha_1_TK_CIV_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };
-class Volha_2_TK_CIV_EP1_DZE1: Volha_2_TK_CIV_EP1
-{
+class Volha_2_TK_CIV_EP1_DZE1: Volha_2_TK_CIV_EP1 {
 	maxspeed = 150; // car 100
 	terrainCoef = 2.5;
-	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+
+	class Upgrades {
+		ItemAVE[] = {"Volha_2_TK_CIV_EP1_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+	};
 };
+
 // Armor 2
-class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1
-{
+class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"VolhaLimo_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
 };
-class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1
-{
+class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"Volha_1_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
 };
-class Volha_2_TK_CIV_EP1_DZE2: Volha_2_TK_CIV_EP1_DZE1
-{
+class Volha_2_TK_CIV_EP1_DZE2: Volha_2_TK_CIV_EP1_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	damageResistance = 0.02099;
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"Volha_2_TK_CIV_EP1_DZE3",{},{{"ItemLRK",1},{"PartGeneric",1},{"ItemTent",1}}};
+	};
 };
+
 // Cargo 3
-class VolhaLimo_TK_CIV_EP1_DZE3: VolhaLimo_TK_CIV_EP1_DZE2
-{
+class VolhaLimo_TK_CIV_EP1_DZE3: VolhaLimo_TK_CIV_EP1_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"VolhaLimo_TK_CIV_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
 };
-class Volha_1_TK_CIV_EP1_DZE3: Volha_1_TK_CIV_EP1_DZE2
-{
+class Volha_1_TK_CIV_EP1_DZE3: Volha_1_TK_CIV_EP1_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"Volha_1_TK_CIV_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
 };
-class Volha_2_TK_CIV_EP1_DZE3: Volha_2_TK_CIV_EP1_DZE2
-{
+class Volha_2_TK_CIV_EP1_DZE3: Volha_2_TK_CIV_EP1_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"Volha_2_TK_CIV_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+	};
 };
+
 // Fuel 4
-class VolhaLimo_TK_CIV_EP1_DZE4: VolhaLimo_TK_CIV_EP1_DZE3
-{
+class VolhaLimo_TK_CIV_EP1_DZE4: VolhaLimo_TK_CIV_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-class Volha_1_TK_CIV_EP1_DZE4: Volha_1_TK_CIV_EP1_DZE3
-{
+class Volha_1_TK_CIV_EP1_DZE4: Volha_1_TK_CIV_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
 };
-class Volha_2_TK_CIV_EP1_DZE4: Volha_2_TK_CIV_EP1_DZE3
-{
+class Volha_2_TK_CIV_EP1_DZE4: Volha_2_TK_CIV_EP1_DZE3 {
 	fuelCapacity = 210; // car 100
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/datsun.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/datsun.hpp
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/hilux.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/hilux.hpp
@@ -1,472 +1,296 @@
-class hilux1_civil_1_open: Car
-{
-	scope = 2;
-	faction = "CIV";
-	maxSpeed = 125;
-	side = 3;
-	model = "\ca\Wheeled\hilux1_civil_1_open";
-	picture = "\Ca\wheeled\data\ico\hilux1_civil_1_open_CA.paa";
-	Icon = "\Ca\wheeled\data\map_ico\icomap_hilux_CA.paa";
-	mapSize = 7;
-	typicalCargo[] = {};
-	crew = "";
-	displayName = "Off-road (tan)";
-	transportSoldier = 1;
-	driverAction = "Hilux_Driver";
+class hilux1_civil_1_open;
+class hilux1_civil_1_open_DZE: hilux1_civil_1_open {
 	terrainCoef = 2.5;
-	wheelCircumference = 2.532;
-	steerAheadPlan = 0.2;
-	cargoIsCoDriver[] = {1};
-	insideSoundCoef = 0.9;
-	soundGear[] = {"",0.000562341,1};
-	SoundGetIn[] = {"\ca\sounds\vehicles\wheeled\offroad\ext\ext-offroad-getout-1",0.562341,1};
-	SoundGetOut[] = {"\ca\sounds\vehicles\wheeled\offroad\ext\ext-offroad-getout-1",0.562341,1,30};
-	soundEngineOnInt[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-start-1",0.398107,1};
-	soundEngineOnExt[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-start-1",0.398107,1,250};
-	soundEngineOffInt[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-stop-1",0.398107,1};
-	soundEngineOffExt[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-stop-1",0.398107,1,250};
-	buildCrash0[] = {"Ca\sounds\Vehicles\Crash\crash_building_01",0.707946,1,200};
-	buildCrash1[] = {"Ca\sounds\Vehicles\Crash\crash_building_02",0.707946,1,200};
-	buildCrash2[] = {"Ca\sounds\Vehicles\Crash\crash_building_03",0.707946,1,200};
-	buildCrash3[] = {"Ca\sounds\Vehicles\Crash\crash_building_04",0.707946,1,200};
-	soundBuildingCrash[] = {"buildCrash0",0.25,"buildCrash1",0.25,"buildCrash2",0.25,"buildCrash3",0.25};
-	WoodCrash0[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_01",0.707946,1,200};
-	WoodCrash1[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_02",0.707946,1,200};
-	WoodCrash2[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_03",0.707946,1,200};
-	WoodCrash3[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_04",0.707946,1,200};
-	WoodCrash4[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_05",0.707946,1,200};
-	WoodCrash5[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_06",0.707946,1,200};
-	soundWoodCrash[] = {"woodCrash0",0.166,"woodCrash1",0.166,"woodCrash2",0.166,"woodCrash3",0.166,"woodCrash4",0.166,"woodCrash5",0.166};
-	ArmorCrash0[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_01",0.707946,1,200};
-	ArmorCrash1[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_02",0.707946,1,200};
-	ArmorCrash2[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_03",0.707946,1,200};
-	ArmorCrash3[] = {"Ca\sounds\Vehicles\Crash\crash_vehicle_04",0.707946,1,200};
-	soundArmorCrash[] = {"ArmorCrash0",0.25,"ArmorCrash1",0.25,"ArmorCrash2",0.25,"ArmorCrash3",0.25};
-	class SoundEvents
-	{
-		class AccelerationIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-acce-1",0.177828,1};
-			limit = "0.7";
-			expression = "(engineOn*(1-camPos))*gmeterZ*(speed factor[2.5, 4])";
-		};
-		class AccelerationOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-acce-1",0.177828,1,250};
-			limit = "0.7";
-			expression = "(engineOn*camPos)*gmeterZ*(speed factor[2.5, 4])";
-		};
-	};
-	class Sounds: Sounds
-	{
-		class Engine: Engine
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-low-1",0.562341,1,300};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "camPos*engineOn*((rpm factor[0.21, 0.5]) min (rpm factor[0.7, 0.5]))";
-		};
-		class EngineHighOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-high-2",0.562341,1,350};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "camPos*engineOn*(rpm factor[0.5, 0.85])";
-		};
-		class IdleOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-idle-5",0.354813,1,150};
-			frequency = "1";
-			volume = "camPos*engineOn*(rpm factor[0.4, 0])";
-		};
-		class TiresRockOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2",0.1,1,30};
-			frequency = "1";
-			volume = "camPos*rock*(speed factor[2, 20])";
-		};
-		class TiresSandOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2",0.1,1,30};
-			frequency = "1";
-			volume = "camPos*sand*(speed factor[2, 20])";
-		};
-		class TiresGrassOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3",0.1,1,30};
-			frequency = "1";
-			volume = "camPos*grass*(speed factor[2, 20])";
-		};
-		class TiresMudOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2",0.1,1,30};
-			frequency = "1";
-			volume = "camPos*mud*(speed factor[2, 20])";
-		};
-		class TiresGravelOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2",0.125893,1,30};
-			frequency = "1";
-			volume = "camPos*gravel*(speed factor[2, 20])";
-		};
-		class TiresAsphaltOut
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3",0.0891251,1,30};
-			frequency = "1";
-			volume = "camPos*asphalt*(speed factor[2, 20])";
-		};
-		class NoiseOut
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\ext\ext-offroad-acce-2",0.1,1,30};
-			frequency = "1";
-			volume = "camPos*(damper0 max 0.02)*(speed factor[0, 8])";
-		};
-		class EngineLowIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-low-1",0.562341,1};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "(1-camPos)*engineOn*((rpm factor[0.2, 0.4]) min (rpm factor[0.7, 0.5]))";
-		};
-		class EngineHighIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-high-2",0.562341,1};
-			frequency = "(randomizer*0.05+0.95)*rpm";
-			volume = "(1-camPos)*engineOn*(rpm factor[0.56, 0.8])";
-		};
-		class IdleIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-idle-5",0.354813,1};
-			frequency = "1";
-			volume = "(1-camPos)*engineOn*(rpm factor[0.35, 0])";
-		};
-		class TiresRockIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2",0.1,1};
-			frequency = "1";
-			volume = "(1-camPos)*rock*(speed factor[2, 20])";
-		};
-		class TiresSandIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2",0.1,1};
-			frequency = "1";
-			volume = "(1-camPos)*sand*(speed factor[2, 20])";
-		};
-		class TiresGrassIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3",0.1,1};
-			frequency = "1";
-			volume = "(1-camPos)*grass*(speed factor[2, 20])";
-		};
-		class TiresMudIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2",0.1,1};
-			frequency = "1";
-			volume = "(1-camPos)*mud*(speed factor[2, 20])";
-		};
-		class TiresGravelIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2",0.141254,1};
-			frequency = "1";
-			volume = "(1-camPos)*gravel*(speed factor[2, 20])";
-		};
-		class TiresAsphaltIn
-		{
-			sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3",0.177828,1};
-			frequency = "1";
-			volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
-		};
-		class NoiseIn
-		{
-			sound[] = {"ca\sounds\Vehicles\Wheeled\offroad\int\int-offroad-noise-1",0.316228,1};
-			frequency = "1";
-			volume = "(damper0 max 0.03)*(speed factor[0, 8])*(1-camPos)";
-		};
-		class Movement: Movement
-		{
-			sound = "soundEnviron";
-			frequency = "1";
-			volume = "0";
-		};
-	};
-	cargoAction[] = {"Hilux_Cargo01"};
-	hasGunner = 0;
-	class Turrets
-	{
-	};
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\data\detailmapy\coyota_trup1.rvmat","ca\wheeled\data\detailmapy\coyota_trup1.rvmat","ca\wheeled\data\detailmapy\coyota_trup1_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	hiddenSelections[] = {"Camo1"};
-	hiddenSelectionsTextures[] = {"\ca\wheeled\data\coyota_trup1.paa"};
-	class Library
-	{
-		libTextDesc = "Civil Car.";
-	};
-	rarityUrban = 0.8;
-	brakeDistance = 11;
-	upgradeVehicle[] = {"hilux1_civil_1_open_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
-};
-class hilux1_civil_2_covered: hilux1_civil_1_open
-{
-	model = "\ca\Wheeled\hilux1_civil_2_covered";
-	faction = "CIV";
-	picture = "\Ca\wheeled\data\ico\hilux1_civil_2_covered_CA.paa";
-	Icon = "\Ca\wheeled\data\map_ico\icomap_hilux_CA.paa";
-	mapSize = 7;
-	typicalCargo[] = {};
-	crew = "";
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\data\detailmapy\coyota_trup1.rvmat","ca\wheeled\data\detailmapy\coyota_trup1.rvmat","ca\wheeled\data\detailmapy\coyota_trup1_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_addons.rvmat","ca\wheeled\data\detailmapy\coyota_addons.rvmat","ca\wheeled\data\detailmapy\coyota_addons_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	hiddenSelections[] = {};
-	hiddenSelectionsTextures[] = {};
-	displayName = "Off-road (red)";
-	rarityUrban = 0.35;
-	upgradeVehicle[] = {"hilux1_civil_2_covered_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
-};
-class hilux1_civil_3_open: hilux1_civil_1_open
-{
-	model = "\ca\Wheeled\hilux1_civil_3_open";
-	picture = "\Ca\wheeled\data\ico\hilux1_civil_3_open_CA.paa";
-	Icon = "\Ca\wheeled\data\map_ico\icomap_hilux_CA.paa";
-	mapSize = 7;
-	faction = "CIV";
-	typicalCargo[] = {};
-	crew = "";
-	displayName = "Off-road (white)";
-	class Damage
-	{
-		tex[] = {};
-		mat[] = {"ca\wheeled\data\detailmapy\coyota_trup1.rvmat","ca\wheeled\data\detailmapy\coyota_trup1.rvmat","ca\wheeled\data\detailmapy\coyota_trup1_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola.rvmat","ca\wheeled\data\detailmapy\coyota_kola_destruct.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier.rvmat","ca\wheeled\data\detailmapy\coyota_interier_destruct.rvmat","ca\wheeled\data\detailmapy\auta_skla.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat","ca\wheeled\data\detailmapy\auta_skla_in_damage.rvmat"};
-	};
-	hiddenSelections[] = {};
-	hiddenSelectionsTextures[] = {};
-	upgradeVehicle[] = {"hilux1_civil_3_open_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
-};
+	class HitPoints;

+	class Upgrades {
+		ItemORP[] = {"hilux1_civil_1_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+		ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
+};
+class hilux1_civil_2_covered;
+class hilux1_civil_2_covered_DZE: hilux1_civil_2_covered {
+	terrainCoef = 2.5;
+	class HitPoints;
+
+	class Upgrades {
+		ItemORP[] = {"hilux1_civil_2_covered_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+		ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
+};
+class hilux1_civil_3_open;
+class hilux1_civil_3_open_DZE: hilux1_civil_3_open {
+	terrainCoef = 2.5;
+	class HitPoints;
+
+	class Upgrades {
+		ItemORP[] = {"hilux1_civil_3_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
+		ItemARM[] = {"Pickup_PK_INS_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
+};

 // Performance 1
-class hilux1_civil_1_open_DZE1: hilux1_civil_1_open
-{
+class hilux1_civil_1_open_DZE1: hilux1_civil_1_open_DZE {
 	maxspeed = 150; // max engine limit 125-130
-	terrainCoef = 2.5;
-	upgradeVehicle[] = {"hilux1_civil_1_open_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+	terrainCoef = 1.8;
+	class HitPoints: HitPoints {
+		class HitLFWheel;
+		class HitLBWheel;
+		class HitRFWheel;
+		class HitRBWheel;
+		class HitFuel;
+		class HitEngine;
+		class HitGlass1;
+		class HitGlass2;
+		class HitGlass3;
+		class HitGlass4;
+	};
+
+	class Upgrades {
+		ItemAVE[] = {"hilux1_civil_1_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+		ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_2_covered_DZE1: hilux1_civil_2_covered
-{
+class hilux1_civil_2_covered_DZE1: hilux1_civil_2_covered_DZE {
 	maxspeed = 150; // car 100
-	terrainCoef = 2.5;
-	upgradeVehicle[] = {"hilux1_civil_2_covered_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+	terrainCoef = 1.8;
+	class HitPoints: HitPoints {
+		class HitLFWheel;
+		class HitLBWheel;
+		class HitRFWheel;
+		class HitRBWheel;
+		class HitFuel;
+		class HitEngine;
+		class HitGlass1;
+		class HitGlass2;
+		class HitGlass3;
+		class HitGlass4;
+	};
+
+	class Upgrades {
+		ItemAVE[] = {"hilux1_civil_2_covered_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+		ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_3_open_DZE1: hilux1_civil_3_open
-{
+class hilux1_civil_3_open_DZE1: hilux1_civil_3_open_DZE {
 	maxspeed = 150; // car 100
-	terrainCoef = 2.5;
-	upgradeVehicle[] = {"hilux1_civil_3_open_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+	terrainCoef = 1.8;
+	class HitPoints: HitPoints {
+		class HitLFWheel;
+		class HitLBWheel;
+		class HitRFWheel;
+		class HitRBWheel;
+		class HitFuel;
+		class HitEngine;
+		class HitGlass1;
+		class HitGlass2;
+		class HitGlass3;
+		class HitGlass4;
+	};
+
+	class Upgrades {
+		ItemAVE[] = {"hilux1_civil_3_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}};
+		ItemARM[] = {"Pickup_PK_INS_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
+
 // Armor 2
-class hilux1_civil_1_open_DZE2: hilux1_civil_1_open_DZE1
-{
+class hilux1_civil_1_open_DZE2: hilux1_civil_1_open_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"hilux1_civil_1_open_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"hilux1_civil_1_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}};
+		ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_2_covered_DZE2: hilux1_civil_2_covered_DZE1
-{
+class hilux1_civil_2_covered_DZE2: hilux1_civil_2_covered_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"hilux1_civil_2_covered_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"hilux1_civil_2_covered_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}};
+		ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_3_open_DZE2: hilux1_civil_3_open_DZE1
-{
+class hilux1_civil_3_open_DZE2: hilux1_civil_3_open_DZE1 {
 	armor = 50; // car 20
-	upgradeVehicle[] = {"hilux1_civil_3_open_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
-	class HitPoints: HitPoints
-	{
-		class HitLFWheel: HitLFWheel
-		{
+	class HitPoints: HitPoints {
+		class HitLFWheel: HitLFWheel {
 			armor = 0.3;
 		};
-		class HitLBWheel: HitLBWheel
-		{
+		class HitLBWheel: HitLBWheel {
 			armor = 0.3;
 		};
-		class HitRFWheel: HitRFWheel
-		{
+		class HitRFWheel: HitRFWheel {
 			armor = 0.3;
 		};
-		class HitRBWheel: HitRBWheel
-		{
+		class HitRBWheel: HitRBWheel {
 			armor = 0.3;
 		};
-		class HitFuel
-		{
+		class HitFuel {
 			armor = 0.28;
 			material = -1;
 			name = "palivo";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitEngine
-		{
+		class HitEngine {
 			armor = 1;
 			material = -1;
 			name = "motor";
 			visual = "";
 			passThrough = 1;
 		};
-		class HitGlass1: HitGlass1
-		{
+		class HitGlass1: HitGlass1 {
 			armor = 0.1;
 		};
-		class HitGlass2: HitGlass2
-		{
+		class HitGlass2: HitGlass2 {
 			armor = 0.1;
 		};
-		class HitGlass3: HitGlass3
-		{
+		class HitGlass3: HitGlass3 {
 			armor = 0.1;
 		};
-		class HitGlass4: HitGlass4
-		{
+		class HitGlass4: HitGlass4 {
 			armor = 0.1;
 		};
 	};
+
+	class Upgrades {
+		ItemLRK[] = {"hilux1_civil_3_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}};
+		ItemARM[] = {"Pickup_PK_INS_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
+
 // Cargo 3
-class hilux1_civil_1_open_DZE3: hilux1_civil_1_open_DZE2
-{
+class hilux1_civil_1_open_DZE3: hilux1_civil_1_open_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"hilux1_civil_1_open_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"hilux1_civil_1_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+		ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_2_covered_DZE3: hilux1_civil_2_covered_DZE2
-{
+class hilux1_civil_2_covered_DZE3: hilux1_civil_2_covered_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"hilux1_civil_2_covered_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"hilux1_civil_2_covered_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+		ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_3_open_DZE3: hilux1_civil_3_open_DZE2
-{
+class hilux1_civil_3_open_DZE3: hilux1_civil_3_open_DZE2 {
 	transportMaxWeapons = 20;  // car 10
-	transportMaxMagazines = 100; // car 50 
+	transportMaxMagazines = 100; // car 50
    transportmaxbackpacks = 4; // car 2
-	upgradeVehicle[] = {"hilux1_civil_3_open_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+
+	class Upgrades {
+		ItemTNK[] = {"hilux1_civil_3_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
+		ItemARM[] = {"Pickup_PK_INS_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
+
 // Fuel 4
-class hilux1_civil_1_open_DZE4: hilux1_civil_1_open_DZE3
-{
+class hilux1_civil_1_open_DZE4: hilux1_civil_1_open_DZE3 {
 	fuelCapacity = 210; // car 100
+
+	class Upgrades {
+		ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_2_covered_DZE4: hilux1_civil_2_covered_DZE3
-{
+class hilux1_civil_2_covered_DZE4: hilux1_civil_2_covered_DZE3 {
 	fuelCapacity = 210; // car 100
+
+	class Upgrades {
+		ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
-class hilux1_civil_3_open_DZE4: hilux1_civil_3_open_DZE3
-{
+class hilux1_civil_3_open_DZE4: hilux1_civil_3_open_DZE3 {
 	fuelCapacity = 210; // car 100
+
+	class Upgrades {
+		ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgVehicles/Players.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Players.hpp
@@ -135,6 +135,7 @@ class Bandit1_DZ : Soldier_Crew_PMC {
 };
 class Bandit2_DZ: Soldier_Crew_PMC {
 	scope = 2;
+	side = 1;
 	displayName = $STR_CHAR_2;
 	weapons[] = {"Throw","Put"};
 	model = "\ca\characters_E\GER\GER_rifleman";
@@ -557,4 +558,4 @@ class Camo1_DZ: BAF_Soldier_L_W {
 	respawnMagazines[] = {};
 	weaponSlots = "1	 + 	4	 + 12*		256	 + 2*	4096	 + 	2	 + 8*	16  + 12*131072";
 	canHideBodies = 1;
-};
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/SEA/PBX.hpp
@@ -26,4 +26,5 @@ class PBX: RubberBoat {
 	transportMaxMagazines = 50;
 	transportMaxWeapons = 5;
 	transportMaxBackpacks = 1;
-};
+	fuelCapacity = 23;
+};
--- a/SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/SEA/RHIB.hpp
@@ -17,7 +17,7 @@ class Ship : AllVehicles
    maxSpeed = 30;
    simulation = "ship";
    audible = 6;
-    fuelCapacity = 100;
+    fuelCapacity = 250;
    formationX = 50;
    formationZ = 100;
    brakeDistance = 50;
@@ -569,4 +569,4 @@ class RHIB_DZ : Boat
 		"ca\water\data\rhib_dash_destruct.rvmat"
 	  };
 	};
-};
+};
--- a/SQF/dayz_code/Configs/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons.hpp
@@ -68,8 +68,11 @@ class Mode_FullAuto: Mode_SemiAuto
 class CfgWeapons {

 	class Pecheneg;
-	class Pecheneg_DZ: Pecheneg
-	{
+	class Pecheneg_DZ: Pecheneg {
+		type = "1";
+	};
+	class PK;
+	class PK_DZ: PK {
 		type = "1";
 	};

@@ -84,7 +87,7 @@ class CfgWeapons {
 	{
 		scope = 2;
 		//melee= "true";
-		
+
 		/*
 		bullet1[] = {"ca\sounds\weapons\shells\big_shell_wood_01",0.0707946,1,15};
 		bullet2[] = {"ca\sounds\weapons\shells\big_shell_wood_02",0.0707946,1,15};
@@ -101,20 +104,20 @@ class CfgWeapons {
 		*/

 		//soundBullet[] = {"bullet1",0.083,"bullet2",0.083,"bullet3",0.083,"bullet4",0.083,"bullet5",0.083,"bullet6",0.083,"bullet7",0.083,"bullet8",0.083,"bullet9",0.083,"bullet10",0.083,"bullet11",0.083,"bullet12",0.083};
-		
+
 		emptySound[] = {"",10,1};
 		soundBullet[] = {"emptySound",1};
-		
+

 		model = "\z\addons\dayz_epoch\models\chainsaw.p3d";

 		picture = "\z\addons\dayz_epoch\pictures\equip_chainsaw_CA.paa";
-		
+
 		displayName = "Chainsaw";
-		
+
 		cursor = "";
 		cursoraim = "\ca\Weapons\Data\clear_empty";
-		 
+
 		modes[] = {"manual"};
 		handAnim[]=
 		{
@@ -125,7 +128,7 @@ class CfgWeapons {
 		{
 			recoil = "recoil_auto_machinegun_10outof10";
 			recoilProne = "recoil_auto_machinegun_prone_10outof10";
-			
+
 			dispersion = 0.2;

 			begin1[] = {"\dayz_sfx\chainsaw\running2.ogg",1.77828,1,1000};
@@ -143,10 +146,10 @@ class CfgWeapons {

 			burst = 1;
 			multiplier = 1;
-		
+
 			soundContinuous = 0;
 			soundBurst = 0;
-			
+
 			useAction = 0;
 			useActionTitle = "";

@@ -207,7 +210,7 @@ class CfgWeapons {
 	class PistolCore;	// External class reference
 	class Pistol;	// External class reference
 	class GrenadeLauncher; // External class reference
-	
+
 	class DMR;	// External class reference

 	class ItemMatchbox_DZE: ItemCore
@@ -235,7 +238,7 @@ class CfgWeapons {
 			};
 		};
 	};
-		
+
 	#include "CfgWeapons\Loot.hpp"

 	#include "CfgWeapons\Melee\MeleeMachete.hpp"
@@ -250,7 +253,7 @@ class CfgWeapons {
 	#include "CfgWeapons\Melee\MeleeSledgehammer.hpp"
 	//	#include "CfgWeapons\Melee\MeleeBaseBallBatBarbed.hpp"
 	//	#include "CfgWeapons\Melee\MeleeBaseBallBatNails.hpp"
-	 
+
 	#include "CfgWeapons\Item\ItemWatch.hpp"
 	#include "CfgWeapons\Item\ItemMap.hpp"
 	#include "CfgWeapons\Item\ItemMap_Debug.hpp"
@@ -264,14 +267,14 @@ class CfgWeapons {
 	#include "CfgWeapons\Item\ItemKeyKit.hpp"
 	#include "CfgWeapons\Item\ItemKeys.hpp"
 	#include "CfgWeapons\Item\ItemToolbox.hpp"
-	
+
 	//Sniper Rifles
 	#include "CfgWeapons\Weapon\Sniper\AS50.hpp"
 	#include "CfgWeapons\Weapon\Sniper\M107.hpp"
 	#include "CfgWeapons\Weapon\Sniper\KSVK.hpp"
-	
+
 	#include "CfgWeapons\Weapon\Sniper\DMR_DZ.hpp"
-	#include "CfgWeapons\Weapon\Pistol\MakerovSD.hpp"
+	#include "CfgWeapons\Weapon\Pistol\MakarovSD.hpp"
 	#include "CfgWeapons\Weapon\LMG\m240_scoped.hpp"
 	#include "CfgWeapons\Weapon\LMG\M249_EP1.hpp"
 	#include "CfgWeapons\Weapon\LMG\M249_m145_EP1.hpp"
--- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp
@@ -1,7 +1,4 @@
 class Crossbow_DZ : Crossbow {
 	displayName = $STR_EQUIP_CROSSBOW;
-		magazines[] =
-		{
-			"WoodenArrow"
-		};
+		magazines[] ={"Quiver","WoodenArrow"};
 	};
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Pistol/MakarovSD.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Pistol/MakarovSD.hpp
@@ -15,5 +15,5 @@ class MakarovSD : Makarov {
  descriptionShort = "Silenced semi-automatic pistol <br/>Caliber: 9x18mm"; 
  model = "ca\weapons_E\makarov\makarov_silenced"; 
  displayName = "Makarov SD"; 
-  magazines[] = {"8Rnd_9x18_MakarovSD","8Rnd_9x18_Makarov"}; 
-};
+  magazines[] = {"8Rnd_9x18_MakarovSD"}; 
+};
--- a/SQF/dayz_code/Configs/RscDisplay/RscDisplayCraftingMenu.hpp
+++ b/SQF/dayz_code/Configs/RscDisplay/RscDisplayCraftingMenu.hpp
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Musical Sound Samples Dan Oberbauer http://www.freesound.org/people/DJ%20Chronos/`