From 58e021bda4455b6e3ce59eacb7269764fc7ba8f4 Mon Sep 17 00:00:00 2001 From: lambdatiger Date: Fri, 23 Aug 2024 12:30:48 -0500 Subject: [PATCH] Fixed firefist inheritance and order of 125mm shell --- addons/frag/CfgAmmoFragParameters.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/frag/CfgAmmoFragParameters.hpp b/addons/frag/CfgAmmoFragParameters.hpp index f8df7b00d9..8d6402c377 100644 --- a/addons/frag/CfgAmmoFragParameters.hpp +++ b/addons/frag/CfgAmmoFragParameters.hpp @@ -670,7 +670,7 @@ class M_Vorona_HE: M_Vorona_HEAT { GVAR(classes)[] = {QGVAR(tiny)}; }; -class M_127mm_Firefist_AT: RocketBase { // HOT missile +class M_127mm_Firefist_AT: MissileBase { // HOT missile GVAR(skip) = 1; }; @@ -729,17 +729,18 @@ class ammo_ShipCannon_120mm_HE: Sh_155mm_AMOS { GVAR(classes)[] = {QGVAR(small), QGVAR(small), QGVAR(medium), QGVAR(large)}; }; +class Sh_125mm_HE: Sh_120mm_HE { + GVAR(metal) = 19900; + GVAR(charge) = 3400; + GVAR(gurney_c) = 2901; +}; + class Sh_125mm_HEAT: Sh_125mm_HE { GVAR(skip) = 1; GVAR(metal) = 16760; GVAR(charge) = 1640; GVAR(gurney_c) = 2901; }; -class Sh_125mm_HE: Sh_120mm_HE { - GVAR(metal) = 19900; - GVAR(charge) = 3400; - GVAR(gurney_c) = 2901; -}; class Sh_105mm_HEAT_MP: Sh_125mm_HEAT { GVAR(skip) = 0;