Icons, 9mm silencer, m16a2

Vanilla development commit:

896825693d

SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp

@@ -10,8 +10,7 @@ AttachmentsEast[] =
 {
 	{Loot_MAGAZINE,		2,		Attachment_Kobra},
 	{Loot_MAGAZINE,		1,		Attachment_PSO1},
-	{Loot_MAGAZINE,		3,		Attachment_SupMakarov},
-	{Loot_MAGAZINE,		2,		Attachment_SupBizon},
+	{Loot_MAGAZINE,		3,		Attachment_Sup9},
 	{Loot_MAGAZINE,		1,		Attachment_Sup545},
 	{Loot_MAGAZINE,		2,		Attachment_GP25},
 	{Loot_MAGAZINE,		2,		Attachment_Ghillie},

SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp

@@ -80,7 +80,7 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.5,		G36K_Camo_DZ}, //G36K_camo
 	{Loot_WEAPON,		0.3,		G36_C_SD_camo},
 	{Loot_WEAPON,		0.5,		M16A2_DZ}, //M16A2
-	{Loot_WEAPON,		0.2,		M16A2_GL_DZ}, //M16A2GL
+	//{Loot_WEAPON,		0.2,		M16A2_GL_DZ}, //M16A2GL //added to attachments system
 	{Loot_WEAPON,		0.1,		M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope)
 	{Loot_WEAPON,		0.5,		M4A1_DZ}, //M4A1
 	{Loot_WEAPON,		0.4,		M4A1_CCO_DZ}, //M4A1_Aim

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

@@ -59,16 +59,6 @@ class Category_693 {
 		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"};

SQF/dayz_code/Configs/CfgWeapons/Pistols/Makarov.hpp

@@ -9,7 +9,8 @@ class Makarov_DZ : Makarov
 	
 	class Attachments
 	{
-		Attachment_SupMakarov = "Makarov_SD_DZ";
+		Attachment_SupMakarov = "Makarov_SD_DZ"; //left to maintain old suppressor attachment
+		Attachment_Sup9 = "Makarov_SD_DZ";
 	};
 };
 
@@ -27,7 +28,7 @@ class Makarov_SD_DZ : MakarovSD
 		class RemoveSuppressor
 		{
 			text = $STR_ATTACHMENT_RMVE_Silencer;
-			script = "; ['Attachment_SupMakarov',_id,'Makarov_DZ'] call player_removeAttachment";
+			script = "; ['Attachment_Sup9',_id,'Makarov_DZ'] call player_removeAttachment";
 		};
 	};
 };

SQF/dayz_code/Configs/CfgWeapons/Rifles/Bizon.hpp

@@ -15,7 +15,8 @@ class Bizon_DZ : bizon
 	
 	class Attachments
 	{
-		Attachment_SupBizon = "Bizon_SD_DZ";
+		Attachment_SupBizon = "Bizon_SD_DZ";//left to maintain old attachment suppressor
+		Attachment_Sup9 = "Bizon_SD_DZ";
 	};
 };
 
@@ -39,7 +40,7 @@ class Bizon_SD_DZ : bizon_silenced
 		class RemoveSuppressor
 		{
 			text = $STR_ATTACHMENT_RMVE_Silencer;
-			script = "; ['Attachment_SupBizon',_id,'Bizon_DZ'] call player_removeAttachment";
+			script = "; ['Attachment_Sup9',_id,'Bizon_DZ'] call player_removeAttachment";
 		};
 	};
 };

SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp

@@ -6,6 +6,10 @@ class M16A2_DZ : M16A2
 		30Rnd_556x45_Stanag,
 		30Rnd_556x45_StanagSD
 	};
+	class Attachments
+	{
+		Attachment_M203 = "M16A2_GL_DZ";
+	};
 };
 
 class M16A2_GL_DZ : M16A2GL
@@ -15,4 +19,12 @@ class M16A2_GL_DZ : M16A2GL
 		30Rnd_556x45_Stanag,
 		30Rnd_556x45_StanagSD
 	};
+	class ItemActions
+	{
+		class RemoveGL
+		{
+			text = $STR_DZ_ATT_M203_RMVE;
+			script = "; ['Attachment_M203',_id,'M16A2_DZ'] call player_removeAttachment";
+		};
+	};
 };

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Attachments.hpp

@@ -71,12 +71,4 @@ class Attachment_Sup545
 class Attachment_Sup556 
 {
 	weight = 0.1;
-};
-class Attachment_SupBizon 
-{
-	weight = 0.1;
-};
-class Attachment_SupMakarov 
-{
-	weight = 0.05;
 };

Server Files/SQL/1.0.6_Updates.sql

@@ -78,8 +78,6 @@ INSERT INTO `Traders_DATA` VALUES(null, '["Attachment_SCOPED",1]', 10, '[6,"Item
 INSERT INTO `Traders_DATA` VALUES(null, '["Attachment_Sup9",1]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 693, 'trade_items');
 INSERT INTO `Traders_DATA` VALUES(null, '["Attachment_Sup545",1]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 693, 'trade_items');
 INSERT INTO `Traders_DATA` VALUES(null, '["Attachment_Sup556",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 693, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(null, '["Attachment_SupBizon",1]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 693, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(null, '["Attachment_SupMakarov",1]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 693, 'trade_items');
 
 -- ----------------------------
 -- ItemMatchbox_DZE was removed because it was identical to ItemMatchbox, use dayz_matchboxCount config variable for match stick count