Explosives/Realistic Names - Improve CfgVehicles explosives naming (a…

…cemod#10200) * Improve explosives naming * Move all ACE explosives into compat * Update CfgMagazines.hpp
blake8090 · Aug 18, 2024 · 24014b4 · 24014b4
1 parent c14f0ce
commit 24014b4
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 20 deletions.
diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
@@ -106,7 +106,7 @@ class CfgVehicles {
     };
 
     class ACE_Explosives_Place_DemoCharge: ACE_Explosives_Place {
-        displayName = "Demo Charge";
+        displayName = "$STR_A3_cfgMagazines_DemoCharge0";
         model = "\A3\Weapons_F\explosives\c4_charge_small_d";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -115,15 +115,15 @@ class CfgVehicles {
         };
     };
     class ACE_Explosives_Place_APERSBoundingMine: ACE_Explosives_Place {
-        displayName = "APERS Bounding Mine";
+        displayName = "$STR_A3_cfgMagazines_BouncingMineRangeMagazine0";
         model = "\A3\Weapons_F\explosives\mine_AP_bouncing";
     };
     class ACE_Explosives_Place_APERSMine: ACE_Explosives_Place {
-        displayName = "APERS Mine";
+        displayName = "$STR_A3_cfgMagazines_ClassicMineRangeMagazine0";
         model = "\A3\Weapons_F\explosives\mine_ap";
     };
     class ACE_Explosives_Place_APERSTripwireMine: ACE_Explosives_Place {
-        displayName = "APERS Tripwire Mine";
+        displayName = "$STR_A3_cfgMagazines_ClassicMineWireMagazine0";
         model = "\A3\Weapons_F\explosives\mine_AP_tripwire";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -133,12 +133,12 @@ class CfgVehicles {
     };
 
     class ACE_Explosives_Place_ATMine: ACE_Explosives_Place {
-        displayName = "AT Mine";
+        displayName = "$STR_A3_CfgMagazines_Mine0";
         model = "\A3\Weapons_f\Explosives\mine_at";
     };
 
     class ACE_Explosives_Place_Claymore: ACE_Explosives_Place {
-        displayName = "Claymore";
+        displayName = "$STR_A3_cfgMagazines_DirectionalMineRemoteMagazine0";
         model = "\A3\Weapons_F\explosives\mine_AP_miniclaymore";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -148,7 +148,7 @@ class CfgVehicles {
     };
 
     class ACE_Explosives_Place_SatchelCharge: ACE_Explosives_Place {
-        displayName = "Satchel Charge";
+        displayName = "$STR_A3_cfgMagazines_PipeBomb0";
         model = "\A3\Weapons_F\Explosives\satchel";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -159,7 +159,7 @@ class CfgVehicles {
 
     // Orange DLC:
     class ACE_Explosives_Place_APERSMineDispenser: ACE_Explosives_Place {
-        displayName = "APERSMineDispenser";
+        displayName = "$STR_A3_CfgMagazines_APERSMineDispenser_Mag0";
         model = "\A3\Weapons_F_Orange\Explosives\APERSmineDispenser";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -168,7 +168,7 @@ class CfgVehicles {
         };
     };
     class ACE_Explosives_Place_TrainingMine: ACE_Explosives_Place {
-        displayName = "TrainingMine";
+        displayName = "$STR_A3_CfgMagazines_TrainingMine_Mag0";
         model = "\A3\Weapons_F_Orange\Explosives\TrainingMine_F";
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -179,28 +179,28 @@ class CfgVehicles {
 
 
     class ACE_Explosives_Place_SLAM: ACE_Explosives_Place {
-        displayName = "SLAM";
+        displayName = "$STR_A3_cfgMagazines_DirectionalMineRangeMagazine0";
         model = "\A3\Weapons_F\Explosives\mine_SLAM_directional";
     };
 
     // IEDs
     class ACE_Explosives_Place_IEDUrbanBig: ACE_Explosives_Place {
-        displayName = "IED Urban Big";
+        displayName = "$STR_A3_CfgVehicles_IEDUrbanBig_F";
         model = "\A3\Weapons_F\Explosives\IED_urban_big";
     };
 
     class ACE_Explosives_Place_IEDLandBig: ACE_Explosives_Place {
-        displayName = "IED Land Big";
+        displayName = "$STR_A3_CfgVehicles_IEDLandBig_F";
         model = "\A3\Weapons_F\Explosives\IED_land_big";
     };
 
     class ACE_Explosives_Place_IEDUrbanSmall: ACE_Explosives_Place {
-        displayName = "IED Urban Small";
+        displayName = "$STR_A3_CfgVehicles_IEDUrbanSmall_F";
         model = "\A3\Weapons_F\Explosives\IED_urban_small";
     };
 
     class ACE_Explosives_Place_IEDLandSmall: ACE_Explosives_Place {
-        displayName = "IED Land Small";
+        displayName = "$STR_A3_CfgVehicles_IEDLandSmall_F";
         model = "\A3\Weapons_F\Explosives\IED_land_small";
     };
 

diff --git a/addons/realisticnames/CfgMagazines.hpp b/addons/realisticnames/CfgMagazines.hpp
@@ -390,12 +390,6 @@ class CfgMagazines {
     class DemoCharge_Remote_Mag: SatchelCharge_Remote_Mag {
         displayName = CSTRING(DemoCharge_Name);
     };
-    class ACE_SatchelCharge_Remote_Mag_Throwable: CA_Magazine {
-        displayName = CSTRING(SatchelChargeThrowable_Name);
-    };
-    class ACE_DemoCharge_Remote_Mag_Throwable: ACE_SatchelCharge_Remote_Mag_Throwable {
-        displayName = CSTRING(DemoChargeThrowable_Name);
-    };
 
     // hand grenades
     class HandGrenade: CA_Magazine {

diff --git a/addons/realisticnames/compat_explosives/CfgMagazines.hpp b/addons/realisticnames/compat_explosives/CfgMagazines.hpp
@@ -0,0 +1,9 @@
+class CfgMagazines {
+    class CA_Magazine;
+    class ACE_SatchelCharge_Remote_Mag_Throwable: CA_Magazine {
+        displayName = CSTRING(SatchelChargeThrowable_Name);
+    };
+    class ACE_DemoCharge_Remote_Mag_Throwable: ACE_SatchelCharge_Remote_Mag_Throwable {
+        displayName = CSTRING(DemoChargeThrowable_Name);
+    };
+};
diff --git a/addons/realisticnames/compat_explosives/CfgVehicles.hpp b/addons/realisticnames/compat_explosives/CfgVehicles.hpp
@@ -0,0 +1,29 @@
+class CfgVehicles {
+    class ACE_Explosives_Place;
+    class ACE_Explosives_Place_DemoCharge: ACE_Explosives_Place {
+        displayName = CSTRING(DemoCharge_Name);
+    };
+    class ACE_Explosives_Place_APERSBoundingMine: ACE_Explosives_Place {
+        displayName = CSTRING(APERSBoundingMine_Name);
+    };
+    class ACE_Explosives_Place_APERSMine: ACE_Explosives_Place {
+        displayName = CSTRING(APERSMine_Name);
+    };
+    class ACE_Explosives_Place_APERSTripwireMine: ACE_Explosives_Place {
+        displayName = CSTRING(APERSTripwireMine_Name);
+    };
+    class ACE_Explosives_Place_ATMine: ACE_Explosives_Place {
+        displayName = CSTRING(ATMine_Name);
+    };
+    class ACE_Explosives_Place_Claymore: ACE_Explosives_Place {
+        displayName = CSTRING(Claymore_Name);
+    };
+    class ACE_Explosives_Place_SatchelCharge: ACE_Explosives_Place {
+        displayName = CSTRING(SatchelCharge_Name);
+    };
+
+    // Orange DLC
+    class ACE_Explosives_Place_SLAM: ACE_Explosives_Place {
+        displayName = CSTRING(SLAM_Name);
+    };
+};
diff --git a/addons/realisticnames/compat_explosives/config.cpp b/addons/realisticnames/compat_explosives/config.cpp
@@ -0,0 +1,22 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {QUOTE(ADDON), "ace_explosives"};
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        // this prevents any patched class from requiring this addon
+        addonRootClass = "A3_Characters_F";
+    };
+};
+
+#include "CfgMagazines.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/realisticnames/compat_explosives/script_component.hpp b/addons/realisticnames/compat_explosives/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT explosives
+#define SUBCOMPONENT_BEAUTIFIED Explosives
+#include "..\script_component.hpp"