Compat SPE - Add calibers to ammunition for use in ace_rearm (#11184)

* Add rearm compat to SPE compat

* Update shells.hpp

* Update shells.hpp

Author: johnb432

addons/compat_spe/CfgAmmo/bullets.hpp

@@ -2,15 +2,27 @@ class SPE_Bullet_Vehicle_base;
 
 class SPE_B_127x99_Mixed: SubmunitionBase {
     ACE_caliber = 12.954;
+    EGVAR(rearm,caliber) = 12.7; // rounded to 13
 };
 
 class SPE_B_127x99_Ball: SPE_Bullet_Vehicle_base {
     ACE_caliber = 12.954;
+    EGVAR(rearm,caliber) = 12.7;
 };
 class SPE_B_127x99_API: SPE_B_127x99_Ball {
     EGVAR(vehicle_damage,incendiary) = 1;
 };
 
+class SPE_B_75x54_Ball: SPE_Bullet_base {
+    EGVAR(rearm,caliber) = 7.5; // rounded to 8
+};
+class SPE_B_762x63_Ball: SPE_Bullet_base {
+    EGVAR(rearm,caliber) = 7.62;
+};
+class SPE_B_792x57_Ball: SPE_Bullet_base {
+    EGVAR(rearm,caliber) = 7.92;
+};
+
 // FLAK
 class SPE_Bullet_AA_base;
 class SPE_SprGr_FlaK_38: SPE_Bullet_AA_base {
@@ -21,6 +33,7 @@ class SPE_SprGr_FlaK_38: SPE_Bullet_AA_base {
     EGVAR(frag,gurney_c) = 2930;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_tiny", "ACE_frag_small_HD"};
+    EGVAR(rearm,caliber) = 20;
 };
 
 class SPE_Bullet_AP_base;
@@ -32,4 +45,5 @@ class SPE_PzGr_FlaK_38_AP_T: SPE_Bullet_AP_base {
     EGVAR(frag,gurney_c) = 2930;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_tiny", "ACE_frag_small_HD"};
+    EGVAR(rearm,caliber) = 20;
 };

addons/compat_spe/CfgAmmo/explosives.hpp

@@ -1,13 +1,9 @@
-class ShellBase;
 class SubmunitionBase;
-class MineCore;
-class PipeBombBase;
-class SPE_MAIN_pipebomb: PipeBombBase {};
-class SPE_ShellHE_base: ShellBase {};
-class SPE_ShellHEAT_base: ShellBase {};
-class RocketBase;
-class SPE_MAIN_mine: MineCore {};
-class SPE_Rocket_base: RocketBase {};
+class SPE_MAIN_pipebomb;
+class SPE_ShellHE_base;
+class SPE_ShellHEAT_base;
+class SPE_MAIN_mine;
+class SPE_Rocket_base;
 class SPE_PzFaust_30m: SPE_Rocket_base {
     EGVAR(frag,enabled) = 1;
     EGVAR(frag,force) = 1;
@@ -34,6 +30,7 @@ class SPE_Sh_M43A1_81_HE: SubmunitionBase  {
     EGVAR(frag,gurney_c) = 2750;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
+    EGVAR(rearm,caliber) = 82;
 };
 class SPE_M48_HE: SPE_ShellHE_base {
     EGVAR(frag,enabled) = 1;
@@ -43,6 +40,7 @@ class SPE_M48_HE: SPE_ShellHE_base {
     EGVAR(frag,gurney_c) = 2750;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_small"};
+    EGVAR(rearm,caliber) = 75;
 };
 class SPE_M101_M1_HE: SPE_ShellHE_base {
     EGVAR(frag,enabled) = 1;
@@ -52,6 +50,7 @@ class SPE_M101_M1_HE: SPE_ShellHE_base {
     EGVAR(frag,gurney_c) = 2750;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
+    EGVAR(rearm,caliber) = 105;
 };
 class SPE_S_105L28_Gr38: SPE_ShellHE_base {
     EGVAR(frag,enabled) = 1;
@@ -61,6 +60,7 @@ class SPE_S_105L28_Gr38: SPE_ShellHE_base {
     EGVAR(frag,gurney_c) = 2750;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
+    EGVAR(rearm,caliber) = 105;
 };
 class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base {
     EGVAR(frag,enabled) = 1;
@@ -70,6 +70,7 @@ class SPE_S_105L28_Gr39HlC: SPE_ShellHEAT_base {
     EGVAR(frag,gurney_c) = 2750;
     EGVAR(frag,gurney_k) = 1/2;
     EGVAR(frag,classes)[] = {"ACE_frag_medium","ACE_frag_large"};
+    EGVAR(rearm,caliber) = 105;
 };
 class SPE_R_280mm_WkSpr: SubmunitionBase {
     EGVAR(frag,enabled) = 1;

addons/compat_spe/CfgAmmo/grenades.hpp

@@ -1,6 +1,5 @@
-class GrenadeBase;
 class SPE_GrenadeHand_base;
-class SPE_Grenade_base: GrenadeBase {};
+class SPE_Grenade_base;
 
 class SPE_US_M15: SPE_GrenadeHand_base {
     ACE_damageType = QGVAR(explosive_incendiary);
@@ -107,8 +106,7 @@ class SPE_G_SPRGR_30_Detonation: SPE_Grenade_base {
     EGVAR(frag,classes)[] = {"ACE_frag_small_HD"};
 };
 
-class SmokeShell;
-class SPE_SmokeShell_base: SmokeShell {};
+class SPE_SmokeShell_base;
 class SPE_US_AN_M14: SPE_SmokeShell_base {
     EGVAR(grenades,incendiary) = 1;
 };

addons/compat_spe/CfgAmmo/melee.hpp

@@ -1,7 +1,5 @@
-class BulletBase;
-class BulletCore;
-class BulletBase_NonAceAB: BulletCore {};
-class SPE_Bullet_base: BulletBase {};
+class BulletBase_NonAceAB;
+class SPE_Bullet_base;
 
 class SPE_B_Bayonet: SPE_Bullet_base {
     ACE_damageType = "stab";