From ed1d42f71d30b61ea8e560b55ed5c361d61ae71b Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sat, 24 Aug 2024 22:17:39 +0200 Subject: [PATCH] Aegis Compat - Add some realistic names (#10253) --- .../CfgVehicles.hpp | 21 +++++++++++++++ .../compat_aegis_realisticnames/config.cpp | 26 +++++++++++++++++++ .../script_component.hpp | 3 +++ .../stringtable.xml | 15 +++++++++++ .../CfgVehicles.hpp | 13 ++++++++++ .../compat_aegis_vehicles/config.cpp | 25 ++++++++++++++++++ .../script_component.hpp | 3 +++ addons/compat_aegis/config.cpp | 7 ++--- 8 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp create mode 100644 addons/compat_aegis/compat_aegis_realisticnames/config.cpp create mode 100644 addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp create mode 100644 addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml rename addons/compat_aegis/{ => compat_aegis_vehicles}/CfgVehicles.hpp (88%) create mode 100644 addons/compat_aegis/compat_aegis_vehicles/config.cpp create mode 100644 addons/compat_aegis/compat_aegis_vehicles/script_component.hpp diff --git a/addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp b/addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp new file mode 100644 index 0000000000..19a1bef510 --- /dev/null +++ b/addons/compat_aegis/compat_aegis_realisticnames/CfgVehicles.hpp @@ -0,0 +1,21 @@ +class CfgVehicles { + class APC_Wheeled_01_base_v2_F; + class B_APC_Wheeled_01_cannon_v2_F: APC_Wheeled_01_base_v2_F { + displayName = ECSTRING(realisticnames,APC_Wheeled_01_cannon_Name); + }; + + class B_APC_Wheeled_01_base_F; + class B_APC_Wheeled_01_medical_F: B_APC_Wheeled_01_base_F { + displayName = SUBCSTRING(APC_Wheeled_01_medical_Name); + }; + + class APC_Tracked_02_medical_base_F; + class O_R_APC_Tracked_02_medical_F: APC_Tracked_02_medical_base_F { + displayName = SUBCSTRING(APC_Tracked_02_medical_Name); + }; + + class APC_Tracked_03_base_v2_F; + class B_A_APC_tracked_03_cannon_v2_F: APC_Tracked_03_base_v2_F { + displayName = ECSTRING(realisticnames,APC_tracked_03_cannon_Name); + }; +}; diff --git a/addons/compat_aegis/compat_aegis_realisticnames/config.cpp b/addons/compat_aegis/compat_aegis_realisticnames/config.cpp new file mode 100644 index 0000000000..add9f50a3a --- /dev/null +++ b/addons/compat_aegis/compat_aegis_realisticnames/config.cpp @@ -0,0 +1,26 @@ +#include "script_component.hpp" + +class CfgPatches { + class SUBADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "A3_Aegis_Armor_F_Aegis_APC_Wheeled_01", + "A3_Aegis_Armor_F_Aegis_APC_Tracked_02", + "A3_Aegis_Armor_F_Aegis_APC_Tracked_03", + "ace_realisticnames" + }; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {"johnb43"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + + // this prevents any patched class from requiring this addon + addonRootClass = "A3_Characters_F"; + }; +}; + +#include "CfgVehicles.hpp" diff --git a/addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp b/addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp new file mode 100644 index 0000000000..b8d0682fa4 --- /dev/null +++ b/addons/compat_aegis/compat_aegis_realisticnames/script_component.hpp @@ -0,0 +1,3 @@ +#define SUBCOMPONENT realisticnames +#define SUBCOMPONENT_BEAUTIFIED Realistic Names +#include "..\script_component.hpp" diff --git a/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml b/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml new file mode 100644 index 0000000000..2f904b320b --- /dev/null +++ b/addons/compat_aegis/compat_aegis_realisticnames/stringtable.xml @@ -0,0 +1,15 @@ + + + + + Badger IFV (Medical) + SPz Badger (Sanitäter) + Badger IFV (Médical) + + + BM-2T Stalker (Medical) + BM-2T Stalker (Sanitäter) + BM-2T Stalker (Médical) + + + diff --git a/addons/compat_aegis/CfgVehicles.hpp b/addons/compat_aegis/compat_aegis_vehicles/CfgVehicles.hpp similarity index 88% rename from addons/compat_aegis/CfgVehicles.hpp rename to addons/compat_aegis/compat_aegis_vehicles/CfgVehicles.hpp index 8b069b517e..5d0e86faaf 100644 --- a/addons/compat_aegis/CfgVehicles.hpp +++ b/addons/compat_aegis/compat_aegis_vehicles/CfgVehicles.hpp @@ -6,6 +6,19 @@ class CfgVehicles { }; }; + class APC_Tracked_03_base_F: Tank_F { + class Turrets: Turrets { + class MainTurret: MainTurret {}; + }; + }; + class APC_Tracked_03_base_v2_F: APC_Tracked_03_base_F { + class Turrets: Turrets { + class MainTurret: MainTurret { + weapons[] = {"autocannon_40mm_CTWS", "ACE_LMG_coax_L94A1_mem3"}; // Aegis upgrades to a 40mm cannon, but we want realistic MG name + }; + }; + }; + class MBT_01_base_F: Tank_F { class Turrets: Turrets { class MainTurret: MainTurret { diff --git a/addons/compat_aegis/compat_aegis_vehicles/config.cpp b/addons/compat_aegis/compat_aegis_vehicles/config.cpp new file mode 100644 index 0000000000..fd16fa8686 --- /dev/null +++ b/addons/compat_aegis/compat_aegis_vehicles/config.cpp @@ -0,0 +1,25 @@ +#include "script_component.hpp" + +class CfgPatches { + class SUBADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "A3_Aegis_Armor_F_Aegis_MBT_01", + "A3_Aegis_Armor_F_Aegis_APC_Tracked_03", + "ace_vehicles" + }; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {"johnb43"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + + // this prevents any patched class from requiring this addon + addonRootClass = "A3_Characters_F"; + }; +}; + +#include "CfgVehicles.hpp" diff --git a/addons/compat_aegis/compat_aegis_vehicles/script_component.hpp b/addons/compat_aegis/compat_aegis_vehicles/script_component.hpp new file mode 100644 index 0000000000..17370c415f --- /dev/null +++ b/addons/compat_aegis/compat_aegis_vehicles/script_component.hpp @@ -0,0 +1,3 @@ +#define SUBCOMPONENT vehicles +#define SUBCOMPONENT_BEAUTIFIED Vehicles +#include "..\script_component.hpp" diff --git a/addons/compat_aegis/config.cpp b/addons/compat_aegis/config.cpp index 51a70b06ff..2de723b9a4 100644 --- a/addons/compat_aegis/config.cpp +++ b/addons/compat_aegis/config.cpp @@ -6,13 +6,14 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_vehicles", "A3_Aegis_Armor_F_Aegis_MBT_01"}; + requiredAddons[] = {"ace_common"}; skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); authors[] = {"johnb43"}; url = ECSTRING(main,URL); VERSION_CONFIG; + + // this prevents any patched class from requiring this addon + addonRootClass = "A3_Characters_F"; }; }; - -#include "CfgVehicles.hpp"