Add new L85 and SVD variants

Vanilla commits:

8951508770

aad4569581

58e594553b

eaf9648253

CHANGE LOG 1.0.6.2.txt

@@ -1,6 +1,8 @@
 [NEW] Newest version of DayZero enterable buildings provided by Tansien and Zac https://zombies.nu/. This fixes broken barracks shadows and adds several new interiors. #1601
 [NEW] Land_houseV_2T2 is now enterable. Interior modeled by @Streatman
 [NEW] Added loot positions for new enterable buildings
+[NEW] Added L85 attachments totaling 24 variants, new models by @Streatman. Class L85_Holo_DZ no longer exists and must be updated to L85A2_DZ in custom scripts and SQL.
+[NEW] SVD scope attachments can now be removed, new models by @Streatman
 [NEW] Added DZE_limitPlots so admins can limit plot poles to one per UID, disabled by default. @oiad
 [NEW] Pumpkin, sunflower, and hemp plants spawned with createVehicle can be harvested with a knife now. #1928 @F507DMT
 [NEW] The journal and dayz_survived variable now contain actual play time [array] instead of days since the character was created [number].
@@ -14,7 +16,7 @@
 [NEW] Admins can now change the lootRefreshTimer for each building type from the default 15 minutes. CfgLoot.hpp must be updated if using custom loot tables. 
 
 [UPDATED] Loot and zed spawn is now disabled in trader cities by default. This is configurable in mission\init.sqf via DZE_SafeZonePosArray. Added function to check positions against DZE_SafeZonePosArray "_PosInSafeZone = _positionToCheck call DZE_SafeZonePosCheck;"
-[UPDATED] Zombie pathing. Zeds should now run more direct to players.
+[UPDATED] Zombie pathing. Zeds should now run more direct to players and no longer get stuck at the position where a player entered a vehicle.
 [UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
 [UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
 [UPDATED] Owners can no longer be removed by added friends in plot and door management. @oiad

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

@@ -50,7 +50,8 @@ AmmoBoxEU2[] =
 {
 	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
 	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
-	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
+	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240},
+	{Loot_MAGAZINE,		4,		5Rnd_86x70_L115A1}
 };
 
 //7.62x39mm
@@ -102,4 +103,4 @@ AmmoBoxUS4[] =
 	{Loot_MAGAZINE,		1,		SmokeShellRed},
 	{Loot_MAGAZINE,		1,		SmokeShellGreen},
 	{Loot_MAGAZINE,		0.3,	PipeBomb}
-};
+};

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

@@ -33,7 +33,7 @@ Supermarket[] =
 	{Loot_MAGAZINE,		3,		ItemBandage},
 	{Loot_MAGAZINE,		2,		ItemPainkiller},
 	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
-	{Loot_MAGAZINE,		2,		equip_nails},
+	{Loot_MAGAZINE,		1,		equip_nails},
 	
 	//Groups
 	{Loot_GROUP,		40,		Consumable},

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

@@ -43,9 +43,8 @@ sniperrifles[] = {
 	{Loot_WEAPON,		1,		AK_107_PSO},
 	{Loot_WEAPON,		0.9,	M4SPR},
 	{Loot_WEAPON,		0.9,	M40A3_DZ}, //M40A3
-	{Loot_WEAPON,		0.7,	SVD_Gh_DZ}, //SVD_CAMO
+	{Loot_WEAPON,		0.7,	SVD_PSO1_Gh_DZ},
-	{Loot_WEAPON,		0.7,	SVD_des_EP1},
+	{Loot_WEAPON,		0.7,	SVD_PSO1_DZ},
-	{Loot_WEAPON,		0.7,	SVD_DZ}, //SVD
 	{Loot_WEAPON,		1,		CZ550_DZ}, //huntingrifle
 	{Loot_WEAPON,		0.8,	M24_des_EP1},
 	{Loot_WEAPON,		0.8,	M24_DZ}, //M24
@@ -96,14 +95,12 @@ assaultrifles[] = {
 	{Loot_WEAPON,		0.3,		SA58_ACOG_DZ}, //No camo, no grip handle
 	{Loot_WEAPON,		0.2,		Sa58V_RCO_EP1}, // Camo with grip handle
 	{Loot_WEAPON,		0.3,		SA58_RIS_DZ}, //SA58_DZ with different rail
-	{Loot_WEAPON,		0.4,		m8_compact},
+	{Loot_WEAPON,		0.3,		m8_compact},
-	{Loot_WEAPON,		0.3,		m8_sharpshooter},
+	{Loot_WEAPON,		0.2,		m8_sharpshooter},
-	{Loot_WEAPON,		0.3,		m8_holo_sd},
+	{Loot_WEAPON,		0.2,		m8_holo_sd},
-	{Loot_WEAPON,		0.5,		m8_carbine},
+	{Loot_WEAPON,		0.3,		m8_carbine},
-	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_SUSAT},
+	{Loot_WEAPON,		0.5,		L85A2_DZ},
-	{Loot_WEAPON,		0.3,		L85_Holo_DZ}, //BAF_L85A2_RIS_Holo
 	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
-	{Loot_WEAPON,		0.2,		BAF_L85A2_RIS_ACOG}, //L85A2 ACOG
 	//Mk16
 	{Loot_WEAPON,		0.2,		SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD 
 	{Loot_WEAPON,		0.3,		SCAR_L_CQC}, //Mk16 CQC 

SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp

@@ -36,7 +36,18 @@ class CfgMagazines
 	
 	//Consumables: food, drinks etc.
 	#include "Consumables\Consumables.hpp"
-
+	
+	/*class 5Rnd_86x70_L115A1: CA_Magazine //.338 Lapua Magnum
+	{
+		scope = 2;
+		displayName = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10;
+		descriptionShort = $STR_BAF_CFGMAGAZINES_5RND_86X70_L115A10_0;
+		ammo=B_86x70_Ball_noTracer;
+		count=5;
+		initSpeed = 936; //TODO
+		picture="\CA\weapons_BAF\data\UI\M_lrr_CA.paa"; 
+		// descriptionShort = $STR_DSS_10RND_M107; TODO
+	};*/
 	
 	
 	//EPOCH ADDITIONS

SQF/dayz_code/Configs/CfgMagazines/Items/Tent.hpp

@@ -17,7 +17,7 @@ class ItemTent : CA_Magazine
 			require[] = {};
 			consume[] = {"ItemTent"};
 			create = "TentStorage";
-			ghost = "TentStorage_Ghost";
+			//ghost = "TentStorage_Ghost";
 			//Bypass collision test
 			bypassCollision = "true";
 		};
@@ -62,7 +62,7 @@ class ItemDomeTent : CA_Magazine
 			require[] = {};
 			consume[] = {"ItemDomeTent"};
 			create = "DomeTentStorage";
-			ghost = "DomeTentStorage_Ghost";
+			//ghost = "DomeTentStorage_Ghost";
 			//Bypass collision test
 			bypassCollision = "true";
 		};

SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp

@@ -123,7 +123,14 @@ class CfgWeapons
 	class RPK_74;
 	#include "Rifles\RPK74.hpp"
 	
-	class SVD;
+	class SVD : Rifle
+	{
+		class OpticsModes
+		{
+			class Scope;
+			class Ironsights;
+		};
+	};
 	#include "Rifles\SVD.hpp"
 	
 	#include "Rifles\Mosin.hpp"
@@ -141,7 +148,7 @@ class CfgWeapons
 	#include "Rifles\SA58.hpp"
 	
 	class BAF_L85A2_RIS_Holo;
-	#include "Rifles\L85.hpp"
+	#include "Rifles\L85A2.hpp"
 	
 	class bizon;
 	class bizon_silenced;
@@ -157,6 +164,7 @@ class CfgWeapons
 	#include "Rifles\Winchester1866.hpp"
 	#include "Rifles\Remington870.hpp"
 	#include "Rifles\Crossbow.hpp"
+	#include "Rifles\L115A3.hpp"
 	
 	
 	
@@ -275,7 +283,6 @@ class CfgWeapons
 	
 	
 	
-	
 	/* OTHER */
 	
 	/*class ItemFlashlightEmpty : ItemCore
@@ -322,4 +329,4 @@ class CfgWeapons
 			};
 		};
 	};*/
-};
+};

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

@@ -0,0 +1,60 @@
+class L115A3_Base : Rifle
+{
+	scope = 2;
+	descriptionShort = $STR_DZ_WPN_L115A3_DESC;
+	
+	magazines[] = {5Rnd_86x70_L115A1};
+	
+	handAnim[] = {"OFP2_ManSkeleton","\Ca\weapons\data\Anim\M24.rtm"};
+	
+	dexterity = 1.7;
+	initSpeed = 936;
+
+	optics = true;		
+	modelOptics = "\ca\Weapons_baf\LRR_optic"; 
+	visionMode[] = {"Normal"};
+	weaponInfoType = "RscWeaponZeroing";
+	discreteDistance[] = {100,200,300,400,500,600,700,800,1000,1200,1400};
+	discreteDistanceInitIndex = 2;
+	opticsPPEffects[] = {"OpticsCHAbera1","OpticsBlur1"};
+	opticsFlare = true;
+	opticsDisablePeripherialVision = true;
+	opticsZoomMin = 0.0498; distanceZoomMin = 400;
+	opticsZoomMax = 0.15; 	distanceZoomMax = 120;
+	discretefov[] = {0.0755,0.0249};
+	discreteInitIndex = 0;
+	
+	modes[] = {"Single"};
+	
+	class Single : Mode_SemiAuto
+	{
+		dispersion = 0.00018;
+		soundContinuous = 0;
+		reloadTime = 2;
+		backgroundReload = true;
+		recoil = "recoil_single_primary_2outof10";
+		recoilProne = "recoil_single_primary_prone_2outof10";
+		begin1[] = {"ca\sounds_baf\weapons\AS50_rel", db9, 1,1300}; 
+		soundBegin[] = {begin1,1};
+		minRange = 2;
+		minRangeProbab = 0.10;
+		midRange = 250;
+		midRangeProbab = 0.7;
+		maxRange = 1500;
+		maxRangeProbab = 0.05;
+	};
+/// type = WeaponSlotPrimary + WeaponSlotSecondary;	
+};
+
+class L115A3_DZ : L115A3_Base
+{
+	model = "\ca\weapons_BAF\LRR_scoped_BAF";
+	picture = "\CA\weapons_baf\data\UI\LRR_scoped_ca.paa";  
+	displayname = $STR_DZ_WPN_L115A3_NAME;
+};
+
+class L115A3_2_DZ : L115A3_DZ
+{
+    model = "\ca\weapons_BAF\LRR_scoped_w_BAF";
+    displayname = $STR_BAF_CFGWEAPONS_BAF_LRR_SCOPED_W0;
+};

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

@@ -1,21 +0,0 @@
-class L85_Holo_DZ : BAF_L85A2_RIS_Holo
-{
-	/*
-	magazines[] =
-	{
-		30Rnd_556x45_Stanag,
-		30Rnd_556x45_StanagSD
-	};
-	*/
-};
-class BAF_L85A2_RIS_CWS;
-class BAF_L85A2_RIS_TWS_DZ : BAF_L85A2_RIS_CWS
-{
-	visionMode[] = {"Normal","NVG","Ti"};
-	thermalMode[] = {6};
-	discretefov[] = {0.0755,0.0249};
-	discreteInitIndex = 0;
-	discreteDistance[] = {100,200,300,400,500,600,700,800};
-	discreteDistanceInitIndex = 2;
-	displayName = "L85A2 TWS";
-};

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

@@ -0,0 +1,754 @@
+#define L85A2_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;\
+}
+
+#define L85A2_MFLASHLIGHT class FlashLight\
+{\
+	color[] = {0.9, 0.0, 0.0, 0.9};\
+	ambient[] = {0.1, 0.0, 0.0, 1.0};\
+	position = "flash dir";\
+	direction = "flash";\
+	angle = 30;\
+	scale[] = {1, 1, 0.5};\
+	brightness = 0.08;\
+}
+
+#define L85A2_ACOG modelOptics = "\Ca\weapons_E\SCAR\ACOG_TA31_optic_4x.p3d";\
+class OpticsModes\
+{\
+	class ACOG\
+	{\
+		opticsID = 1;\
+		useModelOptics = true;\
+		opticsFlare = true;\
+		opticsDisablePeripherialVision = true;\
+		opticsZoomMin = 0.0623;\
+		opticsZoomMax = 0.0623;\
+		opticsZoomInit = 0.0623;\
+		distanceZoomMin = 300;\
+		distanceZoomMax = 300;\
+		memoryPointCamera = "opticView";\
+		visionMode[] = {"Normal"};\
+		opticsPPEffects[] = {"OpticsCHAbera3","OpticsBlur3"};\
+		cameraDir = "";\
+	};\
+	\
+	class Iron\
+	{\
+		opticsID = 2;\
+		useModelOptics = false;\
+		opticsFlare = false;\
+		opticsDisablePeripherialVision = false;\
+		opticsZoomMin = 0.25;\
+		opticsZoomMax = 1.1;\
+		opticsZoomInit = 0.5;\
+		distanceZoomMin = 100;\
+		distanceZoomMax = 100;\
+		memoryPointCamera = "eye";\
+		visionMode[] = {};\
+		opticsPPEffects[] = {};\
+		cameraDir = "";\
+	};\
+}
+
+//Iron sights
+
+class L85A2_DZ : BAF_L85A2_RIS_Holo
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_NAME;
+	
+	magazines[] =
+	{
+		30Rnd_556x45_Stanag,
+		30Rnd_556x45_StanagSD
+	};
+	
+	class Single;
+	class FullAuto;
+	
+	class Attachments
+	{
+		Attachment_CCO = "L85A2_CCO_DZ";
+		Attachment_Holo = "L85A2_Holo_DZ";
+		Attachment_ACOG = "L85A2_ACOG_DZ";
+		Attachment_Sup556 = "L85A2_SD_DZ";
+		Attachment_FL = "L85A2_FL_DZ";
+		Attachment_MFL = "L85A2_MFL_DZ";
+	};
+};
+
+class L85A2_FL_DZ : L85A2_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_FL.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_FL_NAME;
+	
+	L85A2_FLASHLIGHT;
+	
+	class Attachments
+	{
+		Attachment_CCO = "L85A2_CCO_FL_DZ";
+		Attachment_Holo = "L85A2_Holo_FL_DZ";
+		Attachment_ACOG = "L85A2_ACOG_FL_DZ";
+		Attachment_Sup556 = "L85A2_SD_FL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_MFL_DZ : L85A2_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_FL.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_MFL_NAME;
+	
+	L85A2_MFLASHLIGHT;
+	
+	class Attachments
+	{
+		Attachment_CCO = "L85A2_CCO_MFL_DZ";
+		Attachment_Holo = "L85A2_Holo_MFL_DZ";
+		Attachment_ACOG = "L85A2_ACOG_MFL_DZ";
+		Attachment_Sup556 = "L85A2_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_SD_Base : L85A2_DZ
+{
+	magazines[] =
+	{
+	//	30Rnd_556x45_Stanag,
+		30Rnd_556x45_StanagSD
+	};
+	fireLightDuration = 0;
+	fireLightIntensity = 0;
+	modes[] = {"Single","FullAuto"};
+	class Single : Single
+	{
+		begin1[] = {"ca\sounds\weapons\rifles\rifle-silence-single2",1,1,300};
+		soundBegin[] = {"begin1",1};
+		recoil = "recoil_single_primary_2outof10";
+		recoilProne = "recoil_single_primary_prone_2outof10";
+		minRange = 2;
+		minRangeProbab = 0.3;
+		midRange = 40;
+		midRangeProbab = 0.7;
+		maxRange = 150;
+		maxRangeProbab = 0.05;
+	};
+	class FullAuto : FullAuto
+	{
+		begin1[] = {"ca\sounds\weapons\rifles\rifle-silence-single2",1,1,300};
+		soundBegin[] = {"begin1",1};
+		recoil = "recoil_auto_primary_2outof10";
+		recoilProne = "recoil_auto_primary_prone_2outof10";
+		minRange = 0;
+		minRangeProbab = 0.3;
+		midRange = 20;
+		midRangeProbab = 0.7;
+		maxRange = 40;
+		maxRangeProbab = 0.05;
+	};
+};
+	
+class L85A2_SD_DZ : L85A2_SD_Base
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_SD.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_SD_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_SD_NAME;
+	
+	class Attachments
+	{
+		Attachment_CCO = "L85A2_CCO_SD_DZ";
+		Attachment_Holo = "L85A2_Holo_SD_DZ";
+		Attachment_ACOG = "L85A2_ACOG_SD_DZ";
+		Attachment_FL = "L85A2_SD_FL_DZ";
+		Attachment_MFL = "L85A2_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_SD_FL_DZ : L85A2_SD_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_SD_FL.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_sd_FL_NAME;
+	
+	L85A2_FLASHLIGHT;
+	
+	class Attachments
+	{
+		Attachment_CCO = "L85A2_CCO_SD_FL_DZ";
+		Attachment_Holo = "L85A2_Holo_SD_FL_DZ";
+		Attachment_ACOG = "L85A2_ACOG_SD_FL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_SD_MFL_DZ : L85A2_SD_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_SD_FL.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_sd_MFL_NAME;
+	
+	L85A2_MFLASHLIGHT;
+	
+	class Attachments
+	{
+		Attachment_CCO = "L85A2_CCO_SD_MFL_DZ";
+		Attachment_Holo = "L85A2_Holo_SD_MFL_DZ";
+		Attachment_ACOG = "L85A2_ACOG_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+//CCO
+
+class L85A2_CCO_DZ : L85A2_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_CCO.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_cco_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_CCO_NAME;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_CCO_SD_DZ";
+		Attachment_FL = "L85A2_CCO_FL_DZ";
+		Attachment_MFL = "L85A2_CCO_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveCCO
+		{
+			text = $STR_DZ_ATT_CCO_RMVE;
+			script = "; ['Attachment_CCO',_id,'L85A2_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_CCO_FL_DZ : L85A2_FL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_cco_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_cco_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_CCO_FL_NAME;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_CCO_SD_FL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveCCO
+		{
+			text = $STR_DZ_ATT_CCO_RMVE;
+			script = "; ['Attachment_CCO',_id,'L85A2_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_CCO_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_CCO_MFL_DZ : L85A2_MFL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_cco_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_cco_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_CCO_MFL_NAME;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_CCO_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveCCO
+		{
+			text = $STR_DZ_ATT_CCO_RMVE;
+			script = "; ['Attachment_CCO',_id,'L85A2_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_CCO_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_CCO_SD_DZ : L85A2_SD_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_cco_sd.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_cco_sd_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_CCO_SD_NAME;
+	
+	class Attachments
+	{
+		Attachment_FL = "L85A2_CCO_SD_FL_DZ";
+		Attachment_MFL = "L85A2_CCO_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveCCO
+		{
+			text = $STR_DZ_ATT_CCO_RMVE;
+			script = "; ['Attachment_CCO',_id,'L85A2_SD_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_CCO_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_CCO_SD_FL_DZ : L85A2_SD_FL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_cco_sd_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_cco_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_CCO_SD_FL_NAME;
+	
+	class ItemActions
+	{
+		class RemoveCCO
+		{
+			text = $STR_DZ_ATT_CCO_RMVE;
+			script = "; ['Attachment_CCO',_id,'L85A2_SD_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_CCO_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_CCO_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_CCO_SD_MFL_DZ : L85A2_SD_MFL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_cco_sd_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_cco_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_CCO_SD_MFL_NAME;
+	
+	class ItemActions
+	{
+		class RemoveCCO
+		{
+			text = $STR_DZ_ATT_CCO_RMVE;
+			script = "; ['Attachment_CCO',_id,'L85A2_SD_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_CCO_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_CCO_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+//Holo
+
+class L85A2_Holo_DZ : L85A2_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_holo.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_holo_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_HOLO_NAME;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_Holo_SD_DZ";
+		Attachment_FL = "L85A2_Holo_FL_DZ";
+		Attachment_MFL = "L85A2_Holo_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'L85A2_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_Holo_FL_DZ : L85A2_FL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_holo_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_holo_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_HOLO_FL_NAME;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_Holo_SD_FL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'L85A2_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_Holo_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_Holo_MFL_DZ : L85A2_MFL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_holo_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_holo_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_HOLO_MFL_NAME;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_Holo_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'L85A2_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_Holo_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_Holo_SD_DZ : L85A2_SD_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_holo_sd.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_holo_sd_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_HOLO_SD_NAME;
+	
+	class Attachments
+	{
+		Attachment_FL = "L85A2_Holo_SD_FL_DZ";
+		Attachment_MFL = "L85A2_Holo_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'L85A2_SD_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_Holo_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_Holo_SD_FL_DZ : L85A2_SD_FL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_holo_sd_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_holo_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_HOLO_SD_FL_NAME;
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'L85A2_SD_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_Holo_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_Holo_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_Holo_SD_MFL_DZ : L85A2_SD_MFL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_holo_sd_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_holo_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_HOLO_SD_MFL_NAME;
+	
+	class ItemActions
+	{
+		class RemoveHolo
+		{
+			text = $STR_DZ_ATT_HOLO_RMVE;
+			script = "; ['Attachment_Holo',_id,'L85A2_SD_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_Holo_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_Holo_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+//ACOG
+
+class L85A2_ACOG_DZ : L85A2_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_acog.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_acog_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_ACOG_NAME;
+	
+	L85A2_ACOG;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_ACOG_SD_DZ";
+		Attachment_FL = "L85A2_ACOG_FL_DZ";
+		Attachment_MFL = "L85A2_ACOG_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'L85A2_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_ACOG_FL_DZ : L85A2_FL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_acog_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_acog_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_ACOG_FL_NAME;
+	
+	L85A2_ACOG;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_ACOG_SD_FL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'L85A2_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_ACOG_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_ACOG_MFL_DZ : L85A2_MFL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_acog_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_acog_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_ACOG_MFL_NAME;
+	
+	L85A2_ACOG;
+	
+	class Attachments
+	{
+		Attachment_Sup556 = "L85A2_ACOG_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'L85A2_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_ACOG_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_ACOG_SD_DZ : L85A2_SD_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_acog_sd.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_acog_sd_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_ACOG_SD_NAME;
+	
+	L85A2_ACOG;
+	
+	class Attachments
+	{
+		Attachment_FL = "L85A2_ACOG_SD_FL_DZ";
+		Attachment_MFL = "L85A2_ACOG_SD_MFL_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'L85A2_SD_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_ACOG_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_ACOG_SD_FL_DZ : L85A2_SD_FL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_acog_sd_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_acog_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_ACOG_SD_FL_NAME;
+	
+	L85A2_ACOG;
+	
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'L85A2_SD_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_ACOG_FL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_FL',_id,'L85A2_ACOG_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class L85A2_ACOG_SD_MFL_DZ : L85A2_SD_MFL_DZ
+{
+	model = "z\addons\dayz_communityweapons\L85A2\L85A2_acog_sd_fl.p3d";
+	picture = "\z\addons\dayz_communityweapons\L85A2\data\w_L85A2_acog_sd_fl_ca.paa";
+	displayName = $STR_DZ_WPN_L85A2_ACOG_SD_MFL_NAME;
+	
+	L85A2_ACOG;
+
+	class ItemActions
+	{
+		class RemoveACOG
+		{
+			text = $STR_DZ_ATT_ACOG_RMVE;
+			script = "; ['Attachment_ACOG',_id,'L85A2_SD_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveSuppressor
+		{
+			text = $STR_ATTACHMENT_RMVE_Silencer;
+			script = "; ['Attachment_Sup556',_id,'L85A2_ACOG_MFL_DZ'] call player_removeAttachment";
+		};
+		class RemoveFlashlight
+		{
+			text = $STR_DZ_ATT_FL_RFL_RMVE;
+			script = "; ['Attachment_MFL',_id,'L85A2_ACOG_SD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class BAF_L85A2_RIS_CWS;
+class BAF_L85A2_RIS_TWS_DZ : BAF_L85A2_RIS_CWS
+{
+	visionMode[] = {"Normal","NVG","Ti"};
+	thermalMode[] = {6};
+	discretefov[] = {0.0755,0.0249};
+	discreteInitIndex = 0;
+	discreteDistance[] = {100,200,300,400,500,600,700,800};
+	discreteDistanceInitIndex = 2;
+	displayName = "L85A2 TWS";
+};

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

@@ -1,7 +1,8 @@
-class SVD_DZ : SVD
+class SVD_PSO1_DZ : SVD
 {
+	model = "z\addons\dayz_communityweapons\SVD\SVD_PSO.p3d";
 	picture = "\ca\weapons\data\equip\w_svd_ca.paa";
-	displayName = $STR_DZ_WPN_SVD_NAME;
+	displayName = $STR_DZ_WPN_SVD_PSO1_NAME;
 	
 	//weaponInfoType = "RscWeaponEmpty";
 	//discreteDistance[] = {};
@@ -9,8 +10,7 @@ class SVD_DZ : SVD
 	//distanceZoomMin = 200;
 	//distanceZoomMax = 200;
 	
-	magazines[] = {10Rnd_762x54_SVD};
+	magazines[] = {10Rnd_762x54_SVD};	
-	
 	//reloadTime = 0.06;
 	
 	//recoil = "recoil_single_primary_4outof10";
@@ -18,19 +18,84 @@ class SVD_DZ : SVD
 	
 	//dispersion = 0.00045;
 	
+	class OpticsModes : OpticsModes
+	{
+		class Scope : Scope {};
+		class Ironsights : Ironsights {};
+	};
+	
+	class Attachments
+	{
+		Attachment_Ghillie = "SVD_PSO1_Gh_DZ";
+	};
+	
+	class ItemActions
+	{
+		class RemovePSO1
+		{
+			text = $STR_DZ_ATT_PSO1_RMVE;
+			script = "; ['Attachment_PSO1',_id,'SVD_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class SVD_PSO1_Gh_DZ : SVD_PSO1_DZ
+{
+	model = "z\addons\dayz_communityweapons\SVD\SVD_PSO_Ghilli.p3d";
+	picture = "\z\addons\dayz_communityweapons\SVD\data\w_SVD_PSO1_Gh_ca.paa";
+	displayName = $STR_DZ_WPN_SVD_PSO1_GH_NAME;
+	
+	class Attachments {};
+	
+	class ItemActions
+	{
+		class RemoveGhillie
+		{
+			text = $STR_DZ_ATT_GHIL_RMVE;
+			script = "; ['Attachment_Ghillie',_id,'SVD_PSO1_DZ'] call player_removeAttachment";
+		};
+		class RemovePSO1
+		{
+			text = $STR_DZ_ATT_PSO1_RMVE;
+			script = "; ['Attachment_PSO1',_id,'SVD_Gh_DZ'] call player_removeAttachment";
+		};
+	};
+};
+
+class SVD_DZ : SVD_PSO1_DZ
+{
+	model = "z\addons\dayz_communityweapons\SVD\SVD.p3d";
+	picture = "\z\addons\dayz_communityweapons\SVD\data\w_SVD_ca.paa";
+	displayName = $STR_DZ_WPN_SVD_NAME;
+	
+	weaponInfoType = "RscWeaponZeroing";
+	
+	class OpticsModes : OpticsModes
+	{
+		class Ironsights : Ironsights
+		{
+			opticsID = 1;
+			discreteDistanceInitIndex = 2;
+		};
+	};
+	
 	class Attachments
 	{
 		Attachment_Ghillie = "SVD_Gh_DZ";
+		Attachment_PSO1 = "SVD_PSO1_DZ";
 	};
 };
 
 class SVD_Gh_DZ : SVD_DZ
 {
-	model = "ca\weapons\svd_camo.p3d";
+	model = "z\addons\dayz_communityweapons\SVD\SVD_Ghilli.p3d";
-	picture = "\ca\weapons\data\equip\w_svd_camo_ca.paa";
+	picture = "\z\addons\dayz_communityweapons\SVD\data\w_SVD_Gh_ca.paa";
 	displayName = $STR_DZ_WPN_SVD_GH_NAME;
 	
-	class Attachments {};
+	class Attachments 
+	{
+		Attachment_PSO1 = "SVD_PSO1_Gh_DZ";
+	};
 	
 	class ItemActions
 	{

SQF/dayz_code/stringtable.xml

@@ -9554,6 +9554,111 @@
 			<Russian>DMR (камуфляж)</Russian>
 			<German>DMR Tarn</German>
 		</Key>
+		<Key ID="STR_DZ_WPN_L115A3_NAME">
+			<English>L115A3 LRR</English>
+		</Key>
+		<Key ID="STR_DZ_WPN_L115A3_DESC">
+			<English>Sniper rifle   &lt;br/&gt;Caliber: .338 Lapua Magnum</English>
+			<Russian>Снайперская винтовка &lt;br/&gt;Патрон: .338 Lapua Magnum</Russian>
+			<German>Scharfschützengewehr  &lt;br/&gt;Kaliber: .338 Lapua Magnum</German>			
+		</Key>
+
+		<!-- L85A2 -->
+		<Key ID="STR_DZ_WPN_L85A2_NAME">
+			<English>L85A2</English>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_FL_NAME">
+			<English>L85A2 FL</English>
+			<Russian>L85A2 Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_MFL_NAME">
+			<English>L85A2 MFL</English>
+			<Russian>L85A2 вФ</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_SD_NAME">
+			<English>L85A2 SD</English>
+			<Russian>L85A2 ПБС</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_SD_FL_NAME">
+			<English>L85A2 SD FL</English>
+			<Russian>L85A2 ПБС Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_SD_MFL_NAME">
+			<English>L85A2 SD MFL</English>
+			<Russian>L85A2 ПБС вФ</Russian>
+		</Key>
+		<!-- L85A2 CCO-->
+		<Key ID="STR_DZ_WPN_L85A2_CCO_NAME">
+			<English>L85A2 CCO</English>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_CCO_FL_NAME">
+			<English>L85A2 CCO FL</English>
+			<Russian>L85A2 CCO Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_CCO_MFL_NAME">
+			<English>L85A2 CCO MFL</English>
+			<Russian>L85A2 CCO вФ</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_CCO_SD_NAME">
+			<English>L85A2 CCO SD</English>
+			<Russian>L85A2 CCO ПБС</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_CCO_SD_FL_NAME">
+			<English>L85A2 CCO SD FL</English>
+			<Russian>L85A2 CCO ПБС Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_CCO_SD_MFL_NAME">
+			<English>L85A2 CCO SD MFL</English>
+			<Russian>L85A2 CCO ПБС вФ</Russian>
+		</Key>
+		<!-- L85A2 Holo -->
+		<Key ID="STR_DZ_WPN_L85A2_HOLO_NAME">
+			<English>L85A2 Holo</English>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_HOLO_FL_NAME">
+			<English>L85A2 Holo FL</English>
+			<Russian>L85A2 Holo Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_HOLO_MFL_NAME">
+			<English>L85A2 Holo MFL</English>
+			<Russian>L85A2 Holo вФ</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_HOLO_SD_NAME">
+			<English>L85A2 Holo SD</English>
+			<Russian>L85A2 Holo ПБС</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_HOLO_SD_FL_NAME">
+			<English>L85A2 Holo SD FL</English>
+			<Russian>L85A2 Holo ПБС Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_HOLO_SD_MFL_NAME">
+			<English>L85A2 Holo SD MFL</English>
+			<Russian>L85A2 Holo ПБС вФ</Russian>
+		</Key>
+		<!-- L85A2 ACOG -->
+		<Key ID="STR_DZ_WPN_L85A2_ACOG_NAME">
+			<English>L85A2 ACOG</English>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_ACOG_FL_NAME">
+			<English>L85A2 ACOG FL</English>
+			<Russian>L85A2 ACOG Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_ACOG_MFL_NAME">
+			<English>L85A2 ACOG MFL</English>
+			<Russian>L85A2 ACOG вФ</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_ACOG_SD_NAME">
+			<English>L85A2 ACOG SD</English>
+			<Russian>L85A2 ACOG ПБС</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_ACOG_SD_FL_NAME">
+			<English>L85A2 ACOG SD FL</English>
+			<Russian>L85A2 ACOG ПБС Ф</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_L85A2_ACOG_SD_MFL_NAME">
+			<English>L85A2 ACOG SD MFL</English>
+			<Russian>L85A2 ACOG ПБС вФ</Russian>
+		</Key>
 		
 		<!-- M4A1 -->
 		<Key ID="STR_DZ_WPN_M4A1_NAME">
@@ -10349,6 +10454,14 @@
 			<Russian>СВД (камуфляж)</Russian>
 			<German>SVD Tarn</German>
 		</Key>
+		<Key ID="STR_DZ_WPN_SVD_PSO1_NAME">
+			<English>SVD PSO-1</English>
+			<Russian>СВД ПСО-1</Russian>
+		</Key>
+		<Key ID="STR_DZ_WPN_SVD_PSO1_GH_NAME">
+			<English>SVD PSO-1 Camo</English>
+			<Russian>СВД ПСО-1 (камуфляж)</Russian>
+		</Key>
 		
 		<!-- Mosin -->
 		<Key ID="STR_DZ_WPN_MOSIN_NAME">

Server Files/SQL/1.0.6.2_Updates.sql

@@ -6,9 +6,25 @@
 	EXISTING 1051 DATABASES SHOULD RUN 1.0.6_UPDATES.SQL FIRST, THEN RUN THIS FILE.
 */
 
-/*
+
-THIS PROCEDURE IS REQUIRED FOR 1062 AND RETURNS THE OBJECT ID MUCH MORE EFFICIENTLY THAN THE METHOD IN 1061 SQF
+/* Update L85 and SVD classnames */
-*/
+UPDATE `Traders_DATA` SET `item` = '["L85A2_DZ",3]' WHERE `item` = '["L85_Holo_DZ",3]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Backpack, '"L85_Holo_DZ"') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"L85_Holo_DZ"') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, '"L85_Holo_DZ"', '"L85A2_DZ"') WHERE INSTR(Inventory, '"L85_Holo_DZ"') > 0;
+
+UPDATE `Traders_DATA` SET `item` = '["SVD_PSO1_DZ",3]' WHERE `item` = '["SVD_DZ",3]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Backpack, '"SVD_DZ"') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Inventory, '"SVD_DZ"') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, '"SVD_DZ"', '"SVD_PSO1_DZ"') WHERE INSTR(Inventory, '"SVD_DZ"') > 0;
+
+UPDATE `Traders_DATA` SET `item` = '["SVD_PSO1_Gh_DZ",3]' WHERE `item` = '["SVD_Gh_DZ",3]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, '"SVD_Gh_DZ"', '"SVD_PSO1_Gh_DZ"') WHERE INSTR(Backpack, '"SVD_Gh_DZ"') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, '"SVD_Gh_DZ"', '"SVD_PSO1_Gh_DZ"') WHERE INSTR(Inventory, '"SVD_Gh_DZ"') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, '"SVD_Gh_DZ"', '"SVD_PSO1_Gh_DZ"') WHERE INSTR(Inventory, '"SVD_Gh_DZ"') > 0;
+
+
+/* THIS PROCEDURE IS REQUIRED FOR 1062 AND RETURNS THE OBJECT ID MUCH MORE EFFICIENTLY THAN THE METHOD IN 1061 SQF */
 DROP procedure IF EXISTS `retObjID`;
 
 DELIMITER $$
@@ -41,4 +57,4 @@ BEGIN
  SELECT @OID;
 END;$$
 
-DELIMITER ;
+DELIMITER ;

Server Files/SQL/epoch.sql

@@ -376,7 +376,7 @@ INSERT INTO `Traders_DATA` VALUES(5063, '["M249_DZ",3]', 10, '[1,"ItemGoldBar10o
 INSERT INTO `Traders_DATA` VALUES(5064, '["M240_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 486, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5065, '["Mk48_CCO_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 486, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5066, '["Pecheneg_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 486, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(5067, '["SVD_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(5067, '["SVD_PSO1_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5069, '["M40A3_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5070, '["M14_CCO_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5072, '["Bizon_SD_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 488, 'trade_weapons');
@@ -492,7 +492,7 @@ INSERT INTO `Traders_DATA` VALUES(5341, '["m8_carbine",3]', 10, '[5,"ItemGoldBar
 INSERT INTO `Traders_DATA` VALUES(5342, '["M24_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5344, '["VSS_vintorez",3]', 10, '[3,"ItemGoldBar10oz",1]', '[4,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5345, '["SVD_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(5346, '["SVD_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(5346, '["SVD_PSO1_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(5348, '["20Rnd_9x39_SP5_VSS",1]', 10, '[3,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 527, 'trade_items');
 INSERT INTO `Traders_DATA` VALUES(5349, '["8Rnd_12Gauge_Slug",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 527, 'trade_items');
 INSERT INTO `Traders_DATA` VALUES(5350, '["20Rnd_762x51_SB_SCAR",1]', 10, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
@@ -817,7 +817,7 @@ INSERT INTO `Traders_DATA` VALUES(6128, '["Revolver_DZ",3]', 10, '[2,"ItemSilver
 INSERT INTO `Traders_DATA` VALUES(6129, '["LeeEnfield_DZ",3]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 574, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6130, '["CZ550_DZ",3]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6131, '["M4SPR",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6132, '["SVD_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6132, '["SVD_PSO1_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6133, '["SVD_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6134, '["M24_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6135, '["M24_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 487, 'trade_weapons');
@@ -862,12 +862,12 @@ INSERT INTO `Traders_DATA` VALUES(6174, '["Sa61_EP1",3]', 10, '[1,"ItemGoldBar",
 INSERT INTO `Traders_DATA` VALUES(6175, '["MP5_DZ",3]', 10, '[1,"ItemGoldBar",1]', '[2,"ItemSilverBar10oz",1]', 0, 604, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6176, '["UZI_SD_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 604, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6177, '["MP5_SD_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 604, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6178, '["SVD_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6178, '["SVD_PSO1_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6179, '["M40A3_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6180, '["M14_CCO_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6181, '["CZ550_DZ",3]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6182, '["M4SPR",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6183, '["SVD_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6183, '["SVD_PSO1_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6184, '["SVD_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6185, '["M24_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6186, '["M24_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 605, 'trade_weapons');
@@ -963,12 +963,12 @@ INSERT INTO `Traders_DATA` VALUES(6278, '["Sa61_EP1",3]', 10, '[1,"ItemGoldBar",
 INSERT INTO `Traders_DATA` VALUES(6279, '["MP5_DZ",3]', 10, '[1,"ItemGoldBar",1]', '[2,"ItemSilverBar10oz",1]', 0, 618, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6280, '["UZI_SD_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 618, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6281, '["MP5_SD_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 618, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6282, '["SVD_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6282, '["SVD_PSO1_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6283, '["M40A3_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6284, '["M14_CCO_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6285, '["CZ550_DZ",3]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6286, '["M4SPR",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6287, '["SVD_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6287, '["SVD_PSO1_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6288, '["SVD_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6289, '["M24_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6290, '["M24_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 619, 'trade_weapons');
@@ -1150,12 +1150,12 @@ INSERT INTO `Traders_DATA` VALUES(6472, '["M249_DZ",3]', 10, '[1,"ItemGoldBar10o
 INSERT INTO `Traders_DATA` VALUES(6473, '["M240_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 638, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6474, '["Mk48_CCO_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 638, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6475, '["Pecheneg_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 638, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6483, '["SVD_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6483, '["SVD_PSO1_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6484, '["M40A3_Gh_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6485, '["M14_CCO_DZ",3]', 10, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6486, '["CZ550_DZ",3]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6487, '["M4SPR",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(6488, '["SVD_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(6488, '["SVD_PSO1_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6489, '["SVD_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6490, '["M24_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(6491, '["M24_des_EP1",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 640, 'trade_weapons');
@@ -1603,14 +1603,10 @@ INSERT INTO `Traders_DATA` VALUES(7358, '["5Rnd_86x70_L115A1",1]', 10, '[4,"Item
 INSERT INTO `Traders_DATA` VALUES(7359, '["100Rnd_762x51_M240",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 577, 'trade_items');
 INSERT INTO `Traders_DATA` VALUES(7360, '["20Rnd_762x51_FNFAL",1]', 10, '[4,"ItemSilverBar10oz",1]', '[2,"ItemSilverBar10oz",1]', 0, 577, 'trade_items');
 INSERT INTO `Traders_DATA` VALUES(7361, '["20Rnd_762x51_SB_SCAR",1]', 10, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 577, 'trade_items');
-INSERT INTO `Traders_DATA` VALUES(7362, '["BAF_L85A2_RIS_SUSAT",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 485, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(7363, '["L85A2_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 485, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7363, '["L85_Holo_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 485, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(7365, '["L85A2_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 602, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7364, '["BAF_L85A2_RIS_SUSAT",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 602, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(7367, '["L85A2_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 615, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7365, '["L85_Holo_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 602, 'trade_weapons');
+INSERT INTO `Traders_DATA` VALUES(7369, '["L85A2_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 637, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7366, '["BAF_L85A2_RIS_SUSAT",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 615, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7367, '["L85_Holo_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 615, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7368, '["BAF_L85A2_RIS_SUSAT",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 637, 'trade_weapons');
-INSERT INTO `Traders_DATA` VALUES(7369, '["L85_Holo_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 637, 'trade_weapons');
 INSERT INTO `Traders_DATA` VALUES(7370, '["V3S_Civ",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle');
 INSERT INTO `Traders_DATA` VALUES(7371, '["V3S_RA_TK_GUE_EP1_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle');
 INSERT INTO `Traders_DATA` VALUES(7373, '["V3S_TK_EP1_DZE",2]', 2, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 564, 'trade_any_vehicle');