Skip to content

Commit

Permalink
Merge pull request #1083 from ebkr/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ebkr authored Oct 1, 2023
2 parents 9eedb79 + a0e8cad commit 8487a2c
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ log.txt
*.ntvs*
*.njsproj
*.sln
/.vs
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 3.1.44

- Games added:
- Atomicrops
- Erenshor
- Sunkenland
- Wizard with a Gun (Thanks to @RandomWolf)

### 3.1.43
All changes were by the Thunderstore team for this release

Expand All @@ -11,7 +19,6 @@ All changes were by the Thunderstore team for this release
- Bomb Rush Cyberfunk
- Touhou: Lost Branch of Legend


### 3.1.42
- Games using MelonLoader should now correctly generate assemblies on first launch (EG: BONEWORKS / BONELABS)
- Data directory can (finally) be re-set to an older directory without having to clear settings
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "r2modman",
"version": "3.1.43",
"version": "3.1.44",
"description": "A simple and easy to use mod manager for several games using Thunderstore.",
"productName": "r2modman",
"author": "ebkr",
Expand Down
2 changes: 1 addition & 1 deletion src/_managerinf/ManagerInformation.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import VersionNumber from '../model/VersionNumber';

export default class ManagerInformation {
public static VERSION: VersionNumber = new VersionNumber('3.1.43');
public static VERSION: VersionNumber = new VersionNumber('3.1.44');
public static IS_PORTABLE: boolean = false;
public static APP_NAME: string = "r2modman";
}
Binary file added src/assets/images/game_selection/Atomicrops.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/game_selection/Erenshor.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/game_selection/Sunkenland.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions src/model/game/GameManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,28 @@ 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",
"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",
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",
[new StorePlatformMetadata(StorePlatform.STEAM, "2080690")], "Sunkenland.jpg",
GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),

new Game("Atomicrops", "Atomicrops", "Atomicrops",
"Atomicrops", ["Atomicrops.exe"], "Atomicrops_Data",
"https://thunderstore.io/c/atomicrops/api/v1/package/", "https://raw.githubusercontent.com/ebkr/r2modmanPlus/master/modExclusions.md",
[new StorePlatformMetadata(StorePlatform.STEAM, "757320")], "Atomicrops.jpg",
GameSelectionDisplayMode.VISIBLE, GameInstanceType.GAME, PackageLoader.BEPINEX, []),

new Game("Erenshor", "Erenshor", "Erenshor",
"Erenshor", ["Erenshor.exe"], "Erenshor_Data",
"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, []),
];

static get activeGame(): Game {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ export default class InstallationRuleApplicator {
buildBepInExRules("WizardOfLegend"),
buildBepInExRules("BombRushCyberfunk"),
buildBepInExRules("TouhouLostBranchOfLegend"),
buildBepInExRules("WizardWithAGun"),
buildBepInExRules("Sunkenland"),
buildBepInExRules("Atomicrops"),
buildBepInExRules("Erenshor"),
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ const MODLOADER_PACKAGES = [
new ModLoaderPackageMapping("BepInEx-BepInExPack_IL2CPP", "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),
];


Expand Down Expand Up @@ -144,6 +146,10 @@ const VARIANTS = {
WizardOfLegend: MODLOADER_PACKAGES,
BombRushCyberfunk: MODLOADER_PACKAGES,
TouhouLostBranchOfLegend: MODLOADER_PACKAGES,
WizardWithAGun: MODLOADER_PACKAGES,
Sunkenland: MODLOADER_PACKAGES,
Atomicrops: MODLOADER_PACKAGES,
Erenshor: 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.
Expand Down
2 changes: 1 addition & 1 deletion src/r2mm/manager/SettingsDexieStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(60).stores(store);
this.version(62).stores(store);

this.activeGame = game;
this.global = this.table("value");
Expand Down

0 comments on commit 8487a2c

Please sign in to comment.