Implement custom mission support with CampaignTagSelector

CnCNet · Sep 22, 2024 · 1485f2a · 1485f2a
1 parent ac044f7
commit 1485f2a
Show file tree

Hide file tree

Showing 12 changed files with 471 additions and 118 deletions.
diff --git a/ClientCore/ClientConfiguration.cs b/ClientCore/ClientConfiguration.cs
@@ -328,6 +328,8 @@ private List<TranslationGameFile> ParseTranslationGameFiles()
 
         public string AllowedCustomGameModes => clientDefinitionsIni.GetStringValue(SETTINGS, "AllowedCustomGameModes", "Standard,Custom Map");
 
+        public bool CampaignTagSelectorEnabled => clientDefinitionsIni.GetBooleanValue(SETTINGS, "CampaignTagSelectorEnabled", false);
+
         public string GetGameExecutableName()
         {
             string[] exeNames = clientDefinitionsIni.GetStringValue(SETTINGS, "GameExecutableNames", "Game.exe").Split(',');
@@ -420,6 +422,11 @@ public List<string> GetIRCServers()
 
         public bool DiscordIntegrationGloballyDisabled => string.IsNullOrWhiteSpace(DiscordAppId) || DisableDiscordIntegration;
 
+        public string CustomMissionPath => clientDefinitionsIni.GetStringValue(SETTINGS, "CustomMissionPath", "Maps/CustomMissions");
+        public string CustomMissionCsfName => clientDefinitionsIni.GetStringValue(SETTINGS, "CustomMissionCsfName", "stringtable99.csf");
+        public string CustomMissionPalName => clientDefinitionsIni.GetStringValue(SETTINGS, "CustomMissionPalName", "custommission.pal");
+        public string CustomMissionShpName => clientDefinitionsIni.GetStringValue(SETTINGS, "CustomMissionShpName", "custommission.shp");
+
         public OSVersion GetOperatingSystemVersion()
         {
 #if NETFRAMEWORK

diff --git a/ClientGUI/INItializableWindow.cs b/ClientGUI/INItializableWindow.cs
@@ -29,29 +29,43 @@ public INItializableWindow(WindowManager windowManager) : base(windowManager)
         /// instead of the window's name.
         /// </summary>
         protected string IniNameOverride { get; set; }
+        private bool VisitChild(IEnumerable<XNAControl> list, Func<XNAControl, bool> judge)
+        {
+            foreach (XNAControl child in list)
+            {
+                bool stop = judge(child);
+                if (stop) return true;
+                stop = VisitChild(child.Children, judge);
+                if (stop) return true;
+            }
+            return false;
+        }
 
         public T FindChild<T>(string childName, bool optional = false) where T : XNAControl
         {
-            T child = FindChild<T>(Children, childName);
-            if (child == null && !optional)
+            XNAControl result = null;
+            VisitChild(new List<XNAControl>() { this }, control =>
+            {
+                if (control.Name != childName) return false;
+                result = control;
+                return true;
+            });
+            if (result == null && !optional)
                 throw new KeyNotFoundException("Could not find required child control: " + childName);
-
-            return child;
+            return (T)result;
         }
 
-        private T FindChild<T>(IEnumerable<XNAControl> list, string controlName) where T : XNAControl
+        public List<T> FindChildrenStartWith<T>(string prefix) where T : XNAControl
         {
-            foreach (XNAControl child in list)
+            List<T> result = new List<T>();
+            VisitChild(new List<XNAControl>() { this }, (control) =>
             {
-                if (child.Name == controlName)
-                    return (T)child;
-
-                T childOfChild = FindChild<T>(child.Children, controlName);
-                if (childOfChild != null)
-                    return childOfChild;
-            }
-
-            return null;
+                if (string.IsNullOrEmpty(prefix) ||
+                !string.IsNullOrEmpty(control.Name) && control.Name.StartsWith(prefix))
+                    result.Add((T)control);
+                return false;
+            });
+            return result;
         }
 
         /// <summary>

diff --git a/DXMainClient/DXGUI/GameClass.cs b/DXMainClient/DXGUI/GameClass.cs
@@ -235,6 +235,8 @@ private IServiceProvider BuildServiceProvider(WindowManager windowManager)
                             .AddSingletonXnaControl<CnCNetGameLoadingLobby>()
                             .AddSingletonXnaControl<CnCNetLobby>()
                             .AddSingletonXnaControl<GameInProgressWindow>()
+                            .AddSingletonXnaControl<CampaignTagSelector>()
+                            .AddSingletonXnaControl<GameLoadingWindow>()
                             .AddSingletonXnaControl<SkirmishLobby>()
                             .AddSingletonXnaControl<MainMenu>()
                             .AddSingletonXnaControl<MapPreviewBox>()