From f8d482374adbc491331482a55274fb6c3b003c6f Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sun, 21 Jan 2024 20:09:03 -0500 Subject: [PATCH 01/16] Project Update --- .hemtt/project.toml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index d68de4c8..493755c7 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -31,4 +31,18 @@ preset = "Hemtt" [hemtt.launch] workshop = [ "450814997", # CBA_A3's Workshop ID + "463939057", # ACE3 + "843577117", # RHS USAF ] +parameters = [ + "-skipIntro", # These parameters are passed to the Arma 3 executable + "-noSplash", # They do not need to be added to your list + "-showScriptErrors", # You can add additional parameters here + "-debug", + "-filePatching", + "C:\\Users\\Jonah Pool\\Documents\\Arma 3 - Other Profiles\\SGT%2eTurn%2eJ\\missions\\StrykerDragoon_NoScripting.Stratis\\mission.sqm", # Launch into existing Editor Mission - \\ needed +] + + +[hemtt.dev] +exclude = ["addons/gear"] From 293f7f2a7bae357e6ef8b3a243f8f909829d7217 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 12:28:33 -0500 Subject: [PATCH 02/16] Added HEI and changed magazine sizes --- addons/vehicles_dragoon/CfgAmmo.hpp | 39 ++++++ addons/vehicles_dragoon/CfgMagazines.hpp | 40 ++++++ addons/vehicles_dragoon/CfgWeapons.hpp | 159 +++++++++++++++++++++++ addons/vehicles_dragoon/config.cpp | 3 + 4 files changed, 241 insertions(+) create mode 100644 addons/vehicles_dragoon/CfgAmmo.hpp create mode 100644 addons/vehicles_dragoon/CfgMagazines.hpp create mode 100644 addons/vehicles_dragoon/CfgWeapons.hpp diff --git a/addons/vehicles_dragoon/CfgAmmo.hpp b/addons/vehicles_dragoon/CfgAmmo.hpp new file mode 100644 index 00000000..2419b100 --- /dev/null +++ b/addons/vehicles_dragoon/CfgAmmo.hpp @@ -0,0 +1,39 @@ +class CfgAmmo { + class B_30mm_HE; + class B_30mm_HE_Tracer_Red; + class cav_B_30mm_HEI_Tracer_Red: B_30mm_HE_Tracer_Red { + ace_vehicle_damage_incendiary = 0.3; + indirectHitRange = 6; + indirectHit = 8; + }; + // TODO: FCS Air Burst + class cav_B_30mm_HEAB_Tracer_Red: B_30mm_HE_Tracer_Red { + ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) + ace_frag_metal = 363; // Amount of metal being fragmented (grams) - information below + ace_frag_charge = 185; // Amount of explosive filler (grams) - information below + ace_frag_gurney_c = 2843; // Gurney velocity constant for explosive type - information below + ace_frag_gurney_k = 1/2; // Gurney shape factor - information below + ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below + ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below + ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below + deflecting = 0; + indirectHitRange = 2; + indirectHit = 6; + airbursting = 1; + ABSubmun = "cav_B_30mm_HEAB_Helper"; + }; + class cav_B_30mm_HEAB_Helper: B_30mm_HE { + ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) + ace_frag_metal = 363; // Amount of metal being fragmented (grams) - information below + ace_frag_charge = 185; // Amount of explosive filler (grams) - information below + ace_frag_gurney_c = 2843; // Gurney velocity constant for explosive type - information below + ace_frag_gurney_k = 1/2; // Gurney shape factor - information below + ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below + ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below + ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below + indirectHitRange = 2; + indirectHit = 6; + simulation = "shotRocket"; + timeToLive = 0; + }; +}; \ No newline at end of file diff --git a/addons/vehicles_dragoon/CfgMagazines.hpp b/addons/vehicles_dragoon/CfgMagazines.hpp new file mode 100644 index 00000000..00cf4fb2 --- /dev/null +++ b/addons/vehicles_dragoon/CfgMagazines.hpp @@ -0,0 +1,40 @@ +class CfgMagazines { + class 140Rnd_30mm_MP_shells_Tracer_Red; + class 78Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells_Tracer_Red { + displayName = CSTRING(78Rnd_30mm_MP_shells_Tracer_Red); + displayNameShort = CSTRING(78Rnd_30mm_MP_shells_Tracer_Red_dispShort); + displayNameMFDFormat = "MP-T"; + count=78; + }; + class 60Rnd_30mm_APFSDS_shells_Tracer_Red; + class 78Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells_Tracer_Red { + displayName = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red); + displayNameShort = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort); + count=78; + }; + class 78Rnd_30mm_HEI_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red { + ammo = "cav_B_30mm_HEI_Tracer_Red"; + displayNameMFDFormat = "HEI-T"; + displayName = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red); + displayNameShort = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red_dispShort); + }; + class 4Rnd_Titan_long_missiles; + class cav_2Rnd_GAA_missiles: 4Rnd_Titan_long_missiles { + displayName = CSTRING(cav_2Rnd_GAA_missiles); + displayNameShort = CSTRING(cav_2Rnd_GAA_missiles_dispShort); + count=2; + }; + // TODO: ACE FCS Air Burst Mags + class 78Rnd_30mm_HEABT_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red { + ammo="cav_B_30mm_HEAB_Tracer_Red"; + displayNameMFDFormat="HEAB-T"; + displayName=CSTRING(78Rnd_30mm_HEAB_shells_Tracer_Red); + displayNameShort=CSTRING(78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort); + }; + class 200Rnd_762x51_Belt_Red; + class cav_mag_300Rnd_762x51_Belt_Red: 200Rnd_762x51_Belt_Red { + ammo="B_762x51_Tracer_Red"; + displayName=CSTRING(cav_mag_300Rnd_762x51_Belt_Red); + count=300; + }; +}; \ No newline at end of file diff --git a/addons/vehicles_dragoon/CfgWeapons.hpp b/addons/vehicles_dragoon/CfgWeapons.hpp new file mode 100644 index 00000000..5f889600 --- /dev/null +++ b/addons/vehicles_dragoon/CfgWeapons.hpp @@ -0,0 +1,159 @@ +class CfgWeapons { + class CannonCore; + class autocannon_Base_F: CannonCore { + class player; + }; + class autocannon_30mm_CTWS: autocannon_Base_F + { + displayName = "$STR_A3_GATLING_30MM_CTWS0"; + muzzles[] = {"HE","AP"}; + class HE: autocannon_Base_F + { + displayName = "$STR_A3_GATLING_30MM_CTWS0"; + magazines[] = {"140Rnd_30mm_MP_shells","140Rnd_30mm_MP_shells_Tracer_Red","140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Yellow","78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; + magazineReloadTime = 40; + class player: player + { + dispersion = 0.0018; + }; + class close: player + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 3; + burstRangeMax = 6; + aiRateOfFire = 1; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 200; + minRange = 0; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.7; + maxRange = 800; + maxRangeProbab = 0.8; + }; + class short: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 5; + aiRateOfFire = 2; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 600; + minRange = 600; + minRangeProbab = 0.75; + midRange = 800; + midRangeProbab = 0.8; + maxRange = 1200; + maxRangeProbab = 0.8; + }; + class medium: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 3; + aiRateOfFire = 2; + aiRateOfFireDispersion = 3; + aiRateOfFireDistance = 1000; + minRange = 1000; + minRangeProbab = 0.8; + midRange = 1500; + midRangeProbab = 0.8; + maxRange = 2000; + maxRangeProbab = 0.7; + }; + class far: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 1; + aiRateOfFire = 2; + aiRateOfFireDispersion = 4; + aiRateOfFireDistance = 1800; + minRange = 1800; + minRangeProbab = 0.74; + midRange = 2400; + midRangeProbab = 0.65; + maxRange = 3000; + maxRangeProbab = 0.05; + }; + }; + class AP: autocannon_Base_F + { + displayName = "$STR_A3_GATLING_30MM_CTWS0"; + magazines[] = {"60Rnd_30mm_APFSDS_shells","60Rnd_30mm_APFSDS_shells_Tracer_Red","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Yellow","78Rnd_30mm_APFSDS_shells_Tracer_Red"}; + magazineReloadTime = 40; + class player: player + { + dispersion = 0.00108; + }; + class close: player + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 3; + burstRangeMax = 6; + aiRateOfFire = 1; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 200; + minRange = 0; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.7; + maxRange = 800; + maxRangeProbab = 0.8; + }; + class short: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 5; + aiRateOfFire = 2; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 600; + minRange = 600; + minRangeProbab = 0.75; + midRange = 800; + midRangeProbab = 0.8; + maxRange = 1200; + maxRangeProbab = 0.8; + }; + class medium: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 3; + aiRateOfFire = 2; + aiRateOfFireDispersion = 3; + aiRateOfFireDistance = 1000; + minRange = 1000; + minRangeProbab = 0.8; + midRange = 1500; + midRangeProbab = 0.8; + maxRange = 2000; + maxRangeProbab = 0.7; + }; + class far: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 1; + aiRateOfFire = 2; + aiRateOfFireDispersion = 4; + aiRateOfFireDistance = 1800; + minRange = 1800; + minRangeProbab = 0.74; + midRange = 2400; + midRangeProbab = 0.65; + maxRange = 3000; + maxRangeProbab = 0.05; + }; + }; + }; +}; \ No newline at end of file diff --git a/addons/vehicles_dragoon/config.cpp b/addons/vehicles_dragoon/config.cpp index 8abac371..77effdb0 100644 --- a/addons/vehicles_dragoon/config.cpp +++ b/addons/vehicles_dragoon/config.cpp @@ -48,5 +48,8 @@ class CfgPatches { }; }; +#include "CfgAmmo.hpp" +#include "CfgMagazines.hpp" +#include "CfgWeapons.hpp" #include "CfgVehicles.hpp" #include "CfgEditorSubcategories.hpp" From 7d550fbd024a199e2b12074aeb0fcfd59137c5af Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 12:35:45 -0500 Subject: [PATCH 03/16] Fix string table --- addons/vehicles_dragoon/stringtable.xml | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/addons/vehicles_dragoon/stringtable.xml b/addons/vehicles_dragoon/stringtable.xml index 00c3d10d..c4ccd383 100644 --- a/addons/vehicles_dragoon/stringtable.xml +++ b/addons/vehicles_dragoon/stringtable.xml @@ -1,5 +1,6 @@ + APC (Woodland) @@ -9,7 +10,43 @@ APC (Arctic) + + + + 78Rnd MP Tracer (Red) + + + MP-T + + + 78Rnd APFSDS Tracer (Red) + + + APFSDS-T + + + 78Rnd HEAB Tracer (Red) + + + HEAB-T + + + 78Rnd HEI Tracer (Red) + + + HEI-T + + + 300Rnd Linked M80A1 EPR Belt + + + 2Rnd Titan AA + + + Titan AA + + M1296 Dragoon @@ -160,5 +197,13 @@ M1296 Dragoon (Warhorse-7) + + + + M240C Coax + + + ATGM Launcher + \ No newline at end of file From 1fb887bf34125a8c5d3eb2182994f7d383c42e40 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 12:44:17 -0500 Subject: [PATCH 04/16] Update project.toml --- .hemtt/project.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 493755c7..2e334b92 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -39,8 +39,7 @@ parameters = [ "-noSplash", # They do not need to be added to your list "-showScriptErrors", # You can add additional parameters here "-debug", - "-filePatching", - "C:\\Users\\Jonah Pool\\Documents\\Arma 3 - Other Profiles\\SGT%2eTurn%2eJ\\missions\\StrykerDragoon_NoScripting.Stratis\\mission.sqm", # Launch into existing Editor Mission - \\ needed + "-filePatching" ] From 65af24c6c7d62b7af6259bdc0ef1a500525795ee Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Fri, 2 Feb 2024 14:49:23 -0500 Subject: [PATCH 05/16] Tabs to Spaces --- addons/vehicles_dragoon/CfgAmmo.hpp | 54 ++--- addons/vehicles_dragoon/CfgWeapons.hpp | 312 ++++++++++++------------- 2 files changed, 183 insertions(+), 183 deletions(-) diff --git a/addons/vehicles_dragoon/CfgAmmo.hpp b/addons/vehicles_dragoon/CfgAmmo.hpp index 2419b100..806e62b7 100644 --- a/addons/vehicles_dragoon/CfgAmmo.hpp +++ b/addons/vehicles_dragoon/CfgAmmo.hpp @@ -1,14 +1,14 @@ class CfgAmmo { - class B_30mm_HE; - class B_30mm_HE_Tracer_Red; - class cav_B_30mm_HEI_Tracer_Red: B_30mm_HE_Tracer_Red { - ace_vehicle_damage_incendiary = 0.3; - indirectHitRange = 6; - indirectHit = 8; - }; - // TODO: FCS Air Burst - class cav_B_30mm_HEAB_Tracer_Red: B_30mm_HE_Tracer_Red { - ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) + class B_30mm_HE; + class B_30mm_HE_Tracer_Red; + class cav_B_30mm_HEI_Tracer_Red: B_30mm_HE_Tracer_Red { + ace_vehicle_damage_incendiary = 0.3; + indirectHitRange = 6; + indirectHit = 8; + }; + // TODO: FCS Air Burst + class cav_B_30mm_HEAB_Tracer_Red: B_30mm_HE_Tracer_Red { + ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) ace_frag_metal = 363; // Amount of metal being fragmented (grams) - information below ace_frag_charge = 185; // Amount of explosive filler (grams) - information below ace_frag_gurney_c = 2843; // Gurney velocity constant for explosive type - information below @@ -16,24 +16,24 @@ class CfgAmmo { ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below - deflecting = 0; + deflecting = 0; indirectHitRange = 2; - indirectHit = 6; - airbursting = 1; - ABSubmun = "cav_B_30mm_HEAB_Helper"; - }; - class cav_B_30mm_HEAB_Helper: B_30mm_HE { - ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) - ace_frag_metal = 363; // Amount of metal being fragmented (grams) - information below - ace_frag_charge = 185; // Amount of explosive filler (grams) - information below - ace_frag_gurney_c = 2843; // Gurney velocity constant for explosive type - information below - ace_frag_gurney_k = 1/2; // Gurney shape factor - information below - ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below - ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below - ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below - indirectHitRange = 2; - indirectHit = 6; + indirectHit = 6; + airbursting = 1; + ABSubmun = "cav_B_30mm_HEAB_Helper"; + }; + class cav_B_30mm_HEAB_Helper: B_30mm_HE { + ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) + ace_frag_metal = 363; // Amount of metal being fragmented (grams) - information below + ace_frag_charge = 185; // Amount of explosive filler (grams) - information below + ace_frag_gurney_c = 2843; // Gurney velocity constant for explosive type - information below + ace_frag_gurney_k = 1/2; // Gurney shape factor - information below + ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below + ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below + ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below + indirectHitRange = 2; + indirectHit = 6; simulation = "shotRocket"; timeToLive = 0; - }; + }; }; \ No newline at end of file diff --git a/addons/vehicles_dragoon/CfgWeapons.hpp b/addons/vehicles_dragoon/CfgWeapons.hpp index 5f889600..20a65052 100644 --- a/addons/vehicles_dragoon/CfgWeapons.hpp +++ b/addons/vehicles_dragoon/CfgWeapons.hpp @@ -1,159 +1,159 @@ class CfgWeapons { class CannonCore; - class autocannon_Base_F: CannonCore { - class player; - }; - class autocannon_30mm_CTWS: autocannon_Base_F - { - displayName = "$STR_A3_GATLING_30MM_CTWS0"; - muzzles[] = {"HE","AP"}; - class HE: autocannon_Base_F - { - displayName = "$STR_A3_GATLING_30MM_CTWS0"; - magazines[] = {"140Rnd_30mm_MP_shells","140Rnd_30mm_MP_shells_Tracer_Red","140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Yellow","78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; - magazineReloadTime = 40; - class player: player - { - dispersion = 0.0018; - }; - class close: player - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 3; - burstRangeMax = 6; - aiRateOfFire = 1; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 200; - minRange = 0; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.7; - maxRange = 800; - maxRangeProbab = 0.8; - }; - class short: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 5; - aiRateOfFire = 2; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 600; - minRange = 600; - minRangeProbab = 0.75; - midRange = 800; - midRangeProbab = 0.8; - maxRange = 1200; - maxRangeProbab = 0.8; - }; - class medium: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 3; - aiRateOfFire = 2; - aiRateOfFireDispersion = 3; - aiRateOfFireDistance = 1000; - minRange = 1000; - minRangeProbab = 0.8; - midRange = 1500; - midRangeProbab = 0.8; - maxRange = 2000; - maxRangeProbab = 0.7; - }; - class far: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 1; - aiRateOfFire = 2; - aiRateOfFireDispersion = 4; - aiRateOfFireDistance = 1800; - minRange = 1800; - minRangeProbab = 0.74; - midRange = 2400; - midRangeProbab = 0.65; - maxRange = 3000; - maxRangeProbab = 0.05; - }; - }; - class AP: autocannon_Base_F - { - displayName = "$STR_A3_GATLING_30MM_CTWS0"; - magazines[] = {"60Rnd_30mm_APFSDS_shells","60Rnd_30mm_APFSDS_shells_Tracer_Red","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Yellow","78Rnd_30mm_APFSDS_shells_Tracer_Red"}; - magazineReloadTime = 40; - class player: player - { - dispersion = 0.00108; - }; - class close: player - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 3; - burstRangeMax = 6; - aiRateOfFire = 1; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 200; - minRange = 0; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.7; - maxRange = 800; - maxRangeProbab = 0.8; - }; - class short: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 5; - aiRateOfFire = 2; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 600; - minRange = 600; - minRangeProbab = 0.75; - midRange = 800; - midRangeProbab = 0.8; - maxRange = 1200; - maxRangeProbab = 0.8; - }; - class medium: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 3; - aiRateOfFire = 2; - aiRateOfFireDispersion = 3; - aiRateOfFireDistance = 1000; - minRange = 1000; - minRangeProbab = 0.8; - midRange = 1500; - midRangeProbab = 0.8; - maxRange = 2000; - maxRangeProbab = 0.7; - }; - class far: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 1; - aiRateOfFire = 2; - aiRateOfFireDispersion = 4; - aiRateOfFireDistance = 1800; - minRange = 1800; - minRangeProbab = 0.74; - midRange = 2400; - midRangeProbab = 0.65; - maxRange = 3000; - maxRangeProbab = 0.05; - }; - }; - }; + class autocannon_Base_F: CannonCore { + class player; + }; + class autocannon_30mm_CTWS: autocannon_Base_F + { + displayName = "$STR_A3_GATLING_30MM_CTWS0"; + muzzles[] = {"HE","AP"}; + class HE: autocannon_Base_F + { + displayName = "$STR_A3_GATLING_30MM_CTWS0"; + magazines[] = {"140Rnd_30mm_MP_shells","140Rnd_30mm_MP_shells_Tracer_Red","140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Yellow","78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; + magazineReloadTime = 40; + class player: player + { + dispersion = 0.0018; + }; + class close: player + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 3; + burstRangeMax = 6; + aiRateOfFire = 1; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 200; + minRange = 0; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.7; + maxRange = 800; + maxRangeProbab = 0.8; + }; + class short: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 5; + aiRateOfFire = 2; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 600; + minRange = 600; + minRangeProbab = 0.75; + midRange = 800; + midRangeProbab = 0.8; + maxRange = 1200; + maxRangeProbab = 0.8; + }; + class medium: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 3; + aiRateOfFire = 2; + aiRateOfFireDispersion = 3; + aiRateOfFireDistance = 1000; + minRange = 1000; + minRangeProbab = 0.8; + midRange = 1500; + midRangeProbab = 0.8; + maxRange = 2000; + maxRangeProbab = 0.7; + }; + class far: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 1; + aiRateOfFire = 2; + aiRateOfFireDispersion = 4; + aiRateOfFireDistance = 1800; + minRange = 1800; + minRangeProbab = 0.74; + midRange = 2400; + midRangeProbab = 0.65; + maxRange = 3000; + maxRangeProbab = 0.05; + }; + }; + class AP: autocannon_Base_F + { + displayName = "$STR_A3_GATLING_30MM_CTWS0"; + magazines[] = {"60Rnd_30mm_APFSDS_shells","60Rnd_30mm_APFSDS_shells_Tracer_Red","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Yellow","78Rnd_30mm_APFSDS_shells_Tracer_Red"}; + magazineReloadTime = 40; + class player: player + { + dispersion = 0.00108; + }; + class close: player + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 3; + burstRangeMax = 6; + aiRateOfFire = 1; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 200; + minRange = 0; + minRangeProbab = 0.1; + midRange = 400; + midRangeProbab = 0.7; + maxRange = 800; + maxRangeProbab = 0.8; + }; + class short: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 5; + aiRateOfFire = 2; + aiRateOfFireDispersion = 2; + aiRateOfFireDistance = 600; + minRange = 600; + minRangeProbab = 0.75; + midRange = 800; + midRangeProbab = 0.8; + maxRange = 1200; + maxRangeProbab = 0.8; + }; + class medium: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 3; + aiRateOfFire = 2; + aiRateOfFireDispersion = 3; + aiRateOfFireDistance = 1000; + minRange = 1000; + minRangeProbab = 0.8; + midRange = 1500; + midRangeProbab = 0.8; + maxRange = 2000; + maxRangeProbab = 0.7; + }; + class far: close + { + aiBurstTerminable = 1; + showToPlayer = 0; + burst = 1; + burstRangeMax = 1; + aiRateOfFire = 2; + aiRateOfFireDispersion = 4; + aiRateOfFireDistance = 1800; + minRange = 1800; + minRangeProbab = 0.74; + midRange = 2400; + midRangeProbab = 0.65; + maxRange = 3000; + maxRangeProbab = 0.05; + }; + }; + }; }; \ No newline at end of file From 46b6c00e851dc8291e505b959abc370dac3cfd76 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Sat, 3 Feb 2024 10:00:44 -0500 Subject: [PATCH 06/16] Replace project.toml with old one --- .hemtt/project.toml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 2e334b92..79bba3be 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -31,17 +31,4 @@ preset = "Hemtt" [hemtt.launch] workshop = [ "450814997", # CBA_A3's Workshop ID - "463939057", # ACE3 - "843577117", # RHS USAF -] -parameters = [ - "-skipIntro", # These parameters are passed to the Arma 3 executable - "-noSplash", # They do not need to be added to your list - "-showScriptErrors", # You can add additional parameters here - "-debug", - "-filePatching" -] - - -[hemtt.dev] -exclude = ["addons/gear"] +] \ No newline at end of file From 4629d0577189c498ca7aa48adcd8d02493dbd5c5 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 7 Feb 2024 10:41:23 -0500 Subject: [PATCH 07/16] Remove all redundant values --- addons/vehicles_dragoon/CfgWeapons.hpp | 146 +------------------------ 1 file changed, 2 insertions(+), 144 deletions(-) diff --git a/addons/vehicles_dragoon/CfgWeapons.hpp b/addons/vehicles_dragoon/CfgWeapons.hpp index 20a65052..7bb1802e 100644 --- a/addons/vehicles_dragoon/CfgWeapons.hpp +++ b/addons/vehicles_dragoon/CfgWeapons.hpp @@ -5,155 +5,13 @@ class CfgWeapons { }; class autocannon_30mm_CTWS: autocannon_Base_F { - displayName = "$STR_A3_GATLING_30MM_CTWS0"; - muzzles[] = {"HE","AP"}; class HE: autocannon_Base_F { - displayName = "$STR_A3_GATLING_30MM_CTWS0"; - magazines[] = {"140Rnd_30mm_MP_shells","140Rnd_30mm_MP_shells_Tracer_Red","140Rnd_30mm_MP_shells_Tracer_Green","140Rnd_30mm_MP_shells_Tracer_Yellow","78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; - magazineReloadTime = 40; - class player: player - { - dispersion = 0.0018; - }; - class close: player - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 3; - burstRangeMax = 6; - aiRateOfFire = 1; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 200; - minRange = 0; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.7; - maxRange = 800; - maxRangeProbab = 0.8; - }; - class short: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 5; - aiRateOfFire = 2; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 600; - minRange = 600; - minRangeProbab = 0.75; - midRange = 800; - midRangeProbab = 0.8; - maxRange = 1200; - maxRangeProbab = 0.8; - }; - class medium: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 3; - aiRateOfFire = 2; - aiRateOfFireDispersion = 3; - aiRateOfFireDistance = 1000; - minRange = 1000; - minRangeProbab = 0.8; - midRange = 1500; - midRangeProbab = 0.8; - maxRange = 2000; - maxRangeProbab = 0.7; - }; - class far: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 1; - aiRateOfFire = 2; - aiRateOfFireDispersion = 4; - aiRateOfFireDistance = 1800; - minRange = 1800; - minRangeProbab = 0.74; - midRange = 2400; - midRangeProbab = 0.65; - maxRange = 3000; - maxRangeProbab = 0.05; - }; + magazines[] += {"78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; }; class AP: autocannon_Base_F { - displayName = "$STR_A3_GATLING_30MM_CTWS0"; - magazines[] = {"60Rnd_30mm_APFSDS_shells","60Rnd_30mm_APFSDS_shells_Tracer_Red","60Rnd_30mm_APFSDS_shells_Tracer_Green","60Rnd_30mm_APFSDS_shells_Tracer_Yellow","78Rnd_30mm_APFSDS_shells_Tracer_Red"}; - magazineReloadTime = 40; - class player: player - { - dispersion = 0.00108; - }; - class close: player - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 3; - burstRangeMax = 6; - aiRateOfFire = 1; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 200; - minRange = 0; - minRangeProbab = 0.1; - midRange = 400; - midRangeProbab = 0.7; - maxRange = 800; - maxRangeProbab = 0.8; - }; - class short: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 5; - aiRateOfFire = 2; - aiRateOfFireDispersion = 2; - aiRateOfFireDistance = 600; - minRange = 600; - minRangeProbab = 0.75; - midRange = 800; - midRangeProbab = 0.8; - maxRange = 1200; - maxRangeProbab = 0.8; - }; - class medium: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 3; - aiRateOfFire = 2; - aiRateOfFireDispersion = 3; - aiRateOfFireDistance = 1000; - minRange = 1000; - minRangeProbab = 0.8; - midRange = 1500; - midRangeProbab = 0.8; - maxRange = 2000; - maxRangeProbab = 0.7; - }; - class far: close - { - aiBurstTerminable = 1; - showToPlayer = 0; - burst = 1; - burstRangeMax = 1; - aiRateOfFire = 2; - aiRateOfFireDispersion = 4; - aiRateOfFireDistance = 1800; - minRange = 1800; - minRangeProbab = 0.74; - midRange = 2400; - midRangeProbab = 0.65; - maxRange = 3000; - maxRangeProbab = 0.05; - }; + magazines[] += {"78Rnd_30mm_APFSDS_shells_Tracer_Red"}; }; }; }; \ No newline at end of file From b44f546c6db813745a81fdd5fbbde3ec15bc1598 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 7 Feb 2024 11:41:23 -0500 Subject: [PATCH 08/16] Add ace fragmentation to HEI --- addons/vehicles_dragoon/CfgAmmo.hpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/addons/vehicles_dragoon/CfgAmmo.hpp b/addons/vehicles_dragoon/CfgAmmo.hpp index 806e62b7..22946a72 100644 --- a/addons/vehicles_dragoon/CfgAmmo.hpp +++ b/addons/vehicles_dragoon/CfgAmmo.hpp @@ -2,6 +2,14 @@ class CfgAmmo { class B_30mm_HE; class B_30mm_HE_Tracer_Red; class cav_B_30mm_HEI_Tracer_Red: B_30mm_HE_Tracer_Red { + ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) + ace_frag_metal = 378; // Amount of metal being fragmented (grams) - information below + ace_frag_charge = 181; // Amount of explosive filler (grams) - information below + ace_frag_gurney_c = 2830; // Gurney velocity constant for explosive type - information below + ace_frag_gurney_k = 1/2; // Gurney shape factor - information below + ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below + ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below + ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below ace_vehicle_damage_incendiary = 0.3; indirectHitRange = 6; indirectHit = 8; @@ -11,7 +19,7 @@ class CfgAmmo { ace_frag_enabled = 1; // Enable fragmentation (0-disabled, 1-enabled) ace_frag_metal = 363; // Amount of metal being fragmented (grams) - information below ace_frag_charge = 185; // Amount of explosive filler (grams) - information below - ace_frag_gurney_c = 2843; // Gurney velocity constant for explosive type - information below + ace_frag_gurney_c = 2830; // Gurney velocity constant for explosive type - information below ace_frag_gurney_k = 1/2; // Gurney shape factor - information below ace_frag_classes[] = {"ACE_frag_medium"}; // Type of fragments - information below ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below From e0860bbb96d6cb97b8044624a0e032652f009721 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 7 Feb 2024 11:41:56 -0500 Subject: [PATCH 09/16] Change initSpeed of HEI --- addons/vehicles_dragoon/CfgMagazines.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/vehicles_dragoon/CfgMagazines.hpp b/addons/vehicles_dragoon/CfgMagazines.hpp index 00cf4fb2..599afb99 100644 --- a/addons/vehicles_dragoon/CfgMagazines.hpp +++ b/addons/vehicles_dragoon/CfgMagazines.hpp @@ -17,6 +17,7 @@ class CfgMagazines { displayNameMFDFormat = "HEI-T"; displayName = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red); displayNameShort = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red_dispShort); + initSpeed=1100; }; class 4Rnd_Titan_long_missiles; class cav_2Rnd_GAA_missiles: 4Rnd_Titan_long_missiles { From 5eb04912d7d07c66dee6c5bbbdb5a2ba00f4eb0a Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Tue, 2 Apr 2024 17:50:25 -0400 Subject: [PATCH 10/16] Use modified turret to avoid overwriting base objects. --- addons/vehicles_dragoon/CfgVehicles.hpp | 62 ++++++++++++++++++++++++- addons/vehicles_dragoon/CfgWeapons.hpp | 13 +++++- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/addons/vehicles_dragoon/CfgVehicles.hpp b/addons/vehicles_dragoon/CfgVehicles.hpp index f1709884..5a83c299 100644 --- a/addons/vehicles_dragoon/CfgVehicles.hpp +++ b/addons/vehicles_dragoon/CfgVehicles.hpp @@ -1,5 +1,54 @@ class CfgVehicles { - class I_APC_Wheeled_03_cannon_F; + class All { + class Turrets; + }; + + class AllVehicles: All { + class NewTurret { + class Turrets; + }; + }; + + class Land: AllVehicles {}; + + class LandVehicle: Land { + class CommanderOptics; + }; + + class Car: LandVehicle {}; + class Car_F: Car { + class Turrets { + class MainTurret: NewTurret {}; + }; + }; + + class Wheeled_APC_F: Car_F { + class Turrets { + class MainTurret: NewTurret { + class Turrets { + class CommanderOptics: CommanderOptics {}; + }; + }; + }; + }; + + class APC_Wheeled_03_base_F: Wheeled_APC_F { + class Turrets: Turrets { + class MainTurret: MainTurret {}; + }; + }; + class I_APC_Wheeled_03_base_F: APC_Wheeled_03_base_F {}; + + class I_APC_Wheeled_03_cannon_F: I_APC_Wheeled_03_base_F { + class Turrets: Turrets { + class MainTurret: MainTurret { + class Turrets: Turrets { + class CommanderOptics: CommanderOptics {}; + }; + }; + }; + }; + class cav_dragoon_base_F: I_APC_Wheeled_03_cannon_F { scope = 1; scopeCurator = 1; @@ -289,6 +338,17 @@ class CfgVehicles { mass = -50; }; }; + class Turrets: Turrets { + class MainTurret: MainTurret { + weapons[] = {"cav_autocannon_30mm_CTWS","LMG_coax_ext","cav_dragoon_missiles_AA","SmokeLauncher"}; + magazines[] = {"78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_APFSDS_shells_Tracer_Red","78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Red","4Rnd_Titan_long_missiles","SmokeLauncherMag"}; + class Turrets: Turrets { + class CommanderOptics: CommanderOptics { + weapons[] = {}; + }; + }; + }; + }; }; class cav_dragoon_unarmed_base_F: cav_dragoon_base_F { supplyRadius = 10; diff --git a/addons/vehicles_dragoon/CfgWeapons.hpp b/addons/vehicles_dragoon/CfgWeapons.hpp index 7bb1802e..12877b3d 100644 --- a/addons/vehicles_dragoon/CfgWeapons.hpp +++ b/addons/vehicles_dragoon/CfgWeapons.hpp @@ -5,13 +5,22 @@ class CfgWeapons { }; class autocannon_30mm_CTWS: autocannon_Base_F { - class HE: autocannon_Base_F + class HE: autocannon_Base_F {}; + class AP: autocannon_Base_F {}; + }; + class cav_autocannon_30mm_CTWS: autocannon_30mm_CTWS + { + class HE: HE { magazines[] += {"78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; }; - class AP: autocannon_Base_F + class AP: AP { magazines[] += {"78Rnd_30mm_APFSDS_shells_Tracer_Red"}; }; }; + class missiles_titan; + class cav_dragoon_missiles_AA: missiles_titan { + magazines[] = {"4Rnd_Titan_long_missiles"}; + }; }; \ No newline at end of file From 297140454d54864842e01f53de796f73e86ba03c Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Tue, 2 Apr 2024 17:50:50 -0400 Subject: [PATCH 11/16] Add MFD label to APFSDS-T --- addons/vehicles_dragoon/CfgMagazines.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/vehicles_dragoon/CfgMagazines.hpp b/addons/vehicles_dragoon/CfgMagazines.hpp index 599afb99..e2d56d6b 100644 --- a/addons/vehicles_dragoon/CfgMagazines.hpp +++ b/addons/vehicles_dragoon/CfgMagazines.hpp @@ -10,6 +10,7 @@ class CfgMagazines { class 78Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells_Tracer_Red { displayName = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red); displayNameShort = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort); + displayNameMFDFormat = "APFSDS-T"; count=78; }; class 78Rnd_30mm_HEI_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red { From 3fce3137630aa0f2ddf202f9b68d94c71ed0b23d Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 3 Apr 2024 17:03:06 -0400 Subject: [PATCH 12/16] Further weapons updates as well as convention update --- addons/vehicles_dragoon/CfgMagazines.hpp | 31 ++++++++++++------------ addons/vehicles_dragoon/CfgVehicles.hpp | 4 +-- addons/vehicles_dragoon/CfgWeapons.hpp | 12 ++++++--- addons/vehicles_dragoon/stringtable.xml | 30 +++++++++++------------ 4 files changed, 42 insertions(+), 35 deletions(-) diff --git a/addons/vehicles_dragoon/CfgMagazines.hpp b/addons/vehicles_dragoon/CfgMagazines.hpp index e2d56d6b..66e955cd 100644 --- a/addons/vehicles_dragoon/CfgMagazines.hpp +++ b/addons/vehicles_dragoon/CfgMagazines.hpp @@ -1,37 +1,38 @@ class CfgMagazines { class 140Rnd_30mm_MP_shells_Tracer_Red; - class 78Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells_Tracer_Red { - displayName = CSTRING(78Rnd_30mm_MP_shells_Tracer_Red); - displayNameShort = CSTRING(78Rnd_30mm_MP_shells_Tracer_Red_dispShort); + class cav_78Rnd_30mm_MP_shells_Tracer_Red: 140Rnd_30mm_MP_shells_Tracer_Red { + displayName = CSTRING(cav_78Rnd_30mm_MP_shells_Tracer_Red); + displayNameShort = CSTRING(cav_78Rnd_30mm_MP_shells_Tracer_Red_dispShort); displayNameMFDFormat = "MP-T"; count=78; }; class 60Rnd_30mm_APFSDS_shells_Tracer_Red; - class 78Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells_Tracer_Red { - displayName = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red); - displayNameShort = CSTRING(78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort); + class cav_78Rnd_30mm_APFSDS_shells_Tracer_Red: 60Rnd_30mm_APFSDS_shells_Tracer_Red { + displayName = CSTRING(cav_78Rnd_30mm_APFSDS_shells_Tracer_Red); + displayNameShort = CSTRING(cav_78Rnd_30mm_APFSDS_shells_Tracer_Red_dispShort); displayNameMFDFormat = "APFSDS-T"; count=78; }; - class 78Rnd_30mm_HEI_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red { + class cav_78Rnd_30mm_HEI_shells_Tracer_Red: cav_78Rnd_30mm_MP_shells_Tracer_Red { ammo = "cav_B_30mm_HEI_Tracer_Red"; displayNameMFDFormat = "HEI-T"; - displayName = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red); - displayNameShort = CSTRING(78Rnd_30mm_HEI_shells_Tracer_Red_dispShort); + displayName = CSTRING(cav_78Rnd_30mm_HEI_shells_Tracer_Red); + displayNameShort = CSTRING(cav_78Rnd_30mm_HEI_shells_Tracer_Red_dispShort); initSpeed=1100; }; class 4Rnd_Titan_long_missiles; - class cav_2Rnd_GAA_missiles: 4Rnd_Titan_long_missiles { - displayName = CSTRING(cav_2Rnd_GAA_missiles); - displayNameShort = CSTRING(cav_2Rnd_GAA_missiles_dispShort); + class cav_2Rnd_fim92_missiles: 4Rnd_Titan_long_missiles { + displayName = CSTRING(cav_2Rnd_fim92_missiles); + displayNameShort = CSTRING(cav_2Rnd_fim92_missiles_dispShort); + ammo = "rhs_ammo_fim92_missile"; count=2; }; // TODO: ACE FCS Air Burst Mags - class 78Rnd_30mm_HEABT_shells_Tracer_Red: 78Rnd_30mm_MP_shells_Tracer_Red { + class cav_78Rnd_30mm_HEABT_shells_Tracer_Red: cav_78Rnd_30mm_MP_shells_Tracer_Red { ammo="cav_B_30mm_HEAB_Tracer_Red"; displayNameMFDFormat="HEAB-T"; - displayName=CSTRING(78Rnd_30mm_HEAB_shells_Tracer_Red); - displayNameShort=CSTRING(78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort); + displayName=CSTRING(cav_78Rnd_30mm_HEAB_shells_Tracer_Red); + displayNameShort=CSTRING(cav_78Rnd_30mm_HEAB_shells_Tracer_Red_dispShort); }; class 200Rnd_762x51_Belt_Red; class cav_mag_300Rnd_762x51_Belt_Red: 200Rnd_762x51_Belt_Red { diff --git a/addons/vehicles_dragoon/CfgVehicles.hpp b/addons/vehicles_dragoon/CfgVehicles.hpp index 5a83c299..5b7beaee 100644 --- a/addons/vehicles_dragoon/CfgVehicles.hpp +++ b/addons/vehicles_dragoon/CfgVehicles.hpp @@ -340,8 +340,8 @@ class CfgVehicles { }; class Turrets: Turrets { class MainTurret: MainTurret { - weapons[] = {"cav_autocannon_30mm_CTWS","LMG_coax_ext","cav_dragoon_missiles_AA","SmokeLauncher"}; - magazines[] = {"78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red","78Rnd_30mm_APFSDS_shells_Tracer_Red","78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Red","4Rnd_Titan_long_missiles","SmokeLauncherMag"}; + weapons[] = {"cav_autocannon_30mm_CTWS","cav_dragoon_coax_m240","cav_dragoon_missiles_AA","SmokeLauncher"}; + magazines[] = {"cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_2Rnd_fim92_missiles","SmokeLauncherMag"}; class Turrets: Turrets { class CommanderOptics: CommanderOptics { weapons[] = {}; diff --git a/addons/vehicles_dragoon/CfgWeapons.hpp b/addons/vehicles_dragoon/CfgWeapons.hpp index 12877b3d..a1c8a804 100644 --- a/addons/vehicles_dragoon/CfgWeapons.hpp +++ b/addons/vehicles_dragoon/CfgWeapons.hpp @@ -12,15 +12,21 @@ class CfgWeapons { { class HE: HE { - magazines[] += {"78Rnd_30mm_MP_shells_Tracer_Red","78Rnd_30mm_HEI_shells_Tracer_Red"}; + magazines[] += {"cav_78Rnd_30mm_MP_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red"}; }; class AP: AP { - magazines[] += {"78Rnd_30mm_APFSDS_shells_Tracer_Red"}; + magazines[] += {"cav_78Rnd_30mm_APFSDS_shells_Tracer_Red"}; }; }; class missiles_titan; class cav_dragoon_missiles_AA: missiles_titan { - magazines[] = {"4Rnd_Titan_long_missiles"}; + displayName = CSTRING(cav_dragoon_missiles_AA); + magazines[] = {"cav_2Rnd_fim92_missiles","rhs_fim92_mag"}; + }; + class LMG_coax_ext; + class cav_dragoon_coax_m240: LMG_coax_ext { + displayName = CSTRING(cav_dragoon_coax_m240); + magazines[] += {"cav_mag_300Rnd_762x51_Belt_Red"}; }; }; \ No newline at end of file diff --git a/addons/vehicles_dragoon/stringtable.xml b/addons/vehicles_dragoon/stringtable.xml index c4ccd383..6cf4d2ab 100644 --- a/addons/vehicles_dragoon/stringtable.xml +++ b/addons/vehicles_dragoon/stringtable.xml @@ -12,38 +12,38 @@ - + 78Rnd MP Tracer (Red) - + MP-T - + 78Rnd APFSDS Tracer (Red) - + APFSDS-T - + 78Rnd HEAB Tracer (Red) - + HEAB-T - + 78Rnd HEI Tracer (Red) - + HEI-T 300Rnd Linked M80A1 EPR Belt - - 2Rnd Titan AA + + 2Rnd Stinger - - Titan AA + + Stinger @@ -199,11 +199,11 @@ - + M240C Coax - - ATGM Launcher + + Stinger Launcher \ No newline at end of file From 134744da6b6d89053f4b14440ec22cfe49b130f1 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 3 Apr 2024 17:27:44 -0400 Subject: [PATCH 13/16] Remove all magazines from commander turret as well --- addons/vehicles_dragoon/CfgVehicles.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/vehicles_dragoon/CfgVehicles.hpp b/addons/vehicles_dragoon/CfgVehicles.hpp index 5b7beaee..a81a7d24 100644 --- a/addons/vehicles_dragoon/CfgVehicles.hpp +++ b/addons/vehicles_dragoon/CfgVehicles.hpp @@ -345,6 +345,7 @@ class CfgVehicles { class Turrets: Turrets { class CommanderOptics: CommanderOptics { weapons[] = {}; + magazines[] = {}; }; }; }; From 4c76ebc444c8265d7d940f211d356575784eb5d7 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 3 Apr 2024 23:19:45 -0400 Subject: [PATCH 14/16] Damage reduction and remove missile launcher. --- addons/vehicles_dragoon/CfgAmmo.hpp | 2 +- addons/vehicles_dragoon/CfgVehicles.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/vehicles_dragoon/CfgAmmo.hpp b/addons/vehicles_dragoon/CfgAmmo.hpp index 22946a72..1db68beb 100644 --- a/addons/vehicles_dragoon/CfgAmmo.hpp +++ b/addons/vehicles_dragoon/CfgAmmo.hpp @@ -12,7 +12,7 @@ class CfgAmmo { ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below ace_vehicle_damage_incendiary = 0.3; indirectHitRange = 6; - indirectHit = 8; + indirectHit = 6; }; // TODO: FCS Air Burst class cav_B_30mm_HEAB_Tracer_Red: B_30mm_HE_Tracer_Red { diff --git a/addons/vehicles_dragoon/CfgVehicles.hpp b/addons/vehicles_dragoon/CfgVehicles.hpp index a81a7d24..9ab6edfa 100644 --- a/addons/vehicles_dragoon/CfgVehicles.hpp +++ b/addons/vehicles_dragoon/CfgVehicles.hpp @@ -340,8 +340,8 @@ class CfgVehicles { }; class Turrets: Turrets { class MainTurret: MainTurret { - weapons[] = {"cav_autocannon_30mm_CTWS","cav_dragoon_coax_m240","cav_dragoon_missiles_AA","SmokeLauncher"}; - magazines[] = {"cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_2Rnd_fim92_missiles","SmokeLauncherMag"}; + weapons[] = {"cav_autocannon_30mm_CTWS","cav_dragoon_coax_m240","SmokeLauncher"}; + magazines[] = {"cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","SmokeLauncherMag"}; class Turrets: Turrets { class CommanderOptics: CommanderOptics { weapons[] = {}; From 5d9bd62e84d34f8f68658983b48e156ed6304329 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Wed, 3 Apr 2024 23:52:07 -0400 Subject: [PATCH 15/16] Damage adjustments --- addons/vehicles_dragoon/CfgAmmo.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/vehicles_dragoon/CfgAmmo.hpp b/addons/vehicles_dragoon/CfgAmmo.hpp index 1db68beb..c7a97b57 100644 --- a/addons/vehicles_dragoon/CfgAmmo.hpp +++ b/addons/vehicles_dragoon/CfgAmmo.hpp @@ -11,8 +11,8 @@ class CfgAmmo { ace_frag_skip = 0; // (Optional) Skip fragmentation for this ammo type (0-disabled, 1-enabled) - information below ace_frag_force = 0; // (Optional) Force fragmentation system (0-disabled, 1-enabled) - information below ace_vehicle_damage_incendiary = 0.3; - indirectHitRange = 6; - indirectHit = 6; + indirectHitRange = 4; + indirectHit = 8; }; // TODO: FCS Air Burst class cav_B_30mm_HEAB_Tracer_Red: B_30mm_HE_Tracer_Red { From f2cd5851ffe59eb812eaf8f983fb0684f55b84f5 Mon Sep 17 00:00:00 2001 From: Jonah Pool Date: Thu, 4 Apr 2024 15:31:39 -0400 Subject: [PATCH 16/16] Remove AT Launchers from dragoons. To be added back in future branch. --- addons/vehicles_dragoon/CfgVehicles.hpp | 2 +- addons/vehicles_dragoon/CfgWeapons.hpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/addons/vehicles_dragoon/CfgVehicles.hpp b/addons/vehicles_dragoon/CfgVehicles.hpp index 9ab6edfa..d9d9dea5 100644 --- a/addons/vehicles_dragoon/CfgVehicles.hpp +++ b/addons/vehicles_dragoon/CfgVehicles.hpp @@ -341,7 +341,7 @@ class CfgVehicles { class Turrets: Turrets { class MainTurret: MainTurret { weapons[] = {"cav_autocannon_30mm_CTWS","cav_dragoon_coax_m240","SmokeLauncher"}; - magazines[] = {"cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","SmokeLauncherMag"}; + magazines[] = {"cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","cav_78Rnd_30mm_APFSDS_shells_Tracer_Red","2000Rnd_762x51_Belt_T_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","cav_mag_300Rnd_762x51_Belt_Red","SmokeLauncherMag","SmokeLauncherMag"}; class Turrets: Turrets { class CommanderOptics: CommanderOptics { weapons[] = {}; diff --git a/addons/vehicles_dragoon/CfgWeapons.hpp b/addons/vehicles_dragoon/CfgWeapons.hpp index a1c8a804..6e47f8d9 100644 --- a/addons/vehicles_dragoon/CfgWeapons.hpp +++ b/addons/vehicles_dragoon/CfgWeapons.hpp @@ -12,18 +12,13 @@ class CfgWeapons { { class HE: HE { - magazines[] += {"cav_78Rnd_30mm_MP_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red"}; + magazines[] = {"cav_78Rnd_30mm_MP_shells_Tracer_Red","cav_78Rnd_30mm_HEI_shells_Tracer_Red"}; }; class AP: AP { - magazines[] += {"cav_78Rnd_30mm_APFSDS_shells_Tracer_Red"}; + magazines[] = {"cav_78Rnd_30mm_APFSDS_shells_Tracer_Red"}; }; }; - class missiles_titan; - class cav_dragoon_missiles_AA: missiles_titan { - displayName = CSTRING(cav_dragoon_missiles_AA); - magazines[] = {"cav_2Rnd_fim92_missiles","rhs_fim92_mag"}; - }; class LMG_coax_ext; class cav_dragoon_coax_m240: LMG_coax_ext { displayName = CSTRING(cav_dragoon_coax_m240);