From e06c1998165a9fb03bc2363345c096c00e1c1579 Mon Sep 17 00:00:00 2001
From: Valmo Trindade <val_mo_jr@hotmail.com>
Date: Mon, 19 May 2025 22:54:26 -0300
Subject: [PATCH] fixed CfgPatches modules

---
 addons/main/config.cpp   |   5 +-
 addons/server/config.cpp | 108 ++++++---------------------------------
 addons/video/config.cpp  |   3 +-
 3 files changed, 18 insertions(+), 98 deletions(-)

diff --git a/addons/main/config.cpp b/addons/main/config.cpp
index 358fc8c..ceb0816 100644
--- a/addons/main/config.cpp
+++ b/addons/main/config.cpp
@@ -3,10 +3,7 @@
 class CfgPatches {
   class ADDON {
     name = COMPONENT_NAME;
-    units[] = {
-      "armatak_module_core",
-      "armatak_module_callsign"
-    };
+    units[] = {};
     weapons[] = {};
     requiredAddons[] = {
         "cba_main",
diff --git a/addons/server/config.cpp b/addons/server/config.cpp
index c546f5b..84bfe91 100644
--- a/addons/server/config.cpp
+++ b/addons/server/config.cpp
@@ -3,7 +3,9 @@
 class CfgPatches {
   class ADDON {
     name = COMPONENT_NAME;
-    units[] = {};
+    units[] = {
+			QGVAR(coreModule)
+		};
     weapons[] = {};
     requiredAddons[] = {
         "cba_main",
@@ -38,20 +40,21 @@ class CfgVehicles {
 			class AnyBrain;
 		};
 	};
-  
-	class armatak_module_core: Module_F {
+
+	class GVAR(coreModule): Module_F {
 		scope = 2;
+		scopeCurator = 2;
 		displayname = "ARMATAK CoT Router";
 		icon = "\a3\Modules_F_Curator\Data\iconRadio_ca.paa";
-		category = "armatak_module_category";
-		function = "armatak_fnc_init";
+		category = QEGVAR(main,moduleCategory);
+		function = QFUNC(3denCoreModuleConfig);
 		functionPriority = 1;
 		isGlobal = 0;
-		isTriggerActivated = 0;
+		isTriggerActivated = 1;
 		isDisposable = 1;
 		is3den = 0;
 		curatorCanAttach = 0;
-		curatorInfoType = "RscDisplayAttributeModuleNuke";
+		curatorInfoType = "armatak_zeus_core_module_dialog";
 
 		canSetArea = 0;
 		canSetAreaShape = 0;
@@ -63,15 +66,15 @@ class CfgVehicles {
 		};
 
 		class Attributes: AttributesBase {
-			class armatak_module_tak_server_instance_address: Edit {
-				property = "armatak_module_tak_server_instance_address";
+			class GVAR(moduleInstanceAddress): Edit {
+				property = QGVAR(moduleInstanceAddress);
 				displayname = "TAK Server Address";
 				tooltip = "TAK Server Instance Address";
 				typeName = "STRING";
 				defaultValue = "localhost";
 			};
-			class armatak_module_tak_server_instance_port: Edit {
-				property = "armatak_module_tak_server_instance_port";
+			class GVAR(moduleInstancePort): Edit {
+				property = QGVAR(moduleInstancePort);
 				displayname = "TAK Server TCP Port";
 				tooltip = "TAK Server instance Port for TCP connection";
 				typeName = "NUMBER";
@@ -86,87 +89,8 @@ class CfgVehicles {
 
 			class LocationArea_F {
 				description[] = {
-					"First line",
-					"Second line"
-				};
-				position = 1;
-				direction = 1;
-				optional = 1;
-				duplicate = 1;
-				synced[] = { "BluforUnit", "AnyBrain" };
-			};
-			class BluforUnit
-			{
-				description = "Short description";
-				displayName = "Any BLUFOR unit";
-				icon = "iconMan";
-				side = 1;
-			};
-		};
-	};
-	class armatak_module_video_stream_core: armatak_module_core {
-		scope = 2;
-		displayname = "ARMATAK MediaMTX Video Feed Parser";
-		icon = "\a3\Modules_F_Curator\Data\iconcuratorsetcamera_ca.paa";
-		category = "armatak_module_category";
-		function = "armatak_fnc_video_init";
-		functionPriority = 1;
-		isGlobal = 0;
-		isTriggerActivated = 0;
-		isDisposable = 1;
-		is3den = 0;
-		curatorCanAttach = 0;
-		curatorInfoType = "RscDisplayAttributeModuleNuke";
-
-		canSetArea = 0;
-		canSetAreaShape = 0;
-		canSetAreaHeight = 0;
-
-		class AttributesValues {
-			size3[] = { 1, 1, -1 };
-			isRectangle = 0;
-		};
-
-		class Attributes: AttributesBase {
-			class armatak_module_mediamtx_video_stream_instance_address: Edit {
-				property = "armatak_module_mediamtx_video_stream_instance_address";
-				displayname = "MediaMTX Provider Address";
-				tooltip = "MediaMTX Provider Instance Address";
-				typeName = "STRING";
-				defaultValue = "localhost";
-			};
-			class armatak_module_mediamtx_video_stream_instance_port: Edit {
-				property = "armatak_module_mediamtx_video_stream_instance_port";
-				displayname = "MediaMTX Provider Port";
-				tooltip = "MediaMTX Provider Port for handling video streams";
-				typeName = "STRING";
-				defaultValue = "8554";
-			};
-			class armatak_module_mediamtx_video_stream_instance_auth_user: Edit {
-				property = "armatak_module_mediamtx_video_stream_instance_auth_user";
-				displayname = "MediaMTX Provider Username";
-				tooltip = "MediaMTX Provider Instance Username";
-				typeName = "STRING";
-				defaultValue = "administrator";
-			};
-			class armatak_module_mediamtx_video_stream_instance_auth_pass: Edit {
-				property = "armatak_module_mediamtx_video_stream_instance_auth_pass";
-				displayname = "MediaMTX Provider Password";
-				tooltip = "MediaMTX Provider Instance Password";
-				typeName = "STRING";
-				defaultValue = "password";
-			};
-			class ModuleDescription: ModuleDescription {};
-		};
-
-		class ModuleDescription: ModuleDescription {
-			description = "Generate the initial ARMATAK configuration, syncronizing all players to the TAK server instance";
-			sync[] = {"LocationArea_F"};
-
-			class LocationArea_F {
-				description[] = {
-					"First line",
-					"Second line"
+					"This module will synchronize all",
+					"players to the TAK server instance"
 				};
 				position = 1;
 				direction = 1;
diff --git a/addons/video/config.cpp b/addons/video/config.cpp
index fc7d754..a9ca685 100644
--- a/addons/video/config.cpp
+++ b/addons/video/config.cpp
@@ -4,8 +4,7 @@ class CfgPatches {
   class ADDON {
     name = COMPONENT_NAME;
     units[] = {
-      "armatak_module_core",
-      "armatak_module_callsign"
+      QGVAR(videoModule)
     };
     weapons[] = {};
     requiredAddons[] = {