From c95a8ca21b48f2348b460f09258a18cb8a87a6d1 Mon Sep 17 00:00:00 2001
From: lambdatiger <spam.stnuocca.sl@gmail.com>
Date: Mon, 8 Jan 2024 16:05:46 -0600
Subject: [PATCH] Fixed configname conflict after merging spall & frag cfgAmmos

---
 addons/frag/CfgAmmo.hpp | 54 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/addons/frag/CfgAmmo.hpp b/addons/frag/CfgAmmo.hpp
index bb80aad48a..0cdd3c2602 100644
--- a/addons/frag/CfgAmmo.hpp
+++ b/addons/frag/CfgAmmo.hpp
@@ -362,21 +362,57 @@ class CfgAmmo {
         airFriction = QUOTE(BASE_DRAG_HD*0.5);
         caliber = 2.8;
     };
-
-    class GVAR(spall_small): GVAR(small) {
-        timeToLive = 0.2;
+    
+    //////////////////
+    
+    class GVAR(spallBase) : B_65x39_Caseless
+    {
+        access = 3;
+        submunitionAmmo[] = {"ace_frag_small_c",4,"ace_frag_medium_c",3,"ace_frag_large_c",2,"ace_frag_huge_c",1};
+        submunitionConeType[] = {"random", 20};
+        submunitionConeAngle = 40;
+        submunitionDirectionType = "SubmunitionModelDirection";
+        triggerTime = 0;
+        submunitionInitialOffset[] = {0,0,0};
+        submunitionInitSpeed = 0; 
+        triggerSpeedCoef[] = {0.75,1.25};
+        deleteParentWhenTriggered = 1;
+        submunitionParentSpeedCoef = 1;
     };
 
-    class GVAR(spall_medium): GVAR(medium) {
-        timeToLive = 0.2;
+    class GVAR(spall_tiny) : GVAR(spallBase)
+    {
+        submunitionAmmo[] = {"ace_frag_small_c", 4, "ace_frag_medium_c", 1};
+        submunitionConeType[] = {"poissondisccenter", 5};
+        submunitionConeAngle = 40;
     };
 
-    class GVAR(spall_large): GVAR(large) {
-        timeToLive = 0.25;
+    class GVAR(spall_small) : GVAR(spallBase)
+    {
+        submunitionAmmo[] = {"ace_frag_small_c", 4,"ace_frag_medium_c", 1};
+        submunitionConeType[] = {"poissondisccenter", 10};
+        submunitionConeAngle = 40;
     };
 
-    class GVAR(spall_huge): GVAR(huge) {
-        timeToLive = 0.3;
+    class GVAR(spall_medium) : GVAR(spallBase)
+    {
+        submunitionAmmo[] = {"ace_frag_small_c", 2, "ace_frag_small_HD_c", 1,"ace_frag_medium_c", 3, "ace_frag_medium_HD_c", 1, "ace_frag_large_c", 2};
+        submunitionConeType[] = {"poissondisccenter", 15};
+        submunitionConeAngle = 40;
+    };
+
+    class GVAR(spall_large) : GVAR(spallBase)
+    {
+        submunitionAmmo[] = {"ace_frag_tiny_c", 3, "ace_frag_tiny_HD_c", 3, "ace_frag_small_c", 4, "ace_frag_small_HD_c", 4, "ace_frag_medium_HD_c", 5, "ace_frag_large_c", 2, "ace_frag_large_HD_c", 2, "ace_frag_huge_c",1};
+        submunitionConeType[] = {"poissondisccenter", 15};
+        submunitionConeAngle = 40;
+    };
+
+    class GVAR(spall_huge) : GVAR(spallBase)
+    {
+        submunitionAmmo[] = {"ace_frag_tiny_c", 3, "ace_frag_tiny_HD_c", 3, "ace_frag_small_c", 4, "ace_frag_small_HD_c", 4, "ace_frag_medium_HD_c", 5, "ace_frag_large_c", 2, "ace_frag_large_HD_c", 2, "ace_frag_huge_c",1};
+        submunitionConeType[] = {"poissondisccenter", 20};
+        submunitionConeAngle = 40;
     };