From d25160110a91c99b6af1c5c77caca10d97893ae0 Mon Sep 17 00:00:00 2001
From: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Date: Thu, 25 Apr 2024 13:50:49 +0200
Subject: [PATCH] Chemical - Fix mortar issues (#458)

**When merged this pull request will:**
-  Fix wrong inheritance
- Fix "No matching carry mag" that was blocking unloading 8rnd and 5rnd
ammo from mortar

### IMPORTANT

- [Development Guidelines](https://ace3.acemod.org/wiki/development/)
are read, understood and applied.
- Title of this PR uses our standard template `Component -
Add|Fix|Improve|Change|Make|Remove {changes}`.
---
 addons/chemical/CfgMagazineGroups.hpp |  4 +++-
 addons/chemical/CfgVehicles.hpp       |  4 ++++
 addons/chemical/CfgWeapons.hpp        | 11 +++--------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/chemical/CfgMagazineGroups.hpp b/addons/chemical/CfgMagazineGroups.hpp
index 7396137a3..6fcc61888 100644
--- a/addons/chemical/CfgMagazineGroups.hpp
+++ b/addons/chemical/CfgMagazineGroups.hpp
@@ -2,8 +2,10 @@
 class ace_csw_groups {
     class KAT_1Rnd_82mm_Mo_Type0 {
         KAT_1Rnd_82mm_Mo_Type0 = 1;
+        KAT_5Rnd_82mm_Mo_Type0_AI = 1;
     };
     class KAT_1Rnd_82mm_Mo_TypeCS {
         KAT_1Rnd_82mm_Mo_TypeCS = 1;
+        KAT_3Rnd_82mm_Mo_TypeCS_AI = 1;
     };
-};
\ No newline at end of file
+};
diff --git a/addons/chemical/CfgVehicles.hpp b/addons/chemical/CfgVehicles.hpp
index c30931f3e..e090ef6d0 100644
--- a/addons/chemical/CfgVehicles.hpp
+++ b/addons/chemical/CfgVehicles.hpp
@@ -179,6 +179,10 @@ class CfgVehicles {
         };
     };
     class Mortar_01_base_F: StaticMortar {
+        class ace_csw: ace_csw {
+            proxyWeapon = "ace_mortar_82mm";
+        };
+
         class Turrets: Turrets {
             class MainTurret: MainTurret {
                 magazines[] += {"KAT_5Rnd_82mm_Mo_Type0_AI","KAT_5Rnd_82mm_Mo_Type0_AI","KAT_5Rnd_82mm_Mo_Type0_AI","KAT_5Rnd_82mm_Mo_Type0_AI","KAT_3Rnd_82mm_Mo_TypeCS_AI","KAT_3Rnd_82mm_Mo_TypeCS_AI","KAT_3Rnd_82mm_Mo_TypeCS_AI"};
diff --git a/addons/chemical/CfgWeapons.hpp b/addons/chemical/CfgWeapons.hpp
index 97eedc329..81fc65409 100644
--- a/addons/chemical/CfgWeapons.hpp
+++ b/addons/chemical/CfgWeapons.hpp
@@ -31,18 +31,13 @@ class CfgWeapons {
     class CannonCore;
     class mortar_82mm: CannonCore {
         magazines[] += {
-            "KAT_1Rnd_82mm_Mo_Type0",
             "KAT_5Rnd_82mm_Mo_Type0_AI",
-            "KAT_1Rnd_82mm_Mo_TypeCS",
             "KAT_3Rnd_82mm_Mo_TypeCS_AI"
         };
     };
-    class ACE_mortar_82mm;
-    class ACE_mortar_82mm: ACE_mortar_82mm {
-        magazines[] += {
-            "KAT_1Rnd_82mm_Mo_Type0",
-            "KAT_1Rnd_82mm_Mo_TypeCS"
-        };
+
+    class ACE_mortar_82mm: mortar_82mm {
+        magazines[] = {"ACE_1Rnd_82mm_Mo_HE","ACE_1Rnd_82mm_Mo_Smoke","ACE_1Rnd_82mm_Mo_Illum","ACE_1Rnd_82mm_Mo_HE_Guided","ACE_1Rnd_82mm_Mo_HE_LaserGuided", "KAT_1Rnd_82mm_Mo_Type0", "KAT_1Rnd_82mm_Mo_TypeCS"};
     };
 
     class GrenadeLauncher;