Loot/Traders update (#1696)

* Update Weapons.hpp * Update Military.hpp * Update Industrial.hpp * Update Industrial.hpp * Update Military.hpp * Update Residential.hpp * Update Military.hpp * Update Military.hpp * Update BanditClothing.hpp * Update BanditAmmunition.hpp * Update BanditHelicopterArmed.hpp * Update BanditMilitaryArmed.hpp * Update BanditTrucksArmed.hpp * Update BanditWeapons.hpp * Update FriendlyAssaultRifle.hpp * Update FriendlyBackpacks.hpp * Update FriendlyBuildingSupplies.hpp * Update FriendlyCargoTrucks.hpp * Update FriendlyChemlitesFlares.hpp * Update FriendlyFuelTrucks.hpp * Update FriendlyLightMachineGunAmmo.hpp * Update FriendlyMilitaryUnarmed.hpp * Update FriendlyMilitaryUnarmed.hpp * Update FriendlyPackagedFood.hpp * Update FriendlyMilitaryUnarmed.hpp * Update FriendlyPistols.hpp * Update FriendlyShotgunsandSingleshot.hpp * Update FriendlyShotgunsandSingleshotAmmo.hpp * Update FriendlySmokeGrenades.hpp * Update FriendlySniperRifle.hpp * Update FriendlySniperRifleAmmo.hpp * Update FriendlySubmachineGunAmmo.hpp * Update FriendlySubmachineGuns.hpp * Update FriendlyToolbeltItems.hpp * Update FriendlyVehicleParts.hpp * Update HeroHelicopterArmed.hpp * Update NeutralAirplanes.hpp * Update NeutralBlackMarketAmmo.hpp * Update NeutralBlackMarketWeapons.hpp * Update NeutralExplosives.hpp * Update NeutralHelicopterUnarmed.hpp * Update FriendlyDrinks.hpp * Update FriendlyLightMachineGun.hpp * Update NeutralAirplanes.hpp * Update BanditAmmunition.hpp * Update FriendlyVehicleParts.hpp * Update NeutralWholesale.hpp
2025-12-14 12:12:34 +03:00 · 2016-06-18 18:10:05 +02:00
parent 5b7ef99569
commit df6c34cfe9
38 changed files with 512 additions and 487 deletions
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
@@ -38,8 +38,8 @@ Industrial[] =
 	
 	//Other
 	{Loot_GROUP,		15,		Parts},
-	{Loot_GROUP,		7,		Military},
+//	{Loot_GROUP,		7,		Military},
 	{Loot_PILE,			10,		Trash, 1, 3},
 	{Loot_PILE,			4,		Consumable, 1, 2},
 	{Loot_GROUP,		8,		Generic}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
@@ -13,7 +13,7 @@ Military[] =
 	//Tools
 	{Loot_TOOL,			3,		Binocular},
 	{Loot_TOOL,			4,		ItemFlashlightRed},
-	{Loot_TOOL,			4,		ItemKnife},
+	{Loot_TOOL,			3.5,		ItemKnife},
 	{Loot_TOOL,			0.5,	ItemGPS},
 	{Loot_TOOL,			3,		ItemMap},
 	{Loot_TOOL,			3,		ItemEtool},
@@ -28,18 +28,18 @@ Military[] =
 	{Loot_GROUP,		1,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
-	{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
-	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
-	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
-	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	1.3,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
+	{Loot_CONTAINER,	0.7,		DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
+	{Loot_CONTAINER,	0.5,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
+	{Loot_CONTAINER,	1.5,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
+	{Loot_CONTAINER,	1.5,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
+//	{Loot_CONTAINER,	2,		DZ_MedBox, MedicalBox, 10, 20},
 	
 	//Other
 	{Loot_MAGAZINE,		5,		FoodMRE},
-	{Loot_MAGAZINE,		5,		ItemSandbag},
+	{Loot_MAGAZINE,		4,		ItemSandbag},
 	{Loot_PILE,			15,		AmmoMilitaryLow, 1, 3},
 	{Loot_GROUP,		4,		AmmoMilitaryHigh},
 	{Loot_GROUP,		4,		AttachmentsGeneric},
@@ -63,7 +63,7 @@ MilitarySpecial[] =
 	{Loot_TOOL,			4,		Binocular},
 	{Loot_TOOL,			2,		Binocular_Vector},
 	{Loot_TOOL,			3,		ItemFlashlightRed},
-	{Loot_TOOL,			5,		ItemKnife},
+	{Loot_TOOL,			4,		ItemKnife},
 	{Loot_TOOL,			1.3,	ItemGPS},
 	{Loot_TOOL,			4,		ItemMap},
 	{Loot_TOOL,			2,		ItemEtool},
@@ -77,7 +77,7 @@ MilitarySpecial[] =
 	{Loot_GROUP,		2,		specialclothes},
 	
 	//Containers
-	{Loot_CONTAINER,	3,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},	//5.45x39
+	{Loot_CONTAINER,	2.5,		DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},	//5.45x39
 	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS1, 7, 14},	//5.56x45
 	{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxCZ1, 7, 14},	//7.62x39
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxCZ2, 2, 5},	//7.62x54R
@@ -109,4 +109,4 @@ MilitaryIndustrial[] = {//DZE ADDED
 	{Loot_MAGAZINE,				2,		ItemGenerator},
 	{Loot_MAGAZINE,				2,		fuel_pump_kit},
 	{Loot_GROUP, 				15, 	Military}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Residential.hpp
@@ -4,7 +4,7 @@ Residential[] =
 	{Loot_WEAPON,		6,		MeleeBaseBallBat},
 	
 	//Weapon Groups
-	{Loot_GROUP,		3,		Military},
+//	{Loot_GROUP,		3,		Military},
 	{Loot_GROUP,		8,		pistols},
 	{Loot_GROUP,		6,		shotgunsingleshot},
 	
@@ -35,4 +35,4 @@ Residential[] =
 	{Loot_GROUP,		3,		tents},
 	{Loot_WEAPON,		3,		ItemMatchbox},
 	{Loot_GROUP,		8,		Generic}
-};
+};
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -107,7 +107,7 @@ machineguns[] = {
 	{Loot_WEAPON,		1,		Pecheneg_DZ},
 	{Loot_WEAPON,		1,		PKM_DZ}, //PK_DZ
 	{Loot_WEAPON,		0.9,	L110A1_DZ}, //BAF_L110A1_Aim_DZE scope is slightly different from L110A1_CCO_DZ, otherwise identical
-	{Loot_WEAPON,		1,		MG36_camo},
+	{Loot_WEAPON,		0.9,		MG36_camo},
 	{Loot_WEAPON,		1,		M60A4_EP1_DZE},
 	{Loot_WEAPON,		1,		MG36},
 	{Loot_WEAPON,		1,		M249_m145_EP1_DZE},
@@ -120,4 +120,4 @@ militaryshotguns[] = {
 	{Loot_WEAPON,		2,		Saiga12K},
 	{Loot_WEAPON,		2,		Remington870_FL_DZ}, //Remington870_lamp
 	{Loot_WEAPON,		2,		M1014_DZ} //M1014
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp
@@ -1,32 +1,32 @@
 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 5Rnd_86x70_L115A1 {
+		class 20Rnd_762x51_SB_SCAR {
 		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
 	};
 	class 20Rnd_762x51_FNFAL {
 		type = "trade_items";
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
 	};
-	class 20Rnd_762x51_SB_SCAR {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
 	class 20Rnd_762x51_DMR {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class 5Rnd_86x70_L115A1 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditClothing.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditClothing.hpp
@@ -9,6 +9,16 @@ class Category_575 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
+	class Skin_BanditW1_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class Skin_BanditW2_DZ {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
 	class Skin_GUE_Commander_DZ {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
@@ -49,14 +59,4 @@ class Category_575 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class Skin_BanditW1_DZ {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class Skin_BanditW2_DZ {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditHelicopterArmed.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditHelicopterArmed.hpp
@@ -1,20 +1,10 @@
 class Category_512 {
-	class CH_47F_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
-	class UH1H_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
 	class Mi17_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
-	class UH60M_EP1_DZE {
+	class UH1H_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
@@ -24,10 +14,20 @@ class Category_512 {
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
+	class UH60M_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
 	class MH60S_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
+	};	
+	class CH_47F_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
 	};
 	class CH53_DZE {
 		type = "trade_any_vehicle";
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp
@@ -1,23 +1,13 @@
 class Category_569 {
-	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 LandRover_Special_CZ_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
 	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";
@@ -28,5 +18,15 @@ class Category_569 {
 		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"};
 	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditTrucksArmed.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditTrucksArmed.hpp
@@ -1,8 +1,8 @@
 class Category_534 {
-	class ArmoredSUV_PMC_DZE {
+	class Pickup_PK_TK_GUE_EP1_DZE {
 		type = "trade_any_vehicle";
-		buy[] = {2,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
 	};
 	class Pickup_PK_GUE_DZE {
 		type = "trade_any_vehicle";
@@ -14,14 +14,14 @@ class Category_534 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {5,"ItemGoldBar"};
 	};
-	class Pickup_PK_TK_GUE_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
 	class Offroad_DSHKM_Gue_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class ArmoredSUV_PMC_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp
@@ -1,9 +1,4 @@
 class Category_627 {
-	class DMR_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
 	class G36_C_SD_camo { //Holo SD desert camo
 		type = "trade_weapons";
 		buy[] = {1,"ItemGoldBar10oz"};
@@ -14,16 +9,6 @@ class Category_627 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {5,"ItemGoldBar"};
 	};
-	class SCAR_H_LNG_Sniper_SD {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class BAF_LRR_scoped {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
 	class FNFAL_DZ {
 		type = "trade_weapons";
 		buy[] = {8,"ItemGoldBar"};
@@ -34,14 +19,29 @@ class Category_627 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class Mk48_DZ {
+	class SCAR_H_LNG_Sniper_SD {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"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"};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp
@@ -1,9 +1,4 @@
 class Category_485 {
-	class G36A_Camo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
 	class G36C_DZ {
 		type = "trade_weapons";
 		buy[] = {4,"ItemGoldBar"};
@@ -14,6 +9,11 @@ class Category_485 {
 		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"};
@@ -54,6 +54,16 @@ class Category_485 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {5,"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 SA58_DZ {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar"};
@@ -94,18 +104,8 @@ class Category_485 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class BAF_L85A2_RIS_SUSAT {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
-	class L85_Holo_DZ {
-		type = "trade_weapons";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
-	};
 };

 class Category_615 {
 	duplicate = 485;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBackpacks.hpp
@@ -9,53 +9,53 @@ class Category_538 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
-	class DZ_ALICE_Pack_EP1 {
+	class DZ_Czech_Vest_Puch {
 		type = "trade_backpacks";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
 	};
 	class DZ_Assault_Pack_EP1 {
 		type = "trade_backpacks";
 		buy[] = {1,"ItemGoldBar"};
 		sell[] = {5,"ItemSilverBar10oz"};
 	};
-	class DZ_Backpack_EP1 {
+	class DZ_TerminalPack_EP1 {
 		type = "trade_backpacks";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class DZ_British_ACU {
+	class DZ_ALICE_Pack_EP1 {
 		type = "trade_backpacks";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class DZ_CivilBackpack_EP1 {
-		type = "trade_backpacks";
-		buy[] = {6,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class DZ_Czech_Vest_Puch {
-		type = "trade_backpacks";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
 	};
 	class DZ_TK_Assault_Pack_EP1 {
 		type = "trade_backpacks";
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {3,"ItemSilverBar10oz"};
 	};
-	class DZ_TerminalPack_EP1 {
+	class DZ_British_ACU {
 		type = "trade_backpacks";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
+		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[] = {6,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
+	class DZ_Backpack_EP1 {
+		type = "trade_backpacks";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
 };

 class Category_688 {
 	duplicate = 538;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
@@ -1,14 +1,4 @@
 class Category_678 {
-	class ItemSandbag {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class ItemTankTrap {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
 	class ItemDesertTent {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar10oz"};
@@ -24,36 +14,6 @@ class Category_678 {
 		buy[] = {4,"ItemSilverBar10oz"};
 		sell[] = {2,"ItemSilverBar10oz"};
 	};
-	class ItemComboLock {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class ItemVault {
-		type = "trade_items";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
-	class ItemWire {
-		type = "trade_items";
-		buy[] = {6,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class 30m_plot_kit {
-		type = "trade_items";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar10oz"};
-	};
-	class ItemCorrugated {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	class ItemPole {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
 	class ItemLightBulb {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar10oz"};
@@ -64,6 +24,46 @@ class Category_678 {
 		buy[] = {6,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class ItemWire {
+		type = "trade_items";
+		buy[] = {6,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class ItemSandbag {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class ItemTankTrap {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class ItemPole {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
+	class ItemCorrugated {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
+	class 30m_plot_kit {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {6,"ItemGoldBar10oz"};
+	};
+	class ItemComboLock {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar10oz"};
+		sell[] = {2,"ItemSilverBar10oz"};
+	};
+	class ItemVault {
+		type = "trade_items";
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
 };

 class Category_680 {
@@ -72,4 +72,4 @@ class Category_680 {

 class Category_530 {
 	duplicate = 678;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyCargoTrucks.hpp
@@ -14,6 +14,16 @@ class Category_564 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class UralCivil_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
+	class UralCivil2_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class V3S_Open_TK_CIV_EP1 {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
@@ -24,16 +34,6 @@ class Category_564 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class Kamaz {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class MTVR_DES_EP1 {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
 	class V3S_Civ {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
@@ -49,21 +49,21 @@ class Category_564 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class UralCivil_DZE {
+	class Kamaz {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class UralCivil2_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
 	class KamazOpen_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
+	class MTVR_DES_EP1 {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemGoldBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
+	};
 	class MTVR {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemGoldBar10oz"};
@@ -73,4 +73,4 @@ class Category_564 {

 class Category_570 {
 	duplicate = 564;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyChemlitesFlares.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyChemlitesFlares.hpp
@@ -24,6 +24,16 @@ class Category_542 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
+	class FlareWhite_GP25 {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class FlareGreen_GP25 {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
 	class HandRoadFlare {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar"};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyDrinks.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyDrinks.hpp
@@ -1,4 +1,9 @@
 class Category_601 {
+	class ItemWaterbottleUnfilled {
+		type = "trade_items";
+		buy[] = {3,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
 	class ItemSodaCoke {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar"};
@@ -94,11 +99,6 @@ class Category_601 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class ItemWaterbottleUnfilled {
-		type = "trade_items";
-		buy[] = {3,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
 	class ItemSodaRbull {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar"};
@@ -113,4 +113,4 @@ class Category_601 {

 class Category_691 {
 	duplicate = 601;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyFuelTrucks.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyFuelTrucks.hpp
@@ -1,14 +1,4 @@
 class Category_492 {
-	class KamazRefuel_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {7,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class MtvrRefuel_DES_EP1_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {7,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
 	class UralRefuel_TK_EP1_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {7,"ItemGoldBar10oz"};
@@ -19,6 +9,16 @@ class Category_492 {
 		buy[] = {7,"ItemGoldBar10oz"};
 		sell[] = {3,"ItemGoldBar10oz"};
 	};
+	class KamazRefuel_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class MtvrRefuel_DES_EP1_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {7,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
 	class MtvrRefuel_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {7,"ItemGoldBar10oz"};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGun.hpp
@@ -24,16 +24,6 @@ class Category_486 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class Pecheneg_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {1,"ItemGoldBar10oz"};
-	};
-	class PKM_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
 	class RPK_DZ {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar10oz"};
@@ -49,8 +39,18 @@ class Category_486 {
 		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;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyLightMachineGunAmmo.hpp
@@ -1,4 +1,19 @@
 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"};
@@ -14,21 +29,6 @@ class Category_622 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class 100Rnd_762x51_M240 {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
-	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_762x54_PK {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
@@ -38,4 +38,4 @@ class Category_622 {

 class Category_481 {
 	duplicate = 622;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp
@@ -1,4 +1,14 @@
 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"};
@@ -19,25 +29,15 @@ class Category_491 {
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
-	class GAZ_Vodnik_MedEvac {
-		type = "trade_any_vehicle";
-		buy[] = {1,"ItemBriefcase100oz"};
-		sell[] = {5,"ItemGoldBar10oz"};
-	};
 	class HMMWV_DZ {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
-	class LandRover_CZ_EP1 {
+	class GAZ_Vodnik_MedEvac {
 		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"};
+		buy[] = {1,"ItemBriefcase100oz"};
+		sell[] = {5,"ItemGoldBar10oz"};
 	};
 };

--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPackagedFood.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPackagedFood.hpp
@@ -19,21 +19,6 @@ class Category_629 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
-	class FoodMRE {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class FoodPistachio {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class FoodNutmix {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
 	class FoodCanBeef {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar"};
@@ -179,8 +164,23 @@ class Category_629 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
+	class FoodPistachio {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class FoodNutmix {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class FoodMRE {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
 };

 class Category_692 {
 	duplicate = 629;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp
@@ -1,18 +1,13 @@
 class Category_489 {
-	class G17_DZ {
-		type = "trade_weapons";
-		buy[] = {5,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
-	class M1911_DZ {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
 	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";
@@ -29,8 +24,13 @@ class Category_489 {
 		buy[] = {3,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
+	class M1911_DZ {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
 };

 class Category_617 {
 	duplicate = 489;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp
@@ -1,29 +1,29 @@
 class Category_574 {
-	class Winchester1866_DZ {
+	class Crossbow_DZ {
 		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
+		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 Crossbow_DZ {
+	class Winchester1866_DZ {
 		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
 	};
 	class M1014_DZ {
 		type = "trade_weapons";
 		buy[] = {3,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
-	class RedRyder {
-		type = "trade_weapons";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
 	class Remington870_DZ {
 		type = "trade_weapons";
 		buy[] = {2,"ItemGoldBar"};
@@ -43,4 +43,4 @@ class Category_574 {

 class Category_620 {
 	duplicate = 574;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshotAmmo.hpp
@@ -1,5 +1,20 @@
 class Category_623 {
-	class 15Rnd_W1866_Slug {
+	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"};
@@ -24,22 +39,7 @@ class Category_623 {
 		buy[] = {4,"ItemSilverBar"};
 		sell[] = {4,"ItemSilverBar"};
 	};
-	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 {
+	class 15Rnd_W1866_Slug {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
@@ -58,4 +58,4 @@ class Category_623 {

 class Category_573 {
 	duplicate = 623;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySmokeGrenades.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySmokeGrenades.hpp
@@ -14,4 +14,14 @@ class Category_543 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
+	class 1Rnd_Smoke_M203 {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class 1Rnd_Smoke_GP25 {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp
@@ -1,5 +1,5 @@
 class Category_487 {
-	class M40A3_DZ {
+	class M4SPR {
 		type = "trade_weapons";
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {6,"ItemGoldBar"};
@@ -14,7 +14,17 @@ class Category_487 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class M4SPR {
+	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"};
@@ -29,18 +39,8 @@ class Category_487 {
 		buy[] = {1,"ItemGoldBar10oz"};
 		sell[] = {6,"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 Category_619 {
 	duplicate = 487;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp
@@ -1,4 +1,14 @@
 class Category_624 {
+	class 5Rnd_17HMR {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar10oz"};
+	};
+	class 5Rnd_762x51_M24 {
+		type = "trade_items";
+		buy[] = {1,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar"};
+	};
 	class 20Rnd_762x51_DMR {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar"};
@@ -9,18 +19,8 @@ class Category_624 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class 5Rnd_762x51_M24 {
-		type = "trade_items";
-		buy[] = {1,"ItemSilverBar10oz"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class 5Rnd_17HMR {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar10oz"};
-	};
 };

 class Category_482 {
 	duplicate = 624;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGunAmmo.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGunAmmo.hpp
@@ -1,14 +1,9 @@
 class Category_626 {
-	class 30Rnd_9x19_MP5 {
+	class 20Rnd_B_765x17_Ball {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class 30Rnd_9x19_MP5SD {
-		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
 	class 30Rnd_9x19_UZI {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar10oz"};
@@ -19,6 +14,16 @@ class Category_626 {
 		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"};
@@ -29,13 +34,8 @@ class Category_626 {
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class 20Rnd_B_765x17_Ball {
-		type = "trade_items";
-		buy[] = {2,"ItemSilverBar10oz"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
 };

 class Category_483 {
 	duplicate = 626;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp
@@ -1,19 +1,9 @@
 class Category_488 {
-	class Bizon_DZ {
-		type = "trade_weapons";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
 	class Sa61_EP1 {
 		type = "trade_weapons";
 		buy[] = {1,"ItemGoldBar"};
 		sell[] = {5,"ItemSilverBar10oz"};
 	};
-	class MP5_DZ {
-		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {2,"ItemSilverBar10oz"};
-	};
 	class PDW_DZ {
 		type = "trade_weapons";
 		buy[] = {4,"ItemGoldBar"};
@@ -24,8 +14,18 @@ class Category_488 {
 		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;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyToolbeltItems.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyToolbeltItems.hpp
@@ -1,9 +1,24 @@
 class Category_679 {
+	class ItemWatch {
+		type = "trade_weapons";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
 	class ItemCompass {
 		type = "trade_weapons";
 		buy[] = {6,"ItemSilverBar"};
 		sell[] = {3,"ItemSilverBar"};
 	};
+	class ItemMap {
+		type = "trade_weapons";
+		buy[] = {6,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class ItemGPS {
+		type = "trade_weapons";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
 	class Binocular {
 		type = "trade_weapons";
 		buy[] = {2,"ItemSilverBar"};
@@ -14,10 +29,10 @@ class Category_679 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class ItemEtool {
+	class NVGoggles {
 		type = "trade_weapons";
-		buy[] = {9,"ItemSilverBar10oz"};
-		sell[] = {6,"ItemSilverBar10oz"};
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
 	};
 	class ItemFlashlight {
 		type = "trade_weapons";
@@ -29,10 +44,15 @@ class Category_679 {
 		buy[] = {1,"ItemSilverBar10oz"};
 		sell[] = {5,"ItemSilverBar"};
 	};
-	class ItemGPS {
+	class ItemMatchbox {
 		type = "trade_weapons";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class ItemEtool {
+		type = "trade_weapons";
+		buy[] = {9,"ItemSilverBar10oz"};
+		sell[] = {6,"ItemSilverBar10oz"};
 	};
 	class ItemHatchet {
 		type = "trade_weapons";
@@ -44,31 +64,11 @@ class Category_679 {
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
-	class ItemMap {
-		type = "trade_weapons";
-		buy[] = {6,"ItemSilverBar"};
-		sell[] = {3,"ItemSilverBar"};
-	};
-	class ItemMatchbox {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
 	class ItemToolbox {
 		type = "trade_weapons";
 		buy[] = {2,"ItemSilverBar"};
 		sell[] = {1,"ItemSilverBar"};
 	};
-	class ItemWatch {
-		type = "trade_weapons";
-		buy[] = {2,"ItemSilverBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class NVGoggles {
-		type = "trade_weapons";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
 	class ItemCrowbar {
 		type = "trade_weapons";
 		buy[] = {2,"ItemSilverBar"};
@@ -132,4 +132,4 @@ class Category_681 {

 class Category_532 {
 	duplicate = 679;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyVehicleParts.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyVehicleParts.hpp
@@ -1,4 +1,34 @@
 class Category_677 {
+	class PartGeneric {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {6,"ItemSilverBar"};
+	};
+	class PartWheel {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class PartGlass {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class PartEngine {
+		type = "trade_items";
+		buy[] = {5,"ItemGoldBar"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class PartVRotor {
+		type = "trade_items";
+		buy[] = {5,"ItemGoldBar"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class PartFueltank {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {5,"ItemSilverBar"};
+	};
 	class ItemFuelcan {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar"};
@@ -24,41 +54,6 @@ class Category_677 {
 		buy[] = {8,"ItemSilverBar"};
 		sell[] = {4,"ItemSilverBar"};
 	};
-	class PartEngine {
-		type = "trade_items";
-		buy[] = {5,"ItemGoldBar"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class PartVRotor {
-		type = "trade_items";
-		buy[] = {5,"ItemGoldBar"};
-		sell[] = {1,"ItemSilverBar10oz"};
-	};
-	class PartWheel {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {2,"ItemSilverBar"};
-	};
-	class PartGlass {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
-		sell[] = {1,"ItemSilverBar"};
-	};
-	class PartGeneric {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {6,"ItemSilverBar"};
-	};
-	class PartFueltank {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {5,"ItemSilverBar"};
-	};
-	class ItemFuelBarrel {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
 };

 class Category_682 {
@@ -67,4 +62,4 @@ class Category_682 {

 class Category_531 {
 	duplicate = 677;
-};
+};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroHelicopterArmed.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/HeroHelicopterArmed.hpp
@@ -1,20 +1,10 @@
 class Category_493 {
-	class CH_47F_EP1_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
-	class UH1H_DZE {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
 	class Mi17_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
-	class UH60M_EP1_DZE {
+	class UH1H_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
@@ -24,11 +14,21 @@ class Category_493 {
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
+	class UH60M_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
 	class MH60S_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
 		sell[] = {1,"ItemBriefcase100oz"};
 	};
+	class CH_47F_EP1_DZE {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
 	class CH53_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAirplanes.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralAirplanes.hpp
@@ -1,19 +1,4 @@
 class Category_517 {
-	class AN2_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class C130J_US_EP1_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {4,"ItemBriefcase100oz"};
-		sell[] = {2,"ItemBriefcase100oz"};
-	};
-	class MV22_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {5,"ItemBriefcase100oz"};
-		sell[] = {2,"ItemBriefcase100oz"};
-	};
 	class GNT_C185U {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar10oz"};
@@ -34,4 +19,19 @@ class Category_517 {
 		buy[] = {4,"ItemGoldBar10oz"};
 		sell[] = {2,"ItemGoldBar10oz"};
 	};
+	class AN2_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemGoldBar10oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
+	class MV22_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {5,"ItemBriefcase100oz"};
+		sell[] = {2,"ItemBriefcase100oz"};
+	};
+	class C130J_US_EP1_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {4,"ItemBriefcase100oz"};
+		sell[] = {2,"ItemBriefcase100oz"};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp
@@ -1,9 +1,4 @@
 class Category_527 {
-	class 20Rnd_9x39_SP5_VSS {
-		type = "trade_items";
-		buy[] = {3,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
-	};
 	class 8Rnd_B_Saiga12_74Slug {
 		type = "trade_items";
 		buy[] = {5,"ItemSilverBar"};
@@ -34,6 +29,11 @@ class Category_527 {
 		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"};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketWeapons.hpp
@@ -39,6 +39,11 @@ class Category_526 {
 		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"};
@@ -49,19 +54,14 @@ class Category_526 {
 		buy[] = {2,"ItemGoldBar10oz"};
 		sell[] = {6,"ItemGoldBar"};
 	};
-	class MG36_camo {
+	class VSS_vintorez {
 		type = "trade_weapons";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {6,"ItemGoldBar"};
+		buy[] = {3,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar"};
 	};
 	class KSVK_DZE {
 		type = "trade_weapons";
 		buy[] = {3,"ItemGoldBar10oz"};
 		sell[] = {1,"ItemGoldBar10oz"};
 	};
-	class VSS_vintorez {
-		type = "trade_weapons";
-		buy[] = {3,"ItemGoldBar10oz"};
-		sell[] = {4,"ItemGoldBar"};
-	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralExplosives.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralExplosives.hpp
@@ -4,19 +4,24 @@ class Category_529 {
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
-	class PipeBomb {
-		type = "trade_items";
-		buy[] = {4,"ItemBriefcase100oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
-	};
-	class 1Rnd_HE_M203 {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
 	class HandGrenade_east {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
+	class 1Rnd_HE_M203 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class 1Rnd_HE_GP25 {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class PipeBomb {
+		type = "trade_items";
+		buy[] = {4,"ItemBriefcase100oz"};
+		sell[] = {2,"ItemGoldBar10oz"};
+	};
 };
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp
@@ -1,19 +1,4 @@
 class Category_519 {
-	class Mi17_Civilian_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {2,"ItemBriefcase100oz"};
-		sell[] = {1,"ItemBriefcase100oz"};
-	};
-	class AH6X_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {6,"ItemGoldBar10oz"};
-		sell[] = {3,"ItemGoldBar10oz"};
-	};
-	class MH6J_DZ {
-		type = "trade_any_vehicle";
-		buy[] = {8,"ItemGoldBar10oz"};
-		sell[] = {4,"ItemGoldBar10oz"};
-	};
 	class CSJ_GyroC {
 		type = "trade_any_vehicle";
 		buy[] = {4,"ItemGoldBar"};
@@ -29,6 +14,21 @@ class Category_519 {
 		buy[] = {5,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class AH6X_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {6,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
+	};
+	class MH6J_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {8,"ItemGoldBar10oz"};
+		sell[] = {4,"ItemGoldBar10oz"};
+	};
+	class Mi17_Civilian_DZ {
+		type = "trade_any_vehicle";
+		buy[] = {2,"ItemBriefcase100oz"};
+		sell[] = {1,"ItemBriefcase100oz"};
+	};
 	class BAF_Merlin_DZE {
 		type = "trade_any_vehicle";
 		buy[] = {2,"ItemBriefcase100oz"};
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralWholesale.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralWholesale.hpp
@@ -39,31 +39,36 @@ class Category_675 {
 		buy[] = {6,"ItemSilverBar10oz"};
 		sell[] = {6,"ItemSilverBar10oz"};
 	};
-	class CinderBlocks {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
 	class PartPlywoodPack {
 		type = "trade_items";
 		buy[] = {2,"ItemSilverBar10oz"};
 		sell[] = {1,"ItemSilverBar10oz"};
 	};
-	class MortarBucket {
-		type = "trade_items";
-		buy[] = {1,"ItemGoldBar10oz"};
-		sell[] = {5,"ItemGoldBar"};
-	};
 	class PartPlankPack {
 		type = "trade_items";
 		buy[] = {1,"ItemSilverBar10oz"};
 		sell[] = {5,"ItemSilverBar"};
 	};
+	class CinderBlocks {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
+	class MortarBucket {
+		type = "trade_items";
+		buy[] = {1,"ItemGoldBar10oz"};
+		sell[] = {5,"ItemGoldBar"};
+	};
 	class ItemFuelBarrelEmpty {
 		type = "trade_items";
 		buy[] = {1,"ItemGoldBar"};
 		sell[] = {5,"ItemSilverBar10oz"};
 	};
+	class ItemFuelBarrel {
+		type = "trade_items";
+		buy[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
+	};
 };

 class Category_636 {
@@ -72,4 +77,4 @@ class Category_636 {

 class Category_555 {
 	duplicate = 675;
-};
+};