1.0.6.2 cleanup

Removed two exceptions that are no longer used

CHANGE LOG 1.0.6.2.txt

@@ -0,0 +1,109 @@
+[NEW] Newest version of DayZero enterable buildings provided by Tansien and Zac https://zombies.nu/. This fixes broken barracks shadows and adds several new interiors. #1601
+[NEW] Land_houseV_2T2 is now enterable. Interior modeled by @Streatman
+[NEW] Added loot positions for new enterable buildings
+[NEW] Added L85 attachments totaling 24 variants, new models by @Streatman. Class L85_Holo_DZ no longer exists and must be updated to L85A2_DZ in custom scripts and SQL, see 1.0.6.2_Updates.sql
+[NEW] SVD scope attachments can now be removed, new models by @Streatman
+[NEW] Added option to toggle status icons in "Game Options" menu and via F3 hotkey. Note this will also toggle Epoch "friendly" tags because they are the same display.
+[NEW] Added DZE_limitPlots so admins can limit plot poles to one per UID, disabled by default. @oiad
+[NEW] Pumpkin, sunflower, and hemp plants spawned with createVehicle can be harvested with a knife now. #1928 @F507DMT
+[NEW] The journal and dayz_survived variable now contain actual play time [array] instead of days since the character was created [number].
+[NEW] Added secondary iron sight to CZ550 modeled by @Streatman
+[NEW] Added bolt animations to CZ550 and LeeEnfield modeled by @Streatman
+[NEW] Added some basic compatibility for falconsan's Ruegen map (beta version released February 2016)
+[NEW] Admins can now define what parts are returned from modular building parts, see configVariables.sqf/DZE_modularConfig @oiad @BigEgg17
+[NEW] Added basic server-side authentication to hive object creation/deletion for improved security. Affects Server_(DeleteObj|PublishObj|PublishVeh|SwapObj|UpdateObject), admins and script makers should review the changes if using PVDZ_obj_(Destroy|Publish), PVDZ_veh_Save, PVDZE_obj_Swap, PVDZE_veh_(Publish|Upgrade) or server_deleteObj and verify custom code is compliant with these changes (github.com/EpochModTeam/DayZ-Epoch/commit/42e0047)
+[NEW] Added BAF_L85A2_RIS_TWS_DZ to emulate the old behavior of the now NV only BAF_L85A2_RIS_CWS. This weapon is not used by default. Server owners can implement it if desired. #1983
+[NEW] Admins can now define a maximum build height, see configVariables.sqf/DZE_BuildHeightLimit. @BigEgg17
+[NEW] Admins can now change the lootRefreshTimer for each building type from the default 15 minutes. CfgLoot.hpp must be updated if using custom loot tables.
+
+[UPDATED] Loot and zed spawn is now disabled in trader cities by default. This is configurable in mission\init.sqf via DZE_SafeZonePosArray. Added function to check positions against DZE_SafeZonePosArray "_PosInSafeZone = _positionToCheck call DZE_SafeZonePosCheck;"
+[UPDATED] Zombie pathing. Zeds should now run more direct to players and no longer get stuck at the position where a player entered a vehicle.
+[UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
+[UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
+[UPDATED] Owners can no longer be removed by added friends in plot and door management. @oiad
+[UPDATED] A new hidden version of the gear menu is now used for force saves so players do not see the dialog flash on screen.
+[UPDATED] Anyone can now lock a modular door without knowing the combination or having any special access. #1944 @ndavalos
+[UPDATED] Locking and unlocking safes no longer plays the medic animation. #1942 @SmokeyBR
+[UPDATED] Locking and unlocking safes now uses call instead of spawn on the server. This fixes the user input lock and safes appearing to disappear momentarily when server FPS is low.
+[UPDATED] Added cleanup of destroyed vehicles and CraterLong after 5 minutes in sched_corpses.sqf.
+[UPDATED] Reverted group menu color scheme to A2OA default for consistency with game dialogs
+[UPDATED] All Zupa dialogs have been updated to use consistent title bar color, button colors, text style and background. The trader menu background is now semi-transparent for increased visibility of surroundings.
+[UPDATED] DZE_ZombieSpeed = [min, max]; has replaced the, now removed, DZE_slowZombies variable. set DZE_ZombieSpeed = [2,2]; for DZE_slowZombies = true; behavior. see configvariables.sqf for more info
+[UPDATED] Reverted increased waves in stormy weather to Chernarus default settings.
+[UPDATED] Removed server control panel, because it is abused by players and not currently used by admins
+[UPDATED] Moved large format strings in dayz_server to str formatText to avoid A2 2048 format character limit
+[UPDATED] Vehicles can now only be sold from the "Gear" sell menu. This prevents accidental selling when using the "sell all" feature on backpacks and vehicle inventories.
+[UPDATED] Added all upgraded weapons to the traders as sell only for the sell price of the base weapon plus the sell price of attachments. This allows them to be sold without removing attachments first. #1982 @worldwidesorrow
+[UPDATED] Increased the coverage angle of headlights on land vehicles and added a headlight to the old bicycle
+[UPDATED] The huey searchlight and gunner seat now have improved visibility in first person view.
+[UPDATED] The AH6X_DZ now uses a new model which removes the camera and computer, adds a search light and fixes unknown animation source turret errors.
+[UPDATED] Removed policecar from dayz_vehicles due to model errors, SQL must be updated if this vehicle was used, see 1.0.6.2_Updates.sql
+[UPDATED] Player is no longer set in combat for throwing a flare or chemlight
+[UPDATED] CSJ_Gyro push script so it no longer spams global setPos. This allows MaxSetPosPerInterval to be filtered in BEServer.cfg.
+[UPDATED] Updated DatabaseMySQL.dll to MySQL version 5.7.20, server admins should update to MySQL server 5.7.20 or above. Updated tbb.dll and tbbmalloc.dll to Intel TBB 2018 Update 2
+[UPDATED] Some DZ weapons which had magazine types restricted (AK, G17, M249, PDW) can now use all compatible A2 magazines. Silenced DZ weapons can now use both SD and non-SD magazines again.
+[UPDATED] Added example basic.cfg and BEServer.cfg files to server configs
+
+[FIXED] Purchased and upgraded vehicles will now spawn quicker and no longer be destroyed by sched_safetyVehicle when server FPS is low. HiveExt.dll and SQL must be updated. See 1.0.6.2_Updates.sql
+[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
+[FIXED] Trees at POI can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down.
+[FIXED] Vanilla POI were updated with new locations and moved back to global spawn again. This synchronizes the POI buildings and trees destroyed/chopped status for all clients.
+[FIXED] All traps now need to be armed after placing. This fixes them not triggering right after building.
+[FIXED] Smoke and grenade tripwires now require a grenade to rearm after triggering.
+[FIXED] Player no longer does medic animation after triggering a single use trap.
+[FIXED] Removing a trap with no room in your gear will no longer delete the trap.
+[FIXED] Player_forceSave is now called correctly when the abort menu is opened. It was previously using the wrong variable and time.
+[FIXED] The unconscious wake up animation can no longer be skipped by using a bandage or other right click actions.
+[FIXED] Sharpening a knife will no longer delete one if the player already had a fully sharpened knife on their toolbelt (duplicate weapon).
+[FIXED] Swimming in air or ground after relog, clothes change and respawn on certain maps. #1913 @Cherdenko
+[FIXED] Arma cheats (LeftShift + NumPad-) enterable on map display and create marker text box. #1915 @BigEgg17
+[FIXED] It is no longer possible to duplicate melee weapons by double clicking to drop and right clicking at the same time. @F507DMT
+[FIXED] Death messages and damage sometimes showing RunOver when they should not due to a variable not resetting after being runover. @oiad
+[FIXED] CFGMoves/Animation CTD on server. @icomrade Thanks Choc for reporting
+[FIXED] DayZ_RollingMessage FPS impact. #1926 @BigEgg17
+[FIXED] Random skin selection on new character creation with DZE_defaultSkin = [["Male skin1","Male skin2"],["Female skin1","Female skin2"]];
+[FIXED] Corpse markers are now deleted for bodies that are hidden.
+[FIXED] Unable to eat FoodPumpkin
+[FIXED] Unable to sell classic 'ItemBloodbag' at traders @oiad
+[FIXED] Unable to sell upgraded _DZE[1-4] vehicle variants if their base vehicle class is removed from the trader configs
+[FIXED] The player building a shed, tent or other unlocked storage was unable to use its gear and M240 nests were non-functional until relog when DZE_GodModeBase=true; @oiad
+[FIXED] Death message killer inaccurate when player is caused to bleed by one unit and then killed by a different unit shortly after. @oiad
+[FIXED] Group saving issue which could potentially join a player to a random group or not save group properly after death.
+[FIXED] Harvested pumpkin, sunflower, and hemp plants no longer respawn after relog (allowed infinite harvesting).
+[FIXED] Multiple players can no longer harvest the same plant at once. #1928 @F507DMT
+[FIXED] Purchased boats sometimes not spawning on helipad even when it is free of obstructions.
+[FIXED] Unable to fill water at some ponds and wells on Napf and Namalsk due to missing or misplaced waterHoleProxy.
+[FIXED] Potential undefined error for dayz_characterID on login. @oiad
+[FIXED] Actions like cook, gather meat, repair, etc. are now interrupted properly if the player vaults, moves or enters a vehicle during the medic animation. #1942 @SmokeyBR
+[FIXED] Readded crossbow reload sound
+[FIXED] Using setDamage or setHit to kill a player via script will no longer cause a double death.
+[FIXED] The dramatic recoil camera shake effect from a nearby bullet hit is now reset correctly instead of remaining permanent.
+[FIXED] Added temporary fix for missing AS50 ammo error with beta branch core patch. #1955 @AirwavesMan
+[FIXED] Melee and tranquilizer bolt knockouts were usually instant or far shorter than the intended time of 20s-80s.
+[FIXED] Multiple dupe fixes - SERVER ADMINS, DO NOT IMPLEMENT SCRIPTS WHICH KICK PLAYERS TO THE LOBBY (ENDMISSION, FAILMISSION, etc.), YOU MUST KICK THEM ENTIRELY OUT OF THE SERVER! (EX: by BE restriction, but with the stock scripts.txt forceEnd, failmission, and endmission should kick the player anyway)
+[FIXED] Certain classes (i.e. Satchel Charge) which are both magazines and weapons were not retained through skin change #1981 @AirwavesMan
+[FIXED] Blocked another A2OA script execution bug from improperly cleared eventhandlers. See dayz_code\system\antihack.sqf. Thanks to Dihan for reporting
+[FIXED] Missing shadows on some _DZ weapons. Thanks @Streatman
+[FIXED] Launchers and launcher ammo are now detected correctly in the sell menu when a player has a launcher and ammo with the same classname.
+[FIXED] Wrong bleeding icon on Epoch legacy status UI
+[FIXED] A locked door can now be auto unlocked right after placement by the player who built it
+[FIXED] A rare error in keyboard.sqf for certain combination binds.
+[FIXED] Floating loot positions in hotel (Land_HouseB_Tenement)
+[FIXED] Updates to humanity and player stats after a skin change not always saving in hive (server_getDiff)
+[FIXED] Bad vehicle type crew error for RHIB2Turret on A2OA main menu intro scene
+[FIXED] Fresh spawns running on login if they died while running
+[FIXED] Death camera height incorrect when player dies above terrain level
+[FIXED] Duplicate weapon error when player dies with the same weapon in hands and on back
+[FIXED] Vehicle getOut event handler no longer runs on M240 Nest and other static weapons.
+[FIXED] Autorun no longer freezes players when they spam the key or attempt to reactivate it near a body of water.
+
+[NOTE] Fixes below were included in hotfix 1.0.6.1A (March 10th 2017) and are now in the default files.
+[FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. 
+[FIXED] Glitch where group icons scaled very large momentarily while moving off screen.
+[NEW] Added temporary check for mission file overwrite exploit. This can be removed after Bohemia patches it.
+
+[INFO] Server admins must update HiveExt.dll.
+[INFO] HiveExt.dll has been updated to return character_data duration in the 101 call for the dayz_survived stat. Source is available at github.com/vbawol/DayZhiveEpoch/pull/13 @icomrade
+[INFO] HiveExt.dll REQUIRES A NEW PROCEDURE BE ADDED TO YOUR DATABASE FOR IMPROVED VEHICLE/OBJECT SPAWNING LOGIC, SEE 1.0.6.2_UPDATES.SQL!
+[INFO] The server config directory should be located outside the server's A2OA directory for security. This is now done in the example server configs by default.
+[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.

README.md

@@ -14,6 +14,7 @@ http://dayzmod.com
 --------------------------
 Included Custom Addons
 --------------------------
+* DayZero Enterable Buildings - https://zombies.nu/
 * AutoGyro - by CSJ http://www.armaholic.com/page.php?id=2359
 * Taxi by [GLT]Myke http://www.armaholic.com/page.php?id=12289
 * Blackhawk and Seahawk Wrecks by [GLT]Myke http://www.armaholic.com/page.php?id=10670
@@ -27,7 +28,6 @@ Included Custom Addons
 * 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/
 * Anzio 20mm Rifle by WillRobinson - http://www.armaholic.com/page.php?id=30175
 * RedRyder BB Gun by WillRobinson - https://github.com/arma2WillRobinson/Red-Ryder
 
@@ -112,6 +112,8 @@ GitHub Contributors (In order of most commits)
 * AirwavesMan - https://github.com/AirwavesMan
 * Raziel23x - https://github.com/Raziel23x
 * strikerforce - https://github.com/strikerforce
+* dreamforceinc - https://github.com/dreamforceinc
+* F507DMT - https://github.com/F507DMT 
 * ndavalos - https://github.com/ndavalos
 * SmokeyBR - https://github.com/SmokeyBR
 
@@ -120,9 +122,10 @@ Special thanks
 --------------------------
 * BIS for a incredible and versatile game and engine. http://www.bistudio.com/
 * Rocket - DAYZ! http://dayzmod.com | http://dayzgame.com 
+* Rajkosto - DayZ Hive DLL - https://github.com/rajkosto/hive
 * DayZ Community Developers - https://github.com/DayZMod
 * ziellos2k - Tag Friendly code. https://github.com/ziellos2k
-* Dayz Hive DLL - https://github.com/rajkosto/hive
+* Tansien and Zac - for providing and creating DayZero Enterable Buildings https://zombies.nu/
 * Munchiefest - Beta Tester, Wiki Editor, Ideas - http://www.twitch.tv/munchiefest
 * Chelsey - Beta Tester, New female textures.
 * OrangeSherbet - Beta Tester - http://www.twitch.tv/orangesherbet

SQF/dayz_anim/CfgBanned/CfgWeapons.hpp

@@ -9,7 +9,7 @@ class CfgWeapons {
 	class RifleCore;
 	class FakeWeapon: RifleCore
 	{
-		scope = protected;
+		scope = 1;
 		stopThis = true;
 		type = 0;
 		cursor = "";
@@ -36,8 +36,11 @@ class CfgWeapons {
 	//class M24: FakeWeapon {};
 	//class M40A3: FakeWeapon {};
 	//class M240: FakeWeapon {};
+	class M240_Small: FakeWeapon {};
 	//class Mk_48: FakeWeapon {};
+	class Mk_48_Small: FakeWeapon {};
 	//class M249: FakeWeapon {};
+	class M249_Small: FakeWeapon {};
 	//class M4A1: FakeWeapon {};
 	//class M4A1_Aim: FakeWeapon {};
 	//class M4A1_Aim_camo: FakeWeapon {};
@@ -50,12 +53,14 @@ class CfgWeapons {
 	//class MP5SD: FakeWeapon {};
 	//class MP5A5: FakeWeapon {};
 	//class PK: FakeWeapon {};
+	class PK_Small: FakeWeapon {};
 	class Pecheneg: FakeWeapon {};
 	//class SVD: FakeWeapon {};
 	//class SVD_CAMO: FakeWeapon {};
 
 	//class Launcher: FakeWeapon {};
 	class ksvk: FakeWeapon {};
+	class ksvk_Small: FakeWeapon {};
 	class M136: FakeWeapon {};
 	class Javelin: FakeWeapon {};
 	class Stinger: FakeWeapon {};
@@ -208,12 +213,14 @@ class CfgWeapons {
 	//class AKS_74_U: FakeWeapon {};
 	//class AKS_74_UN_kobra: FakeWeapon {};
 	//class RPK_74: FakeWeapon {};
+	class RPK_74_Large: FakeWeapon {};
 	//class bizon: FakeWeapon {};
 	//class bizon_silenced: FakeWeapon {};
 	//class Colt1911: FakeWeapon {};
 	//class DMR: FakeWeapon {};
 	//class M1014: FakeWeapon {};
 	class m107: FakeWeapon {}; //old .50cal
+	class m107_Small: FakeWeapon {};
 	class M252: FakeWeapon {};
 	class 2B14: FakeWeapon {};
 	class Saiga12K: FakeWeapon {};
@@ -225,6 +232,7 @@ class CfgWeapons {
 	class m8_compact: FakeWeapon {};
 	class m8_sharpshooter: FakeWeapon {};
 	class m8_SAW: FakeWeapon {};
+	class m8_SAW_Large: FakeWeapon {};
 	//class huntingrifle: FakeWeapon {};
 	class RPG18: FakeWeapon {};
 	class SMAW: FakeWeapon {};
@@ -246,6 +254,7 @@ class CfgWeapons {
 	class CRV7_FAT: FakeWeapon {};
 	class M621: FakeWeapon {};
 	class BAF_AS50_scoped: FakeWeapon {}; //old .50cal
+	class BAF_AS50_scoped_Large: FakeWeapon {};
 	class BAF_AS50_TWS: FakeWeapon {};
 	class BAF_LRR_scoped: FakeWeapon {}; 
 	class BAF_LRR_scoped_W: FakeWeapon {};
@@ -262,6 +271,7 @@ class CfgWeapons {
 	class BAF_L86A2_ACOG: FakeWeapon {};
 	class BAF_L110A1: FakeWeapon {};
 	//class BAF_L110A1_Aim: FakeWeapon {};
+	class BAF_L110A1_Aim_Small: FakeWeapon {};
 	class BAF_L7A2_GPMG: FakeWeapon {};
 	class BAF_ied_v1: FakeWeapon {};
 	class BAF_ied_v2: FakeWeapon {};
@@ -287,10 +297,15 @@ class CfgWeapons {
 	class revolver_gold_EP1: FakeWeapon {};
 	//class glock17_EP1: FakeWeapon {};
 	//class M60A4_EP1: FakeWeapon {};
+	class M60A4_EP1_Small: FakeWeapon {};
 	//class Mk_48_DES_EP1: FakeWeapon {};
+	class Mk_48_DES_EP1_Small: FakeWeapon {};
 	//class M249_EP1: FakeWeapon {};
+	class M249_EP1_Small: FakeWeapon {};
 	class M249_TWS_EP1: FakeWeapon {};
+	class M249_TWS_EP1_Small: FakeWeapon {};
 	class M249_m145_EP1: FakeWeapon {};
+	class M249_m145_EP1_Small: FakeWeapon {};
 	//class M24_des_EP1: FakeWeapon {};
 	//class SVD_des_EP1: FakeWeapon {};
 	//class SVD_NSPU_EP1: FakeWeapon {};
@@ -318,6 +333,7 @@ class CfgWeapons {
 	class G36K: FakeWeapon {};
 	class MG36: FakeWeapon {};
 	class MG36_camo: FakeWeapon {};
+	class MG36_camo_Large: FakeWeapon {};
 	class GrenadeLauncher_EP1: FakeWeapon {};
 	class M32_EP1: FakeWeapon {};
 	class M79_EP1: FakeWeapon {};
@@ -328,6 +344,7 @@ class CfgWeapons {
 	class M110_NVG_EP1: FakeWeapon {};
 	//class M14_EP1: FakeWeapon {};
 	//class m240_scoped_EP1: FakeWeapon {};
+	class m240_scoped_EP1_Small: FakeWeapon {};
 	class M47Launcher_EP1: FakeWeapon {};
 	class MAAWS: FakeWeapon {};
 	class SCAR_Base: FakeWeapon {};
@@ -353,7 +370,9 @@ class CfgWeapons {
 	class M32_heli: FakeWeapon {};
 	class AA12_PMC: FakeWeapon {};
 	class PMC_AS50_scoped: FakeWeapon {};
+	class PMC_AS50_scoped_Large: FakeWeapon {};
 	class PMC_AS50_TWS: FakeWeapon {};
+	class PMC_AS50_TWS_Large: FakeWeapon {};
 	class m8_carbine_pmc: FakeWeapon {};
 	class m8_compact_pmc: FakeWeapon {};
 	class m8_holo_sd: FakeWeapon {};

SQF/dayz_code/Configs/CfgArma.hpp

@@ -20,7 +20,7 @@ class CfgActions {
 	class PutBag : None { show = 0; };
 	class DropBag : None { show = 0; };
 	class AddBag : None { show = 0; };
-	//class TakeMine : None { show = 0; };
+	class TakeMine : None { show = 0; };
 	class DropWeapon : None { show = 0; };
 	class PutWeapon : None { show = 0; };
 	class DropMagazine : None { show = 0; };

SQF/dayz_code/Configs/CfgCrafting/CfgCrafting.hpp

@@ -12,20 +12,6 @@ class CfgCrafting {
 	#include "Recipes\Weapons\BaseBallBatBarbed.hpp"
 	#include "Recipes\Weapons\Crossbow.hpp"
 
-	//Not Ready
-	/*
-	#include "Recipes\Weapons\M9SD.hpp"
-	#include "Recipes\Weapons\M4A1_AIM.hpp"
-	#include "Recipes\Weapons\MAKAROVSD.hpp"
-	#include "Recipes\Weapons\bizonSD.hpp"
-	#include "Recipes\Weapons\SVD_CAMO.hpp"
-	#include "Recipes\Weapons\M4A1_Aim_CAMO.hpp"
-	#include "Recipes\Weapons\M4A1_HWS_GL_CAMO.hpp"
-	#include "Recipes\Weapons\G36C_camo.hpp"
-	#include "Recipes\Weapons\G36A_camo.hpp"
-	#include "Recipes\Weapons\G36K_camo.hpp"
-	*/
-
 	//Medical
 	#include "Recipes\Medical\Bandage.hpp"
 	#include "Recipes\Medical\sepsisBandage.hpp"

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/G36A_camo.hpp

@@ -1,17 +0,0 @@
-class Blueprint_G36A_camo : Recipe {
-	displayName = $STR_CRAFT_NAME_G36A_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_G36A_CAMO;
-	input[] = 
-	{
-		{"G36A","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"G36A_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/G36C_camo.hpp

@@ -1,17 +0,0 @@
-class Blueprint_G36C_camo : Recipe {
-	displayName = $STR_CRAFT_NAME_G36C_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_G36C_CAMO;
-	input[] = 
-	{
-		{"G36C","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"G36C_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/G36K_camo.hpp

@@ -1,17 +0,0 @@
-class Blueprint_G36K_camo : Recipe {
-	displayName = $STR_CRAFT_NAME_G36K_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_G36K_CAMO;
-	input[] = 
-	{
-		{"G36K","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"G36K_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M4A1_AIM.hpp

@@ -1,19 +0,0 @@
-class Blueprint_M4A1_AIM : Recipe {
-	displayName = $STR_CRAFT_NAME_M4A1_AIM;
-	descriptionShort = $STR_CRAFT_DESC_M4A1_AIM;
-	input[] = 
-	{
-		{"M4A1","CfgWeapons",1},
-		{"Attachment_AIM","CfgMagazines",1},
-		{"equip_rail_screws","CfgMagazines",2},
-		{"equip_weapon_rails","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M4A1_AIM","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M4A1_Aim_CAMO.hpp

@@ -1,17 +0,0 @@
-class Blueprint_M4A1_Aim_CAMO : Recipe {
-	displayName = $STR_CRAFT_NAME_M4A1_Aim_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_M4A1_Aim_CAMO;
-	input[] = 
-	{
-		{"M4A1_Aim","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M4A1_Aim_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M4A1_HWS_GL_CAMO.hpp

@@ -1,17 +0,0 @@
-class Blueprint_M4A1_HWS_GL_CAMO : Recipe {
-	displayName = $STR_CRAFT_NAME_M4A1_HWS_GL_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_M4A1_HWS_GL_CAMO;
-	input[] = 
-	{
-		{"M4A1_HWS_GL","CfgWeapons",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M4A1_HWS_GL_CAMO","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/M9SD.hpp

@@ -1,17 +0,0 @@
-class Blueprint_M9SD : Recipe {
-	displayName = $STR_CRAFT_NAME_M9SD;
-	descriptionShort = $STR_CRAFT_DESC_M9SD;
-	input[] = 
-	{
-		{"M9","CfgWeapons",1},
-		{"Attachment_Silencer","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"M9SD","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/MAKAROVSD.hpp

@@ -1,17 +0,0 @@
-class Blueprint_MAKAROVSD : Recipe {
-	displayName = $STR_CRAFT_NAME_MAKAROVSD;
-	descriptionShort = $STR_CRAFT_DESC_MAKAROVSD;
-	input[] = 
-	{
-		{"Makarov","CfgWeapons",1},
-		{"Attachment_Silencer","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"MakarovSD","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/SVD_CAMO.hpp

@@ -1,18 +0,0 @@
-class Blueprint_SVD_CAMO : Recipe {
-	displayName = $STR_CRAFT_NAME_SVD_CAMO;
-	descriptionShort = $STR_CRAFT_DESC_SVD_CAMO;
-	input[] = 
-	{
-		{"SVD_DZ","CfgWeapons",1},
-		{"Skin_Sniper1_DZ","CfgMagazines",1},
-		{"Attachment_CAMO","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"SVD_CAMO_DZ","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgCrafting/Recipes/Weapons/bizonSD.hpp

@@ -1,17 +0,0 @@
-class Blueprint_bizonSD : Recipe {
-	displayName = $STR_CRAFT_NAME_bizonSD;
-	descriptionShort = $STR_CRAFT_DESC_bizonSD;
-	input[] = 
-	{
-		{"bizon","CfgWeapons",1},
-		{"Attachment_Silencer","CfgMagazines",1}
-	};
-	output[] = 
-	{
-		{"bizon_silenced","CfgWeapons",1}
-	};
-	required[] = 
-	{
-		{"ItemToolbox","CfgWeapons",1}
-	};
-};

SQF/dayz_code/Configs/CfgLoot/Buildings/Boat.hpp

@@ -18,4 +18,11 @@ class Land_BoatSmall_2b : Default
 	lootChance = 0.1;
 	lootPos[] = {{0.00390625,-0.250977,-0.348389}};
 	lootGroup = Boat;
-};
+};
+// ALT-MAP
+class land_molo : Default
+{
+	lootChance = 0.3;
+	lootPos[] = {{-0.94043,2.16602,3.30015}};
+	lootGroup = Boat;
+};

SQF/dayz_code/Configs/CfgLoot/Buildings/Church.hpp

@@ -139,11 +139,20 @@ class Land_Church_05R : Church
 		{-4.85,8.19,-8}
 	};
 };
-//DZE ADDED BELOW
-class land_kostelik_final_2122: Church {
+//ALT-MAP suport
+class land_kostelik_final_2122: Church //nm whitewashed wooden slats
+{
 	lootPos[] = {{5.41992,-3.45703,-5.57918},{-0.963379,4.74414,-5.57919},{1.09082,-2.79297,-5.57919},{-1.39063,-5.18555,-5.57918}};
 };
-
+class Land_A_Mosque_small_2_EP1: Church // tak
+{
+	lootPos[] = { { 1.33496,-0.726074,-2.48535 }, { -0.794922,-1.74414,-2.48538 } };
+};
+class Land_A_Minaret_EP1 : Church // tak
+{
+	lootPos[] =	{ {0.158691,0.131836,5.13947}, {1.86914,-2.97461,5.1394} 	};
+};
+//DZE ADDED BELOW
 class Land_A_Mosque_big_hq_EP1: Church {
 	lootPos[] = {{4.06592,-6.90674,-9.31999},{5.25195,4.07666,-9.31999},{5.70264,7.5376,-4.04752},{-4.78857,-7.00684,-4.04753},{3.93262,9.41846,0.567287},{0.882324,-0.134766,-9.31999}};
 };
@@ -162,10 +171,3 @@ class Land_A_Mosque_small_1_EP1: Church
 		{ 6.66406,4.11719,-1.9437 },
 		{ 0.49707,-1.33301,-1.69603 }};
 };
-
-class Land_A_Mosque_small_2_EP1: Church
-{
-	lootPos[] = {
-		{ 1.33496,-0.726074,-2.48535 },
-		{ -0.794922,-1.74414,-2.48538 }};
-};

SQF/dayz_code/Configs/CfgLoot/Buildings/Farm.hpp

@@ -115,11 +115,19 @@ class Land_smd_sara_stodola2: Farm { // brown open barn
 	lootPos[] = {{4.57617,0.255859,-2.16877},{-4.61133,-1.60156,-2.16877},{-5.38281,2.94336,-2.16877}};
 };
 // ALT-MAP Support
-
-//DZE ADDED BELOW
-class land_jzd_stodola1: Farm {
+class land_jzd_stodola1: Farm // nm
+{
 	lootPos[] = {{-3.81592,-11.418,-2.0262},{1.73877,-6.20605,-2.0262},{-4.13477,-0.265625,-2.0262},{-1.04883,0.180664,-2.0262}};
 };
+//land_plynom in Residential.hpp
+class land_zd_2: Farm // nm shed
+{
+	zedPos[] = {{-0.195313,0.174805,-1.82467}};
+	lootPos[] = {{0.630859,0.280273,-1.82467}, {-1.48145,1.44141,-1.82466}};
+};
+//land_zd_1 in Residential.hpp
+//land_marsh1 in Residential.hpp
+//DZE ADDED BELOW
 class land_shed_m01: Farm {
 	zedPos[] = {{0.218262,-1.78369,-0.347349}};
 };

SQF/dayz_code/Configs/CfgLoot/Buildings/Hospital.hpp

@@ -10,6 +10,7 @@ class Hospital : Default
 
 class Land_A_Hospital : Hospital
 {
+	//lootChance = 0.2;
 	lootPos[] = {
 		//{0.79834,-1.16895,-7.33966},{-7.2334,-2.63574,-7.33966},{-16.3687,-2.4043,-7.33966},{-12.2847,-3.19434,-7.33966},{4.24268,-3.59375,-7.33966},{-3.2666,-0.925781,-7.33966},{6.85693,-2.75098,-7.33966},{11.0151,-3.9541,-7.33966},{16.8198,-4.71094,-7.33966},{-1.6875,5.47168,-7.4494},{12.7476,0.144531,3.29184},{10.2661,-1.21582,3.29184},
 		{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}

SQF/dayz_code/Configs/CfgLoot/Buildings/Industrial.hpp

@@ -316,17 +316,19 @@ class Land_Misc_PowerStation : Industrial
 
 class Land_Shed_W01 : Industrial
 {
-	zedPos[] =
-	{
-		{-1.52832,-0.249023,-1.41138}
-	};
 	lootPos[] =
 	{
-		//{-1.52832,-0.249023,-1.41138}
 		{-1.46289,-0.12207,-1.41129}
 	};
 };
 
+class Land_Shed_W4 : Industrial
+{
+	maxRoaming = 3;
+	zedPos[] = {};
+	lootPos[] = {{-1.8,2.3,-1.32},{-2.1,-1.85,-1.32},{1.85,2.83,-1.32},{0.85,-0.56,-1.32}};
+};
+
 class Land_Tovarna2 : Industrial
 {
 	zedPos[] =
@@ -1171,7 +1173,40 @@ class Land_smd_garaz_open: Industrial // garage with 3 green doors
 	lootPos[] = {{-5.10742,-0.351563,-1.22162},{-1.11328,-0.112305,-1.22162},{3.65039,-0.338867,-1.22162}};
 };
 // ALT-MAP Support
-
+class Land_Ind_Oil_Pump_EP1: Industrial  // tak oil pump
+{
+	lootPos[] = {{ 1.49048,-1.99609,-2.08473 }};
+};
+class land_provoz1: Industrial // nm brick garage
+{
+	zedPos[] = {{-0.134766,2.26465,-2.30756},{3.37305,1.97266,-2.30756},{-4.29297,-1.39258,-2.30756},{4.35107,-1.93945,-2.30756}};
+	lootPos[] = {{1.60449,1.63086,-2.30756},{-2.98193,2.74121,-2.30756},{-1.59277,-2.30273,-2.30756},{1.97852,-2.03613,-2.30756}};
+};
+class land_b_small1: Industrial // nm cinder blocks 
+{
+	lootPos[] = {{-3.14185,1.36816,-1.50033},{-0.0275879,-1.74707,-1.50033},{-3.59619,-3.18945,-1.50033},{-0.729004,-4.95996,-1.50033}};
+};
+class land_seb_nasypka: Industrial // nm cement + metal
+{
+	zedPos[] = {{7.96338,0.114258,-6.50023}};
+	lootPos[] = {{-0.00878906,8.66797,-6.59387},{-0.1875,4.55859,-6.59387},{10.5996,4.24609,-6.52272},{10.7554,1.3623,-6.52408},{9.08057,-6.9873,-0.134289},{2.66699,-7.53906,-0.134289}};
+};
+class land_kontejner_des: Industrial // nm dumpster
+{
+	lootPos[] = {{-2.17334,-0.0615234,-0.729944}};
+};
+class land_f_b2: Industrial { // nm
+	lootPos[] = {{1.58398,0.899414,-4.24147},{-1.33301,-0.991211,-4.24147},{1.91113,-1.68262,-4.24147}};
+};
+class land_bud2: Industrial { // nm
+	lootPos[] = {{-2.32031,-1.25,-1.76814},{-1.58008,-2.3125,-1.77484}};
+};
+class land_seb_mine_main_opt: Industrial { // nm
+	lootPos[] = {{0.590332,4.68115,-0.991421},{-1.86768,4.13525,-0.992432},{0.14209,2.53271,-0.995407},{-3.43457,2.68115,-0.995136},{-3.01416,2.59521,-5.08478},{0.776855,-2.89209,-5.11486},{-6.06885,3.33838,7.8684},{-6.38086,-2.05469,7.8684},{-1.7251,-3.09668,7.8684},{-5.64111,-0.92334,14.6913},{-6.23584,2.76465,14.6913}};
+};
+class land_seb_mine_near: Industrial { // nm
+	lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
+};
 //DZE ADDED BELOW
 class land_trubice: Industrial {
 	lootPos[] = {{-2.36719,2.7627,2.59438},{5.82715,3.01563,2.59438},{1.57617,0.709961,2.59438}};
@@ -1181,9 +1216,6 @@ class land_x_skladiste_low_tex: Industrial { // concrete, arc roof, broken doors
 	//lootPos[] = {{12.5835,2.05273,-2.73836},{-2.45117,8.69385,-1.62253},{-10.9365,2.72217,-2.85032},{-9.50781,-9.54053,-2.85108},{-12.1572,-6.07861,-2.8506}};
 	lootPos[] = {{-8.12354,-0.32373,-2.85032},{-2.31592,-4.27539,-2.5975},{8.15527,-6.89307,-2.5975},{0.398926,4.80029,-2.82628},{-6.0249,-7.64355,-2.85032}};
 };
-class land_b_small1: Industrial {
-	lootPos[] = {{-3.14185,1.36816,-1.50033},{-0.0275879,-1.74707,-1.50033},{-3.59619,-3.18945,-1.50033},{-0.729004,-4.95996,-1.50033}};
-};
 class land_cast1: Industrial {
 	lootPos[] = {{-5.39551,6.56055,-4.38392},{-5.68555,9.04297,-4.38393},{-5.57251,9.08203,-4.38393},{-3.05396,14.5527,-4.38392},{2.97681,13.9014,-4.38392},{-0.227783,11.8418,-4.38393},{1.44995,3.27246,-3.50372},{2.53198,-5.45508,-3.5118},{-4.85596,-2.20898,-3.4266},{1.04224,0.729492,-1.06585}};
 };
@@ -1193,18 +1225,6 @@ class land_panelova: Industrial {
 class land_seb_bouda3: Industrial {
 	lootPos[] = {{2.63574,-3.0332,-1.72872},{-2.71875,-5.08691,-1.72873},{-3.00293,-1.50781,-1.72877},{-2.91357,3.86328,-1.72876},{3.12891,3.01563,-1.72879}};
 };
-class land_f_b2: Industrial {
-	lootPos[] = {{1.58398,0.899414,-4.24147},{-1.33301,-0.991211,-4.24147},{1.91113,-1.68262,-4.24147}};
-};
-class land_bud2: Industrial {
-	lootPos[] = {{-2.32031,-1.25,-1.76814},{-1.58008,-2.3125,-1.77484}};
-};
-class land_seb_mine_main_opt: Industrial {
-	lootPos[] = {{0.590332,4.68115,-0.991421},{-1.86768,4.13525,-0.992432},{0.14209,2.53271,-0.995407},{-3.43457,2.68115,-0.995136},{-3.01416,2.59521,-5.08478},{0.776855,-2.89209,-5.11486},{-6.06885,3.33838,7.8684},{-6.38086,-2.05469,7.8684},{-1.7251,-3.09668,7.8684},{-5.64111,-0.92334,14.6913},{-6.23584,2.76465,14.6913}};
-};
-class land_seb_mine_near: Industrial {
-	lootPos[] = {{7.87646,-5.52881,-8.8979},{9.02979,-5.5918,-8.8979},{4.37451,-7.10156,-8.8979}};
-};
 class land_f_b1: Industrial { // one story garage and ramp
 	zedPos[] = {{2.6582,-3.80225,-3.08734},{3.87988,2.10889,-3.1054}};
 	//lootPos[] = {{-3.18848,-0.702148,-2.21533},{-2.42188,-4.46582,-2.21533}};
@@ -1265,11 +1285,6 @@ class Land_Ind_Garage01_EP1: Industrial
 	};
 	zedPos[] = {{0.125488,0.557861,-0.357141},{1.11084,-1.33643,-0.36116}};
 };
-class Land_Ind_Oil_Pump_EP1: Industrial
-{
-	lootPos[] = {
-		{ 1.49048,-1.99609,-2.08473 }};
-};
 class Land_IndPipe2_bigL_L_EP1: Industrial
 {
 	lootPos[] = {

SQF/dayz_code/Configs/CfgLoot/Buildings/Military.hpp

@@ -68,13 +68,8 @@ class Land_Mil_ControlTower: Military
 	};
 	zedPos[] = {{10.0703,3.76367,-9.62869},{1.75195,5.68164,-5.51373},{3.85254,3.53516,-5.50372},{6.66113,-0.625488,-1.0787},{6.72266,3.23389,-1.0787},{2.63965,-0.191406,-1.0687}};
 	lootChance = 0.4;
-	lootPos[] = {
-		//{10.07,3.76,-9.63},{5.07,3.65,-5.5},{1.75,5.68,-5.51},{7.49,-1.47,-1.04},{2.46,-0.83,-1.07},{7.61,2.05,-0.35},{2.26,2.17,-1.07},{2.56,5.72,-9.63},{6.56,-3.82,-1.06},{9.87,4.04,-1.06},{7.28,-1.69,2.98},
-		{7.33203,-1.104,-1.0787},{2.00684,-0.88623,-1.0787},{6.10938,3.34473,-1.0787},{1.90332,3.67188,-5.51367},{8.71387,3.8042,-9.6387}
-	};
-	lootPosSmall[] = {
-		{7.32324,-1.55957,2.98267},{5.49023,-1.72949,-0.378693},{4.7334,-1.66064,-0.378693},{7.44922,2.03809,-0.378693},{5.86035,3.98438,-0.248688},{6.21289,4.02539,-1.0087},{4.96875,-1.39941,-0.638702},{1.08008,3.98389,-5.51367},{10.0879,3.5459,-9.64868}
-	};
+	lootPos[] = {{3.41,-3.29,-5.5},{9.5,-3.63,-5.5},{8.25,-2.09,-9.64},{2.12,-3.94,-9.64},{-0.01,1.93,-9.64},{-1.96,-3.36,-9.64},{-8.37,-3.53,-9.64},{-6.19,-0.04,-8.83},{-5.49,-3.16,-8.83},{-1.92,0.06,-10.19},{-1.92,0.06,-10.19},{-2.12,-0.01,-9.64},{9.35,6.05,-9.65},{2.6,3.76,-5.5},{7.58,2.04,-0.38},{2.22,-0.87,-1.07},{5.15,-1.88,-0.39}};
+	lootPosSmall[] = {{9.83,4.49,-7.38},{5.56,4.05,-5.51},{6.06,4.1,-0.63},{2.51,-1.96,0.79},{0.35,-3.75,-9.52},{-3.36,-3.44,-9.64},{-6.2,0.03,-9.64},{-10.23,0.02,-8.81},{-7.6,-3.87,-9.64},{5.26,-0.93,-7.57},{0.01,6.07,-9.65},{8.2,-0.53,-4.69},{6.53,-0.91,-4.98},{3.22,-1.21,-5.5}};
 };
 
 class Land_SS_hangar: Military
@@ -111,8 +106,8 @@ class Land_A_TVTower_Base: Military
 		"z_policeman"
 	};
 	zedPos[] = {{-0.95166,1.48047,-2.31586},{-2.01782,-4.24121,-2.30939},{-0.982422,-1.92383,-2.25586}};
-	//lootPos[] = {{-0.982422,-1.92383,-2.25586},{-2.01782,-4.24121,-2.30939},{-0.95166,1.48047,-2.31586}};
-	lootPos[] = {{-0.982422,-1.92627,-2.21573},{-2.01782,-4.2417,-2.21918},{-0.759277,1.42139,-2.21573}};
+	lootPos[] = {{-2.68,-5.79,-22.67},{-2.58,1.46,-22.67},{1.4,-5.85,-22.67},{-1.22,2.99,-20.71},{2.12,2.16,-14.76},{-3.99,-3.58,-14.36},{-4.13,2.92,-10.61},{1.22,1.67,-6.03},{-3.95,-3.39,-6.4},{-4.45,0.97,-2.31},{-4.52,0.61,2.78},{0.82,-0.5,7.21},{-1.82,3.73,2.78}};
+	lootPosSmall[] = {{-1.01,-5.33,-22.67},{-1.56,2.79,-21.65},{-0.7,-4.81,-14.76},{-1.25,3.07,-12.37},{2.57,-0.52,-6.39},{-4.24,-1.23,3.96},{0.68,2.37,2.78},{-1.67,0.13,7.11}};
 };
 
 class Land_Mil_House: Military
@@ -124,13 +119,8 @@ class Land_Mil_House: Military
 		"z_policeman"
 	};
 	zedPos[] = {{11.1638,4.70117,-5.67465},{12.4565,1.42383,-5.67465},{13.6672,4.42383,-5.67465}};
-	lootPos[] = {
-		//{12.4565,1.42383,-5.67465},{11.1638,4.70117,-5.67465},{13.6672,4.42383,-5.67465},
-		{-14.3345,1.24414,-4.94623},{-7.87842,1.45117,-4.15622},{-7.77686,-5.34277,-0.88623},{-4.43506,-5.33594,-0.88623}
-	};
-	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}
-	};
+	lootPos[] = {{8.02,4.33,-5.07},{5,2.6,-5.07},{10.72,-1.85,-5.57},{2.59,-5.69,-5.07},{0.71,-6.8,-5.07},{-7.48,-7.23,-4.24},{-10.11,-4.59,-5.07},{-12.21,-2.28,-5.07},{-7.87,4.44,-0.09},{-13.76,-6.49,-0.94},{-13.96,3.4,-0.94},{-1.71,-6.68,-0.94},{-1.38,-1.7,-0.94},{-12.84,2.75,3.25},{-6.69,-6.36,3.3},{-13.78,6.93,-0.69},{-5.78,6.62,-3.7},{12.91,3.06,-5.68},{14.4,1.51,-5.68},{3.92,2.42,-5.07},{10.82,-0.49,-5.57},{-1.9,-7.37,-5.07},{-1.71,3.84,-5.07},{-1.17,1.31,-5.07}};
+	lootPosSmall[] = {{9.8,1.45,-4.97},{9.74,2.38,-3.8},{9.74,2.35,-4.96},{9.77,3.22,-4.93},{9,4.78,-5.07},{9.73,-0.19,-4.95},{3.47,1,-5.07},{4.15,-5.17,-4.97},{1.95,-5.85,-4.95},{1.96,-5.01,-4.57},{-2.92,-3.78,-5.07},{-4.83,-6.98,-5.07},{-3.2,-7.07,-5.07},{-8.16,-6.95,-5.07},{-4.08,1.73,-0.81},{-4.08,2.51,-0.82},{-7.22,4.41,-0.94},{-7.15,1.57,-0.94},{-8.26,-4.42,-0.94},{-7.24,-4.68,-0.94},{-1,-3.76,-0.94},{-14.76,-0.43,-2.85},{-14.74,-1.45,-2.85}};
 };
 
 class Land_Mil_Barracks_i: MilitarySpecial
@@ -323,20 +313,132 @@ class Land_smd_kostel_trosky: MilitarySpecial // church ruins
 	lootPos[] = {{3.83789,0.8125,-4.81671},{0.206055,12.3555,-5.09952}};
 };
 // ALT-MAP Support 
+class Land_Mil_hangar_EP1: MilitaryIndustrial // tak hangar
+{
+	zombieClass[] = 
+	{
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_soldier_pilot",
+		"z_soldier_heavy",
+		"z_worker1",
+		"z_worker2",
+		"z_worker3"
+	};
+	maxRoaming = 3;
+	lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
+};
+class Land_Mil_ControlTower_EP1: Military // tak atc
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootChance = 0.4;
+	lootPos[] = {
+		{ 5.53369,3.64355,-5.46368 },
+		{ 7.67236,3.68115,-1.0687 },
+		{ 7.53271,-1.70068,-1.0687 },
+		{ 4.55225,1.64111,2.92148 },
+		{ 10.1292,3.6958,-9.62869 },
+		{ 0.491943,6.1543,-9.62869},
+		{ 7.54956,1.74512,-0.378696},
+		{5.40234,-1.71289,-0.378696}};
+};
+class Land_Mil_Barracks_i_EP1: MilitarySpecial // tak barracks
+{
+	lootChance = 0.2;
+	maxRoaming = 2;
+	lootPos[] = {
+		{5.15625,-2.30371,-1.09824},
+		{1.05664,-2.45508,-1.09824},
+		{-0.841797,-2.36133,-1.09824},
+		{-4.03516,-2.31836,-1.09824},
+		{-8.49609,-2.33838,-1.09824}};
+};
+class Land_Mil_House_EP1: Military // tak
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	vehPos[] = {
+		{ 13.439,3.25244,-5.71244,84 }};
+	lootPos[] = {
+		{11.7949,4.3147,-5.81439}
+	};
+	lootPosSmall[] = {
+		{-1.54785,5.46997,-5.00406},
+		{-2.61816,5.46362,-5.0097}
+	};
+	zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
+};
 
-//DZE ADDED BELOW
-class land_AII_last_floor: MilitarySpecial {
+class land_st_vez: MilitarySpecial // nm tower
+{
+	lootPos[] = {{-5.56445,4.23975,-3.31476},{-5.05566,-3.17627,-3.31476},{4.12109,3.92822,2.42732},{-1.73389,2.68896,6.40834},{-4.23584,1.29736,6.40834},{-3.80322,-1.09277,6.40834},{0.430664,1.31787,6.40834},{-2.45166,-2.16748,6.40834},{-0.608398,-0.57666,-11.095},{-2.08691,1.10303,-11.0649},{0.259277,-3.89697,-3.31476},{3.9375,3.30957,-8.50825}};
+};
+class Land_mi8_crashed: Military // nm wreck
+{
+	lootPos[] = {{0.238281, -2.89746, -1.65002}, {0.0, -4.06982, -1.7}, {-0.245117, -6.06982, -1.74091}};
+};
+class land_AII_last_floor: MilitarySpecial
+{
 	zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
 	lootChance = 0.5;
 	maxRoaming = 3;
 	lootPos[] = {{-1.73975,-7.99756,11.6976},{-1.73975,-7.99756,11.6976},{-1.20801,5.45605,4.6129},{-3.82813,2.81494,5.46183}};
 };
-class land_AII_middle_floor: MilitarySpecial {
+
+class land_AII_middle_floor: MilitarySpecial
+{
 	zombieClass[] = {"z_soldier","z_soldier","z_policeman"};
 	lootChance = 0.5;
 	maxRoaming = 3;
 	lootPos[] = {{-7.64941,4.97412,0.510368},{-7.7207,5.10498,0.510216},{-7.27979,-0.931152,0.518509},{8.47461,-2.3252,-4.63377},{9.20508,0.508301,-4.63377},{4.36768,3.7998,-4.63377},{-0.669434,2.74805,-4.63377},{-10.3594,5.03516,-4.63377},{-13.9766,9.10059,-4.63377},{-8.021,1.22314,-4.63377},{6.07227,-2.64551,-4.63377},{-8.75293,8.79297,-2.10379}};
 };
+
+class Land_AII_upper_part: Military
+{
+	lootPos[] = {{-0.616211, -3.80762, -2.31434}, {-2.62158, -1.05127, -2.32196}, {-2.30322, 2.0415, -2.32196}};
+};
+
+class Land_Mil_Guardhouse_EP1: Military //Not enterable, Takistan version
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
+};
+
+class Land_Mil_Guardhouse: Military //Enterable zero_building
+{
+	zombieClass[] =
+	{
+		"z_soldier",
+		"z_soldier",
+		"z_policeman"
+	};
+	lootChance = 0.5;
+	maxRoaming = 3;
+	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
+	lootPos[] = {
+		//{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}
+		{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}
+	};
+	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}
+	};
+};
+
+//DZE ADDED BELOW
 class land_vstup: Military {
 	lootPos[] = {{-11.51,-2.64844,-1.53312},{-6.24463,-2.85059,-1.53312},{-1.16992,-2.84961,-1.53312},{2.70898,-2.85059,-1.53312}};
 };
@@ -368,9 +470,6 @@ class land_smd_strazni_vez: Military {
 	};
 	zedPos[] = {{-1.14844,0.125977,2.28799},{1.04102,2.45898,-1.76974}};
 };
-class land_st_vez: MilitarySpecial {
-	lootPos[] = {{-5.56445,4.23975,-3.31476},{-5.05566,-3.17627,-3.31476},{4.12109,3.92822,2.42732},{-1.73389,2.68896,6.40834},{-4.23584,1.29736,6.40834},{-3.80322,-1.09277,6.40834},{0.430664,1.31787,6.40834},{-2.45166,-2.16748,6.40834},{-0.608398,-0.57666,-11.095},{-2.08691,1.10303,-11.0649},{0.259277,-3.89697,-3.31476},{3.9375,3.30957,-8.50825}};
-};
 
 class Land_A_Stationhouse_ep1: Land_a_stationhouse{};
 class land_ibr_hangar: MilitaryIndustrial
@@ -415,62 +514,6 @@ class Land_vez: Military
 	lootPos[] = {{-0.0585938,1.51367,1.36331}};
 	zedPos[] = {{-0.116699,-0.801758,-2.81857}};
 };
-
-class Land_Mil_ControlTower_EP1: Military
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	lootChance = 0.4;
-	lootPos[] = {
-		{ 5.53369,3.64355,-5.46368 },
-		{ 7.67236,3.68115,-1.0687 },
-		{ 7.53271,-1.70068,-1.0687 },
-		{ 4.55225,1.64111,2.92148 },
-		{ 10.1292,3.6958,-9.62869 },
-		{ 0.491943,6.1543,-9.62869},
-		{ 7.54956,1.74512,-0.378696},
-		{5.40234,-1.71289,-0.378696}};
-};
-class Land_Mil_hangar_EP1: MilitaryIndustrial
-{
-	zombieClass[] = 
-	{
-		"z_soldier_pilot",
-		"z_soldier_heavy",
-		"z_soldier_pilot",
-		"z_soldier_heavy",
-		"z_worker1",
-		"z_worker2",
-		"z_worker3"
-	};
-	maxRoaming = 3;
-	lootPos[] = {{-9.83203,-12.4097,-5.38129},{10.5488,-12.1318,-5.38129},{13.002,0.0214844,-5.38129},{-13.3887,0.25,-5.38129},{13.3203,20.5176,-5.38129},{-13.1865,19.9839,-5.38129},{0.0195313,21.5078,-5.38129},{0.49707,11.5469,-5.38129},{-0.836914,-0.634277,-5.38129},{0.177734,-11.6821,-5.38129}};
-};
-class Land_Mil_Guardhouse_EP1: Military
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	lootPos[] = {{-3.05859,1.76514,-1.59003},{-3.16895,3.45361,-1.59003},{-3.19922,-0.323242,-1.59003}};
-};
-class Land_Mil_Barracks_i_EP1: MilitarySpecial
-{
-	lootChance = 0.2;
-	maxRoaming = 2;
-	lootPos[] = {
-		{5.15625,-2.30371,-1.09824},
-		{1.05664,-2.45508,-1.09824},
-		{-0.841797,-2.36133,-1.09824},
-		{-4.03516,-2.31836,-1.09824},
-		{-8.49609,-2.33838,-1.09824}};
-};
 class Land_fortified_nest_big_EP1: Military
 {
 	lootPos[] = {
@@ -479,26 +522,6 @@ class Land_fortified_nest_big_EP1: Military
 		{-0.991211,1.11621,-0.740341},
 		{-2.87109,-3.94238,-0.740341}};
 };
-
-class Land_Mil_House_EP1: Military
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	vehPos[] = {
-		{ 13.439,3.25244,-5.71244,84 }};
-	lootPos[] = {
-		{11.7949,4.3147,-5.81439}
-	};
-	lootPosSmall[] = {
-		{-1.54785,5.46997,-5.00406},
-		{-2.61816,5.46362,-5.0097}
-	};
-	zedPos[] = {{-2.13477,6.69116,-4.56909},{5.58887,6.41284,-4.44098}};
-};
 class datsun02Wreck: Military
 {
 	zombieClass[] = {"zZombie_Base","z_hunter"};
@@ -517,45 +540,6 @@ class HMMWVWreck: Military
 	maxRoaming = 2;
 	lootPos[] = {};
 };
-
-class Land_Mil_Guardhouse: Military //MOVED FROM RESIDENTIAL
-{
-	zombieClass[] =
-	{
-		"z_soldier",
-		"z_soldier",
-		"z_policeman"
-	};
-	lootChance = 0.5;
-	maxRoaming = 3;
-	zedPos[] = {{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}};
-	lootPos[] = {
-		//{-2.44727,0.250977,-1.70563},{-2.44873,3.00293,-1.70285}
-		{4.65381,-3.61914,-1.46277},{2.99756,3.54102,-0.712769}
-	};
-	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}
-	};
-};
-
-class UH1Wreck_DZ: Military {
-	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
-	zombieChance = 0.3;
-	lootChance = 0.6;
-	minRoaming = 4;
-	maxRoaming = 8;
-	lootPos[] = {};
-};
-
-class UH60Wreck_DZ: Military {
-	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
-	zombieChance = 0.3;
-	lootChance = 0.6;
-	minRoaming = 4;
-	maxRoaming = 8;
-	lootPos[] = {};
-};
-
 class UH60_NAVY_Wreck_DZ: Military {
 	zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"};
 	zombieChance = 0.3;

SQF/dayz_code/Configs/CfgLoot/Buildings/Office.hpp

@@ -11,10 +11,10 @@ class Land_HouseB_Tenement : Office
 	//lootPos[] = {{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{-12.0771,0.645508,-20.7845},{-0.924805,5.26563,-20.7845}};
 	lootPos[] = {
 		//{5.41,9.89,-20.78},{5.99,14.17,-20.78},{12.96,14.07,-20.78},{14.61,8.92,-20.78},{-12.08,0.65,-20.78},{-0.92,5.27,-20.78},{1.27,-0.62,-20.78},{-2.28,2.08,-20.78},{-10.07,4.64,-20.78},{5.35,3.42,-20.78},{13.35,3.37,-20.78},{2.53,-5.75,-20.78},
-		{2.39063,4.80322,-19.8245},{-10.2041,-0.48877,-20.3445},{4.65625,-2.125,-20.3445},{7.27734,11.5957,-20.8045},{-4.50854,5.10645,-19.8245},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}
+		{8.22,6.3,-20.67},{-3.17,0.92,-20.67},{-10.87,-0.99,-20.18},{11.08,11.29,-20.66},{7.27734,11.5957,-20.8045},{5.11865,12.0298,-20.8045},{13.5625,12.1631,-20.8045}
 	};
 	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}
+		{-4.57,4.42,-19.59},{-1.08,4.15,-19.67},{13.53,2.95,-20.66},{-0.94,4.73,-20.66},{-11.28,4.61,-20.66},{4.33,4.15,-20.67},{13.41,11.21,-20.22},{6.7251,11.6895,-20.3445},{3.9,-0.99,-20.66},{12.9602,10.0479,-20.8045},{13.3726,0.939453,-20.8045}
 	};
 	zedPos[] = {{-0.924805,5.26563,-20.7845},{-12.0771,0.645508,-20.7845},{12.9604,14.0723,-20.7845},{14.6064,8.92383,-20.7845},{5.40576,9.89453,-20.7845},{5.98975,14.168,-20.7845}};
 };
@@ -66,6 +66,10 @@ class Land_A_Office01 : Office
 	};
 	zedPos[] = {{0.242188,6.06348,-4.52798},{11.8037,-1.77832,-4.52798},{13.8174,-0.731445,-4.52798},{14.5811,-4.1123,-4.52798},{-2.50391,-2.46875,-4.52798},{4.11133,6.11328,-4.52798},{4.11279,-0.686523,-4.52798},{4.31641,3.74121,-4.52798},{5.08887,0.219727,-4.52798},{-7.76221,5.59082,-4.52798},{1.18945,6.07129,-2.02802},{12.8701,4.70996,-2.02802},{15.3721,3.42383,-2.02802},{1.81152,0.994141,-2.02802},{2.23145,3.76563,-2.02802},{4.93164,4.32031,-2.02802},{7.13867,-2.50684,-2.02802},{8.3457,-1.10645,-2.02802},{4.7666,-4.55859,-2.02487},{9.94727,-3.74023,-2.008},{-4.89111,-2.54785,-1.99799},{-14.5596,-3.40625,-1.98798},{-15.2705,5.92871,-1.94794},{13.6729,6.59668,0.451965},{-10.9063,6.04199,0.451996},{-2.12988,4.5166,0.472015},{7.6416,6.3877,0.472015},{-6.30762,3.30078,0.482025},{13.1924,-2.58594,0.492004},{-1.45654,-2.2832,6.19489},{3.09229,2.4375,6.2049}};
 };
+//land_vysoky1 in Residential.hpp
+//land_dlouhy2 in Residential.hpp
+//land_hotel_p2 in Residential.hpp
+//land_hotel_p1 in Residential.hpp
 
 class Land_A_Office02 : Office
 {

SQF/dayz_code/Configs/CfgLoot/Buildings/Residential.hpp

@@ -104,13 +104,10 @@ class Land_A_MunicipalOffice : Residential
 	maxRoaming = 3;
 	zedPos[] = {{-0.20752,-6.48633,-18.429},{3.31641,-5.77441,-18.429},{-4.66113,-6.27246,-18.429}};
 	lootChance = 0.4;
-	lootPos[] = {
-		//{-4.66113,-6.27246,-18.429},{3.31641,-5.77441,-18.429},{-0.20752,-6.48633,-18.429},{-9.72412,-4.8877,-3.759},{-9.57813,3.55566,-3.759},{-7.17285,11.083,-3.76901},{5.06934,11.1836,-3.74899},{9.3208,5.38574,-3.76901},{9.65283,-4.82129,-3.74899},{3.23535,-0.106445,-0.169037},{4.85156,-3.69043,-0.169037},{-0.80127,-7.88184,-0.169037},{-4.4082,-4.91797,-0.169037},{-4.90771,-2.23145,-0.169037},
-		{-4.66113,-6.27173,-18.429},{3.31641,-5.77417,-18.429},{-0.20752,-6.48682,-18.429},{-9.72412,-4.88745,-3.78903},{-9.57813,3.55615,-3.78903},{-7.16797,11.0737,-3.78903},{5.07422,11.1838,-3.78903},{9.3208,5.38623,-3.78903},{9.65332,-4.82056,-3.78903},{3.23535,-0.105957,-0.169027},{4.85205,-3.69019,-0.169027},{-0.80127,-7.89087,-0.169027},{-4.4082,-4.91772,-0.169027},{-4.90771,-2.23169,-0.169027}
-	};
-	lootPosSmall[] = {
+	lootPos[] = {{-7.73,2.87,-18.43},{-10.45,-2.57,-18.43},{8.85,-5.84,-18.43},{2.86,6.01,-18.43},{9.67,1.66,-18.43},{7.26,10.91,-18.43},{-7.66,10.63,-18.43},{-3.14,5.58,-18.43},{-3.45,10.97,-12.41},{1.5,10.97,-12.41},{-7.92,4.17,-12.41},{-9.73,1.63,-12.41},{7.16,-3.95,-12.41},{9.37,3.61,-12.41},{9.82,10.7,-12.41},{-0.29,7.74,-14.4},{-5.67,0.71,-18.43},{5.72,0.36,-18.43},{9.89,7.54,-3.63},{-4.64,-1.66,-0.17},{4.63,-1.3,-0.17},{-0.27,-7.77,-0.17},{-9.87,2.68,-3.7},{1.66,11.25,-3.71}};
+	/*lootPosSmall[] = {
 		{4.34521,-8.81567,-18.439},{-1.06787,-5.11499,-18.439},{1.3291,9.86938,-18.4413},{-1.54395,9.90649,-18.4353}
-	};
+	};*/
 };
 
 class Land_HouseV2_04_interier : Residential
@@ -153,13 +150,10 @@ class Land_sara_domek_zluty : Residential
 {
 	maxRoaming = 1;
 	zedPos[] = {{-6.17139,-2.33789,-2.43384},{-0.660645,2.05469,-2.43372},{6.36401,-0.236328,-2.43372},{2.95679,3.00684,-2.43365},{-3.75342,-3.54785,-2.42389},{-2.77441,0.751953,-2.42371},{-5.07666,3.04395,-2.42352},{0.627197,-0.584961,-2.41394},{7.06665,2.9541,-2.4137}};
-	lootPos[] = {
-		//{2.96,3.01,-2.43},{7.07,2.95,-2.41},{6.36,-0.24,-2.43},{0.63,-0.58,-2.44},{-0.66,2.05,-2.43},{-2.77,0.75,-2.42},{-5.08,3.04,-2.42},{-6.17,-2.34,-2.43},{-3.75,-3.55,-2.42},
-		{6.91724,3.09277,-2.43372},{6.52881,-0.521973,-2.43379},{0.613037,3.74463,-2.4337},{-7.00024,-0.744141,-2.43373},{-3.13672,3.45459,-2.43364},{-6.81055,-2.67676,-2.43385}
-	};
-	lootPosSmall[] = {
+	lootPos[] = {{7.41,3.32,-2.43},{2.89,2.75,-2.43},{0.2,3.2,-2.43},{-6.59,-3.05,-2.43},{-3.99,2.46,-2.43},{-6.58,-0.39,-2.43},{6.38,-0.34,-2.43}};
+	/*lootPosSmall[] = {
 		{7.26685,-0.882324,-2.43378},{4.00684,3.84766,-2.43372},{-1.11255,1.29395,-2.43382},{-7.22192,-4.23584,-2.43386}
-	};
+	};*/
 };
 
 class Land_HouseV_3I4 : Residential
@@ -169,13 +163,6 @@ class Land_HouseV_3I4 : Residential
 	lootPos[] = {{5.46387,2.80273,-2.61298}};
 };
 
-class Land_Shed_W4 : Residential
-{
-	maxRoaming = 3;
-	zedPos[] = {};
-	lootPos[] = {};
-};
-
 class Land_HouseV_3I1 : Residential
 {
 	maxRoaming = 3;
@@ -225,20 +212,14 @@ class Land_HouseV_2L : Residential
 class Land_HouseV_1I3 : Residential
 {
 	zedPos[] = {{2.19531,-0.954102,-2.23218}};
-	lootPos[] = {{2.19531,-0.954102,-2.23218}};
+	lootPos[] = {{0.65,5.79,-1.7},{0.47,3.13,-1.35},{-0.27,-7.12,-2.15},{-2.61,1.11,-2.16},{1.63,-3.72,-2.16}};
+	lootPosSmall[] = {{-1.33,-1.79,-1.48},{-2.79,7.96,-2.16},{0.82,-7.94,-1.61},{-1.09,-7.95,-1.6}};
 };
 
 class Land_houseV_2T2 : Residential
 {
-	zedPos[] = {{-4.24951,0.988281,-4.0574}};
-	lootPos[] = {
-		//{-4.24951,0.988281,-4.0574},
-		{-3.49072,1.01782,-4.03519}
-	};
-	lootPosSmall[] = {
-		{2.8606,4.33081,-4.65974},
-		{-0.222778,4.34985,-4.65713}
-	};
+	zedPos[] = {{-4.22,0.21,-4.06},{-2.01,2.4,-4.04},{7.07,2.15,-1.28},{0.06,-0.81,-4.04},{4.43,-4.06,-4.04},{-0.85,-4.45,-4.04},{7.24,-2.59,-4.04},{6.99,1.27,-4.04},{7.25,-0.97,-1.28},{0.49,-2.85,-1.28},{3.4,0.63,-1.28},{-2.03,2.09,-1.28},{-3.05,-1.7,-1.28}};
+	lootPos[] = {{-4.22,0.21,-4.06},{-2.01,2.4,-4.04},{7.07,2.15,-1.28},{0.06,-0.81,-4.04},{4.43,-4.06,-4.04},{-0.85,-4.45,-4.04},{7.24,-2.59,-4.04},{6.99,1.27,-4.04},{7.25,-0.97,-1.28},{0.49,-2.85,-1.28},{3.4,0.63,-1.28},{-2.03,2.09,-1.28},{-3.05,-1.7,-1.28},{3.94,-5.13,-1.32},{0.48,-5.15,-1.32}};
 };
 
 class Land_HouseBlock_A1 : Residential
@@ -710,6 +691,19 @@ class Land_smd_kasarna : Residential //
 	zedPos[] = {{6.47363,20.6445,-8.77723},{-14.2305,16.1533,-8.77723}};
 };
 // ALT-MAP Support 
+class Land_House_L_7_EP1: Residential // tak adobe open door on left 1 window on right
+{
+	lootPos[] = {{ 3.52979,-0.34375,0.102112 },{ -0.245117,3.10742,-0.261154 },{ -5.43408,3.36426,-0.646149 },{ -4.90137,1.19189,-0.651993},{ 0.214844,-3.70947,-1.00735}};
+};
+class Land_House_K_6_EP1: Residential // tak 3 story cement open door red blanket on second balcony
+{
+	lootPos[] = {{2.36108,1.41309,-1.60797},{-2.57178,1.42285,-1.59425},{-4.81445,2.98193,1.48639},{-0.123047,3.83203,1.47144},{2.7063,0.193359,4.42145},{-4.3584,-2.99609,4.33153},{-0.0888672,3.0293,4.42143},{2.10864,0.180664,1.47076},{-4.10083,-2.09082,1.55551}};
+};
+
+//land_seb_bouda3 in Industrial.hpp
+class land_seb_mine_maringotka: Residential { // Nm
+	lootPos[] = {{0.423828,0.721191,-0.612675},{-0.976563,-1.32764,-0.612675}};
+};
 
 //DZE ADDED BELOW
 class land_r_housev2_04: Residential {
@@ -813,9 +807,6 @@ class land_dlouhy2: Residential {
 class Land_dulni_bs: Residential {
 	lootPos[] = {{2.76758,2.70068,-1.75205},{2.34668,-1.28564,-1.75205},{-0.478516,-2.64844,-1.75205},{-0.53418,3.11133,-1.75205}};
 };
-class land_seb_mine_maringotka: Residential {
-	lootPos[] = {{0.423828,0.721191,-0.612675},{-0.976563,-1.32764,-0.612675}};
-};
 class Land_hut_old01: Residential {
 	lootPos[] = {{2.2793,-7.06348,-3.06107},{-3.3584,-1.7334,-3.01178},{-5.0332,-0.929688,-3.0112}};
 };
@@ -933,19 +924,6 @@ class land_mbg_killhouse_4: Residential { // cement 2 story
 	//zedPos[] = {{2.97949,2.16211,-3.84318},{-3.87012,5.46484,-3.84317},{6.9248,2.49219,-0.543175}};
 	zedPos[] = {{0.597656,-6.93311,-3.62662},{-8.15625,1.8877,-3.62662}};
 };
-class Land_House_K_6_EP1: Residential
-{
-	lootPos[] = {
-		{2.36108,1.41309,-1.60797},
-		{-2.57178,1.42285,-1.59425},
-		{-4.81445,2.98193,1.48639},
-		{-0.123047,3.83203,1.47144},
-		{2.7063,0.193359,4.42145},
-		{-4.3584,-2.99609,4.33153},
-		{-0.0888672,3.0293,4.42143},
-		{2.10864,0.180664,1.47076},
-		{-4.10083,-2.09082,1.55551}};
-};
 class Land_House_C_10_EP1: Residential
 {
 	lootPos[] = {
@@ -956,15 +934,6 @@ class Land_House_C_10_EP1: Residential
 	};
 	zedPos[] = {{0.153076,-2.36743,-3.31192},{-0.96167,-7.51587,-3.32074},{2.4646,5.95142,-3.2957},{-3.10596,6.55762,-3.29418},{2.66089,5.73584,0.00634003},{-1.50708,7.18359,0.00669289},{-0.899902,-4.46045,0.00529861}};
 };
-class Land_House_L_7_EP1: Residential
-{
-	lootPos[] = {
-		{ 3.52979,-0.34375,0.102112 },
-		{ -0.245117,3.10742,-0.261154 },
-		{ -5.43408,3.36426,-0.646149 },
-		{ -4.90137,1.19189,-0.651993},
-		{ 0.214844,-3.70947,-1.00735}};
-};
 class Land_House_L_6_EP1: Residential
 {
 	lootPos[] = {

SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp

@@ -36,6 +36,7 @@ class CfgLoot
 		#include "Groups\Trash.hpp"
 		#include "Groups\Consumable.hpp"
 		#include "Groups\ConsumableItems.hpp"
+		#include "Groups\Fuel.hpp"
 		#include "Groups\Parts.hpp"
 		//DZE
 		#include "Groups\Weapons.hpp"
@@ -107,6 +108,7 @@ class CfgLoot
 			};
 			
 			lootChance = 0;
+			lootRefreshTimer = 900;
 			lootGroup = "";
 			lootPos[] = {};
 		};
@@ -114,4 +116,4 @@ class CfgLoot
 		// Buildings
 		#include "CfgBuildingPos.hpp"
 	};
-};
+};

SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp

@@ -50,7 +50,8 @@ AmmoBoxEU2[] =
 {
 	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
 	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
-	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
+	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240},
+	{Loot_MAGAZINE,		4,		5Rnd_86x70_L115A1}
 };
 
 //7.62x39mm
@@ -102,4 +103,4 @@ AmmoBoxUS4[] =
 	{Loot_MAGAZINE,		1,		SmokeShellRed},
 	{Loot_MAGAZINE,		1,		SmokeShellGreen},
 	{Loot_MAGAZINE,		0.3,	PipeBomb}
-};
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp

@@ -3,8 +3,8 @@ Construction[] =
 	{Loot_MAGAZINE,		9,		ItemLog}, // Used for crafting and vanilla buildables
 	{Loot_MAGAZINE,		9,		ItemPlank},
 	{Loot_MAGAZINE,		5,		ItemStone}, // Used for crafting and vanilla buildables
-	{Loot_MAGAZINE,		8,		equip_nails},
-//	{Loot_MAGAZINE,		3,		ItemScrews},
+	{Loot_MAGAZINE,		4,		equip_nails},
+//	{Loot_MAGAZINE,		4,		ItemScrews},
 //	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted},
 	{Loot_MAGAZINE,		9,		equip_metal_sheet},
 	{Loot_MAGAZINE,		1,		equip_lever},
@@ -20,7 +20,6 @@ Construction[] =
 	
 	//Items
 	{Loot_MAGAZINE,		6,		ItemSandbag},
-	{Loot_MAGAZINE,		4,		ItemJerryCan},
 	{Loot_MAGAZINE,		1,		ItemWire},
 	{Loot_MAGAZINE,		4,		ItemTankTrap},
 	{Loot_MAGAZINE,		1,		equip_brick},
@@ -31,7 +30,6 @@ Construction[] =
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
 	{Loot_MAGAZINE,		1,		MortarBucket},
 	{Loot_MAGAZINE,		2,		CinderBlocks},
-	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
@@ -41,5 +39,7 @@ Construction[] =
 	{Loot_PILE,			4,		Consumable, 1, 2},
 	{Loot_GROUP,		10,		Trash},
 	//{Loot_GROUP,		6,		Parts},
+	{Loot_GROUP,		4,		JerryCan},
+	{Loot_GROUP,		3,		FuelBarrel},
 	{Loot_GROUP,		3,		Generic}
 };

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp

@@ -11,7 +11,7 @@ DynamicDebris[] =
 	{Loot_WEAPON,		5,		ItemHatchet},
 	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_PILE,			12,		Consumable, 1, 2},
-	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		7,		JerryCan},
 	{Loot_GROUP,		15,		Parts}
 };
 
@@ -30,7 +30,7 @@ DynamicDebrisMilitary[] =
 	{Loot_WEAPON,		5,		ItemHatchet},
 	{Loot_WEAPON,		5,		ItemCompass},
 	{Loot_PILE,			12,		Consumable, 1, 2},
-	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		7,		JerryCan},
 	{Loot_MAGAZINE,		7,		ItemSandbag},
 	{Loot_GROUP,		8,		Military},
 	{Loot_GROUP,		15,		Parts}
@@ -38,7 +38,7 @@ DynamicDebrisMilitary[] =
 SupplyDrop[] = {
 	{Loot_WEAPON,		5,		ItemSledge},
 	{Loot_PILE,			12,		Consumable, 1, 2},
-	{Loot_MAGAZINE,		7,		ItemJerryCan},
+	{Loot_GROUP,		7,		JerryCan},
 	{Loot_MAGAZINE,		7,		bulk_ItemTankTrap},
 	{Loot_MAGAZINE,		7,		PartPlywoodPack},
 	{Loot_MAGAZINE,		7,		PartPlankPack},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Farm.hpp

@@ -12,17 +12,14 @@ Farm[] =
 	
 	//Items
 	{Loot_MAGAZINE,		4,		ItemSandbag},
-	{Loot_MAGAZINE,		3,		ItemJerryCan},
-	{Loot_MAGAZINE,		4,		ItemFuelCan},
 	{Loot_MAGAZINE,		1,		TrapBear},
 	{Loot_MAGAZINE,		8,		PartWoodPile},
 	{Loot_MAGAZINE,		3,		equip_rope},
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
-	{Loot_MAGAZINE,		6,		equip_nails},
+	{Loot_MAGAZINE,		3,		equip_nails},
 	{Loot_MAGAZINE,		4,		equip_string},
 	{Loot_MAGAZINE,		2,		equip_lever},
 	{Loot_MAGAZINE,		2,		PartPlankPack},
-	{Loot_MAGAZINE,		2,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		1,		ItemLightBulb},
 	{Loot_MAGAZINE,		1,		ItemSledgeHead},
 	{Loot_MAGAZINE,		1.5,	ItemSledgeHandle},
@@ -33,6 +30,9 @@ Farm[] =
 	{Loot_GROUP,		3,		AttachmentsGeneric},
 	{Loot_GROUP,		8,		Consumable},
 	{Loot_WEAPON,		3,		ItemMatchbox},
+	{Loot_GROUP,		3,		JerryCan},
+	{Loot_GROUP,		4,		FuelCan},
+	{Loot_GROUP,		2,		FuelBarrel},
 	{Loot_GROUP,		8,		Generic}
 };
 

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp

@@ -16,13 +16,12 @@ Industrial[] =
 	
 	//Items
 //	{Loot_MAGAZINE,		6,		ItemSandbag},
-	{Loot_MAGAZINE,		4,		ItemJerryCan},
 //	{Loot_MAGAZINE,		1,		ItemWire},
 //	{Loot_MAGAZINE,		4,		ItemTankTrap},
 	{Loot_MAGAZINE,		1,		equip_brick},
 	{Loot_MAGAZINE,		3,		equip_duct_tape},
 	{Loot_MAGAZINE,		2,		equip_hose},
-	{Loot_MAGAZINE,		6,		equip_nails},
+	{Loot_MAGAZINE,		3,		equip_nails},
 //	{Loot_MAGAZINE,		3,		ItemScrews},
 //	{Loot_MAGAZINE,		1,		equip_scrapelectronics},
 	{Loot_MAGAZINE,		2,		equip_metal_sheet},
@@ -31,7 +30,6 @@ Industrial[] =
 	{Loot_MAGAZINE,		8,		ItemPlank},
 	{Loot_MAGAZINE,		2,		MortarBucket},
 	{Loot_MAGAZINE,		3,		CinderBlocks},
-	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},
 	
@@ -39,6 +37,8 @@ Industrial[] =
 	{Loot_GROUP,		15,		Parts},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			3,		Consumable, 1, 2},
+	{Loot_GROUP,		4,		JerryCan},
+	{Loot_GROUP,		3,		FuelBarrel},
 	{Loot_GROUP,		5,		Generic}
 };
 

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp

@@ -150,7 +150,7 @@ MilitarySpecialSmall[] =
 MilitaryIndustrial[] = {//DZE ADDED
 	{Loot_GROUP,		15,		Parts},
 	{Loot_MAGAZINE,		5,		FoodMRE},
-	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
+	{Loot_GROUP,		3,		FuelBarrel},
 	{Loot_MAGAZINE,		2,		ItemGenerator},
 	{Loot_MAGAZINE,		2,		fuel_pump_kit},
 	{Loot_MAGAZINE,		3,		ItemWire},

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp

@@ -33,7 +33,7 @@ Supermarket[] =
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
-	{Loot_MAGAZINE,		5,		equip_nails},
+	{Loot_MAGAZINE,		1,		equip_nails},
 	
 	//Groups
 	{Loot_GROUP,		40,		Consumable},

SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp

@@ -1,10 +1,5 @@
 Consumable[] =
 {
-/*	{Loot_MAGAZINE,		8,		ItemBandage},
-	{Loot_MAGAZINE,		4,		ItemHeatPack},
-	{Loot_MAGAZINE,		3,		ItemPainkiller},
-	{Loot_MAGAZINE,		3,		ItemAntibacterialWipe},*/
-	
 	{Loot_MAGAZINE,		3,		ItemWaterBottleUnfilled}, //TODO: replace with canteen to better fit Epoch lootPosSmall
 	{Loot_MAGAZINE,		3,		ItemWaterBottleSafe},
 	{Loot_MAGAZINE,		3,		ItemWaterBottle},

SQF/dayz_code/Configs/CfgLoot/Groups/Fuel.hpp

@@ -0,0 +1,17 @@
+JerryCan[] =
+{
+	{Loot_MAGAZINE,		1,		ItemJerryCan},
+	{Loot_MAGAZINE,		1,		ItemJerryCanEmpty}
+};
+ 
+FuelCan[] =
+{
+	{Loot_MAGAZINE,		1,		ItemFuelcan},
+	{Loot_MAGAZINE,		1,		ItemFuelcanEmpty}
+}; 
+
+FuelBarrel[] =
+{
+	{Loot_MAGAZINE,		1,		ItemFuelBarrel},
+	{Loot_MAGAZINE,		1,		ItemFuelBarrelEmpty}
+};

SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp

@@ -26,9 +26,10 @@ Generic[] =
 //	{Loot_MAGAZINE,		1,		equip_pvc_box},
 	{Loot_MAGAZINE,		1,		equip_lever},
 	{Loot_MAGAZINE,		1,		equip_rag},
-	{Loot_MAGAZINE,		1,		equip_nails},
-	{Loot_MAGAZINE,		1,		ItemFuelCan},
-	{Loot_MAGAZINE,		1,		PartWoodPile}
+	{Loot_MAGAZINE,		0.3,	equip_nails},
+	{Loot_MAGAZINE,		1,		PartWoodPile},
+	
+	{Loot_GROUP,		1,		FuelCan}
 };
 
 tents[] = {

SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp

@@ -43,13 +43,13 @@ sniperrifles[] = {
 	{Loot_WEAPON,		1,		AK_107_PSO},
 	{Loot_WEAPON,		0.9,	M4SPR},
 	{Loot_WEAPON,		0.9,	M40A3_DZ}, //M40A3
-	{Loot_WEAPON,		0.7,	SVD_Gh_DZ}, //SVD_CAMO
-	{Loot_WEAPON,		0.7,	SVD_des_EP1},
-	{Loot_WEAPON,		0.7,	SVD_DZ}, //SVD
+	{Loot_WEAPON,		0.7,	SVD_PSO1_Gh_DZ},
+	{Loot_WEAPON,		0.7,	SVD_PSO1_DZ},
 	{Loot_WEAPON,		1,		CZ550_DZ}, //huntingrifle
 	{Loot_WEAPON,		0.8,	M24_des_EP1},
 	{Loot_WEAPON,		0.8,	M24_DZ}, //M24
-	{Loot_WEAPON,		0.7,	BAF_LRR_scoped},
+	{Loot_WEAPON,		0.6,	BAF_LRR_scoped},
+	{Loot_WEAPON,		0.6,	BAF_LRR_scoped_W},
 	{Loot_WEAPON,		0.5,	M107_DZ},
 	{Loot_WEAPON,		0.5,	KSVK_DZE},
 	{Loot_WEAPON,		0.5,	VSS_vintorez},
@@ -95,14 +95,12 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.3,		SA58_ACOG_DZ}, //No camo, no grip handle
 	{Loot_WEAPON,		0.2,		Sa58V_RCO_EP1}, // Camo with grip handle
 	{Loot_WEAPON,		0.3,		SA58_RIS_DZ}, //SA58_DZ with different rail
-	{Loot_WEAPON,		0.4,		m8_compact},
-	{Loot_WEAPON,		0.3,		m8_sharpshooter},
-	{Loot_WEAPON,		0.3,		m8_holo_sd},
-	{Loot_WEAPON,		0.5,		m8_carbine},
-	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_SUSAT},
-	{Loot_WEAPON,		0.3,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
+	{Loot_WEAPON,		0.3,		m8_compact},
+	{Loot_WEAPON,		0.2,		m8_sharpshooter},
+	{Loot_WEAPON,		0.2,		m8_holo_sd},
+	{Loot_WEAPON,		0.3,		m8_carbine},
+	{Loot_WEAPON,		0.5,		L85A2_DZ},
 	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
-	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_ACOG}, //L85A2 ACOG
 	//Mk16
 	{Loot_WEAPON,		0.2,		SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD 
 	{Loot_WEAPON,		0.3,		SCAR_L_CQC}, //Mk16 CQC 

SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp

@@ -36,7 +36,18 @@ class CfgMagazines
 	
 	//Consumables: food, drinks etc.
 	#include "Consumables\Consumables.hpp"
-
+	
+	/*class 5Rnd_86x70_L115A1: CA_Magazine //.338 Lapua Magnum
+	{
+		scope = 2;
+		displayName = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10;
+		descriptionShort = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10_0;
+		ammo=B_86x70_Ball_noTracer;
+		count=5;
+		initSpeed = 936; //TODO
+		picture="\CA\weapons_BAF\data\UI\M_lrr_CA.paa"; 
+		// descriptionShort = $STR_DSS_10RND_M107; TODO
+	};*/
 	
 	
 	//EPOCH ADDITIONS

SQF/dayz_code/Configs/CfgMagazines/Consumables/Consumables.hpp

@@ -29,7 +29,7 @@ class ConsumableBase : CA_Magazine
 	{
 		class Consume
 		{
-			text = "Consume";
+			text = $STR_EAT_FOOD;
 			script = "spawn player_consume";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_carbomb.hpp

@@ -1,15 +1,14 @@
-
 class ItemCarBomb : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = "Car Bomb";
+	displayName = $STR_ITEM_NAME_equip_carbomb;
 	model = "\ca\weapons\explosive.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa";
-	descriptionShort = "Can be attached to a vehicles engine and then automaticly explode when the next player enters the drivers seat!";
+	descriptionShort = $STR_ITEM_DESC_equip_carbomb;
 	class ItemActions {
 		class Use {
-			text = "Attach Carbomb";
+			text = $STR_ACTIONS_attach_carbomb;
 			script = "spawn player_attach_bomb;";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Crafting/equip_tent_poles.hpp

@@ -2,7 +2,7 @@ class equip_tent_poles : CA_Magazine {
 	scope = public;
 	count = 1;
 	displayName = $STR_ITEM_NAME_equip_tent_poles;
-	descriptionShort = $STR_ITEM_DESC_tent_poles;
+	descriptionShort = $STR_ITEM_DESC_equip_tent_poles;
 	model = "z\addons\dayz_communityassets\models\1m_pole_6.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_1m_pole_6_ca.paa";
 	type = 256;

SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp

@@ -18,6 +18,11 @@ class FoodPumpkin : FoodEdible {
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
 	class ItemActions
 	{
+		class Consume
+		{
+			text = $STR_EAT_FOOD;
+			script = "spawn player_consume";
+		};
 		class Crafting
 		{
 		text = $STR_FOOD_NAME_PUMPKIN_CRAFT;
@@ -38,4 +43,4 @@ class FoodSunFlowerSeed : FoodEdible {
 	weight = 0.1;
 	model = "z\addons\dayz_communityassets\models\pistachio.p3d"; // TODO: model + icon
 	picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
-};
+};

SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp

@@ -389,21 +389,4 @@ class ItemHotwireKit: CA_Magazine {
 	picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa";
 	descriptionShort = $STR_EPOCH_HOTWIREKIT_DESC;
 	weight = 2;
-};
-
-class ItemBloodbag: CA_Magazine
-{
-	scope = public;
-	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 = $STR_EPOCH_BLOODBAG_ACTION;
-			script = "spawn player_useMeds;";
-		};
-	};
-};
+};

SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp

@@ -1152,7 +1152,7 @@ class ItemKiloHemp : CA_Magazine
 	scope = public;
 	count = 1;
 	displayName = $STR_EPOCH_KILOOFHEMP;
-	descriptionShort = $STR_EPOCH_KILOOFHEMP;
+	descriptionShort = $STR_EPOCH_KILOOFHEMP_DESC;
 	weight = 1;
 	model = "z\addons\dayz_epoch\models\kilohemp.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa";
@@ -1179,3 +1179,61 @@ class ItemKiloHemp : CA_Magazine
 		};
 	};
 };
+
+class ItemOilBarrelEmpty : ItemOilBarrel
+{
+	displayName = $STR_EPOCH_EMPTYOILBARREL;
+	descriptionShort = $STR_EPOCH_EMPTYOILBARREL_DESC;
+};	
+
+class ItemMethylaminBarrelEmpty : ItemOilBarrel
+{
+	displayName = $STR_EPOCH_EMPTYMETHYLAMINEBARREL;
+	descriptionShort = $STR_EPOCH_EMPTYMETHYLAMINEBARREL_DESC;
+};
+
+class ItemMethylaminBarrel : ItemOilBarrel
+{
+	displayName = $STR_EPOCH_METHYLAMINEBARREL;
+	descriptionShort = $STR_EPOCH_METHYLAMINEBARREL_DESC;
+};
+
+class ItemC4Charge : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	type = 256;
+	displayName = $STR_EPOCH_C4_CHARGE;
+	descriptionShort = $STR_EPOCH_C4_CHARGE_DESC;
+	model = "\ca\weapons\explosive.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\carbomb.paa";
+};
+
+class ItemKiloTobacco : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	displayName = $STR_EPOCH_KILOTOBACCO;
+	descriptionShort = $STR_EPOCH_KILOTOBACCO_DESC;
+	weight = 1;
+	model = "z\addons\dayz_epoch\models\kilohemp.p3d";
+	picture = "\z\addons\dayz_epoch\pictures\equip_kilohemp_CA.paa";
+	type = 256;
+};
+
+class ItemKiloBlackTea : ItemKiloTobacco
+{
+	displayName = $STR_EPOCH_KILOBLACKTEA;
+	descriptionShort = $STR_EPOCH_KILOBLACKTEA_DESC;
+};
+
+class ItemTobaccoLeafs : CA_Magazine
+{
+	scope = public;
+	count = 1;
+	displayName = $STR_EPOCH_TOBACCO_LEAF;
+	descriptionShort = $STR_EPOCH_TOBACCO_LEAF_DESC;
+	model = "\z\addons\dayz_communityassets\models\comfrey.p3d";
+	picture = "\z\addons\dayz_communityassets\pictures\equip_comfrey_CA.paa";
+	type = 256;
+};

SQF/dayz_code/Configs/CfgMagazines/Items/CamoNet.hpp

@@ -34,7 +34,7 @@
 		class Build
 		{
 			text = $STR_BUILD_CAMONET;
-			script = "; ['ItemCamoNetGrey','Build'] spawn player_build;";
+			script = "; ['ItemCamoNetGrey','Build'] spawn player_buildPlaceables;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemCamoNetGrey"};
 			create = "CamoNet_DZ";

SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp

@@ -36,12 +36,13 @@ class ItemScrews: CA_Magazine //Construection,farm,indestrial,castle,residential
 	scope = 2;
 	count = 1;
 	type = 256;
-	displayName = "Loose Screws";//"Box of screws for metal"
+	displayName = $STR_BLD_name_ItemScrews;//"Box of screws for metal"
 	picture = "\z\addons\dayz_buildings\equip\item_screws.paa";
 	model = "z\addons\dayz_buildings\models\screws.p3d";
 	descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
 };
 
+/*
 class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
 {
 	scope = 2;
@@ -61,7 +62,6 @@ class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
 	
 };
 
-/*
 ItemScrews //Construection,farm,indestrial,castle,residential
 ItemBagScrews //(LowChance)Construection,(LowChance)indestrial,supermarket
 ItemRSJ //Construection,farm,indestrial,castle

SQF/dayz_code/Configs/CfgMagazines/Items/Sandbag.hpp

@@ -25,7 +25,7 @@ class ItemSandbag : CA_Magazine
 		class Build2
 		{
 			text = $STR_CREATE_STASH;
-			script = "; [_id,'Build2'] spawn player_build;";
+			script = "; [_id,'Build2'] spawn player_buildPlaceables;";
 			require[] = {"ItemEtool"};
 			consume[] = {"ItemSandbag"};
 			create = "StashSmall";

SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp

@@ -17,6 +17,7 @@ class ItemTent : CA_Magazine
 			require[] = {};
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
+			//ghost = "TentStorage_Ghost";
 			//Bypass collision test
 			bypassCollision = "true";
 		};
@@ -61,6 +62,7 @@ class ItemDomeTent : CA_Magazine
 			require[] = {};
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
+			//ghost = "DomeTentStorage_Ghost";
 			//Bypass collision test
 			bypassCollision = "true";
 		};

SQF/dayz_code/Configs/CfgMagazines/Items/WireFence.hpp

@@ -17,7 +17,7 @@ class ItemWire : CA_Magazine
 			script = "spawn player_build;";
 			require[] = {"ItemToolbox"};
 			consume[] = {"ItemWire"};
-			create = "Fort_RazorWire"; // 1.8.7 uses Wire_cat1
+			create = "Fort_RazorWire"; // vanilla uses Wire_cat1
 			byPass = "byPassRoadCheck";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Items/Workbench.hpp

@@ -9,10 +9,11 @@ class ItemWorkBench : CA_Magazine
 	descriptionShort = $STR_BLD_desc_ItemWorkBench;//"A Folded Workbench, required for House Building and Some Crafting"
 	vehicle = "WorkBench";
 	sfx = "tentunpack";
+	
 	class ItemActions {
 		class Build {
 			text = $STR_BLD_build_ItemWorkBench;//"place WorkBench"
-			script = "; ['ItemWorkBench','Build'] spawn player_build;";
+			script = "; ['ItemWorkBench','Build'] spawn player_buildPlaceables;";
 			require[] = {};
 			consume[] = {"ItemWorkBench"};
 			create = "WorkBench";

SQF/dayz_code/Configs/CfgMagazines/Magazines/127x99.hpp

@@ -0,0 +1,5 @@
+class 5Rnd_127x99_as50;
+class 5Rnd_127x99_as50_CP : 5Rnd_127x99_as50
+{
+		ammo = "B_127x99_Ball_noTracer";
+};

SQF/dayz_code/Configs/CfgMagazines/Magazines/Magazines.hpp

@@ -18,5 +18,6 @@
 #include "Shotgun.hpp"
 #include "Arrows.hpp"
 #include "LauncherAmmo.hpp"
+#include "127x99.hpp" //Remove after A2OA stable branch exceeds Version 1.63.131129
 
 #undef COMBINE_MAG

SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp

@@ -204,3 +204,21 @@ class emptyBloodBag : CA_Magazine
 		};
 	};
 };
+
+//Classic blood bag
+class ItemBloodbag: CA_Magazine
+{
+	scope = public;
+	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 = $STR_BLD_use;
+			script = "spawn player_useMeds;";
+		};
+	};
+};

SQF/dayz_code/Configs/CfgMagazines/Planting.hpp

@@ -21,7 +21,7 @@ class ItemPumpkinSeed: CA_Magazine {
 	class ItemActions {
 		class Crafting
 		{
-			text = "Craft Pumpkin Plant";
+			text = $STR_CRAFT_PUMPKIN_PLANT;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
@@ -42,8 +42,8 @@ class ItemPumpkinPlant: CA_Magazine {
 	type = 256;
 	class ItemActions {
 		class Build {
-			text = "Plant Pumpkin";
-			buildText = "pumpkin plant";
+			text = $STR_CRAFT_PLANT_PUMPKIN_PLANT;
+			buildText = $STR_CRAFT_NAME_PUMPKIN_PLANT;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "Grave";			// TODO: model for Pumpkin Stage 1
@@ -63,7 +63,7 @@ class ItemHempSeed: CA_Magazine {
 	class ItemActions {
 		class Crafting
 		{
-			text = "Craft Hemp Plant";
+			text = $STR_CRAFT_HEMP_PLANT;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {""};
 			requiretools[] = {"ItemKnife"};
@@ -84,8 +84,8 @@ class ItemHempPlant: CA_Magazine {
 	type = 256;
 	class ItemActions {
 		class Build {
-			text = "Plant Hemp";
-			buildText = "hemp plant";
+			text = $STR_CRAFT_PLANT_HEMP_PLANT;
+			buildText = $STR_CRAFT_NAME_HEMP_PLANT;
 			script = "spawn player_build;";
 			require[] = {"ItemEtool"};
 			create = "MAP_c_fern";			// TODO: model for Hemp Stage 1

SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp

@@ -17,7 +17,7 @@ class ItemSodaEmpty : HandGrenade
 			script = ";[_id] spawn player_fillWater;";
 		};
 		class Crafting {
-			text = "Melt into Bars";
+			text = $STR_EPOCH_MELT_BARS;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"fire"};
 			requiretools[] = {"ItemToolbox"};
@@ -46,7 +46,7 @@ class TrashTinCan : HandGrenade
 			script = ";[_id] spawn player_fillWater;";
 		};
 		class Crafting {
-			text = "Melt into Bars";
+			text = $STR_EPOCH_MELT_BARS;
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"fire"};
 			requiretools[] = {"ItemToolbox"};

SQF/dayz_code/Configs/CfgPlayerStats/defines.hpp

@@ -25,7 +25,7 @@
 
 class horde_RscPicture
 {
-    access = 0;
+    //access = 0;
     type = CT_STATIC;
     style = ST_PICTURE;
     idc = -1;
@@ -59,7 +59,7 @@ class horde_RscText
  
 class horde_RscStructuredText
 {
-    access = 0;
+    //access = 0;
     type = CT_STRUCTURED_TEXT;
     style = ST_CENTER;
 	font = "Zeppelin33";
@@ -77,7 +77,7 @@ class horde_RscStructuredText
 
 class horde_RscButton
 {
-	access = 0;
+	//access = 0;
 	type = CT_BUTTON;
 	style = ST_LEFT;
 	x = 0;

SQF/dayz_code/Configs/CfgPlayerStats/sound.hpp

@@ -16,7 +16,7 @@ class CfgSounds
 	class horde_sound_close_book: Vas_yessir
 	{
 		name = "horde_sound_close_book";
-		sound[] = {"\z\addons\dayz_communityassets\sounds\close.wss", 1, 1};
+		sound[] = {"\z\addons\dayz_communityassets\sounds\close.wss", 0.5, 1};
 		titles[] = {};
 	};
 };

SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp

@@ -1,37 +1,52 @@
-class Category_577 {
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 30Rnd_556x45_StanagSD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class 20Rnd_762x51_B_SCAR {
-		type = "trade_items";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class 20Rnd_762x51_SB_SCAR {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
-	class 20Rnd_762x51_FNFAL {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class 20Rnd_762x51_DMR {
-		type = "trade_items";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class 5Rnd_86x70_L115A1 {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-};
+class Category_577 {
+	class 100Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 30Rnd_556x45_StanagSD {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class 20Rnd_762x51_B_SCAR {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class 20Rnd_762x51_SB_SCAR {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class 20Rnd_762x51_FNFAL {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class 20Rnd_762x51_DMR {
+		type = "trade_items";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class 5Rnd_86x70_L115A1 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 10Rnd_127x99_M107 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class 3rnd_Anzio_20x102mm {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp

@@ -1,32 +1,32 @@
-class Category_569 {
-	class LandRover_MG_TK_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};	
-	class LandRover_Special_CZ_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
-	class UAZ_MG_TK_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class GAZ_Vodnik_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};	
-	class HMMWV_M998A2_SOV_DES_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
-	class HMMWV_M1151_M2_CZ_DES_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
-};
+class Category_569 {
+	class LandRover_MG_TK_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};	
+	class LandRover_Special_CZ_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
+	};
+	class UAZ_MG_TK_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class GAZ_Vodnik_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};	
+	class HMMWV_M998A2_SOV_DES_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
+	};
+	class HMMWV_M1151_M2_CZ_DES_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp

@@ -1,57 +1,97 @@
-class Category_627 {
-	class G36_C_SD_camo { //Holo SD desert camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class M4A1_AIM_SD_camo { //CCO SD green camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class FNFAL_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class FN_FAL_ANPVS4_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class SCAR_H_LNG_Sniper {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class SCAR_H_LNG_Sniper_SD {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class M110_NVG_EP1 {
-		type = "trade_weapons";
-		buy[] = {7,"ItemGoldBar10oz"};
-		sell[] = {4,"ItemGoldBar10oz"};
-	};
-	class DMR_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class BAF_LRR_scoped {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class M240_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class Mk48_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
+class Category_627 {
+	class G36_C_SD_camo { //Holo SD desert camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_AIM_SD_camo { //CCO SD green camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class FNFAL_ANPVS4_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class FN_FAL_ANPVS4_DZE { // _DZE has toggleable night vision
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class SCAR_H_LNG_Sniper {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class SCAR_H_LNG_Sniper_SD {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M110_NVG_EP1 {
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
+	class DMR_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class DMR_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {31,"ItemGoldBar"};
+	};
+	class BAF_LRR_scoped { //Tan Lapua
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
+	class BAF_LRR_scoped_W { //Green Lapua
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
+	class m107_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar10oz"};
+	};
+	class Anzio_20_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar10oz"};
+	};
+	class M240_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M240_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M240_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class Mk48_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class Mk48_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class Mk48_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp

@@ -1,146 +1,791 @@
-class Category_485 {
-	class G36C_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class G36C_camo { //Iron sight desert camo
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class G36A_Camo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class G36K_Camo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class M16A2_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class M16A4_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M4A1_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M4A1_HWS_GL_camo { //GL Holo Green Camo
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class M4A1_HWS_GL_SD_Camo {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class M4A3_CCO_EP1 { //CCO FL Desert Camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class SCAR_L_CQC {
-		type = "trade_weapons";
-		buy[] = {7,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class SCAR_L_CQC_CCO_SD {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {8,"ItemGoldBar"};
-	};
-	class SCAR_L_CQC_Holo {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class SCAR_L_CQC_EGLM_Holo {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class SCAR_L_STD_EGLM_RCO {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {7,"ItemGoldBar"};
-	};
-	class SCAR_L_STD_HOLO {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class SCAR_L_STD_Mk4CQT {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class L85_Holo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class BAF_L85A2_RIS_SUSAT {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class BAF_L85A2_RIS_ACOG {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class SA58_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class Sa58V_CCO_EP1 {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class Sa58V_RCO_EP1 {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class AKS74U_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class AKM_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class AK74_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class FNFAL_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class FN_FAL_ANPVS4_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
-
-class Category_615 {
-	duplicate = 485;
-};
+class Category_485 {
+	class G36C_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class G36C_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class G36C_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class G36C_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class G36C_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class G36C_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class G36C_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class G36C_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class G36C_camo { //Iron sight desert camo
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class G36A_Camo_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class G36K_Camo_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class G36K_Camo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A2_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class M16A2_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class M16A4_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M16A4_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class M16A4_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M16A4_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M16A4_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M16A4_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A4_GL_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M16A4_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M16A4_GL_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A4_GL_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M16A4_GL_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M16A4_GL_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M16A4_GL_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M4A1_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class M4A1_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_CCO_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_CCO_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_Holo_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_Holo_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_ACOG_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M4A1_ACOG_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_GL_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M4A1_GL_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_GL_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_GL_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_CCO_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M4A1_GL_CCO_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_Holo_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M4A1_GL_Holo_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A1_GL_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {13,"ItemGoldBar"};
+	};
+	class M4A1_GL_ACOG_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {14,"ItemGoldBar"};
+	};
+	class M4A1_HWS_GL_camo { //GL Holo Green Camo
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M4A1_HWS_GL_SD_Camo {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M4A3_CCO_EP1 { //CCO FL Desert Camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC {
+		type = "trade_weapons";
+		buy[] = {7,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_CCO_SD {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_Holo {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SCAR_L_CQC_EGLM_Holo {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_EGLM_RCO {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_HOLO {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SCAR_L_STD_Mk4CQT {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class L85A2_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class L85A2_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class L85A2_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L85A2_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_CCO_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_CCO_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class L85A2_CCO_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class L85A2_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class L85A2_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L85A2_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_Holo_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_Holo_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class L85A2_Holo_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class L85A2_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class L85A2_ACOG_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class L85A2_ACOG_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; //Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class SA58_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class SA58_RIS_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class SA58_RIS_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class SA58_RIS_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SA58_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SA58_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SA58_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SA58_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class SA58_Holo_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SA58_Holo_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SA58_ACOG_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SA58_ACOG_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class SA58_ACOG_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class Sa58V_CCO_EP1 { //Desert camo no attachment support
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Sa58V_RCO_EP1 { //Desert camo no attachment support
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class AKS74U_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class AKS74U_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AKS74U_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class AKS74U_Kobra_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class AKM_DZ {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AKM_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class AKM_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class AK74_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class AK74_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AK74_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class AK74_GL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AK74_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class AK74_Kobra_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class AK74_PSO1_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class AK74_GL_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class AK74_GL_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class AK74_GL_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class AK74_GL_Kobra_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class AK74_GL_PSO1_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class FNFAL_DZ {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class FNFAL_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class FNFAL_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_615 {
+	duplicate = 485;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp

@@ -1,61 +1,66 @@
-class Category_538 {
-	class DZ_Czech_Vest_Pouch {
-		type = "trade_backpacks";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class DZ_Patrol_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
-	class DZ_Assault_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class DZ_TerminalPack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class DZ_ALICE_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {6,"ItemSilverBar10oz"};
-		sell[] = {3,"ItemSilverBar10oz"};
-	};
-	class DZ_TK_Assault_Pack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {8,"ItemSilverBar10oz"};
-		sell[] = {4,"ItemSilverBar10oz"};
-	};
-	class DZ_CompactPack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};	
-	class DZ_British_ACU {
-		type = "trade_backpacks";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class DZ_GunBag_EP1 {
-		type = "trade_backpacks";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class DZ_CivilBackpack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class DZ_Backpack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-};
-
-class Category_688 {
-	duplicate = 538;
-};
+class Category_538 {
+	class DZ_Czech_Vest_Pouch {
+		type = "trade_backpacks";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class DZ_Patrol_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
+	class DZ_Assault_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class DZ_TerminalPack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class DZ_ALICE_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {6,"ItemSilverBar10oz"};
+		sell[] = {3,"ItemSilverBar10oz"};
+	};
+	class DZ_TK_Assault_Pack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {8,"ItemSilverBar10oz"};
+		sell[] = {4,"ItemSilverBar10oz"};
+	};
+	class DZ_CompactPack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};	
+	class DZ_British_ACU {
+		type = "trade_backpacks";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class DZ_GunBag_EP1 {
+		type = "trade_backpacks";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class DZ_CivilBackpack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class DZ_Backpack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class DZ_LargeGunBag_EP1 {
+		type = "trade_backpacks";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_688 {
+	duplicate = 538;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp

@@ -1,61 +1,116 @@
-class Category_486 {
-	class BAF_L86A2_ACOG {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class L110A1_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class M249_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M249_m145_EP1_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {9,"ItemGoldBar"};
-	};
-	class M240_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class Mk48_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class RPK_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class RPK74_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class UK59_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class PKM_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class Pecheneg_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
-
-class Category_616 {
-	duplicate = 486;
-};
+class Category_486 {
+	class BAF_L86A2_ACOG {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L110A1_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class L110A1_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class L110A1_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M249_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M249_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M249_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {8,"ItemGoldBar"};
+	};
+	class M240_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class M240_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M240_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class Mk48_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class Mk48_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class Mk48_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class RPK_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class RPK_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class RPK_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {14,"ItemGoldBar"};
+	};
+	class RPK74_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class RPK74_Kobra_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class RPK74_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class UK59_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class PKM_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class Pecheneg_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+};
+
+class Category_616 {
+	duplicate = 486;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp

@@ -1,41 +1,56 @@
-class Category_622 {
-	class 100Rnd_556x45_M249 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 200Rnd_556x45_M249 {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 50Rnd_762x54_UK59 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 75Rnd_545x39_RPK {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 75Rnd_762x39_RPK {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 100Rnd_762x54_PK {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-};
-
-class Category_481 {
-	duplicate = 622;
-};
+class Category_622 {
+	class 100Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 200Rnd_556x45_L110A1 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 100Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 50Rnd_762x54_UK59 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 45Rnd_545x39_RPK {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class 75Rnd_545x39_RPK {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 75Rnd_762x39_RPK {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 100Rnd_762x54_PK {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+};
+
+class Category_481 {
+	duplicate = 622;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp

@@ -1,118 +1,123 @@
-class Category_541 {
-	class ItemAntibiotic {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class ItemBandage {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemAntibacterialWipe {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	// bloodBagONEG is automatically swapped with ItemBloodbag if dayz_classicBloodBagSystem = true; Other typed bags and bloodTester are ignored.
-	class bloodBagONEG {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class bloodBagANEG {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagAPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagBNEG {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagBPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagABNEG {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagABPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodBagOPOS {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class bloodTester {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class transfusionKit {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class emptyBloodBag {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemEpinephrine {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemHeatPack {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemMorphine {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class ItemPainkiller {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class equip_string {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class equip_gauze {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class equip_gauzepackaged {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class equip_rag {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class equip_herb_box {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
+class Category_541 {
+	class ItemAntibiotic {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class ItemBandage {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemAntibacterialWipe {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	// bloodBagONEG is automatically swapped with ItemBloodbag if dayz_classicBloodBagSystem = true; Other typed bags and bloodTester are ignored.
+	class bloodBagONEG {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class bloodBagANEG {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagAPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagBNEG {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagBPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagABNEG {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagABPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodBagOPOS {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class bloodTester {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class transfusionKit {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class emptyBloodBag {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemEpinephrine {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemHeatPack {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemMorphine {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemPainkiller {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_string {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_gauze {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_gauzepackaged {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_rag {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_herb_box {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemKiloHemp {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
 };

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp

@@ -1,46 +1,51 @@
-class Category_491 {
-	class LandRover_CZ_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class LandRover_TK_CIV_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class HMMWV_M1035_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_Ambulance {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_Ambulance_CZ_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class HMMWV_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class GAZ_Vodnik_MedEvac {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
-};
-
-class Category_599 {
-	duplicate = 491;
-};
+class Category_491 {
+	class LandRover_CZ_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class LandRover_TK_CIV_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class HMMWV_M1035_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_Ambulance {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_Ambulance_CZ_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class HMMWV_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class BTR40_TK_INS_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class GAZ_Vodnik_MedEvac {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
+	};
+};
+
+class Category_599 {
+	duplicate = 491;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistolAmmo.hpp

@@ -1,46 +1,46 @@
-class Category_625 {
-	class 15Rnd_9x19_M9 {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 15Rnd_9x19_M9SD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 17Rnd_9x19_glock17 {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 17Rnd_9x19_glock17SD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 6Rnd_45ACP {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 7Rnd_45ACP_1911 {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 8Rnd_9x18_Makarov {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 8Rnd_9x18_MakarovSD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_484 {
-	duplicate = 625;
+class Category_625 {
+	class 15Rnd_9x19_M9 {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 15Rnd_9x19_M9SD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 17Rnd_9x19_glock17 {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 17Rnd_9x19_glock17SD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 6Rnd_45ACP {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 7Rnd_45ACP_1911 {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 8Rnd_9x18_Makarov {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 8Rnd_9x18_MakarovSD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_484 {
+	duplicate = 625;
 };

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp

@@ -1,36 +1,71 @@
-class Category_489 {
-	class M9_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};	
-	class G17_DZ {
-		type = "trade_weapons";
-		buy[] = {5,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class Makarov_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class Revolver_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class revolver_gold_EP1 {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M1911_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_617 {
-	duplicate = 489;
-};
+class Category_489 {
+	class M9_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class M9_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {25,"ItemSilverBar10oz"};
+	};	
+	class G17_DZ {
+		type = "trade_weapons";
+		buy[] = {5,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class G17_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemSilverBar10oz"};
+	};
+	class G17_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class G17_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class G17_SD_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {32,"ItemSilverBar10oz"};
+	};
+	class G17_SD_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {42,"ItemSilverBar10oz"};
+	};
+	class Makarov_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class Makarov_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {21,"ItemSilverBar10oz"};
+	};
+	class Revolver_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class revolver_gold_EP1 {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M1911_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_617 {
+	duplicate = 489;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp

@@ -1,46 +1,161 @@
-class Category_574 {
-	class Crossbow_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class RedRyder {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class MR43_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {8,"ItemSilverBar"};
-	};
-	class Winchester1866_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class M1014_DZ {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class Remington870_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class LeeEnfield_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class Mosin_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_620 {
-	duplicate = 574;
-};
+class Category_574 {
+	class Crossbow_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class Crossbow_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Crossbow_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Crossbow_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Crossbow_Scope_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class Crossbow_CCO_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class Crossbow_Scope_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Crossbow_CCO_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Crossbow_Scope_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class RedRyder {
+		type = "trade_weapons";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class MR43_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {8,"ItemSilverBar"};
+	};
+	class Winchester1866_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class M1014_DZ {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M1014_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class M1014_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Remington870_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Remington870_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Remington870_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class LeeEnfield_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class Mosin_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class Mosin_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {12,"ItemSilverBar10oz"};
+	};
+	class Mosin_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class Mosin_Belt_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class Mosin_Belt_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {32,"ItemSilverBar10oz"};
+	};
+	class Mosin_Belt_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {42,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {32,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {42,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {52,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_Belt_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {52,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_Belt_FL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {62,"ItemSilverBar10oz"};
+	};
+	class Mosin_PU_Belt_MFL_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {72,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_620 {
+	duplicate = 574;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp

@@ -1,61 +1,61 @@
-class Category_623 {
-	class 1Rnd_Bolt_Tranquilizer {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 1Rnd_Bolt_Explosive {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class 12Rnd_Quiver_Wood {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class 350Rnd_BB_Magazine {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 2Rnd_12Gauge_Buck {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 2Rnd_12Gauge_Slug {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 8Rnd_12Gauge_Slug {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
-	class 8Rnd_12Gauge_Buck {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar"};
-		sell[] = {4,"ItemSilverBar"};
-	};
-	class 15Rnd_W1866_Slug {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 10Rnd_303British {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class 5Rnd_762x54_Mosin {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-};
-
-class Category_573 {
-	duplicate = 623;
-};
+class Category_623 {
+	class 1Rnd_Bolt_Tranquilizer {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 1Rnd_Bolt_Explosive {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class 12Rnd_Quiver_Wood {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class 350Rnd_BB_Magazine {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 2Rnd_12Gauge_Buck {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 2Rnd_12Gauge_Slug {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 8Rnd_12Gauge_Slug {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
+	class 8Rnd_12Gauge_Buck {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
+	class 15Rnd_W1866_Slug {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 10Rnd_303British {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class 5Rnd_762x54_Mosin {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+};
+
+class Category_573 {
+	duplicate = 623;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp

@@ -1,46 +1,96 @@
-class Category_487 {
-	class M4SPR {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M14_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class CZ550_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class M24_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M24_des_EP1 { // desert camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M40A3_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SVD_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SVD_des_EP1 { // desert camo
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-};
-
-class Category_619 {
-	duplicate = 487;
-};
+class Category_487 {
+	class M4SPR {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M14_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class M14_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class M14_CCO_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M14_Holo_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {12,"ItemGoldBar"};
+	};
+	class M14_CCO_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {13,"ItemGoldBar"};
+	};
+	class M14_Holo_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {13,"ItemGoldBar"};
+	};
+	class CZ550_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class M24_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M24_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class M24_des_EP1 { // desert camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M40A3_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M40A3_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SVD_DZ { // iron sights
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SVD_Gh_DZ { // iron sights and ghillie
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {7,"ItemGoldBar"};
+	};
+	class SVD_PSO1_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class SVD_PSO1_Gh_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar10oz"}; // Sell only
+		sell[] = {11,"ItemGoldBar"};
+	};
+	class SVD_des_EP1 { // desert camo
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_619 {
+	duplicate = 487;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp

@@ -1,26 +1,26 @@
-class Category_624 {
-	class 5Rnd_17HMR {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
-	class 5Rnd_762x51_M24 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 20Rnd_762x51_DMR {
-		type = "trade_items";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class 10Rnd_762x54_SVD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_482 {
-	duplicate = 624;
-};
+class Category_624 {
+	class 5Rnd_17HMR {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class 5Rnd_762x51_M24 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 20Rnd_762x51_DMR {
+		type = "trade_items";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class 10Rnd_762x54_SVD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_482 {
+	duplicate = 624;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGunAmmo.hpp

@@ -1,41 +1,41 @@
-class Category_626 {
-	class 20Rnd_B_765x17_Ball {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_UZI {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_UZI_SD {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_MP5 {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 30Rnd_9x19_MP5SD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class 64Rnd_9x19_Bizon {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class 64Rnd_9x19_SD_Bizon {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
-
-class Category_483 {
-	duplicate = 626;
-};
+class Category_626 {
+	class 20Rnd_B_765x17_Ball {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_UZI {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_UZI_SD {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_MP5 {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 30Rnd_9x19_MP5SD {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class 64Rnd_9x19_Bizon {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class 64Rnd_9x19_SD_Bizon {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};
+
+class Category_483 {
+	duplicate = 626;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp

@@ -1,31 +1,41 @@
-class Category_488 {
-	class Sa61_EP1 {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
-	class PDW_DZ {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class UZI_SD_EP1 {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class MP5_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class Bizon_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-};
-
-class Category_618 {
-	duplicate = 488;
-};
+class Category_488 {
+	class Sa61_EP1 {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class PDW_DZ {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class UZI_SD_EP1 {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class MP5_DZ {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class MP5_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {22,"ItemSilverBar10oz"};
+	};
+	class Bizon_DZ {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class Bizon_SD_DZ {
+		type = "trade_weapons";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {6,"ItemGoldBar"};
+	};
+};
+
+class Category_618 {
+	duplicate = 488;
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp

@@ -1,62 +1,77 @@
-class Category_527 {
-	class 8Rnd_B_Saiga12_74Slug {
-		type = "trade_items";
-		buy[] = {5,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 8Rnd_B_Saiga12_Pellets {
-		type = "trade_items";
-		buy[] = {5,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 20Rnd_B_AA12_Pellets {
-		type = "trade_items";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 20Rnd_B_AA12_74Slug {
-		type = "trade_items";
-		buy[] = {8,"ItemSilverBar"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 30Rnd_556x45_Stanag {
-		type = "trade_items";
-		buy[] = {5,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 30Rnd_556x45_StanagSD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class 20Rnd_762x51_B_SCAR {
-		type = "trade_items";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class 20Rnd_762x51_SB_SCAR {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
-	class 100Rnd_556x45_BetaCMag {
-		type = "trade_items";
-		buy[] = {6,"ItemSilverBar10oz"};
-		sell[] = {3,"ItemSilverBar10oz"};
-	};
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 20Rnd_9x39_SP5_VSS {
-		type = "trade_items";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class 5Rnd_127x108_KSVK {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-};
+class Category_527 {
+	class 8Rnd_B_Saiga12_74Slug {
+		type = "trade_items";
+		buy[] = {5,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class 8Rnd_B_Saiga12_Pellets {
+		type = "trade_items";
+		buy[] = {5,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class 20Rnd_B_AA12_Pellets {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 20Rnd_B_AA12_74Slug {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class 30Rnd_556x45_Stanag {
+		type = "trade_items";
+		buy[] = {5,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class 30Rnd_556x45_StanagSD {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class 20Rnd_762x51_B_SCAR {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class 20Rnd_762x51_SB_SCAR {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class 100Rnd_556x45_BetaCMag {
+		type = "trade_items";
+		buy[] = {6,"ItemSilverBar10oz"};
+		sell[] = {3,"ItemSilverBar10oz"};
+	};
+	class 100Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_556x45_M249 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 100Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 200Rnd_762x51_M240 {
+		type = "trade_items";
+		buy[] = {-1,"ItemGoldBar"}; // Sell only
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 20Rnd_9x39_SP5_VSS {
+		type = "trade_items";
+		buy[] = {3,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 5Rnd_127x108_KSVK {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+};

SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp

@@ -1,87 +1,92 @@
-class Category_526 {
-	class MeleeBaseBallBat {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class Saiga12K {
-		type = "trade_weapons";
-		buy[] = {5,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class AA12_PMC {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {5,"ItemGoldBar"};
-	};
-	class m8_compact {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class m8_sharpshooter {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class m8_holo_sd {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class m8_carbine {
-		type = "trade_weapons";
-		buy[] = {5,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class M8_SAW {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SCAR_H_CQC_CCO {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SCAR_H_CQC_CCO_SD {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class SCAR_H_STD_EGLM_Spect {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class MG36 {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class MG36_camo {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class M60A4_EP1_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class m240_scoped_EP1_DZE {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
-	};
-	class VSS_vintorez {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar10oz"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class KSVK_DZE {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-};
+class Category_526 {
+	class MeleeBaseBallBat {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class Saiga12K {
+		type = "trade_weapons";
+		buy[] = {5,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class AA12_PMC {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class m8_compact {
+		type = "trade_weapons";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class m8_sharpshooter {
+		type = "trade_weapons";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class m8_holo_sd {
+		type = "trade_weapons";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class m8_carbine {
+		type = "trade_weapons";
+		buy[] = {5,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class M8_SAW {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_CQC_CCO {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_CQC_CCO_SD {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class SCAR_H_STD_EGLM_Spect {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class MG36 {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class MG36_camo {
+		type = "trade_weapons";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class M249_m145_EP1_DZE {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {9,"ItemGoldBar"};
+	};
+	class M60A4_EP1_DZE {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class m240_scoped_EP1_DZE {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar"};
+	};
+	class VSS_vintorez {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class KSVK_DZE {
+		type = "trade_weapons";
+		buy[] = {3,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+};

SQF/dayz_code/Configs/CfgTownGenerator/CfgTownGeneratorDefault.hpp

@@ -2222,7 +2222,6 @@ class Zelenogorsk {
 	class Object24 { type = "SKODAWreck"; position[] = {2761.44, 5442.06, 0}; direction = 196; onFire = 0; };
 	class Object25 { type = "Fort_Barricade"; position[] = {2215.06, 5154.03, 0}; direction = 129; onFire = 0; };
 	class Object26 { type = "Rubbish1"; position[] = {2831.18, 5463.18, 0}; direction = 204; onFire = 0; };
-	class Object27 { type = "datsun01Wreck"; position[] = {2214.82, 5153.37, 0}; direction = 122; onFire = 0; };
 	class Object28 { type = "Fort_Barricade"; position[] = {2722.08, 5128.01, 0}; direction = 112; onFire = 0; };
 	class Object29 { type = "datsun02Wreck"; position[] = {2731.03, 5062.87, 0}; direction = 110; onFire = 0; };
 	class Object30 { type = "Land_Misc_Rubble_EP1"; position[] = {3202.4, 5156.94, 0}; direction = 300; onFire = 0; };
@@ -2234,7 +2233,6 @@ class Zelenogorsk {
 	class Object36 { type = "Rubbish5"; position[] = {2759.29, 5326.47, 0}; direction = 19; onFire = 0; };
 	class Object37 { type = "SKODAWreck"; position[] = {2626.12, 5118.43, 0}; direction = 140; onFire = 0; };
 	class Object38 { type = "Rubbish3"; position[] = {2646.66, 5926.84, 0}; direction = 327; onFire = 0; };
-	class Object39 { type = "RoadBarrier_long"; position[] = {2236.18, 5146.44, 0}; direction = 275; onFire = 0; };
 	class Object40 { type = "Fort_Barricade"; position[] = {2874.81, 5256.3, 0}; direction = 105; onFire = 0; };
 	class Object41 { type = "datsun02Wreck"; position[] = {2991.58, 5561.9, 0}; direction = 34; onFire = 0; };
 	class Object42 { type = "Land_Misc_Garb_Heap_EP1"; position[] = {2257.37, 5151.29, 0}; direction = 21; onFire = 0; };
@@ -2244,7 +2242,6 @@ class Zelenogorsk {
 	class Object46 { type = "Land_Misc_Rubble_EP1"; position[] = {2661.45, 5575.91, 0}; direction = 8; onFire = 0; };
 	class Object47 { type = "datsun02Wreck"; position[] = {2589.71, 4850.21, 0}; direction = 165; onFire = 0; };
 	class Object48 { type = "Rubbish3"; position[] = {3129.71, 5196.39, 0}; direction = 283; onFire = 0; };
-	class Object49 { type = "Fort_Barricade"; position[] = {2224.11, 5152.66, 0}; direction = 122; onFire = 0; };
 	class Object50 { type = "RoadBarrier_long"; position[] = {3407.76, 4908.85, 0}; direction = 227; onFire = 0; };
 	class Object51 { type = "Rubbish1"; position[] = {2731.81, 5353.15, 0}; direction = 336; onFire = 0; };
 	class Object52 { type = "Fort_Barricade"; position[] = {2262.95, 5374.37, 0}; direction = 178; onFire = 0; };
@@ -2257,11 +2254,9 @@ class Zelenogorsk {
 	class Object59 { type = "Rubbish3"; position[] = {2266.61, 5161.07, 0}; direction = 36; onFire = 0; };
 	class Object60 { type = "HMMWVWreck"; position[] = {2812.47, 5270.69, 0}; direction = 97; onFire = 0; };
 	class Object61 { type = "Fort_Barricade"; position[] = {2753.43, 5325.69, 0}; direction = 279; onFire = 0; };
-	class Object62 { type = "SKODAWreck"; position[] = {2234.22, 5141.31, 0}; direction = 288; onFire = 0; };
 	class Object63 { type = "Rubbish5"; position[] = {2625.31, 5070.09, 0}; direction = 242; onFire = 0; };
 	class Object64 { type = "datsun01Wreck"; position[] = {3397.79, 4906.4, 0}; direction = 308; onFire = 0; };
 	class Object65 { type = "Land_Misc_Rubble_EP1"; position[] = {2820.04, 5243.38, 0}; direction = 4; onFire = 0; };
-	class Object66 { type = "hiluxWreck"; position[] = {2225.07, 5151.34, 0}; direction = 113; onFire = 0; };
 	class Object67 { type = "Land_Misc_Garb_Heap_EP1"; position[] = {2724.28, 5192.38, 0}; direction = 18; onFire = 0; };
 	class Object68 { type = "Land_CncBlock_D"; position[] = {2820.7, 5453.61, 0}; direction = 39; onFire = 0; };
 	class Object69 { type = "Rubbish4"; position[] = {3370.46, 4931.3, 0}; direction = 305; onFire = 0; };
@@ -2270,7 +2265,6 @@ class Zelenogorsk {
 	class Object72 { type = "Rubbish1"; position[] = {3551.27, 5070.84, 0}; direction = 26; onFire = 0; };
 	class Object73 { type = "UralWreck"; position[] = {2730.68, 5202.66, 0}; direction = 18; onFire = 0; };
 	class Object74 { type = "Land_Misc_Garb_Heap_EP1"; position[] = {2813.97, 5230.95, 0}; direction = 179; onFire = 0; };
-	class Object75 { type = "Fort_Barricade"; position[] = {2244.23, 5144.63, 0}; direction = 209; onFire = 0; };
 	class Object76 { type = "RoadBarrier_long"; position[] = {2706.65, 5277.55, 0}; direction = 291; onFire = 0; };
 	class Object77 { type = "UAZWreck"; position[] = {2531.19, 6250.84, 0}; direction = 354; onFire = 0.833768; };
 	class Object78 { type = "hiluxWreck"; position[] = {2716.33, 5463.63, 0}; direction = 23; onFire = 0; };
@@ -4352,21 +4346,13 @@ class Berezino {
 	class Object173 { type = "Rubbish1"; position[] = {11978, 9090.7, 0}; direction = 264; onFire = 0; };
 	class Object174 { type = "Body"; position[] = {11981, 9141.68, 0}; direction = 130; onFire = 0; };
 	class Object175 { type = "Body2"; position[] = {12000.9, 9066, 0}; direction = 330; onFire = 0; };
-	class Object176 { type = "Land_BagFenceLong"; position[] = {11989.1, 9154.88, 0}; direction = 312; onFire = 0; };
 	class Object177 { type = "Land_Misc_Rubble_EP1"; position[] = {12027.1, 9056.95, 0}; direction = 142; onFire = 0; };
 	class Object178 { type = "HMMWVWreck"; position[] = {12019.1, 9169.68, 0}; direction = 96; onFire = 0.259646; };
-	class Object179 { type = "Land_BagFenceLong"; position[] = {11985, 9152.74, 0}; direction = 42; onFire = 0; };
 	class Object180 { type = "Rubbish5"; position[] = {12012.9, 9170.08, 0}; direction = 264; onFire = 0; };
-	class Object181 { type = "Land_BagFenceLong"; position[] = {11988.7, 9158.63, 0}; direction = 224; onFire = 0; };
-	class Object182 { type = "Land_BagFenceLong"; position[] = {11983.6, 9153.96, 0}; direction = 42; onFire = 0; };
 	class Object183 { type = "Land_Misc_Rubble_EP1"; position[] = {12074.2, 9079.12, 0}; direction = 142; onFire = 0; };
 	class Object184 { type = "Land_Misc_Rubble_EP1"; position[] = {12027.7, 9173.92, 0}; direction = 259; onFire = 0; };
-	class Object185 { type = "Land_BagFenceLong"; position[] = {11982.2, 9155.23, 0}; direction = 42; onFire = 0; };
 	class Object186 { type = "Body1"; position[] = {12000.7, 9057.93, 0}; direction = 59; onFire = 0; };
 	class Object187 { type = "Land_ladder_half"; position[] = {11987.6, 9160.85, 0}; direction = 223; onFire = 0; };
-	class Object188 { type = "Land_BagFenceLong"; position[] = {11981.7, 9158.49, 0}; direction = 134; onFire = 0; };
-	class Object189 { type = "Land_BagFenceLong"; position[] = {11983.1, 9159.85, 0}; direction = 134; onFire = 0; };
-	class Object190 { type = "Land_BagFenceLong"; position[] = {11984.4, 9161.2, 0}; direction = 134; onFire = 0; };
 	class Object191 { type = "Fort_RazorWire"; position[] = {11970.5, 9147.41, 0}; direction = 131; onFire = 0; };
 	class Object192 { type = "Rubbish4"; position[] = {11979.6, 9159.24, 0}; direction = 226; onFire = 0; };
 	class Object193 { type = "Hedgehog"; position[] = {11994.3, 9170.49, 0}; direction = 0; onFire = 0; };

SQF/dayz_code/Configs/CfgTownGenerator/chernarusWaters.hpp

@@ -2362,17 +2362,4 @@
 			onFire = 0;
 		};
 
-	};
-	
-	class W182 { //Blocks Topolka Dam walk under water glitch
-		position[] = {10299.095,3659.8674,2.4993041};
-		size = 50;
-		buildings = 1;
-		class Object0 {
-			type = "MAP_pond_big_01";
-			position[] = {10299.095,3659.8674,2.4993041};
-			direction = 0;
-			onFire = 0;
-		};
-	};
-
+	};

SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp

@@ -267,21 +267,20 @@ class Boat : Ship
 };
 class RHIB: Boat
 {
-	displayName = "RHIB";
-	crew = "";
+	displayName = $STR_DN_RHIB;
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
 };
 class RHIB2Turret: RHIB
 {
-	displayName = "RHIB (Mk19)";
+	displayName = $STR_DN_RHIB2;
 };
 
 class RHIB_DZ : Boat
 {
 	scope = public;
-	displayName = "RHIB";
+	displayName = $STR_DN_RHIB;
 	vehicleClass = "Ship";
 	accuracy = 0.5;
 	crew = "";
@@ -498,7 +497,7 @@ class RHIB_DZ : Boat
 		  "100Rnd_127x99_M2",
 		  "100Rnd_127x99_M2"
 		};
-		gunnerName = "front gunner";
+		gunnerName = $STR_POSITION_FRONTGUNNER;
 		gunnerOpticsModel = "\ca\weapons\optika_empty";
 		gunnerForceOptics = 0;
 		startEngine = 0;
@@ -533,7 +532,7 @@ class RHIB_DZ : Boat
 	};
 	class Library
 	{
-	  libTextDesc = "The Naval Special Warfare Rigid Hull Inflatable Boat is a fast, high-buoyancy all weather boat designed to transport a fully equipped team of eight-men and three crew members. It is also fully transportable by C-130 Hercules.";
+	  libTextDesc = $STR_LIB_RHIB;
 	};
 	extCameraPosition[] = {
 	  0,

SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_houseV_2T2.hpp

@@ -0,0 +1,172 @@
+class Land_houseV_2T2 : Land_HouseV_1I2
+{
+	model="z\addons\dayz_buildings\a2_HouseV_2t2\d_HouseV_2t2.p3d";
+	class AnimationSources
+	{
+		class dvere_1_source
+		{
+			source="user";
+			initPhase=0;
+			animPeriod=1;
+		};
+		class dvere_2_source : dvere_1_source {};	
+		class dvere_3_source : dvere_1_source {};
+		class dvere_4_source : dvere_1_source {};
+		class dvere_5_source : dvere_1_source {};
+		class dvere_6_source : dvere_1_source {};
+		class dvere_7_source : dvere_1_source {};
+		class dvere_8_source : dvere_1_source {};
+		class dvere_9_source : dvere_1_source {};
+		class dvere_10_source: dvere_1_source {};
+	};
+	class UserActions
+	{
+		class OpenDoors1
+		{
+			displayName=$STR_DN_OUT_o_DOOR;
+			position=akce_dvere1;
+			radius=1.5;
+			onlyForPlayer=false;
+			condition="this animationPhase ""dvere1"" < 0.5";
+			statement="this animate [""dvere1"", 1]";
+		};
+		class CloseDoors1
+		{
+			displayName=$STR_DN_OUT_C_DOOR;
+			position=akce_dvere1;
+			radius=1.5;
+			onlyForPlayer=false;
+			condition="this animationPhase ""dvere1"" >= 0.5";
+			statement="this animate [""dvere1"", 0]";
+		};
+		class OpenDoors2 : OpenDoors1
+		{
+			position=akce_dvere2;
+			condition="this animationPhase ""dvere2"" < 0.5";
+			statement="this animate [""dvere2"", 1]";
+		};
+		class CloseDoors2 : CloseDoors1
+		{
+			position=akce_dvere2;
+			condition="this animationPhase ""dvere2"" >= 0.5";
+			statement="this animate [""dvere2"", 0]";
+		};
+		class OpenDoors3 : OpenDoors1
+		{
+			position=akce_dvere3;
+			condition="this animationPhase ""dvere3"" < 0.5";
+			statement="this animate [""dvere3"", 1]";
+		};
+		class CloseDoors3 : CloseDoors1
+		{
+			position=akce_dvere3;
+			condition="this animationPhase ""dvere3"" >= 0.5";
+			statement="this animate [""dvere3"", 0]";
+		};
+		class OpenDoors4 : OpenDoors1
+		{
+			position=akce_dvere4;
+			condition="this animationPhase ""dvere4"" < 0.5";
+			statement="this animate [""dvere4"", 1]";
+		};
+		class CloseDoors4 : CloseDoors1
+		{
+			position=akce_dvere4;
+			condition="this animationPhase ""dvere4"" >= 0.5";
+			statement="this animate [""dvere4"", 0]";
+		};
+		class OpenDoors5 : OpenDoors1
+		{
+			position=akce_dvere5;
+			condition="this animationPhase ""dvere5"" < 0.5";
+			statement="this animate [""dvere5"", 1]";
+		};
+		class CloseDoors5 : CloseDoors1
+		{	
+			position=akce_dvere5;
+			condition="this animationPhase ""dvere5"" >= 0.5";
+			statement="this animate [""dvere5"", 0]";
+		};
+		class OpenDoors6 : OpenDoors1
+		{
+			position=akce_dvere6;
+			condition="this animationPhase ""dvere6"" < 0.5";
+			statement="this animate [""dvere6"", 1]";
+		};
+		class CloseDoors6 : CloseDoors1
+		{	
+			position=akce_dvere6;
+			condition="this animationPhase ""dvere6"" >= 0.5";
+			statement="this animate [""dvere6"", 0]";
+		};
+		class OpenDoors7 : OpenDoors1
+		{
+			position=akce_dvere7;
+			condition="this animationPhase ""dvere7"" < 0.5";
+			statement="this animate [""dvere7"", 1]";
+		};
+		class CloseDoors7 : CloseDoors1
+		{
+			position=akce_dvere7;
+			condition="this animationPhase ""dvere7"" >= 0.5";
+			statement="this animate [""dvere7"", 0]";
+		};
+		class OpenDoors8 : OpenDoors1
+		{
+			position=akce_dvere8;
+			condition="this animationPhase ""dvere8"" < 0.5";
+			statement="this animate [""dvere8"", 1]";
+		};
+		class CloseDoors8 : CloseDoors1
+		{	
+			position=akce_dvere8;
+			condition="this animationPhase ""dvere8"" >= 0.5";
+			statement="this animate [""dvere8"", 0]";
+		};
+		class OpenDoors9 : OpenDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere9"" < 0.5 or this animationPhase ""dvere10"" < 0.5";
+			statement="this animate [""dvere9"", 1];this animate [""dvere10"", 1]";
+		};
+		class CloseDoors9 : CloseDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere9"" >= 0.5 or this animationPhase ""dvere10"" >= 0.5";
+			statement="this animate [""dvere9"", 0];this animate [""dvere10"", 0]";
+		};
+	/*	class OpenDoors10 : OpenDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere10"" < 0.5";
+			statement="this animate [""dvere10"", 1]";
+		};
+		class CloseDoors10 : CloseDoors1
+		{
+			position=akce_dvere910;
+			condition="this animationPhase ""dvere10"" >= 0.5";
+			statement="this animate [""dvere10"", 0]";
+		};
+	*/	
+	};
+	actionBegin1 = "OpenDoors1";
+	actionEnd1   = "OpenDoors1";
+	actionBegin2 = "OpenDoors2";
+	actionEnd2   = "OpenDoors2";
+	actionBegin3 = "OpenDoors3";
+	actionEnd3   = "OpenDoors3";
+	actionBegin4 = "OpenDoors4";
+	actionEnd4   = "OpenDoors4";
+	actionBegin5 = "OpenDoors5";
+	actionEnd5   = "OpenDoors5";
+	actionBegin6 = "OpenDoors6";
+	actionEnd6   = "OpenDoors6";
+	actionBegin7 = "OpenDoors7";
+	actionEnd7   = "OpenDoors7";
+	actionBegin8 = "OpenDoors8";
+	actionEnd8   = "OpenDoors8";
+	actionBegin9 = "OpenDoors9";
+	actionEnd9   = "OpenDoors9";
+//	actionBegin10= "OpenDoors10";
+//	actionEnd10  = "OpenDoors10";
+};

SQF/dayz_code/Configs/CfgVehicles/CamoNetting.hpp

@@ -27,7 +27,7 @@
 			position="action";
 			radius = 3.0;
 			onlyForPlayer = 1;
-			condition = "alive this";
+			condition = "!dayz_actionInProgress && (alive this)";
 			statement = "this spawn object_dismantle;";
 		};
 	};

SQF/dayz_code/Configs/CfgVehicles/Car/CAR_SEDAN.hpp

@@ -12,7 +12,13 @@ class car_sedan : SkodaBase {
 		ItemORP[] = {"car_sedan_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}};
 	};
 };
-
+/* //Removed from dayz_vehicles
+class policecar: car_sedan {
+	class Upgrades {
+		ItemORP[] = {};
+	};
+};
+*/
 // Performance 1
 class car_sedan_DZE1: car_sedan {
 	original = "car_sedan";

SQF/dayz_code/Configs/CfgVehicles/Car/Kamaz.hpp

@@ -92,7 +92,7 @@ class KamazRefuel_DZ: KamazRefuel {
 	class TransportMagazines{};
 	class TransportWeapons{};
 	fuelCapacity = 10400;
-	//For future Developement = transportFuel = 10400;			// refueltruck
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 };
 class KamazRefuel_DZE1: KamazRefuel_DZ {
 	original = "KamazRefuel_DZ";

SQF/dayz_code/Configs/CfgVehicles/Car/Mtvr.hpp

@@ -34,7 +34,7 @@ class MtvrRefuel_DES_EP1_DZ : MtvrRefuel_base {
 	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;
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
 };
 
@@ -46,6 +46,6 @@ class MtvrRefuel_DZ: MtvrRefuel {
 	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
-	transportFuel = 0;
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
 };

SQF/dayz_code/Configs/CfgVehicles/Car/Tractor.hpp

@@ -3,4 +3,11 @@ class Tractor: Car {
 	typicalCargo[] = {};
 	class TransportMagazines {};
 	class TransportWeapons {};
+	class Reflectors
+	{
+		class Left
+		{
+			angle = 120;
+		};
+	};
 };

SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp

@@ -95,6 +95,6 @@ class UralRefuel_TK_EP1_DZ: UralRefuel_TK_EP1 {
 	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
-	transportFuel = 0;
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
 };

SQF/dayz_code/Configs/CfgVehicles/Car/V3S_Civ.hpp

@@ -1,16 +1,18 @@
-class V3S_Civ: V3S_Base {
-		crew = "";
-		faction = "CIV";
-		rarityurban = 0.3;
-		scope = public;
-		side = 3;
-		typicalCargo[] = {};
-		class TransportMagazines {};
-		class TransportWeapons {};
-		class Library {
-			libtextdesc = $STR_EP1_LIB_V3S;
-		};
+class V3S_Civ : V3S_Base 
+{
+	crew = "";
+	faction = "CIV";
+	rarityurban = 0.3;
+	scope = public;
+	side = 3;
+	typicalCargo[] = {};
+	class TransportMagazines {};
+	class TransportWeapons {};
+	class Library 
+	{
+		libtextdesc = $STR_EP1_LIB_V3S;
 	};
+};
 
 class V3S_Base_EP1;
 class V3S_Open_TK_CIV_EP1: V3S_Base_EP1 {
@@ -72,6 +74,6 @@ class V3S_Refuel_TK_GUE_EP1_DZ: V3S_Refuel_TK_GUE_EP1 {
 	hiddenSelections[] = {};
 	class TransportMagazines{};
 	class TransportWeapons{};
-	transportFuel = 0;
+	transportFuel = 0; //Required to disable A2 built in auto refuel for fuel trucks
 	fuelCapacity = 10000;
 };

SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp

@@ -4,7 +4,8 @@ class WeaponCloudsGun;  // External class reference
 class WeaponFireMGun;   // External class reference
 class WeaponCloudsMGun;
 
-class CfgVehicles {
+class CfgVehicles 
+{
 	class ALL;
 	class AllVehicles : ALL
 	{
@@ -170,8 +171,11 @@ class CfgVehicles {
 		class ViewPilot;
 		class AnimationSources;
 		class EventHandlers;
-		class Reflectors {
-			class Left {
+		class Reflectors
+		{
+			class Left
+			{
+				angle = 120;
 				color[] = {0.9,0.8,0.8,1};
 				ambient[] = {0.1,0.1,0.1,1};
 				position = "L svetlo";
@@ -181,7 +185,9 @@ class CfgVehicles {
 				size = 0.5;
 				brightness = 0.5;
 			};
-			class Right {
+			class Right
+			{
+				angle = 120;
 				color[] = {0.9,0.8,0.8,1};
 				ambient[] = {0.1,0.1,0.1,1};
 				position = "P svetlo";
@@ -198,7 +204,7 @@ class CfgVehicles {
 			class Salvage {ACTION_SALVAGE; radius = 4;};
 		};*/
 	};
-	class Car: LandVehicle {
+	class Car : LandVehicle {
 		class HitPoints
 		{
 			class HitEngine;
@@ -273,7 +279,7 @@ class CfgVehicles {
 		};
 		class Eventhandlers;
 	};
-	class Truck;
+
 
 	//External Class
 	//class SkodaBase; //in Car\Skoda.hpp
@@ -291,15 +297,37 @@ class CfgVehicles {
 			class HitRBWheel:HitRBWheel{armor=1;};
 		};
 	};
-	class Motorcycle;
+	class Motorcycle : LandVehicle
+	{
+		class Reflectors
+		{
+			class Right
+			{
+				angle = 90;
+			};
+		};
+	};
 	class RubberBoat;
 	//class UAZ_Unarmed_Base;
 	//class HMMWV_Base;
 	class AH6_Base_EP1;
-	class AH6X_EP1;
 	class An2_Base_EP1;
 	class TT650_Base;
-	class V3S_Base;
+	class Truck;
+	class V3S_Base : Truck
+	{
+		class Reflectors
+		{
+			class Left
+			{
+				angle = 120;
+			};
+			class Right
+			{
+				angle = 120;
+			};
+		};
+	};
 	class SUV_Base_EP1 : Car
 	{
 		class HitPoints : HitPoints
@@ -329,6 +357,7 @@ class CfgVehicles {
 		class DestructionEffects;
 	};
 	class House_EP1;
+	class Land_HouseV_1I2;
 	class SpawnableWreck : House {};
 	class Strategic;
 	class NonStrategic;
@@ -337,10 +366,26 @@ class CfgVehicles {
 	class BuiltItems;
 	class Building;
 	class ReammoBox;
-	
 	class M1030_base;
 	class MMT_base;
-	class Old_bike_base_EP1;
+	class Bicycle;
+	class Old_bike_base_EP1 : Bicycle
+	{
+		class Reflectors 
+		{
+			class Right
+			{
+				color[] = {0.9,0.8,0.8,1};
+				ambient[] = {0.1,0.1,0.1,1};
+				position = "P svetlo";
+				direction = "konec P svetla";
+				hitpoint = "P svetlo";
+				selection = "P svetlo";
+				brightness = 0.4;
+				size = 1;
+			};
+		};
+	};
 	class Old_moto_base;
 	class Ikarus_base;
 	//class Volha_TK_CIV_Base_EP1;
@@ -403,10 +448,6 @@ class CfgVehicles {
 	#include "Helicopter\CH47.hpp"
 	#include "Helicopter\BAF_Merlin.hpp"
 	#include "Helicopter\AH1Z.hpp"
-	//Wrecks
-	//#include "Helicopter\MI8Wreck.hpp"
-	//#include "Helicopter\UH1Wreck.hpp"
-	//#include "Helicopter\UH60Wreck.hpp"
 	#include "CrashSite.hpp"
 	//Planes
 	#include "Plane\AN2_DZ.hpp"
@@ -455,6 +496,7 @@ class CfgVehicles {
 	#include "Buildings\Land_VASICore.hpp"
 	#include "Buildings\Land_Vysilac_FM.hpp"
 	#include "Buildings\WaterSources.hpp"
+	#include "Buildings\Land_houseV_2T2.hpp"
 
 	//Duplicates of Epoch items in DZE\Prop_Defs.hpp
 	//#include "CamoNetting.hpp"
@@ -480,6 +522,18 @@ class CfgVehicles {
 	#include "antihack_plants.hpp"
 	//#include "antihack_weaponholders.hpp"
 	
+	class Land_CncBlock_AntiHack: NonStrategic
+	{
+		scope=public;
+		vehicleClass="Misc";
+		//model = \Ca\misc3\CncBlock_D;
+		model = "z\addons\dayz_communityassets\models\CncBlock_D.p3d";
+		Icon = "\Ca\misc3\Data\Icons\icon_cnc_con_barrier_CA.paa";
+		mapSize = 4;
+		displayName=$STR_MISC_CNCBLOCK_D;
+		armor=150;
+	};
+	
 	//EPOCH
 	#include "DZE\Wrecks.hpp"
 	#include "DZE\Doors.hpp"

SQF/dayz_code/Configs/CfgVehicles/CommonActions.hpp

@@ -8,7 +8,7 @@
 	condition = "(['Repair',this] call userActionConditions)";\
 	statement = "this call player_repairVehicle;";\
 	hideOnUse = 0
-
+		
 #define ACTION_SALVAGE displayName = $STR_ACTIONS_SALVAGEVEH;\
 	displayNameDefault = $STR_ACTIONS_SALVAGEVEH;\
 	priority = 0;\
@@ -29,4 +29,13 @@
 	onlyForPlayer = 1;\
 	shortcut = "";\
 	condition = "(['PushPlane',this] call userActionConditions)";\
-	statement = "this call player_pushPlane;"
+	statement = "this call player_pushPlane;"
+	
+#define ACTION_REARM priority = 3;\
+	radius = 3;\
+	position = "camera";\
+	showWindow = 0;\
+	onlyForPlayer = 1;\
+	shortcut = "reloadMagazine";\
+	condition = "(['AddAmmo',this] call userActionConditions)";\
+	hideOnUse = 1

SQF/dayz_code/Configs/CfgVehicles/DZE/CSJ_GyroAC.hpp

@@ -103,7 +103,7 @@ class CSJ_GyroP: Plane
 			condition = "(Count (Crew this)==0) and ((getpos this select 2) <1) and (!isengineon this)";
 			statement = "this exec ""\CSJ_GyroAC\scripts\CSJ_rotateGyroRight.sqs"" ";
 		};
-		class push
+		/*class push
 		{
 			displayName = $STR_ACTIONS_PUSH;
 			position = "osa leve smerovky";
@@ -111,7 +111,9 @@ class CSJ_GyroP: Plane
 			radius = 2;
 			condition = "(Count (Crew this)==0) and ((getpos this select 2) <1) and (!isengineon this)";
 			statement = "this exec ""\CSJ_GyroAC\scripts\CSJ_moveGyro.sqs"" ";
-		};
+		};*/
+		//CSJ_moveGyro.sqs uses excessive setPos per second which makes BEServer.cfg MaxSetPosPerInterval filter useless 
+		class PushPlane {ACTION_PUSH;};
 		//class Repair {ACTION_REPAIR; radius = 4;};
 		//class Salvage {ACTION_SALVAGE; radius = 4;};
 	};

SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp

@@ -281,7 +281,7 @@ class Land_ammo_supply_wreck: ruins	{
 /* Your doorsegment is derivated from the normal wall.*/
 class Land_DZE_WoodDoor: Land_DZE_WoodDoor_Base {
 	model = "\z\addons\dayz_epoch\models\small_wall_door_anim.p3d";
-	displayName =  "Wood Door";
+	displayName = $STR_EPOCH_WALLWITHDOOR;
 	GhostPreview = "WoodDoor_Preview_DZ"; 
 	upgradeBuilding[] = {"Land_DZE_WoodDoorLocked",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -317,7 +317,7 @@ class Land_DZE_WoodDoor: Land_DZE_WoodDoor_Base {
 
 class Land_DZE_WoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 	model = "\z\addons\dayz_epoch\models\small_wall_door_locked_anim.p3d";
-	displayName =  "Wood Door Locked";
+	displayName = $STR_EPOCH_WALLWITHDOORLOCKED;
 	GhostPreview = "WoodDoor_Preview_DZ"; 
 	downgradeBuilding[] = {"Land_DZE_WoodDoor",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -358,8 +358,7 @@ class Land_DZE_WoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 		class Lock_Door : Open_Door
 		{
 			displayName=$STR_EPOCH_DOORS_LOCK;
-			//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
-			condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
+			condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
 			statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_hinge"", 0]";
 		};
 		class Unlock_Door : Open_Door
@@ -381,7 +380,7 @@ class Land_DZE_WoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 
 class Land_DZE_LargeWoodDoor: Land_DZE_WoodDoor_Base {
 	model = "\z\addons\dayz_epoch\models\large_wall_door_anim.p3d";
-	displayName =  "Large Wood Door";
+	displayName = $STR_EPOCH_LARGEWALLWITHDOOR;
 	GhostPreview = "LargeWoodDoor_Preview_DZ";
 	upgradeBuilding[] = {"Land_DZE_LargeWoodDoorLocked",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -417,7 +416,7 @@ class Land_DZE_LargeWoodDoor: Land_DZE_WoodDoor_Base {
 
 class Land_DZE_LargeWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 	model = "\z\addons\dayz_epoch\models\large_wall_door_locked_anim.p3d";
-	displayName =  "Large Wood Door Locked";
+	displayName = $STR_EPOCH_LARGEWALLWITHDOORLOCKED;
 	GhostPreview = "LargeWoodDoor_Preview_DZ";
 	downgradeBuilding[] = {"Land_DZE_LargeWoodDoor",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -458,8 +457,7 @@ class Land_DZE_LargeWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 		class Lock_Door : Open_Door
 		{
 			displayName=$STR_EPOCH_DOORS_LOCK;
-			//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
-			condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
+			condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
 			statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_hinge"", 0]";
 		};
 		class Unlock_Door : Open_Door
@@ -481,7 +479,7 @@ class Land_DZE_LargeWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 
 class Land_DZE_GarageWoodDoor: Land_DZE_WoodDoor_Base {
 	model = "\z\addons\dayz_epoch\models\Garage_door_anim.p3d";
-	displayName =  "Garage Wood Door";
+	displayName = $STR_EPOCH_WOODGARAGEDOOR;
 	GhostPreview = "GarageWoodDoor_Preview_DZ";
 	upgradeBuilding[] = {"Land_DZE_GarageWoodDoorLocked",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -517,7 +515,7 @@ class Land_DZE_GarageWoodDoor: Land_DZE_WoodDoor_Base {
 
 class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 	model = "\z\addons\dayz_epoch\models\Garage_door_locked_anim.p3d";
-	displayName =  "Garage Wood Door Locked";
+	displayName = $STR_EPOCH_WOODGARAGEDOORLOCKED;
 	GhostPreview = "GarageWoodDoor_Preview_DZ";
 	downgradeBuilding[] = {"Land_DZE_GarageWoodDoor",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -558,8 +556,7 @@ class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 		class Lock_Door : Open_Door
 		{
 			displayName=$STR_EPOCH_DOORS_LOCK;
-			//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
-			condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
+			condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
 			statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_hinge"", 0]";
 		};
 		class Unlock_Door : Open_Door
@@ -582,7 +579,7 @@ class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base {
 
 class CinderWallDoorLocked_DZ: CinderWallDoorLocked_DZ_Base {
 	model = "\z\addons\dayz_epoch\models\steel_garage_locked.p3d";
-	displayName =  "Block Garage Door Locked";
+	displayName = $STR_EPOCH_BLOCKGARAGEDOORLOCKED;
 	GhostPreview = "CinderWallDoorway_Preview_DZ";
 	downgradeBuilding[] = {"CinderWallDoor_DZ",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -623,8 +620,7 @@ class CinderWallDoorLocked_DZ: CinderWallDoorLocked_DZ_Base {
 		class Lock_Door : Open_Door
 		{
 			displayName=$STR_EPOCH_DOORS_LOCK;
-			//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
-			condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
+			condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
 			statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_latch"", 0]";
 		};
 		class Unlock_Door : Open_Door
@@ -647,7 +643,7 @@ class CinderWallDoorLocked_DZ: CinderWallDoorLocked_DZ_Base {
 
 class CinderWallDoor_DZ: CinderWallDoor_DZ_Base {
 	model = "\z\addons\dayz_epoch\models\steel_garage_door.p3d";
-	displayName =  "Block Garage Door";
+	displayName = $STR_EPOCH_BLOCKGARAGEDOOR;
 	GhostPreview = "CinderWallDoorway_Preview_DZ";
 	upgradeBuilding[] = {"CinderWallDoorLocked_DZ",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -685,7 +681,7 @@ class CinderWallDoor_DZ: CinderWallDoor_DZ_Base {
 
 class CinderWallDoorSmallLocked_DZ: CinderWallDoorLocked_DZ_Base {
 	model = "\z\addons\dayz_epoch\models\Steel_door_locked.p3d";
-	displayName =  "Block Door Locked";
+	displayName = $STR_EPOCH_BLOCKDOORLOCKED;
 	GhostPreview = "CinderWallSmallDoorway_Preview_DZ";
 	downgradeBuilding[] = {"CinderWallDoorSmall_DZ",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/
@@ -726,8 +722,7 @@ class CinderWallDoorSmallLocked_DZ: CinderWallDoorLocked_DZ_Base {
 		class Lock_Door : Open_Door
 		{
 			displayName=$STR_EPOCH_DOORS_LOCK;
-			//condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)";
-			condition="(!keypadCancel and DZE_Lock_Door == (this getvariable['CharacterID','0'])) and (this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
+			condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_latch"" == 1)";
 			statement="PVDZE_handleSafeGear = [player,this,4];publicVariableServer ""PVDZE_handleSafeGear"";this animate [""Open_latch"", 0]";
 		};
 		class Unlock_Door : Open_Door
@@ -750,7 +745,7 @@ class CinderWallDoorSmallLocked_DZ: CinderWallDoorLocked_DZ_Base {
 
 class CinderWallDoorSmall_DZ: CinderWallDoor_DZ_Base {
 	model = "\z\addons\dayz_epoch\models\Steel_door.p3d";
-	displayName =  "Block Door";
+	displayName = $STR_EPOCH_BLOCKDOOR;
 	GhostPreview = "CinderWallSmallDoorway_Preview_DZ";
 	upgradeBuilding[] = {"CinderWallDoorSmallLocked_DZ",{{"ItemComboLock",1}}};
 	/* Arma needs to know, how the animation trigger is triggered*/

SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp

@@ -249,7 +249,7 @@ class BagFenceRound_DZ: BuiltItems
 	cost = 100;
 	model = "\ca\misc2\BagFenceRound.p3d";
 	icon = "\Ca\misc3\data\Icons\icon_bagFenceRound_ca.paa";
-	offset[] = {0,1.5,0.5};
+	offset[] = {0,3,0.5};
 	mapSize = 2;
 	armor = 400;
 	displayName = $STR_EQUIP_NAME_21_ROUND;

SQF/dayz_code/Configs/CfgVehicles/DZE/VaultStorage.hpp

@@ -21,7 +21,7 @@ class VaultStorageLocked: Land_A_tent {
 	transportMaxMagazines = 0;
 	transportMaxWeapons = 0;
 	transportMaxBackpacks = 0;
-	offset[] = {0,1.5,0};
+	offset[] = {0,2.5,0};
 	lockable = 4;
 	unlockedClass = "VaultStorage";
 	requireplot = 0;

SQF/dayz_code/Configs/CfgVehicles/Hedgehog.hpp

@@ -28,7 +28,7 @@
 			position="action";
 			radius = 2.7;
 			onlyForPlayer = 1;
-			condition = "alive this";
+			condition = "!dayz_actionInProgress && (alive this)";
 			statement = "this spawn object_dismantle;";
 		};
 	};

SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp

@@ -42,6 +42,7 @@ class AH6J_EP1_DZ: AH6_Base_EP1
 		fired = "_this call BIS_Effects_EH_Fired;";
 	};
 };
+
 class AH6J_EP1_DZE: AH6J_EP1_DZ
 {
 	scope = public;
@@ -49,9 +50,12 @@ class AH6J_EP1_DZE: AH6J_EP1_DZ
 	displayName = "AH6J_DZE";
 	magazines[] = {"60Rnd_CMFlareMagazine"};
 };
-class AH6X_DZ: AH6X_EP1 {
+
+class AH6X_DZ: AH6_Base_EP1 {
 	displayname = $STR_VEH_NAME_AH6X;
 	displaynameshort = $STR_EP1_DN_AH6X;
+	model = "dayz_vehicles\helicopters\greybird\greybird.p3d";
+	//cargoAction[] = {"AH6j_Cargo_EP1","UH1Y_Cargo01","UH1Y_Cargo01"};
 	audible = 6;
 	enablemanualfire = 0;
 	scope = public;
@@ -61,7 +65,6 @@ class AH6X_DZ: AH6X_EP1 {
 	hiddenselections[] = {"camo1"};
 	hiddenselectionstextures[] = {"ca\air_e\ah6j\data\ah6_merge1_co.paa"};
 	icon = "\ca\air_e\data\UI\Icon_ah6x_CA.paa";
-	model = "\ca\air_e\ah6j\ah6x";
 	picture = "\ca\air_e\data\UI\Picture_ah6x_CA.paa";
 	isuav = 0;
 	radartype = 0;
@@ -76,62 +79,8 @@ class AH6X_DZ: AH6X_EP1 {
 	transportMaxMagazines = 30;
 	transportmaxbackpacks = 2;
 	fuelCapacity = 242;
-	transportSoldier = 0;
-	memoryPointsGetInGunner = "pos_cargo";
-	memoryPointsGetInGunnerDir = "pos_cargo_dir";
-	class NewTurret;
-	class Turrets
-	{
-		class ObserverTurret: NewTurret
-		{
-			ProxyType = CPCargo;
-			proxyIndex = 1;
-			startEngine = 0;
-			hasgunner = 1;
-			body = "FLIR_turret";
-			gun = "FLIR_gun";
-			animationSourceBody = "FLIR_turret";
-			animationSourceGun = "FLIR_gun";
-			gunBeg = "FLIR_end";
-			gunEnd = "FLIR_begin";
-			memoryPointGun = "FLIR_end";
-			turretAxis = "FLIR_turret_axis";
-			gunAxis = "FLIR_gun_axis";
-			commanding = -1;
-			class Viewoptics
-			{
-				initAngleX = 0;
-				minAngleX = -30;
-				maxAngleX = 30;
-				initAngleY = 0;
-				minAngleY = -100;
-				maxAngleY = 100;
-				minFov = 0.01;
-				initFov = 0.50;
-				maxFov = 0.80;
-				visionMode[] = {"Normal","NVG"};
-				thermalMode[] = {};
-			};
-			gunnerAction = "AH6j_Cargo_EP1";
-			gunnerOpticsModel = "\ca\weapons\2Dscope_UAV.p3d";
-			memoryPointGunnerOptics = "gunnerview";
-			//gunnerOpticsModel = "\ca\weapons\optika_SOFLAM";
-			soundServo[] = {"",0.01,1};
-			gunnerForceOptics = 0;
-			gunnerGetInAction = "GetInLow";
-			gunnerGetOutAction = "GetOutLow";
-			gunnerName = "Observer";
-			animationSourceHatch = "";
-			minElev = -90;
-			maxElev = 60;
-			initElev = 0;
-			minTurn = -360;
-			maxTurn = 360;
-			initTurn = 0;
-			weapons[] = {};
-			magazines[] = {};
-		};
-	};
+
+	class Turrets {};
 	class DefaultEventhandlers;
 	class EventHandlers: DefaultEventhandlers
 	{

SQF/dayz_code/Configs/CfgVehicles/Helicopter/MI8Wreck.hpp

@@ -1,10 +0,0 @@
-class Mi8Wreck_DZ: SpawnableWreck
-	{
-		model = "\Ca\air\MI8Wreck.p3d";
-		icon = "ca\Misc_E\data\Icons\Icon_uh60_wreck_CA";
-		mapSize = 15;
-		displayName = $STR_VEH_NAME_MI8_WRECK;
-		vehicleClass = "Wrecks";
-		heightAdjustment = 1;
-		class AnimationSources {};
-	};

SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp

@@ -14,13 +14,14 @@ class UH1H_base: Helicopter
 	};
 };
 
-class UH1H_DZ: UH1H_base 
+class UH1H_DZ: UH1H_base
 {
 	displayname = "UH-1H (Green Camo)";
 	displaynameshort = "UH-1H (Green Camo)";
 	scope = public;
 	side = 2;
 	crew = "";
+	model = "dayz_vehicles\helicopters\huey\huey.p3d";
 	typicalCargo[] = {};
 	hiddenSelections[] = {};
 	class TransportMagazines{};

SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Wreck.hpp

@@ -1,9 +0,0 @@
-class UH1Wreck_DZ: SpawnableWreck
-	{
-		model = "\ca\air2\UH1Y\UH1Y_Crashed.p3d";
-		icon = "\ca\air2\data\UI\icon_UH1Y_CA.paa";
-		mapSize = 15;
-		displayName = $STR_VEH_NAME_UH1Y_WRECK;
-		vehicleClass = "Wrecks";
-		class AnimationSources {};
-	};

SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1Y.hpp

@@ -32,12 +32,12 @@ class UH1Y_DZ: UH1_Base {
 	{
 		class MainTurret: MainTurret
 		{
-			gunnerOpticsModel = "\ca\weapons\optika_SOFLAM";
+			//gunnerOpticsModel = "\ca\Weapons\optika_empty";
 			magazines[] = {"2000Rnd_762x51_M134"};
 		};
 		class RightDoorGun: RightDoorGun
 		{
-			gunnerOpticsModel = "\ca\weapons\optika_SOFLAM";
+			//gunnerOpticsModel = "\ca\Weapons\optika_empty";
 			visionMode[] = {"Normal","NVG"};
 			magazines[] = {"2000Rnd_762x51_M134"};
 		};
@@ -147,12 +147,12 @@ class UH1Y_DZE: UH1Y_DZ {
 	class Turrets : Turrets {
 		class MainTurret: MainTurret
 		{
-			gunnerOpticsModel = "\ca\weapons\optika_SOFLAM";
+			//gunnerOpticsModel = "\ca\Weapons\optika_empty";
 			magazines[] = {};
 		};
 		class RightDoorGun: RightDoorGun
 		{
-			gunnerOpticsModel = "\ca\weapons\optika_SOFLAM";
+			//gunnerOpticsModel = "\ca\Weapons\optika_empty";
 			visionMode[] = {"Normal","NVG"};
 			magazines[] = {};
 		};

SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH60Wreck.hpp

@@ -1,9 +0,0 @@
-class UH60Wreck_DZ: SpawnableWreck
-	{
-		model = "\Ca\Misc_E\Wreck_UH60_EP1.p3d";
-		icon = "ca\Misc_E\data\Icons\Icon_uh60_wreck_CA";
-		mapSize = 15;
-		displayName = $STR_VEH_NAME_UH60_WRECK;
-		vehicleClass = "Wrecks";
-		class AnimationSources {};
-	};

SQF/dayz_code/Configs/CfgVehicles/Sandbag.hpp

@@ -26,7 +26,7 @@
 			position="action";
 			radius = 3.0;
 			onlyForPlayer = 1;
-			condition = "alive this";
+			condition = "!dayz_actionInProgress && (alive this)";
 			statement = "this spawn object_dismantle;";
 		};
 	};