From 18bd1acc332e667de94a40c5732f3f73a9278147 Mon Sep 17 00:00:00 2001
From: lambdatiger <spam.stnuocca.sl@gmail.com>
Date: Mon, 26 Aug 2024 11:29:34 -0500
Subject: [PATCH] Compat GM - Fix inheritance and add GM stringtable entries to
 display names (#10256)

* Fixed inheritance on PETN and PLNP

* Added GM's localization strings

* adds required addons

* one of my testing scripts added forward slashes that aren't/aren't reflected in the GM configs
---
 addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp    |  7 ++++---
 .../compat_gm/compat_gm_explosives/CfgVehicles.hpp   | 12 ++++++------
 addons/compat_gm/compat_gm_explosives/config.cpp     |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp b/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
index 3da49f45ab..a8f9ca632e 100644
--- a/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
+++ b/addons/compat_gm/compat_gm_explosives/CfgAmmo.hpp
@@ -1,9 +1,10 @@
 class CfgAmmo {
-    class PipeBombBase;
-    class gm_explosive_petn_charge: PipeBombBase {
+    class gm_explosive_petn_base;
+    class gm_explosive_charge_petn: gm_explosive_petn_base {
         EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
     };
-    class gm_explosive_plnp_charge: PipeBombBase {
+    class gm_explosive_plnp_base;
+    class gm_explosive_charge_plnp: gm_explosive_plnp_base {
         EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.02};
     };
 
diff --git a/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp b/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
index bb279c82b9..ea201aa579 100644
--- a/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
+++ b/addons/compat_gm/compat_gm_explosives/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
 
     // CHARGE
     class EGVAR(explosives,Place_gm_explosive_petn): EGVAR(explosives,Place) {
-        displayName = "PETN Charge";
+        displayName = "$STR_DN_GM_EXPLOSIVE_PETN_CHARGE";
         model = "gm\gm_weapons\gm_put\gm_explosive_charge_petn";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -18,7 +18,7 @@ class CfgVehicles {
         };
     };
     class EGVAR(explosives,Place_gm_explosive_plnp): EGVAR(explosives,Place) {
-        displayName = "PLNP Charge";
+        displayName = "$STR_DN_GM_EXPLOSIVE_PLNP_CHARGE";
         model = "gm\gm_weapons\gm_put\gm_explosive_charge_plnp";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -28,7 +28,7 @@ class CfgVehicles {
     };
     // AT MINE
     class EGVAR(explosives,Place_gm_mine_tm46): EGVAR(explosives,Place) {
-        displayName = "AT Mine TM46";
+        displayName = "$STR_DN_GM_MINE_AT_TM46";
         model = "gm\gm_weapons\gm_put\gm_mine_at_tm46";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -37,7 +37,7 @@ class CfgVehicles {
         };
     };
     class EGVAR(explosives,Place_gm_explosive_dm21): EGVAR(explosives,Place) {
-        displayName = "AT Mine DM21";
+        displayName = "$STR_DN_GM_MINE_AT_DM21";
         model = "gm\gm_weapons\gm_put\gm_mine_at_dm21";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -46,7 +46,7 @@ class CfgVehicles {
         };
     };
     class EGVAR(explosives,Place_gm_explosive_m111): EGVAR(explosives,Place) {
-        displayName = "MN 111";
+        displayName = "$STR_DN_GM_MINE_AT_MN111";
         model = "gm\gm_weapons\gm_launchers\gm_platan\gm_mine_at_mn111_disarmed";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -56,7 +56,7 @@ class CfgVehicles {
     };
     // AP
     class EGVAR(explosives,Place_gm_explosive_dm31): EGVAR(explosives,Place) {
-        displayName = "AP Mine DM31";
+        displayName = "$STR_DN_GM_MINE_AP_DM31";
         model = "gm\gm_weapons\gm_put\gm_mine_ap_dm31";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
diff --git a/addons/compat_gm/compat_gm_explosives/config.cpp b/addons/compat_gm/compat_gm_explosives/config.cpp
index e240c28389..9b4d16a1e6 100644
--- a/addons/compat_gm/compat_gm_explosives/config.cpp
+++ b/addons/compat_gm/compat_gm_explosives/config.cpp
@@ -8,6 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "gm_core",
+            "gm_weapons_put",
             "ace_explosives"
         };
         skipWhenMissingDependencies = 1;