Merge pull request #1704 from AirwavesMan/master

Some more Changes

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

@@ -3,7 +3,7 @@ Industrial[] =
 	//Tools
 	{Loot_WEAPON,		3,		ItemKnife},
 	{Loot_WEAPON,		6,		ItemToolbox},
-	{Loot_WEAPON,		2,		ItemFlashlight},
+//	{Loot_WEAPON,		2,		ItemFlashlight},
 //	{Loot_WEAPON,		8,		ItemCrowbar},
 	{Loot_VEHICLE,		8,		WeaponHolder_ItemCrowbar},
 //	{Loot_WEAPON,		5,		ItemHatchet},
@@ -30,8 +30,8 @@ Industrial[] =
 	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe},
 	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe},
 	{Loot_MAGAZINE,		12,		ItemPlank},
-	{Loot_MAGAZINE,		1,		MortarBucket},
+	{Loot_MAGAZINE,		2,		MortarBucket},
-	{Loot_MAGAZINE,		2,		CinderBlocks},
+	{Loot_MAGAZINE,		3,		CinderBlocks},
 	{Loot_MAGAZINE,		3,		ItemFuelBarrelEmpty},
 	{Loot_MAGAZINE,		3,		ItemGenerator},
 	{Loot_MAGAZINE,		1,		fuel_pump_kit},

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

@@ -906,8 +906,15 @@ class CinderBlocks: CA_Magazine
 			output[] = {{"cinder_door_kit",1}};
 			input[] = {{"CinderBlocks",4},{"MortarBucket",1},{"ItemTankTrap",1}};
 		};
-
+		class Crafting3
-
+		{
+			text = $STR_EPOCH_PLAYER_252_1;
+			script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem; r_action_count = r_action_count + 1;";
+			neednearby[] = {"workshop"};
+			requiretools[] = {"ItemToolbox"};
+			output[] = {{"full_cinder_wall_kit",1}};
+			input[] = {{"CinderBlocks",7},{"MortarBucket",2}};
+		};
 	};
 };
 class MortarBucket: CA_Magazine
@@ -1174,4 +1181,4 @@ class ItemKiloHemp : CA_Magazine
 			input[] = {{"ItemKiloHemp",1}};
 		};
 	};
-};
+};

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

@@ -21,7 +21,7 @@ class cinder_wall_kit: CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
-	displayName = $STR_EPOCH_CINDERBLOCKWALL;
+	displayName = $STR_EPOCH_CINDERBLOCKWALL_HALF;
 	descriptionShort = $STR_EPOCH_CINDERBLOCKWALL_DESC;
 	model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
 	picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";

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

@@ -1,20 +1,15 @@
 class Category_693 {
-	class Attachment_ACOG {
-		type = "trade_items";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
 	class Attachment_BELT {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
-	class Attachment_CCO {
+	class Attachment_SA58RIS {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
-	class Attachment_FL {
+	class Attachment_Ghillie {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
@@ -24,12 +19,12 @@ class Category_693 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class Attachment_Ghillie {
+	class Attachment_FL {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class Attachment_GP25 {
+	class Attachment_CCO {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
@@ -44,31 +39,36 @@ class Category_693 {
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
-	class Attachment_M203 {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
-	class Attachment_PSO1 {
-		type = "trade_items";
-		buy[] = {8,"ItemGoldBar"};
-		sell[] = {4,"ItemGoldBar"};
-	};
-	class Attachment_SA58RIS {
-		type = "trade_items";
-		buy[] = {4,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
 	class Attachment_SCOPED {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class Attachment_ACOG {
+		type = "trade_items";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};	
+	class Attachment_PSO1 {
+		type = "trade_items";
+		buy[] = {8,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
+	};
 	class Attachment_Sup9 {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
+	class Attachment_SupMakarov {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class Attachment_SupBizon {
+		type = "trade_items";
+		buy[] = {6,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
 	class Attachment_Sup545 {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar"};
@@ -79,14 +79,15 @@ class Category_693 {
 		buy[] = {8,"ItemGoldBar"};
 		sell[] = {4,"ItemGoldBar"};
 	};
-	class Attachment_SupBizon {
+	class Attachment_GP25 {
 		type = "trade_items";
-		buy[] = {6,"ItemGoldBar"};
+		buy[] = {4,"ItemGoldBar"};
-		sell[] = {3,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
-	};
+	};	
-	class Attachment_SupMakarov {
+	class Attachment_M203 {
 		type = "trade_items";
 		buy[] = {4,"ItemGoldBar"};
 		sell[] = {2,"ItemGoldBar"};
 	};
 };
+

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

@@ -24,6 +24,51 @@ class Category_678 {
 		buy[] = {6,"ItemGoldBar"};
 		sell[] = {3,"ItemGoldBar"};
 	};
+	class equip_brick {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class equip_duct_tape {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_rope {
+		type = "trade_items";
+		buy[] = {4,"ItemSilverBar"};
+		sell[] = {2,"ItemSilverBar"};
+	};
+	class equip_hose {
+		type = "trade_items";
+		buy[] = {6,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class equip_nails {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar"};
+		sell[] = {1,"ItemSilverBar"};
+	};
+	class equip_scrapelectronics {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
+	};
+	class equip_metal_sheet {
+		type = "trade_items";
+		buy[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemSilverBar10oz"};
+	};
+	class equip_1inch_metal_pipe {
+		type = "trade_items";
+		buy[] = {6,"ItemSilverBar"};
+		sell[] = {3,"ItemSilverBar"};
+	};
+	class equip_2inch_metal_pipe {
+		type = "trade_items";
+		buy[] = {8,"ItemSilverBar"};
+		sell[] = {4,"ItemSilverBar"};
+	};
 	class ItemWire {
 		type = "trade_items";
 		buy[] = {6,"ItemSilverBar"};
@@ -56,8 +101,8 @@ class Category_678 {
 	};
 	class ItemComboLock {
 		type = "trade_items";
-		buy[] = {4,"ItemSilverBar10oz"};
+		buy[] = {2,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemSilverBar10oz"};
+		sell[] = {1,"ItemGoldBar10oz"};
 	};
 	class ItemVault {
 		type = "trade_items";

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

@@ -1,43 +1,43 @@
 class Category_675 {
-	class bulk_15Rnd_9x19_M9SD {
-		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
-	};
 	class bulk_17Rnd_9x19_glock17 {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
 	};
-	class bulk_30Rnd_556x45_StanagSD {
+	class bulk_15Rnd_9x19_M9SD {
 		type = "trade_items";
 		buy[] = {2,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
+		sell[] = {1,"ItemGoldBar"};
 	};
 	class bulk_30Rnd_9x19_MP5SD {
 		type = "trade_items";
-		buy[] = {2,"ItemGoldBar"};
+		buy[] = {3,"ItemGoldBar"};
-		sell[] = {2,"ItemGoldBar"};
+		sell[] = {3,"ItemGoldBar"};
+	};
+	class bulk_30Rnd_556x45_StanagSD {
+		type = "trade_items";
+		buy[] = {4,"ItemGoldBar"};
+		sell[] = {4,"ItemGoldBar"};
 	};
 	class bulk_ItemSandbag {
 		type = "trade_items";
-		buy[] = {2,"ItemGoldBar10oz"};
+		buy[] = {3,"ItemGoldBar10oz"};
-		sell[] = {2,"ItemGoldBar10oz"};
+		sell[] = {3,"ItemGoldBar10oz"};
 	};
 	class bulk_ItemTankTrap {
 		type = "trade_items";
-		buy[] = {1,"ItemGoldBar"};
+		buy[] = {2,"ItemGoldBar"};
-		sell[] = {1,"ItemGoldBar"};
+		sell[] = {2,"ItemGoldBar"};
 	};
 	class bulk_ItemWire {
 		type = "trade_items";
-		buy[] = {3,"ItemSilverBar10oz"};
+		buy[] = {5,"ItemSilverBar10oz"};
-		sell[] = {3,"ItemSilverBar10oz"};
+		sell[] = {5,"ItemSilverBar10oz"};
 	};
 	class bulk_PartGeneric {
 		type = "trade_items";
-		buy[] = {6,"ItemSilverBar10oz"};
+		buy[] = {8,"ItemGoldBar"};
-		sell[] = {6,"ItemSilverBar10oz"};
+		sell[] = {8,"ItemGoldBar"};
 	};
 	class PartPlywoodPack {
 		type = "trade_items";

SQF/dayz_code/stringtable.xml

@@ -12861,6 +12861,15 @@
 			<!-- <French></French> -->
 			<Czech>Vytvořit 1/2 zdi</Czech>
 		</Key>
+		<Key ID="STR_EPOCH_PLAYER_252_1">
+			<English>Craft Full Wall</English>
+			<German>Ganze Wand herstellen</German>
+			<Russian>Создать: все стены</Russian>
+			<!-- <Spanish></Spanish> -->
+			<!-- <Dutch></Dutch> -->
+			<!-- <French></French> -->
+			<Czech>Vytvářet plnou stěnou</Czech>
+		</Key>
 		<Key ID="STR_EPOCH_PLAYER_253">
 			<English>Craft Garage Doorway</English>
 			<German>Garagentor-Rahmen herstellen</German>
@@ -16035,13 +16044,21 @@
 			<French>Metal Floor</French>
 			<Czech>Metal Floor</Czech>
 		</Key>
+		<Key ID="STR_EPOCH_CINDERBLOCKWALL_HALF">
+			<English>Cinder Wall Half</English>
+			<German>Cinder Wall Half</German>
+			<Russian>Cinder Wall Half</Russian>
+			<Spanish>Cinder Wall Half</Spanish>
+			<French>Cinder Wall Half</French>
+			<Czech>Cinder Wall Half</Czech>
+		</Key>
 		<Key ID="STR_EPOCH_CINDERBLOCKWALL">
-			<English>Cinder Block Wall</English>
+			<English>Cinder Wall Full</English>
-			<German>Cinder Block Wall</German>
+			<German>Cinder Wall Full</German>
-			<Russian>Cinder Block Wall</Russian>
+			<Russian>Cinder Wall Full</Russian>
-			<Spanish>Cinder Block Wall</Spanish>
+			<Spanish>Cinder Wall Full</Spanish>
-			<French>Cinder Block Wall</French>
+			<French>Cinder Wall Full</French>
-			<Czech>Cinder Block Wall</Czech>
+			<Czech>Cinder Wall Full</Czech>
 		</Key>
 		<Key ID="STR_EPOCH_CINDERBLOCKWALL_DESC">
 			<English>Half height cinder block wall.</English>