General - Use subcomponent macro (#139)

Co-authored-by: Mike-MF <[email protected]>
Theseus-Aegis · Sep 9, 2023 · 66d1038 · 66d1038
1 parent cbe705d
commit 66d1038
Show file tree

Hide file tree

Showing 62 changed files with 141 additions and 119 deletions.
diff --git a/addons/african_militia/config.cpp b/addons/african_militia/config.cpp
@@ -76,6 +76,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main", "tacu_assets"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/african_militia/subconfig_ace/config.cpp b/addons/african_militia/subconfig_ace/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_African_Militia_B_Medic",
@@ -15,10 +15,11 @@ class CfgPatches {
             "ace_explosives",
             "ace_medical_treatment"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/african_militia/subconfig_ace/script_component.hpp b/addons/african_militia/subconfig_ace/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT african_militia_ace
-#define COMPONENT_BEAUTIFIED African Militia ACE
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT ace
+#define SUBCOMPONENT_BEAUTIFIED ACE
+#include "..\script_component.hpp"
diff --git a/addons/african_militia/subconfig_cup/config.cpp b/addons/african_militia/subconfig_cup/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             // Backpacks
@@ -20,10 +20,11 @@ class CfgPatches {
             "tacu_assets_cup",
             "CUP_Weapons_LoadOrder"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/african_militia/subconfig_cup/script_component.hpp b/addons/african_militia/subconfig_cup/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT african_militia_cup
-#define COMPONENT_BEAUTIFIED African Militia CUP
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT cup
+#define SUBCOMPONENT_BEAUTIFIED CUP
+#include "..\script_component.hpp"
diff --git a/addons/african_north/config.cpp b/addons/african_north/config.cpp
@@ -161,6 +161,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main", "tacu_assets"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/african_south/config.cpp b/addons/african_south/config.cpp
@@ -200,6 +200,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main", "tacu_assets"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/african_south/subconfig_ace/config.cpp b/addons/african_south/subconfig_ace/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_African_South_B_Medic",
@@ -14,10 +14,11 @@ class CfgPatches {
             "ace_explosives",
             "ace_medical_treatment"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/african_south/subconfig_ace/script_component.hpp b/addons/african_south/subconfig_ace/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT african_south_ace
-#define COMPONENT_BEAUTIFIED African South ACE
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT ace
+#define SUBCOMPONENT_BEAUTIFIED ACE
+#include "..\script_component.hpp"
diff --git a/addons/african_south/subconfig_cup/config.cpp b/addons/african_south/subconfig_cup/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_African_South_V_B_D30",
@@ -18,10 +18,11 @@ class CfgPatches {
             "tacu_assets_cup",
             "CUP_Weapons_LoadOrder"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/african_south/subconfig_cup/script_component.hpp b/addons/african_south/subconfig_cup/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT african_south_cup
-#define COMPONENT_BEAUTIFIED African South CUP
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT cup
+#define SUBCOMPONENT_BEAUTIFIED CUP
+#include "..\script_component.hpp"
diff --git a/addons/ammunition/config.cpp b/addons/ammunition/config.cpp
@@ -9,6 +9,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/ammunition/subconfig_CUP/script_component.hpp b/addons/ammunition/subconfig_CUP/script_component.hpp
diff --git a/addons/ammunition/subconfig_CUP/CfgAmmo.hpp → addons/ammunition/subconfig_cup/CfgAmmo.hpp b/addons/ammunition/subconfig_CUP/CfgAmmo.hpp → addons/ammunition/subconfig_cup/CfgAmmo.hpp
diff --git a/...nition/subconfig_CUP/CfgMagazineWells.hpp → ...nition/subconfig_cup/CfgMagazineWells.hpp b/...nition/subconfig_CUP/CfgMagazineWells.hpp → ...nition/subconfig_cup/CfgMagazineWells.hpp
diff --git a/...ammunition/subconfig_CUP/CfgMagazines.hpp → ...ammunition/subconfig_cup/CfgMagazines.hpp b/...ammunition/subconfig_CUP/CfgMagazines.hpp → ...ammunition/subconfig_cup/CfgMagazines.hpp
diff --git a/...s/ammunition/subconfig_CUP/CfgWeapons.hpp → ...s/ammunition/subconfig_cup/CfgWeapons.hpp b/...s/ammunition/subconfig_CUP/CfgWeapons.hpp → ...s/ammunition/subconfig_cup/CfgWeapons.hpp
diff --git a/addons/ammunition/subconfig_CUP/config.cpp → addons/ammunition/subconfig_cup/config.cpp b/addons/ammunition/subconfig_CUP/config.cpp → addons/ammunition/subconfig_cup/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
@@ -11,10 +11,11 @@ class CfgPatches {
             "tacu_ammunition",
             "CUP_Weapons_LoadOrder"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/ammunition/subconfig_cup/script_component.hpp b/addons/ammunition/subconfig_cup/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT cup
+#define SUBCOMPONENT_BEAUTIFIED CUP
+#include "..\script_component.hpp"
diff --git a/addons/assets/config.cpp b/addons/assets/config.cpp
@@ -158,6 +158,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike, GilleeDoo"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/assets/subconfig_cup/config.cpp b/addons/assets/subconfig_cup/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_Assets_AGS_base",
@@ -27,10 +27,11 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"tacu_assets", "CUP_Weapons_LoadOrder"};
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/assets/subconfig_cup/script_component.hpp b/addons/assets/subconfig_cup/script_component.hpp
@@ -1,5 +1,3 @@
-#define COMPONENT assets_cup
-#define COMPONENT_BEAUTIFIED Assets CUP
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
-#include "..\script_macros.hpp"
+#define SUBCOMPONENT cup
+#define SUBCOMPONENT_BEAUTIFIED CUP
+#include "..\script_component.hpp"
diff --git a/addons/baf/config.cpp b/addons/baf/config.cpp
@@ -118,6 +118,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main", "tacu_assets"};
         author = ECSTRING(main,Author);
         authors[] = {"GilleeDoo, Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/baf/subconfig_ace/config.cpp b/addons/baf/subconfig_ace/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_BAF_B_Demolitions_Fieldpack_Arid",
@@ -18,10 +18,11 @@ class CfgPatches {
             "ace_explosives",
             "ace_medical_treatment"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/baf/subconfig_ace/script_component.hpp b/addons/baf/subconfig_ace/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT baf_ace
-#define COMPONENT_BEAUTIFIED British Armed Forces ACE
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT ace
+#define SUBCOMPONENT_BEAUTIFIED ACE
+#include "..\script_component.hpp"
diff --git a/addons/baf/subconfig_cup/config.cpp b/addons/baf/subconfig_cup/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_BAF_V_B_Arid_L11A1",
@@ -21,10 +21,11 @@ class CfgPatches {
             "tacu_assets_cup",
             "CUP_Weapons_LoadOrder"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/baf/subconfig_cup/script_component.hpp b/addons/baf/subconfig_cup/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT baf_cup
-#define COMPONENT_BEAUTIFIED British Armed Forces CUP
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT cup
+#define SUBCOMPONENT_BEAUTIFIED CUP
+#include "..\script_component.hpp"
diff --git a/addons/cartel_greek/config.cpp b/addons/cartel_greek/config.cpp
@@ -61,6 +61,7 @@ class CfgPatches {
         };
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
         skipWhenMissingDependencies = 1;
     };

diff --git a/addons/faction_overwrites/config.cpp b/addons/faction_overwrites/config.cpp
@@ -9,6 +9,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main", "tacu_ammunition"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/faction_overwrites/subconfig_cup/config.cpp b/addons/faction_overwrites/subconfig_cup/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
@@ -11,10 +11,11 @@ class CfgPatches {
             "tacu_cup_ammunition",
             "CUP_Creatures_People_LoadOrder"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/faction_overwrites/subconfig_cup/script_component.hpp b/addons/faction_overwrites/subconfig_cup/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT faction_overwrites_cup
-#define COMPONENT_BEAUTIFIED Faction Overwrites CUP
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT cup
+#define SUBCOMPONENT_BEAUTIFIED CUP
+#include "..\script_component.hpp"
diff --git a/addons/faction_overwrites/subconfig_mu/config.cpp b/addons/faction_overwrites/subconfig_mu/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
@@ -16,10 +16,11 @@ class CfgPatches {
             "MU_mercs",
             "MU_RU"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };
 

diff --git a/addons/faction_overwrites/subconfig_mu/script_component.hpp b/addons/faction_overwrites/subconfig_mu/script_component.hpp
@@ -1,4 +1,3 @@
-#define COMPONENT faction_overwrites_mu
-#define COMPONENT_BEAUTIFIED Faction Overwrites Missing Units
-#include "\x\tacu\addons\main\script_mod.hpp"
-#include "\x\tacu\addons\main\script_macros.hpp"
+#define SUBCOMPONENT mu
+#define SUBCOMPONENT_BEAUTIFIED Missing Units
+#include "..\script_component.hpp"
diff --git a/addons/foreign_legion/config.cpp b/addons/foreign_legion/config.cpp
@@ -94,6 +94,7 @@ class CfgPatches {
         requiredAddons[] = {"tacu_main", "tacu_assets"};
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/foreign_legion/subconfig_ace/config.cpp b/addons/foreign_legion/subconfig_ace/config.cpp
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 class CfgPatches {
-    class ADDON {
+    class SUBADDON {
         name = COMPONENT_NAME;
         units[] = {
             "TACU_Foreign_Legion_B_Demolitions_AssaultPack",
@@ -15,10 +15,11 @@ class CfgPatches {
             "ace_explosives",
             "ace_medical_treatment"
         };
+        skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);
         authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
-        skipWhenMissingDependencies = 1;
     };
 };