Merge pull request #1024 from thunderstore-io/sunfrost

Add three games AND Fix Shadows Over Loathing autodiscovery bug
ebkr · May 17, 2023 · fbff1ee · fbff1ee
2 parents 6d176ed + fe01c2b
commit fbff1ee
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 2 deletions.
diff --git a/src/assets/images/game_selection/shadows-of-doubt.jpg b/src/assets/images/game_selection/shadows-of-doubt.jpg
diff --git a/src/assets/images/game_selection/sun-haven.jpg b/src/assets/images/game_selection/sun-haven.jpg
diff --git a/src/assets/images/game_selection/wildfrost.jpg b/src/assets/images/game_selection/wildfrost.jpg
diff --git a/src/model/game/GameManager.ts b/src/model/game/GameManager.ts
@@ -420,7 +420,7 @@ export default class GameManager {
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.MELON_LOADER, ["pq"]),
 
         new Game("Shadows Over Loathing", "ShadowsOverLoathing", "ShadowsOverLoathing",
-            "Shadows Over Loathing", ["Shadows Over Loathing.exe"], "ShadowsOverLoathing_Data",
+            path.join("Shadows Over Loathing", "Shadows Over Loathing"), ["Shadows Over Loathing.exe"], "ShadowsOverLoathing_Data",
             "https://thunderstore.io/c/shadows-over-loathing/api/v1/package/", "https://github.com/ebkr/r2modmanPlus/master/modExclusions.md",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1939160")], "shadows-over-loathing.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sol"]),
@@ -430,6 +430,24 @@ export default class GameManager {
             "https://thunderstore.io/c/west-of-loathing/api/v1/package/", "https://github.com/ebkr/r2modmanPlus/master/modExclusions.md",
             [new StorePlatformMetadata(StorePlatform.STEAM, "597220")], "west-of-loathing.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wol"]),
+
+        new Game("Sun Haven", "SunHaven", "SunHaven",
+            "Sun Haven", ["Sun Haven.exe"], "SunHaven_Data",
+            "https://thunderstore.io/c/sun-haven/api/v1/package/", "https://github.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1432860")], "sun-haven.jpg",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sh"]),
+
+        new Game("Wildfrost", "Wildfrost", "Wildfrost",
+            "Wildfrost", ["Wildfrost.exe"], "Wildfrost_Data",
+            "https://thunderstore.io/c/wildfrost/api/v1/package/", "https://github.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1811990")], "wildfrost.jpg",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wfrst"]),
+
+        new Game("Shadows of Doubt", "ShadowsofDoubt", "ShadowsofDoubt",
+            "Shadows of Doubt", ["Shadows of Doubt.exe"], "ShadowsofDoubt_Data",
+            "https://thunderstore.io/c/shadows-of-doubt/api/v1/package/", "https://github.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "986130")], "shadows-of-doubt.jpg",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["sod"]),
     ];
 
     static get activeGame(): Game {

diff --git a/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts b/src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts
@@ -98,6 +98,9 @@ export default class InstallationRuleApplicator {
             buildMelonLoaderRules("PatchQuest"),
             buildBepInExRules("ShadowsOverLoathing"),
             buildBepInExRules("WestofLoathing"),
+            buildBepInExRules("SunHaven"),
+            buildBepInExRules("Wildfrost"),
+            buildBepInExRules("ShadowsofDoubt"),
         ]
     }
 }
diff --git a/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts b/src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts
@@ -78,6 +78,9 @@ const VARIANTS = {
     PatchQuest: [new ModLoaderPackageMapping("LavaGang-MelonLoader", "", PackageLoader.MELON_LOADER)],
     ShadowsOverLoathing: [new ModLoaderPackageMapping("BepInEx-BepInExPack", "BepInExPack", PackageLoader.BEPINEX)],
     WestofLoathing: [new ModLoaderPackageMapping("BepInEx-BepInExPack", "BepInExPack", PackageLoader.BEPINEX)],
+    SunHaven: [new ModLoaderPackageMapping("BepInEx-BepInExPack", "BepInExPack", PackageLoader.BEPINEX)],
+    Wildfrost: [new ModLoaderPackageMapping("BepInEx-BepInExPack_IL2CPP", "BepInExPack", PackageLoader.BEPINEX)],
+    ShadowsofDoubt: [new ModLoaderPackageMapping("BepInEx-BepInExPack_IL2CPP", "BepInExPack", PackageLoader.BEPINEX)],
 };
 // Exported separately from the definition in order to preserve the key names in the type definition.
 // Otherwise this would become [key: string] and we couldn't use the game names for type hinting elsewhere.

diff --git a/src/r2mm/manager/SettingsDexieStore.ts b/src/r2mm/manager/SettingsDexieStore.ts
@@ -34,7 +34,7 @@ export default class SettingsDexieStore extends Dexie {
 
         // Add all games to store. Borked v2-3 locally
         // Increment per game or change to settings.
-        this.version(56).stores(store);
+        this.version(57).stores(store);
 
         this.activeGame = game;
         this.global = this.table("value");