diff --git a/assets b/assets index 0315ccc420..06a78042a1 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 0315ccc42041b693d1bbf502fa1d8059890ab8ca +Subproject commit 06a78042a15c7982f8267824f181510c5a95c4ee diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx index ba99818bc5..c5e622ff9d 100644 --- a/source/funkin/save/Save.hx +++ b/source/funkin/save/Save.hx @@ -93,7 +93,7 @@ class Save framerate: #if web 60 #else flixel.math.FlxMath.maxInt(60, lime.app.Application.current.window.displayMode.refreshRate) #end, flashingLights: true, zoomCamera: true, - centeredStrums: false, + centerStrums: false, coloredHealthBar: false, debugDisplay: false, autoPause: true, @@ -831,6 +831,7 @@ typedef SaveScoreData = typedef SaveScoreTallyData = { + var killer:Int; var sick:Int; var good:Int; var bad:Int; diff --git a/source/funkin/ui/options/PreferencesMenu.hx b/source/funkin/ui/options/PreferencesMenu.hx index 94d6d01673..bcc831ebb7 100644 --- a/source/funkin/ui/options/PreferencesMenu.hx +++ b/source/funkin/ui/options/PreferencesMenu.hx @@ -50,9 +50,9 @@ class PreferencesMenu extends Page descTextBG.antialiasing = false; descTextBG.active = false; - descText = new FlxText(0, 0, 0, "Ass Text!!!", 26); + descText = new FlxText(0, 0, 0, "No description", 26); descText.scrollFactor.set(); - descText.font = "VCR OSD Mono"; + descText.font = Paths.font("vcr.ttf"); descText.alignment = CENTER; descText.setBorderStyle(OUTLINE, FlxColor.BLACK, 2); // descText.antialiasing = false; @@ -265,7 +265,7 @@ class CounterPreferenceItem extends FlxText public function new(x:Float, y:Float, defaultValue:Int = 0, minValue:Int = 0, maxValue:Int = 1, onChange:Int->Void, step:Int = 1) { super(x, y, 0, "", 42); - this.font = "VCR OSD Mono"; + this.font = Paths.font("vcr.ttf"); this.alignment = RIGHT; this.setBorderStyle(OUTLINE, FlxColor.BLACK, 3); // this.antialiasing = false;