Change scope and type of configs from name to numbers

This got discussed earlier. Since epoch got merged with DayZ Mod we have a different name for the scope and type of configs.  A proper config should use numbers for those entries. This is the same how arma configs are written.  The basicDefines.hpp has all the needed information stored.

Also, this removes the weight entries from the magazines since we have them in a separate folder, so admins can edit them.

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

@@ -120,7 +120,7 @@ class OpticsModes\
 
 
 class ACR_DZ_BASE: M4A1 {
-	scope = private;
+	scope = 0;
 	ACR_FLASHLIGHT;
 	magazines[] = {"ACR_30Rnd_680x43"};
 	class Library
@@ -179,7 +179,7 @@ class ACR_DZ_BASE: M4A1 {
 };
 
 class ACR_SD_DZ_BASE: M4A1_AIM_SD_camo {
-	scope = private;
+	scope = 0;
 	ACR_FLASHLIGHT;
 	magazines[] = {"ACR_30Rnd_680x43_SD"};
 	fireLightDuration = 0;
@@ -241,7 +241,7 @@ class ACR_SD_DZ_BASE: M4A1_AIM_SD_camo {
 //ACR Woodland
 class ACR_WDL_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_ACR_NAME;	
 	weaponInfoType = "RscWeaponZeroing";
 	discreteDistance[] = {100,200,300,400,500,600};	
@@ -260,7 +260,7 @@ class ACR_WDL_DZ : ACR_DZ_BASE
 
 class ACR_WDL_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_ACR_SD_NAME;
 	weaponInfoType = "RscWeaponZeroing";
 	discreteDistance[] = {100,200,300,400,500,600};	
@@ -675,7 +675,7 @@ class ACR_WDL_ACOG_GL_SD_DZ : ACR_WDL_GL_SD_DZ
 //ACR Woodland TWS
 class ACR_WDL_TWS_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_wdl_tws.paa";
 	model = "\fhq_remington\acr\acr_wdl_tws.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_NAME;
@@ -730,7 +730,7 @@ class ACR_WDL_TWS_GL_DZ : ACR_WDL_GL_DZ
 
 class ACR_WDL_TWS_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_wdl_tws_sd.paa";
 	model = "\fhq_remington\acr\acr_wdl_tws_sd.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME;
@@ -794,7 +794,7 @@ class ACR_WDL_TWS_GL_SD_DZ : ACR_WDL_GL_SD_DZ
 //ACR Woodland NV
 class ACR_WDL_NV_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -810,7 +810,7 @@ class ACR_WDL_NV_DZ : ACR_DZ_BASE
 
 class ACR_WDL_NV_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;
@@ -833,7 +833,7 @@ class ACR_WDL_NV_SD_DZ : ACR_SD_DZ_BASE
 
 class ACR_WDL_NV_GL_DZ : ACR_WDL_GL_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -856,7 +856,7 @@ class ACR_WDL_NV_GL_DZ : ACR_WDL_GL_DZ
 
 class ACR_WDL_NV_GL_SD_DZ : ACR_WDL_GL_SD_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;
@@ -886,7 +886,7 @@ class ACR_WDL_NV_GL_SD_DZ : ACR_WDL_GL_SD_DZ
 //ACR Black
 class ACR_BL_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_blk_iron.paa";
 	model = "\fhq_remington\acr\acr_blk_iron.p3d";	
 	displayName = $STR_DZ_WPN_ACR_NAME;	
@@ -907,7 +907,7 @@ class ACR_BL_DZ : ACR_DZ_BASE
 
 class ACR_BL_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_blk_iron_sd.paa";
 	model = "\fhq_remington\acr\acr_blk_iron_sd.p3d";	
 	displayName = $STR_DZ_WPN_ACR_SD_NAME;
@@ -1338,7 +1338,7 @@ class ACR_BL_ACOG_GL_SD_DZ : ACR_BL_GL_SD_DZ
 //ACR Black TWS
 class ACR_BL_TWS_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_blk_tws.paa";
 	model = "\fhq_remington\acr\acr_blk_tws.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_NAME;
@@ -1393,7 +1393,7 @@ class ACR_BL_TWS_GL_DZ : ACR_BL_GL_DZ
 
 class ACR_BL_TWS_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_blk_tws_sd.paa";
 	model = "\fhq_remington\acr\acr_blk_tws_sd.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME;
@@ -1457,7 +1457,7 @@ class ACR_BL_TWS_GL_SD_DZ : ACR_BL_GL_SD_DZ
 //ACR Black NV
 class ACR_BL_NV_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -1473,7 +1473,7 @@ class ACR_BL_NV_DZ : ACR_DZ_BASE
 
 class ACR_BL_NV_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;
@@ -1496,7 +1496,7 @@ class ACR_BL_NV_SD_DZ : ACR_SD_DZ_BASE
 
 class ACR_BL_NV_GL_DZ : ACR_BL_GL_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -1519,7 +1519,7 @@ class ACR_BL_NV_GL_DZ : ACR_BL_GL_DZ
 
 class ACR_BL_NV_GL_SD_DZ : ACR_BL_GL_SD_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;
@@ -1547,7 +1547,7 @@ class ACR_BL_NV_GL_SD_DZ : ACR_BL_GL_SD_DZ
 //ACR Desert
 class ACR_DES_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_tan_iron.paa";
 	model = "\fhq_remington\acr\acr_tan_iron.p3d";
 	displayName = $STR_DZ_WPN_ACR_NAME;	
@@ -1568,7 +1568,7 @@ class ACR_DES_DZ : ACR_DZ_BASE
 
 class ACR_DES_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_tan_iron_sd.paa";
 	model = "\fhq_remington\acr\acr_tan_iron_sd.p3d";
 	displayName = $STR_DZ_WPN_ACR_SD_NAME;
@@ -1999,7 +1999,7 @@ class ACR_DES_ACOG_GL_SD_DZ : ACR_DES_GL_SD_DZ
 //ACR Desert TWS
 class ACR_DES_TWS_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_tan_tws.paa";
 	model = "\fhq_remington\acr\acr_tan_tws.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_NAME;
@@ -2054,7 +2054,7 @@ class ACR_DES_TWS_GL_DZ : ACR_DES_GL_DZ
 
 class ACR_DES_TWS_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_tan_tws_sd.paa";
 	model = "\fhq_remington\acr\acr_tan_tws_sd.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME;
@@ -2118,7 +2118,7 @@ class ACR_DES_TWS_GL_SD_DZ : ACR_DES_GL_SD_DZ
 //ACR Desert NV
 class ACR_DES_NV_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -2134,7 +2134,7 @@ class ACR_DES_NV_DZ : ACR_DZ_BASE
 
 class ACR_DES_NV_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;
@@ -2157,7 +2157,7 @@ class ACR_DES_NV_SD_DZ : ACR_SD_DZ_BASE
 
 class ACR_DES_NV_GL_DZ : ACR_DES_GL_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -2180,7 +2180,7 @@ class ACR_DES_NV_GL_DZ : ACR_DES_GL_DZ
 
 class ACR_DES_NV_GL_SD_DZ : ACR_DES_GL_SD_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME;
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;	
@@ -2209,7 +2209,7 @@ class ACR_DES_NV_GL_SD_DZ : ACR_DES_GL_SD_DZ
 //ACR Snow
 class ACR_SNOW_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_snw_iron.paa";
 	model = "\fhq_remington\acr\acr_snw_iron.p3d";
 	displayName = $STR_DZ_WPN_ACR_NAME;	
@@ -2230,7 +2230,7 @@ class ACR_SNOW_DZ : ACR_DZ_BASE
 
 class ACR_SNOW_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_snw_iron_sd.paa";
 	model = "\fhq_remington\acr\acr_snw_iron_sd.p3d";	
 	displayName = $STR_DZ_WPN_ACR_SD_NAME;
@@ -2661,7 +2661,7 @@ class ACR_SNOW_ACOG_GL_SD_DZ : ACR_SNOW_GL_SD_DZ
 //ACR Snow TWS
 class ACR_SNOW_TWS_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_snw_tws.paa";
 	model = "\fhq_remington\acr\acr_snw_tws.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_NAME;
@@ -2716,7 +2716,7 @@ class ACR_SNOW_TWS_GL_DZ : ACR_SNOW_GL_DZ
 
 class ACR_SNOW_TWS_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	picture = "\fhq_remington\acr\ui\i_acr_snw_tws_sd.paa";
 	model = "\fhq_remington\acr\acr_snw_tws_sd.p3d";
 	displayName = $STR_DZ_WPN_ACR_TWS_SD_NAME;
@@ -2780,7 +2780,7 @@ class ACR_SNOW_TWS_GL_SD_DZ : ACR_SNOW_GL_SD_DZ
 //ACR Snow NV
 class ACR_SNOW_NV_DZ : ACR_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -2796,7 +2796,7 @@ class ACR_SNOW_NV_DZ : ACR_DZ_BASE
 
 class ACR_SNOW_NV_SD_DZ : ACR_SD_DZ_BASE
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;
@@ -2819,7 +2819,7 @@ class ACR_SNOW_NV_SD_DZ : ACR_SD_DZ_BASE
 
 class ACR_SNOW_NV_GL_DZ : ACR_SNOW_GL_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_DESC;
@@ -2842,7 +2842,7 @@ class ACR_SNOW_NV_GL_DZ : ACR_SNOW_GL_DZ
 
 class ACR_SNOW_NV_GL_SD_DZ : ACR_SNOW_GL_SD_DZ
 {
-	scope = public;
+	scope = 2;
 	ACR_NV;
 	displayName = $STR_DZ_WPN_ACR_NV_GL_SD_NAME;	
 	descriptionShort = $STR_DZ_WPN_ACR_NV_SD_DESC;

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

@@ -1,6 +1,6 @@
 class AN94_DZ: AK_74
 {
-	scope = public;
+	scope = 2;
 	opticsZoomInit = 0.375;
 	model = "\RH_aks\RH_an94.p3d";
 	picture = "\RH_aks\inv\an94.paa";
@@ -111,7 +111,7 @@ class AN94_DZ: AK_74
 };
 class AN94_GL_DZ: AN94_DZ
 {
-	scope = public;
+	scope = 2;
 	model = "\RH_aks\RH_an94gl.p3d";
 	modelOptics = "-";
 	optics = 1;

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

@@ -1,7 +1,7 @@
 class BAF_AS50_scoped;
 class BAF_AS50_scoped_DZ : BAF_AS50_scoped {
 	displayname = "AS50";
-	type = WeaponSlotPrimary;
+	type = 1;
 	canlock = 0;
 	//cursor = "RifleCursor";
 	//cursoraim = "Foresight";

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

@@ -2,5 +2,5 @@ class Anzio_20;
 class Anzio_20_DZ : Anzio_20 {
 	displayName = $STR_DZ_WPN_ANZIO_NAME;
 	descriptionShort = $STR_DZ_WPN_ANZIO_DESC;	
-	type = WeaponSlotPrimary;
+	type = 1;
 };

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

@@ -1,7 +1,7 @@
 class Barrett_MRAD_Iron_DZ: m107
 {
-	scope = public;
-	type = WeaponSlotPrimary;
+	scope = 2;
+	type = 1;
 	canlock	= 0;
 	autoFire = 0;
 	displayname = $STR_DZ_WPN_BARETT_MRAD_IRON_NAME;
@@ -55,8 +55,8 @@ class Barrett_MRAD_CCO_DZ: Barrett_MRAD_Iron_DZ
 
 class Barrett_MRAD_Sniper_DZ: m107
 {	
-	scope = public;
-	type = WeaponSlotPrimary;
+	scope = 2;
+	type = 1;
 	canlock	= 0;
 	autoFire = 0;
 	magazines[] = {10Rnd_86x70_MRAD};

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

@@ -1,6 +1,6 @@
 class CTAR21_DZ: M4A1
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_CTAR21_NAME;
 	model = "\RH_hk416\RH_ctar21.p3d";
 	picture = "\RH_hk416\inv\ctar21.paa";

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

@@ -56,7 +56,7 @@ class Crossbow_Base : Rifle
 
 class Crossbow_DZ : Crossbow_Base
 {
-	scope = public;
+	scope = 2;
 	
 	model = "z\addons\community_crossbow\models\crossbow.p3d";
 	picture = "\z\addons\community_crossbow\icons\crossbow_icon.paa";

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

@@ -1,6 +1,6 @@
 class G3_DZ: FNFAL_DZ
 {
-	scope = public;
+	scope = 2;
 	model = "\z\addons\dayz_epoch_w\g3\h4g3.p3d";
 	picture	= "\z\addons\dayz_epoch_w\g3\data\w_g3_ca.paa";
 	displayName	= $STR_DZ_WPN_G3_NAME;

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

@@ -1,7 +1,7 @@
 //Groza-9
 class Groza9_DZ: AKM_DZ
 {
-	scope = public;
+	scope = 2;
 	model = "\RH_aks\RH_oc14.p3d";
 	picture = "\RH_aks\inv\oc14.paa";
 	displayName = $STR_DZ_WPN_Groza9_NAME;
@@ -150,7 +150,7 @@ class Groza9_Sniper_SD_DZ: Groza9_SD_DZ
 //Groza-1
 class Groza1_DZ: AKM_DZ
 {
-	scope = public;
+	scope = 2;
 	model = "\RH_aks\RH_gr1.p3d";
 	picture = "\RH_aks\inv\gr1.paa";
 	displayName = $STR_DZ_WPN_Groza1_NAME;

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

@@ -1,6 +1,6 @@
 class HK53A3_DZ: M4A1
 {
-	scope = public;
+	scope = 2;
 	model = "\RH_smg\RH_HK53.p3d";
 	displayName = $STR_DZ_WPN_HK53A3_NAME;
 	UiPicture = "\CA\weapons\data\Ico\i_regular_CA.paa";

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

@@ -1,6 +1,6 @@
 class KAC_PDW_DZ: Rifle
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_KACPDW_NAME;
 	descriptionShort = $STR_DZ_WPN_KACPDW_DESC;
 	model = "\RH_pdw\RH_pdw.p3d";

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

@@ -1,4 +1,4 @@
 class ksvk;
 class KSVK_DZE:ksvk {
-    type = WeaponSlotPrimary;
+    type = 1;
 };

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

@@ -4,7 +4,7 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim
 	picture = "\z\addons\dayz_communityweapons\l110a1\data\w_l110a1_cco_ca.paa";
 	displayName = $STR_DZ_WPN_L110A1_CCO_NAME;
 	irDistance = 0;
-	type = WeaponSlotPrimary;
+	type = 1;
 	magazines[] =
 	{
 		200Rnd_556x45_L110A1,
@@ -64,7 +64,7 @@ class L110A1_DZ : L110A1_CCO_DZ
 };
 
 class BAF_L110A1_Aim_DZE: BAF_L110A1_Aim { //Slightly different scope from L110A1_CCO_DZ, otherwise identical
-	type = WeaponSlotPrimary;
+	type = 1;
 	magazines[] =
 	{
 		200Rnd_556x45_L110A1,

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

@@ -2,8 +2,8 @@ class m107;
 class m107_DZ: m107 {
 	displayname = $STR_DZ_WPN_M107_NAME;
 	descriptionShort = $STR_DZ_WPN_M107_DESC;
-	scope = public;
-	type = WeaponSlotPrimary;
+	scope = 2;
+	type = 1;
 	canlock = 0;
 	magazines[] = {"10Rnd_127x99_m107"};
 	begin1[] = {"ca\sounds\weapons\rifles\m107",2.51189,1,2000};

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

@@ -45,7 +45,7 @@ class M16A2_Rusty_DZ : M16A2 {
 		scale[] = {1, 1, 0.5};
 		brightness = 0.1;
 	};
-	scope = public;
+	scope = 2;
 	picture = "\ice_apo_weapons\Data\m16_ca.paa";
 	model = "\ice_apo_weapons\M16_proxy";
 	displayName = $STR_DZE_WPN_M16RUSTY_NAME;

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

@@ -38,7 +38,7 @@ class OpticsModes\
 
 class M1A_SC16_BL_DZ: M14_EP1
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_M1ASC16_NAME;
 	descriptionShort = $STR_DZ_WPN_M1ASC16_DESC;
 	reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20};
@@ -187,7 +187,7 @@ class M1A_SC16_BL_Sniper_DZ: M1A_SC16_BL_DZ
 
 class M1A_SC16_TAN_DZ: M14_EP1
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_M1ASC16_NAME;
 	descriptionShort = $STR_DZ_WPN_M1ASC16_DESC;
 	reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20};
@@ -338,7 +338,7 @@ class M1A_SC16_TAN_Sniper_DZ: M1A_SC16_TAN_DZ
 
 class M1A_SC2_BL_DZ: M14_EP1
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_M1ASC2_NAME;
 	descriptionShort = $STR_DZ_WPN_M1ASC2_DESC;
 	reloadMagazineSound[] = {"\RH_m14\Sound\M14_Reload.wss",0.056234,1,20};

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

@@ -1,7 +1,7 @@
 class M200_CheyTac_DZ: m107
 {
-	scope = public;
-	type = WeaponSlotPrimary;
+	scope = 2;
+	type = 1;
 	canlock	= 0;
 	displayname = $STR_DZ_WPN_M200_CHEYTAC_NAME;
 	descriptionShort = $STR_DZ_WPN_M200_CHEYTAC_DESC;

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

@@ -1,6 +1,6 @@
 class M21_DZ: M14_EP1
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_M21_NAME;
 	descriptionShort = $STR_DZ_WPN_M21_DESC;
 	model = "\RH_m14\RH_m21.p3d";

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

@@ -3,7 +3,7 @@ class M240_DZ : M240
 	picture = "\z\addons\dayz_communityweapons\m240\data\w_m240_ca.paa";
 	displayName = $STR_DZ_WPN_M240_NAME;
 	
-	type = WeaponSlotPrimary;
+	type = 1;
 	
 	magazines[] = {100Rnd_762x51_M240};
 	
@@ -51,5 +51,5 @@ class M240_Holo_DZ : M240_CCO_DZ
 };
 
 class m240_scoped_EP1_DZE:m240_scoped_EP1 { //has m145 scope
-	type = WeaponSlotPrimary;
+	type = 1;
 };

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

@@ -4,7 +4,7 @@ class M249_CCO_DZ : M249
 	picture = "\z\addons\dayz_communityweapons\m249\data\w_m249_cco_ca.paa";
 	displayName = $STR_DZ_WPN_M249_CCO_NAME;
 	
-	type = WeaponSlotPrimary;
+	type = 1;
 	
 	magazines[] = 
 	{
@@ -67,7 +67,7 @@ class M249_Holo_DZ : M249_CCO_DZ
 
 class M249_EP1;
 class M249_EP1_DZ: M249_EP1 { //Iron sight with shorter stock (slightly different look from M249_DZ) can also fire MG36 mags
-	type = WeaponSlotPrimary;
+	type = 1;
 	
 	magazines[] = 
 	{
@@ -84,7 +84,7 @@ class M249_EP1_DZ: M249_EP1 { //Iron sight with shorter stock (slightly differen
 
 class M249_m145_EP1;
 class M249_m145_EP1_DZE: M249_m145_EP1 {
-	type = WeaponSlotPrimary;
+	type = 1;
 	
 	magazines[] = 
 	{

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

@@ -1,6 +1,6 @@
 class M31_DZ: MP5A5
 {
-	scope = public;
+	scope = 2;
 	model = "z\addons\dayz_epoch_w\suomi\suomikp31.p3d";
 	displayName = $STR_DZ_WPN_M31_NAME;
 	descriptionShort = $STR_DZ_WPN_M31_DESC;			

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

@@ -1564,7 +1564,7 @@ class M4A1_GL_ACOG_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ
 class M4A1_Rusty_DZ : M4A1 {
 	M4A1_FLASHLIGHT;
 	
-	scope = public;
+	scope = 2;
 	model = "\ice_apo_weapons\M4_ironsight";
 	picture = "\ice_apo_weapons\Data\m4a1_ca.paa";
 	displayName = $STR_DZE_WPN_M4RUSTY_NAME;

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

@@ -1,4 +1,4 @@
 class M60A4_EP1;
 class M60A4_EP1_DZE : M60A4_EP1 {
-    type = WeaponSlotPrimary;
+    type = 1;
 };

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

@@ -1,6 +1,6 @@
 class MAT49_DZ: MP5A5
 {
-	scope = public;
+	scope = 2;
 	model = "\z\addons\dayz_epoch_w\mat49\h4_mat49";
 	displayName = $STR_DZ_WPN_MAT49_NAME;
 	descriptionShort = $STR_DZ_WPN_MAT49_DESC;	

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

@@ -1,6 +1,6 @@
 class MR43_Base : Rifle
 {
-	scope = public;
+	scope = 2;
 	
 	descriptionShort = $STR_DZ_WPN_MR43_DESC;
 	

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

@@ -1,6 +1,6 @@
 class MSR_BASE: Rifle
 {
-	scope = private;
+	scope = 0;
 	irLaserPos = "laser pos";
 	irLaserEnd = "laser dir";
 	irDistance = 100;
@@ -53,7 +53,7 @@ class MSR_BASE: Rifle
 };
 class MSR_SD_BASE: Rifle
 {
-	scope = private;
+	scope = 0;
 	irLaserPos = "laser pos";
 	irLaserEnd = "laser dir";
 	irDistance = 100;
@@ -109,7 +109,7 @@ class MSR_SD_BASE: Rifle
 
 class MSR_DZ: MSR_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_MSR_NAME;
 	descriptionShort = $STR_DZ_WPN_MSR_DESC;	
 	model = "\fhq_remington\MSR\MSR.p3d";
@@ -118,7 +118,7 @@ class MSR_DZ: MSR_BASE
 
 class MSR_SD_DZ: MSR_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_MSRSD_NAME;
 	descriptionShort = $STR_DZ_WPN_MSR_SD_DESC;	
 	model = "\fhq_remington\MSR\MSR_sd.p3d";
@@ -127,7 +127,7 @@ class MSR_SD_DZ: MSR_SD_BASE
 
 class MSR_NV_DZ: MSR_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_MSR_NV_NAME;
 	descriptionShort = $STR_DZ_WPN_MSR_NV_DESC;	
 	model = "\fhq_remington\MSR\MSR_nv.p3d";
@@ -137,7 +137,7 @@ class MSR_NV_DZ: MSR_BASE
 
 class MSR_NV_SD_DZ: MSR_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_MSRSD_NV_NAME;
 	descriptionShort = $STR_DZ_WPN_MSR_SD_NV_DESC;	
 	model = "\fhq_remington\MSR\MSR_nv_sd.p3d";
@@ -147,7 +147,7 @@ class MSR_NV_SD_DZ: MSR_SD_BASE
 
 class MSR_TWS_DZ: MSR_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_MSR_TWS_NAME;
 	descriptionShort = $STR_DZ_WPN_MSR_TWS_DESC;	
 	model = "\fhq_remington\MSR\MSR_tws.p3d";
@@ -184,7 +184,7 @@ class MSR_TWS_DZ: MSR_BASE
 
 class MSR_TWS_SD_DZ: MSR_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_MSRSD_TWS_NAME;
 	descriptionShort = $STR_DZ_WPN_MSR_SD_TWS_DESC;	
 	model = "\fhq_remington\MSR\MSR_tws_sd.p3d";

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

@@ -4,7 +4,7 @@ class Mk48_CCO_DZ : Mk_48
 	picture = "\z\addons\dayz_communityweapons\mk48\data\w_mk48_cco_camo_ca.paa";
 	displayName = $STR_DZ_WPN_MK48_CCO_NAME;
 	
-	type = WeaponSlotPrimary;
+	type = 1;
 	
 	magazines[] = {100Rnd_762x51_M240};
 	
@@ -61,7 +61,7 @@ class Mk48_Holo_DZ : Mk48_CCO_DZ
 class Mk_48_DES_EP1;
 class Mk48_DES_CCO_DZ: Mk_48_DES_EP1 {
 	displayName = $STR_DZ_WPN_MK48_CCO_NAME;
-	type = WeaponSlotPrimary;
+	type = 1;
 	weaponInfoType = "RscWeaponZeroing";
 	discreteDistance[] = {300,400,500,600,700,800,900,1000};
 	discreteDistanceInitIndex = 0;

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

@@ -53,7 +53,7 @@ class Mosin_Base : Rifle
 
 class Mosin_DZ : Mosin_Base
 {
-	scope = public;
+	scope = 2;
 	
 	model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_animated";
 	picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891.paa";
@@ -220,7 +220,7 @@ class Mosin_Belt_MFL_DZ : Mosin_MFL_DZ
 
 class Mosin_PU_DZ : Mosin_Base
 {
-	scope = public;
+	scope = 2;
 	
 	model = "z\addons\dayz_communityweapons\models\mosin_nagant\mosin_1891_scoped_animated";
 	picture = "\z\addons\dayz_communityweapons\models\mosin_nagant\images\1891S.paa";

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

@@ -1,6 +1,6 @@
 class PKM_DZ : PK //Iron sight PKM
 {
-	type = WeaponSlotPrimary;
+	type = 1;
 	
 	model = "z\addons\dayz_communityweapons\pkm\pkm.p3d";
 	displayName = $STR_DZ_WPN_PKM_NAME;
@@ -19,6 +19,7 @@ class PKM_DZ : PK //Iron sight PKM
 	};
 };
 
-class Pecheneg_DZ: Pecheneg { //PKP with long range scope
-	type = WeaponSlotPrimary;
+class Pecheneg_DZ: Pecheneg //PKP with long range scope
+{ 
+	type = 1;
 };

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

@@ -38,7 +38,7 @@ class OpticsModes\
 
 class RK95_DZ: AKM_DZ
 {
-	scope = public;
+	scope = 2;
 	opticsZoomInit = 0.375;
 	model = "\RH_aks\RH_rk95.p3d";
 	picture = "\RH_aks\inv\rk95.paa";

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

@@ -1,6 +1,6 @@
 class RSASS_BASE: DMR
 {
-	scope = private;
+	scope = 0;
 	htMin = 1;
 	htMax = 420;
 	afMax = 0;
@@ -114,7 +114,7 @@ class RSASS_SD_BASE: RSASS_BASE
 
 class RSASS_DZ: RSASS_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_RSASS_NAME;
 	descriptionShort = $STR_DZ_WPN_RSASS_DESC;	
 	model = "\fhq_remington\rsass\rsass.p3d";
@@ -128,7 +128,7 @@ class RSASS_DZ: RSASS_BASE
 
 class RSASS_TWS_DZ: RSASS_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_RSASS_TWS_NAME;
 	descriptionShort = $STR_DZ_WPN_RSASS_TWS_DESC;		
 	model = "\fhq_remington\rsass\rsass_tws.p3d";
@@ -184,7 +184,7 @@ class RSASS_TWS_DZ: RSASS_BASE
 };
 class RSASS_SD_DZ: RSASS_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_RSASSSD_NAME;
 	descriptionShort = $STR_DZ_WPN_RSASS_SD_DESC;		
 	model = "\fhq_remington\rsass\rsass_sd.p3d";
@@ -198,7 +198,7 @@ class RSASS_SD_DZ: RSASS_SD_BASE
 
 class RSASS_TWS_SD_DZ: RSASS_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_RSASSSD_TWS_NAME;
 	descriptionShort = $STR_DZ_WPN_RSASS_SD_TWS_DESC;		
 	model = "\fhq_remington\rsass\rsass_tws_sd.p3d";

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

@@ -22,7 +22,7 @@
 
 class Remington870_Base : Rifle
 {
-	scope = public;
+	scope = 2;
 	
 	descriptionShort = $STR_DZ_WPN_R870_DESC;
 	

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

@@ -1,6 +1,6 @@
 class Sten_MK_DZ: MP5A5
 {
-	scope = public;
+	scope = 2;
 	model = "z\addons\dayz_epoch_w\sten\h4_sten.p3d";
 	displayName = $STR_DZ_WPN_STEN_MK_NAME;
 	picture	= "\z\addons\dayz_epoch_w\sten\data\W_sten_CA.paa";

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

@@ -21,7 +21,7 @@ class OpticsModes\
 
 class SteyrAug_A3_base: Rifle
 {
-	scope = private;
+	scope = 0;
 	displayName = "";
 	descriptionShort = $STR_DZ_WPN_AUGA3_DESC;
 	model = "\MIDF_Weapons\Aug_a3\Aug_a3.p3d";	
@@ -72,7 +72,7 @@ class SteyrAug_A3_base: Rifle
 };
 
 class SteyrAug_A3_Green_DZ: SteyrAug_A3_base {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_AUGA3_NAME;
 	modelOptics = "\MIDF_Weapons\optic\leupold_cqt.p3d";
 	picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_green.paa";
@@ -143,7 +143,7 @@ class SteyrAug_A3_ACOG_Blue_DZ: SteyrAug_A3_ACOG_Green_DZ {
 };
 
 class SteyrAug_A3_Holo_Green_DZ: SteyrAug_A3_base {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_AUGA3_HOLO_NAME;
 	model = "\MIDF_Weapons\Aug_a3\Aug_a3_eotech.p3d";
 	picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_eotech_green.paa";
@@ -173,7 +173,7 @@ class SteyrAug_A3_Holo_Blue_DZ: SteyrAug_A3_Holo_Green_DZ {
 };
 
 class SteyrAug_A3_GL_Green_DZ: SteyrAug_A3_Green_DZ {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_AUGA3_GL_NAME;
 	picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_gl_green.paa";
 	model = "\MIDF_Weapons\Aug_a3\aug_a3_gl.p3d";	
@@ -264,7 +264,7 @@ class SteyrAug_A3_ACOG_GL_Blue_DZ: SteyrAug_A3_ACOG_GL_Green_DZ {
 };
 
 class SteyrAug_A3_Holo_GL_Green_DZ: SteyrAug_A3_base {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_AUGA3_HOLO_GL_NAME;
 	picture = "\MIDF_Weapons\Aug_a3\pictures\aug_a3_eotech_gl_green.paa";
 	model = "\MIDF_Weapons\Aug_a3\aug_a3_eotech_gl.p3d";

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

@@ -1,6 +1,6 @@
 class USAS12_DZ: Saiga12K
 {
-	scope = public;		
+	scope = 2;		
 	displayName = $STR_DZ_WPN_USAS12_NAME;
 	descriptionShort = $STR_DZ_WPN_USAS12_DESC;
 	model = "\z\addons\dayz_epoch_w\usas12\h4_usas12.p3d";

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

@@ -1,7 +1,7 @@
 class WA2000_DZ: m107
 {
-	scope = public;
-	type = WeaponSlotPrimary;
+	scope = 2;
+	type = 1;
 	canlock	= 0;
 	displayname = $STR_DZ_WPN_WA2000_NAME;
 	descriptionShort = $STR_DZ_WPN_WA2000_DESC;

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

@@ -1,6 +1,6 @@
 class Winchester1866_Base : Rifle
 {
-	scope = public;
+	scope = 2;
 	descriptionShort = $STR_DZ_WPN_W1866_DESC;
 	
 	magazines[] = {15Rnd_W1866_Slug};

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

@@ -1,6 +1,6 @@
 class XM2010_BASE: Rifle
 {
-	scope = private;
+	scope = 0;
 	irLaserPos = "laser pos";
 	irLaserEnd = "laser dir";
 	irDistance = 100;
@@ -53,7 +53,7 @@ class XM2010_BASE: Rifle
 
 class XM2010_SD_BASE: Rifle
 {
-	scope = private;
+	scope = 0;
 	irLaserPos = "laser pos";
 	irLaserEnd = "laser dir";
 	irDistance = 100;
@@ -108,7 +108,7 @@ class XM2010_SD_BASE: Rifle
 
 class XM2010_DZ: XM2010_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM2010_NAME;
 	descriptionShort = $STR_DZ_WPN_XM2010_DESC;
 	model = "\fhq_remington\XM2010\XM2010.p3d";
@@ -116,7 +116,7 @@ class XM2010_DZ: XM2010_BASE
 };
 class XM2010_SD_DZ: XM2010_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM2010SD_NAME;
 	descriptionShort = $STR_DZ_WPN_XM2010_SD_DESC;
 	model = "\fhq_remington\XM2010\XM2010_sd.p3d";
@@ -124,7 +124,7 @@ class XM2010_SD_DZ: XM2010_SD_BASE
 };
 class XM2010_NV_DZ: XM2010_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM2010_NV_NAME;
 	descriptionShort = $STR_DZ_WPN_XM2010_NV_DESC;
 	model = "\fhq_remington\XM2010\XM2010_nv.p3d";
@@ -133,7 +133,7 @@ class XM2010_NV_DZ: XM2010_BASE
 };
 class XM2010_NV_SD_DZ: XM2010_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM2010SD_NV_NAME;
 	descriptionShort = $STR_DZ_WPN_XM2010_SD_NV_DESC;
 	model = "\fhq_remington\XM2010\XM2010_nv_sd.p3d";
@@ -142,7 +142,7 @@ class XM2010_NV_SD_DZ: XM2010_SD_BASE
 };
 class XM2010_TWS_DZ: XM2010_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM2010_TWS_NAME;
 	descriptionShort = $STR_DZ_WPN_XM2010_TWS_DESC;
 	model = "\fhq_remington\XM2010\XM2010_tws.p3d";
@@ -178,7 +178,7 @@ class XM2010_TWS_DZ: XM2010_BASE
 };
 class XM2010_TWS_SD_DZ: XM2010_SD_BASE
 {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM2010SD_TWS_NAME;
 	descriptionShort = $STR_DZ_WPN_XM2010_SD_TWS_DESC;
 	model = "\fhq_remington\XM2010\XM2010_tws_sd.p3d";

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

@@ -1,6 +1,6 @@
 class m8_carbine;
 class XM8_DZ: m8_carbine {
-	scope = public;
+	scope = 2;
 	displayName = $STR_DZ_WPN_XM8_CARBINE_NAME;
 	descriptionShort = $STR_DSS_XM8;
 	model = "\RH_mgswp\RH_xm8.p3d";