diff --git a/addons/atragmx/functions/fnc_initGunList.sqf b/addons/atragmx/functions/fnc_initGunList.sqf
index d0491220d27..73aaac75880 100644
--- a/addons/atragmx/functions/fnc_initGunList.sqf
+++ b/addons/atragmx/functions/fnc_initGunList.sqf
@@ -78,7 +78,9 @@ if (_resetGunList) then {
["5.56x45mm Mk318" , 872, 100, 0.0814490, -0.00125880, 7.11, 0, 2, 10, 120, 0, 0, 4.018, 5.70, 17.78, 0.307, 1, "ASM" , [[-15,853],[0,860],[10,867],[15,872],[25,886],[30,895],[35,906]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
["5.56x45mm M995" , 861, 100, 0.0825279, -0.00126182, 7.11, 0, 2, 10, 120, 0, 0, 4.536, 5.70, 17.78, 0.310, 1, "ASM" , [[-15,842],[0,849],[10,856],[15,861],[25,875],[30,884],[35,895]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true],
- ["5.45x39mm 7N6M" , 735, 100, 0.0784916, -0.00119458, 3.81, 0, 2, 10, 120, 0, 0, 3.430, 5.60, 16.00, 0.336, 1, "ICAO", [[-15,716],[0,723],[10,730],[15,735],[25,749],[30,758],[35,769]] , [[0, 0.339], [730, 0.331], [960, 0.323], [1100, 0.321], [1220, 0.320], [1380, 0.320], [1480, 0.320]], true]];
+ ["5.45x39mm 7N6M" , 735, 100, 0.0784916, -0.00119458, 3.81, 0, 2, 10, 120, 0, 0, 3.430, 5.60, 16.00, 0.336, 1, "ICAO", [[-15,716],[0,723],[10,730],[15,735],[25,749],[30,758],[35,769]] , [[0, 0.339], [730, 0.331], [960, 0.323], [1100, 0.321], [1220, 0.320], [1380, 0.320], [1480, 0.320]], true],
+
+ ["Slug 300gr" , 524, 100, 0.1612520, -0.00212000, 7.11, 0, 2, 10, 120, 0, 0, 19.44, 12.7, 00.00, 0.200, 1, "ICAO", [[-15,522],[0,522],[10,523],[15,524],[25,525],[30,526],[35,527]] , [[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]], true]];
[] call FUNC(clear_user_data);
profileNamespace setVariable ["ACE_ATragMX_gunList", GVAR(gunList)];
diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp
index b959b1459e6..8b27155540f 100644
--- a/addons/ballistics/CfgAmmo.hpp
+++ b/addons/ballistics/CfgAmmo.hpp
@@ -127,6 +127,32 @@ class CfgAmmo {
caliber = 1.037; //~7mm RHA, ~22.4mm metal, probably still too high though as RHA is hardened.
};
+ class B_12Gauge_Slug_NoCartridge: B_12Gauge_Slug { // Federal Law Enforcement Tactical TruBall Rifled Slug https://le.vistaoutdoor.com/ammunition/federal/slug/details.aspx?id=705
+ // ACE_muzzleVelocityVariationSD = 2; // effective standart deviation in-game ~9m/s (as IRL, series of muzzle velocity measurements in-game with standart deviation formula)
+ // ACE3 default value 0.3 https://github.com/acemod/ACE3/blob/master/addons/advanced_ballistics/script_component.hpp#L32: effective standart deviation in-game ~1, ~2m/s, should be ~3, ~5m/s for manufactured ammunitions
+ ACE_bulletMass = 28.382; // 438gr
+ ACE_ballisticCoefficients[] = {0.07}; // Federal Law Enforcement https://le.vistaoutdoor.com/ammunition/federal/slug/details.aspx?id=705
+ // as reference https://www.youtube.com/watch?v=960nYuugzZo, Federal Slug (1600fps, 30"), unknown mesurement conditions, chronograph 5ft from muzzle
+ ACE_ammoTempMuzzleVelocityShifts[] = {-2.655, -2.547, -2.285, -2.012, -1.698, -1.280, -0.764, -0.153, 0.596, 1.517, 2.619}; // default ACE_ammoTempMuzzleVelocityShifts values /10 (Ammo Temp MV Curve Tables by TiborasaurusRex). Muzzle velocity shift 0m/s 70°F (21°C), -1m/s 15°C
+ ACE_muzzleVelocities[] = {340, 440, 477, 489, 517}; // Muzzle Velocities 70°F (21°C, MV 15°C +1m/s), 419m/s (317mm), 426m/s (330.2mm), 436m/s (349.7mm), 485m/s (699.3mm), 488m/s (1600fps, 30") ASM conditions (15°C, 999.916hPa, 78%)
+ ACE_barrelLengths[] = {165.1, 355.6, 546.1, 762, 914.4}; // 6.5, 14, 21.5, 30, 36"
+ // model="\A3\weapons_f\empty";
+ // cartridge="";
+ simulation = "shotBullet"; // B_12Gauge_Slug "shotBullet", B_12Gauge_Slug_NoCartridge "shotSubmunitions" breaks Slug trajectory in-game and makes no sense for this sort of projectile
+ airFriction = -0.006; // based on terminal velocities, Federal Slug 1600fps 30" ASM: Mach 1 340m/s ~60m (Strelok Pro), B_12Gauge_Slug -0.008
+ };
+
+ class ACE_12Gauge_Slug_NoCartridge: B_12Gauge_Slug_NoCartridge { // Hornady Shotgun Slug 300gr https://www.hornady.com/ammunition/shotgun/12-ga-sst-300-gr-ftx-slug#!/
+ ACE_caliber = 12.7; // 500 S&W https://www.hornady.com/bullets/handgun/50-cal-500-300-gr-ftx-500-s-w#!/ https://bobp.cip-bobp.org/uploads/tdcc/tab-iv/500-s-w-mag-en.pdf
+ ACE_bulletLength = 24.03; // 0.946" (Hornady Load Data)
+ ACE_bulletMass = 19.44; // 300gr
+ ACE_ballisticCoefficients[] = {0.2};
+ ACE_standardAtmosphere = "ICAO"; // Hornady
+ ACE_muzzleVelocities[] = {425, 550, 596, 611, 646}; // Muzzle Velocities 70°F (21°C, MV 15°C +1m/s), 524m/s (317mm), 533m/s (330.2mm), 545m/s (349.7mm), 606m/s (699.3mm), 610m/s (2000fps, 30") ICAO conditions (15°C, 1013,25 hPa, 0%)
+ // 12 Gauge SAAMI test barrel 30" https://static.hornady.media/presscenter/docs/1411008168-1768498925-Hornady-2026-Product-Catalog.pdf#page=190
+ airFriction = -0.00212; // based on terminal velocities, Hornady Slug 2000fps 30" ICAO: Mach 1 340m/s ~275m (Strelok Pro)
+ };
+
class B_556x45_Ball: BulletBase {
airFriction=-0.00130094;
tracerScale = 1;
diff --git a/addons/ballistics/CfgMagazineWells.hpp b/addons/ballistics/CfgMagazineWells.hpp
index be00c64b2f1..c7f62dedd35 100644
--- a/addons/ballistics/CfgMagazineWells.hpp
+++ b/addons/ballistics/CfgMagazineWells.hpp
@@ -6,7 +6,8 @@ class CfgMagazineWells {
"ACE_2Rnd_12Gauge_Pellets_No2_Buck",
"ACE_2Rnd_12Gauge_Pellets_No3_Buck",
"ACE_2Rnd_12Gauge_Pellets_No4_Buck",
- "ACE_2Rnd_12Gauge_Pellets_No4_Bird"
+ "ACE_2Rnd_12Gauge_Pellets_No4_Bird",
+ "ACE_2Rnd_12Gauge_Slug"
};
};
@@ -17,7 +18,8 @@ class CfgMagazineWells {
"ACE_2Rnd_12Gauge_Pellets_No2_Buck",
"ACE_2Rnd_12Gauge_Pellets_No3_Buck",
"ACE_2Rnd_12Gauge_Pellets_No4_Buck",
- "ACE_2Rnd_12Gauge_Pellets_No4_Bird"
+ "ACE_2Rnd_12Gauge_Pellets_No4_Bird",
+ "ACE_2Rnd_12Gauge_Slug"
};
};
@@ -28,7 +30,8 @@ class CfgMagazineWells {
"ACE_6Rnd_12Gauge_Pellets_No2_Buck",
"ACE_6Rnd_12Gauge_Pellets_No3_Buck",
"ACE_6Rnd_12Gauge_Pellets_No4_Buck",
- "ACE_6Rnd_12Gauge_Pellets_No4_Bird"
+ "ACE_6Rnd_12Gauge_Pellets_No4_Bird",
+ "ACE_6Rnd_12Gauge_Slug"
};
};
diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp
index 6d82caa87f2..2dd8fe11b10 100644
--- a/addons/ballistics/CfgMagazines.hpp
+++ b/addons/ballistics/CfgMagazines.hpp
@@ -108,6 +108,38 @@ class CfgMagazines {
descriptionShort = CSTRING(12Gauge_Pellets_No00_Buck_Description);
};
+ class 2Rnd_12Gauge_Slug: 2Rnd_12Gauge_Pellets {
+ // ammo = "B_12Gauge_Slug_NoCartridge";
+ initSpeed = 488; // according to ACE_muzzleVelocities 12 Gauge SAAMI test barrel 30" ASM conditions (15°C, 999.916hPa, 78%), 450
+ };
+
+ class ACE_2Rnd_12Gauge_Slug: 2Rnd_12Gauge_Slug {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(2Rnd_12Gauge_Slug_Name);
+ displayNameShort = CSTRING(2Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610; // according to ACE_muzzleVelocities 12 Gauge SAAMI test barrel 30" ICAO conditions (15°C, 1013,25 hPa, 0%)
+ };
+
+ class 6Rnd_12Gauge_Slug: 2Rnd_12Gauge_Pellets { // arifle_MSBS65_UBS_base_F, arifle_XMS_Shot_lxWS
+ // ammo="B_12Gauge_Slug_NoCartridge";
+ initSpeed = 431; // 431x0.971576= 419m/s according to Crye Six12 ACE_muzzleVelocities ASM conditions (15°C, 999.916hPa, 78%), 450
+ };
+
+ class ACE_6Rnd_12Gauge_Slug: 6Rnd_12Gauge_Slug { // arifle_MSBS65_UBS_base_F, arifle_XMS_Shot_lxWS
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(6Rnd_12Gauge_Slug_Name);
+ displayNameShort = CSTRING(6Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 537; // 537x0.971576= 524m/s according to Crye Six12 ACE_muzzleVelocities ICAO conditions (15°C, 1013,25 hPa, 0%)
+ };
+
+ class 15Rnd_12Gauge_Slug: 15Rnd_12Gauge_Pellets {
+ // scope = 1;
+ // ammo="B_12Gauge_Slug_NoCartridge";
+ initSpeed = 488; // 450
+ };
+
class 30Rnd_580x42_Mag_F: CA_Magazine {
initSpeed = 950;
};
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index 1b287f18377..c6921f8e008 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -141,11 +141,13 @@ class CfgWeapons {
class sgun_HunterShotgun_01_base_F: Rifle_Long_Base_F {
ACE_barrelLength = 699.3; // https://www.imfdb.org/wiki/CZ-581
ACE_twistDirection = 0;
+ initSpeed = -0.99385; // 485, 606m/s according to ACE_muzzleVelocities ICAO and ASM conditions (15°C, 59°F)
};
// CZ-581 (sawed off)
class sgun_HunterShotgun_01_sawedoff_base_F: sgun_HunterShotgun_01_base_F {
ACE_barrelLength = 349.7; // About half of original length
+ initSpeed = -0.893443; // 436, 545m/s according to ACE_muzzleVelocities ICAO and ASM conditions (15°C, 59°F)
};
// Rifle_Base_F
@@ -377,9 +379,11 @@ class CfgWeapons {
// MSBS GROT UBS
class arifle_MSBS65_UBS_base_F: arifle_MSBS65_base_F {
+ // initSpeed = -0.971576;
class UBS_F: Rifle_Base_F {
ACE_barrelLength = 317; // https://modernfirearms.net/en/shotguns/u-s-a-shotguns/crye-six12-eng/
ACE_twistDirection = 0;
+ // initSpeed = 0; // tested with -2 and 1000 w/o effect on secondary UBS_F muzzle velocity
};
};
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 3cfce3699ca..d97a0d1e949 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -3630,6 +3630,78 @@
.408
.408
+
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+ 12 Gauge 2Rnd Slug 300gr
+
+
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+
+
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+ 12 Gauge 6Rnd Slug 300gr
+
+
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+
[ACE] Ammo Supply Crate
[ACE] Bedna s municí
diff --git a/addons/compat_ws/CfgMagazineWells.hpp b/addons/compat_ws/CfgMagazineWells.hpp
new file mode 100644
index 00000000000..6b96658afc9
--- /dev/null
+++ b/addons/compat_ws/CfgMagazineWells.hpp
@@ -0,0 +1,12 @@
+class CfgMagazineWells {
+ class AA40_12Gauge { // Weapon initSpeed -1: ACE_barrelLength 762mm (12 Gauge SAAMI test barrel 30"), ACE_muzzleVelocities 610m/s (2000fps ICAO)
+ ADDON[] = { // standart version 18" 457.2mm initSpeed -0.940574 574m/s according to ACE_muzzleVelocities ICAO
+ "ACE_20Rnd_12Gauge_AA40_Slug_lxWS",
+ "ACE_20Rnd_12Gauge_AA40_Slug_Tan_lxWS",
+ "ACE_20Rnd_12Gauge_AA40_Slug_Snake_lxWS",
+ "ACE_8Rnd_12Gauge_AA40_Slug_lxWS",
+ "ACE_8Rnd_12Gauge_AA40_Slug_Tan_lxWS",
+ "ACE_8Rnd_12Gauge_AA40_Slug_Snake_lxWS"
+ };
+ };
+};
diff --git a/addons/compat_ws/CfgMagazines.hpp b/addons/compat_ws/CfgMagazines.hpp
new file mode 100644
index 00000000000..02e651602a5
--- /dev/null
+++ b/addons/compat_ws/CfgMagazines.hpp
@@ -0,0 +1,56 @@
+class CfgMagazines {
+ class 20Rnd_12Gauge_AA40_Slug_lxWS;
+ class 20Rnd_12Gauge_AA40_Slug_Tan_lxWS;
+ class 20Rnd_12Gauge_AA40_Slug_Snake_lxWS;
+ class 8Rnd_12Gauge_AA40_Slug_lxWS;
+ class 8Rnd_12Gauge_AA40_Slug_Tan_lxWS;
+ class 8Rnd_12Gauge_AA40_Slug_Snake_lxWS;
+
+ class ACE_20Rnd_12Gauge_AA40_Slug_lxWS: 20Rnd_12Gauge_AA40_Slug_lxWS {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(20Rnd_12Gauge_AA40_Slug_lxWS_Name);
+ displayNameShort = CSTRING(20Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610; // according to ACE_muzzleVelocities 12 Gauge SAAMI test barrel 30" ICAO conditions (15°C, 1013,25 hPa, 0%)
+ };
+
+ class ACE_20Rnd_12Gauge_AA40_Slug_Tan_lxWS: 20Rnd_12Gauge_AA40_Slug_Tan_lxWS {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(20Rnd_12Gauge_AA40_Slug_Tan_lxWS_Name);
+ displayNameShort = CSTRING(20Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610;
+ };
+
+ class ACE_20Rnd_12Gauge_AA40_Slug_Snake_lxWS: 20Rnd_12Gauge_AA40_Slug_Snake_lxWS {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(20Rnd_12Gauge_AA40_Slug_Snake_lxWS_Name);
+ displayNameShort = CSTRING(20Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610;
+ };
+
+ class ACE_8Rnd_12Gauge_AA40_Slug_lxWS: 8Rnd_12Gauge_AA40_Slug_lxWS {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(8Rnd_12Gauge_AA40_Slug_lxWS_Name);
+ displayNameShort = CSTRING(20Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610;
+ };
+
+ class ACE_8Rnd_12Gauge_AA40_Slug_Tan_lxWS: 8Rnd_12Gauge_AA40_Slug_Tan_lxWS {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(8Rnd_12Gauge_AA40_Slug_Tan_lxWS_Name);
+ displayNameShort = CSTRING(20Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610;
+ };
+
+ class ACE_8Rnd_12Gauge_AA40_Slug_Snake_lxWS: 8Rnd_12Gauge_AA40_Slug_Snake_lxWS {
+ author = ECSTRING(common,ACETeam);
+ displayName = CSTRING(8Rnd_12Gauge_AA40_Slug_Snake_lxWS_Name);
+ displayNameShort = CSTRING(20Rnd_12Gauge_Slug_NameShort);
+ ammo = "ACE_12Gauge_Slug_NoCartridge";
+ initSpeed = 610;
+ };
+};
diff --git a/addons/compat_ws/CfgWeapons.hpp b/addons/compat_ws/CfgWeapons.hpp
index 551a1794e08..c17ce3960eb 100644
--- a/addons/compat_ws/CfgWeapons.hpp
+++ b/addons/compat_ws/CfgWeapons.hpp
@@ -2,9 +2,11 @@ class CfgWeapons {
// AA40
class Rifle_Base_F;
class sgun_aa40_base_lxWS: Rifle_Base_F {
- ACE_barrelLength = 457;
+ ACE_barrelLength = 330.2; // WS AA-12 CQB version 13" https://en.wikipedia.org/wiki/Atchisson_AA-12 https://modernfirearms.net/userfiles/_thumbs/Images/shotgun/sh29/aa-12.jpg
ACE_barrelTwist = 0.0;
ACE_twistDirection = 0;
+ ACE_RailHeightAboveBore = 4.99572; // checkScopes.sqf
+ initSpeed = -0.873; // 426, 533 m/s according to ACE_muzzleVelocities ICAO and ASM conditions (15°C, 59°F)
};
// Galat Arm
@@ -12,6 +14,7 @@ class CfgWeapons {
ACE_barrelLength = 535;
ACE_barrelTwist = 304.8;
ACE_twistDirection = 1;
+ ACE_RailHeightAboveBore = 4.28793; // checkScopes.sqf
};
// SA-77
@@ -20,6 +23,7 @@ class CfgWeapons {
ACE_barrelLength = 550;
ACE_barrelTwist = 304.8;
ACE_twistDirection = 1;
+ ACE_RailHeightAboveBore = 4.82762; // checkScopes.sqf
EGVAR(overheating,allowSwapBarrel) = 1;
};
class LMG_S77_Compact_base_lxWS: LMG_S77_base_lxWS {
@@ -29,6 +33,10 @@ class CfgWeapons {
EGVAR(overheating,allowSwapBarrel) = 1;
};
+ class glaunch_GLX_base_lxWS: Rifle_Base_F {
+ ACE_RailHeightAboveBore = 4.88889; // checkScopes.sqf
+ };
+
// SLR
class DMR_06_base_F;
class arifle_SLR_lxWS: DMR_06_base_F {
@@ -47,6 +55,7 @@ class CfgWeapons {
ACE_barrelLength = 460;
ACE_barrelTwist = 304.8;
ACE_twistDirection = 1;
+ ACE_RailHeightAboveBore = 4.28793; // checkScopes.sqf
};
class arifle_VelkoR5_lxWS: arifle_Velko_base_lxWS {
ACE_barrelLength = 332;
@@ -60,11 +69,25 @@ class CfgWeapons {
ACE_barrelLength = 406.4;
ACE_barrelTwist = 178.0;
ACE_twistDirection = 1;
+ ACE_IronSightBaseAngle = 0; // arifle_SPAR_01_base_F 0.002856
+ ACE_RailHeightAboveBore = 6; // no value checkScopes.sqf, estimation based on arifle_MSBS65_UBS_F 5.1754, arifle_SPAR_01_base_F 3.20768
+ initSpeed = -0.971576; // Western Sahara 900
};
+
// 20 inch barrel for the marksman/autorifle
class arifle_XMS_lxWS;
class arifle_XMS_M_lxWS: arifle_XMS_lxWS {
ACE_barrelLength = 508.0;
+ initSpeed = -1; // Western Sahara 925
+ };
+
+ class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS {
+ // initSpeed = -0.971576;
+ class UBS_lxWS: Rifle_Base_F {
+ ACE_barrelLength = 317; // https://modernfirearms.net/en/shotguns/u-s-a-shotguns/crye-six12-eng/
+ ACE_twistDirection = 0;
+ // initSpeed = 0; // tested with -2 and 1000 w/o effect on secondary UBS_lxWS muzzle velocity
+ };
};
// Headgear
@@ -90,4 +113,33 @@ class CfgWeapons {
ace_hearing_lowerVolume = 0;
ace_hearing_hasEHP = 0;
};
+
+ class ItemCore;
+ class optic_r1_high_lxWS: ItemCore {
+ ACE_ScopeHeightAboveRail = 4.07748; // checkScopes.sqf
+ };
+
+ class optic_r1_low_lxWS: optic_r1_high_lxWS {
+ ACE_ScopeHeightAboveRail = 2.4921; // checkScopes.sqf
+ };
+
+ class optic_r1_low_khaki_lxWS: optic_r1_high_lxWS {
+ ACE_ScopeHeightAboveRail = 2.4921; // checkScopes.sqf
+ };
+
+ class optic_r1_low_sand_lxWS: optic_r1_high_lxWS {
+ ACE_ScopeHeightAboveRail = 2.4921; // checkScopes.sqf
+ };
+
+ class optic_r1_low_snake_lxWS: optic_r1_high_lxWS {
+ ACE_ScopeHeightAboveRail = 2.4921; // checkScopes.sqf
+ };
+
+ class optic_r1_low_arid_lxWS: optic_r1_high_lxWS {
+ ACE_ScopeHeightAboveRail = 2.4921; // checkScopes.sqf
+ };
+
+ class optic_r1_low_lush_lxWS: optic_r1_high_lxWS {
+ ACE_ScopeHeightAboveRail = 2.4921; // checkScopes.sqf
+ };
};
diff --git a/addons/compat_ws/compat_ws_realisticnames/CfgWeapons.hpp b/addons/compat_ws/compat_ws_realisticnames/CfgWeapons.hpp
index 69c1f37f87d..ab2b7b5c522 100644
--- a/addons/compat_ws/compat_ws_realisticnames/CfgWeapons.hpp
+++ b/addons/compat_ws/compat_ws_realisticnames/CfgWeapons.hpp
@@ -127,6 +127,7 @@ class CfgWeapons {
};
// XMS has no realistic name as it's a make believe hybrid of the XM8/VHS-K2: XM8+VHS = XMS, this just removes the 5.56 mm from the name.
+ class Rifle_Base_F;
class arifle_SPAR_01_base_F;
class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F {
displayName = SUBCSTRING(XMS_Name);
@@ -162,6 +163,9 @@ class CfgWeapons {
};
class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS {
displayName = SUBCSTRING(XMS_SG_Name);
+ class UBS_lxWS: Rifle_Base_F {
+ displayName = SUBCSTRING(UBS_lxWS_Name);
+ };
};
class arifle_XMS_Shot_Camo_lxWS: arifle_XMS_Shot_lxWS {
displayName = SUBCSTRING(XMS_SG_Camo_Name);
diff --git a/addons/compat_ws/compat_ws_realisticnames/stringtable.xml b/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
index b4295512f7c..c69a3f203ed 100644
--- a/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
+++ b/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
@@ -526,6 +526,19 @@
XMS SG（沙色）
XMS SG (пісочний)
+
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+ SIX-12
+
XMS SW (Stripes)
XMS SW (Rayé)
diff --git a/addons/compat_ws/config.cpp b/addons/compat_ws/config.cpp
index 9dc85f5d82a..87ad984abff 100644
--- a/addons/compat_ws/config.cpp
+++ b/addons/compat_ws/config.cpp
@@ -18,3 +18,5 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
+#include "CfgMagazines.hpp"
+#include "CfgMagazineWells.hpp"
diff --git a/addons/compat_ws/stringtable.xml b/addons/compat_ws/stringtable.xml
new file mode 100644
index 00000000000..07d692e3147
--- /dev/null
+++ b/addons/compat_ws/stringtable.xml
@@ -0,0 +1,131 @@
+
+
+
+
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+ 12 Gauge 20Rnd Slug 300gr Mag
+
+
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+ 12 Gauge 20Rnd Slug 300gr Tan Mag
+
+
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+ 12 Gauge 20Rnd Slug 300gr Snake Mag
+
+
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+ 12 Gauge 8Rnd Slug 300gr Mag
+
+
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+ 12 Gauge 8Rnd Slug 300gr Tan Mag
+
+
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+ 12 Gauge 8Rnd Slug 300gr Snake Mag
+
+
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+ Slug 300gr
+
+
+
diff --git a/addons/scopes/functions/fnc_firedEH.sqf b/addons/scopes/functions/fnc_firedEH.sqf
index 12339884699..ae72cbdc694 100644
--- a/addons/scopes/functions/fnc_firedEH.sqf
+++ b/addons/scopes/functions/fnc_firedEH.sqf
@@ -21,7 +21,7 @@ TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_veh
if !(_ammo isKindOf "BulletBase") exitWith {};
// Ignore secondary muzzles
-if (_weapon != _muzzle) exitWith {};
+// if (_weapon != _muzzle) exitWith {};
private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
if (_weaponIndex < 0) exitWith {};