Skip to content

Commit

Permalink
Merge pull request #143 from naschorr/dev
Browse files Browse the repository at this point in the history
Merging electron description and splash image improvements into main
  • Loading branch information
naschorr authored Mar 12, 2024
2 parents 511851a + 9c6b13d commit a898699
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 37 deletions.
3 changes: 2 additions & 1 deletion GUI/GUI.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
Expand All @@ -15,6 +15,7 @@
<PackageReference Include="Blazored.Modal" Version="6.0.1" />
<PackageReference Include="CssBuilder" Version="0.1.8" />
<PackageReference Include="ElectronNET.API" Version="23.6.2" />
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion GUI/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"wikiUrl": "https://github.com/naschorr/deep-rock-galactic-save-syncer/wiki",
"updateCheckUrl": "https://api.github.com/repos/naschorr/deep-rock-galactic-save-syncer/releases",
"overwriteFileRefreshIgnoreLockChangesMilliseconds": 7500,
"exitSteamExampleUrl": "https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/exit_steam_guide.png"
"exitSteamExampleUrl": "https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/exit_steam_guide.png"
}
3 changes: 2 additions & 1 deletion GUI/electron.manifest.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"executable": "GUI",
"splashscreen": {
"imageFile": "/wwwroot/images/logo.png"
"imageFile": "/wwwroot/images/logo_splash.png"
},
"name": "DeepRockGalacticSaveSyncer",
"description": "Easily keep your Steam and Xbox save files for Deep Rock Galactic synced up!",
"author": "Nick Schorr",
"singleInstance": true,
"environment": "Production",
Expand Down
Binary file modified GUI/icon.ico
Binary file not shown.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/logo.png" width="150"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/logo.png" width="150"/></p>

# Deep Rock Galactic Save Syncer
![tests workflow](https://github.com/naschorr/deep-rock-galactic-save-syncer/actions/workflows/tests.yml/badge.svg)

Easily keep your Steam and Xbox save files for Deep Rock Galactic synced up! That means no more lost progress when swapping between platforms to play with your friends.

<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example.png" width="800"/></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example.png" width="800"/></p>

> Here's an example of the DRGSS interface
Expand All @@ -22,40 +22,40 @@ There's no need to configure anything, just install and go!
The save file that's progressed the most is automatically chosen to overwrite the other. In the screenshot above, the Steam save file's Driller has one more promotion than the Xbox save file, and so the Steam save file will be kept.

Granular save file comparison lets you see what's changed at a glance:
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example_comparison.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example_comparison.png" /></p>

> Notice that the Gunner on the left has been promoted once to Gold I, while the one on the right is still Silver III. Since the left Gunner has more promotions, it means that the left save file has likely been played more recently. The `>` operator in the middle confirms this.
### One-click operation by default
The big button at the bottom lets you know what's going to happen when you click on it:

<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example_button_steam_xbox.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example_button_steam_xbox.png" /></p>

<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example_button_xbox_steam.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example_button_xbox_steam.png" /></p>

### Override the defaults and choose the save you want to keep
Don't agree with DRGSS' choice? Click the save you'd like to keep to override it!

### Quickly open your save file's directory in the explorer
Access the save files yourself with a single click! Each save file has a <img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/icons_high_contrast/arrow_icon.png" width="24" /> button that'll open it for you.
Access the save files yourself with a single click! Each save file has a <img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/icons_high_contrast/arrow_icon.png" width="24" /> button that'll open it for you.

### Save files are backed up during the sync operation
Chose the wrong file accidentally? Just delete the invalid one, and rename the `*.backup` file back to the original name. Alternatively, check out the [wiki](https://github.com/naschorr/deep-rock-galactic-save-syncer/wiki/Troubleshooting#restoring-drgss-backups) page that goes over restoring backups.

### Refresh the save files
Has something changed? Hit the refresh button to update your save files before syncing.

<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example_button_refresh.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example_button_refresh.png" /></p>

### Safe save file manipulation
DRGSS won't try to interfere with a save file while it's being written to by the game, so just hold tight until the all clear is given.

<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example_button_busy.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example_button_busy.png" /></p>

### Divergent save file detection
If you've made progress with both save files separately, DRGSS will alert you of this via the button at the bottom:

<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/dev/resources/images/example_button_divergent.png" /></p>
<p align="center"><img src="https://raw.githubusercontent.com/naschorr/deep-rock-galactic-save-syncer/main/resources/images/example_button_divergent.png" /></p>

To fix this, simply pick a save file to keep, and the button will become enabled again.

Expand Down
52 changes: 27 additions & 25 deletions resources/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icons/icon.ico
Binary file not shown.
Binary file modified resources/images/logo.png
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 resources/images/logo_splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a898699

Please sign in to comment.