zoom platform support

Author: fgsfds

Directory.Packages.props

@@ -25,7 +25,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageVersion Include="xunit" Version="2.8.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.309.5" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.309.7" />
     <PackageVersion Include="ConfigureAwaitAnalyzer" Version="1.0.3" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.6" />

src/Games/Games/BaseGame.cs

@@ -106,7 +106,8 @@ protected bool IsInstalled(string file)
             return false;
         }
 
-        if (!File.Exists(Path.Combine(GameInstallFolder, file)))
+        if (!File.Exists(Path.Combine(GameInstallFolder, file)) &&
+            !File.Exists(Path.Combine(GameInstallFolder, "addons", file)))
         {
             return false;
         }

src/Games/Games/WangGame.cs

@@ -1,6 +1,5 @@
 using Common;
 using Common.Enums;
-using Common.Enums.Addons;
 using Common.Helpers;
 using Common.Interfaces;
 using Mods.Addons;
@@ -22,23 +21,13 @@ public sealed class WangGame : BaseGame
     /// <inheritdoc/>
     public override List<string> RequiredFiles => ["SW.GRP"];
 
-    /// <summary>
-    /// Is Duke it Out in DC installed
-    /// </summary>
-    public bool IsWantonInstalled => IsInstalled("WT.GRP");
-
-    /// <summary>
-    /// Is Nuclear Winter installed
-    /// </summary>
-    public bool IsTwinDragonInstalled => IsInstalled("TD.GRP");
-
 
     /// <summary>
     /// Get list of original campaigns
     /// </summary>
     public override Dictionary<AddonVersion, IAddon> GetOriginalCampaigns()
     {
-        Dictionary<AddonVersion, IAddon> campaigns = new(3);
+        Dictionary<AddonVersion, IAddon> campaigns = new(1);
 
         if (IsBaseGameInstalled)
         {
@@ -68,70 +57,6 @@ public override Dictionary<AddonVersion, IAddon> GetOriginalCampaigns()
                 StartMap = null,
                 PreviewImage = null,
             });
-
-            if (IsWantonInstalled)
-            {
-                var wangWdId = nameof(WangAddonEnum.Wanton).ToLower();
-                campaigns.Add(new(wangWdId), new WangCampaign()
-                {
-                    Id = wangWdId,
-                    Type = AddonTypeEnum.Official,
-                    Title = "Wanton Destruction",
-                    GridImage = ImageHelper.FileNameToStream("Wang.wanton.jpg", Assembly.GetExecutingAssembly()),
-                    Author = "Sunstorm Interactive",
-                    Description = """
-                        **Wanton Destruction** is an official expansion that was created by **Sunstorm Interactive** and tested by **3D Realms**, but was not released by the distributor.
-                        It was found and released for free on September 9, 2005.
-                    
-                        The add-on chronicles Lo Wang's adventures after the original game. He visits his relatives in USA, but is forced to fight off Zilla's forces again.
-                        The game culminates with a battle against Master Zilla above the streets of Tokyo, which ends with Master Zilla's death.
-                    
-                        The game features 12 new levels, new artwork and a few new enemy replacements, such as human enemies; though they still act like their original counterparts.
-                        """,
-                    Version = null,
-                    SupportedGame = new(GameEnum.ShadowWarrior),
-                    RequiredFeatures = null,
-                    PathToFile = null,
-                    DependentAddons = new(StringComparer.OrdinalIgnoreCase) { { nameof(WangAddonEnum.Wanton), null } },
-                    IncompatibleAddons = null,
-                    MainDef = null,
-                    AdditionalDefs = null,
-                    StartMap = null,
-                    PreviewImage = null,
-                });
-            }
-
-            if (IsTwinDragonInstalled)
-            {
-                var wangTdId = nameof(WangAddonEnum.TwinDragon).ToLower();
-                campaigns.Add(new(wangTdId), new WangCampaign()
-                {
-                    Id = wangTdId,
-                    Type = AddonTypeEnum.Official,
-                    Title = "Twin Dragon",
-                    GridImage = ImageHelper.FileNameToStream("Wang.twin.jpg", Assembly.GetExecutingAssembly()),
-                    Author = "Wylde Productions, Level Infinity",
-                    Description = """
-                        **Twin Dragon** is an official expansion to the Shadow Warrior that was released as a free download on July 4, 1998.
-                        
-                        The game reveals that Lo Wang has a twin brother, Hung Lo, with whom he was separated in early childhood. Hung Lo becomes a dark person whose goal is to destroy the world.
-                        Similar to Master Zilla, he uses the creatures from the dark side, criminal underworld and Zilla's remnants to further his goals. Lo Wang has to journey through his dark minions,
-                        reach his palace and defeat the evil Twin Dragon Hung Lo once and for all. When he reaches the palace, Lo Wang defeats his brother by shooting a Nuke at him, which kills Hung Lo in the process.
-                        
-                        The game features 13 new levels, new sounds, artwork and a new final boss, Hung Lo, who replaced Zilla.
-                        """,
-                    Version = null,
-                    SupportedGame = new(GameEnum.ShadowWarrior),
-                    RequiredFeatures = null,
-                    PathToFile = null,
-                    DependentAddons = new(StringComparer.OrdinalIgnoreCase) { { nameof(WangAddonEnum.TwinDragon), null } },
-                    IncompatibleAddons = null,
-                    MainDef = null,
-                    AdditionalDefs = null,
-                    StartMap = null,
-                    PreviewImage = null,
-                });
-            }
         }
 
         return campaigns;

src/Games/Providers/GamesPathsProvider.cs

@@ -28,6 +28,19 @@ public GamesPathsProvider(IConfigProvider config)
         {
             _config = config;
 
+            if (OperatingSystem.IsWindows())
+            {
+                var zoomPath = (string?)Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\ZOOM PLATFORM\Duke Nukem 3D - Atomic Edition", "InstallPath", null);
+
+                if (!string.IsNullOrWhiteSpace(zoomPath))
+                {
+                    if (Directory.Exists(zoomPath))
+                    {
+                        _dukePath ??= zoomPath;
+                    }
+                }
+            }
+
             var libs = GetSteamLibraries();
 
             foreach (var lib in libs)
@@ -47,19 +60,13 @@ public GamesPathsProvider(IConfigProvider config)
                     _dukePath ??= pathToGame;
                 }
 
-                //World Tour
-                //Using WT as a base game as a last resort
-                pathToGame = Path.Combine(lib, "Duke Nukem 3D Twentieth Anniversary World Tour");
-                if (Directory.Exists(pathToGame))
-                {
-                    _dukePath ??= pathToGame;
-                }
-
 
                 //WORLD TOUR
                 pathToGame = Path.Combine(lib, "Duke Nukem 3D Twentieth Anniversary World Tour");
                 if (Directory.Exists(pathToGame))
                 {
+                    //Using WT as a base game as a last resort
+                    _dukePath ??= pathToGame;
                     _dukeWtPath ??= pathToGame;
                 }
 
@@ -126,6 +133,8 @@ public GamesPathsProvider(IConfigProvider config)
                     _redneckPath ??= pathToGame;
                 }
 
+
+                //RIDES AGAIN
                 pathToGame = Path.Combine(lib, "Redneck Rampage Rides Again", "AGAIN");
                 if (Directory.Exists(pathToGame))
                 {
@@ -156,6 +165,7 @@ public GamesPathsProvider(IConfigProvider config)
                     _witch1Path ??= pathToGame;
                 }
 
+                //WITCHAVEN II
                 pathToGame = Path.Combine(lib, "Witchaven II Blood Vengeance", "Original", "GAME", "WHAVEN2");
                 if (Directory.Exists(pathToGame))
                 {
@@ -190,6 +200,8 @@ public GamesPathsProvider(IConfigProvider config)
         {
             return game switch
             {
+                DukeVersionEnum.Duke3D_13D => _dukePath,
+                DukeVersionEnum.Duke3D_Atomic => _dukePath,
                 DukeVersionEnum.Duke3D_WT => _dukeWtPath,
                 _ => throw new NotImplementedException()
             };

src/Mods/Providers/InstalledAddonsProvider.cs

@@ -1,6 +1,7 @@
 using ClientCommon.Config;
 using Common;
 using Common.Enums;
+using Common.Enums.Addons;
 using Common.Enums.Versions;
 using Common.Helpers;
 using Common.Interfaces;
@@ -170,25 +171,17 @@ public Dictionary<AddonVersion, IAddon> GetInstalledCampaigns()
 
         if (result is not null)
         {
-            foreach (var customCamp in result.OrderBy(static x => x.Value.Title))
+            foreach (var customCamp in result
+                //hack so SW addons end up at the beginning of the list
+                    .OrderByDescending(static x => x.Key.Id.Equals(nameof(WangAddonEnum.TwinDragon), StringComparison.InvariantCultureIgnoreCase))
+                    .ThenByDescending(static x => x.Key.Id.Equals(nameof(WangAddonEnum.Wanton), StringComparison.InvariantCultureIgnoreCase))
+                    .ThenBy(static x => x.Value.Title))
             {
-                if (campaigns.TryGetValue(customCamp.Key, out var _))
-                {
-                    //replacing original campaign with the downloaded one
-                    campaigns[customCamp.Key] = customCamp.Value;
-                }
-                else
-                {
-                    campaigns.Add(customCamp.Key, customCamp.Value);
-                }
+                campaigns.Add(customCamp.Key, customCamp.Value);
             }
-
-            return campaigns;
-        }
-        else
-        {
-            return [];
         }
+
+        return campaigns;
     }
 
     /// <inheritdoc/>

src/Ports/Ports/EDuke32/EDuke32.cs

@@ -184,7 +184,14 @@ protected void GetDukeArgs(StringBuilder sb, DukeGame game, IAddon addon)
                     dukeAddon = (byte)DukeAddonEnum.DukeVaca;
                 }
 
-                sb.Append($@" {AddDirectoryParam}""{game.GameInstallFolder}"" -addon {dukeAddon}");
+                sb.Append($@" {AddDirectoryParam}""{game.GameInstallFolder}""");
+
+                if (Directory.Exists(Path.Combine(game.GameInstallFolder!, "AddOns")))
+                {
+                    sb.Append($@" {AddDirectoryParam}""{Path.Combine(game.GameInstallFolder!, "AddOns")}""");
+                }
+
+                sb.Append($@" -addon {dukeAddon}");
             }
 
 

src/Ports/Ports/EDuke32/VoidSW.cs

@@ -69,9 +69,7 @@ protected override void BeforeStart(IGame game, IAddon campaign)
         protected override void GetStartCampaignArgs(StringBuilder sb, IGame game, IAddon addon)
         {
             //don't search for steam/gog installs
-            sb.Append($@" -usecwd");
-
-            sb.Append($@" {AddDirectoryParam}""{game.GameInstallFolder}""");
+            sb.Append($@" -usecwd {AddDirectoryParam}""{game.GameInstallFolder}""");
 
             if (addon.MainDef is not null)
             {

src/Ports/Ports/Raze.cs

@@ -487,6 +487,11 @@ private static void AddGamePathsToConfig(string gameFolder, string modsFolder, s
                     var path = gameFolder.Replace('\\', '/');
                     sb.Append("Path=").AppendLine(path);
 
+                    if (Directory.Exists(Path.Combine(gameFolder, "addons")))
+                    {
+                        sb.Append("Path=").AppendLine(path + "/addons");
+                    }
+
                     do
                     {
                         i++;
@@ -503,6 +508,12 @@ private static void AddGamePathsToConfig(string gameFolder, string modsFolder, s
 
                     var path = gameFolder.Replace('\\', '/');
                     sb.Append("Path=").AppendLine(path);
+
+                    if (Directory.Exists(Path.Combine(gameFolder, "addons")))
+                    {
+                        sb.Append("Path=").AppendLine(path + "/addons");
+                    }
+
                     path = modsFolder.Replace('\\', '/');
                     sb.Append("Path=").AppendLine(path);