Merge pull request #1108 from ebkr/develop

Develop

CHANGELOG.md

@@ -1,3 +1,12 @@
+### 3.1.45
+- Games added:
+  - Cities: Skylines II
+  - Lethal Company
+  - DREDGE
+  - Last Train Outta' Wormtown
+  - Wizard With a Gun
+    - Now boots the full game instead of the demo (Thanks to @RandomWolf)
+
 ### 3.1.44
 
 - Games added:

package.json

@@ -1,6 +1,6 @@
 {
     "name": "r2modman",
-    "version": "3.1.44",
+    "version": "3.1.45",
     "description": "A simple and easy to use mod manager for several games using Thunderstore.",
     "productName": "r2modman",
     "author": "ebkr",

src/_managerinf/ManagerInformation.ts

@@ -1,7 +1,7 @@
 import VersionNumber from '../model/VersionNumber';
 
 export default class ManagerInformation {
-    public static VERSION: VersionNumber = new VersionNumber('3.1.44');
+    public static VERSION: VersionNumber = new VersionNumber('3.1.45');
     public static IS_PORTABLE: boolean = false;
     public static APP_NAME: string = "r2modman";
 }

src/model/game/GameManager.ts

@@ -492,11 +492,13 @@ export default class GameManager {
             "https://thunderstore.io/c/touhou-lost-branch-of-legend/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
             [new StorePlatformMetadata(StorePlatform.STEAM, "1140150")], "TouhouLostBranchOfLegend.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["lbol"]),
+
          new Game("Wizard With A Gun", "WizardWithAGun", "WizardWithAGun",
-            "wizardwithagun", ['wizardwithagun.exe'], "wizardwithagun_Data",
+            "Wizard With A Gun", ['wizardwithagun.exe'], "wizardwithagun_Data",
             "https://thunderstore.io/c/wizard-with-a-gun/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
-            [new StorePlatformMetadata(StorePlatform.STEAM, "2312630")], "WizardWithAGun.jpg",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1150530")], "WizardWithAGun.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, ["wizgun"]),
+
         new Game("Sunkenland", "Sunkenland", "Sunkenland",
             "Sunkenland", ["Sunkenland.exe"], "Sunkenland_Data",
             "https://thunderstore.io/c/sunkenland/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
@@ -514,6 +516,30 @@ export default class GameManager {
             "https://thunderstore.io/c/erenshor/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
             [new StorePlatformMetadata(StorePlatform.STEAM, "2382520")], "Erenshor.jpg",
             GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
+
+        new Game("Last Train Outta' Wormtown", "LastTrainOuttaWormtown", "LastTrainOuttaWormtown",
+            "Last Train Outta' Wormtown", ["Last Train Out Of WormTown.exe"], "Last Train Out Of WormTown_Data",
+            "https://thunderstore.io/c/last-train-outta-wormtown/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "2318480")], "LastTrainOuttaWormtown.png",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
+
+        new Game("DREDGE", "Dredge", "Dredge",
+            "DREDGE", ["DREDGE.exe"], "DREDGE_Data",
+            "https://thunderstore.io/c/dredge/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1562430")], "Dredge.png",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
+
+        new Game("Cities: Skylines II", "CitiesSkylines2", "CitiesSkylines2",
+            "Cities Skylines II", ["Cities2.exe"], "CitiesSkylines2_Data",
+            "https://thunderstore.io/c/cities-skylines-ii/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "949230"), new StorePlatformMetadata(StorePlatform.XBOX_GAME_PASS, "ParadoxInteractive.CitiesSkylinesII-PCEdition")], "CitiesSkylines2.png",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
+
+        new Game("Lethal Company", "LethalCompany", "LethalCompany",
+            "Lethal Company", ["Lethal Company.exe"], "LethalCompany_Data",
+            "https://thunderstore.io/c/lethal-company/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
+            [new StorePlatformMetadata(StorePlatform.STEAM, "1966720")], "LethalCompany.png",
+            GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),
     ];
 
     static get activeGame(): Game {

src/r2mm/installing/default_installation_rules/InstallationRuleApplicator.ts

@@ -112,6 +112,10 @@ export default class InstallationRuleApplicator {
             buildBepInExRules("Sunkenland"),
             buildBepInExRules("Atomicrops"),
             buildBepInExRules("Erenshor"),
+            buildBepInExRules("LastTrainOuttaWormtown"),
+            buildBepInExRules("Dredge"),
+            buildBepInExRules("CitiesSkylines2"),
+            buildBepInExRules("LethalCompany"),
         ]
     }
 }

src/r2mm/installing/profile_installers/ModLoaderVariantRecord.ts

@@ -59,10 +59,12 @@ const MODLOADER_PACKAGES = [
     new ModLoaderPackageMapping("GodotModding-GodotModLoader", "", PackageLoader.GODOT_ML),
     new ModLoaderPackageMapping("BepInEx-BepInExPack_Skul", "BepInExPack", PackageLoader.BEPINEX),
     new ModLoaderPackageMapping("BepInEx-BepInExPack_IL2CPP", "BepInExPack", PackageLoader.BEPINEX),
+    new ModLoaderPackageMapping("BepInEx-BepInExPack_x86", "BepInExPack", PackageLoader.BEPINEX),
     new ModLoaderPackageMapping("Modding_Council-BepInExPack_of_Legend", "BepInExPack_of_Legend", PackageLoader.BEPINEX),
     new ModLoaderPackageMapping("BepInEx-BepInExPack_Thronefall", "BepInExPack", PackageLoader.BEPINEX),
     new ModLoaderPackageMapping("BepInEx-BepInExPack_WizardWithAGun", "BepInExPack", PackageLoader.BEPINEX),
     new ModLoaderPackageMapping("SunkenlandModding-BepInExPack_Sunkenland", "BepInExPack_Sunkenland", PackageLoader.BEPINEX),
+    new ModLoaderPackageMapping("BepInEx_Wormtown-BepInExPack", "BepInExPack", PackageLoader.BEPINEX),
 ];
 
 
@@ -150,6 +152,10 @@ const VARIANTS = {
     Sunkenland: MODLOADER_PACKAGES,
     Atomicrops: MODLOADER_PACKAGES,
     Erenshor: MODLOADER_PACKAGES,
+    LastTrainOuttaWormtown: MODLOADER_PACKAGES,
+    Dredge: MODLOADER_PACKAGES,
+    CitiesSkylines2: MODLOADER_PACKAGES,
+    LethalCompany: MODLOADER_PACKAGES,
 };
 // 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.

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(62).stores(store);
+        this.version(64).stores(store);
 
         this.activeGame = game;
         this.global = this.table("value");