Add epoch version of the Red Ryder BB gun

SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp

@@ -4,7 +4,6 @@ Hunting[] =
 	{Loot_GROUP,		10,		shotgunsingleshot},
 	{Loot_GROUP,		1,		Chainsaws},
 	{Loot_WEAPON,		1,		DMR_Gh_DZ},
-	{Loot_WEAPON,		1,		RedRyder},
 	
 	//Tools
 	{Loot_GROUP,		5,		ToolsSurvival},
@@ -14,7 +13,7 @@ Hunting[] =
 	{Loot_MAGAZINE,		2,		FoodNutmix},
 	{Loot_MAGAZINE,		1,		ItemDocument},
 	{Loot_MAGAZINE,		1,		ItemMixOil},
-	{Loot_MAGAZINE,		1,		350Rnd_BB_Magazine},
+	{Loot_MAGAZINE,		1,		350Rnd_BB_GUN},
 	
 	//Backpacks
 	{Loot_GROUP,		5,		backpacks},

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

@@ -269,7 +269,7 @@ shotgunsingleshot[] = { // Residential Spawns
 	{Loot_WEAPON,		2,		LeeEnfield_DZ},
 	{Loot_WEAPON,		3,		MR43_DZ},
 	{Loot_WEAPON,		3,		Crossbow_DZ},
-	{Loot_WEAPON,		3,		RedRyder},
+	{Loot_WEAPON,		3,		RedRyder_DZ},
 	{Loot_WEAPON,		1,		CZ550_DZ},
 	{Loot_WEAPON,		1,		Mosin_DZ}
 };

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

@@ -54,3 +54,16 @@ class 20Rnd_B_765x17_Ball: 10Rnd_B_765x17_Ball
 {
 	displayName = "$STR_EP1_DN_20RND_B_765X17_BALL";	
 };
+
+//Red Ryder
+class 350Rnd_BB_Magazine;
+class 350Rnd_BB_GUN: 350Rnd_BB_Magazine
+{
+	displayName = $STR_DZ_MAG_350RND_BB_GUN_NAME;	
+	descriptionShort = $STR_DZ_MAG_350RND_BB_GUN_DESC;	
+	
+	class ItemActions
+	{
+		COMBINE_MAG
+	};	
+};

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

@@ -60,7 +60,7 @@ class Category_20 {
 class Category_21 {
 	class 1Rnd_Bolt_Tranquilizer {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class 12Rnd_Quiver_Wood {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
-	class 350Rnd_BB_Magazine {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
+	class 350Rnd_BB_GUN {type = "trade_items";buy[] = {2,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class 2Rnd_12Gauge_Buck {type = "trade_items";buy[] = {1,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class 2Rnd_12Gauge_Slug {type = "trade_items";buy[] = {1,"ItemSilverBar"};sell[] = {1,"ItemSilverBar"};};
 	class 8Rnd_12Gauge_Slug {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {4,"ItemSilverBar"};};

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

@@ -162,7 +162,7 @@ class Category_15 {
 	class Crossbow_Scope_FL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
 	class Crossbow_CCO_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
 	class Crossbow_Scope_MFL_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};};
-	class RedRyder {type = "trade_weapons";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};};
+	class RedRyder_DZ {type = "trade_weapons";buy[] = {1,"ItemSilverBar10oz"};sell[] = {5,"ItemSilverBar"};};
 	class MR43_DZ {type = "trade_weapons";buy[] = {1,"ItemSilverBar10oz"};sell[] = {8,"ItemSilverBar"};};
 	class Winchester1866_DZ {type = "trade_weapons";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};};
 	class M1014_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};

SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Ammunition.hpp

@@ -60,7 +60,7 @@ class Category_20 {
 class Category_21 {
 	class 1Rnd_Bolt_Tranquilizer {type = "trade_items";buy[] = {2,"worth"};sell[] = {1,"worth"};};
 	class 12Rnd_Quiver_Wood {type = "trade_items";buy[] = {4,"worth"};sell[] = {2,"worth"};};
-	class 350Rnd_BB_Magazine {type = "trade_items";buy[] = {2,"worth"};sell[] = {1,"worth"};};
+	class 350Rnd_BB_GUN {type = "trade_items";buy[] = {2,"worth"};sell[] = {1,"worth"};};
 	class 2Rnd_12Gauge_Buck {type = "trade_items";buy[] = {1,"worth"};sell[] = {1,"worth"};};
 	class 2Rnd_12Gauge_Slug {type = "trade_items";buy[] = {1,"worth"};sell[] = {1,"worth"};};
 	class 8Rnd_12Gauge_Slug {type = "trade_items";buy[] = {4,"worth"};sell[] = {4,"worth"};};

SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp

@@ -162,7 +162,7 @@ class Category_15 {
 	class Crossbow_Scope_FL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {400,"worth"};};
 	class Crossbow_CCO_MFL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {400,"worth"};};
 	class Crossbow_Scope_MFL_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {500,"worth"};};
-	class RedRyder {type = "trade_weapons";buy[] = {10,"worth"};sell[] = {5,"worth"};};
+	class RedRyder_DZ {type = "trade_weapons";buy[] = {10,"worth"};sell[] = {5,"worth"};};
 	class MR43_DZ {type = "trade_weapons";buy[] = {10,"worth"};sell[] = {5,"worth"};};
 	class Winchester1866_DZ {type = "trade_weapons";buy[] = {20,"worth"};sell[] = {10,"worth"};};
 	class M1014_DZ {type = "trade_weapons";buy[] = {300,"worth"};sell[] = {200,"worth"};};

SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp

@@ -214,6 +214,8 @@ class CfgWeapons
 	#include "Rifles\WA2000.hpp"	
 	#include "Rifles\BarrettMRAD.hpp"	
 	
+	#include "Rifles\RedRyder.hpp"
+	
 	/* PISTOLS */
 	
 	class M9;

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

@@ -0,0 +1,6 @@
+class RedRyder;
+class RedRyder_DZ: RedRyder {
+	displayName = $STR_DZ_WPN_RED_RYDER_NAME;
+	descriptionShort = $STR_DZ_WPN_RED_RYDER_DESC;
+	magazines[] = {"350Rnd_BB_GUN"};
+};

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/Ammo/ShotgunAmmo.hpp

@@ -59,6 +59,10 @@ class 350Rnd_BB_Magazine
 {
 	weight = 0.06;
 };
+class 350Rnd_BB_GUN
+{
+	weight = 0.06;
+};
 class 8Rnd_12Gauge_Buck
 {
 	weight = 0.3;

SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Shotguns.hpp

@@ -78,6 +78,10 @@ class RedRyder
 {
 	weight = 1;
 };
+class RedRyder_DZ
+{
+	weight = 1;
+};
 class Saiga12K
 {
 	weight = 3.5;

SQF/dayz_code/stringtable.xml

@@ -18397,6 +18397,15 @@
 			<Russian>M134 сдвоенный</Russian>
 		</Key>
 		
+		<!-- Red Ryder BB Gun -->
+		<Key ID="STR_DZ_WPN_RED_RYDER_NAME">
+			<English>Red Ryder BB</English>
+		</Key>
+        <Key ID="STR_DZ_WPN_RED_RYDER_DESC">
+			<English>Red Ryder BB&lt;br/&gt;Caliber: 4.5mm BBs</English>
+			<German>Red Ryder BB&lt;br/&gt;Kaliber: 4.5mm BBs</German>
+		</Key>		
+
 		<!-- **** MAGAZINES **** -->
 
 		<Key ID="STR_DZ_MAG_17RND_9X19_GLOCK17SD_NAME">
@@ -21927,6 +21936,22 @@
 			<Hungarian>Kaliber: 30x113mm&lt;br/&gt; Töltények: 1200&lt;br/&gt; Hozzá tartozó fegyver: AH-64</Hungarian>
 		</Key>
 		
+		<Key ID="STR_DZ_MAG_350RND_BB_GUN_NAME">
+			<English>350Rnd. 4.5mm mag.</English>
+			<Russian>350с. 4.5мм</Russian>
+		</Key>
+		<Key ID="STR_DZ_MAG_350RND_BB_GUN_DESC">
+			<English>Caliber: 4.5mm&lt;br/&gt;Rounds: 350&lt;br/&gt;Used in: Red Ryder BB</English>
+			<French>Calibre: 4.5mm&lt;br/&gt;Munitions : 350&lt;br/&gt;Utilisé avec: Red Ryder BB</French>
+			<Spanish>Calibre: 4.5mm&lt;br/&gt;Cartuchos: 350&lt;br/&gt;Usado en: Red Ryder BB</Spanish>
+			<Italian>Calibro: 4.5mm&lt;br/&gt;Munizioni: 350&lt;br/&gt;Usato in: Red Ryder BB</Italian>
+			<Polish>Kaliber: 4.5mm&lt;br/&gt;Naboje: 350&lt;br/&gt;Uzywany w: Red Ryder BB</Polish>
+			<Russian>Калибр: 4.5мм&lt;br/&gt;Количество: 350&lt;br/&gt;Исп. в: Red Ryder BB</Russian>
+			<German>Kaliber: 4.5mm&lt;br/&gt;Patronen: 350&lt;br/&gt;Verwendet in: Red Ryder BB</German>
+			<Czech>Kalibr: 4.5mm&lt;br/&gt;Nábojů: 350&lt;br/&gt;Pro: Red Ryder BB</Czech>
+			<Hungarian>Kaliber: 4.5mm&lt;br/&gt; Töltények: 350&lt;br/&gt; Hozzá tartozó fegyver: Red Ryder BB</Hungarian>
+		</Key>		
+
 		<!-- **** ATTACHMENTS **** -->
 
 		<Key ID="STR_DZ_ATT_ACT_TO_PRIMARY">