From d957119b54dbf987312e9e0d80e01241ada81555 Mon Sep 17 00:00:00 2001 From: Mike-MF Date: Sun, 3 Sep 2023 05:37:57 +0100 Subject: [PATCH 1/4] Ammunition - Add `cartridge` property to ammunition (#173) --- addons/ammunition/CfgAmmo.hpp | 22 ++++++---- addons/ammunition/bi/magazines/12g.hpp | 8 ++-- addons/ammunition/bi/magazines/45ACP.hpp | 4 +- addons/ammunition/bi/magazines/545x39.hpp | 12 ++--- addons/ammunition/bi/magazines/556x45.hpp | 4 +- addons/ammunition/bi/magazines/57x28.hpp | 2 +- addons/ammunition/bi/magazines/58x42.hpp | 4 +- addons/ammunition/bi/magazines/65x39.hpp | 26 +++++------ addons/ammunition/bi/magazines/762x39.hpp | 14 +++--- addons/ammunition/bi/magazines/762x51.hpp | 2 +- addons/ammunition/bi/magazines/762x54r.hpp | 4 +- addons/ammunition/bi/magazines/9x19.hpp | 4 +- addons/ammunition/cup/CfgAmmo.hpp | 6 ++- addons/ammunition/cup/magazines/12g.hpp | 2 +- addons/ammunition/cup/magazines/45ACP.hpp | 4 +- addons/ammunition/cup/magazines/46x30.hpp | 2 +- addons/ammunition/cup/magazines/545x39.hpp | 4 +- addons/ammunition/cup/magazines/556x45.hpp | 44 +++++++++---------- addons/ammunition/cup/magazines/68x43.hpp | 2 +- addons/ammunition/cup/magazines/762x39.hpp | 2 +- addons/ammunition/cup/magazines/762x51.hpp | 4 +- addons/ammunition/cup/magazines/9x19.hpp | 16 +++---- addons/ammunition/cup/magazines/9x39.hpp | 2 +- addons/ammunition/niarms/CfgAmmo.hpp | 3 +- addons/ammunition/niarms/magazines/10mm.hpp | 2 +- .../niarms/magazines/300Blackout.hpp | 2 +- addons/ammunition/niarms/magazines/357.hpp | 4 +- addons/ammunition/niarms/magazines/556x45.hpp | 6 +-- addons/ammunition/niarms/magazines/762x51.hpp | 2 +- addons/ammunition/niarms/magazines/9x19.hpp | 4 +- addons/ammunition/script_macros.hpp | 28 ++++++------ addons/ammunition/ws/magazines/556x45.hpp | 2 +- addons/ammunition/ws/magazines/762x51.hpp | 4 +- 33 files changed, 129 insertions(+), 122 deletions(-) diff --git a/addons/ammunition/CfgAmmo.hpp b/addons/ammunition/CfgAmmo.hpp index 7ba14e6e..1f6305cd 100644 --- a/addons/ammunition/CfgAmmo.hpp +++ b/addons/ammunition/CfgAmmo.hpp @@ -57,6 +57,7 @@ class CfgAmmo { caliber = 0.525; submunitionConeType[] = {"random", 12}; triggerTime = 0.008; + cartridge = "FxCartridge_slug"; submunitionAmmo = QCLASS(12g_Pellets_Submunition_Deploy); submunitionConeAngle = 0.81; }; @@ -66,8 +67,9 @@ class CfgAmmo { class CLASS(9x19_Ball): B_9x21_Ball_Tracer_Yellow { aiAmmoUsageFlags = "64 + 128"; caliber = 0.1; + cartridge = "FxCartridge_9mm"; hit = 8; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(9x19_EPR): CLASS(9x19_Ball) { caliber = 0.9; @@ -83,7 +85,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 0.3; hit = 10; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(545x39_EPR): CLASS(545x39_Ball) { caliber = 1; @@ -98,8 +100,9 @@ class CfgAmmo { class CLASS(45ACP_Ball): B_45ACP_Ball { aiAmmoUsageFlags = "64 + 128"; caliber = 0.15; + cartridge = "FxCartridge_9mm"; hit = 11; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(45ACP_EPR): CLASS(45ACP_Ball) { caliber = 0.85; @@ -126,7 +129,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 0.25; hit = 10; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(58x42_EPR): CLASS(58x42_Ball) { caliber = 1.35; @@ -143,7 +146,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 0.4; hit = 11; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(556x45_EPR): CLASS(556x45_Ball) { hit = 12; @@ -163,8 +166,9 @@ class CfgAmmo { class CLASS(65x39_Ball): B_65x39_Caseless { aiAmmoUsageFlags = "64 + 128"; caliber = 0.35; + cartridge = "FxCartridge_65"; hit = 10.8; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(65x39_EPR): CLASS(65x39_Ball) { caliber = 1.6; @@ -196,7 +200,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 0.25; hit = 11.3; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(762x39_EPR): CLASS(762x39_Ball) { caliber = 1.55; @@ -212,7 +216,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 0.28; hit = 12.8; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(762x51_EPR): CLASS(762x51_Ball) { caliber = 1.85; @@ -246,7 +250,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 0.33; hit = 13; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(762x54r_EPR): CLASS(762x54r_Ball) { caliber = 2; diff --git a/addons/ammunition/bi/magazines/12g.hpp b/addons/ammunition/bi/magazines/12g.hpp index ced00243..656ee9d3 100644 --- a/addons/ammunition/bi/magazines/12g.hpp +++ b/addons/ammunition/bi/magazines/12g.hpp @@ -1,5 +1,5 @@ class CLASS(2Rnd_P_000): 2Rnd_12Gauge_Pellets { - MACRO_SCOPE + MACRO_SCOPE; displayName = "2Rnd (Magnum)"; displayNameShort = "#00 Magnum"; descriptionShort = "#00 Magnum Shells"; @@ -23,7 +23,7 @@ class CLASS(8Rnd_P_000): CA_Magazine { }; class CLASS(8Rnd_S_AP20): CA_Magazine { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(S_12G_AP20); displayName = "8Rnd M1014 (Slug)"; displayNameShort = "AP-20"; @@ -68,7 +68,7 @@ class CLASS(6Rnd_Smoke_M1014): CLASS(8Rnd_Smoke_M1014) { // 6Rnd MSBS GROT class CLASS(6Rnd_P_UGL): 6Rnd_12Gauge_Pellets { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(P_12G_000); displayName = "6Rnd MSBS (Magnum)"; displayNameShort = "#00 Magnum"; @@ -76,7 +76,7 @@ class CLASS(6Rnd_P_UGL): 6Rnd_12Gauge_Pellets { }; class CLASS(6Rnd_S_UGL): 6Rnd_12Gauge_Slug { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(S_12G_AP20); displayName = "6Rnd MSBS (Slug)"; displayNameShort = "AP-20"; diff --git a/addons/ammunition/bi/magazines/45ACP.hpp b/addons/ammunition/bi/magazines/45ACP.hpp index 62cdc369..3177e14a 100644 --- a/addons/ammunition/bi/magazines/45ACP.hpp +++ b/addons/ammunition/bi/magazines/45ACP.hpp @@ -1,7 +1,7 @@ // .45ACP FNX-45 class 11Rnd_45ACP_Mag; class CLASS(15Rnd_45ACP_FNX45_Ball): 11Rnd_45ACP_Mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(45ACP_Ball); descriptionShort = ".45ACP Ball Reload Tracer"; displayName = ".45ACP 15Rnd FNX-45 (Ball)"; @@ -10,7 +10,7 @@ class CLASS(15Rnd_45ACP_FNX45_Ball): 11Rnd_45ACP_Mag { // .45ACP SMG class CLASS(25Rnd_45ACP_Ball): 30Rnd_45ACP_Mag_SMG_01 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(45ACP_Ball); displayName = ".45ACP 25Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/bi/magazines/545x39.hpp b/addons/ammunition/bi/magazines/545x39.hpp index 4c7df3f4..0407f0d0 100644 --- a/addons/ammunition/bi/magazines/545x39.hpp +++ b/addons/ammunition/bi/magazines/545x39.hpp @@ -1,7 +1,7 @@ // 5.45x39mm (Using the nice looking AK-12 Mags) class CLASS(30Rnd_545x39_Ball): 30Rnd_545x39_Mag_F { - MACRO_SCOPE - MACRO_AK12_MAGAZINE_TAN + MACRO_SCOPE; + MACRO_AK12_MAGAZINE_TAN; ammo = QCLASS(545x39_Ball); displayName = "5.45mm 30Rnd Tan (Ball)"; displayNameShort = "Ball"; @@ -30,19 +30,19 @@ class CLASS(30Rnd_545x39_AP): CLASS(30Rnd_545x39_EPR) { // 5.45x39mm Black class CLASS(30Rnd_545x39_Ball_Black): CLASS(30Rnd_545x39_Ball) { - MACRO_AK12_MAGAZINE_BLACK + MACRO_AK12_MAGAZINE_BLACK; displayName = "5.45mm 30Rnd Black (Ball)"; }; class CLASS(30Rnd_545x39_Ball_Tracer_Black): CLASS(30Rnd_545x39_Ball_Tracer) { - MACRO_AK12_MAGAZINE_BLACK + MACRO_AK12_MAGAZINE_BLACK; displayName = "5.45mm 30Rnd Black [T] (Ball)"; }; class CLASS(30Rnd_545x39_EPR_Black): CLASS(30Rnd_545x39_EPR) { - MACRO_AK12_MAGAZINE_BLACK + MACRO_AK12_MAGAZINE_BLACK; displayName = "5.45mm 30Rnd Black (EPR)"; }; class CLASS(30Rnd_545x39_AP_Black): CLASS(30Rnd_545x39_AP) { - MACRO_AK12_MAGAZINE_BLACK + MACRO_AK12_MAGAZINE_BLACK; displayName = "5.45mm 30Rnd Black (AP)"; }; diff --git a/addons/ammunition/bi/magazines/556x45.hpp b/addons/ammunition/bi/magazines/556x45.hpp index 7d507332..0b227340 100644 --- a/addons/ammunition/bi/magazines/556x45.hpp +++ b/addons/ammunition/bi/magazines/556x45.hpp @@ -1,6 +1,6 @@ // 5.56x45mm Belt class CLASS(200Rnd_556x45_Ball_Belt): 200Rnd_556x45_Box_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 200Rnd Belt [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -23,7 +23,7 @@ class CLASS(200Rnd_556x45_EPR_Belt): CLASS(200Rnd_556x45_Ball_Belt) { // 5.56x45mm Drum 150 class CLASS(150Rnd_556x45_Ball_Drum): 150Rnd_556x45_Drum_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 150Rnd Drum [TE4] (Ball)"; displayNameShort = "Ball TE4"; diff --git a/addons/ammunition/bi/magazines/57x28.hpp b/addons/ammunition/bi/magazines/57x28.hpp index 5431f91f..a89bf945 100644 --- a/addons/ammunition/bi/magazines/57x28.hpp +++ b/addons/ammunition/bi/magazines/57x28.hpp @@ -1,6 +1,6 @@ // 5.7x28mm - Only one because all 5.7 Ammo is considered AP. class CLASS(50Rnd_57x28_Ball): 50Rnd_570x28_SMG_03 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(57x28_Ball); displayName = "5.7mm 50Rnd (AP)"; displayNameShort = "AP"; diff --git a/addons/ammunition/bi/magazines/58x42.hpp b/addons/ammunition/bi/magazines/58x42.hpp index 096b4864..137b349c 100644 --- a/addons/ammunition/bi/magazines/58x42.hpp +++ b/addons/ammunition/bi/magazines/58x42.hpp @@ -1,6 +1,6 @@ // 5.8x42mm class CLASS(30Rnd_58x42_Ball): 30Rnd_580x42_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(58x42_Ball); displayName = "5.8mm 30Rnd (Ball)"; displayNameShort = "Ball"; @@ -29,7 +29,7 @@ class CLASS(30Rnd_58x42_AP): CLASS(30Rnd_58x42_EPR) { // 5.8x42mm Drum class CLASS(100Rnd_58x42_Ball): 100Rnd_580x42_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(58x42_Ball); displayName = "5.8mm 100Rnd [TE4] (Ball)"; displayNameShort = "Ball TE4"; diff --git a/addons/ammunition/bi/magazines/65x39.hpp b/addons/ammunition/bi/magazines/65x39.hpp index e5acfd9b..77ab1dda 100644 --- a/addons/ammunition/bi/magazines/65x39.hpp +++ b/addons/ammunition/bi/magazines/65x39.hpp @@ -1,6 +1,6 @@ // 6.5x39mm (MX, Sand) class CLASS(30Rnd_65x39_Ball_MX_Sand): 30Rnd_65x39_caseless_mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(65x39_Ball); displayName = "6.5mm 30Rnd MX Sand (Ball)"; displayNameShort = "Ball"; @@ -28,25 +28,25 @@ class CLASS(30Rnd_65x39_AP_MX_Sand): CLASS(30Rnd_65x39_EPR_MX_Sand) { // 6.5x39mm (MX, Black) class CLASS(30Rnd_65x39_Ball_MX_Black): CLASS(30Rnd_65x39_Ball_MX_Sand) { - MACRO_65_MAGAZINE_MX_Black + MACRO_65_MAGAZINE_MX_Black; displayName = "6.5mm 30Rnd MX Black (Ball)"; }; class CLASS(30Rnd_65x39_Ball_Tracer_MX_Black): CLASS(30Rnd_65x39_Ball_Tracer_MX_Sand) { - MACRO_65_MAGAZINE_MX_Black + MACRO_65_MAGAZINE_MX_Black; displayName = "6.5mm 30Rnd MX Black [T] (Ball)"; }; class CLASS(30Rnd_65x39_EPR_MX_Black): CLASS(30Rnd_65x39_EPR_MX_Sand) { - MACRO_65_MAGAZINE_MX_Black + MACRO_65_MAGAZINE_MX_Black; displayName = "6.5mm 30Rnd MX Black (EPR)"; }; class CLASS(30Rnd_65x39_AP_MX_Black): CLASS(30Rnd_65x39_AP_MX_Sand) { - MACRO_65_MAGAZINE_MX_Black + MACRO_65_MAGAZINE_MX_Black; displayName = "6.5mm 30Rnd MX Black (AP)"; }; // 6.5x39mm (MX, MG Sand) class CLASS(100Rnd_65x39_Ball_MX_LSW_Sand): 100Rnd_65x39_caseless_mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(65x39_Ball); displayName = "6.5mm 100Rnd MX LSW Sand [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -68,21 +68,21 @@ class CLASS(100Rnd_65x39_EPR_MX_LSW_Sand): CLASS(100Rnd_65x39_Ball_MX_LSW_Sand) // 6.5x39mm (MX, MG Black) class CLASS(100Rnd_65x39_Ball_MX_LSW_Black): CLASS(100Rnd_65x39_Ball_MX_LSW_Sand) { - MACRO_65_MAGAZINE_MX_LSW_Black + MACRO_65_MAGAZINE_MX_LSW_Black; displayName = "6.5mm 100Rnd MX LSW Black [TE4] (Ball)"; }; class CLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Black): CLASS(100Rnd_65x39_Ball_Tracer_MX_LSW_Sand) { - MACRO_65_MAGAZINE_MX_LSW_Black + MACRO_65_MAGAZINE_MX_LSW_Black; displayName = "6.5mm 100Rnd MX LSW Black [T] (Ball)"; }; class CLASS(100Rnd_65x39_EPR_MX_LSW_Black): CLASS(100Rnd_65x39_EPR_MX_LSW_Sand) { - MACRO_65_MAGAZINE_MX_LSW_Black + MACRO_65_MAGAZINE_MX_LSW_Black; displayName = "6.5mm 100Rnd MX LSW Black [TE4] (EPR)"; }; // 6.5x39mm (GROT/MSBS) class CLASS(30Rnd_65x39_Ball_MSBS): 30Rnd_65x39_caseless_msbs_mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(65x39_Ball); displayName = "6.5mm 30Rnd MSBS (Ball)"; displayNameShort = "Ball"; @@ -110,7 +110,7 @@ class CLASS(30Rnd_65x39_AP_MSBS): CLASS(30Rnd_65x39_EPR_MSBS) { // 6.5x39mm Katiba/Type-115 class CLASS(30Rnd_65x39_Ball_Katiba): 30Rnd_65x39_caseless_green { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(65x39_Ball); displayName = "6.5mm 30Rnd Katiba (Ball)"; displayNameShort = "Ball"; @@ -138,7 +138,7 @@ class CLASS(30Rnd_65x39_AP_Katiba): CLASS(30Rnd_65x39_EPR_Katiba) { // 6.5x39mm Belt class CLASS(200Rnd_65x39_Ball_Belt): 200Rnd_65x39_cased_Box { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(65x39_Ball); displayName = "6.5mm 200Rnd Belt [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -160,7 +160,7 @@ class CLASS(200Rnd_65x39_EPR_Belt): CLASS(200Rnd_65x39_Ball_Belt) { // 6.5x39mm DMR class CLASS(20Rnd_65x39_Ball): 20Rnd_650x39_Cased_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(65x39_Ball); displayName = "6.5mm 20Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/bi/magazines/762x39.hpp b/addons/ammunition/bi/magazines/762x39.hpp index 12dd73a5..a3eef6e1 100644 --- a/addons/ammunition/bi/magazines/762x39.hpp +++ b/addons/ammunition/bi/magazines/762x39.hpp @@ -1,6 +1,6 @@ // 7.62x39mm (Plastic, Black) class CLASS(30Rnd_762x39_Ball_Plastic_Black): 30Rnd_762x39_AK12_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x39_Ball); displayName = "7.62mm 30Rnd AK Plastic Black (Ball)"; displayNameShort = "Ball"; @@ -29,26 +29,26 @@ class CLASS(30Rnd_762x39_AP_Plastic_Black): CLASS(30Rnd_762x39_EPR_Plastic_Black // 7.62x39mm (Plastic, Tan) class CLASS(30Rnd_762x39_Ball_Plastic_Tan): CLASS(30Rnd_762x39_Ball_Plastic_Black) { - MACRO_762_AK12_MAGAZINE_TAN + MACRO_762_AK12_MAGAZINE_TAN; displayName = "7.62mm 30Rnd AK Plastic Tan (Ball)"; mass = 11; }; class CLASS(30Rnd_762x39_Ball_Tracer_Plastic_Tan): CLASS(30Rnd_762x39_Ball_Tracer_Plastic_Black) { - MACRO_762_AK12_MAGAZINE_TAN + MACRO_762_AK12_MAGAZINE_TAN; displayName = "7.62mm 30Rnd AK Plastic Tan [T] (Ball)"; }; class CLASS(30Rnd_762x39_EPR_Plastic_Tan): CLASS(30Rnd_762x39_EPR_Plastic_Black) { - MACRO_762_AK12_MAGAZINE_TAN + MACRO_762_AK12_MAGAZINE_TAN; displayName = "7.62mm 30Rnd AK Plastic Tan (EPR)"; }; class CLASS(30Rnd_762x39_AP_Plastic_Tan): CLASS(30Rnd_762x39_AP_Plastic_Black) { - MACRO_762_AK12_MAGAZINE_TAN + MACRO_762_AK12_MAGAZINE_TAN; displayName = "7.62mm 30Rnd AK Plastic Tan (AP)"; }; // 7.62x39mm (Metal) class CLASS(30Rnd_762x39_Ball_Metal): 30Rnd_762x39_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x39_Ball); displayName = "7.62mm 30Rnd AK Metal (Ball)"; displayNameShort = "Ball"; @@ -77,7 +77,7 @@ class CLASS(30Rnd_762x39_AP_Metal): CLASS(30Rnd_762x39_EPR_Metal) { // 7.62x39mm (Drum) class CLASS(75Rnd_762x39_Ball_Drum): 75rnd_762x39_AK12_Mag_F { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x39_Ball); displayName = "7.62mm 75Rnd AK Drum [TE4] (Ball)"; displayNameShort = "Ball TE4"; diff --git a/addons/ammunition/bi/magazines/762x51.hpp b/addons/ammunition/bi/magazines/762x51.hpp index fd6090fb..2dcf10f9 100644 --- a/addons/ammunition/bi/magazines/762x51.hpp +++ b/addons/ammunition/bi/magazines/762x51.hpp @@ -1,6 +1,6 @@ // 7.62x51mm class CLASS(20Rnd_762x51_Ball): 20Rnd_762x51_Mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x51_Ball); displayName = "7.62mm 20Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/bi/magazines/762x54r.hpp b/addons/ammunition/bi/magazines/762x54r.hpp index 0881e51f..6f1054f6 100644 --- a/addons/ammunition/bi/magazines/762x54r.hpp +++ b/addons/ammunition/bi/magazines/762x54r.hpp @@ -1,6 +1,6 @@ // 7.62x54r Negev Boxes class CLASS(150Rnd_762x54r_Ball_Belt): 150Rnd_762x54_Box { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x54r_Ball); displayName = "7.62mm 150Rnd Belt [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -23,7 +23,7 @@ class CLASS(150Rnd_762x54r_EPR_Belt): CLASS(150Rnd_762x54r_Ball_Belt) { // 7.62x54r SVD/VS-121 Magazines class CLASS(10Rnd_762x54r_Ball): 10Rnd_762x54_Mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x54r_Ball); displayName = "7.62mm 10Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/bi/magazines/9x19.hpp b/addons/ammunition/bi/magazines/9x19.hpp index 6f5a2d61..ab67b121 100644 --- a/addons/ammunition/bi/magazines/9x19.hpp +++ b/addons/ammunition/bi/magazines/9x19.hpp @@ -1,6 +1,6 @@ class 16Rnd_9x21_Mag; class CLASS(17Rnd_9x19mm_Walther_Ball): 16Rnd_9x21_Mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 17Rnd Walther (Ball)"; @@ -9,7 +9,7 @@ class CLASS(17Rnd_9x19mm_Walther_Ball): 16Rnd_9x21_Mag { // 9x19mm class CLASS(30Rnd_9x19_Ball): 30Rnd_9x21_Mag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); displayName = "9mm 30Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/CfgAmmo.hpp b/addons/ammunition/cup/CfgAmmo.hpp index aaa3a5a5..5629f388 100644 --- a/addons/ammunition/cup/CfgAmmo.hpp +++ b/addons/ammunition/cup/CfgAmmo.hpp @@ -7,7 +7,7 @@ class CfgAmmo { aiAmmoUsageFlags = "64 + 128"; caliber = 1.5; hit = 12; - MACRO_TRACERS + MACRO_TRACERS; ACE_caliber = 5.7; ACE_bulletLength = 21.6; ACE_bulletMass = 2; @@ -18,6 +18,7 @@ class CfgAmmo { // 4.6x30mm (Comparable to 5.7x28mm but slightly worse performing penetration.) class CLASS(46x30_Ball): CLASS(57x28_Ball) { caliber = 0.15; + cartridge = "FxCartridge_9mm"; hit = 8; }; class CLASS(46x30_EPR): CLASS(46x30_Ball) { @@ -33,8 +34,9 @@ class CfgAmmo { class CLASS(9x39_Ball): CUP_B_9x39_SP5 { aiAmmoUsageFlags = "64 + 128"; caliber = 0.15; + cartridge = "FxCartridge_9mm"; hit = 10; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(9x39_EPR): CLASS(9x39_Ball) { caliber = 1.1; diff --git a/addons/ammunition/cup/magazines/12g.hpp b/addons/ammunition/cup/magazines/12g.hpp index 084caf8a..2385c650 100644 --- a/addons/ammunition/cup/magazines/12g.hpp +++ b/addons/ammunition/cup/magazines/12g.hpp @@ -1,6 +1,6 @@ // 8Rnd Saiga class CLASS(8Rnd_Saiga_000): CUP_5Rnd_B_Saiga12_Buck_00 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(P_12G_000); count = 8; displayName = "8Rnd Saiga (Magnum)"; diff --git a/addons/ammunition/cup/magazines/45ACP.hpp b/addons/ammunition/cup/magazines/45ACP.hpp index 9016540d..4d5d6963 100644 --- a/addons/ammunition/cup/magazines/45ACP.hpp +++ b/addons/ammunition/cup/magazines/45ACP.hpp @@ -1,7 +1,7 @@ // .45ACP 1911 class CUP_7Rnd_45ACP_1911; class CLASS(8Rnd_45ACP_1911_Ball): CUP_7Rnd_45ACP_1911 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(45ACP_Ball); descriptionShort = ".45ACP Ball Reload Tracer"; displayName = ".45ACP 8Rnd 1911 (Ball)"; @@ -11,7 +11,7 @@ class CLASS(8Rnd_45ACP_1911_Ball): CUP_7Rnd_45ACP_1911 { // .45ACP MK23 SOCOM class CUP_12Rnd_45ACP_mk23; class CLASS(12Rnd_45ACP_MK23_Ball): CUP_12Rnd_45ACP_mk23 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(45ACP_Ball); descriptionShort = ".45ACP Ball Reload Tracer"; displayName = ".45ACP 12Rnd MK23 (Ball)"; diff --git a/addons/ammunition/cup/magazines/46x30.hpp b/addons/ammunition/cup/magazines/46x30.hpp index 19d92c0a..849b9d1c 100644 --- a/addons/ammunition/cup/magazines/46x30.hpp +++ b/addons/ammunition/cup/magazines/46x30.hpp @@ -1,6 +1,6 @@ // 4.6x30mm class CLASS(40Rnd_46x30_Ball): CUP_40Rnd_46x30_MP7 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(46x30_Ball); displayName = "4.6mm 40Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/magazines/545x39.hpp b/addons/ammunition/cup/magazines/545x39.hpp index 614465de..2706c643 100644 --- a/addons/ammunition/cup/magazines/545x39.hpp +++ b/addons/ammunition/cup/magazines/545x39.hpp @@ -1,6 +1,6 @@ // 5.45x39mm Quadstack class CLASS(60Rnd_545x39_Ball_Quadstack): CUP_60Rnd_545x39_AK74M_M { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(545x39_Ball); displayName = "5.45mm 60Rnd Quadstack [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -23,7 +23,7 @@ class CLASS(60Rnd_545x39_EPR_Quadstack): CLASS(60Rnd_545x39_Ball_Quadstack) { // 5.45x39mm Fort class CLASS(30Rnd_545x39_Ball_Fort): CUP_30Rnd_545x39_Fort224_M { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(545x39_Ball); displayName = "5.45mm 30Rnd Fort (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/magazines/556x45.hpp b/addons/ammunition/cup/magazines/556x45.hpp index 92157477..ca192cbf 100644 --- a/addons/ammunition/cup/magazines/556x45.hpp +++ b/addons/ammunition/cup/magazines/556x45.hpp @@ -1,7 +1,7 @@ // 5.56x45mm (EMAG, Black) class CLASS(30Rnd_556x45_Ball_EMAG): 30Rnd_556x45_Stanag { - MACRO_SCOPE - MACRO_556_MAGAZINE_EMAG_Black + MACRO_SCOPE; + MACRO_556_MAGAZINE_EMAG_Black; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 30Rnd EMAG (Ball)"; displayNameShort = "Ball"; @@ -30,61 +30,61 @@ class CLASS(30Rnd_556x45_AP_EMAG): CLASS(30Rnd_556x45_EPR_EMAG) { // 5.56x45mm (EMAG, Tan) class CLASS(30Rnd_556x45_Ball_EMAG_Tan): CLASS(30Rnd_556x45_Ball_EMAG) { - MACRO_556_MAGAZINE_EMAG_Tan + MACRO_556_MAGAZINE_EMAG_Tan; displayName = "5.56mm 30Rnd EMAG Tan (Ball)"; }; class CLASS(30Rnd_556x45_Ball_Tracer_EMAG_Tan): CLASS(30Rnd_556x45_Ball_Tracer_EMAG) { - MACRO_556_MAGAZINE_EMAG_Tan + MACRO_556_MAGAZINE_EMAG_Tan; displayName = "5.56mm 30Rnd EMAG Tan [T] (Ball)"; }; class CLASS(30Rnd_556x45_EPR_EMAG_Tan): CLASS(30Rnd_556x45_EPR_EMAG) { - MACRO_556_MAGAZINE_EMAG_Tan + MACRO_556_MAGAZINE_EMAG_Tan; displayName = "5.56mm 30Rnd EMAG Tan (EPR)"; }; class CLASS(30Rnd_556x45_AP_EMAG_Tan): CLASS(30Rnd_556x45_AP_EMAG) { - MACRO_556_MAGAZINE_EMAG_Tan + MACRO_556_MAGAZINE_EMAG_Tan; displayName = "5.56mm 30Rnd EMAG Tan (AP)"; }; // 5.56x45mm (PMAG, Black) class CLASS(30Rnd_556x45_Ball_PMAG): CLASS(30Rnd_556x45_Ball_EMAG) { - MACRO_556_MAGAZINE_PMAG_Black + MACRO_556_MAGAZINE_PMAG_Black; displayName = "5.56mm 30Rnd PMAG (Ball)"; }; class CLASS(30Rnd_556x45_Ball_Tracer_PMAG): CLASS(30Rnd_556x45_Ball_Tracer_EMAG) { - MACRO_556_MAGAZINE_PMAG_Black + MACRO_556_MAGAZINE_PMAG_Black; displayName = "5.56mm 30Rnd PMAG [T] (Ball)"; }; class CLASS(30Rnd_556x45_EPR_PMAG): CLASS(30Rnd_556x45_EPR_EMAG) { - MACRO_556_MAGAZINE_PMAG_Black + MACRO_556_MAGAZINE_PMAG_Black; displayName = "5.56mm 30Rnd PMAG (EPR)"; }; class CLASS(30Rnd_556x45_AP_PMAG): CLASS(30Rnd_556x45_AP_EMAG) { - MACRO_556_MAGAZINE_PMAG_Black + MACRO_556_MAGAZINE_PMAG_Black; displayName = "5.56mm 30Rnd PMAG (AP)"; }; // 5.56x45mm (PMAG, Tan) class CLASS(30Rnd_556x45_Ball_PMAG_Tan): CLASS(30Rnd_556x45_Ball_PMAG) { - MACRO_556_MAGAZINE_PMAG_Tan + MACRO_556_MAGAZINE_PMAG_Tan; displayName = "5.56mm 30Rnd PMAG Coyote (Ball)"; }; class CLASS(30Rnd_556x45_Ball_Tracer_PMAG_Tan): CLASS(30Rnd_556x45_Ball_Tracer_PMAG) { - MACRO_556_MAGAZINE_PMAG_Tan + MACRO_556_MAGAZINE_PMAG_Tan; displayName = "5.56mm 30Rnd PMAG Coyote [T] (Ball)"; }; class CLASS(30Rnd_556x45_EPR_PMAG_Tan): CLASS(30Rnd_556x45_EPR_PMAG) { - MACRO_556_MAGAZINE_PMAG_Tan + MACRO_556_MAGAZINE_PMAG_Tan; displayName = "5.56mm 30Rnd PMAG Coyote (EPR)"; }; class CLASS(30Rnd_556x45_AP_PMAG_Tan): CLASS(30Rnd_556x45_AP_PMAG) { - MACRO_556_MAGAZINE_PMAG_Tan + MACRO_556_MAGAZINE_PMAG_Tan; displayName = "5.56mm 30Rnd PMAG Coyote (AP)"; }; // 5.56x45mm AK class CLASS(30Rnd_556x45_Ball_AK): CUP_30Rnd_556x45_AK { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 30Rnd AK (Ball)"; displayNameShort = "Ball"; @@ -113,7 +113,7 @@ class CLASS(30Rnd_556x45_AP_AK): CLASS(30Rnd_556x45_EPR_AK) { // 5.56x45mm G36 class CLASS(30Rnd_556x45_Ball_G36): CUP_30Rnd_TE1_Green_Tracer_556x45_G36 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 30Rnd G36 (Ball)"; displayNameShort = "Ball"; @@ -143,7 +143,7 @@ class CLASS(30Rnd_556x45_AP_G36): CLASS(30Rnd_556x45_Ball_G36) { // 5.56x45mm FAMAS class CLASS(25Rnd_556x45_Ball_FAMAS): CUP_25Rnd_556x45_Famas { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 25Rnd FAMAS (Ball)"; displayNameShort = "Ball"; @@ -172,7 +172,7 @@ class CLASS(25Rnd_556x45_AP_FAMAS): CLASS(25Rnd_556x45_Ball_FAMAS) { // 5.56x45mm Surefire 60Rnd class CLASS(60Rnd_556x45_Ball_Surefire): CUP_60Rnd_556x45_SureFire { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 60Rnd Surefire [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -195,7 +195,7 @@ class CLASS(60Rnd_556x45_EPR_Surefire): CLASS(60Rnd_556x45_Ball_Surefire) { /// 5.56x45mm Beta-C class CLASS(100Rnd_556x45_Ball_BetaC): CUP_100Rnd_556x45_BetaCMag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 100Rnd Beta-C [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -218,7 +218,7 @@ class CLASS(100Rnd_556x45_EPR_BetaC): CLASS(100Rnd_556x45_Ball_BetaC) { // 5.56x45mm M249 Pouch 100 class CLASS(100Rnd_556x54_Ball_Pouch): CUP_100Rnd_TE4_Green_Tracer_556x45_M249 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 100Rnd M249 Pouch [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -241,7 +241,7 @@ class CLASS(100Rnd_556x54_EPR_Pouch): CLASS(100Rnd_556x54_Ball_Pouch) { // 5.56x45mm M249 Pouch 200 class CLASS(200Rnd_556x45_Ball_Pouch): CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 200Rnd M249 Pouch [TE4] (Ball)"; displayNameShort = "Ball TE4"; @@ -264,7 +264,7 @@ class CLASS(200Rnd_556x45_EPR_Pouch): CLASS(200Rnd_556x45_Ball_Pouch) { // 5.56x45mm M249 Box 200 class CLASS(200Rnd_556x45_Ball_Box): CUP_200Rnd_TE4_Green_Tracer_556x45_M249 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 200Rnd M249 Box [TE4] (Ball)"; displayNameShort = "Ball TE4"; diff --git a/addons/ammunition/cup/magazines/68x43.hpp b/addons/ammunition/cup/magazines/68x43.hpp index 7fe77421..e7d779e5 100644 --- a/addons/ammunition/cup/magazines/68x43.hpp +++ b/addons/ammunition/cup/magazines/68x43.hpp @@ -1,6 +1,6 @@ // 6.8x43mm ACR class CLASS(30Rnd_68x43_Ball_ACR): CUP_30Rnd_680x43_Stanag { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(68x43_Ball); displayName = "6.8mm 30Rnd ACR (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/magazines/762x39.hpp b/addons/ammunition/cup/magazines/762x39.hpp index 25275fa7..227106cf 100644 --- a/addons/ammunition/cup/magazines/762x39.hpp +++ b/addons/ammunition/cup/magazines/762x39.hpp @@ -1,6 +1,6 @@ // 7.62x39mm CZ807 class CLASS(30Rnd_762x39_Ball_CZ): CUP_30Rnd_762x39_CZ807 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x39_Ball); displayName = "7.62mm 30Rnd CZ (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/magazines/762x51.hpp b/addons/ammunition/cup/magazines/762x51.hpp index db39dae1..ef570ae9 100644 --- a/addons/ammunition/cup/magazines/762x51.hpp +++ b/addons/ammunition/cup/magazines/762x51.hpp @@ -1,6 +1,6 @@ // 7.62x51mm FAL class CLASS(20Rnd_762x51_Ball_FAL): CUP_20Rnd_762x51_FNFAL_M { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x51_Ball); displayName = "7.62mm 20Rnd FAL (Ball)"; displayNameShort = "Ball"; @@ -29,7 +29,7 @@ class CLASS(20Rnd_762x51_AP_FAL): CLASS(20Rnd_762x51_EPR_FAL) { // 7.62x51mm SCAR-H class CLASS(20Rnd_762x51_Ball_SCAR): CUP_20Rnd_762x51_B_SCAR_bkl { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x51_Ball); displayName = "7.62mm 20Rnd SCAR (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/magazines/9x19.hpp b/addons/ammunition/cup/magazines/9x19.hpp index 42cc2c23..770ad4f6 100644 --- a/addons/ammunition/cup/magazines/9x19.hpp +++ b/addons/ammunition/cup/magazines/9x19.hpp @@ -1,7 +1,7 @@ // 9x19 Browning class CUP_13Rnd_9x19_Browning_HP; class CLASS(13Rnd_9x19_Browning_Ball): CUP_13Rnd_9x19_Browning_HP { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 13Rnd Browning (Ball)"; @@ -11,7 +11,7 @@ class CLASS(13Rnd_9x19_Browning_Ball): CUP_13Rnd_9x19_Browning_HP { // 9x19 CZ75 class CUP_18Rnd_9x19_Phantom; class CLASS(18Rnd_9x19_CZ75_Ball): CUP_18Rnd_9x19_Phantom { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 18Rnd CZ75 (Ball)"; @@ -21,7 +21,7 @@ class CLASS(18Rnd_9x19_CZ75_Ball): CUP_18Rnd_9x19_Phantom { // 9x19 Glock class CUP_17Rnd_9x19_glock17; class CLASS(17Rnd_9x19_Glock_Ball): CUP_17Rnd_9x19_glock17 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 17Rnd Glock (Ball)"; @@ -31,7 +31,7 @@ class CLASS(17Rnd_9x19_Glock_Ball): CUP_17Rnd_9x19_glock17 { // 9x19 M17 class CUP_17Rnd_9x19_M17_Black; class CLASS(17Rnd_9x19_M17_Ball): CUP_17Rnd_9x19_M17_Black { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 17Rnd M17 (Ball)"; @@ -41,7 +41,7 @@ class CLASS(17Rnd_9x19_M17_Ball): CUP_17Rnd_9x19_M17_Black { // 9x19 M9 class CUP_15Rnd_9x19_M9; class CLASS(15Rnd_9x19_M9_Ball): CUP_15Rnd_9x19_M9 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 15Rnd M9 (Ball)"; @@ -50,7 +50,7 @@ class CLASS(15Rnd_9x19_M9_Ball): CUP_15Rnd_9x19_M9 { // 9x19mm MP5 class CLASS(30Rnd_9x19_Ball_MP5): CUP_30Rnd_9x19_MP5 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); displayName = "9mm 30Rnd MP5 (Ball)"; displayNameShort = "Ball"; @@ -79,7 +79,7 @@ class CLASS(30Rnd_9x19_AP_MP5): CLASS(30Rnd_9x19_EPR_MP5) { // 9x19mm Vityaz class CLASS(30Rnd_9x19_Ball_Vityaz): CUP_30Rnd_9x19_Vityaz { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); displayName = "9mm 30Rnd Vityaz (Ball)"; displayNameShort = "Ball"; @@ -108,7 +108,7 @@ class CLASS(30Rnd_9x19_AP_Vityaz): CLASS(30Rnd_9x19_EPR_Vityaz) { // 9x19 Bizon class CLASS(64Rnd_9x19_Ball_Bizon): CUP_64Rnd_9x19_Bizon_M { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); displayName = "9mm 64Rnd Bizon (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/cup/magazines/9x39.hpp b/addons/ammunition/cup/magazines/9x39.hpp index a9906fb7..cd829d6b 100644 --- a/addons/ammunition/cup/magazines/9x39.hpp +++ b/addons/ammunition/cup/magazines/9x39.hpp @@ -1,6 +1,6 @@ // 9x39mm class CLASS(30Rnd_9x39_Ball): CUP_30Rnd_9x39_SP5_VIKHR_M { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x39_Ball); displayName = "9x39mm 30Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/niarms/CfgAmmo.hpp b/addons/ammunition/niarms/CfgAmmo.hpp index 8571e2e5..04cc8801 100644 --- a/addons/ammunition/niarms/CfgAmmo.hpp +++ b/addons/ammunition/niarms/CfgAmmo.hpp @@ -5,8 +5,9 @@ class CfgAmmo { class CLASS(300AAC_Ball): HLC_300Blackout_Ball { aiAmmoUsageFlags = "64 + 128"; caliber = 0.19; + cartridge = "FxCartridge_762"; hit = 12; - MACRO_TRACERS + MACRO_TRACERS; }; class CLASS(300AAC_EPR): CLASS(300AAC_Ball) { caliber = 1.2; diff --git a/addons/ammunition/niarms/magazines/10mm.hpp b/addons/ammunition/niarms/magazines/10mm.hpp index 619da498..3716c413 100644 --- a/addons/ammunition/niarms/magazines/10mm.hpp +++ b/addons/ammunition/niarms/magazines/10mm.hpp @@ -1,5 +1,5 @@ class CLASS(10mm_Ball_Special): hlc_15Rnd_9x19_B_P226 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(10mm_Ball); descriptionShort = "10mm Auto Ball Reload Tracer"; displayName = "10mm 8Rnd M11 10th Legion (Ball)"; diff --git a/addons/ammunition/niarms/magazines/300Blackout.hpp b/addons/ammunition/niarms/magazines/300Blackout.hpp index 615b9bb0..81de8217 100644 --- a/addons/ammunition/niarms/magazines/300Blackout.hpp +++ b/addons/ammunition/niarms/magazines/300Blackout.hpp @@ -1,5 +1,5 @@ class CLASS(30Rnd_300AAC_Ball): hlc_29rnd_300BLK_STANAG { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(300AAC_Ball); displayName = ".300AAC 30Rnd (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/niarms/magazines/357.hpp b/addons/ammunition/niarms/magazines/357.hpp index 74157a98..286511b8 100644 --- a/addons/ammunition/niarms/magazines/357.hpp +++ b/addons/ammunition/niarms/magazines/357.hpp @@ -1,7 +1,7 @@ // .357 SIG class hlc_12Rnd_357SIG_B_P226; class CLASS(12Rnd_357_P226_Magnum): hlc_12Rnd_357SIG_B_P226 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(357_Magnum); descriptionShort = ".357 Magnum Reload Tracer"; displayName = ".357 12Rnd P226 (Magnum)"; @@ -10,7 +10,7 @@ class CLASS(12Rnd_357_P226_Magnum): hlc_12Rnd_357SIG_B_P226 { class hlc_8Rnd_357SIG_B_P239; class CLASS(8Rnd_357_P239_Magnum): hlc_8Rnd_357SIG_B_P239 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(357_Magnum); descriptionShort = ".357 Magnum Reload Tracer"; displayName = ".357 8Rnd P239 (Magnum)"; diff --git a/addons/ammunition/niarms/magazines/556x45.hpp b/addons/ammunition/niarms/magazines/556x45.hpp index 746f0a44..0fae4767 100644 --- a/addons/ammunition/niarms/magazines/556x45.hpp +++ b/addons/ammunition/niarms/magazines/556x45.hpp @@ -1,6 +1,6 @@ // 5.56x45mm SG55X Series class CLASS(30Rnd_556x45_Ball_SG): hlc_30Rnd_556x45_EPR_sg550 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 30Rnd SiG (Ball)"; displayNameShort = "Ball"; @@ -29,7 +29,7 @@ class CLASS(30Rnd_556x45_AP_SG): CLASS(30Rnd_556x45_EPR_SG) { // 5.56x45mm AUG class CLASS(30Rnd_556x45_Ball_AUG): hlc_30Rnd_556x45_B_AUG { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 30Rnd AUG (Ball)"; displayNameShort = "Ball"; @@ -58,7 +58,7 @@ class CLASS(30Rnd_556x45_AP_AUG): CLASS(30Rnd_556x45_EPR_AUG) { // 5.56x45mm AUG 42Rnd class CLASS(42Rnd_556x45_Ball_AUG): hlc_40Rnd_556x45_B_AUG { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 42Rnd AUG (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/niarms/magazines/762x51.hpp b/addons/ammunition/niarms/magazines/762x51.hpp index d1f754d8..90323280 100644 --- a/addons/ammunition/niarms/magazines/762x51.hpp +++ b/addons/ammunition/niarms/magazines/762x51.hpp @@ -1,6 +1,6 @@ // 7.62x51mm Belt class CLASS(100Rnd_762x51_Ball_Belt): hlc_100Rnd_762x51_B_M60E4 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x51_Ball); displayName = "7.62mm 100Rnd [TE4] (Ball)"; displayNameShort = "Ball TE4"; diff --git a/addons/ammunition/niarms/magazines/9x19.hpp b/addons/ammunition/niarms/magazines/9x19.hpp index d48c5d42..d6d85f9c 100644 --- a/addons/ammunition/niarms/magazines/9x19.hpp +++ b/addons/ammunition/niarms/magazines/9x19.hpp @@ -1,7 +1,7 @@ // 9x19 SIG class hlc_15Rnd_9x19_B_P226; class CLASS(15Rnd_9x19_P226_Ball): hlc_15Rnd_9x19_B_P226 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 15Rnd P226 (Ball)"; @@ -11,7 +11,7 @@ class CLASS(15Rnd_9x19_P226_Ball): hlc_15Rnd_9x19_B_P226 { // 9x19 SIG P239 class hlc_10Rnd_9x19_B_P239; class CLASS(10Rnd_9x19_P239_Ball): hlc_10Rnd_9x19_B_P239 { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(9x19_Ball); descriptionShort = "9x19mm Ball Reload Tracer"; displayName = "9mm 10Rnd P239 (Ball)"; diff --git a/addons/ammunition/script_macros.hpp b/addons/ammunition/script_macros.hpp index 1fe1d435..81e127d3 100644 --- a/addons/ammunition/script_macros.hpp +++ b/addons/ammunition/script_macros.hpp @@ -1,13 +1,13 @@ #define MACRO_SCOPE \ scope = 2; \ scopeArsenal = 2; \ - author = ECSTRING(main,Author); + author = ECSTRING(main,Author) #define MACRO_TRACERS \ - model = "\A3\Weapons_f\Data\bullettracer\tracer_Yellow"; - tracerEndTime = 1; - tracerScale = 0.5; - tracerstartTime = 0.05; + model = "\A3\Weapons_f\Data\bullettracer\tracer_Yellow"; \ + tracerEndTime = 1; \ + tracerScale = 0.5; \ + tracerstartTime = 0.05 #define MACRO_AK12_MAGAZINE_TAN \ hiddenSelections[] = {"Camo1"}; \ @@ -15,7 +15,7 @@ model = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines\CUP_mag_30Rnd_AK12.p3d"; \ modelSpecial = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines_proxy\CUP_mag_30Rnd_AK12.p3d"; \ modelSpecialIsProxy = 1; \ - picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_ak74_ca.paa"; + picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_ak74_ca.paa" #define MACRO_AK12_MAGAZINE_BLACK \ hiddenSelections[] = {"Camo1"}; \ @@ -23,7 +23,7 @@ model = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines\CUP_mag_30Rnd_AK12.p3d"; \ modelSpecial = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines_proxy\CUP_mag_30Rnd_AK12.p3d"; \ modelSpecialIsProxy = 1; \ - picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_ak74_ca.paa"; + picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_ak74_ca.paa" #define MACRO_556_MAGAZINE_PMAG_Black \ hiddenSelections[] = {"Camo1"}; \ @@ -31,36 +31,36 @@ model = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines\CUP_mag_30rnd_pmag.p3d"; \ modelSpecial = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines_proxy\CUP_mag_30rnd_pmag.p3d"; \ modelSpecialIsProxy = 1; \ - picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_30rnd_pmag_black_ca.paa"; + picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_30rnd_pmag_black_ca.paa" #define MACRO_556_MAGAZINE_PMAG_Tan \ hiddenSelections[] = {"Camo1"}; \ hiddenSelectionsTextures[] = {"\CUP\Weapons\CUP_Weapons_Ammunition\magazines\data\cup_pmag_coyote_co.paa"}; \ - picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_30rnd_pmag_coyote_ca.paa"; + picture = "\CUP\Weapons\CUP_Weapons_Ammunition\data\ui\m_30rnd_pmag_coyote_ca.paa" #define MACRO_556_MAGAZINE_EMAG_Black \ hiddenSelections[] = {"Camo1"}; \ hiddenSelectionsTextures[] = {"\CUP\Weapons\CUP_Weapons_Ammunition\magazines\data\emag_co.paa"}; \ model = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines\CUP_mag_30Rnd_EMAG.p3d"; \ modelSpecial = "\CUP\Weapons\CUP_Weapons_Ammunition\magazines_proxy\CUP_mag_30Rnd_EMAG.p3d"; \ - modelSpecialIsProxy = 1; + modelSpecialIsProxy = 1 #define MACRO_556_MAGAZINE_EMAG_Tan \ hiddenSelections[] = {"Camo1"}; \ - hiddenSelectionsTextures[] = {"\CUP\Weapons\CUP_Weapons_Ammunition\magazines\data\emag_coyote_co.paa"}; + hiddenSelectionsTextures[] = {"\CUP\Weapons\CUP_Weapons_Ammunition\magazines\data\emag_coyote_co.paa"} #define MACRO_65_MAGAZINE_MX_Black \ hiddenSelections[] = {"camo"}; \ hiddenSelectionsTextures[] = {"\A3\Weapons_F_EPB\Rifles\MX_Black\Data\XMX_Base_Black_co.paa"}; \ - picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_30Rnd_65x39_caseless_black_mag_CA.paa"; + picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_30Rnd_65x39_caseless_black_mag_CA.paa" #define MACRO_65_MAGAZINE_MX_LSW_Black \ hiddenSelections[] = {"camo"}; \ hiddenSelectionsTextures[] = {"\A3\Weapons_F_EPB\Rifles\MX_Black\Data\XMX_lmg_Black_co.paa"}; \ - picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_100Rnd_65x39_caseless_black_mag_CA.paa"; + picture = "\a3\Weapons_F\MagazineProxies\data\UI\icon_100Rnd_65x39_caseless_black_mag_CA.paa" #define MACRO_762_AK12_MAGAZINE_TAN \ hiddenSelections[] = {"Camo"}; \ hiddenSelectionsMaterials[] = {"a3\Weapons_F_Enoch\Rifles\AK12\Data\AK12_F_2_camo.rvmat"}; \ hiddenSelectionsTextures[] = {"a3\Weapons_F_Enoch\Rifles\AK12\Data\ak12_ak12_2_camo_co.paa"}; \ - picture = "\a3\Weapons_F_Enoch\MagazineProxies\data\UI\icon_30rnd_762x39_AK12_Arid_Mag_F_CA.paa"; + picture = "\a3\Weapons_F_Enoch\MagazineProxies\data\UI\icon_30rnd_762x39_AK12_Arid_Mag_F_CA.paa" diff --git a/addons/ammunition/ws/magazines/556x45.hpp b/addons/ammunition/ws/magazines/556x45.hpp index ee8cf603..9befc5ca 100644 --- a/addons/ammunition/ws/magazines/556x45.hpp +++ b/addons/ammunition/ws/magazines/556x45.hpp @@ -1,6 +1,6 @@ // Western Sahara Assets class CLASS(35Rnd_556x45_Ball_R4): 35Rnd_556x45_Velko_reload_tracer_yellow_lxWS { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(556x45_Ball); displayName = "5.56mm 35Rnd R4 (Ball)"; displayNameShort = "Ball"; diff --git a/addons/ammunition/ws/magazines/762x51.hpp b/addons/ammunition/ws/magazines/762x51.hpp index 9bdfce56..25a10688 100644 --- a/addons/ammunition/ws/magazines/762x51.hpp +++ b/addons/ammunition/ws/magazines/762x51.hpp @@ -1,6 +1,6 @@ // WS FAL (Original FAL magazines are not properly positioned) class CLASS(20Rnd_762x51_Ball_SLR): 20Rnd_762x51_slr_lxWS { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x51_Ball); displayName = "7.62mm 20Rnd SLR (Ball)"; displayNameShort = "Ball"; @@ -29,7 +29,7 @@ class CLASS(20Rnd_762x51_AP_SLR): CLASS(20Rnd_762x51_Ball_SLR) { // Western Sahara Belt class CLASS(100Rnd_762x51_Ball_Belt_SA77): 100Rnd_762x51_S77_Yellow_lxWS { - MACRO_SCOPE + MACRO_SCOPE; ammo = QCLASS(762x51_Ball); displayName = "7.62mm 100Rnd SA-77 [TE4] (Ball)"; displayNameShort = "Ball TE4"; From dd36d8558668bcfe5dc9e7cf21d78e4443aaba99 Mon Sep 17 00:00:00 2001 From: Mike-MF Date: Sun, 3 Sep 2023 05:39:15 +0100 Subject: [PATCH 2/4] Ammunition - Add CUP HK417 Magazines (#172) --- addons/ammunition/cup/CfgMagazines.hpp | 43 +++++++++++----------- addons/ammunition/cup/magazines/762x51.hpp | 29 +++++++++++++++ addons/ammunition/magwells/rifle.hpp | 6 ++- 3 files changed, 56 insertions(+), 22 deletions(-) diff --git a/addons/ammunition/cup/CfgMagazines.hpp b/addons/ammunition/cup/CfgMagazines.hpp index c7de849e..f2b0e5ed 100644 --- a/addons/ammunition/cup/CfgMagazines.hpp +++ b/addons/ammunition/cup/CfgMagazines.hpp @@ -1,32 +1,33 @@ class CfgMagazines { - class CUP_5Rnd_B_Saiga12_Buck_00; - class CUP_30Rnd_9x19_MP5; - class CUP_30Rnd_9x19_Vityaz; - class CUP_64Rnd_9x19_Bizon_M; - class CUP_40Rnd_46x30_MP7; - class CUP_30Rnd_545x39_Fort224_M; - class CUP_60Rnd_545x39_AK74M_M; - class CUP_30Rnd_556x45_AK; - class CUP_25Rnd_556x45_Famas; - class CUP_30Rnd_TE1_Green_Tracer_556x45_G36; - class CUP_60Rnd_556x45_SureFire; + class 30Rnd_556x45_Stanag; class CUP_100Rnd_556x45_BetaCMag; class CUP_100Rnd_TE4_Green_Tracer_556x45_M249; - class CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch; + class CUP_12Rnd_45ACP_mk23; + class CUP_13Rnd_9x19_Browning_HP; + class CUP_15Rnd_9x19_M9; + class CUP_17Rnd_9x19_glock17; + class CUP_17Rnd_9x19_M17_Black; + class CUP_18Rnd_9x19_Phantom; class CUP_200Rnd_TE4_Green_Tracer_556x45_M249; + class CUP_200Rnd_TE4_Green_Tracer_556x45_M249_Pouch; + class CUP_20Rnd_762x51_B_SCAR_bkl; + class CUP_20Rnd_762x51_FNFAL_M; + class CUP_20Rnd_762x51_HK417; + class CUP_25Rnd_556x45_Famas; + class CUP_30Rnd_545x39_Fort224_M; + class CUP_30Rnd_556x45_AK; class CUP_30Rnd_680x43_Stanag; class CUP_30Rnd_762x39_CZ807; - class CUP_20Rnd_762x51_FNFAL_M; - class CUP_20Rnd_762x51_B_SCAR_bkl; + class CUP_30Rnd_9x19_MP5; + class CUP_30Rnd_9x19_Vityaz; class CUP_30Rnd_9x39_SP5_VIKHR_M; - class CUP_13Rnd_9x19_Browning_HP; - class CUP_18Rnd_9x19_Phantom; - class CUP_17Rnd_9x19_glock17; - class CUP_17Rnd_9x19_M17_Black; - class CUP_15Rnd_9x19_M9; + class CUP_30Rnd_TE1_Green_Tracer_556x45_G36; + class CUP_40Rnd_46x30_MP7; + class CUP_5Rnd_B_Saiga12_Buck_00; + class CUP_60Rnd_545x39_AK74M_M; + class CUP_60Rnd_556x45_SureFire; + class CUP_64Rnd_9x19_Bizon_M; class CUP_7Rnd_45ACP_1911; - class CUP_12Rnd_45ACP_mk23; - class 30Rnd_556x45_Stanag; #include "magazines\12g.hpp" #include "magazines\45ACP.hpp" diff --git a/addons/ammunition/cup/magazines/762x51.hpp b/addons/ammunition/cup/magazines/762x51.hpp index ef570ae9..3e34cf3d 100644 --- a/addons/ammunition/cup/magazines/762x51.hpp +++ b/addons/ammunition/cup/magazines/762x51.hpp @@ -27,6 +27,35 @@ class CLASS(20Rnd_762x51_AP_FAL): CLASS(20Rnd_762x51_EPR_FAL) { descriptionShort = "7.62x51mm AP Reload Tracer"; }; +// 7.62x51mm HK417 +class CLASS(20Rnd_762x51_Ball_HK417): CUP_20Rnd_762x51_HK417 { + MACRO_SCOPE; + ammo = QCLASS(762x51_Ball); + displayName = "7.62mm 20Rnd HK417 (Ball)"; + displayNameShort = "Ball"; + descriptionShort = "7.62x51mm Ball Reload Tracer"; + lastRoundsTracer = 2; + mass = 11; +}; +class CLASS(20Rnd_762x51_Ball_Tracer_HK417): CLASS(20Rnd_762x51_Ball_HK417) { + displayName = "7.62mm 20Rnd HK417 [T] (Ball)"; + displayNameShort = "Ball Tracer"; + descriptionShort = "7.62x51mm Ball Tracer"; + tracersEvery = 1; +}; +class CLASS(20Rnd_762x51_EPR_HK417): CLASS(20Rnd_762x51_Ball_HK417) { + ammo = QCLASS(762x51_EPR); + displayName = "7.62mm 20Rnd HK417 (EPR)"; + displayNameShort = "EPR"; + descriptionShort = "7.62x51mm EPR Reload Tracer"; +}; +class CLASS(20Rnd_762x51_AP_HK417): CLASS(20Rnd_762x51_Ball_HK417) { + ammo = QCLASS(762x51_AP); + displayName = "7.62mm 20Rnd HK417 (AP)"; + displayNameShort = "AP"; + descriptionShort = "7.62x51mm AP Reload Tracer"; +}; + // 7.62x51mm SCAR-H class CLASS(20Rnd_762x51_Ball_SCAR): CUP_20Rnd_762x51_B_SCAR_bkl { MACRO_SCOPE; diff --git a/addons/ammunition/magwells/rifle.hpp b/addons/ammunition/magwells/rifle.hpp index c3d2cfe7..d3768bca 100644 --- a/addons/ammunition/magwells/rifle.hpp +++ b/addons/ammunition/magwells/rifle.hpp @@ -414,7 +414,11 @@ class CBA_762x51_HK417 { QCLASS(20Rnd_762x51_Ball), QCLASS(20Rnd_762x51_Ball_Tracer), QCLASS(20Rnd_762x51_EPR), - QCLASS(20Rnd_762x51_AP) + QCLASS(20Rnd_762x51_AP), + QCLASS(20Rnd_762x51_Ball_HK417), + QCLASS(20Rnd_762x51_Ball_Tracer_HK417), + QCLASS(20Rnd_762x51_EPR_HK417), + QCLASS(20Rnd_762x51_AP_HK417) }; }; From 6f2bbdf8c0e67f122527fad0f4ff3b124816ac9c Mon Sep 17 00:00:00 2001 From: Mike-MF Date: Mon, 4 Sep 2023 17:25:14 +0100 Subject: [PATCH 3/4] Overhaul Recoils (#176) Co-authored-by: jonpas --- addons/recoils/CfgRecoils.hpp | 337 ++++++++++++++- addons/recoils/CfgWeapons.hpp | 37 +- .../{ws/12G/aa40.hpp => bohemia/12G.hpp} | 8 +- addons/recoils/bohemia/338.hpp | 3 + addons/recoils/bohemia/338/mar10.hpp | 6 - addons/recoils/bohemia/545.hpp | 33 ++ addons/recoils/bohemia/545/ak.hpp | 6 - addons/recoils/bohemia/556.hpp | 81 ++++ addons/recoils/bohemia/556/f2000.hpp | 13 - addons/recoils/bohemia/556/hk416.hpp | 33 -- addons/recoils/bohemia/556/tar21.hpp | 15 - addons/recoils/bohemia/65.hpp | 99 +++++ addons/recoils/bohemia/65/katiba.hpp | 15 - addons/recoils/bohemia/65/msbs.hpp | 55 --- addons/recoils/bohemia/65/mx.hpp | 25 -- addons/recoils/bohemia/65/qbu.hpp | 12 - addons/recoils/bohemia/65/type115.hpp | 12 - addons/recoils/bohemia/762N.hpp | 71 ++++ addons/recoils/bohemia/762N/ebr.hpp | 4 - addons/recoils/bohemia/762N/hk417.hpp | 12 - addons/recoils/bohemia/762N/m14.hpp | 11 - addons/recoils/bohemia/762N/sig.hpp | 6 - .../recoils/bohemia/{762R/ak.hpp => 762R.hpp} | 42 +- addons/recoils/{ => bohemia}/baseclasses.hpp | 88 ++-- addons/recoils/config.cpp | 4 +- addons/recoils/cup/12G/m1014.hpp | 19 - addons/recoils/cup/12G/saiga12.hpp | 6 - addons/recoils/cup/545/ak.hpp | 59 --- addons/recoils/cup/545/ak12.hpp | 19 - addons/recoils/cup/556/acr.hpp | 23 -- addons/recoils/cup/556/ak.hpp | 57 --- addons/recoils/cup/556/ak19.hpp | 19 - addons/recoils/cup/556/aug.hpp | 4 - addons/recoils/cup/556/cz.hpp | 37 -- addons/recoils/cup/556/famas.hpp | 9 - addons/recoils/cup/556/fort.hpp | 29 -- addons/recoils/cup/556/g36.hpp | 84 ---- addons/recoils/cup/556/galil.hpp | 11 - addons/recoils/cup/556/hk416.hpp | 20 - addons/recoils/cup/556/l85.hpp | 22 - addons/recoils/cup/556/m16.hpp | 46 --- addons/recoils/cup/556/m27.hpp | 14 - addons/recoils/cup/556/m4.hpp | 46 --- addons/recoils/cup/556/mg36.hpp | 6 - addons/recoils/cup/556/mk12.hpp | 6 - addons/recoils/cup/556/mk18.hpp | 8 - addons/recoils/cup/556/scar.hpp | 41 -- addons/recoils/cup/762N/fal.hpp | 31 -- addons/recoils/cup/762N/g3.hpp | 10 - addons/recoils/cup/762N/galil.hpp | 6 - addons/recoils/cup/762N/gewehr.hpp | 6 - addons/recoils/cup/762N/hk417.hpp | 18 - addons/recoils/cup/762N/l129a1.hpp | 10 - addons/recoils/cup/762N/m110.hpp | 6 - addons/recoils/cup/762N/m14.hpp | 9 - addons/recoils/cup/762N/romat.hpp | 6 - addons/recoils/cup/762N/sa58.hpp | 19 - addons/recoils/cup/762N/scar.hpp | 44 -- addons/recoils/cup/762N/stg.hpp | 6 - addons/recoils/cup/762R/ak.hpp | 114 ------ addons/recoils/cup/762R/ak15.hpp | 19 - addons/recoils/cup/762R/cz.hpp | 15 - addons/recoils/cup/762R/groza.hpp | 14 - addons/recoils/cup/762R/rpk.hpp | 16 - addons/recoils/cup/762_54/svd.hpp | 4 - addons/recoils/cup/config.cpp | 129 +----- addons/recoils/cup/weapons/12G.hpp | 18 + addons/recoils/cup/weapons/545.hpp | 92 +++++ addons/recoils/cup/weapons/556.hpp | 383 ++++++++++++++++++ .../cup/{68/acr.hpp => weapons/68.hpp} | 20 +- addons/recoils/cup/weapons/762N.hpp | 217 ++++++++++ addons/recoils/cup/weapons/762R.hpp | 138 +++++++ addons/recoils/cup/weapons/baseclasses.hpp | 49 +++ addons/recoils/niarms/556/acr.hpp | 33 -- addons/recoils/niarms/556/aug.hpp | 11 - addons/recoils/niarms/556/m4.hpp | 39 -- addons/recoils/niarms/556/sig.hpp | 41 -- addons/recoils/niarms/762R/sig.hpp | 18 - addons/recoils/niarms/blackout/ar15.hpp | 11 - .../recoils/niarms/blackout/honeybadger.hpp | 4 - addons/recoils/niarms/config.cpp | 32 +- addons/recoils/niarms/weapons/556.hpp | 148 +++++++ .../niarms/{68/acr.hpp => weapons/68.hpp} | 27 +- addons/recoils/niarms/weapons/762N.hpp | 7 + addons/recoils/niarms/weapons/762R.hpp | 13 + addons/recoils/niarms/weapons/baseclasses.hpp | 14 + addons/recoils/pi/300WM/falkor.hpp | 15 - addons/recoils/pi/762R/rk.hpp | 7 - addons/recoils/pi/config.cpp | 23 +- addons/recoils/recoils/12G.hpp | 25 -- addons/recoils/recoils/300wm.hpp | 7 - addons/recoils/recoils/338.hpp | 7 - addons/recoils/recoils/545.hpp | 41 -- addons/recoils/recoils/556.hpp | 70 ---- addons/recoils/recoils/65.hpp | 65 --- addons/recoils/recoils/68.hpp | 20 - addons/recoils/recoils/762N.hpp | 38 -- addons/recoils/recoils/762R.hpp | 38 -- addons/recoils/recoils/blackout.hpp | 20 - addons/recoils/ws/556/velko.hpp | 13 - addons/recoils/ws/556/xms.hpp | 14 - addons/recoils/ws/762N/slr.hpp | 11 - addons/recoils/ws/762R/galat.hpp | 4 - addons/recoils/ws/config.cpp | 45 -- addons/recoils/ws/script_component.hpp | 4 - addons/weapons/CfgRecoils.hpp | 15 +- addons/weapons/CfgWeapons.hpp | 2 +- 107 files changed, 1805 insertions(+), 2089 deletions(-) rename addons/recoils/{ws/12G/aa40.hpp => bohemia/12G.hpp} (53%) create mode 100644 addons/recoils/bohemia/338.hpp delete mode 100644 addons/recoils/bohemia/338/mar10.hpp create mode 100644 addons/recoils/bohemia/545.hpp delete mode 100644 addons/recoils/bohemia/545/ak.hpp create mode 100644 addons/recoils/bohemia/556.hpp delete mode 100644 addons/recoils/bohemia/556/f2000.hpp delete mode 100644 addons/recoils/bohemia/556/hk416.hpp delete mode 100644 addons/recoils/bohemia/556/tar21.hpp create mode 100644 addons/recoils/bohemia/65.hpp delete mode 100644 addons/recoils/bohemia/65/katiba.hpp delete mode 100644 addons/recoils/bohemia/65/msbs.hpp delete mode 100644 addons/recoils/bohemia/65/mx.hpp delete mode 100644 addons/recoils/bohemia/65/qbu.hpp delete mode 100644 addons/recoils/bohemia/65/type115.hpp create mode 100644 addons/recoils/bohemia/762N.hpp delete mode 100644 addons/recoils/bohemia/762N/ebr.hpp delete mode 100644 addons/recoils/bohemia/762N/hk417.hpp delete mode 100644 addons/recoils/bohemia/762N/m14.hpp delete mode 100644 addons/recoils/bohemia/762N/sig.hpp rename addons/recoils/bohemia/{762R/ak.hpp => 762R.hpp} (50%) rename addons/recoils/{ => bohemia}/baseclasses.hpp (79%) delete mode 100644 addons/recoils/cup/12G/m1014.hpp delete mode 100644 addons/recoils/cup/12G/saiga12.hpp delete mode 100644 addons/recoils/cup/545/ak.hpp delete mode 100644 addons/recoils/cup/545/ak12.hpp delete mode 100644 addons/recoils/cup/556/acr.hpp delete mode 100644 addons/recoils/cup/556/ak.hpp delete mode 100644 addons/recoils/cup/556/ak19.hpp delete mode 100644 addons/recoils/cup/556/aug.hpp delete mode 100644 addons/recoils/cup/556/cz.hpp delete mode 100644 addons/recoils/cup/556/famas.hpp delete mode 100644 addons/recoils/cup/556/fort.hpp delete mode 100644 addons/recoils/cup/556/g36.hpp delete mode 100644 addons/recoils/cup/556/galil.hpp delete mode 100644 addons/recoils/cup/556/hk416.hpp delete mode 100644 addons/recoils/cup/556/l85.hpp delete mode 100644 addons/recoils/cup/556/m16.hpp delete mode 100644 addons/recoils/cup/556/m27.hpp delete mode 100644 addons/recoils/cup/556/m4.hpp delete mode 100644 addons/recoils/cup/556/mg36.hpp delete mode 100644 addons/recoils/cup/556/mk12.hpp delete mode 100644 addons/recoils/cup/556/mk18.hpp delete mode 100644 addons/recoils/cup/556/scar.hpp delete mode 100644 addons/recoils/cup/762N/fal.hpp delete mode 100644 addons/recoils/cup/762N/g3.hpp delete mode 100644 addons/recoils/cup/762N/galil.hpp delete mode 100644 addons/recoils/cup/762N/gewehr.hpp delete mode 100644 addons/recoils/cup/762N/hk417.hpp delete mode 100644 addons/recoils/cup/762N/l129a1.hpp delete mode 100644 addons/recoils/cup/762N/m110.hpp delete mode 100644 addons/recoils/cup/762N/m14.hpp delete mode 100644 addons/recoils/cup/762N/romat.hpp delete mode 100644 addons/recoils/cup/762N/sa58.hpp delete mode 100644 addons/recoils/cup/762N/scar.hpp delete mode 100644 addons/recoils/cup/762N/stg.hpp delete mode 100644 addons/recoils/cup/762R/ak.hpp delete mode 100644 addons/recoils/cup/762R/ak15.hpp delete mode 100644 addons/recoils/cup/762R/cz.hpp delete mode 100644 addons/recoils/cup/762R/groza.hpp delete mode 100644 addons/recoils/cup/762R/rpk.hpp delete mode 100644 addons/recoils/cup/762_54/svd.hpp create mode 100644 addons/recoils/cup/weapons/12G.hpp create mode 100644 addons/recoils/cup/weapons/545.hpp create mode 100644 addons/recoils/cup/weapons/556.hpp rename addons/recoils/cup/{68/acr.hpp => weapons/68.hpp} (51%) create mode 100644 addons/recoils/cup/weapons/762N.hpp create mode 100644 addons/recoils/cup/weapons/762R.hpp create mode 100644 addons/recoils/cup/weapons/baseclasses.hpp delete mode 100644 addons/recoils/niarms/556/acr.hpp delete mode 100644 addons/recoils/niarms/556/aug.hpp delete mode 100644 addons/recoils/niarms/556/m4.hpp delete mode 100644 addons/recoils/niarms/556/sig.hpp delete mode 100644 addons/recoils/niarms/762R/sig.hpp delete mode 100644 addons/recoils/niarms/blackout/ar15.hpp delete mode 100644 addons/recoils/niarms/blackout/honeybadger.hpp create mode 100644 addons/recoils/niarms/weapons/556.hpp rename addons/recoils/niarms/{68/acr.hpp => weapons/68.hpp} (51%) create mode 100644 addons/recoils/niarms/weapons/762N.hpp create mode 100644 addons/recoils/niarms/weapons/762R.hpp create mode 100644 addons/recoils/niarms/weapons/baseclasses.hpp delete mode 100644 addons/recoils/pi/300WM/falkor.hpp delete mode 100644 addons/recoils/pi/762R/rk.hpp delete mode 100644 addons/recoils/recoils/12G.hpp delete mode 100644 addons/recoils/recoils/300wm.hpp delete mode 100644 addons/recoils/recoils/338.hpp delete mode 100644 addons/recoils/recoils/545.hpp delete mode 100644 addons/recoils/recoils/556.hpp delete mode 100644 addons/recoils/recoils/65.hpp delete mode 100644 addons/recoils/recoils/68.hpp delete mode 100644 addons/recoils/recoils/762N.hpp delete mode 100644 addons/recoils/recoils/762R.hpp delete mode 100644 addons/recoils/recoils/blackout.hpp delete mode 100644 addons/recoils/ws/556/velko.hpp delete mode 100644 addons/recoils/ws/556/xms.hpp delete mode 100644 addons/recoils/ws/762N/slr.hpp delete mode 100644 addons/recoils/ws/762R/galat.hpp delete mode 100644 addons/recoils/ws/config.cpp delete mode 100644 addons/recoils/ws/script_component.hpp diff --git a/addons/recoils/CfgRecoils.hpp b/addons/recoils/CfgRecoils.hpp index cdf104b9..52d5add6 100644 --- a/addons/recoils/CfgRecoils.hpp +++ b/addons/recoils/CfgRecoils.hpp @@ -1,28 +1,331 @@ class CfgRecoils { /* - - Parameter muzzleOuter defines the possible area where the recoil would like to move the weapon's muzzle randomly at each shot. It is defined as ellipse with variables defining the - (x = horizontal axis position, y = vertical axis position, a = horizontal magnitude, b = vertical magnitude); or, translated to the weapon's recoil movement behavior + - Parameter muzzleOuter defines the possible area where the recoil would like to move the weapon's muzzle randomly at each shot. + It is defined as ellipse with variables defining the: + x = horizontal axis position (Kick Right) + y = vertical axis position (Kick Up) + a = horizontal magnitude (Kick Left) + b = vertical magnitude (Kick Up/Down) (how far to the right, how high up, how much horizontal deviation, how much vertical deviation). - Parameter kickBack defines the minimum and maximum of random interval for backward force applied over the arms and torso for each fired shot. - Remaining parameters define how much of the random muzzle displacement within the defined ellipse space is permanent (causing muzzle rise you should compensate for) and how much is temporary - (causing temporal weapon rise up and down, thus causing the weapon to shake in your hands). + - Parameter temporary defines how much shake the weapon has when fired. + - Parameter permanent defines how much your weapon climbs per shot. + + - Recoil Naming: + + Regular Rifles: + Caliber_Long - 16-18" + Caliber_Medium - 14-16" + Caliber_Short - < 14" + + Foregrip or Grenade Launchers: Lessened horizontal recoil. + Caliber_Long_FG + Caliber_Medium_FG + Caliber_Short_FG + + Bullpups: Lessened horizontal recoil, no FG variant, slightly better than FG for rifles. + Caliber_Long_BP + Caliber_Medium_BP + Caliber_Short_BP + + LMGs: Different style of recoil pattern for manageability. + Caliber_Long_MG */ - // Inherit into new classes. - class CLASS(Recoil_Default) { - kickBack[] = {0.03, 0.05}; + // 12G - Operate differently from regular rifles, the barrel is either short or long. + class CLASS(12G_Long) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.25, 0.75, 0.4, 0.4}; + permanent = 0.4; + temporary = 0.025; + }; + class CLASS(12G_Long_FG) { + kickBack[] = {0.018, 0.038}; + muzzleOuter[] = {0.22, 0.7, 0.37, 0.37}; + permanent = 0.35; temporary = 0.02; }; + class CLASS(12G_Short) { + kickBack[] = {0.025, 0.045}; + muzzleOuter[] = {0.28, 0.85, 0.44, 0.44}; + permanent = 0.44; + temporary = 0.03; + }; + class CLASS(12G_Short_FG) { + kickBack[] = {0.023, 0.043}; + muzzleOuter[] = {0.25, 0.8, 0.41, 0.41}; + permanent = 0.39; + temporary = 0.025; + }; - #include "recoils\545.hpp" - #include "recoils\556.hpp" - #include "recoils\65.hpp" - #include "recoils\68.hpp" - #include "recoils\762R.hpp" - #include "recoils\762N.hpp" - #include "recoils\12G.hpp" - #include "recoils\blackout.hpp" - #include "recoils\300wm.hpp" - #include "recoils\338.hpp" + // 6.5 + class CLASS(65_Long) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.25, 0.6, 0.35, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(65_Medium) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.28, 0.64, 0.38, 0.3}; + permanent = 0.15; + temporary = 0.017; + }; + class CLASS(65_Short) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.31, 0.66, 0.41, 0.4}; + permanent = 0.15; + temporary = 0.019; + }; + + class CLASS(65_Long_FG) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.22, 0.55, 0.32, 0.3}; + permanent = 0.15; + temporary = 0.013; + }; + class CLASS(65_Medium_FG) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.24, 0.59, 0.35, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(65_Short_FG) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.26, 0.61, 0.38, 0.4}; + permanent = 0.15; + temporary = 0.017; + }; + + class CLASS(65_Long_BP) { + kickBack[] = {0.015, 0.035}; + muzzleOuter[] = {0.22, 0.6, 0.35, 0.3}; + permanent = 0.15; + temporary = 0.014; + }; + class CLASS(65_Medium_BP) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.24, 0.64, 0.38, 0.4}; + permanent = 0.15; + temporary = 0.016; + }; + + // 300WM + class CLASS(300WM_Long) { + kickBack[] = {0.3, 0.5}; + muzzleOuter[] = {0.46, 0.76, 0.5, 0.5}; + permanent = 0.2; + temporary = 0.02; + }; + + // 338 Lapua + class CLASS(338_Long) { + kickBack[] = {0.33, 0.53}; + muzzleOuter[] = {0.5, 0.82, 0.55, 0.55}; + permanent = 0.22; + temporary = 0.02; + }; + + // 5.45 + class CLASS(545_Long) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.2, 0.45, 0.3, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(545_Medium) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.23, 0.49, 0.36, 0.3}; + permanent = 0.15; + temporary = 0.017; + }; + class CLASS(545_Short) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.26, 0.51, 0.39, 0.4}; + permanent = 0.15; + temporary = 0.019; + }; + + class CLASS(545_Long_FG) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.2, 0.44, 0.33, 0.3}; + permanent = 0.15; + temporary = 0.013; + }; + class CLASS(545_Medium_FG) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.22, 0.48, 0.36, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(545_Short_FG) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.24, 0.5, 0.39, 0.3}; + permanent = 0.15; + temporary = 0.017; + }; + + class CLASS(545_Long_BP) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.18, 0.4, 0.3, 0.3}; + permanent = 0.15; + temporary = 0.013; + }; + class CLASS(545_Short_BP) { + kickBack[] = {0.03, 0.05}; + muzzleOuter[] = {0.22, 0.44, 0.33, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + + // 5.56 + class CLASS(556_Long) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.225, 0.525, 0.325, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(556_Medium) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.255, 0.565, 0.37, 0.3}; + permanent = 0.15; + temporary = 0.017; + }; + class CLASS(556_Short) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.285, 0.585, 0.4, 0.4}; + permanent = 0.15; + temporary = 0.019; + }; + + class CLASS(556_Long_FG) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.21, 0.495, 0.325, 0.3}; + permanent = 0.15; + temporary = 0.013; + }; + class CLASS(556_Medium_FG) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.23, 0.535, 0.355, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(556_Short_FG) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.025, 0.555, 0.385, 0.4}; + permanent = 0.15; + temporary = 0.017; + }; + + class CLASS(556_Long_BP) { + kickBack[] = {0.015, 0.035}; + muzzleOuter[] = {0.22, 0.6, 0.35, 0.3}; + permanent = 0.15; + temporary = 0.014; + }; + class CLASS(556_Medium_BP) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.24, 0.64, 0.38, 0.4}; + permanent = 0.15; + temporary = 0.016; + }; + class CLASS(556_Short_BP) { + kickBack[] = {0.025, 0.045}; + muzzleOuter[] = {0.26, 0.68, 0.41, 0.4}; + permanent = 0.15; + temporary = 0.018; + }; + + class CLASS(556_Long_MG) { + kickBack[] = {0.01, 0.03}; + muzzleOuter[] = {0.15, 0.36, 0.25, 0.25}; + permanent = 0.12; + temporary = 0.01; + }; + + // 7.62 NATO + class CLASS(762N_Long) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.31, 0.7, 0.41, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(762N_Medium) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.34, 0.74, 0.44, 0.3}; + permanent = 0.015; + temporary = 0.017; + }; + class CLASS(762N_Short) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.37, 0.78, 0.47, 0.4}; + permanent = 0.015; + temporary = 0.019; + }; + + class CLASS(762N_Long_FG) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.28, 0.65, 0.38, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(762N_Medium_FG) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.3, 0.69, 0.41, 0.3}; + permanent = 0.15; + temporary = 0.017; + }; + class CLASS(762N_Short_FG) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.32, 0.73, 0.44, 0.4}; + permanent = 0.15; + temporary = 0.019; + }; + + class CLASS(762N_Long_MG) { + kickBack[] = {0.01, 0.03}; + muzzleOuter[] = {0.25, 0.45, 0.35, 0.35}; + permanent = 0.15; + temporary = 0.015; + }; + + // 7.62 Russian + class CLASS(762R_Long) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.28, 0.65, 0.38, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(762R_Medium) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.31, 0.69, 0.41, 0.3}; + permanent = 0.15; + temporary = 0.017; + }; + class CLASS(762R_Short) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.34, 0.73, 0.43, 0.4}; + permanent = 0.15; + temporary = 0.019; + }; + + class CLASS(762R_Long_FG) { + kickBack[] = {0.02, 0.04}; + muzzleOuter[] = {0.25, 0.6, 0.35, 0.3}; + permanent = 0.15; + temporary = 0.013; + }; + class CLASS(762R_Medium_FG) { + kickBack[] = {0.025, 0.05}; + muzzleOuter[] = {0.27, 0.64, 0.38, 0.3}; + permanent = 0.15; + temporary = 0.015; + }; + class CLASS(762R_Short_FG) { + kickBack[] = {0.03, 0.06}; + muzzleOuter[] = {0.29, 0.68, 0.41, 0.4}; + permanent = 0.15; + temporary = 0.017; + }; }; diff --git a/addons/recoils/CfgWeapons.hpp b/addons/recoils/CfgWeapons.hpp index f34b810f..8e16894c 100644 --- a/addons/recoils/CfgWeapons.hpp +++ b/addons/recoils/CfgWeapons.hpp @@ -1,31 +1,10 @@ class CfgWeapons { - // Base classes - #include "baseclasses.hpp" - - // 5.45 - #include "bohemia\545\ak.hpp" - - // 5.56 - #include "bohemia\556\f2000.hpp" - #include "bohemia\556\hk416.hpp" - #include "bohemia\556\tar21.hpp" - - // 6.5 - #include "bohemia\65\katiba.hpp" - #include "bohemia\65\msbs.hpp" - #include "bohemia\65\mx.hpp" - #include "bohemia\65\qbu.hpp" - #include "bohemia\65\type115.hpp" - - // 7.62x39 - #include "bohemia\762R\ak.hpp" - - // 7.62x51 - #include "bohemia\762N\ebr.hpp" - #include "bohemia\762N\hk417.hpp" - #include "bohemia\762N\m14.hpp" - #include "bohemia\762N\sig.hpp" - - // .338 - #include "bohemia\338\mar10.hpp" + #include "bohemia\baseclasses.hpp" + #include "bohemia\12G.hpp" + #include "bohemia\65.hpp" + #include "bohemia\338.hpp" + #include "bohemia\545.hpp" + #include "bohemia\556.hpp" + #include "bohemia\762N.hpp" + #include "bohemia\762R.hpp" }; diff --git a/addons/recoils/ws/12G/aa40.hpp b/addons/recoils/bohemia/12G.hpp similarity index 53% rename from addons/recoils/ws/12G/aa40.hpp rename to addons/recoils/bohemia/12G.hpp index e3b69521..e8eba57c 100644 --- a/addons/recoils/ws/12G/aa40.hpp +++ b/addons/recoils/bohemia/12G.hpp @@ -1,12 +1,12 @@ -// AA40 - No inheriting +// AA40 class sgun_aa40_lxWS: sgun_aa40_base_lxWS { - recoil = QCLASS(12G_LongBarrel); + recoil = QCLASS(12G_Long); }; class sgun_aa40_snake_lxWS: sgun_aa40_base_lxWS { - recoil = QCLASS(12G_LongBarrel); + recoil = QCLASS(12G_Long); }; class sgun_aa40_tan_lxWS: sgun_aa40_base_lxWS { - recoil = QCLASS(12G_LongBarrel); + recoil = QCLASS(12G_Long); }; diff --git a/addons/recoils/bohemia/338.hpp b/addons/recoils/bohemia/338.hpp new file mode 100644 index 00000000..fea86f4b --- /dev/null +++ b/addons/recoils/bohemia/338.hpp @@ -0,0 +1,3 @@ +class srifle_DMR_02_F: DMR_02_base_F { + recoil = QCLASS(338_Long); +}; diff --git a/addons/recoils/bohemia/338/mar10.hpp b/addons/recoils/bohemia/338/mar10.hpp deleted file mode 100644 index 12f16e1b..00000000 --- a/addons/recoils/bohemia/338/mar10.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Noreen ULR Rifles inherit - -// Noreen ULR - Long Barrel -class srifle_DMR_02_F: DMR_02_base_F { - recoil = QCLASS(338_LongBarrel); -}; diff --git a/addons/recoils/bohemia/545.hpp b/addons/recoils/bohemia/545.hpp new file mode 100644 index 00000000..8a474fd9 --- /dev/null +++ b/addons/recoils/bohemia/545.hpp @@ -0,0 +1,33 @@ +// AKS +class arifle_AKS_F: arifle_AKS_base_F { + recoil = QCLASS(545_Short); +}; + +// QBZ (5.8, but may aswell use 5.45 recoil) +class arifle_CTAR_blk_F: arifle_CTAR_base_F { + recoil = QCLASS(545_Long); +}; +class arifle_CTAR_hex_F: arifle_CTAR_base_F { + recoil = QCLASS(545_Long); +}; +class arifle_CTAR_ghex_F: arifle_CTAR_base_F { + recoil = QCLASS(545_Long); +}; +class arifle_CTAR_GL_blk_F: arifle_CTAR_GL_base_F { + recoil = QCLASS(545_Long_FG); +}; +class arifle_CTAR_GL_hex_F: arifle_CTAR_GL_base_F { + recoil = QCLASS(545_Long_FG); +}; +class arifle_CTAR_GL_ghex_F: arifle_CTAR_GL_base_F { + recoil = QCLASS(545_Long_FG); +}; +class arifle_CTARS_blk_F: arifle_CTARS_base_F { + recoil = QCLASS(545_Long); +}; +class arifle_CTARS_hex_F: arifle_CTARS_base_F { + recoil = QCLASS(545_Long); +}; +class arifle_CTARS_ghex_F: arifle_CTARS_base_F { + recoil = QCLASS(545_Long); +}; diff --git a/addons/recoils/bohemia/545/ak.hpp b/addons/recoils/bohemia/545/ak.hpp deleted file mode 100644 index d21705a6..00000000 --- a/addons/recoils/bohemia/545/ak.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// AKS-74u, Only one exists. - -// AKS-74u - Short Barrel -class arifle_AKS_F: arifle_AKS_base_F { - recoil = QCLASS(545_ShortBarrel); -}; diff --git a/addons/recoils/bohemia/556.hpp b/addons/recoils/bohemia/556.hpp new file mode 100644 index 00000000..b70214f2 --- /dev/null +++ b/addons/recoils/bohemia/556.hpp @@ -0,0 +1,81 @@ +// F2000 +class arifle_Mk20_F: mk20_base_F { + recoil = QCLASS(556_Long_BP); +}; +class arifle_Mk20C_F: mk20_base_F { + recoil = QCLASS(556_Long_BP); +}; +class arifle_Mk20_GL_F: mk20_base_F { + recoil = QCLASS(556_Long_BP); +}; + +// HK416 +class arifle_SPAR_01_blk_F: arifle_SPAR_01_base_F { + recoil = QCLASS(556_Short); +}; +class arifle_SPAR_01_khk_F: arifle_SPAR_01_base_F { + recoil = QCLASS(556_Short); +}; +class arifle_SPAR_01_snd_F: arifle_SPAR_01_base_F { + recoil = QCLASS(556_Short); +}; +class arifle_SPAR_01_GL_blk_F: arifle_SPAR_01_GL_base_F { + recoil = QCLASS(556_Short_FG); +}; +class arifle_SPAR_01_GL_khk_F: arifle_SPAR_01_GL_base_F { + recoil = QCLASS(556_Short_FG); +}; +class arifle_SPAR_01_GL_snd_F: arifle_SPAR_01_GL_base_F { + recoil = QCLASS(556_Short_FG); +}; +class arifle_SPAR_02_blk_F: arifle_SPAR_02_base_F { + recoil = QCLASS(556_Medium_FG); +}; +class arifle_SPAR_02_khk_F: arifle_SPAR_02_base_F { + recoil = QCLASS(556_Medium_FG); +}; +class arifle_SPAR_02_snd_F: arifle_SPAR_02_base_F { + recoil = QCLASS(556_Medium_FG); +}; + +// TAR-21 +class arifle_TRG21_F: Tavor_base_F { + recoil = QCLASS(556_Long_BP); +}; +class arifle_TRG21_GL_F: arifle_TRG21_F { + recoil = QCLASS(556_Long_BP); +}; +class arifle_TRG20_F: Tavor_base_F { + recoil = QCLASS(556_Medium_BP); +}; + +// Velko R4/R5 +class arifle_Velko_lxWS: arifle_Velko_base_lxWS { + recoil = QCLASS(556_Long); +}; + +class arifle_VelkoR5_lxWS: arifle_Velko_base_lxWS { + recoil = QCLASS(556_Short); +}; + +class arifle_VelkoR5_GL_lxWS: arifle_VelkoR5_lxWS { + recoil = QCLASS(556_Short_FG); +}; + +// XMS +class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { + recoil = QCLASS(556_Short_BP); +}; + +class arifle_XMS_GL_lxWS: arifle_XMS_Base_lxWS { + recoil = QCLASS(556_Short_FG); +}; + +class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS { + recoil = QCLASS(556_Short_FG); +}; + +// Minimi SPW +class LMG_03_F: LMG_03_base_F { + recoil = QCLASS(556_Long_MG); +}; diff --git a/addons/recoils/bohemia/556/f2000.hpp b/addons/recoils/bohemia/556/f2000.hpp deleted file mode 100644 index c2b1d5f5..00000000 --- a/addons/recoils/bohemia/556/f2000.hpp +++ /dev/null @@ -1,13 +0,0 @@ -// F2000 Rifles - All rifles inherit - -// F2000 - Long Barrel -class arifle_Mk20_F: mk20_base_F { - recoil = QCLASS(556_Bullpup_Long); -}; -class arifle_Mk20C_F: mk20_base_F { - recoil = QCLASS(556_Bullpup_Long); -}; -// GL -class arifle_Mk20_GL_F: mk20_base_F { - recoil = QCLASS(556_Bullpup_GL_Long); -}; diff --git a/addons/recoils/bohemia/556/hk416.hpp b/addons/recoils/bohemia/556/hk416.hpp deleted file mode 100644 index 59b6c313..00000000 --- a/addons/recoils/bohemia/556/hk416.hpp +++ /dev/null @@ -1,33 +0,0 @@ -// HK416 Rifles (APEX) - Rifles don't inherit - -// HK416 - Short Barrel -class arifle_SPAR_01_blk_F: arifle_SPAR_01_base_F { - recoil = QCLASS(556_ShortBarrel); -}; -class arifle_SPAR_01_khk_F: arifle_SPAR_01_base_F { - recoil = QCLASS(556_ShortBarrel); -}; -class arifle_SPAR_01_snd_F: arifle_SPAR_01_base_F { - recoil = QCLASS(556_ShortBarrel); -}; -// GL -class arifle_SPAR_01_GL_blk_F: arifle_SPAR_01_GL_base_F { - recoil = QCLASS(556_GL_Short); -}; -class arifle_SPAR_01_GL_khk_F: arifle_SPAR_01_GL_base_F { - recoil = QCLASS(556_GL_Short); -}; -class arifle_SPAR_01_GL_snd_F: arifle_SPAR_01_GL_base_F { - recoil = QCLASS(556_GL_Short); -}; - -// HK416A5 - Medium Barrel Foregrip -class arifle_SPAR_02_blk_F: arifle_SPAR_02_base_F { - recoil = QCLASS(556_Foregrip_Medium); -}; -class arifle_SPAR_02_khk_F: arifle_SPAR_02_base_F { - recoil = QCLASS(556_Foregrip_Medium); -}; -class arifle_SPAR_02_snd_F: arifle_SPAR_02_base_F { - recoil = QCLASS(556_Foregrip_Medium); -}; diff --git a/addons/recoils/bohemia/556/tar21.hpp b/addons/recoils/bohemia/556/tar21.hpp deleted file mode 100644 index ed22efbb..00000000 --- a/addons/recoils/bohemia/556/tar21.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// Tavor Rifles - All rifles inherit - -// TAR-21 - Long Barrel -class arifle_TRG21_F: Tavor_base_F { - recoil = QCLASS(556_Bullpup_Long); -}; -// GL -class arifle_TRG21_GL_F: arifle_TRG21_F { - recoil = QCLASS(556_Bullpup_GL_Long); -}; - -// CTAR-21 - Medium Barrel -class arifle_TRG20_F: Tavor_base_F { - recoil = QCLASS(556_Bullpup_Medium); -}; diff --git a/addons/recoils/bohemia/65.hpp b/addons/recoils/bohemia/65.hpp new file mode 100644 index 00000000..e9b39d0b --- /dev/null +++ b/addons/recoils/bohemia/65.hpp @@ -0,0 +1,99 @@ +// Katiba +class arifle_Katiba_F: arifle_Katiba_Base_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_Katiba_GL_F: arifle_Katiba_Base_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_Katiba_C_F: arifle_Katiba_Base_F { + recoil = QCLASS(65_Medium_BP); +}; + +// MSBS +class arifle_MSBS65_F: arifle_MSBS65_base_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_black_F: arifle_MSBS65_base_black_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_camo_F: arifle_MSBS65_base_camo_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_sand_F: arifle_MSBS65_base_sand_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_GL_F: arifle_MSBS65_GL_base_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_GL_black_F: arifle_MSBS65_GL_base_black_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_GL_camo_F: arifle_MSBS65_GL_base_camo_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_GL_sand_F: arifle_MSBS65_GL_base_sand_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_UBS_F: arifle_MSBS65_UBS_base_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_UBS_black_F: arifle_MSBS65_UBS_base_black_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_UBS_camo_F: arifle_MSBS65_UBS_base_camo_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_UBS_sand_F: arifle_MSBS65_UBS_base_sand_F { + recoil = QCLASS(65_Medium_BP); +}; +class arifle_MSBS65_Mark_F: arifle_MSBS65_Mark_base_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_MSBS65_Mark_black_F: arifle_MSBS65_Mark_base_black_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_MSBS65_Mark_camo_F: arifle_MSBS65_Mark_base_camo_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_MSBS65_Mark_sand_F: arifle_MSBS65_Mark_base_sand_F { + recoil = QCLASS(65_Long_BP); +}; + +// MX +class arifle_MX_F: arifle_MX_Base_F { + recoil = QCLASS(65_Medium_FG); +}; +class arifle_MX_GL_F: arifle_MX_Base_F { + recoil = QCLASS(65_Medium_FG); +}; +class arifle_MX_SW_F: arifle_MX_Base_F { + recoil = QCLASS(65_Long_FG); +}; +class arifle_MXC_F: arifle_MX_Base_F { + recoil = QCLASS(65_Short_FG); +}; +class arifle_MXM_F: arifle_MX_Base_F { + recoil = QCLASS(65_Long_FG); +}; + +// QBU-88 +class srifle_DMR_07_blk_F: DMR_07_base_F { + recoil = QCLASS(65_Long_BP); +}; +class srifle_DMR_07_ghex_F: DMR_07_base_F { + recoil = QCLASS(65_Long_BP); +}; +class srifle_DMR_07_hex_F: DMR_07_base_F { + recoil = QCLASS(65_Long_BP); +}; + +// Type 115 +class arifle_ARX_blk_F: arifle_ARX_base_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_ARX_ghex_F: arifle_ARX_base_F { + recoil = QCLASS(65_Long_BP); +}; +class arifle_ARX_hex_F: arifle_ARX_base_F { + recoil = QCLASS(65_Long_BP); +}; diff --git a/addons/recoils/bohemia/65/katiba.hpp b/addons/recoils/bohemia/65/katiba.hpp deleted file mode 100644 index ed457b2d..00000000 --- a/addons/recoils/bohemia/65/katiba.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// Katiba Rifles - -// KH2002 - Long Barrel Bullpup -class arifle_Katiba_F: arifle_Katiba_Base_F { - recoil = QCLASS(65_Bullpup_Long); -}; -// GL -class arifle_Katiba_GL_F: arifle_Katiba_Base_F { - recoil = QCLASS(65_Bullpup_GL_Long); -}; - -// KH2002 - Medium Barrel Bullpup -class arifle_Katiba_C_F: arifle_Katiba_Base_F { - recoil = QCLASS(65_Bullpup_Medium); -}; diff --git a/addons/recoils/bohemia/65/msbs.hpp b/addons/recoils/bohemia/65/msbs.hpp deleted file mode 100644 index 7466381b..00000000 --- a/addons/recoils/bohemia/65/msbs.hpp +++ /dev/null @@ -1,55 +0,0 @@ -// MSBS Rifles don't inherit - This is nightmare fuel.. - -// MSBS - Medium Barrel Bullpup Foregrip -class arifle_MSBS65_F: arifle_MSBS65_base_F { - recoil = QCLASS(65_Bullpup_Foregrip_Medium); -}; -class arifle_MSBS65_black_F: arifle_MSBS65_base_black_F { - recoil = QCLASS(65_Bullpup_Foregrip_Medium); -}; -class arifle_MSBS65_camo_F: arifle_MSBS65_base_camo_F { - recoil = QCLASS(65_Bullpup_Foregrip_Medium); -}; -class arifle_MSBS65_sand_F: arifle_MSBS65_base_sand_F { - recoil = QCLASS(65_Bullpup_Foregrip_Medium); -}; -// GL -class arifle_MSBS65_GL_F: arifle_MSBS65_GL_base_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -class arifle_MSBS65_GL_black_F: arifle_MSBS65_GL_base_black_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -class arifle_MSBS65_GL_camo_F: arifle_MSBS65_GL_base_camo_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -class arifle_MSBS65_GL_sand_F: arifle_MSBS65_GL_base_sand_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -// SG -class arifle_MSBS65_UBS_F: arifle_MSBS65_UBS_base_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -class arifle_MSBS65_UBS_black_F: arifle_MSBS65_UBS_base_black_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -class arifle_MSBS65_UBS_camo_F: arifle_MSBS65_UBS_base_camo_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; -class arifle_MSBS65_UBS_sand_F: arifle_MSBS65_UBS_base_sand_F { - recoil = QCLASS(65_Bullpup_GL_Medium); -}; - -// MSBS - Long Barrel Bullpup -class arifle_MSBS65_Mark_F: arifle_MSBS65_Mark_base_F { - recoil = QCLASS(65_Bullpup_Long); -}; -class arifle_MSBS65_Mark_black_F: arifle_MSBS65_Mark_base_black_F { - recoil = QCLASS(65_Bullpup_Long); -}; -class arifle_MSBS65_Mark_camo_F: arifle_MSBS65_Mark_base_camo_F { - recoil = QCLASS(65_Bullpup_Long); -}; -class arifle_MSBS65_Mark_sand_F: arifle_MSBS65_Mark_base_sand_F { - recoil = QCLASS(65_Bullpup_Long); -}; diff --git a/addons/recoils/bohemia/65/mx.hpp b/addons/recoils/bohemia/65/mx.hpp deleted file mode 100644 index aa9b44a6..00000000 --- a/addons/recoils/bohemia/65/mx.hpp +++ /dev/null @@ -1,25 +0,0 @@ -// MX Rifles inherit - -// MX - Medium Barrel Foregrip -class arifle_MX_F: arifle_MX_Base_F { - recoil = QCLASS(65_Foregrip_Medium); -}; -// GL -class arifle_MX_GL_F: arifle_MX_Base_F { - recoil = QCLASS(65_GL_Medium); -}; - -// MX LSW - Long Barrel Foregrip -class arifle_MX_SW_F: arifle_MX_Base_F { - recoil = QCLASS(65_Foregrip_Long); -}; - -// MXC - Short Barrel Foregrip -class arifle_MXC_F: arifle_MX_Base_F { - recoil = QCLASS(65_Foregrip_Short); -}; - -// MXM - Long Barrel Foregrip -class arifle_MXM_F: arifle_MX_Base_F { - recoil = QCLASS(65_Foregrip_Long); -}; diff --git a/addons/recoils/bohemia/65/qbu.hpp b/addons/recoils/bohemia/65/qbu.hpp deleted file mode 100644 index 1b396d01..00000000 --- a/addons/recoils/bohemia/65/qbu.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// QBU Rifles don't inherit - -// QBU-88 - Long Barrel Bullpup -class srifle_DMR_07_blk_F: DMR_07_base_F { - recoil = QCLASS(65_Bullpup_Long); -}; -class srifle_DMR_07_ghex_F: DMR_07_base_F { - recoil = QCLASS(65_Bullpup_Long); -}; -class srifle_DMR_07_hex_F: DMR_07_base_F { - recoil = QCLASS(65_Bullpup_Long); -}; diff --git a/addons/recoils/bohemia/65/type115.hpp b/addons/recoils/bohemia/65/type115.hpp deleted file mode 100644 index 215c3c11..00000000 --- a/addons/recoils/bohemia/65/type115.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// Type 115 Rifles don't inherit - -// Type 115 - Long Barrel Bullpup GL -class arifle_ARX_blk_F: arifle_ARX_base_F { - recoil = QCLASS(65_Bullpup_GL_Long); -}; -class arifle_ARX_ghex_F: arifle_ARX_base_F { - recoil = QCLASS(65_Bullpup_GL_Long); -}; -class arifle_ARX_hex_F: arifle_ARX_base_F { - recoil = QCLASS(65_Bullpup_GL_Long); -}; diff --git a/addons/recoils/bohemia/762N.hpp b/addons/recoils/bohemia/762N.hpp new file mode 100644 index 00000000..a37b8e8b --- /dev/null +++ b/addons/recoils/bohemia/762N.hpp @@ -0,0 +1,71 @@ +// EBR +class srifle_EBR_F: EBR_base_F { + recoil = QCLASS(762N_Long_FG); +}; + +// HK417 +class arifle_SPAR_03_blk_F: arifle_SPAR_03_base_F { + recoil = QCLASS(762N_Long); +}; +class arifle_SPAR_03_khk_F: arifle_SPAR_03_base_F { + recoil = QCLASS(762N_Long); +}; +class arifle_SPAR_03_snd_F: arifle_SPAR_03_base_F { + recoil = QCLASS(762N_Long); +}; + +// M14 +class srifle_DMR_06_camo_F: DMR_06_base_F { + recoil = QCLASS(762N_Long); +}; + +// M14 (classic) +class srifle_DMR_06_hunter_F: DMR_06_hunter_base_F { + recoil = QCLASS(762N_Long); +}; + +// SIG 556 +class srifle_DMR_03_F: DMR_03_base_F { + recoil = QCLASS(762N_Long); +}; + +// SLR +class arifle_SLR_lxWS: DMR_06_base_F { + recoil = QCLASS(762N_Long); +}; + +class arifle_SLR_GL_lxWS: arifle_SLR_lxWS { + recoil = QCLASS(762N_Long); +}; + +class arifle_SLR_V_GL_lxWS: arifle_SLR_V_lxWS { + recoil = QCLASS(762N_Long); +}; + +// Negev +class LMG_Zafir_F: Rifle_Long_Base_F { + recoil = QCLASS(762N_Long_MG); +}; + +// SA-77 +class LMG_S77_lxWS: LMG_S77_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; +class LMG_S77_AAF_lxWS: LMG_S77_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; +class LMG_S77_Desert_lxWS: LMG_S77_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; +class LMG_S77_GHex_lxWS: LMG_S77_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; +class LMG_S77_Hex_lxWS: LMG_S77_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; +class LMG_S77_Compact_lxWS: LMG_S77_Compact_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; +class LMG_S77_Compact_Snakeskin_lxWS: LMG_S77_Compact_base_lxWS { + recoil = QCLASS(762N_Long_MG); +}; diff --git a/addons/recoils/bohemia/762N/ebr.hpp b/addons/recoils/bohemia/762N/ebr.hpp deleted file mode 100644 index ca251974..00000000 --- a/addons/recoils/bohemia/762N/ebr.hpp +++ /dev/null @@ -1,4 +0,0 @@ -// Mk14 Mod 1 EBR - Long Barrel Foregrip -class srifle_EBR_F: EBR_base_F { - recoil = QCLASS(762N_Foregrip_Long); -}; diff --git a/addons/recoils/bohemia/762N/hk417.hpp b/addons/recoils/bohemia/762N/hk417.hpp deleted file mode 100644 index 16e32b79..00000000 --- a/addons/recoils/bohemia/762N/hk417.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// HK417A2 Rifles do not inherit. - -// HK417A2 - Long Barrel -class arifle_SPAR_03_blk_F: arifle_SPAR_03_base_F { - recoil = QCLASS(762N_LongBarrel); -}; -class arifle_SPAR_03_khk_F: arifle_SPAR_03_base_F { - recoil = QCLASS(762N_LongBarrel); -}; -class arifle_SPAR_03_snd_F: arifle_SPAR_03_base_F { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/bohemia/762N/m14.hpp b/addons/recoils/bohemia/762N/m14.hpp deleted file mode 100644 index 5c39418c..00000000 --- a/addons/recoils/bohemia/762N/m14.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// M14 Rifles inherit - -// M14 - Long Barrel -class srifle_DMR_06_camo_F: DMR_06_base_F { - recoil = QCLASS(762N_LongBarrel); -}; - -// M14 (classic) -class srifle_DMR_06_hunter_F: DMR_06_hunter_base_F { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/bohemia/762N/sig.hpp b/addons/recoils/bohemia/762N/sig.hpp deleted file mode 100644 index e2454aed..00000000 --- a/addons/recoils/bohemia/762N/sig.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// SIG 556 Rifles inherit - -// SIG 556 - Long Barrel -class srifle_DMR_03_F: DMR_03_base_F { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/bohemia/762R/ak.hpp b/addons/recoils/bohemia/762R.hpp similarity index 50% rename from addons/recoils/bohemia/762R/ak.hpp rename to addons/recoils/bohemia/762R.hpp index 94060a10..4551e93c 100644 --- a/addons/recoils/bohemia/762R/ak.hpp +++ b/addons/recoils/bohemia/762R.hpp @@ -1,49 +1,51 @@ -// AK Rifles - Don't inherit for some reason. - -// AKM - Medium Barrel +// AKM class arifle_AKM_F: arifle_AKM_base_F { - recoil = QCLASS(762R_MediumBarrel); + recoil = QCLASS(762R_Medium); }; -// AK-15 - Medium Barrel +// AK-15 class arifle_AK12_F: arifle_AK12_base_F { - recoil = QCLASS(762R_MediumBarrel); + recoil = QCLASS(762R_Medium); }; class arifle_AK12_arid_F: arifle_AK12_base_F { - recoil = QCLASS(762R_MediumBarrel); + recoil = QCLASS(762R_Medium); }; class arifle_AK12_lush_F: arifle_AK12_base_F { - recoil = QCLASS(762R_MediumBarrel); + recoil = QCLASS(762R_Medium); }; -// GL class arifle_AK12_GL_F: arifle_AK12_GL_base_F { - recoil = QCLASS(762R_GL_Medium); + recoil = QCLASS(762N_Medium_FG); }; class arifle_AK12_GL_arid_F: arifle_AK12_GL_base_F { - recoil = QCLASS(762R_GL_Medium); + recoil = QCLASS(762N_Medium_FG); }; class arifle_AK12_GL_lush_F: arifle_AK12_GL_base_F { - recoil = QCLASS(762R_GL_Medium); + recoil = QCLASS(762N_Medium_FG); }; -// AK-15K - Short Barrel +// AK-15K class arifle_AK12U_F: arifle_AK12U_base_F { - recoil = QCLASS(762R_ShortBarrel); + recoil = QCLASS(762R_Short); }; class arifle_AK12U_arid_F: arifle_AK12U_base_F { - recoil = QCLASS(762R_ShortBarrel); + recoil = QCLASS(762R_Short); }; class arifle_AK12U_lush_F: arifle_AK12U_base_F { - recoil = QCLASS(762R_ShortBarrel); + recoil = QCLASS(762R_Short); }; -// RPK - Long Barrel +// RPK class arifle_RPK12_F: arifle_RPK12_base_F { - recoil = QCLASS(762R_LongBarrel); + recoil = QCLASS(762R_Long); }; class arifle_RPK12_arid_F: arifle_RPK12_base_F { - recoil = QCLASS(762R_LongBarrel); + recoil = QCLASS(762R_Long); }; class arifle_RPK12_lush_F: arifle_RPK12_base_F { - recoil = QCLASS(762R_LongBarrel); + recoil = QCLASS(762R_Long); +}; + +// Galat +class arifle_Galat_lxWS: arifle_Galat_base_lxWS { + recoil = QCLASS(762R_Long); }; diff --git a/addons/recoils/baseclasses.hpp b/addons/recoils/bohemia/baseclasses.hpp similarity index 79% rename from addons/recoils/baseclasses.hpp rename to addons/recoils/bohemia/baseclasses.hpp index d189d37c..924c1318 100644 --- a/addons/recoils/baseclasses.hpp +++ b/addons/recoils/bohemia/baseclasses.hpp @@ -1,71 +1,51 @@ -// AKs -class arifle_AKS_base_F; -class arifle_AKM_base_F; class arifle_AK12_base_F; class arifle_AK12_GL_base_F; class arifle_AK12U_base_F; -class arifle_RPK12_base_F; - -// F2000s -class mk20_base_F; - -// HK416 -class arifle_SPAR_01_base_F; -class arifle_SPAR_01_GL_base_F; -class arifle_SPAR_02_base_F; - -// HK417 -class arifle_SPAR_03_base_F; - -// Katiba +class arifle_AKM_base_F; +class arifle_AKS_base_F; +class arifle_ARX_base_F; +class arifle_CTAR_base_F; +class arifle_CTAR_GL_base_F; +class arifle_CTARS_base_F; +class arifle_Galat_base_lxWS; class arifle_Katiba_Base_F; - -// M14 -class DMR_06_base_F; -class DMR_06_hunter_base_F; - -// Mk14 Mod 1 EBR -class EBR_base_F; - -// MSBS -class arifle_MSBS65_base_F; class arifle_MSBS65_base_black_F; class arifle_MSBS65_base_camo_F; +class arifle_MSBS65_base_F; class arifle_MSBS65_base_sand_F; -class arifle_MSBS65_GL_base_F; class arifle_MSBS65_GL_base_black_F; class arifle_MSBS65_GL_base_camo_F; +class arifle_MSBS65_GL_base_F; class arifle_MSBS65_GL_base_sand_F; -class arifle_MSBS65_UBS_base_F; -class arifle_MSBS65_UBS_base_black_F; -class arifle_MSBS65_UBS_base_camo_F; -class arifle_MSBS65_UBS_base_sand_F; -class arifle_MSBS65_Mark_base_F; class arifle_MSBS65_Mark_base_black_F; class arifle_MSBS65_Mark_base_camo_F; +class arifle_MSBS65_Mark_base_F; class arifle_MSBS65_Mark_base_sand_F; - -// MX +class arifle_MSBS65_UBS_base_black_F; +class arifle_MSBS65_UBS_base_camo_F; +class arifle_MSBS65_UBS_base_F; +class arifle_MSBS65_UBS_base_sand_F; class arifle_MX_Base_F; - -// Noreen -class DMR_02_base_F; - -// QBU -class DMR_07_base_F; - -// SIG -class DMR_03_base_F; - -// Tar-21s -class Tavor_base_F; - -// Type 115 -class arifle_ARX_base_F; - -// Fort +class arifle_RPK12_base_F; +class arifle_SLR_V_lxWS; +class arifle_SPAR_01_base_F; +class arifle_SPAR_01_base_F; +class arifle_SPAR_01_GL_base_F; +class arifle_SPAR_02_base_F; +class arifle_SPAR_03_base_F; class arifle_TRG20_F; class arifle_TRG21_F; - -// Saiga +class arifle_Velko_base_lxWS; +class DMR_02_base_F; +class DMR_03_base_F; +class DMR_06_base_F; +class DMR_06_hunter_base_F; +class DMR_07_base_F; +class EBR_base_F; +class LMG_03_base_F; +class LMG_S77_base_lxWS; +class LMG_S77_Compact_base_lxWS; +class mk20_base_F; class Rifle_Base_F; +class sgun_aa40_base_lxWS; +class Tavor_base_F; diff --git a/addons/recoils/config.cpp b/addons/recoils/config.cpp index 9dc4885f..d28f92f6 100644 --- a/addons/recoils/config.cpp +++ b/addons/recoils/config.cpp @@ -7,9 +7,7 @@ class CfgPatches { weapons[] = {}; magazines[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = { - "tacgt_main" - }; + requiredAddons[] = {"tacgt_main", "data_f_lxWS_Loadorder"}; author = ECSTRING(main,Author); authors[] = {"Mike"}; url = ECSTRING(main,URL); diff --git a/addons/recoils/cup/12G/m1014.hpp b/addons/recoils/cup/12G/m1014.hpp deleted file mode 100644 index 55b4c880..00000000 --- a/addons/recoils/cup/12G/m1014.hpp +++ /dev/null @@ -1,19 +0,0 @@ -// M1014 Rifles - All others inherit. - -// M1014 - Long Barrel -class CUP_sgun_M1014: CUP_sgun_M1014_base { - recoil = QCLASS(12G_LongBarrel); -}; -// Foregrip -class CUP_sgun_M1014_vfg: CUP_sgun_M1014_base { - recoil = QCLASS(12G_Foregrip_LongBarrel); -}; - -// M1014 - Short Barrel -class CUP_sgun_M1014_Entry: CUP_sgun_M1014_base { - recoil = QCLASS(12G_ShortBarrel); -}; -// Foregrip -class CUP_sgun_M1014_Entry_vfg: CUP_sgun_M1014_Entry { - recoil = QCLASS(12G_Foregrip_ShortBarrel); -}; diff --git a/addons/recoils/cup/12G/saiga12.hpp b/addons/recoils/cup/12G/saiga12.hpp deleted file mode 100644 index 1e3de54f..00000000 --- a/addons/recoils/cup/12G/saiga12.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Saiga 12k - RIS version inherits - -// Saiga12K - Long Barrel -class CUP_sgun_Saiga12K: Rifle_Base_F { - recoil = QCLASS(12G_LongBarrel); -}; diff --git a/addons/recoils/cup/545/ak.hpp b/addons/recoils/cup/545/ak.hpp deleted file mode 100644 index 06a84ba5..00000000 --- a/addons/recoils/cup/545/ak.hpp +++ /dev/null @@ -1,59 +0,0 @@ -// AK Rifles - -// AK-105 - Short Barrel -class CUP_arifle_AK105: CUP_arifle_AK_Base { - recoil = QCLASS(545_ShortBarrel); -}; -// Foregrip -class CUP_arifle_AK105_railed: CUP_arifle_AK105 { - recoil = QCLASS(545_Foregrip_Short); -}; - -// AK-107 - Medium Barrel -class CUP_arifle_AK107: CUP_arifle_AK107_Base { - recoil = QCLASS(545_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AK107_railed: CUP_arifle_AK107 { - recoil = QCLASS(545_Foregrip_Medium); -}; -// GL -class CUP_arifle_AK107_GL: CUP_arifle_AK107_Base { - recoil = QCLASS(545_GL_Medium); -}; - -// AK-74N - Medium Barrel -class CUP_arifle_AK74: CUP_arifle_AK_Base { - recoil = QCLASS(545_MediumBarrel); -}; -// GL -class CUP_arifle_AK74_GL: CUP_arifle_AK_Base { - recoil = QCLASS(545_GL_Medium); -}; - -// AK-74M - Medium Barrel -class CUP_arifle_AK74M: CUP_arifle_AK_Base { - recoil = QCLASS(545_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AK74M_railed: CUP_arifle_AK74M { - recoil = QCLASS(545_Foregrip_Medium); -}; -// GL -class CUP_arifle_AK74M_GL: CUP_arifle_AK_Base { - recoil = QCLASS(545_GL_Medium); -}; - -// AKS-74N - Medium Barrel -class CUP_arifle_AKS74: CUP_arifle_AKS_Base { - recoil = QCLASS(545_MediumBarrel); -}; - -// AKS74U - Short Barrel -class CUP_arifle_AKS74U: CUP_arifle_AKS_Base { - recoil = QCLASS(545_ShortBarrel); -}; -// Foregrip -class CUP_arifle_AKS74U_railed: CUP_arifle_AKS74U { - recoil = QCLASS(545_Foregrip_Short); -}; diff --git a/addons/recoils/cup/545/ak12.hpp b/addons/recoils/cup/545/ak12.hpp deleted file mode 100644 index 61b9c2cf..00000000 --- a/addons/recoils/cup/545/ak12.hpp +++ /dev/null @@ -1,19 +0,0 @@ -// AK-12 Rifles inherit - -// AK-12 - Medium Barrel -class CUP_arifle_AK12_Base: Rifle_Base_F { - recoil = QCLASS(545_MediumBarrel); -}; - -// Foregrip -class CUP_arifle_AK12_AFG_Base: CUP_arifle_AK12_Base { - recoil = QCLASS(545_Foregrip_Medium); -}; -class CUP_arifle_AK12_VG_Base: CUP_arifle_AK12_Base { - recoil = QCLASS(545_Foregrip_Medium); -}; - -// GL -class CUP_arifle_AK12_GP34_Base: CUP_arifle_AK12_Base { - recoil = QCLASS(545_GL_Medium); -}; diff --git a/addons/recoils/cup/556/acr.hpp b/addons/recoils/cup/556/acr.hpp deleted file mode 100644 index ecbbad7d..00000000 --- a/addons/recoils/cup/556/acr.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// All ACR Rifles inherit - -// ACR Rifles - Short -class CUP_arifle_ACRC_blk_556: CUP_arifle_ACR_Short_BASE_556 { - recoil = QCLASS(556_ShortBarrel); -}; -// GL -class CUP_arifle_ACRC_EGLM_blk_556: CUP_arifle_ACR_EGLM_SHORT_BASE_556 { - recoil = QCLASS(556_GL_Short); -}; -// ACR Rifles - Medium -class CUP_arifle_ACR_blk_556: CUP_arifle_ACR_BASE_556 { - recoil = QCLASS(556_MediumBarrel); -}; - -// ACR Rifles - Long -class CUP_arifle_ACR_DMR_blk_556: CUP_arifle_ACR_DMR_BASE_556 { - recoil = QCLASS(556_LongBarrel); -}; -// GL -class CUP_arifle_ACR_EGLM_blk_556: CUP_arifle_ACR_EGLM_BASE_556 { - recoil = QCLASS(556_GL_Medium); -}; diff --git a/addons/recoils/cup/556/ak.hpp b/addons/recoils/cup/556/ak.hpp deleted file mode 100644 index dfa28eb3..00000000 --- a/addons/recoils/cup/556/ak.hpp +++ /dev/null @@ -1,57 +0,0 @@ -// Inheritance doesn't work, AKs inherit from other caliber AKs and i hate it. - -// AK 101 Rifles - Medium variants -class CUP_arifle_AK101: CUP_arifle_AK74M { - recoil = QCLASS(556_MediumBarrel); -}; -class CUP_arifle_AK101_top_rail: CUP_arifle_AK101 { - recoil = QCLASS(556_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AK101_railed: CUP_arifle_AK101 { - recoil = QCLASS(556_Foregrip_Medium); -}; -// GL variants that dont inherit -class CUP_arifle_AK101_GL: CUP_arifle_AK74M_GL { - recoil = QCLASS(556_GL_Medium); -}; -class CUP_arifle_AK101_GL_railed: CUP_arifle_AK101_GL { - recoil = QCLASS(556_GL_Medium); -}; -class CUP_arifle_AK101_GL_top_rail: CUP_arifle_AK101_GL { - recoil = QCLASS(556_GL_Medium); -}; - -// AK 102 Rifles - Short -class CUP_arifle_AK102: CUP_arifle_AK_Base { - recoil = QCLASS(556_ShortBarrel); -}; -class CUP_arifle_AK102_top_rail: CUP_arifle_AK102 { - recoil = QCLASS(556_ShortBarrel); -}; -// Foregrip -class CUP_arifle_AK102_railed: CUP_arifle_AK102 { - recoil = QCLASS(556_Foregrip_Medium); -}; - -// AK 108 Rifles - Medium -class CUP_arifle_AK108: CUP_arifle_AK107 { - recoil = QCLASS(556_MediumBarrel); -}; -class CUP_arifle_AK108_top_rail: CUP_arifle_AK108 { - recoil = QCLASS(556_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AK108_railed: CUP_arifle_AK108 { - recoil = QCLASS(556_Foregrip_Medium); -}; -// GL -class CUP_arifle_AK108_GL: CUP_arifle_AK107_GL { - recoil = QCLASS(556_GL_Medium); -}; -class CUP_arifle_AK108_GL_railed: CUP_arifle_AK108_GL { - recoil = QCLASS(556_GL_Medium); -}; -class CUP_arifle_AK108_GL_top_rail: CUP_arifle_AK108_GL { - recoil = QCLASS(556_GL_Medium); -}; diff --git a/addons/recoils/cup/556/ak19.hpp b/addons/recoils/cup/556/ak19.hpp deleted file mode 100644 index 62e570ec..00000000 --- a/addons/recoils/cup/556/ak19.hpp +++ /dev/null @@ -1,19 +0,0 @@ -// AK-19 Rifles inherit - -// AK-19 - Medium Barrel -class CUP_arifle_AK19_Base: Rifle_Base_F { - recoil = QCLASS(556_MediumBarrel); -}; - -// Foregrip -class CUP_arifle_AK19_AFG_Base: CUP_arifle_AK19_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_AK19_VG_Base: CUP_arifle_AK19_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; - -// GL -class CUP_arifle_AK19_GP34_Base: CUP_arifle_AK19_Base { - recoil = QCLASS(556_GL_Medium); -}; diff --git a/addons/recoils/cup/556/aug.hpp b/addons/recoils/cup/556/aug.hpp deleted file mode 100644 index 0d20713b..00000000 --- a/addons/recoils/cup/556/aug.hpp +++ /dev/null @@ -1,4 +0,0 @@ -// AUG A1 - Long Barrel -class CUP_arifle_AUG_A1: CUP_arifle_AUG_Base { - recoil = QCLASS(556_Bullpup_Long); -}; diff --git a/addons/recoils/cup/556/cz.hpp b/addons/recoils/cup/556/cz.hpp deleted file mode 100644 index c3246433..00000000 --- a/addons/recoils/cup/556/cz.hpp +++ /dev/null @@ -1,37 +0,0 @@ -// All CZ Rifles inherit. - -// CZ 805 A1 Rifles - Medium -class CUP_arifle_CZ805_A1: CUP_arifle_CZ805_Base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class CUP_arifle_CZ805_GL: CUP_arifle_CZ805_Base { - recoil = QCLASS(556_GL_Medium); -}; - -// CZ 805 A2 Rifles - Medium -class CUP_arifle_CZ805_A2: CUP_arifle_CZ805_Base { - recoil = QCLASS(556_MediumBarrel); -}; - -// CZ BREN 2 Rifles - Short -class CUP_CZ_BREN2_556_11: CUP_CZ_BREN2_Base { - recoil = QCLASS(556_ShortBarrel); -}; -class CUP_CZ_BREN2_556_8: CUP_CZ_BREN2_Base { - recoil = QCLASS(556_ShortBarrel); -}; -// GL -class CUP_CZ_BREN2_556_11_GL: CUP_CZ_BREN2_GL_Base { - recoil = QCLASS(556_GL_Short); -}; - - -// CZ BREN 2 Rifles - Medium -class CUP_CZ_BREN2_556_14: CUP_CZ_BREN2_Base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class CUP_CZ_BREN2_556_14_GL: CUP_CZ_BREN2_GL_Base { - recoil = QCLASS(556_GL_Medium); -}; diff --git a/addons/recoils/cup/556/famas.hpp b/addons/recoils/cup/556/famas.hpp deleted file mode 100644 index dfdba3b8..00000000 --- a/addons/recoils/cup/556/famas.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// All FAMAS rifles inherit - -// FAMAS F1 - Long variants -class CUP_Famas_F1: CUP_Famas_Base { - recoil = QCLASS(556_Bullpup_Long); -}; -class CUP_Famas_F1_Rail: CUP_Famas_Base { - recoil = QCLASS(556_Bullpup_Long); -}; diff --git a/addons/recoils/cup/556/fort.hpp b/addons/recoils/cup/556/fort.hpp deleted file mode 100644 index 5a4acfa8..00000000 --- a/addons/recoils/cup/556/fort.hpp +++ /dev/null @@ -1,29 +0,0 @@ -// Fort Rifles / X95s (TAVORs) - -// Fort 221 - Short Bullpup -class CUP_arifle_Fort221: arifle_TRG20_F { - recoil = QCLASS(556_Bullpup_Short); -}; - -class CUP_arifle_X95: Tavor_base_F { - recoil = QCLASS(556_Bullpup_Short); -}; - -// Foregrip -class CUP_arifle_X95_Grippod: CUP_arifle_X95 { - recoil = QCLASS(556_Bullpup_Foregrip_Short); -}; - -// Fort 222 - Long Barrel -class CUP_arifle_Fort222: arifle_TRG21_F { - recoil = QCLASS(556_Bullpup_Long); -}; - -// Fort 224 - Short Barrel -class CUP_arifle_Fort224: CUP_arifle_X95 { - recoil = QCLASS(556_Bullpup_Short); -}; -// Foregrip -class CUP_arifle_Fort224_Grippod: CUP_arifle_X95_Grippod { - recoil = QCLASS(556_Bullpup_Foregrip_Short); -}; diff --git a/addons/recoils/cup/556/g36.hpp b/addons/recoils/cup/556/g36.hpp deleted file mode 100644 index 3f51e9cf..00000000 --- a/addons/recoils/cup/556/g36.hpp +++ /dev/null @@ -1,84 +0,0 @@ -// G36 Rifles Inherit - -// G36 Variants - Long Barrel -class CUP_arifle_G36A: CUP_arifle_G36_Base_CarryhandleOptics { - recoil = QCLASS(556_LongBarrel); -}; -// Foregrip -class CUP_arifle_G36A_RIS: CUP_arifle_G36_Base { - recoil = QCLASS(556_Foregrip_Long); -}; -// GL -class CUP_arifle_AG36: CUP_arifle_G36A { - recoil = QCLASS(556_GL_Long); -}; -class CUP_arifle_G36A_AG36_RIS: CUP_arifle_G36A_RIS { - recoil = QCLASS(556_GL_Long); -}; - -// G36A3 Variants - Long Barrel -class CUP_arifle_G36A3: CUP_arifle_G36A_RIS { - recoil = QCLASS(556_LongBarrel); -}; -// Foregrip -class CUP_arifle_G36A3_grip: CUP_arifle_G36A3 { - recoil = QCLASS(556_Foregrip_Long); -}; -// GL -class CUP_arifle_G36A3_AG36: CUP_arifle_G36A3 { - recoil = QCLASS(556_GL_Long); -}; - -// G36C Variants - Short Barrel -class CUP_arifle_G36C: CUP_arifle_G36_Base { - recoil = QCLASS(556_ShortBarrel); -}; -// Foregrip -class CUP_arifle_G36C_VFG: CUP_arifle_G36C { - recoil = QCLASS(556_Foregrip_Short); -}; - -// G36CA3 Variants - Short Barrel -class CUP_arifle_G36CA3: CUP_arifle_G36C { - recoil = QCLASS(556_ShortBarrel); -}; -// Foregrip -class CUP_arifle_G36CA3_grip: CUP_arifle_G36CA3 { - recoil = QCLASS(556_Foregrip_Short); -}; - -// G36E - Long Barrel -class CUP_arifle_G36E: CUP_arifle_G36_Base_CarryhandleOptics { - recoil = QCLASS(556_LongBarrel); -}; - -// G36K - Short Barrel -class CUP_arifle_G36K: CUP_arifle_G36_Base_CarryhandleOptics { - recoil = QCLASS(556_ShortBarrel); -}; -class CUP_arifle_G36K_RIS: CUP_arifle_G36_Base { - recoil = QCLASS(556_ShortBarrel); -}; -class CUP_arifle_G36K_KSK: CUP_arifle_G36K_RIS { - recoil = QCLASS(556_ShortBarrel); -}; -// Foregrip -class CUP_arifle_G36K_VFG: CUP_arifle_G36K { - recoil = QCLASS(556_Foregrip_Short); -}; -class CUP_arifle_G36K_KSK_VFG: CUP_arifle_G36K_KSK { - recoil = QCLASS(556_Foregrip_Short); -}; -// GL -class CUP_arifle_G36K_AG36: CUP_arifle_G36K { - recoil = QCLASS(556_GL_Short); -}; - -// G36KA3 - Short Barrel -class CUP_arifle_G36KA3: CUP_arifle_G36K_RIS { - recoil = QCLASS(556_ShortBarrel); -}; -// Foregrip -class CUP_arifle_G36KA3_grip: CUP_arifle_G36KA3 { - recoil = QCLASS(556_Foregrip_Short); -}; diff --git a/addons/recoils/cup/556/galil.hpp b/addons/recoils/cup/556/galil.hpp deleted file mode 100644 index 026c8a67..00000000 --- a/addons/recoils/cup/556/galil.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// No need for inheritance, only 2 rifles. - -// Galil - Long Barrel -class CUP_arifle_Galil_556_black: CUP_arifle_GALIL_BASE { - recoil = QCLASS(556_LongBarrel); -}; - -// Galil - Short Barrel -class CUP_arifle_Galil_SAR_black: CUP_arifle_GALIL_BASE { - recoil = QCLASS(556_ShortBarrel); -}; diff --git a/addons/recoils/cup/556/hk416.hpp b/addons/recoils/cup/556/hk416.hpp deleted file mode 100644 index e1f38a68..00000000 --- a/addons/recoils/cup/556/hk416.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// All HK Rifles inherit - All versions bar GL have foregrips - -// HK416 - Medium Barrel -class CUP_arifle_HK416_Black: CUP_arifle_HK416_145_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; -// GL -class CUP_arifle_HK416_M203_Black: CUP_arifle_HK416_Black { - recoil = QCLASS(556_GL_Medium); -}; - -// HK416 - Short Barrel -class CUP_arifle_HK416_CQB_Black: CUP_arifle_HK416_11_Base { - recoil = QCLASS(556_Foregrip_Short); -}; -// GL -class CUP_arifle_HK416_CQB_M203_Black: CUP_arifle_HK416_CQB_Black { - recoil = QCLASS(556_GL_Short); -}; - diff --git a/addons/recoils/cup/556/l85.hpp b/addons/recoils/cup/556/l85.hpp deleted file mode 100644 index 5ecd3cfc..00000000 --- a/addons/recoils/cup/556/l85.hpp +++ /dev/null @@ -1,22 +0,0 @@ -// L85s do not inherit from eachother. - -// L85 - Long Barrel -class CUP_arifle_L85A2: CUP_l85a2 { - recoil = QCLASS(556_Bullpup_Long); -}; -class CUP_arifle_L85A2_NG: CUP_l85a2_ris_ng { - recoil = QCLASS(556_Bullpup_Long); -}; -// Foregrip -class CUP_arifle_L85A2_G: CUP_l85a2_ris { - recoil = QCLASS(556_Bullpup_Foregrip_Long); -}; -// GL -class CUP_arifle_L85A2_GL: CUP_l85a2_ugl { - recoil = QCLASS(556_Bullpup_GL_Long); -}; - -// L86A2 - Long Barrel -class CUP_arifle_L86A2: CUP_l85a2 { - recoil = QCLASS(556_Bullpup_Long); -}; diff --git a/addons/recoils/cup/556/m16.hpp b/addons/recoils/cup/556/m16.hpp deleted file mode 100644 index 618ed1d8..00000000 --- a/addons/recoils/cup/556/m16.hpp +++ /dev/null @@ -1,46 +0,0 @@ -// M16 Rifles inherit - -// M16A1 - Long Barrel -class CUP_arifle_M16A1: CUP_arifle_XM16E1 { - recoil = QCLASS(556_LongBarrel); -}; -// GL -class CUP_arifle_M16A1GL: CUP_arifle_XM16E1 { - recoil = QCLASS(556_GL_Long); -}; - -// M16A1E1 - Long Barrel -class CUP_arifle_M16A1E1: CUP_arifle_XM16E1 { - recoil = QCLASS(556_LongBarrel); -}; -// GL -class CUP_arifle_M16A1E1GL: CUP_arifle_M16A1GL { - recoil = QCLASS(556_GL_Long); -}; - -// M16A2 - Long Barrel -class CUP_arifle_M16A2: CUP_arifle_M16_Base { - recoil = QCLASS(556_LongBarrel); -}; - -// M16A2 Carbine - Medium Barrel -class CUP_arifle_Colt727: CUP_arifle_M16_Base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class CUP_arifle_M16A2_GL: CUP_arifle_M16_Base { - recoil = QCLASS(556_GL_Medium); -}; - -// M16A4 - Long Barrel -class CUP_arifle_M16A4_Base: CUP_arifle_M16_Base { - recoil = QCLASS(556_LongBarrel); -}; -// Foregrip -class CUP_arifle_M16A4_Grip: CUP_arifle_M16A4_Base { - recoil = QCLASS(556_Foregrip_Long); -}; -// GL -class CUP_arifle_M16A4_GL: CUP_arifle_M16_Base { - recoil = QCLASS(556_GL_Long); -}; diff --git a/addons/recoils/cup/556/m27.hpp b/addons/recoils/cup/556/m27.hpp deleted file mode 100644 index 746f9fff..00000000 --- a/addons/recoils/cup/556/m27.hpp +++ /dev/null @@ -1,14 +0,0 @@ -// M27 Rifles, only 3 exist so no need for inheritance - -// M27 - Medium Barrel -class CUP_arifle_HK_M27: CUP_arifle_HK416_Black { - recoil = QCLASS(556_MediumBarrel); -}; -// Foregrip -class CUP_arifle_HK_M27_VFG: CUP_arifle_HK_M27 { - recoil = QCLASS(556_Foregrip_Medium); -}; -// GL -class CUP_arifle_HK_M27_AG36: CUP_arifle_HK416_Black { - recoil = QCLASS(556_GL_Medium); -}; diff --git a/addons/recoils/cup/556/m4.hpp b/addons/recoils/cup/556/m4.hpp deleted file mode 100644 index e050c2fe..00000000 --- a/addons/recoils/cup/556/m4.hpp +++ /dev/null @@ -1,46 +0,0 @@ -// M4 Rifles - All rifles inherit (M4A1, M4 SBR & M4 SOPMOD) - -// M4 SBR - Medium Barrel (Foregrip) -class CUP_arifle_SBR_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; - -// M4A1 - Medium Barrel -class CUP_arifle_M4A1_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_MediumBarrel); -}; -class CUP_arifle_M4A1: CUP_arifle_M4_Base { - recoil = QCLASS(556_MediumBarrel); -}; -// Foregrip -class CUP_arifle_M4A3_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_M4A1_MOE_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_M4A1_standard_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_M4A1_SOMMOD_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_M4A1_SOMMOD_Grip_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Medium); -}; - -// GL -class CUP_arifle_M4A1_BUIS_GL: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_GL_Medium); -}; -class CUP_arifle_M4A1_GL_carryhandle: CUP_arifle_M4A1 { - recoil = QCLASS(556_GL_Medium); -}; - -// M4A1 - Short Barrel (Foregrip) -class CUP_arifle_M4A1_MOE_short_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Short); -}; -class CUP_arifle_M4A1_standard_short_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_Foregrip_Short); -}; diff --git a/addons/recoils/cup/556/mg36.hpp b/addons/recoils/cup/556/mg36.hpp deleted file mode 100644 index 04b99312..00000000 --- a/addons/recoils/cup/556/mg36.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// MG36 Rifles inherit - -// MG36 - Long Barrel -class CUP_arifle_MG36: CUP_arifle_G36_Base { - recoil = QCLASS(556_LongBarrel); -}; diff --git a/addons/recoils/cup/556/mk12.hpp b/addons/recoils/cup/556/mk12.hpp deleted file mode 100644 index a99a2756..00000000 --- a/addons/recoils/cup/556/mk12.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// MK12 SPR - Only 1 rifle. - -// MK12 SPR - Long Barrel -class CUP_srifle_Mk12SPR: CUP_arifle_M4_Base { - recoil = QCLASS(556_LongBarrel); -}; diff --git a/addons/recoils/cup/556/mk18.hpp b/addons/recoils/cup/556/mk18.hpp deleted file mode 100644 index ba56d480..00000000 --- a/addons/recoils/cup/556/mk18.hpp +++ /dev/null @@ -1,8 +0,0 @@ -// MK18 Rifle - Medium -class CUP_arifle_mk18_black: CUP_arifle_M4A1_BUIS_Base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class CUP_arifle_mk18_m203_black: CUP_arifle_mk18_black { - recoil = QCLASS(556_GL_Medium); -}; diff --git a/addons/recoils/cup/556/scar.hpp b/addons/recoils/cup/556/scar.hpp deleted file mode 100644 index 3d133c1c..00000000 --- a/addons/recoils/cup/556/scar.hpp +++ /dev/null @@ -1,41 +0,0 @@ -// SCAR-L Rifles - All rifles inherit - -// SCAR-L - Long Barrel -class CUP_arifle_Mk16_SV: CUP_arifle_SCAR_L_Base { - recoil = QCLASS(556_LongBarrel); -}; - -// SCAR-L - Medium Barrel -class CUP_arifle_Mk16_STD: CUP_arifle_SCAR_L_Base { - recoil = QCLASS(556_MediumBarrel); -}; -// Foregrip -class CUP_arifle_Mk16_STD_FG: CUP_arifle_Mk16_STD { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_Mk16_STD_SFG: CUP_arifle_Mk16_STD { - recoil = QCLASS(556_Foregrip_Medium); -}; -class CUP_arifle_Mk16_STD_AFG: CUP_arifle_Mk16_STD_FG { - recoil = QCLASS(556_Foregrip_Medium); -}; -// GL -class CUP_arifle_Mk16_STD_EGLM: CUP_arifle_Mk16_STD { - recoil = QCLASS(556_GL_Medium); -}; - -// SCAR-L - Short Barrel -class CUP_arifle_Mk16_CQC: CUP_arifle_SCAR_L_Base { - recoil = QCLASS(556_ShortBarrel); -}; -// Foregrip -class CUP_arifle_Mk16_CQC_FG: CUP_arifle_Mk16_CQC { - recoil = QCLASS(556_Foregrip_Short); -}; -class CUP_arifle_Mk16_CQC_SFG: CUP_arifle_Mk16_CQC { - recoil = QCLASS(556_Foregrip_Short); -}; -// GL -class CUP_arifle_Mk16_CQC_EGLM: CUP_arifle_Mk16_CQC { - recoil = QCLASS(556_GL_Short); -}; diff --git a/addons/recoils/cup/762N/fal.hpp b/addons/recoils/cup/762N/fal.hpp deleted file mode 100644 index f228df7e..00000000 --- a/addons/recoils/cup/762N/fal.hpp +++ /dev/null @@ -1,31 +0,0 @@ -// FAL Rifles inherit - -// FAL 50.63 - Long Barrel -class CUP_arifle_FNFAL: Rifle_Base_F { - recoil = QCLASS(762N_LongBarrel); -}; - -// FAL 50.62 - Long Barrel -class CUP_arifle_FNFAL5062: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; - -// FAL 50.61 - Long Barrel -class CUP_arifle_FNFAL5061: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; - -// FAL 50.00 - Long Barrel -class CUP_arifle_FNFAL5060: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; - -// FAL G - Long Barrel -class CUP_arifle_FNFAL5061_wooden: CUP_arifle_FNFAL5060 { - recoil = QCLASS(762N_LongBarrel); -}; - -// FAL OSW - Short Barrel -class CUP_arifle_FNFAL_OSW: CUP_arifle_FNFAL { - recoil = QCLASS(762N_ShortBarrel); -}; diff --git a/addons/recoils/cup/762N/g3.hpp b/addons/recoils/cup/762N/g3.hpp deleted file mode 100644 index 1737ca30..00000000 --- a/addons/recoils/cup/762N/g3.hpp +++ /dev/null @@ -1,10 +0,0 @@ -// G3 Rifles inherit - -// G3A3 - Long Barrel -class CUP_arifle_G3A3_ris: CUP_arifle_G3_Base { - recoil = QCLASS(762N_LongBarrel); -}; -// Foregrip -class CUP_arifle_G3A3_ris_vfg: CUP_arifle_G3_Base { - recoil = QCLASS(762N_Foregrip_Long); -}; diff --git a/addons/recoils/cup/762N/galil.hpp b/addons/recoils/cup/762N/galil.hpp deleted file mode 100644 index 93ac7209..00000000 --- a/addons/recoils/cup/762N/galil.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Only one rifle. - -// Galil - Long Barrel -class CUP_arifle_Galil_black: CUP_arifle_GALIL_BASE { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762N/gewehr.hpp b/addons/recoils/cup/762N/gewehr.hpp deleted file mode 100644 index e6d7da4b..00000000 --- a/addons/recoils/cup/762N/gewehr.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// G1 Rifles inherit - -// G1 - Long Barrel -class CUP_arifle_Gewehr1: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762N/hk417.hpp b/addons/recoils/cup/762N/hk417.hpp deleted file mode 100644 index 11adadb4..00000000 --- a/addons/recoils/cup/762N/hk417.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// HK417 Rifles inherit - -// HK417 - Long Barrel -class CUP_arifle_HK417_20: CUP_arifle_HK417_Base { - recoil = QCLASS(762N_LongBarrel); -}; - -// HK417 CQC - Short Barrel -class CUP_arifle_HK417_12: CUP_arifle_HK417_20 { - recoil = QCLASS(762N_Foregrip_Short); -}; -// GL -class CUP_arifle_HK417_12_M203: CUP_arifle_HK417_12 { - recoil = QCLASS(762N_GL_Short); -}; -class CUP_arifle_HK417_12_AG36: CUP_arifle_HK417_12 { - recoil = QCLASS(762N_GL_Short); -}; diff --git a/addons/recoils/cup/762N/l129a1.hpp b/addons/recoils/cup/762N/l129a1.hpp deleted file mode 100644 index b1435436..00000000 --- a/addons/recoils/cup/762N/l129a1.hpp +++ /dev/null @@ -1,10 +0,0 @@ -// L129A1 Rifles inherit - -// L129A1 - Long Barrel -class CUP_srifle_L129A1: Rifle_Base_F { - recoil = QCLASS(762N_LongBarrel); -}; -// Foregrip -class CUP_srifle_L129A1_HG: CUP_srifle_L129A1 { - recoil = QCLASS(762N_Foregrip_Long); -}; diff --git a/addons/recoils/cup/762N/m110.hpp b/addons/recoils/cup/762N/m110.hpp deleted file mode 100644 index 2051b5a1..00000000 --- a/addons/recoils/cup/762N/m110.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// M110 Rifles inherit - -// M110 - Long Barrel -class CUP_srifle_M110: Rifle_Base_F { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762N/m14.hpp b/addons/recoils/cup/762N/m14.hpp deleted file mode 100644 index c361de3f..00000000 --- a/addons/recoils/cup/762N/m14.hpp +++ /dev/null @@ -1,9 +0,0 @@ -// M14 Rifles don't inherit - -// M14 -class CUP_srifle_M14: Rifle_Base_F { - recoil = QCLASS(762N_LongBarrel); -}; -class CUP_srifle_M14_DMR: Rifle_Base_F { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762N/romat.hpp b/addons/recoils/cup/762N/romat.hpp deleted file mode 100644 index 62b9175b..00000000 --- a/addons/recoils/cup/762N/romat.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// Romat rifles inherit - -// Romat - Long Barrel -class CUP_arifle_IMI_Romat: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762N/sa58.hpp b/addons/recoils/cup/762N/sa58.hpp deleted file mode 100644 index 86b341af..00000000 --- a/addons/recoils/cup/762N/sa58.hpp +++ /dev/null @@ -1,19 +0,0 @@ -// SA58 Rifles inherit - -// SA58 - Long Barrel -class CUP_arifle_DSA_SA58: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; - -// SA58 OSW - Short Barrel -class CUP_arifle_DSA_SA58_OSW: CUP_arifle_DSA_SA58 { - recoil = QCLASS(762N_ShortBarrel); -}; -// Foregrip -class CUP_arifle_DSA_SA58_OSW_VFG: CUP_arifle_DSA_SA58_OSW { - recoil = QCLASS(762N_Foregrip_Short); -}; -// GL -class CUP_arifle_DSA_SA58_OSW_M203: CUP_arifle_DSA_SA58_OSW { - recoil = QCLASS(762N_GL_Short); -}; diff --git a/addons/recoils/cup/762N/scar.hpp b/addons/recoils/cup/762N/scar.hpp deleted file mode 100644 index 762da477..00000000 --- a/addons/recoils/cup/762N/scar.hpp +++ /dev/null @@ -1,44 +0,0 @@ -// SCAR Rifles inherit - -// SCAR-H - Long Barrel -class CUP_arifle_Mk17_STD: CUP_arifle_Mk17_Base { - recoil = QCLASS(762N_LongBarrel); -}; -// GL -class CUP_arifle_Mk17_STD_EGLM: CUP_arifle_Mk17_STD { - recoil = QCLASS(762N_GL_Long); -}; -// Foregrip -class CUP_arifle_Mk17_STD_FG: CUP_arifle_Mk17_STD { - recoil = QCLASS(762N_Foregrip_Long); -}; -class CUP_arifle_Mk17_STD_SFG: CUP_arifle_Mk17_STD_FG { - recoil = QCLASS(762N_Foregrip_Long); -}; -class CUP_arifle_Mk17_STD_AFG: CUP_arifle_Mk17_STD_FG { - recoil = QCLASS(762N_Foregrip_Long); -}; - -// SCAR-H - Short Barrel -class CUP_arifle_Mk17_CQC: CUP_arifle_Mk17_Base { - recoil = QCLASS(762N_ShortBarrel); -}; -// GL -class CUP_arifle_Mk17_CQC_EGLM: CUP_arifle_Mk17_CQC { - recoil = QCLASS(762N_GL_Short); -}; -// Foregrip -class CUP_arifle_Mk17_CQC_FG: CUP_arifle_Mk17_CQC { - recoil = QCLASS(762N_Foregrip_Short); -}; -class CUP_arifle_Mk17_CQC_SFG: CUP_arifle_Mk17_CQC_FG { - recoil = QCLASS(762N_Foregrip_Short); -}; -class CUP_arifle_Mk17_CQC_AFG: CUP_arifle_Mk17_CQC_FG { - recoil = QCLASS(762N_Foregrip_Short); -}; - -// SCAR-H - Long Barrel -class CUP_arifle_Mk20: CUP_arifle_Mk17_Base { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762N/stg.hpp b/addons/recoils/cup/762N/stg.hpp deleted file mode 100644 index c2d8a102..00000000 --- a/addons/recoils/cup/762N/stg.hpp +++ /dev/null @@ -1,6 +0,0 @@ -// STG Rifles inherit - -// StG 58 - Long Barrel -class CUP_arifle_Steyr_Stg58: CUP_arifle_FNFAL { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/762R/ak.hpp b/addons/recoils/cup/762R/ak.hpp deleted file mode 100644 index f7318ca7..00000000 --- a/addons/recoils/cup/762R/ak.hpp +++ /dev/null @@ -1,114 +0,0 @@ -// AK Rifles - Don't inherit - -// AK-103 - Medium Barrel -class CUP_arifle_AK103: CUP_arifle_AK74M { - recoil = QCLASS(762R_MediumBarrel); -}; -class CUP_arifle_AK103_top_rail: CUP_arifle_AK103 { - recoil = QCLASS(762R_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AK103_railed: CUP_arifle_AK103 { - recoil = QCLASS(762R_Foregrip_Medium); -}; -// GL -class CUP_arifle_AK103_GL: CUP_arifle_AK74M_GL { - recoil = QCLASS(762R_GL_Medium); -}; -class CUP_arifle_AK103_GL_top_rail: CUP_arifle_AK103_GL { - recoil = QCLASS(762R_GL_Medium); -}; -class CUP_arifle_AK103_GL_railed: CUP_arifle_AK103_GL { - recoil = QCLASS(762R_GL_Medium); -}; - -// AK-104 - Short Barrel -class CUP_arifle_AK104: CUP_arifle_AK_Base { - recoil = QCLASS(762R_ShortBarrel); -}; -class CUP_arifle_AK104_top_rail: CUP_arifle_AK104 { - recoil = QCLASS(762R_ShortBarrel); -}; -// Foregrip -class CUP_arifle_AK104_railed: CUP_arifle_AK104 { - recoil = QCLASS(762R_Foregrip_Short); -}; - -// AK-109 - Medium Barrel -class CUP_arifle_AK109: CUP_arifle_AK107 { - recoil = QCLASS(762R_MediumBarrel); -}; -class CUP_arifle_AK109_top_rail: CUP_arifle_AK109 { - recoil = QCLASS(762R_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AK109_railed: CUP_arifle_AK109 { - recoil = QCLASS(762R_Foregrip_Medium); -}; -// GL -class CUP_arifle_AK109_GL: CUP_arifle_AK107_GL { - recoil = QCLASS(762R_GL_Medium); -}; -class CUP_arifle_AK109_GL_top_rail: CUP_arifle_AK109_GL { - recoil = QCLASS(762R_GL_Medium); -}; -class CUP_arifle_AK109_GL_railed: CUP_arifle_AK109_GL { - recoil = QCLASS(762R_GL_Medium); -}; - -// AKMN - Medium Barrel -class CUP_arifle_AKM: CUP_arifle_AK_Base { - recoil = QCLASS(762R_MediumBarrel); -}; -// Foregrip -class CUP_arifle_AKMN_railed: CUP_arifle_AKM { - recoil = QCLASS(762R_Foregrip_Medium); -}; -// GL -class CUP_arifle_AKM_GL: CUP_arifle_AKM { - recoil = QCLASS(762R_GL_Medium); -}; - -// AKN - Medium Barrel -class CUP_arifle_AK47: CUP_arifle_AK_Base { - recoil = QCLASS(762R_MediumBarrel); -}; -// GL -class CUP_arifle_AK47_GL: CUP_arifle_AK47 { - recoil = QCLASS(762R_GL_Medium); -}; - -// AKMSN - Medium Barrel -class CUP_arifle_AKMS: CUP_arifle_AKM { - recoil = QCLASS(762R_MediumBarrel); -}; -class CUP_arifle_AKMS_top_rail: CUP_arifle_AKMS { - recoil = QCLASS(762R_MediumBarrel); -}; -// GL -class CUP_arifle_AKMS_GL: CUP_arifle_AKM_GL { - recoil = QCLASS(762R_GL_Medium); -}; -class CUP_arifle_AKMS_GL_top_rail: CUP_arifle_AKMS_GL { - recoil = QCLASS(762R_GL_Medium); -}; - -// AKMS - Medium Barrel -class CUP_arifle_AKMS_Early: CUP_arifle_AKMS { - recoil = QCLASS(762R_MediumBarrel); -}; -// GL -class CUP_arifle_AKMS_GL_Early: CUP_arifle_AKMS_GL { - recoil = QCLASS(762R_GL_Medium); -}; - -// AKS - Medium Barrel -class CUP_arifle_AKS: CUP_arifle_AKM { - recoil = QCLASS(762R_MediumBarrel); -}; -class CUP_arifle_AKS_top_rail: CUP_arifle_AKS { - recoil = QCLASS(762R_MediumBarrel); -}; -class CUP_arifle_AKS_Gold: CUP_arifle_AKS { - recoil = QCLASS(762R_MediumBarrel); -}; diff --git a/addons/recoils/cup/762R/ak15.hpp b/addons/recoils/cup/762R/ak15.hpp deleted file mode 100644 index 35779a41..00000000 --- a/addons/recoils/cup/762R/ak15.hpp +++ /dev/null @@ -1,19 +0,0 @@ -// AK-15 Rifles inherit - -// AK-15 - Medium Barrel -class CUP_arifle_AK15_Base: CUP_arifle_AK12_Base { - recoil = QCLASS(762R_MediumBarrel); -}; - -// Foregrip -class CUP_arifle_AK15_AFG_Base: CUP_arifle_AK15_Base { - recoil = QCLASS(762R_Foregrip_Medium); -}; -class CUP_arifle_AK15_VG_Base: CUP_arifle_AK15_Base { - recoil = QCLASS(762R_Foregrip_Medium); -}; - -// GL -class CUP_arifle_AK15_GP34_Base: CUP_arifle_AK15_Base { - recoil = QCLASS(762R_GL_Medium); -}; diff --git a/addons/recoils/cup/762R/cz.hpp b/addons/recoils/cup/762R/cz.hpp deleted file mode 100644 index f269ee4f..00000000 --- a/addons/recoils/cup/762R/cz.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// CZ Rifles inherit. - -// CZ 807 - Medium Barrel -class CUP_CZ_BREN2_762_14: CUP_CZ_BREN2_762_Base { - recoil = QCLASS(762R_MediumBarrel); -}; -// GL -class CUP_CZ_BREN2_762_14_GL: CUP_CZ_BREN2_762_GL_Base { - recoil = QCLASS(762R_GL_Medium); -}; - -// CZ 807 - Short Barrel -class CUP_CZ_BREN2_762_8: CUP_CZ_BREN2_762_Base { - recoil = QCLASS(762R_ShortBarrel); -}; diff --git a/addons/recoils/cup/762R/groza.hpp b/addons/recoils/cup/762R/groza.hpp deleted file mode 100644 index 4811526a..00000000 --- a/addons/recoils/cup/762R/groza.hpp +++ /dev/null @@ -1,14 +0,0 @@ -// Groza rifles inherit - -// Groza - Short Barrel -class CUP_arifle_OTS14_GROZA_762: CUP_arifle_OTS14_GROZA_762_base { - recoil = QCLASS(762R_ShortBarrel); -}; -// Foregrip -class CUP_arifle_OTS14_GROZA_762_Grip: CUP_arifle_OTS14_GROZA_762_base { - recoil = QCLASS(762R_Foregrip_Short); -}; -// GL -class CUP_arifle_OTS14_GROZA_762_GL: CUP_arifle_OTS14_GROZA_762_base { - recoil = QCLASS(762R_GL_Short); -}; diff --git a/addons/recoils/cup/762R/rpk.hpp b/addons/recoils/cup/762R/rpk.hpp deleted file mode 100644 index 8bde77cb..00000000 --- a/addons/recoils/cup/762R/rpk.hpp +++ /dev/null @@ -1,16 +0,0 @@ -// RPK Rifles inherit (All RPKs are done here for inheritance purposes) - -// RPK - Long Barrel -class CUP_arifle_RPK74: CUP_arifle_AK_Base { - recoil = QCLASS(762R_LongBarrel); -}; - -// RPK74M - Long Barrel -class CUP_arifle_RPK74M: CUP_arifle_RPK74 { - recoil = QCLASS(762R_LongBarrel); -}; - -// RPK-74 (5.45x39) - Long Barrel -class CUP_arifle_RPK74_45: CUP_arifle_RPK74 { - recoil = QCLASS(545_LongBarrel); -}; diff --git a/addons/recoils/cup/762_54/svd.hpp b/addons/recoils/cup/762_54/svd.hpp deleted file mode 100644 index ed45af25..00000000 --- a/addons/recoils/cup/762_54/svd.hpp +++ /dev/null @@ -1,4 +0,0 @@ -// SVD - Uses 7.62x51 Recoil as difference is tiny. -class CUP_srifle_SVD: Rifle_Base_F { - recoil = QCLASS(762N_LongBarrel); -}; diff --git a/addons/recoils/cup/config.cpp b/addons/recoils/cup/config.cpp index 9ca7d89f..1882cb36 100644 --- a/addons/recoils/cup/config.cpp +++ b/addons/recoils/cup/config.cpp @@ -21,126 +21,11 @@ class CfgPatches { }; class CfgWeapons { - // Multiple - class Rifle_Base_F; - class Tavor_base_F; - class arifle_TRG20_F; - class arifle_TRG21_F; - - // ACRs - class CUP_arifle_ACR_Short_BASE_556; - class CUP_arifle_ACR_EGLM_SHORT_BASE_556; - class CUP_arifle_ACR_BASE_556; - class CUP_arifle_ACR_DMR_BASE_556; - class CUP_arifle_ACR_EGLM_BASE_556; - class CUP_arifle_ACR_Short_BASE_68; - class CUP_arifle_ACR_EGLM_SHORT_BASE_68; - class CUP_arifle_ACR_BASE_68; - class CUP_arifle_ACR_EGLM_BASE_68; - class CUP_arifle_ACR_DMR_BASE_68; - - // AKs - class CUP_arifle_AK_Base; - class CUP_arifle_AKS_Base; - class CUP_arifle_AK107_Base; - - // AUG - class CUP_arifle_AUG_Base; - - // CZs - class CUP_arifle_CZ805_Base; - class CUP_CZ_BREN2_Base; - class CUP_CZ_BREN2_GL_Base; - class CUP_CZ_BREN2_762_Base; - class CUP_CZ_BREN2_762_GL_Base; - - // FAMAS - class CUP_Famas_Base; - - // X95 - class CUP_arifle_X95; - class CUP_arifle_X95_Grippod; - - // G3 - class CUP_arifle_G3_Base; - - // G36 - class CUP_arifle_G36_Base_CarryhandleOptics; - class CUP_arifle_G36_Base; - - // Galil - class CUP_arifle_GALIL_BASE; - - // Groza - class CUP_arifle_OTS14_GROZA_762_base; - - // HK416 - class CUP_arifle_HK416_145_Base; - class CUP_arifle_HK416_11_Base; - - // HK417 - class CUP_arifle_HK417_Base; - - // L85 - class CUP_l85a2; - class CUP_l85a2_ris_ng; - class CUP_l85a2_ris; - class CUP_l85a2_ugl; - - // M16 - class CUP_arifle_XM16E1; - class CUP_arifle_M4_Base; - class CUP_arifle_M16_Base; - - // M4 - class CUP_arifle_M4A1_BUIS_Base; - - // SCAR - class CUP_arifle_SCAR_L_Base; - class CUP_arifle_Mk17_Base; - - // M1014 - class CUP_sgun_M1014_base; - - #include "545\ak.hpp" - #include "545\ak12.hpp" - #include "556\acr.hpp" - #include "556\ak.hpp" - #include "556\ak19.hpp" - #include "556\aug.hpp" - #include "556\cz.hpp" - #include "556\famas.hpp" - #include "556\fort.hpp" - #include "556\g36.hpp" - #include "556\galil.hpp" - #include "556\hk416.hpp" - #include "556\l85.hpp" - #include "556\m4.hpp" - #include "556\m16.hpp" - #include "556\m27.hpp" - #include "556\mg36.hpp" - #include "556\mk12.hpp" - #include "556\mk18.hpp" - #include "556\scar.hpp" - #include "68\acr.hpp" - #include "762R\ak.hpp" - #include "762R\ak15.hpp" - #include "762R\cz.hpp" - #include "762R\groza.hpp" - #include "762R\rpk.hpp" - #include "762N\fal.hpp" - #include "762N\g3.hpp" - #include "762N\galil.hpp" - #include "762N\gewehr.hpp" - #include "762N\hk417.hpp" - #include "762N\l129a1.hpp" - #include "762N\m14.hpp" - #include "762N\m110.hpp" - #include "762N\romat.hpp" - #include "762N\sa58.hpp" - #include "762N\scar.hpp" - #include "762N\stg.hpp" - #include "762_54\svd.hpp" - #include "12G\m1014.hpp" - #include "12G\saiga12.hpp" + #include "weapons\baseclasses.hpp" + #include "weapons\12G.hpp" + #include "weapons\68.hpp" + #include "weapons\545.hpp" + #include "weapons\556.hpp" + #include "weapons\762N.hpp" + #include "weapons\762R.hpp" }; diff --git a/addons/recoils/cup/weapons/12G.hpp b/addons/recoils/cup/weapons/12G.hpp new file mode 100644 index 00000000..6409442a --- /dev/null +++ b/addons/recoils/cup/weapons/12G.hpp @@ -0,0 +1,18 @@ +// M1014 +class CUP_sgun_M1014: CUP_sgun_M1014_base { + recoil = QCLASS(12G_Long); +}; +class CUP_sgun_M1014_vfg: CUP_sgun_M1014_base { + recoil = QCLASS(12G_Long_FG); +}; +class CUP_sgun_M1014_Entry: CUP_sgun_M1014_base { + recoil = QCLASS(12G_Short); +}; +class CUP_sgun_M1014_Entry_vfg: CUP_sgun_M1014_Entry { + recoil = QCLASS(12G_Short_FG); +}; + +// Saiga12K +class CUP_sgun_Saiga12K: Rifle_Base_F { + recoil = QCLASS(12G_Long); +}; diff --git a/addons/recoils/cup/weapons/545.hpp b/addons/recoils/cup/weapons/545.hpp new file mode 100644 index 00000000..dade47a7 --- /dev/null +++ b/addons/recoils/cup/weapons/545.hpp @@ -0,0 +1,92 @@ +// AK +class CUP_arifle_AK105: CUP_arifle_AK_Base { + recoil = QCLASS(545_Short); +}; +class CUP_arifle_AK105_railed: CUP_arifle_AK105 { + recoil = QCLASS(545_Short); +}; +class CUP_arifle_AK105_top_rail: CUP_arifle_AK105 { + recoil = QCLASS(545_Short_FG); +}; +class CUP_arifle_AK107: CUP_arifle_AK107_Base { + recoil = QCLASS(545_Medium); +}; +class CUP_arifle_AK107_railed: CUP_arifle_AK107 { + recoil = QCLASS(545_Medium); +}; +class CUP_arifle_AK107_top_rail: CUP_arifle_AK107 { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK107_GL: CUP_arifle_AK107_Base { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK107_GL_top_rail: CUP_arifle_AK107_GL { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK107_GL_railed: CUP_arifle_AK107_GL { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK74: CUP_arifle_AK_Base { + recoil = QCLASS(545_Medium); +}; +class CUP_arifle_AK74_GL: CUP_arifle_AK_Base { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AKS74_GL: CUP_arifle_AK74_GL { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AKS74_GL_top_rail: CUP_arifle_AKS74_GL { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK74M: CUP_arifle_AK_Base { + recoil = QCLASS(545_Medium); +}; +class CUP_arifle_AK74M_railed: CUP_arifle_AK74M { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK74M_GL: CUP_arifle_AK_Base { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AKS74: CUP_arifle_AKS_Base { + recoil = QCLASS(545_Medium); +}; +class CUP_arifle_AKS74U: CUP_arifle_AKS_Base { + recoil = QCLASS(545_Short); +}; +class CUP_arifle_AKS74U_railed: CUP_arifle_AKS74U { + recoil = QCLASS(545_Short_FG); +}; + +// AK-12 +class CUP_arifle_AK12_Base: Rifle_Base_F { + recoil = QCLASS(545_Medium); +}; +class CUP_arifle_AK12_AFG_Base: CUP_arifle_AK12_Base { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK12_VG_Base: CUP_arifle_AK12_Base { + recoil = QCLASS(545_Medium_FG); +}; +class CUP_arifle_AK12_GP34_Base: CUP_arifle_AK12_Base { + recoil = QCLASS(545_Medium_FG); +}; + +// Fort +class CUP_arifle_Fort221: arifle_TRG20_F { + recoil = QCLASS(545_Short_BP); +}; +class CUP_arifle_X95: Tavor_base_F { + recoil = QCLASS(545_Short_BP); +}; +class CUP_arifle_X95_Grippod: CUP_arifle_X95 { + recoil = QCLASS(545_Short_BP); +}; +class CUP_arifle_Fort222: arifle_TRG21_F { + recoil = QCLASS(545_Long_BP); +}; +class CUP_arifle_Fort224: CUP_arifle_X95 { + recoil = QCLASS(545_Short_BP); +}; +class CUP_arifle_Fort224_Grippod: CUP_arifle_X95_Grippod { + recoil = QCLASS(545_Short_BP); +}; diff --git a/addons/recoils/cup/weapons/556.hpp b/addons/recoils/cup/weapons/556.hpp new file mode 100644 index 00000000..747d2763 --- /dev/null +++ b/addons/recoils/cup/weapons/556.hpp @@ -0,0 +1,383 @@ +// ACR +class CUP_arifle_ACRC_blk_556: CUP_arifle_ACR_Short_BASE_556 { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_ACRC_EGLM_blk_556: CUP_arifle_ACR_EGLM_SHORT_BASE_556 { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_ACR_blk_556: CUP_arifle_ACR_BASE_556 { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_ACR_DMR_blk_556: CUP_arifle_ACR_DMR_BASE_556 { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_ACR_EGLM_blk_556: CUP_arifle_ACR_EGLM_BASE_556 { + recoil = QCLASS(556_Medium_FG); +}; + +// AKs +class CUP_arifle_AK101: CUP_arifle_AK74M { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_AK101_top_rail: CUP_arifle_AK101 { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_AK101_railed: CUP_arifle_AK101 { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK101_GL: CUP_arifle_AK74M_GL { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK101_GL_railed: CUP_arifle_AK101_GL { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK101_GL_top_rail: CUP_arifle_AK101_GL { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK102: CUP_arifle_AK_Base { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_AK102_top_rail: CUP_arifle_AK102 { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_AK102_railed: CUP_arifle_AK102 { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK108: CUP_arifle_AK107 { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_AK108_top_rail: CUP_arifle_AK108 { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_AK108_railed: CUP_arifle_AK108 { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK108_GL: CUP_arifle_AK107_GL { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK108_GL_railed: CUP_arifle_AK108_GL { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK108_GL_top_rail: CUP_arifle_AK108_GL { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK19_Base: Rifle_Base_F { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_AK19_AFG_Base: CUP_arifle_AK19_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK19_VG_Base: CUP_arifle_AK19_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_AK19_GP34_Base: CUP_arifle_AK19_Base { + recoil = QCLASS(556_Medium_FG); +}; + +// AUG +class CUP_arifle_AUG_A1: CUP_arifle_AUG_Base { + recoil = QCLASS(556_Long_BP); +}; + +// CZ +class CUP_arifle_CZ805_A1: CUP_arifle_CZ805_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_CZ805_GL: CUP_arifle_CZ805_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_CZ805_A2: CUP_arifle_CZ805_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_CZ_BREN2_556_11: CUP_CZ_BREN2_Base { + recoil = QCLASS(556_Short); +}; +class CUP_CZ_BREN2_556_8: CUP_CZ_BREN2_Base { + recoil = QCLASS(556_Short); +}; +class CUP_CZ_BREN2_556_11_GL: CUP_CZ_BREN2_GL_Base { + recoil = QCLASS(556_Short_FG); +}; +class CUP_CZ_BREN2_556_14: CUP_CZ_BREN2_Base { + recoil = QCLASS(556_Medium); +}; +class CUP_CZ_BREN2_556_14_GL: CUP_CZ_BREN2_GL_Base { + recoil = QCLASS(556_Medium_FG); +}; + +// FAMAS +class CUP_Famas_F1: CUP_Famas_Base { + recoil = QCLASS(556_Long_BP); +}; +class CUP_Famas_F1_Rail: CUP_Famas_Base { + recoil = QCLASS(556_Long_BP); +}; + +// G36 +class CUP_arifle_G36A: CUP_arifle_G36_Base_CarryhandleOptics { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_G36A_RIS: CUP_arifle_G36_Base { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_AG36: CUP_arifle_G36A { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_G36A_AG36_RIS: CUP_arifle_G36A_RIS { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_G36A3: CUP_arifle_G36A_RIS { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_G36A3_grip: CUP_arifle_G36A3 { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_G36A3_AG36: CUP_arifle_G36A3 { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_G36C: CUP_arifle_G36_Base { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_G36C_VFG: CUP_arifle_G36C { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_G36CA3: CUP_arifle_G36C { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_G36CA3_grip: CUP_arifle_G36CA3 { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_G36E: CUP_arifle_G36_Base_CarryhandleOptics { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_G36K: CUP_arifle_G36_Base_CarryhandleOptics { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_G36K_RIS: CUP_arifle_G36_Base { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_G36K_KSK: CUP_arifle_G36K_RIS { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_G36K_VFG: CUP_arifle_G36K { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_G36K_KSK_VFG: CUP_arifle_G36K_KSK { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_G36K_AG36: CUP_arifle_G36K { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_G36KA3: CUP_arifle_G36K_RIS { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_G36KA3_grip: CUP_arifle_G36KA3 { + recoil = QCLASS(556_Short_FG); +}; + +// Galil +class CUP_arifle_Galil_556_black: CUP_arifle_GALIL_BASE { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_Galil_SAR_black: CUP_arifle_GALIL_BASE { + recoil = QCLASS(556_Short); +}; + +// HK416 +class CUP_arifle_HK416_Black: CUP_arifle_HK416_145_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_HK416_M203_Black: CUP_arifle_HK416_Black { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_HK416_CQB_Black: CUP_arifle_HK416_11_Base { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_HK416_CQB_M203_Black: CUP_arifle_HK416_CQB_Black { + recoil = QCLASS(556_Short_FG); +}; + +// L85 +class CUP_arifle_L85A2: CUP_l85a2 { + recoil = QCLASS(556_Long_BP); +}; +class CUP_arifle_L85A2_NG: CUP_l85a2_ris_ng { + recoil = QCLASS(556_Long_BP); +}; +class CUP_arifle_L85A2_G: CUP_l85a2_ris { + recoil = QCLASS(556_Long_BP); +}; +class CUP_arifle_L85A2_GL: CUP_l85a2_ugl { + recoil = QCLASS(556_Long_BP); +}; +class CUP_arifle_L86A2: CUP_l85a2 { + recoil = QCLASS(556_Long_BP); +}; + +// M4 +class CUP_arifle_SBR_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_M4A1: CUP_arifle_M4_Base { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_M4A3_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_MOE_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_standard_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_SOMMOD_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_SOMMOD_Grip_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_BUIS_GL: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_GL_carryhandle: CUP_arifle_M4A1 { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M4A1_MOE_short_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_M4A1_standard_short_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Short_FG); +}; + +// M16 +class CUP_arifle_M16A1: CUP_arifle_XM16E1 { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_M16A1GL: CUP_arifle_XM16E1 { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_M16A1E1: CUP_arifle_XM16E1 { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_M16A1E1GL: CUP_arifle_M16A1GL { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_M16A2: CUP_arifle_M16_Base { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_Colt727: CUP_arifle_M16_Base { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_M16A2_GL: CUP_arifle_M16_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_M16A4_Base: CUP_arifle_M16_Base { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_M16A4_Grip: CUP_arifle_M16A4_Base { + recoil = QCLASS(556_Long_FG); +}; +class CUP_arifle_M16A4_GL: CUP_arifle_M16_Base { + recoil = QCLASS(556_Long_FG); +}; + +// M27 +class CUP_arifle_HK_M27: CUP_arifle_HK416_Black { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_HK_M27_VFG: CUP_arifle_HK_M27 { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_HK_M27_AG36: CUP_arifle_HK416_Black { + recoil = QCLASS(556_Medium_FG); +}; + +// MG36 +class CUP_arifle_MG36: CUP_arifle_G36_Base { + recoil = QCLASS(556_Long); +}; + +// MK12 +class CUP_srifle_Mk12SPR: CUP_arifle_M4_Base { + recoil = QCLASS(556_Long); +}; + +// MK18 +class CUP_arifle_mk18_black: CUP_arifle_M4A1_BUIS_Base { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_mk18_m203_black: CUP_arifle_mk18_black { + recoil = QCLASS(556_Medium_FG); +}; + +// SCAR-L +class CUP_arifle_Mk16_SV: CUP_arifle_SCAR_L_Base { + recoil = QCLASS(556_Long); +}; +class CUP_arifle_Mk16_STD: CUP_arifle_SCAR_L_Base { + recoil = QCLASS(556_Medium); +}; +class CUP_arifle_Mk16_STD_FG: CUP_arifle_Mk16_STD { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_Mk16_STD_SFG: CUP_arifle_Mk16_STD { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_Mk16_STD_AFG: CUP_arifle_Mk16_STD_FG { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_Mk16_STD_EGLM: CUP_arifle_Mk16_STD { + recoil = QCLASS(556_Medium_FG); +}; +class CUP_arifle_Mk16_CQC: CUP_arifle_SCAR_L_Base { + recoil = QCLASS(556_Short); +}; +class CUP_arifle_Mk16_CQC_FG: CUP_arifle_Mk16_CQC { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_Mk16_CQC_SFG: CUP_arifle_Mk16_CQC { + recoil = QCLASS(556_Short_FG); +}; +class CUP_arifle_Mk16_CQC_EGLM: CUP_arifle_Mk16_CQC { + recoil = QCLASS(556_Short_FG); +}; + +// Minimi +class CUP_lmg_minimipara: CUP_saw_base { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_minimi: CUP_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_minimi_railed: CUP_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; + +// M249 +class CUP_lmg_m249_pip1: CUP_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_m249_pip3: CUP_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_m249_pip4: CUP_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_m249_SQuantoon: CUP_lmg_m249_pip4 { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_M249_E2: CUP_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_M249_E1: CUP_lmg_M249_E2 { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_m249_pip2: CUP_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class CUP_lmg_m249_para: CUP_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; diff --git a/addons/recoils/cup/68/acr.hpp b/addons/recoils/cup/weapons/68.hpp similarity index 51% rename from addons/recoils/cup/68/acr.hpp rename to addons/recoils/cup/weapons/68.hpp index a981b463..14c80e08 100644 --- a/addons/recoils/cup/68/acr.hpp +++ b/addons/recoils/cup/weapons/68.hpp @@ -1,24 +1,16 @@ -// ACR Rifles inherit - -// ACR-C - Short Barrel Foregrip +// ACR class CUP_arifle_ACRC_blk_68: CUP_arifle_ACR_Short_BASE_68 { - recoil = QCLASS(68_Foregrip_Short); + recoil = QCLASS(65_Short_FG); }; -// GL class CUP_arifle_ACRC_EGLM_blk_68: CUP_arifle_ACR_EGLM_SHORT_BASE_68 { - recoil = QCLASS(68_GL_Short); + recoil = QCLASS(65_Short_FG); }; - -// ACR - Medium Barrel Foregrip class CUP_arifle_ACR_blk_68: CUP_arifle_ACR_BASE_68 { - recoil = QCLASS(68_Foregrip_Medium); + recoil = QCLASS(65_Medium_FG); }; -// GL class CUP_arifle_ACR_EGLM_blk_68: CUP_arifle_ACR_EGLM_BASE_68 { - recoil = QCLASS(68_GL_Medium); + recoil = QCLASS(65_Medium_FG); }; - -// ACR DMR - Long Barrel class CUP_arifle_ACR_DMR_blk_68: CUP_arifle_ACR_DMR_BASE_68 { - recoil = QCLASS(68_LongBarrel); + recoil = QCLASS(65_Long); }; diff --git a/addons/recoils/cup/weapons/762N.hpp b/addons/recoils/cup/weapons/762N.hpp new file mode 100644 index 00000000..2a1b1110 --- /dev/null +++ b/addons/recoils/cup/weapons/762N.hpp @@ -0,0 +1,217 @@ +// FAL +class CUP_arifle_FNFAL: Rifle_Base_F { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_FNFAL5062: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_FNFAL5061: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_FNFAL5060: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_FNFAL5061_wooden: CUP_arifle_FNFAL5060 { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_FNFAL_OSW: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Short); +}; + +// G3 +class CUP_arifle_G3A3_ris: CUP_arifle_G3_Base { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_G3A3_ris_vfg: CUP_arifle_G3_Base { + recoil = QCLASS(762N_Long_FG); +}; + +// Galil +class CUP_arifle_Galil_black: CUP_arifle_GALIL_BASE { + recoil = QCLASS(762N_Long); +}; + +// G1 +class CUP_arifle_Gewehr1: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; + +// HK417 +class CUP_arifle_HK417_20: CUP_arifle_HK417_Base { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_HK417_12: CUP_arifle_HK417_20 { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_HK417_12_M203: CUP_arifle_HK417_12 { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_HK417_12_AG36: CUP_arifle_HK417_12 { + recoil = QCLASS(762N_Short_FG); +}; + +// L129A1 +class CUP_srifle_L129A1: Rifle_Base_F { + recoil = QCLASS(762N_Long); +}; +class CUP_srifle_L129A1_HG: CUP_srifle_L129A1 { + recoil = QCLASS(762N_Long_FG); +}; + +// M14 +class CUP_srifle_M14: Rifle_Base_F { + recoil = QCLASS(762N_Long); +}; +class CUP_srifle_M14_DMR: Rifle_Base_F { + recoil = QCLASS(762N_Long); +}; + +// M110 +class CUP_srifle_M110: Rifle_Base_F { + recoil = QCLASS(762N_Long_FG); +}; + +// Romat +class CUP_arifle_IMI_Romat: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; + +// SA58 +class CUP_arifle_DSA_SA58: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_DSA_SA58_OSW: CUP_arifle_DSA_SA58 { + recoil = QCLASS(762N_Short); +}; +class CUP_arifle_DSA_SA58_OSW_VFG: CUP_arifle_DSA_SA58_OSW { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_DSA_SA58_OSW_M203: CUP_arifle_DSA_SA58_OSW { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_DSA_SA58_DMR: CUP_arifle_DSA_SA58 { + recoil = QCLASS(762N_Long); +}; + +// SCAR-H +class CUP_arifle_Mk17_STD: CUP_arifle_Mk17_Base { + recoil = QCLASS(762N_Long); +}; +class CUP_arifle_Mk17_STD_EGLM: CUP_arifle_Mk17_STD { + recoil = QCLASS(762N_GL_Long); +}; +class CUP_arifle_Mk17_STD_FG: CUP_arifle_Mk17_STD { + recoil = QCLASS(762N_Long_FG); +}; +class CUP_arifle_Mk17_STD_SFG: CUP_arifle_Mk17_STD_FG { + recoil = QCLASS(762N_Long_FG); +}; +class CUP_arifle_Mk17_STD_AFG: CUP_arifle_Mk17_STD_FG { + recoil = QCLASS(762N_Long_FG); +}; +class CUP_arifle_Mk17_CQC: CUP_arifle_Mk17_Base { + recoil = QCLASS(762N_Short); +}; +class CUP_arifle_Mk17_CQC_EGLM: CUP_arifle_Mk17_CQC { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_Mk17_CQC_FG: CUP_arifle_Mk17_CQC { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_Mk17_CQC_SFG: CUP_arifle_Mk17_CQC_FG { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_Mk17_CQC_AFG: CUP_arifle_Mk17_CQC_FG { + recoil = QCLASS(762N_Short_FG); +}; +class CUP_arifle_Mk20: CUP_arifle_Mk17_Base { + recoil = QCLASS(762N_Long); +}; + +// StG 58 +class CUP_arifle_Steyr_Stg58: CUP_arifle_FNFAL { + recoil = QCLASS(762N_Long); +}; + +// SVD +class CUP_srifle_SVD: Rifle_Base_F { + recoil = QCLASS(762N_Long); +}; + +// Mk48 +class CUP_lmg_Mk48: CUP_lmg_Mk48_Base { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_des: CUP_lmg_Mk48 { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_od: CUP_lmg_Mk48 { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_tan: CUP_lmg_Mk48 { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_wdl: CUP_lmg_Mk48 { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_nohg: CUP_lmg_Mk48 { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_nohg_des: CUP_lmg_Mk48_nohg { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_nohg_wdl: CUP_lmg_Mk48_nohg { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Mk48_nohg_tan: CUP_lmg_Mk48_nohg { + recoil = QCLASS(762N_Long_MG); +}; + +// M60 +class CUP_lmg_M60: CUP_M60E4_base { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_M60E4_norail: CUP_M60E4_base { + recoil = QCLASS(762N_Long_MG); +}; + + +// PKM +class CUP_lmg_PKM: Rifle_Long_Base_F { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_PKM_B50_vfg: CUP_lmg_PKM { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_PKM_front_rail_B50_vfg: CUP_lmg_PKM_B50_vfg { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_PKM_top_rail: CUP_lmg_PKM { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_PKM_top_rail_B50_vfg: CUP_lmg_PKM_top_rail { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_PKMN: CUP_lmg_PKM { + recoil = QCLASS(762N_Long_MG); +}; + +// PKP +class CUP_lmg_Pecheneg: CUP_lmg_PKM { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Pecheneg_B50_vfg: CUP_lmg_Pecheneg { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Pecheneg_desert: CUP_lmg_Pecheneg { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Pecheneg_top_rail: CUP_lmg_Pecheneg { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Pecheneg_top_rail_B50_vfg: CUP_lmg_Pecheneg_top_rail { + recoil = QCLASS(762N_Long_MG); +}; +class CUP_lmg_Pecheneg_woodland: CUP_lmg_Pecheneg { + recoil = QCLASS(762N_Long_MG); +}; diff --git a/addons/recoils/cup/weapons/762R.hpp b/addons/recoils/cup/weapons/762R.hpp new file mode 100644 index 00000000..76dc9bab --- /dev/null +++ b/addons/recoils/cup/weapons/762R.hpp @@ -0,0 +1,138 @@ +// AKs +class CUP_arifle_AK103: CUP_arifle_AK74M { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AK103_top_rail: CUP_arifle_AK103 { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AK103_railed: CUP_arifle_AK103 { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK103_GL: CUP_arifle_AK74M_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK103_GL_top_rail: CUP_arifle_AK103_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK103_GL_railed: CUP_arifle_AK103_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK104: CUP_arifle_AK_Base { + recoil = QCLASS(762R_Short); +}; +class CUP_arifle_AK104_top_rail: CUP_arifle_AK104 { + recoil = QCLASS(762R_Short); +}; +class CUP_arifle_AK104_railed: CUP_arifle_AK104 { + recoil = QCLASS(762R_Short_FG); +}; +class CUP_arifle_AK109: CUP_arifle_AK107 { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AK109_top_rail: CUP_arifle_AK109 { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AK109_railed: CUP_arifle_AK109 { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK109_GL: CUP_arifle_AK107_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK109_GL_top_rail: CUP_arifle_AK109_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK109_GL_railed: CUP_arifle_AK109_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKM: CUP_arifle_AK_Base { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AKMN_railed: CUP_arifle_AKM { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKMN_railed_afg: CUP_arifle_AKM { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKM_GL: CUP_arifle_AKM { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK47: CUP_arifle_AK_Base { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AK47_GL: CUP_arifle_AK47 { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKMS: CUP_arifle_AKM { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AKMS_top_rail: CUP_arifle_AKMS { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AKMS_GL: CUP_arifle_AKM_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKMS_GL_top_rail: CUP_arifle_AKMS_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKMS_Early: CUP_arifle_AKMS { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AKMS_GL_Early: CUP_arifle_AKMS_GL { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AKS: CUP_arifle_AKM { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AKS_top_rail: CUP_arifle_AKS { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AKS_Gold: CUP_arifle_AKS { + recoil = QCLASS(762R_Medium); +}; + +// AK-15 +class CUP_arifle_AK15_Base: CUP_arifle_AK12_Base { + recoil = QCLASS(762R_Medium); +}; +class CUP_arifle_AK15_AFG_Base: CUP_arifle_AK15_Base { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK15_VG_Base: CUP_arifle_AK15_Base { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_arifle_AK15_GP34_Base: CUP_arifle_AK15_Base { + recoil = QCLASS(762R_Medium_FG); +}; + +// CZ +class CUP_CZ_BREN2_762_14: CUP_CZ_BREN2_762_Base { + recoil = QCLASS(762R_Medium); +}; +class CUP_CZ_BREN2_762_14_GL: CUP_CZ_BREN2_762_GL_Base { + recoil = QCLASS(762R_Medium_FG); +}; +class CUP_CZ_BREN2_762_8: CUP_CZ_BREN2_762_Base { + recoil = QCLASS(762R_Short); +}; + +// Groza +class CUP_arifle_OTS14_GROZA_762: CUP_arifle_OTS14_GROZA_762_base { + recoil = QCLASS(762R_Short); +}; +class CUP_arifle_OTS14_GROZA_762_Grip: CUP_arifle_OTS14_GROZA_762_base { + recoil = QCLASS(762R_Short_FG); +}; +class CUP_arifle_OTS14_GROZA_762_GL: CUP_arifle_OTS14_GROZA_762_base { + recoil = QCLASS(762R_Short_FG); +}; + +// RPK +class CUP_arifle_RPK74: CUP_arifle_AK_Base { + recoil = QCLASS(762R_Long); +}; +class CUP_arifle_RPK74M: CUP_arifle_RPK74 { + recoil = QCLASS(762R_Long); +}; +class CUP_arifle_RPK74_45: CUP_arifle_RPK74 { + recoil = QCLASS(545_Long); +}; diff --git a/addons/recoils/cup/weapons/baseclasses.hpp b/addons/recoils/cup/weapons/baseclasses.hpp new file mode 100644 index 00000000..2e41cd65 --- /dev/null +++ b/addons/recoils/cup/weapons/baseclasses.hpp @@ -0,0 +1,49 @@ +class arifle_TRG20_F; +class arifle_TRG21_F; +class CUP_arifle_ACR_BASE_556; +class CUP_arifle_ACR_BASE_68; +class CUP_arifle_ACR_DMR_BASE_556; +class CUP_arifle_ACR_DMR_BASE_68; +class CUP_arifle_ACR_EGLM_BASE_556; +class CUP_arifle_ACR_EGLM_BASE_68; +class CUP_arifle_ACR_EGLM_SHORT_BASE_556; +class CUP_arifle_ACR_EGLM_SHORT_BASE_68; +class CUP_arifle_ACR_Short_BASE_556; +class CUP_arifle_ACR_Short_BASE_68; +class CUP_arifle_AK107_Base; +class CUP_arifle_AK_Base; +class CUP_arifle_AKS_Base; +class CUP_arifle_AUG_Base; +class CUP_arifle_CZ805_Base; +class CUP_arifle_G36_Base; +class CUP_arifle_G36_Base_CarryhandleOptics; +class CUP_arifle_G3_Base; +class CUP_arifle_GALIL_BASE; +class CUP_arifle_HK416_11_Base; +class CUP_arifle_HK416_145_Base; +class CUP_arifle_HK417_Base; +class CUP_arifle_M16_Base; +class CUP_arifle_M4_Base; +class CUP_arifle_M4A1_BUIS_Base; +class CUP_arifle_Mk17_Base; +class CUP_arifle_OTS14_GROZA_762_base; +class CUP_arifle_SCAR_L_Base; +class CUP_arifle_X95; +class CUP_arifle_X95_Grippod; +class CUP_arifle_XM16E1; +class CUP_CZ_BREN2_762_Base; +class CUP_CZ_BREN2_762_GL_Base; +class CUP_CZ_BREN2_Base; +class CUP_CZ_BREN2_GL_Base; +class CUP_Famas_Base; +class CUP_l85a2; +class CUP_l85a2_ris; +class CUP_l85a2_ris_ng; +class CUP_l85a2_ugl; +class CUP_lmg_Mk48_Base; +class CUP_M60E4_base; +class CUP_saw_base; +class CUP_sgun_M1014_base; +class Rifle_Base_F; +class Rifle_Long_Base_F; +class Tavor_base_F; diff --git a/addons/recoils/niarms/556/acr.hpp b/addons/recoils/niarms/556/acr.hpp deleted file mode 100644 index c2a3041c..00000000 --- a/addons/recoils/niarms/556/acr.hpp +++ /dev/null @@ -1,33 +0,0 @@ -// ACR-E Rifles Inherit - -// ACR-E Compact (Short Barrel) -class hlc_rifle_ACR_SBR_tan: hlc_acr556_base { - recoil = QCLASS(556_ShortBarrel); -}; -// GL -class hlc_rifle_ACR_GL_SBR_black: hlc_rifle_ACR_SBR_black { - recoil = QCLASS(556_GL_Short); -}; - -// ACR-E Carbine (Medium Barrel) -class hlc_rifle_ACR_carb_black: hlc_rifle_ACR_SBR_tan { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class hlc_rifle_ACR_GL_Carb_black: hlc_rifle_ACR_Carb_black { - recoil = QCLASS(556_GL_Medium); -}; - -// ACR-E Mid (Long Barrel) -class hlc_rifle_ACR_MID_black: hlc_rifle_ACR_SBR_tan { - recoil = QCLASS(556_LongBarrel); -}; -// GL -class hlc_rifle_ACR_GL_mid_black: hlc_rifle_ACR_MID_black { - recoil = QCLASS(556_GL_Long); -}; - -// ACR-E Long (Long Barrel) -class hlc_rifle_ACR_Full_black: hlc_rifle_ACR_SBR_tan { - recoil = QCLASS(556_LongBarrel); -}; diff --git a/addons/recoils/niarms/556/aug.hpp b/addons/recoils/niarms/556/aug.hpp deleted file mode 100644 index e417458a..00000000 --- a/addons/recoils/niarms/556/aug.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// AUG Rifles Inherit - -// AUG A1 - Long Barrel -class hlc_rifle_aug: hlc_aug_base { - recoil = QCLASS(556_Bullpup_Long); -}; - -// AUG A3 - Long Barrel/GL -class hlc_rifle_auga3_GL: hlc_rifle_auga3 { - recoil = QCLASS(556_Bullpup_GL_Long); -}; diff --git a/addons/recoils/niarms/556/m4.hpp b/addons/recoils/niarms/556/m4.hpp deleted file mode 100644 index 49277029..00000000 --- a/addons/recoils/niarms/556/m4.hpp +++ /dev/null @@ -1,39 +0,0 @@ -// M4 Variants Inherits (Some are broken with no barrel length at all.) - -// AR15 Sanitised Carbine - Short Barrel -class hlc_rifle_RU556: hlc_ar15_base { - recoil = QCLASS(556_ShortBarrel); -}; - -// BCM 'Jack' Carbine - Medium Barrel -class hlc_rifle_bcmjack: hlc_ar15_base { - recoil = QCLASS(556_MediumBarrel); -}; - -// Colt M4A1 Carbine - Medium Barrel -class hlc_rifle_M4: hlc_ar15_base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class hlc_rifle_m4m203: hlc_rifle_M4 { - recoil = QCLASS(556_GL_Medium); -}; - -// Colt R0727 Carbine - Medium Barrel -class hlc_rifle_Colt727: hlc_ar15_base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class hlc_rifle_Colt727_GL: hlc_rifle_Colt727 { - recoil = QCLASS(556_GL_Medium); -}; - -// MK18 MOD 0 - Short Barrel -class hlc_rifle_mk18mod0: hlc_rifle_CQBR { - recoil = QCLASS(556_ShortBarrel); -}; - -// RRA LAR-15 AMR - Long Barrel -class hlc_rifle_SAMR: hlc_ar15_base { - recoil = QCLASS(556_LongBarrel); -}; diff --git a/addons/recoils/niarms/556/sig.hpp b/addons/recoils/niarms/556/sig.hpp deleted file mode 100644 index 0883fc1b..00000000 --- a/addons/recoils/niarms/556/sig.hpp +++ /dev/null @@ -1,41 +0,0 @@ -// SG 55X Rifles Inherit - -// SG550 - Long Barrel -class hlc_rifle_SG550: hlc_sg550_base { - recoil = QCLASS(556_LongBarrel); -}; -// GL -class hlc_rifle_SG550_GL: hlc_rifle_SG550 { - recoil = QCLASS(556_GL_Long); -}; -class hlc_rifle_SG550_TAC_GL: hlc_rifle_SG550 { - recoil = QCLASS(556_GL_Long); -}; - -// SG550-1 SP - Long Barrel -class hlc_rifle_SG550Sniper: hlc_sg550_base { - recoil = QCLASS(556_LongBarrel); -}; - -// SG551 - Medium Barrel -class hlc_rifle_SG551SB: hlc_sg550_base { - recoil = QCLASS(556_MediumBarrel); -}; -// GL -class hlc_rifle_SG551SB_TAC_GL: hlc_rifle_SG551SB { - recoil = QCLASS(556_GL_Medium); -}; - -// SG551 - Long Barrel -class hlc_rifle_SG551LB: hlc_rifle_SG551SB { - recoil = QCLASS(556_LongBarrel); -}; -// GL -class hlc_rifle_SG551LB_TAC_GL: hlc_rifle_SG551LB { - recoil = QCLASS(556_GL_Long); -}; - -// SSG553 - Short Barrel -class hlc_rifle_SG553SB: hlc_sg550_base { - recoil = QCLASS(556_ShortBarrel); -}; diff --git a/addons/recoils/niarms/762R/sig.hpp b/addons/recoils/niarms/762R/sig.hpp deleted file mode 100644 index f1868996..00000000 --- a/addons/recoils/niarms/762R/sig.hpp +++ /dev/null @@ -1,18 +0,0 @@ -// SIG553-R 762x39 Rifles dont inherit - -// SIG SG553-R - Short Barrel -class hlc_rifle_sg553RSB: hlc_rifle_SG553SB { - recoil = QCLASS(762R_ShortBarrel); -}; -class hlc_rifle_sg553RSB_TAC: hlc_rifle_sg553RSB { - recoil = QCLASS(762R_ShortBarrel); -}; - -// SIG SG553-RLB - Short Barrel -class hlc_rifle_sg553RLB: hlc_rifle_sg553RSB { - recoil = QCLASS(762R_ShortBarrel); -}; -class hlc_rifle_sg553RLB_TAC: hlc_rifle_sg553RLB { - recoil = QCLASS(762R_ShortBarrel); -}; - diff --git a/addons/recoils/niarms/blackout/ar15.hpp b/addons/recoils/niarms/blackout/ar15.hpp deleted file mode 100644 index 63e324ab..00000000 --- a/addons/recoils/niarms/blackout/ar15.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// AR-15 Rifles - -// AR15 - Medium Barrel -class hlc_rifle_Bushmaster300: hlc_ar15_base { - recoil = QCLASS(300B_MediumBarrel); -}; - -// Black Jack - Medium Barrel -class hlc_rifle_bcmblackjack: hlc_rifle_bcmjack { - recoil = QCLASS(300B_MediumBarrel); -}; diff --git a/addons/recoils/niarms/blackout/honeybadger.hpp b/addons/recoils/niarms/blackout/honeybadger.hpp deleted file mode 100644 index b267cf64..00000000 --- a/addons/recoils/niarms/blackout/honeybadger.hpp +++ /dev/null @@ -1,4 +0,0 @@ -// Honey Badger - Short Barrel -class hlc_rifle_honeybadger: hlc_rifle_honeybase { - recoil = QCLASS(300B_ShortBarrel); -}; diff --git a/addons/recoils/niarms/config.cpp b/addons/recoils/niarms/config.cpp index bba234b3..f15e5d4a 100644 --- a/addons/recoils/niarms/config.cpp +++ b/addons/recoils/niarms/config.cpp @@ -24,31 +24,9 @@ class CfgPatches { }; class CfgWeapons { - // ACR-E - class hlc_acr556_base; - class hlc_rifle_ACR_SBR_black; - class hlc_rifle_ACR68_SBR_black; - class hlc_acr_base; - - // AUG - class hlc_aug_base; - class hlc_rifle_auga3; - - // Honey Badger - class hlc_rifle_honeybase; - - // M4 Variants - class hlc_ar15_base; - class hlc_rifle_CQBR; - - // SG55X - class hlc_sg550_base; - - #include "556\acr.hpp" - #include "556\aug.hpp" - #include "556\m4.hpp" - #include "556\sig.hpp" - #include "762R\sig.hpp" - #include "blackout\ar15.hpp" - #include "blackout\honeybadger.hpp" + #include "weapons\baseclasses.hpp" + #include "weapons\68.hpp" + #include "weapons\556.hpp" + #include "weapons\762N.hpp" + #include "weapons\762R.hpp" }; diff --git a/addons/recoils/niarms/weapons/556.hpp b/addons/recoils/niarms/weapons/556.hpp new file mode 100644 index 00000000..e40f91d0 --- /dev/null +++ b/addons/recoils/niarms/weapons/556.hpp @@ -0,0 +1,148 @@ +// ACR +class hlc_rifle_ACR_SBR_tan: hlc_acr556_base { + recoil = QCLASS(556_Short); +}; +class hlc_rifle_ACR_GL_SBR_black: hlc_rifle_ACR_SBR_black { + recoil = QCLASS(556_Short_FG); +}; +class hlc_rifle_ACR_carb_black: hlc_rifle_ACR_SBR_tan { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_ACR_GL_Carb_black: hlc_rifle_ACR_Carb_black { + recoil = QCLASS(556_Medium_FG); +}; +class hlc_rifle_ACR_MID_black: hlc_rifle_ACR_SBR_tan { + recoil = QCLASS(556_Long); +}; +class hlc_rifle_ACR_GL_mid_black: hlc_rifle_ACR_MID_black { + recoil = QCLASS(556_Long_FG); +}; +class hlc_rifle_ACR_Full_black: hlc_rifle_ACR_SBR_tan { + recoil = QCLASS(556_Long); +}; + +// AUG +class hlc_rifle_aug: hlc_aug_base { + recoil = QCLASS(556_Long_BP); +}; +class hlc_rifle_auga3_GL: hlc_rifle_auga3 { + recoil = QCLASS(556_Long_BP); +}; + +// M4 Variants +class hlc_rifle_RU556: hlc_ar15_base { + recoil = QCLASS(556_Short); +}; +class hlc_rifle_bcmjack: hlc_ar15_base { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_M4: hlc_ar15_base { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_m4m203: hlc_rifle_M4 { + recoil = QCLASS(556_Medium_FG); +}; +class hlc_rifle_Colt727: hlc_ar15_base { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_Colt727_GL: hlc_rifle_Colt727 { + recoil = QCLASS(556_Medium_FG); +}; +class hlc_rifle_mk18mod0: hlc_rifle_CQBR { + recoil = QCLASS(556_Short); +}; +class hlc_rifle_SAMR: hlc_ar15_base { + recoil = QCLASS(556_Long); +}; +class hlc_rifle_Bushmaster300: hlc_ar15_base { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_bcmblackjack: hlc_rifle_bcmjack { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_honeybadger: hlc_rifle_honeybase { + recoil = QCLASS(556_Short); +}; +class hlc_rifle_vendimus: hlc_rifle_Bushmaster300 { + recoil = QCLASS(556_Long); +}; + +// SiG Rifles +class hlc_rifle_SG550: hlc_sg550_base { + recoil = QCLASS(556_Long); +}; +class hlc_rifle_SG550_GL: hlc_rifle_SG550 { + recoil = QCLASS(556_Long_FG); +}; +class hlc_rifle_SG550_TAC_GL: hlc_rifle_SG550 { + recoil = QCLASS(556_Long_FG); +}; +class hlc_rifle_SG550Sniper: hlc_sg550_base { + recoil = QCLASS(556_Long); +}; +class hlc_rifle_SG551SB: hlc_sg550_base { + recoil = QCLASS(556_Medium); +}; +class hlc_rifle_SG551SB_TAC_GL: hlc_rifle_SG551SB { + recoil = QCLASS(556_Medium_FG); +}; +class hlc_rifle_SG551LB: hlc_rifle_SG551SB { + recoil = QCLASS(556_Long); +}; +class hlc_rifle_SG551LB_TAC_GL: hlc_rifle_SG551LB { + recoil = QCLASS(556_Long_FG); +}; +class hlc_rifle_SG553SB: hlc_sg550_base { + recoil = QCLASS(556_Short); +}; + +// M249 +class hlc_m249_pip1: hlc_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class hlc_m249_pip2: hlc_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class hlc_m249_pip3: hlc_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class hlc_m249_pip4: hlc_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class hlc_m249_SQuantoon: hlc_m249_pip4 { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_M249E1: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_M249E2: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_m249para: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; + +// Mk46 +class hlc_lmg_mk46: hlc_lmg_minimi_railed { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_mk46mod1: hlc_lmg_mk46 { + recoil = QCLASS(556_Long_MG); +}; + +// Minimi +class hlc_lmg_minimipara: hlc_saw_base { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_minimi_railed: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_minimipara_long: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_minimipara_railed: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; +class hlc_lmg_minimipara_long_railed: hlc_lmg_minimipara { + recoil = QCLASS(556_Long_MG); +}; diff --git a/addons/recoils/niarms/68/acr.hpp b/addons/recoils/niarms/weapons/68.hpp similarity index 51% rename from addons/recoils/niarms/68/acr.hpp rename to addons/recoils/niarms/weapons/68.hpp index fcc97867..c2cdd17c 100644 --- a/addons/recoils/niarms/68/acr.hpp +++ b/addons/recoils/niarms/weapons/68.hpp @@ -1,33 +1,22 @@ -// ACR Rifles inherit - -// ACR-E Compact (Short Barrel) +// ACR class hlc_rifle_ACR68_SBR_tan: hlc_acr_base { - recoil = QCLASS(68_ShortBarrel); + recoil = QCLASS(65_Short); }; -// GL class hlc_rifle_ACR68_GL_SBR_black: hlc_rifle_ACR68_SBR_black { - recoil = QCLASS(68_GL_Short); + recoil = QCLASS(65_Short_FG); }; - -// ACR-E Carbine (Medium Barrel) class hlc_rifle_ACR68_carb_black: hlc_rifle_ACR68_SBR_tan { - recoil = QCLASS(68_MediumBarrel); + recoil = QCLASS(65_Medium); }; -// GL class hlc_rifle_ACR68_GL_Carb_black: hlc_rifle_ACR68_carb_black { - recoil = QCLASS(68_GL_Medium); + recoil = QCLASS(65_Medium_FG); }; - -// ACR-E Mid (Long Barrel) class hlc_rifle_ACR68_MID_black: hlc_rifle_ACR68_SBR_tan { - recoil = QCLASS(68_LongBarrel); + recoil = QCLASS(65_Long); }; -// GL class hlc_rifle_ACR68_GL_mid_black: hlc_rifle_ACR68_MID_black { - recoil = QCLASS(68_GL_Long); + recoil = QCLASS(65_Long_FG); }; - -// ACR-E Long (Long Barrel) class hlc_rifle_ACR68_full_black: hlc_rifle_ACR68_SBR_tan { - recoil = QCLASS(68_LongBarrel); + recoil = QCLASS(65_Long); }; diff --git a/addons/recoils/niarms/weapons/762N.hpp b/addons/recoils/niarms/weapons/762N.hpp new file mode 100644 index 00000000..4255d931 --- /dev/null +++ b/addons/recoils/niarms/weapons/762N.hpp @@ -0,0 +1,7 @@ +// Mk48 +class hlc_lmg_mk48: hlc_saw_base { + recoil = QCLASS(762N_Long_MG); +}; +class hlc_lmg_mk48mod1: hlc_lmg_mk48 { + recoil = QCLASS(762N_Long_MG); +}; diff --git a/addons/recoils/niarms/weapons/762R.hpp b/addons/recoils/niarms/weapons/762R.hpp new file mode 100644 index 00000000..d192cc4f --- /dev/null +++ b/addons/recoils/niarms/weapons/762R.hpp @@ -0,0 +1,13 @@ +// SiG Rifles +class hlc_rifle_sg553RSB: hlc_rifle_SG553SB { + recoil = QCLASS(762R_Short); +}; +class hlc_rifle_sg553RSB_TAC: hlc_rifle_sg553RSB { + recoil = QCLASS(762R_Short); +}; +class hlc_rifle_sg553RLB: hlc_rifle_sg553RSB { + recoil = QCLASS(762R_Short); +}; +class hlc_rifle_sg553RLB_TAC: hlc_rifle_sg553RLB { + recoil = QCLASS(762R_Short); +}; diff --git a/addons/recoils/niarms/weapons/baseclasses.hpp b/addons/recoils/niarms/weapons/baseclasses.hpp new file mode 100644 index 00000000..df911391 --- /dev/null +++ b/addons/recoils/niarms/weapons/baseclasses.hpp @@ -0,0 +1,14 @@ +class hlc_acr556_base; +class hlc_acr_base; +class hlc_ar15_base; +class hlc_aug_base; +class hlc_lmg_minimi_railed; +class hlc_lmg_minimipara; +class hlc_rifle_ACR68_SBR_black; +class hlc_rifle_ACR_SBR_black; +class hlc_rifle_auga3; +class hlc_rifle_CQBR; +class hlc_rifle_honeybase; +class hlc_saw_base; +class hlc_sg550_base; +class hlc_rifle_Bushmaster300; diff --git a/addons/recoils/pi/300WM/falkor.hpp b/addons/recoils/pi/300WM/falkor.hpp deleted file mode 100644 index c6d2c297..00000000 --- a/addons/recoils/pi/300WM/falkor.hpp +++ /dev/null @@ -1,15 +0,0 @@ -// Falkor Petra rifles don't inherit - -// Falkor Petra - Long Barrel -class bnae_falkor_blk_virtual: bnae_falkor_base { - recoil = QCLASS(300WM_LongBarrel); -}; -class bnae_falkor_camo1_virtual: bnae_falkor_base { - recoil = QCLASS(300WM_LongBarrel); -}; -class bnae_falkor_snd_virtual: bnae_falkor_base { - recoil = QCLASS(300WM_LongBarrel); -}; -class bnae_falkor_camo2_virtual: bnae_falkor_base { - recoil = QCLASS(300WM_LongBarrel); -}; diff --git a/addons/recoils/pi/762R/rk.hpp b/addons/recoils/pi/762R/rk.hpp deleted file mode 100644 index a978362f..00000000 --- a/addons/recoils/pi/762R/rk.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// RK-95 Rifles inherit - -// RK-95 - Long Barrel -class bnae_rk95_virtual: bnae_rk95_base { - recoil = QCLASS(762R_LongBarrel); -}; - diff --git a/addons/recoils/pi/config.cpp b/addons/recoils/pi/config.cpp index 58c4d0d5..cdfb1588 100644 --- a/addons/recoils/pi/config.cpp +++ b/addons/recoils/pi/config.cpp @@ -22,12 +22,25 @@ class CfgPatches { }; class CfgWeapons { - // Falkor class bnae_falkor_base; - - // RK95s class bnae_rk95_base; - #include "762R\rk.hpp" - #include "300WM\falkor.hpp" + // RK-95 + class bnae_rk95_virtual: bnae_rk95_base { + recoil = QCLASS(762R_Long); + }; + + // Falkor Petra + class bnae_falkor_blk_virtual: bnae_falkor_base { + recoil = QCLASS(300WM_Long); + }; + class bnae_falkor_camo1_virtual: bnae_falkor_base { + recoil = QCLASS(300WM_Long); + }; + class bnae_falkor_snd_virtual: bnae_falkor_base { + recoil = QCLASS(300WM_Long); + }; + class bnae_falkor_camo2_virtual: bnae_falkor_base { + recoil = QCLASS(300WM_Long); + }; }; diff --git a/addons/recoils/recoils/12G.hpp b/addons/recoils/recoils/12G.hpp deleted file mode 100644 index b5b12789..00000000 --- a/addons/recoils/recoils/12G.hpp +++ /dev/null @@ -1,25 +0,0 @@ -// 12G - -// Long barreled Semi-Auto shotgun -class CLASS(12G_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.3, 1, 0.5, 0.5}; - permanent = 0.5; -}; - -// Long barreled Foregrip Semi-Auto shotgun -class CLASS(12G_Foregrip_LongBarrel): CLASS(12G_LongBarrel) { - muzzleOuter[] = {0.27, 0.9, 0.48, 0.48}; - permanent = 0.28; -}; - -// Short barreled Semi-Auto shotgun -class CLASS(12G_ShortBarrel): CLASS(12G_LongBarrel) { - muzzleOuter[] = {0.35, 1.1, 0.6, 0.6}; - permanent = 0.55; -}; - -// Short barreled Foregrip Semi-Auto shotgun -class CLASS(12G_Foregrip_ShortBarrel): CLASS(12G_ShortBarrel) { - muzzleOuter[] = {0.33, 1, 0.57, 0.57}; - permanent = 0.5; -}; diff --git a/addons/recoils/recoils/300wm.hpp b/addons/recoils/recoils/300wm.hpp deleted file mode 100644 index aba9fd52..00000000 --- a/addons/recoils/recoils/300wm.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// .300 WM (Slightly less kick than .338) - -// Long barreled variant of a .300WM rifle (> 16") -class CLASS(300WM_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.46, 0.76, 0.5, 0.5}; - permanent = 0.2; -}; diff --git a/addons/recoils/recoils/338.hpp b/addons/recoils/recoils/338.hpp deleted file mode 100644 index 0dd78c71..00000000 --- a/addons/recoils/recoils/338.hpp +++ /dev/null @@ -1,7 +0,0 @@ -// .338 Kicks like a mule. - -// Long barreled variant of a .338 rifle (> 16") -class CLASS(338_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.5, 0.82, 0.55, 0.55}; - permanent = 0.2; -}; diff --git a/addons/recoils/recoils/545.hpp b/addons/recoils/recoils/545.hpp deleted file mode 100644 index 2f7ad5b4..00000000 --- a/addons/recoils/recoils/545.hpp +++ /dev/null @@ -1,41 +0,0 @@ -// 5.45x39 - -// Long barreled variant of a 5.45 rifle (16"-18") -class CLASS(545_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.21, 0.5, 0.28, 0.28}; - permanent = 0.14; -}; - -// Medium barreled variant of a 5.45 rifle (14"-16") -class CLASS(545_MediumBarrel): CLASS(545_LongBarrel) { - muzzleOuter[] = {0.23, 0.55, 0.30, 0.30}; - permanent = 0.15; -}; - -// Short barreled variant of a 5.45 rifle (< 14") -class CLASS(545_ShortBarrel): CLASS(545_MediumBarrel) { - muzzleOuter[] = {0.25, 0.6, 0.31, 0.31}; - permanent = 0.2; -}; - -// GL Variants -class CLASS(545_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.19, 0.48, 0.26, 0.26}; - permanent = 0.13; -}; - -class CLASS(545_GL_Medium): CLASS(545_GL_Long) { - muzzleOuter[] = {0.2, 0.50, 0.27, 0.27}; - permanent = 0.14; -}; - -class CLASS(545_GL_Short): CLASS(545_GL_Medium) { - muzzleOuter[] = {0.21, 0.52, 0.28, 0.28}; - permanent = 0.15; -}; - -// Foregrip Variants, inherits from GL -class CLASS(545_Foregrip_Long): CLASS(545_GL_Long) {}; -class CLASS(545_Foregrip_Medium): CLASS(545_GL_Medium) {}; -class CLASS(545_Foregrip_Short): CLASS(545_GL_Short) {}; - diff --git a/addons/recoils/recoils/556.hpp b/addons/recoils/recoils/556.hpp deleted file mode 100644 index f98aa757..00000000 --- a/addons/recoils/recoils/556.hpp +++ /dev/null @@ -1,70 +0,0 @@ -// 5.56x45 - -// Long barreled variant of a 5.56 rifle. (16"-18") -class CLASS(556_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.23, 0.6, 0.30, 0.30}; - permanent = 0.15; -}; - -// Medium barreled variant of a 5.56 rifle. (14"-16") -class CLASS(556_MediumBarrel): CLASS(556_LongBarrel) { - muzzleOuter[] = {0.25, 0.7, 0.33, 0.33}; - permanent = 0.17; -}; - -// Short barreled variant of a 5.56 rifle. (< 14") -class CLASS(556_ShortBarrel): CLASS(556_MediumBarrel) { - muzzleOuter[] = {0.25, 0.7, 0.36, 0.36}; - permanent = 0.2; -}; - -// Bullpup Variants, Lessened horizontal recoil. -class CLASS(556_Bullpup_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.14, 0.65, 0.25, 0.33}; - permanent = 0.14; -}; - -class CLASS(556_Bullpup_Medium): CLASS(556_Bullpup_Long) { - muzzleOuter[] = {0.15, 0.7, 0.25, 0.33}; - permanent = 0.15; -}; -class CLASS(556_Bullpup_Short): CLASS(556_Bullpup_Medium) { - muzzleOuter[] = {0.15, 0.7, 0.25, 0.36}; - permanent = 0.2; -}; - -// GL Variants - More Weight, less overall recoil -class CLASS(556_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.22, 0.63, 0.29, 0.29}; - permanent = 0.13; -}; -class CLASS(556_GL_Medium): CLASS(556_GL_Long) { - muzzleOuter[] = {0.23, 0.65, 0.3, 0.3}; - permanent = 0.14; -}; -// Short Barreled GL - Pretty rare. -class CLASS(556_GL_Short): CLASS(556_GL_Medium) { - muzzleOuter[] = {0.24, 0.67, 0.33, 0.33}; - permanent = 0.16; -}; - -// Bullpup GLs -class CLASS(556_Bullpup_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.14, 0.60, 0.25, 0.3}; - permanent = 0.12; -}; -class CLASS(556_Bullpup_GL_Medium): CLASS(556_Bullpup_GL_Long) { - muzzleOuter[] = {0.15, 0.63, 0.28, 0.3}; - permanent = 0.13; -}; -class CLASS(556_Bullpup_GL_Short): CLASS(556_Bullpup_GL_Medium) { - muzzleOuter[] = {0.16, 0.64, 0.29, 0.31}; - permanent = 0.14; -}; - -// Foregrip Variants, inherits from GL -class CLASS(556_Foregrip_Long): CLASS(556_GL_Long) {}; -class CLASS(556_Foregrip_Medium): CLASS(556_GL_Medium) {}; -class CLASS(556_Foregrip_Short): CLASS(556_GL_Short) {}; -class CLASS(556_Bullpup_Foregrip_Short): CLASS(556_Bullpup_GL_Short) {}; -class CLASS(556_Bullpup_Foregrip_Long): CLASS(556_Bullpup_GL_Long) {}; diff --git a/addons/recoils/recoils/65.hpp b/addons/recoils/recoils/65.hpp deleted file mode 100644 index 4ac309fd..00000000 --- a/addons/recoils/recoils/65.hpp +++ /dev/null @@ -1,65 +0,0 @@ -// 6.5 Caseless (Middle ground between 762x39 & 762x51) - -// Long barreled variant of a 6.5 rifle (> 16") -class CLASS(65_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.27, 0.66, 0.38, 0.38}; - permanent = 0.15; -}; - -// Medium barreled variant of a 6.5 rifle (14"-16") -class CLASS(65_MediumBarrel): CLASS(65_LongBarrel) { - muzzleOuter[] = {0.3, 0.68, 0.4, 0.4}; - permanent = 0.17; -}; - -// Short barreled variant of a 6.5 rifle (< 14") -class CLASS(65_ShortBarrel): CLASS(65_MediumBarrel) { - muzzleOuter[] = {0.32, 0.7, 0.42, 0.42}; - permanent = 0.2; -}; - -// Bullpup Variants, Lessened horizontal recoil. -class CLASS(65_Bullpup_Long): CLASS(65_LongBarrel) { - muzzleOuter[] = {0.19, 0.68, 0.3, 0.4}; - permanent = 0.14; -}; -class CLASS(65_Bullpup_Medium): CLASS(65_MediumBarrel) { - muzzleOuter[] = {0.22, 0.7, 0.32, 0.42}; - permanent = 0.16; -}; - -// GL Variants -class CLASS(65_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.25, 0.64, 0.36, 0.36}; - permanent = 0.14; -}; -class CLASS(65_GL_Medium): CLASS(65_GL_Long) { - muzzleOuter[] = {0.28, 0.66, 0.38, 0.38}; - permanent = 0.16; -}; -class CLASS(65_GL_Short): CLASS(65_GL_Medium) { - muzzleOuter[] = {0.3, 0.68, 0.4, 0.4}; - permanent = 0.18; -}; - -// Bullpup GL -class CLASS(65_Bullpup_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.18, 0.6, 0.3, 0.37}; - permanent = 0.13; -}; -class CLASS(65_Bullpup_GL_Medium): CLASS(65_Bullpup_GL_Long) { - muzzleOuter[] = {0.21, 0.62, 0.32, 0.39}; - permanent = 0.14; -}; - -// Foregrip variants, inherits from GL -class CLASS(65_Foregrip_Long): CLASS(65_GL_Long) {}; -class CLASS(65_Foregrip_Medium): CLASS(65_GL_Medium) {}; -class CLASS(65_Foregrip_Short): CLASS(65_GL_Short) {}; - -class CLASS(65_Bullpup_Foregrip_Long): CLASS(65_Foregrip_Long) { - muzzleOuter[] = {0.19, 0.63, 0.3, 0.34}; -}; -class CLASS(65_Bullpup_Foregrip_Medium): CLASS(65_Bullpup_Foregrip_Long) { - muzzleOuter[] = {0.22, 0.65, 0.32, 0.36}; -}; diff --git a/addons/recoils/recoils/68.hpp b/addons/recoils/recoils/68.hpp deleted file mode 100644 index 04fc73f0..00000000 --- a/addons/recoils/recoils/68.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// 6.8 (Copy of 6.5 until someone can give me answers.) - -// Long barreled variant of a 6.8 rifle (> 16") -class CLASS(68_LongBarrel): CLASS(65_LongBarrel) {}; - -// Medium barreled variant of a 6.8 rifle (14"-16") -class CLASS(68_MediumBarrel): CLASS(65_MediumBarrel) {}; - -// Short barreled variant of a 6.8 rifle (< 14") -class CLASS(68_ShortBarrel): CLASS(65_ShortBarrel) {}; - -// GL Variants -class CLASS(68_GL_Long): CLASS(65_GL_Long) {}; -class CLASS(68_GL_Medium): CLASS(65_GL_Medium) {}; -class CLASS(68_GL_Short): CLASS(65_GL_Short) {}; - -// Foregrip variants, inherits from GL -class CLASS(68_Foregrip_Long): CLASS(68_GL_Long) {}; -class CLASS(68_Foregrip_Medium): CLASS(68_GL_Medium) {}; -class CLASS(68_Foregrip_Short): CLASS(68_GL_Short) {}; diff --git a/addons/recoils/recoils/762N.hpp b/addons/recoils/recoils/762N.hpp deleted file mode 100644 index 65cb1bb3..00000000 --- a/addons/recoils/recoils/762N.hpp +++ /dev/null @@ -1,38 +0,0 @@ -// 7.62x51 NATO. - -// Long barreled variant of a 7.62 rifle (> 16") -class CLASS(762N_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.3, 0.7, 0.46, 0.46}; - permanent = 0.15; -}; - -// Medium barreled variant of a 7.62 rifle (14"-16") -class CLASS(762N_MediumBarrel): CLASS(762N_LongBarrel) { - muzzleOuter[] = {0.32, 0.72, 0.48, 0.48}; - permanent = 0.17; -}; - -// Short barreled variant of a 7.62 rifle (< 14") -class CLASS(762N_ShortBarrel): CLASS(762N_MediumBarrel) { - muzzleOuter[] = {0.34, 0.74, 0.5, 0.5}; - permanent = 0.19; -}; - -// GL Variants -class CLASS(762N_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.29, 0.69, 0.45, 0.45}; - permanent = 0.14; -}; -class CLASS(762N_GL_Medium): CLASS(762N_GL_Long) { - muzzleOuter[] = {0.31, 0.71, 0.47, 0.47}; - permanent = 0.16; -}; -class CLASS(762N_GL_Short): CLASS(762N_GL_Medium) { - muzzleOuter[] = {0.33, 0.73, 0.49, 0.49}; - permanent = 0.17; -}; - -// Foregrip variants, inherits from GL -class CLASS(762N_Foregrip_Long): CLASS(762N_GL_Long) {}; -class CLASS(762N_Foregrip_Medium): CLASS(762N_GL_Medium) {}; -class CLASS(762N_Foregrip_Short): CLASS(762N_GL_Short) {}; diff --git a/addons/recoils/recoils/762R.hpp b/addons/recoils/recoils/762R.hpp deleted file mode 100644 index 146371f1..00000000 --- a/addons/recoils/recoils/762R.hpp +++ /dev/null @@ -1,38 +0,0 @@ -// 7.62x39 Russian - -// Long barreled variant of a 7.62 rifle (16"-18") -class CLASS(762R_LongBarrel): CLASS(Recoil_Default) { - muzzleOuter[] = {0.245, 0.63, 0.33, 0.33}; - permanent = 0.15; -}; - -// Medium barreled variant of a 7.62 rifle (14"-16") -class CLASS(762R_MediumBarrel): CLASS(762R_LongBarrel) { - muzzleOuter[] = {0.25, 0.65, 0.34, 0.34}; - permanent = 0.17; -}; - -// Short barreled variant of a 7.62 rifle (< 14") -class CLASS(762R_ShortBarrel): CLASS(762R_MediumBarrel) { - muzzleOuter[] = {0.28, 0.7, 0.36, 0.36}; - permanent = 0.2; -}; - -// GL Variants -class CLASS(762R_GL_Long): CLASS(Recoil_Default) { - muzzleOuter[] = {0.23, 0.65, 0.32, 0.32}; - permanent = 0.13; -}; -class CLASS(762R_GL_Medium): CLASS(762R_GL_Long) { - muzzleOuter[] = {0.24, 0.67, 0.33, 0.33}; - permanent = 0.14; -}; -class CLASS(762R_GL_Short): CLASS(762R_GL_Medium) { - muzzleOuter[] = {0.25, 0.69, 0.34, 0.34}; - permanent = 0.15; -}; - -// Foregrip variants, inherits from GL -class CLASS(762R_Foregrip_Long): CLASS(762R_GL_Long) {}; -class CLASS(762R_Foregrip_Medium): CLASS(762R_GL_Medium) {}; -class CLASS(762R_Foregrip_Short): CLASS(762R_GL_Short) {}; diff --git a/addons/recoils/recoils/blackout.hpp b/addons/recoils/recoils/blackout.hpp deleted file mode 100644 index c6bad546..00000000 --- a/addons/recoils/recoils/blackout.hpp +++ /dev/null @@ -1,20 +0,0 @@ -// .300 Blackout (Copy of 7.62x39 until someone can give me answers.) - -// Long barreled variant of a .300 blackout rifle (> 16") -class CLASS(300B_LongBarrel): CLASS(762R_LongBarrel) {}; - -// Medium barreled variant of a .300 blackout rifle (14"-16") -class CLASS(300B_MediumBarrel): CLASS(762R_MediumBarrel) {}; - -// Short barreled variant of a .300 blackout rifle (< 14") -class CLASS(300B_ShortBarrel): CLASS(762R_ShortBarrel) {}; - -// GL Variants -class CLASS(300B_GL_Long): CLASS(762R_GL_Long) {}; -class CLASS(300B_GL_Medium): CLASS(762R_GL_Medium) {}; -class CLASS(300B_GL_Short): CLASS(762R_GL_Short) {}; - -// Foregrip variants -class CLASS(300B_Foregrip_Long): CLASS(762R_Foregrip_Long) {}; -class CLASS(300B_Foregrip_Medium): CLASS(762R_Foregrip_Medium) {}; -class CLASS(300B_Foregrip_Short): CLASS(762R_Foregrip_Short) {}; diff --git a/addons/recoils/ws/556/velko.hpp b/addons/recoils/ws/556/velko.hpp deleted file mode 100644 index 20aa6c07..00000000 --- a/addons/recoils/ws/556/velko.hpp +++ /dev/null @@ -1,13 +0,0 @@ -// Velko R4 / R5 - All rifles inherit - -class arifle_Velko_lxWS: arifle_Velko_base_lxWS { - recoil = QCLASS(556_LongBarrel); -}; - -class arifle_VelkoR5_lxWS: arifle_Velko_base_lxWS { - recoil = QCLASS(556_ShortBarrel); -}; - -class arifle_VelkoR5_GL_lxWS: arifle_VelkoR5_lxWS { - recoil = QCLASS(556_GL_Short); -}; diff --git a/addons/recoils/ws/556/xms.hpp b/addons/recoils/ws/556/xms.hpp deleted file mode 100644 index edaf1402..00000000 --- a/addons/recoils/ws/556/xms.hpp +++ /dev/null @@ -1,14 +0,0 @@ -// XMS Rifles - All rifles inherit - -// XMS - Short Barrel -class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { - recoil = QCLASS(556_Bullpup_Foregrip_Short); -}; - -class arifle_XMS_GL_lxWS: arifle_XMS_Base_lxWS { - recoil = QCLASS(556_GL_Short); -}; - -class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS { - recoil = QCLASS(556_GL_Short); -}; diff --git a/addons/recoils/ws/762N/slr.hpp b/addons/recoils/ws/762N/slr.hpp deleted file mode 100644 index 3ebcbce1..00000000 --- a/addons/recoils/ws/762N/slr.hpp +++ /dev/null @@ -1,11 +0,0 @@ -class arifle_SLR_lxWS: DMR_06_base_F { - recoil = QCLASS(762N_LongBarrel); -}; - -class arifle_SLR_GL_lxWS: arifle_SLR_lxWS { - recoil = QCLASS(762N_GL_Long); -}; - -class arifle_SLR_V_GL_lxWS: arifle_SLR_V_lxWS { - recoil = QCLASS(762N_GL_Long); -}; diff --git a/addons/recoils/ws/762R/galat.hpp b/addons/recoils/ws/762R/galat.hpp deleted file mode 100644 index 099b1cc4..00000000 --- a/addons/recoils/ws/762R/galat.hpp +++ /dev/null @@ -1,4 +0,0 @@ -// Galat - Only one rifle -class arifle_Galat_lxWS: arifle_Galat_base_lxWS { - recoil = QCLASS(762R_LongBarrel); -}; diff --git a/addons/recoils/ws/config.cpp b/addons/recoils/ws/config.cpp deleted file mode 100644 index 00540c6d..00000000 --- a/addons/recoils/ws/config.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - name = COMPONENT_NAME; - units[] = {}; - weapons[] = {}; - magazines[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = { - "tacgt_main", - "tacgt_recoils", - "data_f_lxWS_Loadorder", - }; - author = ECSTRING(main,Author); - authors[] = {"Mike"}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - skipWhenMissingDependencies = 1; - }; -}; - -class CfgWeapons { - // AA40 - class sgun_aa40_base_lxWS; - - // Galat - class arifle_Galat_base_lxWS; - - // Velko - class arifle_Velko_base_lxWS; - - // SLR - class arifle_SLR_V_lxWS; - class DMR_06_base_F; - - // XMS - class arifle_SPAR_01_base_F; - - #include "556\velko.hpp" - #include "556\xms.hpp" - #include "762R\galat.hpp" - #include "762N\slr.hpp" - #include "12G\aa40.hpp" -}; diff --git a/addons/recoils/ws/script_component.hpp b/addons/recoils/ws/script_component.hpp deleted file mode 100644 index 9f22dfa5..00000000 --- a/addons/recoils/ws/script_component.hpp +++ /dev/null @@ -1,4 +0,0 @@ -#define COMPONENT recoils_ws -#define COMPONENT_BEAUTIFIED Recoils Western Sahara -#include "\x\tacgt\addons\main\script_mod.hpp" -#include "\x\tacgt\addons\main\script_macros.hpp" diff --git a/addons/weapons/CfgRecoils.hpp b/addons/weapons/CfgRecoils.hpp index 9f683b4f..ba7280fa 100644 --- a/addons/weapons/CfgRecoils.hpp +++ b/addons/weapons/CfgRecoils.hpp @@ -1,14 +1,9 @@ class CfgRecoils { - class recoil_default; - class recoil_mk200: recoil_default { - muzzleOuter[] = {0.3, 0.7, 0.4, 0.2}; - kickBack[] = {0.02, 0.04}; - temporary = 0.005; - }; // LAMG more manageable recoil due to weight reduction from ammo. - class CLASS(recoil_mk200): recoil_mk200 { - muzzleOuter[] = {0.25, 0.55, 0.35, 0.2}; - kickBack[] = {0.02, 0.03}; - temporary = 0.004; + class CLASS(65_Long_MG) { + kickBack[] = {0.01, 0.03}; + muzzleOuter[] = {0.2, 0.4, 0.3, 0.3}; + permanent = 0.12; + temporary = 0.0125; }; }; diff --git a/addons/weapons/CfgWeapons.hpp b/addons/weapons/CfgWeapons.hpp index c3258cd8..645153ee 100644 --- a/addons/weapons/CfgWeapons.hpp +++ b/addons/weapons/CfgWeapons.hpp @@ -103,7 +103,7 @@ class CfgWeapons { displayName = "LAMG (GT Edition)"; descriptionShort = "GT Edition Light Machine-Gun"; scope = 2; - recoil = QCLASS(recoil_mk200); + recoil = QCLASS(65_Long_MG); magazines[] = { QCLASS(100Rnd_65x39_Ball_Belt), QCLASS(100Rnd_65x39_Ball_Tracer_Belt), From 81095cf6bb0e29efefc5ca7e5165bca814b07482 Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 5 Sep 2023 17:09:59 +0200 Subject: [PATCH 4/4] Remove WS ACE Compat (#152) Co-authored-by: Mike-MF --- addons/ws_compat/$PBOPREFIX$ | 1 - addons/ws_compat/CfgWeapons.hpp | 76 --------------------------- addons/ws_compat/README.md | 3 -- addons/ws_compat/config.cpp | 23 -------- addons/ws_compat/script_component.hpp | 4 -- 5 files changed, 107 deletions(-) delete mode 100644 addons/ws_compat/$PBOPREFIX$ delete mode 100644 addons/ws_compat/CfgWeapons.hpp delete mode 100644 addons/ws_compat/README.md delete mode 100644 addons/ws_compat/config.cpp delete mode 100644 addons/ws_compat/script_component.hpp diff --git a/addons/ws_compat/$PBOPREFIX$ b/addons/ws_compat/$PBOPREFIX$ deleted file mode 100644 index 135917f0..00000000 --- a/addons/ws_compat/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -x\tacgt\addons\compat_ws diff --git a/addons/ws_compat/CfgWeapons.hpp b/addons/ws_compat/CfgWeapons.hpp deleted file mode 100644 index c980762b..00000000 --- a/addons/ws_compat/CfgWeapons.hpp +++ /dev/null @@ -1,76 +0,0 @@ -class CfgWeapons { - // AA40 - class Rifle_Base_F; - class sgun_aa40_base_lxWS: Rifle_Base_F { - ACE_barrelLength = 457; - ACE_barrelTwist = 0.0; - ACE_twistDirection = 0; - }; - - // Galat Arm - class arifle_Galat_base_lxWS: Rifle_Base_F { - ACE_barrelLength = 535; - ACE_barrelTwist = 304.8; - ACE_twistDirection = 1; - }; - - // SA-77 - class Rifle_Long_Base_F; - class LMG_S77_base_lxWS: Rifle_Long_Base_F { - ACE_barrelLength = 550; - ACE_barrelTwist = 304.8; - ACE_twistDirection = 1; - }; - class LMG_S77_Compact_base_lxWS: LMG_S77_base_lxWS { - ACE_barrelLength = 500; - ACE_barrelTwist = 304.8; - ACE_twistDirection = 1; - }; - - // SLR - class DMR_06_base_F; - class arifle_SLR_lxWS: DMR_06_base_F { - ACE_barrelLength = 533; - ACE_barrelTwist = 279.4; - ACE_twistDirection = 1; - }; - - // Velko R4/R5 - class arifle_Velko_base_lxWS: arifle_Galat_base_lxWS { - ACE_barrelLength = 460; - ACE_barrelTwist = 304.8; - ACE_twistDirection = 1; - }; - class arifle_VelkoR5_lxWS: arifle_Velko_base_lxWS { - ACE_barrelLength = 332; - ACE_barrelTwist = 304.8; - ACE_twistDirection = 1; - }; - - // XMS - class arifle_SPAR_01_base_F; - class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { - ACE_barrelLength = 406.4; - ACE_barrelTwist = 178.0; - ACE_twistDirection = 1; - }; - - // Headgear - class lxWS_H_CapB_rvs_blk; - class lxWS_H_CapB_rvs_blk_ION: lxWS_H_CapB_rvs_blk { - ace_hearing_protection = 0.75; - ace_hearing_lowerVolume = 0.2; - }; - - class HelmetBase; - class lxWS_H_Tank_tan_F: HelmetBase { - ace_hearing_protection = 0.85; - ace_hearing_lowerVolume = 0.6; - }; - - class H_Cap_headphones; - class lxWS_H_Headset: H_Cap_headphones { - ace_hearing_protection = 0; - ace_hearing_lowerVolume = 0; - }; -}; diff --git a/addons/ws_compat/README.md b/addons/ws_compat/README.md deleted file mode 100644 index a6a0e6e8..00000000 --- a/addons/ws_compat/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Western Sahara Compat - -ACE Compatibility data for Western Sahara. diff --git a/addons/ws_compat/config.cpp b/addons/ws_compat/config.cpp deleted file mode 100644 index d9fbae6e..00000000 --- a/addons/ws_compat/config.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - name = COMPONENT_NAME; - units[] = {}; - weapons[] = {}; - magazines[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = { - "tacgt_main", - "Weapons_F_lxWS", - "Weapons_1_F_lxWS", - "Characters_f_lxWS_headgear" - }; - author = ECSTRING(main,Author); - authors[] = {"Mike"}; - url = ECSTRING(main,URL); - VERSION_CONFIG; - }; -}; - -#include "CfgWeapons.hpp" diff --git a/addons/ws_compat/script_component.hpp b/addons/ws_compat/script_component.hpp deleted file mode 100644 index 0877c807..00000000 --- a/addons/ws_compat/script_component.hpp +++ /dev/null @@ -1,4 +0,0 @@ -#define COMPONENT compat_ws -#define COMPONENT_BEAUTIFIED Western Sahara Compatibility -#include "\x\tacgt\addons\main\script_mod.hpp" -#include "\x\tacgt\addons\main\script_macros.hpp"