Add new pistols

Add new pistols from Robert Hammer.

- 23 new pistols
- New sounds for the M9, M1911, PDW
- New magazine icon and model for M1911
- Full attachment support for different pistols

SQF/dayz_code/Configs/CfgMagazines/Attachments/Attachments.hpp

@@ -34,4 +34,4 @@
 #include "NV.hpp"
 #include "TWS.hpp"
 #include "Sup762.hpp"
-#include "Sup_45.hpp"
+#include "Sup45.hpp"

SQF/dayz_code/Configs/CfgMagazines/Attachments/Sup45.hpp

@@ -1,4 +1,4 @@
-class Attachment_Sup_45 : CA_Magazine {
+class Attachment_Sup45 : CA_Magazine {
 	scope = public;
 	count = 1;
 	type = 256;
@@ -15,5 +15,10 @@ class Attachment_Sup_45 : CA_Magazine {
 			text = $STR_DZ_ATT_ACT_TO_SECONDARY;
 			script = "; [_id,0] call player_attachAttachment";
 		};
+		class AttachToPrimary
+		{
+			text = $STR_DZ_ATT_ACT_TO_PRIMARY;
+			script = "; [_id,1] call player_attachAttachment";
+		};		
 	};
 };

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

@@ -0,0 +1,15 @@
+class 10Rnd_22lfB_RUGERMK2: CA_Magazine
+{
+	scope = public;
+	displayName = $STR_DZ_MAG_10RND_C22_RUGERMK2_NAME;
+	descriptionShort = $STR_DZ_MAG_10RND_RUGERMK2_C22_DESC;
+	picture = "\RH_de\inv\m_mk2.paa";
+	model = "\RH_de\mags\mag_mk2.p3d";
+	ammo = "B_22lfB_Ball";
+	count = 10;
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};	
+};

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

@@ -0,0 +1,17 @@
+class 6Rnd_357Magnum: CA_Magazine
+{
+	scope = public;
+	type = 16;
+	displayName = $STR_DZ_MAG_6RND_357MAGNUM_NAME;
+	descriptionShort = $STR_DZ_MAG_6RND_357MAGNUM_DESC;
+	picture = "\RH_de\inv\m_44m.paa";
+	model = "\dayz_equip\models\ammo_acp45.p3d";
+	ammo = "B_357mag_Ball";
+	count = 6;
+	initSpeed = 421;
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};	
+};

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

@@ -0,0 +1,17 @@
+class 6Rnd_44Magnum: CA_Magazine
+{
+	scope = public;
+	type = 16;
+	displayName = $STR_DZ_MAG_6RND_44MAGNUM_NAME;
+	descriptionShort = $STR_DZ_MAG_6RND_44MAGNUM_DESC;
+	picture = "\RH_de\inv\m_44m.paa";
+	model = "\dayz_equip\models\ammo_acp45.p3d";
+	ammo = "B_44mag_Ball";
+	count = 6;
+	initSpeed = 421;
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};	
+};

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

@@ -1,8 +1,11 @@
 class 7Rnd_45ACP_1911: CA_Magazine
 {
-	model = "\dayz_equip\models\ammo_1911.p3d";
+	model = "\RH_de\mags\mag_kim.p3d";
+	picture = "\RH_de\inv\m_colt.paa";
+	//model = "\dayz_equip\models\ammo_1911.p3d";
 	//picture = "\dayz_equip\textures\equip_1911_ca.paa";
 	displayName = $STR_DZ_MAG_7RND_45ACP_1911_NAME;
+	descriptionShort = $STR_DZ_MAG_7RND_M1911_45ACP_DESC;
 	
 	cartridgeName = "45ACP";
 	
@@ -40,4 +43,31 @@ class 6Rnd_45ACP: CA_Magazine
 			output[] = {"7Rnd_45ACP_1911"};
 		};
 	};
+};
+
+class 15Rnd_45ACP_USP: 7Rnd_45ACP_1911
+{
+	displayName = $STR_DZ_MAG_15RND_45ACP_USP_NAME;
+	descriptionShort = $STR_DZ_MAG_15RND_USP_45ACP_DESC;
+	model = "\RH_de\mags\mag_usp.p3d";
+	picture = "\RH_de\inv\m_usp.paa";
+	count = 15;
+};
+class 15Rnd_45ACP_USPSD: 15Rnd_45ACP_USP
+{
+	displayName = $STR_DZ_MAG_15RND_45ACP_USPSD_NAME;
+	descriptionShort = $STR_DZ_MAG_15RND_USPSD_45ACP_DESC;
+	picture = "\RH_de\inv\m_usp.paa";
+	ammo = "B_45ACP_SD";
+	initSpeed = 278;
+};
+
+class 7Rnd_45ACP_1911SD: 15Rnd_45ACP_USPSD
+{
+	displayName = $STR_DZ_MAG_7RND_45ACP_KIMBER1911SD_NAME;
+	descriptionShort = $STR_DZ_MAG_7RND_KIMBER1911SD_45ACP_DESC;
+	model = "\RH_de\mags\mag_kim.p3d";
+	picture = "\RH_de\inv\m_colt.paa";
+	ammo = "B_45ACP_SD";
+	count = 7;
 };

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

@@ -0,0 +1,19 @@
+class 8Rnd_762x25_TT33 : CA_Magazine
+{
+	scope = public;
+	type = 16;
+	displayName = $STR_DZ_MAG_8RND_762x25_TT33_NAME;
+	descriptionShort = $STR_DZ_MAG_8RND_TT33_762x25_DESC;	
+	picture = "\RH_de\inv\m_tt33.paa";
+	model = "\RH_de\mags\mag_tt33.p3d";	
+	ammo = "B_762x25_Ball";
+	count = 8;
+	initSpeed = 400;
+	
+	cartridgeName = "762x25";
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};

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

@@ -0,0 +1,17 @@
+class 7Rnd_9x17_PPK : CA_Magazine
+{
+	scope = public;
+	type = 16;
+	displayName = $STR_DZ_MAG_7RND_9x17_PPK_NAME;
+	descriptionShort = $STR_DZ_MAG_7RND_PPK_9x17_DESC;
+	picture = "\RH_de\inv\m_ppk.paa";
+	model = "\RH_de\mags\mag_ppk.p3d";	
+	ammo = "B_9x17_Ball";
+	count = 7;
+	initSpeed = 320;
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};
+};

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

@@ -62,6 +62,7 @@ class 30Rnd_9x19_MP5SD : CA_Magazine
 class 15Rnd_9x19_M9 : CA_Magazine
 {
 	displayName = $STR_DZ_MAG_15RND_9X19_M9_NAME;
+	descriptionShort = $STR_DZ_MAG_15RND_M9_9x19_DESC;
 	
 	cartridgeName = "9x19";
 	
@@ -90,6 +91,7 @@ class 17Rnd_9x19_glock17 : CA_Magazine
 	model = "z\addons\dayz_communityweapons\magazines\g17.p3d";
 	picture = "\z\addons\dayz_communityweapons\magazines\data\m_glock17_ca.paa";
 	displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17_NAME;
+	descriptionShort = $STR_DZ_MAG_17RND_G17_9x19_DESC;
 	
 	cartridgeName = "9x19";
 	
@@ -117,6 +119,7 @@ class 15Rnd_9x19_M9SD : 15Rnd_9x19_M9
 {
 	picture = "\z\addons\dayz_communityweapons\magazines\data\m_m9sd_ca.paa";
 	displayName = $STR_DZ_MAG_15RND_9X19_M9SD_NAME;
+	descriptionShort = $STR_DZ_MAG_15RND_M9SD_9x19_DESC;
 	
 	cartridgeName = "9x19_SD";
 	
@@ -144,6 +147,7 @@ class 17Rnd_9x19_glock17SD : 15Rnd_9x19_M9SD
 {
 	picture = "\z\addons\dayz_communityweapons\magazines\data\m_glock17sd_ca.paa";
 	displayName = $STR_DZ_MAG_17RND_9X19_GLOCK17SD_NAME;
+	descriptionShort = $STR_DZ_MAG_17RND_G17SD_9x19_DESC;
 	
 	cartridgeName = "9x19_SD";
 
@@ -169,8 +173,6 @@ class 17Rnd_9x19_glock17SD : 15Rnd_9x19_M9SD
 	};
 };
 
-
-
 /* Bizon */
 
 class 64Rnd_9x19_Bizon : CA_Magazine
@@ -232,4 +234,139 @@ class 18Rnd_9x19_PhantomSD : 15Rnd_9x19_M9SD
 		delete ReloadMag;
 		COMBINE_MAG
 	};
+};
+
+/* FN Browning HP */
+
+class 13Rnd_9x19_BHP: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_13RND_9x19_BHP_NAME;
+	descriptionShort = $STR_DZ_MAG_13RND_BHP_9x19_DESC;
+	model = "\RH_de\mags\mag_mk22.p3d";
+	picture = "\RH_de\inv\m_mk22.paa";
+	count = 13;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+/* SIG Sauer P226 */
+
+class 15Rnd_9x19_P226: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_15RND_9x19_P226_NAME;
+	descriptionShort = $STR_DZ_MAG_15RND_P226_9x19_DESC;
+	model = "\RH_de\mags\mag_mk22.p3d";
+	picture = "\RH_de\inv\m_mk22.paa";
+	count = 15;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+/* Walther P38 */
+
+class 8Rnd_9x19_P38: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_8RND_9x19_P38_NAME;
+	descriptionShort = $STR_DZ_MAG_8RND_P38_9x19_DESC;
+	model = "\RH_de\mags\mag_p38.p3d";
+	picture = "\RH_de\inv\m_p38.paa";
+	count = 8;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+/* Mk 22 Mod 0 */
+
+class 8Rnd_9x19_MK22: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_8RND_9x19_MK22_NAME;
+	descriptionShort = $STR_DZ_MAG_8RND_MK22_9x19_DESC;
+	model = "\RH_de\mags\mag_mk22.p3d";
+	picture = "\RH_de\inv\m_mk22.paa";
+	count = 8;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+class 8Rnd_9x19_MK22SD: 15Rnd_9x19_M9SD
+{
+	displayName = $STR_DZ_MAG_8RND_9x19_MK22SD_NAME;
+	descriptionShort = $STR_DZ_MAG_8RND_MK22SD_9x19_DESC;
+	model = "\RH_de\mags\mag_mk22.p3d";
+	picture = "\RH_de\inv\m_mk22.paa";
+	count = 8;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+
+/* M93R */
+
+class 20Rnd_9x19_M93R: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_20RND_9x19mm_M93R_NAME;
+	descriptionShort = $STR_DZ_MAG_20RND_9x19mm_M93R_DESC;
+	model = "\RH_de\mags\mag_m93r.p3d";
+	picture = "\RH_de\inv\m_m93.paa";
+	count = 20;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+/* G18 */
+
+class 33Rnd_9x19_G18: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_33RND_9x19mm_G18_NAME;
+	descriptionShort = $STR_DZ_MAG_33RND_9x19mm_G18_DESC;
+	model = "\RH_de\mags\mag_m93r.p3d";
+	picture = "\RH_de\inv\m_m93.paa";
+	count = 33;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
+};
+
+/* Tec-9 */
+
+class 32Rnd_9x19_TEC9: 15Rnd_9x19_M9
+{
+	displayName = $STR_DZ_MAG_32RND_9x19mm_TEC9_NAME;
+	descriptionShort = $STR_DZ_MAG_32RND_9x19mm_TEC9_DESC;
+	model = "\RH_de\mags\mag_tec9.p3d";
+	picture = "\RH_de\inv\m_tec9.paa";
+	count = 32;
+	
+	class ItemActions
+	{
+		delete ReloadMag;
+		COMBINE_MAG
+	};	
 };

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

@@ -6,13 +6,18 @@
 	script = "spawn player_combineMag;";\
 };
 
+#include "22lfB.hpp"		//Ruger Mk22
+#include "9x17.hpp"			//PPK
 #include "9x18.hpp"			//Makarov
-#include "9x19.hpp"			//MP5, PDW, Bizon, M9, G17
+#include "9x19.hpp"			//MP5, PDW, Bizon, M9, G17, CZ75, Browning HP, P226, P38
 #include "10x22.hpp"		//P99
 #include "45ACP.hpp"		//Colt M1911, Revolver
+#include "44Magnum.hpp"		//Taurus Raging Bull, Colt Anaconda
+#include "357Magnum.hpp"	//Colt Python
 #include "545x39.hpp"		//AK74, RPK74
 #include "556x45.hpp"		//M249, STANAG, G36
 #include "6x35.hpp"			//KAC PDW
+#include "762x25.hpp"		//Tokarew TT-33
 #include "762x39.hpp"		//AK47, SA58
 #include "762x51.hpp"		//M240, FN FAL, DMR, M24
 #include "762x54r.hpp"		//PK, SVD, Mosin