Mag names, Attachments names, Translation fixes

Vanilla development commit:

af9e009bae

- renamed magazines for better sorting
- renamed attachments for better sorting ([A] prefix added) some fixes,
some strings moved to proper section
- Remington 870 added to new attachment system (weapon flashlight)
- Double-barrel shotgun will now spawns with pellets and has Doubleshot
option (maybe this will make it more popular?)

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

@@ -1,5 +1,6 @@
 class Makarov_DZ : Makarov
 {
+	displayName = $STR_DZ_WPN_PM_NAME;
 	magazines[] =
 	{
 		8Rnd_9x18_Makarov,
@@ -14,6 +15,7 @@ class Makarov_DZ : Makarov
 
 class Makarov_SD_DZ : MakarovSD
 {
+	displayName = $STR_DZ_WPN_PM_SD_NAME;
 	magazines[] =
 	{
 		8Rnd_9x18_MakarovSD,
@@ -24,7 +26,7 @@ class Makarov_SD_DZ : MakarovSD
 	{
 		class RemoveSuppressor
 		{
-			text = $STR_DZ_ATT_SUP545_RMVE;
+			text = $STR_DZ_ATT_SUP9PM_RMVE;
 			script = "; ['Attachment_SupMakarov',_id,'Makarov_DZ'] call player_removeAttachment";
 		};
 	};

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

@@ -1,6 +1,7 @@
 class Bizon_DZ : bizon
 {
 	model = "z\addons\dayz_communityweapons\bizon\bizon.p3d";
+	displayName = $STR_DZ_WPN_BIZON_NAME;
 	
 	magazines[] =
 	{
@@ -21,6 +22,7 @@ class Bizon_DZ : bizon
 class Bizon_SD_DZ : bizon_silenced
 {
 	model = "z\addons\dayz_communityweapons\bizon\bizon_sd.p3d";
+	displayName = $STR_DZ_WPN_BIZON_SD_NAME;
 	
 	magazines[] =
 	{
@@ -36,7 +38,7 @@ class Bizon_SD_DZ : bizon_silenced
 	{
 		class RemoveSuppressor
 		{
-			text = $STR_DZ_ATT_SUP545_RMVE;
+			text = $STR_DZ_ATT_SUP9BIZON_RMVE;
 			script = "; ['Attachment_SupBizon',_id,'Bizon_DZ'] call player_removeAttachment";
 		};
 	};

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

@@ -158,7 +158,7 @@ class Crossbow_Scope_DZ : Crossbow_DZ
 	{
 		class RemoveScope
 		{
-			text = "Remove Scope";
+			text = $STR_DZ_ATT_PU_RMVE;
 			script = "; ['Attachment_SCOPED',_id,'Crossbow_DZ'] call player_removeAttachment";
 		};
 	};
@@ -178,7 +178,7 @@ class Crossbow_Scope_FL_DZ : Crossbow_Scope_DZ
 	{
 		class RemoveScope
 		{
-			text = "Remove Scope";
+			text = $STR_DZ_ATT_PU_RMVE;
 			script = "; ['Attachment_SCOPED',_id,'Crossbow_FL_DZ'] call player_removeAttachment";
 		};
 		

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

@@ -4,13 +4,13 @@ class MR43_DZ : Rifle
 	
 	model = "\dayz_weapons\models\mr43.p3d";
 	picture = "\dayz_weapons\textures\equip_mr43_CA.paa";
-	displayname = $STR_WPN_NAME_5;
-	descriptionShort = $STR_WPN_DESC_5;
+	displayname = $STR_DZ_WPN_MR43_NAME;
+	descriptionShort = $STR_DZ_WPN_MR43_DESC;
 	
 	magazines[] =
 	{
-		2Rnd_12Gauge_Slug,
-		2Rnd_12Gauge_Buck
+		2Rnd_12Gauge_Buck;		
+		2Rnd_12Gauge_Slug		
 	};
 	
 	handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons_E\Data\Anim\LeeEnfield.rtm"};
@@ -18,7 +18,7 @@ class MR43_DZ : Rifle
 	distanceZoomMin = 100;
 	distanceZoomMax = 100;
 	
-	modes[] = {"Single"};
+	modes[] = {"Single","Double"};
 	
 	class Single : Mode_SemiAuto
 	{
@@ -32,4 +32,18 @@ class MR43_DZ : Rifle
 		recoil = "recoil_single_primary_9outof10";
 		recoilProne = "recoil_single_primary_prone_8outof10";
 	};
+	class Double : Mode_Burst
+	{
+		displayName = $STR_DZ_WPN_MR43_DSMODE_NAME;
+		dispersion = 0.003;
+		soundContinuous = 0;
+		reloadTime = 0.001;
+		ffCount = 2;
+		reloadMagazineSound[] = {"\ca\sounds\weapons\rifles\M1014-reload", 0.316228, 1, 20};
+		DB_shotgun_1[] = {"dayz_weapons\sounds\DB_shotgun_1", 1.77828, 1, 1000};
+		soundBegin[] = {"DB_shotgun_1", 1};
+		drySound[] = {"ca\sounds\weapons\rifles\dry", 0.01, 1, 10};
+		recoil = "recoil_single_primary_9outof10";
+		recoilProne = "recoil_single_primary_prone_8outof10";
+	};
 };

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

@@ -1,11 +1,22 @@
+#define R870_FLASHLIGHT class FlashLight\
+{\
+	color[] = {0.9, 0.9, 0.7, 0.9};\
+	ambient[] = {0.1, 0.1, 0.1, 1.0};\
+	position = "flash dir";\
+	direction = "flash";\
+	angle = 30;\
+	scale[] = {1, 1, 0.5};\
+	brightness = 0.1;\
+}
+
 class Remington870_DZ : Rifle
 {
 	scope = public;
 	
 	model = "\dayz_weapons\models\Remington870.p3d";
 	picture = "\dayz_weapons\textures\equip_remington870_CA.paa";
-	displayname = $STR_WPN_NAME_2;
-	descriptionShort = $STR_WPN_DESC_2;
+	displayname = $STR_DZ_WPN_R870_NAME;
+	descriptionShort = $STR_DZ_WPN_R870_DESC;
 	
 	magazines[] =
 	{
@@ -14,6 +25,10 @@ class Remington870_DZ : Rifle
 		2Rnd_12Gauge_Slug,
 		2Rnd_12Gauge_Buck
 	};
+	class Attachments
+	{
+		Attachment_FL = "Remington870_FL_DZ";
+	};
 	
 	handAnim[] = {"OFP2_ManSkeleton", "\Ca\weapons_E\Data\Anim\LeeEnfield.rtm"};
 	
@@ -40,17 +55,17 @@ class Remington870_DZ : Rifle
 class Remington870_FL_DZ : Remington870_DZ
 {
 	model = "\dayz_weapons\models\Remington870_lamp.p3d";
-	displayname = $STR_WPN_NAME_3;
-	descriptionShort = $STR_WPN_DESC_3;
+	displayname = $STR_DZ_WPN_R870_FL_NAME;
+	descriptionShort = $STR_DZ_WPN_R870_FL_DESC;
 	
-	class FlashLight
+	R870_FLASHLIGHT;
+	
+	class ItemActions
 	{
-		color[] = {0.9, 0.9, 0.7, 0.9};
-		ambient[] = {0.1, 0.1, 0.1, 1};
-		position = "flash dir";
-		direction = "flash";
-		angle = 30;
-		scale[] = {1, 1, 0.5};
-		brightness = 0.1;
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'Remington870_DZ'] call player_removeAttachment";
+		};
 	};
 };

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

@@ -4,8 +4,8 @@ class Winchester1866_DZ : Rifle
 	
 	model = "\dayz_weapons\models\Winchester1866.p3d";
 	picture = "\dayz_weapons\textures\equip_winchester1866_CA.paa";
-	displayname = $STR_WPN_NAME_1;
-	descriptionShort = $STR_WPN_DESC_1;
+	displayname = $STR_DZ_WPN_W1866_NAME;
+	descriptionShort = $STR_DZ_WPN_W1866_DESC;
 	
 	magazines[] = {15Rnd_W1866_Slug};
 	
@@ -29,9 +29,4 @@ class Winchester1866_DZ : Rifle
 		recoil = "recoil_single_primary_9outof10";
 		recoilProne = "recoil_single_primary_prone_8outof10";
 	};
-	
-	class Library
-	{
-		libTextDesc = $STR_WPN_DESC_1;
-	};
 };