added some conditions for addons

fgsfds · May 28, 2024 · b8bbdbd · b8bbdbd
1 parent 134250a
commit b8bbdbd
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 13 deletions.
diff --git a/src/Avalonia/Core/Controls/CampaignsControl.axaml.cs b/src/Avalonia/Core/Controls/CampaignsControl.axaml.cs
@@ -3,6 +3,7 @@
 using BuildLauncher.Helpers;
 using BuildLauncher.ViewModels;
 using Common.Enums;
+using Common.Enums.Addons;
 using Common.Helpers;
 using Common.Interfaces;
 using CommunityToolkit.Mvvm.Input;
@@ -60,9 +61,33 @@ private void AddPortsButtons()
                     Content = sp,
                     Command = new RelayCommand(() =>
                         _viewModel.StartCampaignCommand.Execute(port),
-                        () => port.IsInstalled && CampaignsList.SelectedItem is not null &&
-                        (((IAddon)CampaignsList.SelectedItem).RequiredFeatures is null || !((IAddon)CampaignsList.SelectedItem).RequiredFeatures!.Except(port.SupportedFeatures).Any())
-                        ),
+                        () =>
+                        {
+                            if (!port.IsInstalled)
+                            {
+                                return false;
+                            }
+
+                            if (CampaignsList.SelectedItem is null)
+                            {
+                                return false;
+                            }
+
+                            var selectedCampaign = (IAddon)CampaignsList.SelectedItem;
+
+                            if (port.PortEnum is PortEnum.BuildGDX &&
+                                (selectedCampaign.Type is not AddonTypeEnum.Official || selectedCampaign.Id.Equals(DukeAddonEnum.DukeNW.ToString(), StringComparison.InvariantCultureIgnoreCase)))
+                            {
+                                return false;
+                            }
+
+                            if (selectedCampaign.RequiredFeatures is null || !selectedCampaign.RequiredFeatures!.Except(port.SupportedFeatures).Any())
+                            {
+                                return true;
+                            }
+
+                            return false;
+                        }),
                     Margin = new(5),
                     Padding = new(5),
                 };

diff --git a/src/Avalonia/Core/Controls/MapsControl.axaml.cs b/src/Avalonia/Core/Controls/MapsControl.axaml.cs
@@ -60,9 +60,32 @@ private void AddPortsButtons()
                     Content = sp,
                     Command = new RelayCommand(() =>
                         _viewModel.StartMapCommand.Execute(port),
-                        () => port.IsInstalled && MapsList.SelectedItem is not null &&
-                        (((IAddon)MapsList.SelectedItem)?.RequiredFeatures is null || !((IAddon)MapsList.SelectedItem).RequiredFeatures!.Except(port.SupportedFeatures).Any())
-                        ),
+                        () =>
+                        {
+                            if (!port.IsInstalled)
+                            {
+                                return false;
+                            }
+
+                            if (MapsList.SelectedItem is null)
+                            {
+                                return false;
+                            }
+
+                            var selectedMap = (IAddon)MapsList.SelectedItem;
+
+                            if (port.PortEnum is PortEnum.BuildGDX)
+                            {
+                                return false;
+                            }
+
+                            if (selectedMap.RequiredFeatures is null || !selectedMap.RequiredFeatures!.Except(port.SupportedFeatures).Any())
+                            {
+                                return true;
+                            }
+
+                            return false;
+                        }),
                     Margin = new(5),
                     Padding = new(5),
                 };

diff --git a/src/Common/Enums/FeatureEnum.cs b/src/Common/Enums/FeatureEnum.cs
@@ -8,6 +8,9 @@ public enum FeatureEnum
         Sloped_Sprites,
         TROR,
         Wall_Rotate_Cstat,
-        CustomDude
+        CustomDude,
+        WorldTourSupport,
+        [Obsolete]
+        VacaDcSupport
     }
 }
diff --git a/src/Games/Games/DukeGame.cs b/src/Games/Games/DukeGame.cs
@@ -131,7 +131,7 @@ Duke Nukem 3D is a first-person shooter developed and published by **3D Realms**
                         """,
                     Version = null,
                     SupportedGame = new(GameEnum.Duke3D, DukeVersionEnum.Duke3D_WT),
-                    RequiredFeatures = null,
+                    RequiredFeatures = [FeatureEnum.WorldTourSupport],
                     PathToFile = null,
                     DependentAddons = null,
                     IncompatibleAddons = null,
@@ -166,7 +166,7 @@ Duke Nukem 3D is a first-person shooter developed and published by **3D Realms**
                             """,
                         Version = null,
                         SupportedGame = new(GameEnum.Duke3D, DukeVersionEnum.Duke3D_Atomic),
-                        RequiredFeatures = null,
+                        RequiredFeatures = [FeatureEnum.VacaDcSupport],
                         PathToFile = null,
                         DependentAddons = new() { {DukeAddonEnum.DukeVaca.ToString(), null } },
                         IncompatibleAddons = null,
@@ -232,7 +232,7 @@ Duke Nukem must travel to the North Pole in order to stop the brainwashed Santa
                             """,
                         Version = null,
                         SupportedGame = new(GameEnum.Duke3D, DukeVersionEnum.Duke3D_Atomic),
-                        RequiredFeatures = null,
+                        RequiredFeatures = [FeatureEnum.VacaDcSupport],
                         PathToFile = null,
                         DependentAddons = new() { { DukeAddonEnum.DukeDC.ToString(), null } },
                         IncompatibleAddons = null,

diff --git a/src/Ports/Ports/BuildGDX.cs b/src/Ports/Ports/BuildGDX.cs
@@ -45,7 +45,7 @@ public sealed class BuildGDX : BasePort
         public override bool IsInstalled => File.Exists(Path.Combine(PathToExecutableFolder, "BuildGDX.jar"));
 
         /// <inheritdoc/>
-        public override List<FeatureEnum> SupportedFeatures => [];
+        public override List<FeatureEnum> SupportedFeatures => [FeatureEnum.WorldTourSupport];
 
 
         /// <inheritdoc/>

diff --git a/src/Ports/Ports/EDuke32/EDuke32.cs b/src/Ports/Ports/EDuke32/EDuke32.cs
@@ -56,7 +56,7 @@ public class EDuke32 : BasePort
             ];
 
         /// <inheritdoc/>
-        public override List<FeatureEnum> SupportedFeatures => [FeatureEnum.EDuke32_CON];
+        public override List<FeatureEnum> SupportedFeatures => [FeatureEnum.EDuke32_CON, FeatureEnum.WorldTourSupport];
 
         /// <inheritdoc/>
         public override string? InstalledVersion

diff --git a/src/Ports/Ports/Raze.cs b/src/Ports/Ports/Raze.cs
@@ -69,7 +69,7 @@ public sealed class Raze : BasePort
         protected override string AddGrpParam => throw new NotImplementedException();
 
         /// <inheritdoc/>
-        public override List<FeatureEnum> SupportedFeatures => [];
+        public override List<FeatureEnum> SupportedFeatures => [FeatureEnum.WorldTourSupport, FeatureEnum.VacaDcSupport];
 
         /// <inheritdoc/>
         protected override void GetSkipIntroParameter(StringBuilder sb) => sb.Append(" -quick");