Merge pull request #783 from dayz10k/master

Add more fortifications

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -3908,12 +3908,21 @@ class CfgMagazines {
 				output[] = {{"sandbag_nest_kit",1}};
 				input[] = {{"ItemSandbag",4},{"PartWoodPlywood",2},{"PartWoodLumber",4}};
 			};
-			/*
 			class Crafting2
 			{
-				text = "Craft M240 Nest";
+				text = $STR_EPOCH_PLAYER_298;
 				script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
 				neednearby[] = {"workshop"};
+				requiretools[] = {"ItemEtool","ItemToolbox"};
+				output[] = {{"BagFenceRound_DZ_kit",1}};
+				input[] = {{"ItemSandbag",1}};
+			};
+			/*
+			class Crafting3
+			{
+				text = "Craft M240 Nest";
+				script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {"workshop"};
 				requiretools[] = {"ItemEtool","ItemToolbox","M240_DZ"};
 				output[] = {{"m240_nest_kit",1}};
 				input[] = {{"ItemSandbag",4},{"ItemCanvas",1},{"PartWoodPlywood",4},{"PartWoodLumber",3}};
@@ -3924,6 +3933,34 @@ class CfgMagazines {
 		};
 	};
 
+	class BagFenceRound_DZ_kit : CA_Magazine {
+		scope = public;
+		count = 1;
+		type = 256;
+		displayName = $STR_EQUIP_NAME_21;
+		model = "\dayz_equip\models\sandbags.p3d";
+		picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
+		descriptionShort = $STR_EQUIP_DESC_21;
+		
+		class ItemActions {
+			class Build {
+				text = $STR_EPOCH_PLAYER_299;
+				script = "spawn player_build;";
+				require[] = {"ItemEtool"};
+				create = "BagFenceRound_DZ";
+			};
+			class Crafting
+			{
+				text = $STR_EPOCH_PLAYER_300;
+				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {};
+				requiretools[] = {"ItemEtool","ItemToolbox"};
+				output[] = {{"ItemSandbag",1}};
+				input[] = {{"BagFenceRound_DZ_kit",1}};
+			};	
+		};
+	};
+
 	class ItemSledgeHead : CA_Magazine {
 		scope = public;
 		count = 1;
@@ -4014,6 +4051,34 @@ class CfgMagazines {
 				require[] = {"ItemEtool"};
 				create = "Land_HBarrier3_DZ";
 			};
+			class Crafting
+                        {
+                                text = "Craft Quintuple H-barrier";
+                                script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+                                neednearby[] = {};
+                                requiretools[] = {"ItemEtool","ItemToolbox"};
+                                output[] = {{"ItemSandbagExLarge5x",1}};
+                                input[] = {{"ItemSandbagExLarge",1},{"ItemSandbagLarge",2}};
+                        };
+		};
+	};
+	
+	class ItemSandbagExLarge5w : CA_Magazine {
+		scope = public;
+		count = 1;
+		type = 256;
+		displayName = "5 x H-barrier cube";
+		model = "\dayz_equip\models\sandbags.p3d"; // TODO model
+		picture = "\dayz_equip\textures\equip_sandbag_ca.paa";
+		descriptionShort = "Hesco berrier: A buildable object that is used for fortification purposes.";
+		weight = 200;
+		class ItemActions {
+			class Build {
+				text = "Build Quintuple H-barrier";
+				script = "spawn player_build;";
+				require[] = {"ItemEtool"};
+				create = "Land_HBarrier5_DZ";
+			};
 		};
 	};
 	

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -1745,7 +1745,24 @@ class CfgVehicles {
 		removeoutput[] = {{"ItemSandbag",1}};
 		nounderground = 0;
 	};
-
+	//review some of these settings
+	class BagFenceRound_DZ: BuiltItems
+	{
+		scope = 2;
+		destrType = "DestructNo";
+		cost = 100;
+		model = "\Ca\misc3\fort_bagfence_round";
+		icon = "\Ca\misc3\data\Icons\icon_fortBagFenceRound_ca.paa";
+		offset[] = {0,1.5,0.5};
+		mapSize = 3.2;
+		armor = 400;
+		displayName = "Big bag fence (Round)";
+		vehicleClass = "Fortifications";
+		constructioncount = 3;
+		removeoutput[] = {{"ItemSandbag",1}};
+		nounderground = 0;
+	};
+	
 	class Land_HBarrier1_DZ : BuiltItems { 
 		scope = 2; 
 		animated = 0; 
@@ -1798,7 +1815,34 @@ class CfgVehicles {
 		removeoutput[] = {{"ItemSandbagExLarge",1}};
 		nounderground = 0;
 	};
-		
+	
+	class Land_HBarrier5_DZ:BuiltItems {
+		model = "\ca\misc2\HBarrier5.p3d"; 
+		icon = "\Ca\misc2\data\Icons\icon_hescoBarrier5_ca.paa"; 
+		mapSize = 7; 
+		displayName = "H-barrier (long)"; 
+		GhostPreview = "Land_HBarrier5Preview"; 
+		scope = 2; 
+		animated = 0; 
+		vehicleClass = "Fortifications"; 
+		typicalCargo[] = {}; 
+		irTarget = 0; 
+		accuracy = 0.3; 
+		transportAmmo = 0; 			
+		transportRepair = 0; 
+		transportFuel = 0; 
+		destrType = "DestructBuilding"; 
+		armor = 500; 
+		coefInside = 0.5; 
+		coefInsideHeur = 0.8; 
+		cost = 0; 
+		picture = "\CA\ui\data\icon_wf_barriers_ca.paa";
+		offset[] = {0,2.5,0};
+		constructioncount = 8;
+		removeoutput[] = {{"ItemSandbagExLarge",3}};
+		nounderground = 0;
+        };
+        
 	class SandNest_DZ : BuiltItems { 
 		scope = 2; 
 		model = "\ca\Misc_E\fortified_nest_small_ep1"; 

SQF/dayz_code/init/variables.sqf

@@ -478,7 +478,7 @@ if(isNil "dayz_zedsAttackVehicles") then {
 dayz_updateObjects = ["Plane","Car", "Helicopter", "Motorcycle", "Ship", "TentStorage", "VaultStorage","LockboxStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ"];
 dayz_disallowedVault = ["TentStorage", "BuiltItems","ModularItems","DZE_Base_Object"];
 dayz_reveal = ["AllVehicles","WeaponHolder","Land_A_tent","BuiltItems","ModularItems","DZE_Base_Object"];
-dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ"];
+dayz_allowedObjects = ["TentStorage","TentStorageDomed","TentStorageDomed2", "VaultStorageLocked", "Hedgehog_DZ", "Sandbag1_DZ","BagFenceRound_DZ","TrapBear","Fort_RazorWire","WoodGate_DZ","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","Plastic_Pole_EP1_DZ","Generator_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","FireBarrel_DZ"];
 
 DZE_LockableStorage = ["VaultStorage","VaultStorageLocked","LockboxStorageLocked","LockboxStorage"];
 DZE_LockedStorage = ["VaultStorageLocked","LockboxStorageLocked"];

SQF/dayz_epoch_b/stringtable.xml

@@ -5629,6 +5629,36 @@
 		  <French>Lancer la Ligne</French>
 		  <Czech>Cast Fishing Pole</Czech>
 		</Key>
+		<Key ID="STR_EPOCH_PLAYER_298">
+                 <Original>Craft Round Sandbag Fence</Original>
+                 <English>Craft Round Sandbag Fence</English>
+                 <German>Craft Round Sandbag Fence</German>
+                 <Russian>Craft Round Sandbag Fence</Russian>
+                 <Spanish>Craft Round Sandbag Fence</Spanish>
+                 <Dutch>Craft Round Sandbag Fence</Dutch>
+                 <French>Craft Round Sandbag Fence</French>
+                 <Czech>Craft Round Sandbag Fence</Czech>
+                </Key>
+                <Key ID="STR_EPOCH_PLAYER_299">
+                 <Original>Build Round Sandbag Fence</Original>
+                 <English>Build Round Sandbag Fence</English>
+                 <German>Build Round Sandbag Fence</German>
+                 <Russian>Создать: Мешок с песком</Russian>
+                 <Spanish>Build Round Sandbag Fence</Spanish>
+                 <Dutch>Build Round Sandbag Fence</Dutch>
+                 <French>Build Round Sandbag Fence</French>
+                 <Czech>Build Round Sandbag Fence</Czech>
+                </Key>
+                <Key ID="STR_EPOCH_PLAYER_300">
+                 <Original>Craft Sandbag</Original>
+                 <English>Craft Sandbag</English>
+                 <German>Craft Sandbag</German>
+                 <Russian>Craft Sandbag</Russian>
+                 <Spanish>Craft Sandbag</Spanish>
+                 <Dutch>Craft Sandbag</Dutch>
+                 <French>Craft Sandbag</French>
+                 <Czech>Craft Sandbag</Czech>
+                </Key>
 		<Key ID="R3F_VERSION_WEIGHTED">
 		  <Original>1.04</Original>
 		  <English>1.04</English>