Skip to content

Commit 7fc0476

Browse files
RaltyroRaltyro
committed
Fix Legacy Rating/Timing Handler
1 parent 535e702 commit 7fc0476

File tree

6 files changed

+68
-67
lines changed

6 files changed

+68
-67
lines changed

‎source/funkin/backend/scripting/events/note/NoteHitEvent.hx‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ final class NoteHitEvent extends CancellableEvent {
118118
* The attached healthIcon used distinction for icons amongst others
119119
*/
120120
public var healthIcon:HealthIcon;
121-
/**
122-
* Whether note hits are judged in the old way or not.
123-
*/
124-
public var legacyJudge(get, set):Bool;
125121

126122
/**
127123
* Prevents the default sing animation from being played.
@@ -200,15 +196,4 @@ final class NoteHitEvent extends CancellableEvent {
200196
characters = [char];
201197
return char;
202198
}
203-
204-
private var _explicitLegacyJudge:Null<Bool> = null;
205-
private inline function get_legacyJudge():Bool {
206-
if (_explicitLegacyJudge != null)
207-
return _explicitLegacyJudge;
208-
return Flags.MOD_API_VERSION == 1;
209-
}
210-
private function set_legacyJudge(value:Bool):Bool {
211-
_explicitLegacyJudge = value;
212-
return value;
213-
}
214199
}

‎source/funkin/backend/system/Flags.hx‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ import lime.utils.AssetType;
1515
*/
1616
@:build(funkin.backend.system.macros.FlagMacro.build())
1717
class Flags {
18+
public static var overridenFlags:Map<String, Bool> = [];
19+
1820
// -- Codename's Addon Config --
1921
@:bypass public static var addonFlags:Map<String, Dynamic> = [];
2022

23+
public static var CURRENT_API_VERSION:Int = 2;
24+
2125
// -- Codename's Mod Config --
2226
public static var MOD_NAME:String = "";
2327
public static var MOD_DESCRIPTION:String = "";
2428
public static var MOD_AUTHOR:String = "";
25-
public static var MOD_API_VERSION:Int = 1;
29+
@:lazy public static var MOD_API_VERSION:Null<Int> = null;
2630
public static var MOD_DOWNLOAD_LINK:String = "";
2731
public static var MOD_DEPENDENCIES:Array<String> = [];
2832

@@ -41,12 +45,11 @@ class Flags {
4145
@:lazy public static var SAVE_PATH:String = haxe.macro.Compiler.getDefine("SAVE_PATH");
4246
@:lazy public static var SAVE_NAME:String = haxe.macro.Compiler.getDefine("SAVE_NAME");
4347

44-
public static var CURRENT_API_VERSION:Int = 2;
4548
public static var COMMIT_NUMBER:Int = GitCommitMacro.commitNumber;
4649
public static var COMMIT_HASH:String = GitCommitMacro.commitHash;
4750
public static var COMMIT_MESSAGE:String = 'Commit $COMMIT_NUMBER ($COMMIT_HASH)';
4851

49-
@:bypass public static var WINDOW_TITLE_USE_MOD_NAME:Bool = false;
52+
@:lazy public static var WINDOW_TITLE_USE_MOD_NAME:Null<Bool> = null;
5053
@:lazy public static var TITLE:String = Application.current.meta.get('name');
5154
@:lazy public static var VERSION:String = Application.current.meta.get('version');
5255

@@ -125,6 +128,8 @@ class Flags {
125128
@:also(funkin.game.PlayState.opponentMode)
126129
public static var DEFAULT_OPPONENT_MODE:Bool = false;
127130

131+
@:lazy public static var USE_LEGACY_TIMING:Null<Bool> = null;
132+
128133
public static var DEFAULT_NOTE_MS_LIMIT:Float = 1500;
129134
public static var DEFAULT_NOTE_SCALE:Float = 0.7;
130135
#if MODCHARTING_FEATURES
@@ -277,8 +282,6 @@ class Flags {
277282
@:bypass public static var customFlags:Map<String, String> = [];
278283

279284
public static function loadFromData(flags:Map<String, String>, data:String) {
280-
WINDOW_TITLE_USE_MOD_NAME = false;
281-
282285
if (!(data.length > 0)) return;
283286
var res = IniUtil.parseString(data);
284287

@@ -295,26 +298,34 @@ class Flags {
295298
else trace('Invalid section $name');
296299
}
297300
}
301+
}
298302

299-
if (!flags.exists("WINDOW_TITLE_USE_MOD_NAME")) WINDOW_TITLE_USE_MOD_NAME = !flags.exists('TITLE') && flags.exists('MOD_NAME');
300-
else WINDOW_TITLE_USE_MOD_NAME = parseBool(flags.get("WINDOW_TITLE_USE_MOD_NAME"));
301-
302-
flags.remove("WINDOW_TITLE_USE_MOD_NAME");
303+
private static function loadPost() {
304+
if (MOD_API_VERSION == null) MOD_API_VERSION = CURRENT_API_VERSION;
305+
if (WINDOW_TITLE_USE_MOD_NAME == null) WINDOW_TITLE_USE_MOD_NAME = !overridenFlags.exists('TITLE') && overridenFlags.exists('MOD_NAME');
306+
if (USE_LEGACY_TIMING == null) USE_LEGACY_TIMING = MOD_API_VERSION <= 1;
303307
}
304308

305-
public static function loadFromDatas(datas:Array<String>) {
309+
public static function loadFromDatas(datas:Array<String>):Map<String, String> {
306310
var flags:Map<String, String> = [];
307-
for(data in datas) {
308-
if(data != null)
311+
for (data in datas) {
312+
if (data != null)
309313
loadFromData(flags, data);
310314
}
315+
loadPost();
311316
return flags;
312317
}
313318

314319
public static function parseFlags(flags:Map<String, String>) {
315-
for(name=>value in flags)
316-
if(!parse(name, value))
317-
customFlags.set(name, value);
320+
var parsed:Bool;
321+
for (name => value in flags) switch (name) {
322+
case "MOD_API_VERSION":
323+
var version = Std.parseInt(value) ?? CURRENT_API_VERSION;
324+
if (version > MOD_API_VERSION || MOD_API_VERSION == null) MOD_API_VERSION = version;
325+
default:
326+
if (!(parsed = parse(name, value))) customFlags.set(name, value);
327+
if (!overridenFlags.exists(name)) overridenFlags.set(name, parsed);
328+
}
318329

319330
Options.modchartingHoldSubdivisions = DEFAULT_MODCHART_HOLD_SUBDIVISIONS;
320331
}
@@ -365,5 +376,6 @@ class Flags {
365376
parseFlags(flags);
366377
}
367378
}
379+
loadPost();
368380
}
369381
}

‎source/funkin/game/PlayState.hx‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,11 @@ class PlayState extends MusicBeatState
557557
public var noteTypesArray:Array<String> = [null];
558558

559559
/**
560-
* Hit window, in milliseconds. Defaults to 250ms unless changed in options.
561-
* Base game hit window is 175ms.
560+
* Hit window, in milliseconds. A Legacy CNE Hit window configuration,
561+
* Don't use this, it's for mods that still uses the old judgement timing, instead use ratingManager.
562562
*/
563-
public var hitWindow:Float = Options.hitWindow; // is calculated in create(), is safeFrames in milliseconds.
563+
public var hitWindow:Float = Options.hitWindow;
564+
@:noCompletion @:dox(hide) private var _legacyRating:Rating = {name: "", window: 0, accuracy: 0, score: 0};
564565

565566
@:noCompletion @:dox(hide) private var _startCountdownCalled:Bool = false;
566567
@:noCompletion @:dox(hide) private var _endSongCalled:Bool = false;
@@ -1884,48 +1885,48 @@ class PlayState extends MusicBeatState
18841885

18851886
note.wasGoodHit = true;
18861887

1887-
/**
1888-
* CALCULATES RATING
1889-
*/
1890-
var noteDiff = Math.abs(Conductor.songPosition - note.strumTime);
1891-
var daRating:Rating = ratingManager.judgeNote(noteDiff);
1888+
var noteDiff = Math.abs(Conductor.songPosition - note.strumTime), rating:Rating;
1889+
if (!Flags.USE_LEGACY_TIMING) rating = ratingManager.judgeNote(noteDiff);
1890+
else {
1891+
(rating = _legacyRating).splash = false;
1892+
if (noteDiff > hitWindow * 0.9) {
1893+
rating.window = hitWindow;
1894+
rating.name = "shit";
1895+
rating.score = 50;
1896+
rating.accuracy = 0.25;
1897+
}
1898+
else if (noteDiff > hitWindow * 0.75) {
1899+
rating.window = hitWindow * 0.9;
1900+
rating.name = "bad";
1901+
rating.score = 100;
1902+
rating.accuracy = 0.45;
1903+
}
1904+
else if (noteDiff > hitWindow * 0.2) {
1905+
rating.window = hitWindow * 0.75;
1906+
rating.name = "good";
1907+
rating.score = 200;
1908+
rating.accuracy = 0.75;
1909+
}
1910+
else {
1911+
rating.window = hitWindow * 0.2;
1912+
rating.name = "sick";
1913+
rating.score = 300;
1914+
rating.accuracy = 1;
1915+
rating.splash = true;
1916+
}
1917+
}
18921918

18931919
var event:NoteHitEvent;
18941920
if (strumLine != null && !strumLine.cpu)
1895-
event = EventManager.get(NoteHitEvent).recycle(false, !note.isSustainNote, !note.isSustainNote, null, defaultDisplayRating, defaultDisplayCombo, note, strumLine.characters, true, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, daRating.score, note.isSustainNote ? null : daRating.accuracy, 0.023, daRating.name, Options.splashesEnabled && !note.isSustainNote && daRating.splash, 0.5, true, 0.7, true, true, iconP1);
1921+
event = EventManager.get(NoteHitEvent).recycle(false, !note.isSustainNote, !note.isSustainNote, null, defaultDisplayRating, defaultDisplayCombo, note, strumLine.characters, true, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, rating.score, note.isSustainNote ? null : rating.accuracy, 0.023, rating.name, Options.splashesEnabled && !note.isSustainNote && rating.splash, 0.5, true, 0.7, true, true, iconP1);
18961922
else
1897-
event = EventManager.get(NoteHitEvent).recycle(false, false, false, null, defaultDisplayRating, defaultDisplayCombo, note, strumLine.characters, false, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, 0, null, 0, daRating.name, false, 0.5, true, 0.7, true, true, iconP2);
1923+
event = EventManager.get(NoteHitEvent).recycle(false, false, false, null, defaultDisplayRating, defaultDisplayCombo, note, strumLine.characters, false, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, 0, null, 0, rating.name, false, 0.5, true, 0.7, true, true, iconP2);
18981924
event.deleteNote = !note.isSustainNote; // work around, to allow sustain notes to be deleted
18991925
event = scripts.event(strumLine != null && !strumLine.cpu ? "onPlayerHit" : "onDadHit", event);
19001926
strumLine.onHit.dispatch(event);
19011927
gameAndCharsEvent("onNoteHit", event);
19021928

19031929
if (!event.cancelled) {
1904-
if (event.legacyJudge) {
1905-
event.rating = 'sick';
1906-
event.score = 300;
1907-
event.accuracy = 1;
1908-
1909-
if (noteDiff > hitWindow * 0.9)
1910-
{
1911-
event.rating = 'shit';
1912-
event.score = 50;
1913-
event.accuracy = 0.25;
1914-
}
1915-
else if (noteDiff > hitWindow * 0.75)
1916-
{
1917-
event.rating = 'bad';
1918-
event.score = 100;
1919-
event.accuracy = 0.45;
1920-
}
1921-
else if (noteDiff > hitWindow * 0.2)
1922-
{
1923-
event.rating = 'good';
1924-
event.score = 200;
1925-
event.accuracy = 0.75;
1926-
}
1927-
}
1928-
19291930
if (!note.isSustainNote) {
19301931
if (event.countScore) songScore += event.score;
19311932
if (event.accuracy != null) {

‎source/funkin/game/StrumLine.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ class StrumLine extends FlxTypedGroup<Strum> {
216216
if (__updateNote_event.cancelled) return;
217217

218218
if (__updateNote_event.__updateHitWindow) {
219-
var hitWindow = PlayState.instance.hitWindow;
219+
var hitWindow = Flags.USE_LEGACY_TIMING ? PlayState.instance.hitWindow : PlayState.instance.ratingManager.lastHitWindow;
220220
daNote.canBeHit = (daNote.strumTime > __updateNote_songPos - (hitWindow * daNote.latePressWindow)
221221
&& daNote.strumTime < __updateNote_songPos + (hitWindow * daNote.earlyPressWindow));
222222

‎source/funkin/game/scoring/RatingManager.hx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ class RatingManager
1212
{
1313
public var hitWindows:StringMap<Float>;
1414
public var ratingData:Array<Rating> = [];
15+
public var lastHitWindow:Float = -1;
1516

1617
public function new(?preset:WindowPreset):Void
1718
{
@@ -63,6 +64,8 @@ class RatingManager
6364
? data.window
6465
: (hitWindows.exists(name) ? hitWindows.get(name) : -1);
6566

67+
if (window > lastHitWindow) lastHitWindow = window;
68+
6669
var newRating:Rating = {
6770
name: name,
6871
window: window,

‎source/funkin/options/Options.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Options
3838
public static var devMode:Bool = false;
3939
public static var betaUpdates:Bool = false;
4040
public static var splashesEnabled:Bool = true;
41-
public static var hitWindow:Float = 250;
41+
@:dox(hide) @:doNotSave public static var hitWindow:Float = 250; // DEPRECATED
4242
public static var songOffset:Float = 0;
4343
public static var framerate:Int = 120;
4444
public static var gpuOnlyBitmaps:Bool = #if (mac || web) false #else true #end; // causes issues on mac and web

0 commit comments

Comments
 (0)