diff --git a/addons/ballistics/CfgVehicles.hpp b/addons/ballistics/CfgVehicles.hpp index cdc73dcd99..9923d083ad 100644 --- a/addons/ballistics/CfgVehicles.hpp +++ b/addons/ballistics/CfgVehicles.hpp @@ -4,15 +4,7 @@ count = COUNT; \ } -#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \ - name = #ITEM; \ - count = COUNT; \ -} - class CfgVehicles { - #include - #include - class NATO_Box_Base; class Box_NATO_Wps_F: NATO_Box_Base { class TransportMagazines { @@ -35,12 +27,6 @@ class CfgVehicles { }; class Box_NATO_Support_F: NATO_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_muzzle_mzls_H,5); - MACRO_ADDITEM(ACE_muzzle_mzls_B,5); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5); - }; class TransportMagazines { MACRO_ADDMAGAZINE(ACE_30Rnd_65x39_caseless_mag_SD,6); MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_SD,3); @@ -77,12 +63,6 @@ class CfgVehicles { }; class Box_East_Support_F: EAST_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_muzzle_mzls_H,5); - MACRO_ADDITEM(ACE_muzzle_mzls_B,5); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5); - }; class TransportMagazines { MACRO_ADDMAGAZINE(ACE_30Rnd_65x39_caseless_green_mag_SD,6); MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_SD,3); @@ -117,13 +97,6 @@ class CfgVehicles { }; class Box_IND_Support_F: IND_Box_Base { - class TransportItems { - MACRO_ADDITEM(ACE_muzzle_mzls_H,1); - MACRO_ADDITEM(ACE_muzzle_mzls_B,5); - MACRO_ADDITEM(ACE_muzzle_mzls_L,5); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5); - }; class TransportMagazines { MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_SD,6); }; @@ -186,13 +159,6 @@ class CfgVehicles { MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_SD,2); MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_AP,2);*/ }; - class TransportItems { - MACRO_ADDITEM(ACE_muzzle_mzls_H,2); - MACRO_ADDITEM(ACE_muzzle_mzls_B,2); - MACRO_ADDITEM(ACE_muzzle_mzls_L,2); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,2); - MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,2); - }; }; class Sign_F; diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp index a8a449e9dc..43a0bf365f 100644 --- a/addons/ballistics/CfgWeapons.hpp +++ b/addons/ballistics/CfgWeapons.hpp @@ -539,249 +539,4 @@ class CfgWeapons { }; }; }; - - - /* Flash suppressors */ - - class ACE_muzzle_mzls_H: ItemCore { - author = "$STR_ACE_Common_ACETeam"; - _generalMacro = "ACE_muzzle_mzls_H"; - htMin = 1; - htMax = 600; - afMax = 0; - mfMax = 0; - mFact = 1; - tBody = 100; - scope = 2; - displayName = "$STR_ACE_muzzle_mzls_H"; - picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa"; - model = "\A3\weapons_f\acc\acca_mzls_H_F"; - - class ItemInfo: InventoryMuzzleItem_Base_F { - mass = 8; - soundTypeIndex = 0; - muzzleEnd = "zaslehPoint"; - alternativeFire = "Zasleh2"; - - class MagazineCoef { - initSpeed = 1.0; - }; - - class AmmoCoef { - hit = 1.0; - visibleFire = 0.5; - audibleFire = 1.0; - visibleFireTime = 0.5; - audibleFireTime = 1.0; - cost = 1.0; - typicalSpeed = 1.0; - airFriction = 1.0; - }; - - class MuzzleCoef { - dispersionCoef = "0.9f"; - artilleryDispersionCoef = "1.0f"; - fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; - minRangeCoef = "1.0f"; - minRangeProbabCoef = "1.0f"; - midRangeCoef = "1.0f"; - midRangeProbabCoef = "1.0f"; - maxRangeCoef = "1.0f"; - maxRangeProbabCoef = "1.0f"; - }; - }; - - inertia = 0.2; - }; - - class ACE_muzzle_mzls_B: ACE_muzzle_mzls_H { - author = "$STR_ACE_Common_ACETeam"; - _generalMacro = "ACE_muzzle_mzls_B"; - displayName = "$STR_ACE_muzzle_mzls_B"; - picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa"; - model = "\A3\weapons_f\acc\acca_mzls_H_F"; - - class ItemInfo: ItemInfo { - mass = 6; - soundTypeIndex = 0; - muzzleEnd = "zaslehPoint"; - alternativeFire = "Zasleh2"; - - class MagazineCoef { - initSpeed = 1.0; - }; - - class AmmoCoef { - hit = 1.0; - visibleFire = 0.5; - audibleFire = 1.0; - visibleFireTime = 0.5; - audibleFireTime = 1.0; - cost = 1.0; - typicalSpeed = 1.0; - airFriction = 1.0; - }; - - class MuzzleCoef { - dispersionCoef = "0.9f"; - artilleryDispersionCoef = "1.0f"; - fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; - minRangeCoef = "1.0f"; - minRangeProbabCoef = "1.0f"; - midRangeCoef = "1.0f"; - midRangeProbabCoef = "1.0f"; - maxRangeCoef = "1.0f"; - maxRangeProbabCoef = "1.0f"; - }; - }; - - inertia = 0.2; - }; - - class ACE_muzzle_mzls_L: ACE_muzzle_mzls_H { - author = "$STR_ACE_Common_ACETeam"; - _generalMacro = "ACE_muzzle_mzls_L"; - displayName = "$STR_ACE_muzzle_mzls_L"; - picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa"; - model = "\A3\weapons_f\acc\acca_mzls_l_F"; - - class ItemInfo: ItemInfo { - mass = 6; - soundTypeIndex = 0; - muzzleEnd = "zaslehPoint"; - alternativeFire = "Zasleh2"; - - class MagazineCoef { - initSpeed = 1.0; - }; - - class AmmoCoef { - hit = 1.0; - visibleFire = 0.5; - audibleFire = 1.0; - visibleFireTime = 0.5; - audibleFireTime = 1.0; - cost = 1.0; - typicalSpeed = 1.0; - airFriction = 1.0; - }; - - class MuzzleCoef { - dispersionCoef = "0.9f"; - artilleryDispersionCoef = "1.0f"; - fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; - minRangeCoef = "1.0f"; - minRangeProbabCoef = "1.0f"; - midRangeCoef = "1.0f"; - midRangeProbabCoef = "1.0f"; - maxRangeCoef = "1.0f"; - maxRangeProbabCoef = "1.0f"; - }; - }; - - inertia = 0.1; - }; - - class ACE_muzzle_mzls_smg_01: ACE_muzzle_mzls_H { - author = "$STR_ACE_Common_ACETeam"; - _generalMacro = "ACE_muzzle_mzls_smg_01"; - displayName = "$STR_ACE_muzzle_mzls_smg_01"; - picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa"; - model = "\A3\weapons_f\acc\acca_mzls_H_F"; //"\A3\weapons_f\acc\acca_mzls_smg_01_F"; - - class ItemInfo: ItemInfo { - mass = 6; - soundTypeIndex = 0; - muzzleEnd = "zaslehPoint"; - alternativeFire = "Zasleh2"; - - class MagazineCoef { - initSpeed = 1.0; - }; - - class AmmoCoef { - hit = 1.0; - visibleFire = 0.5; - audibleFire = 1.0; - visibleFireTime = 0.5; - audibleFireTime = 1.0; - cost = 1.0; - typicalSpeed = 1.0; - airFriction = 1.0; - }; - - class MuzzleCoef { - dispersionCoef = "0.9f"; - artilleryDispersionCoef = "1.0f"; - fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; - minRangeCoef = "1.0f"; - minRangeProbabCoef = "1.0f"; - midRangeCoef = "1.0f"; - midRangeProbabCoef = "1.0f"; - maxRangeCoef = "1.0f"; - maxRangeProbabCoef = "1.0f"; - }; - }; - - inertia = 0.1; - }; - - class ACE_muzzle_mzls_smg_02: ACE_muzzle_mzls_H { - author = "$STR_ACE_Common_ACETeam"; - _generalMacro = "ACE_muzzle_mzls_smg_02"; - displayName = "$STR_ACE_muzzle_mzls_smg_02"; - picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa"; - model = "\A3\weapons_f\acc\acca_mzls_H_F"; //"\A3\weapons_f\acc\acca_mzls_smg_01_F"; - - class ItemInfo: ItemInfo { - mass = 6; - soundTypeIndex = 0; - muzzleEnd = "zaslehPoint"; - alternativeFire = "Zasleh2"; - - class MagazineCoef { - initSpeed = 1.0; - }; - - class AmmoCoef { - hit = 1.0; - visibleFire = 0.5; - audibleFire = 1.0; - visibleFireTime = 0.5; - audibleFireTime = 1.0; - cost = 1.0; - typicalSpeed = 1.0; - airFriction = 1.0; - }; - - class MuzzleCoef { - dispersionCoef = "0.9f"; - artilleryDispersionCoef = "1.0f"; - fireLightCoef = "0.5f"; - recoilCoef = "1.0f"; - recoilProneCoef = "1.0f"; - minRangeCoef = "1.0f"; - minRangeProbabCoef = "1.0f"; - midRangeCoef = "1.0f"; - midRangeProbabCoef = "1.0f"; - maxRangeCoef = "1.0f"; - maxRangeProbabCoef = "1.0f"; - }; - }; - - inertia = 0.1; - }; - - - /* Vests */ - - #include }; diff --git a/addons/ballistics/config.cpp b/addons/ballistics/config.cpp index 9e8614c3fb..e94c9f4efb 100644 --- a/addons/ballistics/config.cpp +++ b/addons/ballistics/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { class ADDON { units[] = {"ACE_TargetWall"}; - weapons[] = {"ACE_muzzle_mzls_H","ACE_muzzle_mzls_B","ACE_muzzle_mzls_L","ACE_muzzle_mzls_smg_01","ACE_muzzle_mzls_smg_02"}; + weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; author[] = {"TaoSensai","commy2"}; diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml index 32e5c8097d..429e4aabe6 100644 --- a/addons/ballistics/stringtable.xml +++ b/addons/ballistics/stringtable.xml @@ -486,66 +486,5 @@ Калибр: 7.62x51mm M118LR<br />Патронов: 20<br />Тип: M14 Calibro: 7.62x51mm M118LR<br />Munizioni:20<br />In uso su: M14 - - - Flash Suppressor (6.5 mm) - Lángrejtő (6,5 mm) - Mündungsfeuerdämpfer (6,5 mm) - Soppressore di fiamma (6.5mm) - Supressor de Clarão (6,5mm) - Tłumik płomieni (6,5 mm) - Tlumič záblesku (6,5 mm) - Cache-flamme (6,5 mm) - Пламегаситель (6,5 мм) - Supresor (6,5 mm) - - - Flash Suppressor (7.62 mm) - Lángrejtő (7,62 mm) - Mündungsfeuerdämpfer (7,62 mm) - Soppressore di fiamma (7.62mm) - Supressor de Clarão (7,62mm) - Tłumik płomieni (7,62 mm) - Tlumič záblesku (7,62 mm) - Cache-flamme (7,62 mm) - Пламегаситель (7,62 мм) - Supresor (7,62 mm) - - - Flash Suppressor (5.56 mm) - Lángrejtő (5,56 mm) - Mündungsfeuerdämpfer (5,56 mm) - Soppressore di fiamma (5.56mm) - Supressor de Clarão (5,56mm) - Tłumik płomieni (5,56 mm) - Tlumič záblesku (5,56 mm) - Cache-flamme (5,56 mm) - Пламегаситель (5,56 мм) - Supresor (5,56 mm) - - - Flash Suppressor (.45 ACP) - Lángrejtő (.45 ACP) - Mündungsfeuerdämpfer (.45 ACP) - Soppressore di fiamma (.45 ACP) - Supressor de Clarão (.45 ACP) - Tłumik płomieni (.45 ACP) - Tlumič záblesku (.45 ACP) - Cache-flamme (.45 ACP) - Пламегаситель (.45 ACP) - Supresor (.45 ACP) - - - Flash Suppressor (9 mm) - Lángrejtő (9 mm) - Mündungsfeuerdämpfer (9 mm) - Soppressore di fiamma (9 mm) - Supressor de Clarão (9mm) - Tłumik płomieni (9 mm) - Tlumič záblesku (9 mm) - Cache-flamme (9 mm) - Пламегаситель (9 мм) - Supresor (9 mm) - - \ No newline at end of file + diff --git a/addons/flashsuppressors/$PBOPREFIX$ b/addons/flashsuppressors/$PBOPREFIX$ new file mode 100644 index 0000000000..fce4d8c366 --- /dev/null +++ b/addons/flashsuppressors/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\flashsuppressors \ No newline at end of file diff --git a/addons/flashsuppressors/CfgVehicles.hpp b/addons/flashsuppressors/CfgVehicles.hpp new file mode 100644 index 0000000000..40dc505d64 --- /dev/null +++ b/addons/flashsuppressors/CfgVehicles.hpp @@ -0,0 +1,48 @@ + +#define MACRO_ADDITEM(ITEM,COUNT) class _xx_##ITEM { \ + name = #ITEM; \ + count = COUNT; \ +} + +class CfgVehicles { + class NATO_Box_Base; + class Box_NATO_Support_F: NATO_Box_Base { + class TransportItems { + MACRO_ADDITEM(ACE_muzzle_mzls_H,5); + MACRO_ADDITEM(ACE_muzzle_mzls_B,5); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5); + }; + }; + + class EAST_Box_Base; + class Box_East_Support_F: EAST_Box_Base { + class TransportItems { + MACRO_ADDITEM(ACE_muzzle_mzls_H,5); + MACRO_ADDITEM(ACE_muzzle_mzls_B,5); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5); + }; + }; + + class IND_Box_Base; + class Box_IND_Support_F: IND_Box_Base { + class TransportItems { + MACRO_ADDITEM(ACE_muzzle_mzls_H,1); + MACRO_ADDITEM(ACE_muzzle_mzls_B,5); + MACRO_ADDITEM(ACE_muzzle_mzls_L,5); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,5); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,5); + }; + }; + + class ACE_Box_Misc: Box_NATO_Support_F { + class TransportItems { + MACRO_ADDITEM(ACE_muzzle_mzls_H,2); + MACRO_ADDITEM(ACE_muzzle_mzls_B,2); + MACRO_ADDITEM(ACE_muzzle_mzls_L,2); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_01,2); + MACRO_ADDITEM(ACE_muzzle_mzls_smg_02,2); + }; + }; +}; diff --git a/addons/flashsuppressors/CfgWeapons.hpp b/addons/flashsuppressors/CfgWeapons.hpp new file mode 100644 index 0000000000..973d438961 --- /dev/null +++ b/addons/flashsuppressors/CfgWeapons.hpp @@ -0,0 +1,242 @@ + +class CfgWeapons { + class ItemCore; + class InventoryMuzzleItem_Base_F; + + class ACE_muzzle_mzls_H: ItemCore { + author = "$STR_ACE_Common_ACETeam"; + _generalMacro = "ACE_muzzle_mzls_H"; + htMin = 1; + htMax = 600; + afMax = 0; + mfMax = 0; + mFact = 1; + tBody = 100; + scope = 2; + displayName = "$STR_ACE_muzzle_mzls_H"; + picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa"; + model = "\A3\weapons_f\acc\acca_mzls_H_F"; + + class ItemInfo: InventoryMuzzleItem_Base_F { + mass = 8; + soundTypeIndex = 0; + muzzleEnd = "zaslehPoint"; + alternativeFire = "Zasleh2"; + + class MagazineCoef { + initSpeed = 1.0; + }; + + class AmmoCoef { + hit = 1.0; + visibleFire = 0.5; + audibleFire = 1.0; + visibleFireTime = 0.5; + audibleFireTime = 1.0; + cost = 1.0; + typicalSpeed = 1.0; + airFriction = 1.0; + }; + + class MuzzleCoef { + dispersionCoef = "0.9f"; + artilleryDispersionCoef = "1.0f"; + fireLightCoef = "0.5f"; + recoilCoef = "1.0f"; + recoilProneCoef = "1.0f"; + minRangeCoef = "1.0f"; + minRangeProbabCoef = "1.0f"; + midRangeCoef = "1.0f"; + midRangeProbabCoef = "1.0f"; + maxRangeCoef = "1.0f"; + maxRangeProbabCoef = "1.0f"; + }; + }; + + inertia = 0.2; + }; + + class ACE_muzzle_mzls_B: ACE_muzzle_mzls_H { + author = "$STR_ACE_Common_ACETeam"; + _generalMacro = "ACE_muzzle_mzls_B"; + displayName = "$STR_ACE_muzzle_mzls_B"; + picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_h_ca.paa"; + model = "\A3\weapons_f\acc\acca_mzls_H_F"; + + class ItemInfo: ItemInfo { + mass = 6; + soundTypeIndex = 0; + muzzleEnd = "zaslehPoint"; + alternativeFire = "Zasleh2"; + + class MagazineCoef { + initSpeed = 1.0; + }; + + class AmmoCoef { + hit = 1.0; + visibleFire = 0.5; + audibleFire = 1.0; + visibleFireTime = 0.5; + audibleFireTime = 1.0; + cost = 1.0; + typicalSpeed = 1.0; + airFriction = 1.0; + }; + + class MuzzleCoef { + dispersionCoef = "0.9f"; + artilleryDispersionCoef = "1.0f"; + fireLightCoef = "0.5f"; + recoilCoef = "1.0f"; + recoilProneCoef = "1.0f"; + minRangeCoef = "1.0f"; + minRangeProbabCoef = "1.0f"; + midRangeCoef = "1.0f"; + midRangeProbabCoef = "1.0f"; + maxRangeCoef = "1.0f"; + maxRangeProbabCoef = "1.0f"; + }; + }; + + inertia = 0.2; + }; + + class ACE_muzzle_mzls_L: ACE_muzzle_mzls_H { + author = "$STR_ACE_Common_ACETeam"; + _generalMacro = "ACE_muzzle_mzls_L"; + displayName = "$STR_ACE_muzzle_mzls_L"; + picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa"; + model = "\A3\weapons_f\acc\acca_mzls_l_F"; + + class ItemInfo: ItemInfo { + mass = 6; + soundTypeIndex = 0; + muzzleEnd = "zaslehPoint"; + alternativeFire = "Zasleh2"; + + class MagazineCoef { + initSpeed = 1.0; + }; + + class AmmoCoef { + hit = 1.0; + visibleFire = 0.5; + audibleFire = 1.0; + visibleFireTime = 0.5; + audibleFireTime = 1.0; + cost = 1.0; + typicalSpeed = 1.0; + airFriction = 1.0; + }; + + class MuzzleCoef { + dispersionCoef = "0.9f"; + artilleryDispersionCoef = "1.0f"; + fireLightCoef = "0.5f"; + recoilCoef = "1.0f"; + recoilProneCoef = "1.0f"; + minRangeCoef = "1.0f"; + minRangeProbabCoef = "1.0f"; + midRangeCoef = "1.0f"; + midRangeProbabCoef = "1.0f"; + maxRangeCoef = "1.0f"; + maxRangeProbabCoef = "1.0f"; + }; + }; + + inertia = 0.1; + }; + + class ACE_muzzle_mzls_smg_01: ACE_muzzle_mzls_H { + author = "$STR_ACE_Common_ACETeam"; + _generalMacro = "ACE_muzzle_mzls_smg_01"; + displayName = "$STR_ACE_muzzle_mzls_smg_01"; + picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa"; + model = "\A3\weapons_f\acc\acca_mzls_H_F"; //"\A3\weapons_f\acc\acca_mzls_smg_01_F"; + + class ItemInfo: ItemInfo { + mass = 6; + soundTypeIndex = 0; + muzzleEnd = "zaslehPoint"; + alternativeFire = "Zasleh2"; + + class MagazineCoef { + initSpeed = 1.0; + }; + + class AmmoCoef { + hit = 1.0; + visibleFire = 0.5; + audibleFire = 1.0; + visibleFireTime = 0.5; + audibleFireTime = 1.0; + cost = 1.0; + typicalSpeed = 1.0; + airFriction = 1.0; + }; + + class MuzzleCoef { + dispersionCoef = "0.9f"; + artilleryDispersionCoef = "1.0f"; + fireLightCoef = "0.5f"; + recoilCoef = "1.0f"; + recoilProneCoef = "1.0f"; + minRangeCoef = "1.0f"; + minRangeProbabCoef = "1.0f"; + midRangeCoef = "1.0f"; + midRangeProbabCoef = "1.0f"; + maxRangeCoef = "1.0f"; + maxRangeProbabCoef = "1.0f"; + }; + }; + + inertia = 0.1; + }; + + class ACE_muzzle_mzls_smg_02: ACE_muzzle_mzls_H { + author = "$STR_ACE_Common_ACETeam"; + _generalMacro = "ACE_muzzle_mzls_smg_02"; + displayName = "$STR_ACE_muzzle_mzls_smg_02"; + picture = "\A3\weapons_F\Data\UI\gear_acca_mzls_l_ca.paa"; + model = "\A3\weapons_f\acc\acca_mzls_H_F"; //"\A3\weapons_f\acc\acca_mzls_smg_01_F"; + + class ItemInfo: ItemInfo { + mass = 6; + soundTypeIndex = 0; + muzzleEnd = "zaslehPoint"; + alternativeFire = "Zasleh2"; + + class MagazineCoef { + initSpeed = 1.0; + }; + + class AmmoCoef { + hit = 1.0; + visibleFire = 0.5; + audibleFire = 1.0; + visibleFireTime = 0.5; + audibleFireTime = 1.0; + cost = 1.0; + typicalSpeed = 1.0; + airFriction = 1.0; + }; + + class MuzzleCoef { + dispersionCoef = "0.9f"; + artilleryDispersionCoef = "1.0f"; + fireLightCoef = "0.5f"; + recoilCoef = "1.0f"; + recoilProneCoef = "1.0f"; + minRangeCoef = "1.0f"; + minRangeProbabCoef = "1.0f"; + midRangeCoef = "1.0f"; + midRangeProbabCoef = "1.0f"; + maxRangeCoef = "1.0f"; + maxRangeProbabCoef = "1.0f"; + }; + }; + + inertia = 0.1; + }; +}; diff --git a/addons/flashsuppressors/config.cpp b/addons/flashsuppressors/config.cpp new file mode 100644 index 0000000000..bc04cdefea --- /dev/null +++ b/addons/flashsuppressors/config.cpp @@ -0,0 +1,16 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {}; + weapons[] = {"ACE_muzzle_mzls_H","ACE_muzzle_mzls_B","ACE_muzzle_mzls_L","ACE_muzzle_mzls_smg_01","ACE_muzzle_mzls_smg_02"}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author[] = {"TaoSensai","commy2"}; + authorUrl = "https://github.com/Taosenai/tmr"; + VERSION_CONFIG; + }; +}; + +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" diff --git a/addons/flashsuppressors/newclasses.txt b/addons/flashsuppressors/newclasses.txt new file mode 100644 index 0000000000..5e9543fa37 --- /dev/null +++ b/addons/flashsuppressors/newclasses.txt @@ -0,0 +1,6 @@ + +ACE_muzzle_mzls_H +ACE_muzzle_mzls_B +ACE_muzzle_mzls_L +ACE_muzzle_mzls_smg_01 +ACE_muzzle_mzls_smg_02 diff --git a/addons/flashsuppressors/script_component.hpp b/addons/flashsuppressors/script_component.hpp new file mode 100644 index 0000000000..bb1a7c8f0c --- /dev/null +++ b/addons/flashsuppressors/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT flashsuppressors +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_FLASHSUPPRESSORS + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_ENABLED_FLASHSUPPRESSORS + #define DEBUG_SETTINGS DEBUG_ENABLED_FLASHSUPPRESSORS +#endif + +#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/flashsuppressors/stringtable.xml b/addons/flashsuppressors/stringtable.xml new file mode 100644 index 0000000000..3f6cc7b0d2 --- /dev/null +++ b/addons/flashsuppressors/stringtable.xml @@ -0,0 +1,66 @@ + + + + + + Flash Suppressor (6.5 mm) + Lángrejtő (6,5 mm) + Mündungsfeuerdämpfer (6,5 mm) + Soppressore di fiamma (6.5mm) + Supressor de Clarão (6,5mm) + Tłumik płomieni (6,5 mm) + Tlumič záblesku (6,5 mm) + Cache-flamme (6,5 mm) + Пламегаситель (6,5 мм) + Supresor (6,5 mm) + + + Flash Suppressor (7.62 mm) + Lángrejtő (7,62 mm) + Mündungsfeuerdämpfer (7,62 mm) + Soppressore di fiamma (7.62mm) + Supressor de Clarão (7,62mm) + Tłumik płomieni (7,62 mm) + Tlumič záblesku (7,62 mm) + Cache-flamme (7,62 mm) + Пламегаситель (7,62 мм) + Supresor (7,62 mm) + + + Flash Suppressor (5.56 mm) + Lángrejtő (5,56 mm) + Mündungsfeuerdämpfer (5,56 mm) + Soppressore di fiamma (5.56mm) + Supressor de Clarão (5,56mm) + Tłumik płomieni (5,56 mm) + Tlumič záblesku (5,56 mm) + Cache-flamme (5,56 mm) + Пламегаситель (5,56 мм) + Supresor (5,56 mm) + + + Flash Suppressor (.45 ACP) + Lángrejtő (.45 ACP) + Mündungsfeuerdämpfer (.45 ACP) + Soppressore di fiamma (.45 ACP) + Supressor de Clarão (.45 ACP) + Tłumik płomieni (.45 ACP) + Tlumič záblesku (.45 ACP) + Cache-flamme (.45 ACP) + Пламегаситель (.45 ACP) + Supresor (.45 ACP) + + + Flash Suppressor (9 mm) + Lángrejtő (9 mm) + Mündungsfeuerdämpfer (9 mm) + Soppressore di fiamma (9 mm) + Supressor de Clarão (9mm) + Tłumik płomieni (9 mm) + Tlumič záblesku (9 mm) + Cache-flamme (9 mm) + Пламегаситель (9 мм) + Supresor (9 mm) + + + diff --git a/addons/protection/$PBOPREFIX$ b/addons/protection/$PBOPREFIX$ new file mode 100644 index 0000000000..7ba9736ebe --- /dev/null +++ b/addons/protection/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\protection \ No newline at end of file diff --git a/addons/protection/CfgVehicles.hpp b/addons/protection/CfgVehicles.hpp new file mode 100644 index 0000000000..bce583e2ec --- /dev/null +++ b/addons/protection/CfgVehicles.hpp @@ -0,0 +1,5 @@ + +class CfgVehicles { + #include + #include +}; diff --git a/addons/protection/CfgWeapons.hpp b/addons/protection/CfgWeapons.hpp new file mode 100644 index 0000000000..3f706fed41 --- /dev/null +++ b/addons/protection/CfgWeapons.hpp @@ -0,0 +1,4 @@ + +class CfgWeapons { + #include +}; diff --git a/addons/ballistics/FixHelmets.hpp b/addons/protection/FixHelmets.hpp similarity index 100% rename from addons/ballistics/FixHelmets.hpp rename to addons/protection/FixHelmets.hpp diff --git a/addons/ballistics/FixUniforms.hpp b/addons/protection/FixUniforms.hpp similarity index 100% rename from addons/ballistics/FixUniforms.hpp rename to addons/protection/FixUniforms.hpp diff --git a/addons/ballistics/FixVests.hpp b/addons/protection/FixVests.hpp similarity index 100% rename from addons/ballistics/FixVests.hpp rename to addons/protection/FixVests.hpp diff --git a/addons/protection/config.cpp b/addons/protection/config.cpp new file mode 100644 index 0000000000..fb81590d90 --- /dev/null +++ b/addons/protection/config.cpp @@ -0,0 +1,16 @@ +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = {"ace_common"}; + author[] = {"TaoSensai","commy2"}; + authorUrl = "https://github.com/Taosenai/tmr"; + VERSION_CONFIG; + }; +}; + +#include "CfgVehicles.hpp" +#include "CfgWeapons.hpp" diff --git a/addons/protection/script_component.hpp b/addons/protection/script_component.hpp new file mode 100644 index 0000000000..1b2774a8ef --- /dev/null +++ b/addons/protection/script_component.hpp @@ -0,0 +1,12 @@ +#define COMPONENT protection +#include "\z\ace\addons\main\script_mod.hpp" + +#ifdef DEBUG_ENABLED_PROTECTION + #define DEBUG_MODE_FULL +#endif + +#ifdef DEBUG_ENABLED_PROTECTION + #define DEBUG_SETTINGS DEBUG_ENABLED_PROTECTION +#endif + +#include "\z\ace\addons\main\script_macros.hpp" \ No newline at end of file