Skip to content
Merged
4 changes: 3 additions & 1 deletion addons/atragmx/functions/fnc_initGunList.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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)];
Expand Down
11 changes: 11 additions & 0 deletions addons/ballistics/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,17 @@ class CfgAmmo {
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;
Expand Down
9 changes: 6 additions & 3 deletions addons/ballistics/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
};
};

Expand All @@ -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"
};
};

Expand All @@ -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"
};
};

Expand Down
16 changes: 16 additions & 0 deletions addons/ballistics/CfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,27 @@ class CfgMagazines {
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 = 539; // 539x0.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";
Expand Down
72 changes: 72 additions & 0 deletions addons/ballistics/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3630,6 +3630,78 @@
<Hungarian>.408</Hungarian>
<Ukrainian>.408</Ukrainian>
</Key>
<Key ID="STR_ACE_Ballistics_2Rnd_12Gauge_Slug_Name">
<English>12 Gauge 2Rnd Slug 300gr</English>
<Czech>12 Gauge 2Rnd Slug 300gr</Czech>
<French>12 Gauge 2Rnd Slug 300gr</French>
<Spanish>12 Gauge 2Rnd Slug 300gr</Spanish>
<Italian>12 Gauge 2Rnd Slug 300gr</Italian>
<Polish>12 Gauge 2Rnd Slug 300gr</Polish>
<Portuguese>12 Gauge 2Rnd Slug 300gr</Portuguese>
<Russian>12 Gauge 2Rnd Slug 300gr</Russian>
<German>12 Gauge 2Rnd Slug 300gr</German>
<Korean>12 Gauge 2Rnd Slug 300gr</Korean>
<Japanese>12 Gauge 2Rnd Slug 300gr</Japanese>
<Chinese>12 Gauge 2Rnd Slug 300gr</Chinese>
<Chinesesimp>12 Gauge 2Rnd Slug 300gr</Chinesesimp>
<Turkish>12 Gauge 2Rnd Slug 300gr</Turkish>
<Hungarian>12 Gauge 2Rnd Slug 300gr</Hungarian>
<Ukrainian>12 Gauge 2Rnd Slug 300gr</Ukrainian>
</Key>
<Key ID="STR_ACE_Ballistics_2Rnd_12Gauge_Slug_NameShort">
<English>Slug 300gr</English>
<Czech>Slug 300gr</Czech>
<French>Slug 300gr</French>
<Spanish>Slug 300gr</Spanish>
<Italian>Slug 300gr</Italian>
<Polish>Slug 300gr</Polish>
<Portuguese>Slug 300gr</Portuguese>
<Russian>Slug 300gr</Russian>
<German>Slug 300gr</German>
<Korean>Slug 300gr</Korean>
<Japanese>Slug 300gr</Japanese>
<Chinese>Slug 300gr</Chinese>
<Chinesesimp>Slug 300gr</Chinesesimp>
<Turkish>Slug 300gr</Turkish>
<Hungarian>Slug 300gr</Hungarian>
<Ukrainian>Slug 300gr</Ukrainian>
</Key>
<Key ID="STR_ACE_Ballistics_6Rnd_12Gauge_Slug_Name">
<English>12 Gauge 6Rnd Slug 300gr</English>
<Czech>12 Gauge 6Rnd Slug 300gr</Czech>
<French>12 Gauge 6Rnd Slug 300gr</French>
<Spanish>12 Gauge 6Rnd Slug 300gr</Spanish>
<Italian>12 Gauge 6Rnd Slug 300gr</Italian>
<Polish>12 Gauge 6Rnd Slug 300gr</Polish>
<Portuguese>12 Gauge 6Rnd Slug 300gr</Portuguese>
<Russian>12 Gauge 6Rnd Slug 300gr</Russian>
<German>12 Gauge 6Rnd Slug 300gr</German>
<Korean>12 Gauge 6Rnd Slug 300gr</Korean>
<Japanese>12 Gauge 6Rnd Slug 300gr</Japanese>
<Chinese>12 Gauge 6Rnd Slug 300gr</Chinese>
<Chinesesimp>12 Gauge 6Rnd Slug 300gr</Chinesesimp>
<Turkish>12 Gauge 6Rnd Slug 300gr</Turkish>
<Hungarian>12 Gauge 6Rnd Slug 300gr</Hungarian>
<Ukrainian>12 Gauge 6Rnd Slug 300gr</Ukrainian>
</Key>
<Key ID="STR_ACE_Ballistics_6Rnd_12Gauge_Slug_NameShort">
<English>Slug 300gr</English>
<Czech>Slug 300gr</Czech>
<French>Slug 300gr</French>
<Spanish>Slug 300gr</Spanish>
<Italian>Slug 300gr</Italian>
<Polish>Slug 300gr</Polish>
<Portuguese>Slug 300gr</Portuguese>
<Russian>Slug 300gr</Russian>
<German>Slug 300gr</German>
<Korean>Slug 300gr</Korean>
<Japanese>Slug 300gr</Japanese>
<Chinese>Slug 300gr</Chinese>
<Chinesesimp>Slug 300gr</Chinesesimp>
<Turkish>Slug 300gr</Turkish>
<Hungarian>Slug 300gr</Hungarian>
<Ukrainian>Slug 300gr</Ukrainian>
</Key>
<Key ID="STR_ACE_Ballistics_AmmoSupplyCrate_DisplayName">
<English>[ACE] Ammo Supply Crate</English>
<Czech>[ACE] Bedna s municí</Czech>
Expand Down
14 changes: 14 additions & 0 deletions addons/compat_ws/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

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"
};
};
};
55 changes: 54 additions & 1 deletion addons/compat_ws/CfgMagazines.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@

class CfgMagazines {
class 11Rnd_45ACP_Mag;
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 6rnd_Smoke_Mag_lxWS: 11Rnd_45ACP_Mag {
initSpeed = 336; // 336x0.971576= 326m/s according to Crye Six12 ACE_muzzleVelocities ICAO conditions (15°C, 1013,25 hPa, 0%), 380
Expand All @@ -17,5 +23,52 @@ class CfgMagazines {
class 2rnd_Smoke_Mag_lxWS: 6rnd_Smoke_Mag_lxWS {
initSpeed = 380;
};
};

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";

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we should throw this into a SUBCOMPONENT ballistics?
I can take care of it

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For .xml, i took very basically ballistic CfgMagazines as example, if you have a better way, don't hesitate.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's that the ammo comes from ace_ballistics, so it should be in config's requiredAddons

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to ace_compat_ws_ballistics
so the config changes are made only if ace_ballistics and WS are present

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;
};
};
1 change: 1 addition & 0 deletions addons/compat_ws/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ class CfgPatches {
#include "CfgWeapons.hpp"
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"
#include "CfgMagazineWells.hpp"
Loading
Loading