-
-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
set octoshock fps overrides to mednafen values (#1781)
* set octoshock fps overrides to mednafen values game version should not be a required field for submission * remove GameVersion initialization * random typo
- Loading branch information
1 parent
79667e1
commit 84c264a
Showing
3 changed files
with
13 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,9 @@ internal class Bk2 : ParserBase, IParser | |
private const double NtscNesFramerate = 60.0988138974405; | ||
private const double NtscSnesFramerate = 60.0988138974405; | ||
private const double PalSnesFramerate = 50.0069789081886; | ||
// mednafen values to match current octoshock | ||
Check warning on line 16 in TASVideos.Parsers/Parsers/Bk2.cs GitHub Actions / build
|
||
private const double NtscPsxFramerate = 59.94006013870239; | ||
private const double PalPsxFramerate = 50.00028192996979; | ||
|
||
protected virtual string[] InvalidArchiveEntries => new[] | ||
{ | ||
|
@@ -180,6 +183,14 @@ public async Task<IParseResult> Parse(Stream file, long length) | |
} | ||
} | ||
|
||
// TASVideos.Core\Services\QueueService.cs line 433 implies we only ever have a list of framerates for cores with framerate overrides, but it doesn't distinguish by core. nymashock has cycle count but octoshock has to rely on mednafen framerates for now. so we override with a constant for octoshock, to prevent picking random wrong values from nymashock overrides | ||
if (core == "octoshock") | ||
{ | ||
result.FrameRateOverride = result.Region == RegionType.Pal | ||
? PalPsxFramerate | ||
: NtscPsxFramerate; | ||
} | ||
|
||
if (result.CycleCount.HasValue) | ||
{ | ||
if (ValidClockRates.Contains(clockRate)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters