From 4b486559b984df2c6570fe33f6384b745acda6d0 Mon Sep 17 00:00:00 2001
From: ebayShopper <ebayShopper@users.noreply.github.com>
Date: Mon, 20 Nov 2017 15:38:00 -0500
Subject: [PATCH] Update shotgun configs

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/cad0a6fd2de98243e1ecc7e3ae91c55e7f6c332d
---
 SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp | 14 +++++++++-----
 .../Configs/CfgWeapons/Rifles/Remington870.hpp   | 13 +++++++++----
 SQF/dayz_code/Configs/CfgWeapons/Rifles/UK59.hpp | 16 ++++++++++------
 .../Configs/CfgWeapons/Rifles/Winchester1866.hpp | 13 ++++++++-----
 4 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
index 4bd74f283..0c7d4a22c 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MR43.hpp
@@ -1,15 +1,12 @@
-class MR43_DZ : Rifle
+class MR43_Base : Rifle
 {
 	scope = public;
 	
-	model = "\dayz_weapons\models\mr43.p3d";
-	picture = "\dayz_weapons\textures\equip_mr43_CA.paa";
-	displayname = $STR_DZ_WPN_MR43_NAME;
 	descriptionShort = $STR_DZ_WPN_MR43_DESC;
 	
 	magazines[] =
 	{
-		2Rnd_12Gauge_Buck,
+		2Rnd_12Gauge_Buck,	
 		2Rnd_12Gauge_Slug		
 	};
 	
@@ -47,3 +44,10 @@ class MR43_DZ : Rifle
 		recoilProne = "recoil_single_primary_prone_8outof10";
 	};
 };
+
+class MR43_DZ : MR43_Base
+{
+	model = "\dayz_weapons\models\mr43.p3d";
+	picture = "\dayz_weapons\textures\equip_mr43_CA.paa";
+	displayname = $STR_DZ_WPN_MR43_NAME;
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
index 02714dd7c..08d5472fb 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Remington870.hpp
@@ -20,13 +20,10 @@
 	brightness = 0.08;\
 }
 
-class Remington870_DZ : Rifle
+class Remington870_Base : Rifle
 {
 	scope = public;
 	
-	model = "\dayz_weapons\models\Remington870.p3d";
-	picture = "\dayz_weapons\textures\equip_remington870_CA.paa";
-	displayname = $STR_DZ_WPN_R870_NAME;
 	descriptionShort = $STR_DZ_WPN_R870_DESC;
 	
 	magazines[] =
@@ -57,6 +54,14 @@ class Remington870_DZ : Rifle
 		recoil = "recoil_single_primary_9outof10";
 		recoilProne = "recoil_single_primary_prone_8outof10";
 	};
+};
+
+class Remington870_DZ : Remington870_Base
+{
+	model = "\dayz_weapons\models\Remington870.p3d";
+	picture = "\dayz_weapons\textures\equip_remington870_CA.paa";
+	displayname = $STR_DZ_WPN_R870_NAME;
+	
 	class Attachments
 	{
 		Attachment_FL = "Remington870_FL_DZ";
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/UK59.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/UK59.hpp
index 8015dac76..ccd5872dd 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/UK59.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/UK59.hpp
@@ -1,13 +1,8 @@
-class UK59_DZ : PKM_DZ
+class UK59_Base : PKM_DZ
 {
-	model = "z\addons\dayz_communityweapons\uk59\uk59.p3d";
-	picture = "\z\addons\dayz_communityweapons\uk59\data\w_uk59_ca.paa";
-	displayName = $STR_DZ_WPN_UK59_NAME;
 	descriptionShort = $STR_DZ_WPN_UK59_DESC;
 	
 	magazines[] = {50Rnd_762x54_UK59};
-
-	discreteDistance[] = {100,200,300,400,500,600,700,800};
 	
 	class FullAuto : FullAuto
 	{
@@ -15,4 +10,13 @@ class UK59_DZ : PKM_DZ
 		begin1[] = {"\z\addons\dayz_communityweapons\uk59\data\uk_single_1", db8, 1, 1400};
 		soundBegin[] = {begin1,1};
 	};
+};
+
+class UK59_DZ : UK59_Base
+{
+	model = "z\addons\dayz_communityweapons\uk59\uk59.p3d";
+	picture = "\z\addons\dayz_communityweapons\uk59\data\w_uk59_ca.paa";
+	displayName = $STR_DZ_WPN_UK59_NAME;
+	
+	discreteDistance[] = {100,200,300,400,500,600,700,800};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp
index cc6068a1d..a3512d262 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Winchester1866.hpp
@@ -1,10 +1,6 @@
-class Winchester1866_DZ : Rifle
+class Winchester1866_Base : Rifle
 {
 	scope = public;
-	
-	model = "\dayz_weapons\models\Winchester1866.p3d";
-	picture = "\dayz_weapons\textures\equip_winchester1866_CA.paa";
-	displayname = $STR_DZ_WPN_W1866_NAME;
 	descriptionShort = $STR_DZ_WPN_W1866_DESC;
 	
 	magazines[] = {15Rnd_W1866_Slug};
@@ -29,4 +25,11 @@ class Winchester1866_DZ : Rifle
 		recoil = "recoil_single_primary_9outof10";
 		recoilProne = "recoil_single_primary_prone_8outof10";
 	};
+};
+
+class Winchester1866_DZ : Winchester1866_Base
+{
+	model = "\dayz_weapons\models\Winchester1866.p3d";
+	picture = "\dayz_weapons\textures\equip_winchester1866_CA.paa";
+	displayname = $STR_DZ_WPN_W1866_NAME;
 };
\ No newline at end of file