From 341e734373c8ad07483ea18676f26dedfe18e726 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Fri, 30 Sep 2016 21:47:48 -0400
Subject: [PATCH] Change satchel and mines to single gear slot

For consistency with all other items in Epoch.
---
 CHANGE LOG 1.0.6.txt                              |  1 +
 .../Configs/CfgMagazines/CfgMagazines.hpp         |  1 +
 .../Configs/CfgMagazines/Items/Explosives.hpp     | 15 +++++++++++++++
 .../Configs/CfgMagazines/Items/Items.hpp          |  3 ++-
 SQF/dayz_code/stringtable.xml                     | 12 ++++++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp

diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt
index 2dfe29a31..bd961d588 100644
--- a/CHANGE LOG 1.0.6.txt	
+++ b/CHANGE LOG 1.0.6.txt	
@@ -65,6 +65,7 @@
 [CHANGED] With R3Fweight on overburdened players are now forced to move slowly instead of being knocked out. The scream was also removed. #1145 @icomrade @ebaydayz
 [CHANGED] Abort and respawn are now disabled immediately in the pause menu onLoad to compensate for low fps delay. @ebaydayz
 [CHANGED] Player_onPause is now customizable by admins along with the new unscheduled fn_pauseMenuChecks. #1340 @Rimblock @ebaydayz
+[CHANGED] Satchel charges and mines now take one inventory slot instead of two. @ebaydayz
 
 [FIXED] Zombies now target and attack players correctly with 1.8.8 code
 [FIXED] Server position sync bug after falling unconscious. Fixes AI on server not seeing the player after knock out and position revert after relog. #1522 @ebaydayz
diff --git a/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
index ea6a00762..e6a576487 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
@@ -3,6 +3,7 @@ class CfgMagazines
 	//External references
 	class CA_Magazine;
 	class HandGrenade;
+	class TimeBomb;
 	
 	
 	
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp
new file mode 100644
index 000000000..c6b293fcd
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Explosives.hpp
@@ -0,0 +1,15 @@
+class Mine: TimeBomb
+{
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
+
+class MineE: TimeBomb
+{
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
+
+class PipeBomb: TimeBomb
+{
+	displayName = $STR_DZ_MAG_SATCHEL_NAME; // Singular "Satchel Charge" for death messages "with a x"
+	type = WeaponSlotItem; // Only takes up one gear slot in Epoch
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp
index fda19dadd..2c56d3f3a 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp
@@ -23,4 +23,5 @@
 #include "equip_brick.hpp"
 #include "equip_lever.hpp"
 #include "WaterBottle.hpp"
-//#include "Canteen.hpp"
\ No newline at end of file
+//#include "Canteen.hpp"
+#include "Explosives.hpp"
\ No newline at end of file
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index ebcd29ce2..7994b0d21 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -16402,5 +16402,17 @@
 		<Key ID="STR_DZ_MAG_20Rnd_B_AA12_HE_NAME">
 			<English>20Rnd. 19mm HE.</English>
 		</Key>
+		<Key ID="STR_DZ_MAG_SATCHEL_NAME">
+			<English>Satchel Charge</English>
+			<French>Charges en sacoche</French>
+			<Spanish>Cargas concentradas</Spanish>
+			<Italian>Cariche esplosive</Italian>
+			<Hungarian>Rádiós Bomba</Hungarian>
+			<Polish>Ładunki wybuchowe</Polish>
+			<Russian>Взрывчатка</Russian>
+			<German>Sprengladungen</German>
+			<Czech>Nálože plastické trhaviny</Czech>
+			<Japanese>梱包爆薬</Japanese>
+		</Key>
 	</Package>
 </Project>