Skip to content

Commit

Permalink
Add missing JP .exe version for 1.10 (#77)
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrankvdStam
FrankvdStam authored Jan 5, 2025
1 parent 7cb4585 commit 87794c4
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 36 deletions.
57 changes: 29 additions & 28 deletions src/SoulMemory/EldenRing/EldenRing.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,34 +204,35 @@ private void ResetPointers()

#region version ================================================================================================

private readonly Dictionary<EldenRingVersion, Version> _versions = new Dictionary<EldenRingVersion, Version>()
private readonly List<(EldenRingVersion eldenRingVersion, Version version)> _versions = new List<(EldenRingVersion, Version)>()
{

{ EldenRingVersion.V1_02_0, new Version(1,2,0,0) },
{ EldenRingVersion.V1_02_1, new Version(1,2,1,0) },
{ EldenRingVersion.V1_02_2, new Version(1,2,2,0) },
{ EldenRingVersion.V1_02_3, new Version(1,2,3,0) },
{ EldenRingVersion.V1_03_0, new Version(1,3,0,0) },
{ EldenRingVersion.V1_03_1, new Version(1,3,1,0) },
{ EldenRingVersion.V1_03_2, new Version(1,3,2,0) },
{ EldenRingVersion.V1_04_0, new Version(1,4,0,0) },
{ EldenRingVersion.V1_04_1, new Version(1,4,1,0) },
{ EldenRingVersion.V1_05_0, new Version(1,5,0,0) },
{ EldenRingVersion.V1_06_0, new Version(1,6,0,0) },
{ EldenRingVersion.V1_07_0, new Version(1,7,0,0) },
{ EldenRingVersion.V1_08_0, new Version(1,8,0,0) },
{ EldenRingVersion.V1_08_1, new Version(1,8,1,0) },
{ EldenRingVersion.V1_09_0, new Version(1,9,0,0) },
{ EldenRingVersion.V1_09_1, new Version(1,9,1,0) },
(EldenRingVersion.V1_02_0, new Version(1,2,0,0)),
(EldenRingVersion.V1_02_1, new Version(1,2,1,0)),
(EldenRingVersion.V1_02_2, new Version(1,2,2,0)),
(EldenRingVersion.V1_02_3, new Version(1,2,3,0)),
(EldenRingVersion.V1_03_0, new Version(1,3,0,0)),
(EldenRingVersion.V1_03_1, new Version(1,3,1,0)),
(EldenRingVersion.V1_03_2, new Version(1,3,2,0)),
(EldenRingVersion.V1_04_0, new Version(1,4,0,0)),
(EldenRingVersion.V1_04_1, new Version(1,4,1,0)),
(EldenRingVersion.V1_05_0, new Version(1,5,0,0)),
(EldenRingVersion.V1_06_0, new Version(1,6,0,0)),
(EldenRingVersion.V1_07_0, new Version(1,7,0,0)),
(EldenRingVersion.V1_08_0, new Version(1,8,0,0)),
(EldenRingVersion.V1_08_1, new Version(1,8,1,0)),
(EldenRingVersion.V1_09_0, new Version(1,9,0,0)),
(EldenRingVersion.V1_09_1, new Version(1,9,1,0)),
//1.10 turned into 2.0.0.0 for some reason
{ EldenRingVersion.V1_10_0, new Version(2,0,0,0) },
{ EldenRingVersion.V1_10_1, new Version(2,0,1,0) },
{ EldenRingVersion.V1_12_0, new Version(2,2,0,0) },
{ EldenRingVersion.V1_12_3, new Version(2,2,3,0) },
{ EldenRingVersion.V1_13_0, new Version(2,3,0,0) },
{ EldenRingVersion.V1_14_0, new Version(2,4,0,0) },
{ EldenRingVersion.V1_15_0, new Version(2,5,0,0) },
{ EldenRingVersion.V1_16_0, new Version(2,6,0,0) },
(EldenRingVersion.V1_10_0, new Version(2,0,0,0)),
(EldenRingVersion.V1_10_0, new Version(2,0,0,1)), //JP-only version for 1.10
(EldenRingVersion.V1_10_1, new Version(2,0,1,0)),
(EldenRingVersion.V1_12_0, new Version(2,2,0,0)),
(EldenRingVersion.V1_12_3, new Version(2,2,3,0)),
(EldenRingVersion.V1_13_0, new Version(2,3,0,0)),
(EldenRingVersion.V1_14_0, new Version(2,4,0,0)),
(EldenRingVersion.V1_15_0, new Version(2,5,0,0)),
(EldenRingVersion.V1_16_0, new Version(2,6,0,0)),

Check notice on line 235 in src/SoulMemory/EldenRing/EldenRing.cs

View workflow job for this annotation

GitHub Actions / Qodana for .NET

Use preferred style for trailing comma before new line in multiline lists 

Remove trailing comma to conform to code style
};

public enum EldenRingVersion
Expand Down Expand Up @@ -275,13 +276,13 @@ public enum EldenRingVersion

public EldenRingVersion GetVersion(Version v)
{
var version = _versions.FirstOrDefault(i => i.Value.CompareTo(v) == 0);
if (version.Value == null)
var version = _versions.FirstOrDefault(i => i.version.CompareTo(v) == 0);
if (version.version == null)

Check notice on line 280 in src/SoulMemory/EldenRing/EldenRing.cs

View workflow job for this annotation

GitHub Actions / Qodana for .NET

'if-return' statement can be rewritten as 'return' statement 

Convert into 'return' statement
{
return EldenRingVersion.Unknown;
}

return version.Key;
return version.eldenRingVersion;
}

#endregion
Expand Down
17 changes: 9 additions & 8 deletions src/cli/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,23 @@ internal class Program
static void Main(string[] args)
{

GameLoop<DarkSouls1>((e) =>
{
var saveSlot = e.GetCurrentSaveSlot();
var pos = e.GetPosition();
var igtElapsed = TimeSpan.FromMilliseconds(e.GetInGameTimeMilliseconds());
Console.WriteLine($"IGT: {igtElapsed} slot: {saveSlot} pos: {pos}");
});

GlobalHotKey.RegisterHotKey(ModifierKeys.Alt, Key.A, () =>{ Debug.WriteLine("A"); });
GlobalHotKey.RegisterHotKey(ModifierKeys.Alt, Key.S, () =>{ Debug.WriteLine("S"); });
GlobalHotKey.RegisterHotKey(ModifierKeys.Alt, Key.D, () =>{ Debug.WriteLine("D"); });

//TestUi();
GameLoop<EldenRing>((e) =>
{
var versionString = e.GetProcess().MainModule?.FileVersionInfo.ProductVersion ?? "Failed to read ER version";
if(!Version.TryParse(versionString, out Version v))
{
Console.WriteLine("Failed to parse version string");
}

Console.WriteLine($"Raw version: {versionString}, ER version: {e.GetVersion(v)}");

var igtElapsed = TimeSpan.FromMilliseconds(e.GetInGameTimeMilliseconds());
e.GetPosition();
Console.WriteLine($"IGT: {igtElapsed}");
});
}
Expand Down

0 comments on commit 87794c4

Please sign in to comment.