diff --git a/source/Alphabet.hx b/source/Alphabet.hx index a92b5d1..eec323d 100644 --- a/source/Alphabet.hx +++ b/source/Alphabet.hx @@ -278,8 +278,10 @@ class AlphaCharacter extends FlxSprite super(x, y); var tex = Paths.getSparrowAtlas('alphabet'); frames = tex; - - antialiasing = true; + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } } public function createBold(letter:String) diff --git a/source/BackgroundDancer.hx b/source/BackgroundDancer.hx index c572c1e..3107fa4 100644 --- a/source/BackgroundDancer.hx +++ b/source/BackgroundDancer.hx @@ -13,7 +13,10 @@ class BackgroundDancer extends FlxSprite animation.addByIndices('danceLeft', 'bg dancer sketch PINK', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); animation.play('danceLeft'); - antialiasing = true; + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } } var danceDir:Bool = false; diff --git a/source/Character.hx b/source/Character.hx index b9bc7f8..2f15c00 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -26,7 +26,10 @@ class Character extends FlxSprite this.isPlayer = isPlayer; var tex:FlxAtlasFrames; - antialiasing = true; + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } switch (curCharacter) { diff --git a/source/DiffOverview.hx b/source/DiffOverview.hx index e91b34d..4f27fcc 100644 --- a/source/DiffOverview.hx +++ b/source/DiffOverview.hx @@ -89,7 +89,10 @@ class DiffOverview extends FlxSubState babyArrow.animation.addByPrefix('blue', 'arrowDOWN'); babyArrow.animation.addByPrefix('purple', 'arrowLEFT'); babyArrow.animation.addByPrefix('red', 'arrowRIGHT'); - babyArrow.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + babyArrow.antialiasing = true; + } babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7)); switch (Math.abs(i)) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 123e240..fe3d44b 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -111,6 +111,10 @@ class FreeplayState extends MusicBeatState // LOAD CHARACTERS var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuBGBlue')); + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } add(bg); grpSongs = new FlxTypedGroup(); diff --git a/source/GameOverState.hx b/source/GameOverState.hx index c26c063..250095e 100644 --- a/source/GameOverState.hx +++ b/source/GameOverState.hx @@ -41,7 +41,10 @@ class GameOverState extends FlxTransitionableState restart.setGraphicSize(Std.int(restart.width * 0.6)); restart.updateHitbox(); restart.alpha = 0; - restart.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + restart.antialiasing = true; + } add(restart); FlxG.sound.music.fadeOut(2, FlxG.sound.music.volume * 0.6); diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index 56e00f4..26e29e6 100644 --- a/source/GameplayCustomizeState.hx +++ b/source/GameplayCustomizeState.hx @@ -43,7 +43,7 @@ class GameplayCustomizeState extends MusicBeatState public override function create() { #if windows // Updating Discord Rich Presence - DiscordClient.changePresence("Customizing Gameplay", null); + DiscordClient.changePresence("Customizing Gameplay Modules", null); #end sick = new FlxSprite().loadGraphic(Paths.image('sick','shared')); @@ -116,7 +116,7 @@ class GameplayCustomizeState extends MusicBeatState generateStaticArrows(0); generateStaticArrows(1); - text = new FlxText(5, FlxG.height + 40, 0, "Drag around gameplay elements, R to reset, Escape to go back.", 12); + text = new FlxText(5, FlxG.height + 40, 0, "Click and drag around gameplay elements to customize their positions.\nPress R to reset.\nPress Escape to go back.", 12); text.scrollFactor.set(); text.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK); diff --git a/source/GitarooPause.hx b/source/GitarooPause.hx index cb9705c..a8c5f99 100644 --- a/source/GitarooPause.hx +++ b/source/GitarooPause.hx @@ -22,12 +22,20 @@ class GitarooPause extends MusicBeatState FlxG.sound.music.stop(); var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('pauseAlt/pauseBG')); + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } add(bg); var bf:FlxSprite = new FlxSprite(0, 30); bf.frames = Paths.getSparrowAtlas('pauseAlt/bfLol'); bf.animation.addByPrefix('lol', "funnyThing", 13); bf.animation.play('lol'); + if(FlxG.save.data.antialiasing) + { + bf.antialiasing = true; + } add(bf); bf.screenCenter(X); @@ -36,6 +44,10 @@ class GitarooPause extends MusicBeatState replayButton.animation.addByPrefix('selected', 'bluereplay', 0, false); replayButton.animation.appendByPrefix('selected', 'yellowreplay'); replayButton.animation.play('selected'); + if(FlxG.save.data.antialiasing) + { + replayButton.antialiasing = true; + } add(replayButton); cancelButton = new FlxSprite(FlxG.width * 0.58, replayButton.y); @@ -43,6 +55,10 @@ class GitarooPause extends MusicBeatState cancelButton.animation.addByPrefix('selected', 'bluecancel', 0, false); cancelButton.animation.appendByPrefix('selected', 'cancelyellow'); cancelButton.animation.play('selected'); + if(FlxG.save.data.antialiasing) + { + cancelButton.antialiasing = true; + } add(cancelButton); changeThing(); diff --git a/source/HealthIcon.hx b/source/HealthIcon.hx index 74f46a1..50f3026 100644 --- a/source/HealthIcon.hx +++ b/source/HealthIcon.hx @@ -15,7 +15,10 @@ class HealthIcon extends FlxSprite loadGraphic(Paths.image('iconGrid'), true, 150, 150); - antialiasing = true; + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } animation.add('bf', [0, 1], 0, false, isPlayer); animation.add('bf-car', [0, 1], 0, false, isPlayer); animation.add('bf-christmas', [0, 1], 0, false, isPlayer); diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx index 78d86e4..89039ff 100644 --- a/source/KadeEngineData.hx +++ b/source/KadeEngineData.hx @@ -15,6 +15,12 @@ class KadeEngineData if (FlxG.save.data.downscroll == null) FlxG.save.data.downscroll = false; + if (FlxG.save.data.antialiasing == null) + FlxG.save.data.antialiasing = true; + + if (FlxG.save.data.missSounds == null) + FlxG.save.data.missSounds = true; + if (FlxG.save.data.dfjk == null) FlxG.save.data.dfjk = false; diff --git a/source/LoadReplayState.hx b/source/LoadReplayState.hx index 3560888..8bbb255 100644 --- a/source/LoadReplayState.hx +++ b/source/LoadReplayState.hx @@ -64,7 +64,10 @@ class LoadReplayState extends MusicBeatState menuBG.setGraphicSize(Std.int(menuBG.width * 1.1)); menuBG.updateHitbox(); menuBG.screenCenter(); - menuBG.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + menuBG.antialiasing = true; + } add(menuBG); grpControls = new FlxTypedGroup(); diff --git a/source/LoadingState.hx b/source/LoadingState.hx index 23bce2e..6609fa4 100644 --- a/source/LoadingState.hx +++ b/source/LoadingState.hx @@ -38,7 +38,10 @@ class LoadingState extends MusicBeatState { logo = new FlxSprite(-150, -100); logo.frames = Paths.getSparrowAtlas('logoBumpin'); - logo.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + logo.antialiasing = true; + } logo.animation.addByPrefix('bump', 'logo bumpin', 24); logo.animation.play('bump'); logo.updateHitbox(); @@ -49,7 +52,10 @@ class LoadingState extends MusicBeatState gfDance.frames = Paths.getSparrowAtlas('gfDanceTitle'); gfDance.animation.addByIndices('danceLeft', 'gfDance', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); gfDance.animation.addByIndices('danceRight', 'gfDance', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - gfDance.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + gfDance.antialiasing = true; + } add(gfDance); add(logo); diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index ab5f444..690291c 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -67,7 +67,10 @@ class MainMenuState extends MusicBeatState bg.setGraphicSize(Std.int(bg.width * 1.1)); bg.updateHitbox(); bg.screenCenter(); - bg.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } add(bg); camFollow = new FlxObject(0, 0, 1, 1); @@ -80,7 +83,10 @@ class MainMenuState extends MusicBeatState magenta.updateHitbox(); magenta.screenCenter(); magenta.visible = false; - magenta.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + magenta.antialiasing = true; + } magenta.color = 0xFFfd719b; add(magenta); // magenta.scrollFactor.set(); @@ -101,7 +107,10 @@ class MainMenuState extends MusicBeatState menuItem.screenCenter(X); menuItems.add(menuItem); menuItem.scrollFactor.set(); - menuItem.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + menuItem.antialiasing = true; + } if (firstStart) FlxTween.tween(menuItem,{y: 60 + (i * 160)},1 + (i * 0.25) ,{ease: FlxEase.expoInOut, onComplete: function(flxTween:FlxTween) { diff --git a/source/MenuCharacter.hx b/source/MenuCharacter.hx index 9d7a9bb..c35e25a 100644 --- a/source/MenuCharacter.hx +++ b/source/MenuCharacter.hx @@ -44,7 +44,10 @@ class MenuCharacter extends FlxSprite super(x, y); this.flipped = flipped; - antialiasing = true; + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } frames = Paths.getSparrowAtlas('campaign_menu_UI_characters'); diff --git a/source/Note.hx b/source/Note.hx index 472dbd2..57d6357 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -108,7 +108,10 @@ class Note extends FlxSprite setGraphicSize(Std.int(width * 0.7)); updateHitbox(); - antialiasing = true; + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } } else { @@ -144,7 +147,11 @@ class Note extends FlxSprite setGraphicSize(Std.int(width * 0.7)); updateHitbox(); - antialiasing = true; + + if(FlxG.save.data.antialiasing) + { + antialiasing = true; + } } } diff --git a/source/Options.hx b/source/Options.hx index 10eb0b0..b55cab7 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -304,6 +304,26 @@ class FlashingLightsOption extends Option } } +class AntialiasingOption extends Option +{ + public function new(desc:String) + { + super(); + description = desc; + } + public override function press():Bool + { + FlxG.save.data.antialiasing = !FlxG.save.data.antialiasing; + display = updateDisplay(); + return true; + } + + private override function updateDisplay():String + { + return "Antialiasing " + (!FlxG.save.data.antialiasing ? "off" : "on"); + } +} + class ShowInput extends Option { public function new(desc:String) diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx index f953f01..a80b1c4 100644 --- a/source/OptionsMenu.hx +++ b/source/OptionsMenu.hx @@ -27,47 +27,48 @@ class OptionsMenu extends MusicBeatState var options:Array = [ new OptionCategory("Gameplay", [ new DFJKOption(controls), - new DownscrollOption("Change the layout of the strumline."), - new GhostTapOption("Ghost Tapping is when you tap a direction and it doesn't give you a miss."), - new Judgement("Customize your Hit Timings (LEFT or RIGHT)"), + new DownscrollOption("Toggle making the notes scroll down rather than up."), + new GhostTapOption("Toggle counting pressing a directional input when no arrow is there as a miss."), + new Judgement("Customize your Hit Timings. (LEFT or RIGHT)"), #if desktop - new FPSCapOption("Cap your FPS"), + new FPSCapOption("Change your FPS Cap."), #end - new ScrollSpeedOption("Change your scroll speed (1 = Chart dependent)"), + new ScrollSpeedOption("Change your scroll speed. (1 = Chart dependent)"), new AccuracyDOption("Change how accuracy is calculated. (Accurate = Simple, Complex = Milisecond Based)"), new ResetButtonOption("Toggle pressing R to gameover."), // new OffsetMenu("Get a note offset based off of your inputs!"), - new CustomizeGameplay("Drag'n'Drop Gameplay Modules around to your preference") + new CustomizeGameplay("Drag and drop gameplay modules to your prefered positions!") ]), new OptionCategory("Appearance", [ new DistractionsAndEffectsOption("Toggle stage distractions that can hinder your gameplay."), new CamZoomOption("Toggle the camera zoom in-game."), new StepManiaOption("Sets the colors of the arrows depending on quantization instead of direction."), - new AccuracyOption("Display accuracy information."), - new SongPositionOption("Show the songs current position (as a bar)"), - new NPSDisplayOption("Shows your current Notes Per Second."), - new RainbowFPSOption("Make the FPS Counter Rainbow"), - new CpuStrums("CPU's strumline lights up when a note hits it."), + new AccuracyOption("Display accuracy information on the info bar."), + new SongPositionOption("Show the song's current position as a scrolling bar."), + new NPSDisplayOption("Shows your current Notes Per Second on the info bar."), + new RainbowFPSOption("Make the FPS Counter flicker through rainbow colors."), + new CpuStrums("Toggle the CPU's strumline lighting up when it hits a note."), ]), new OptionCategory("Misc", [ new FPSOption("Toggle the FPS Counter"), - #if desktop - new ReplayOption("View replays"), - #end new FlashingLightsOption("Toggle flashing lights that can cause epileptic seizures and strain."), new WatermarkOption("Enable and disable all watermarks from the engine."), + new AntialiasingOption("Toggle antialiasing, improving graphics quality at a slight performance penalty."), new ScoreScreen("Show the score screen after the end of a song"), new ShowInput("Display every single input in the score screen."), - new Optimization("No backgrounds, no characters, centered notes, no player 2."), + new Optimization("No characters or backgrounds. Just a rhythm game, with none of the extra bells and whistles."), new GraphicLoading("On startup, cache every character. Significantly decrease load times. (HIGH MEMORY)"), new BotPlay("Showcase your charts and mods with autoplay.") ]), - new OptionCategory("Manage Save Data", [ - new ResetScoreOption("Reset your score on all songs and weeks."), - new LockWeeksOption("Reset your storymode progress. (only Tutorial + Week 1 will be unlocked)"), - new ResetSettings("Reset ALL your settings.") + new OptionCategory("Saves and Data", [ + #if desktop + new ReplayOption("View saved song replays."), + #end + new ResetScoreOption("Reset your score on all songs and weeks. This is irreversible!"), + new LockWeeksOption("Reset your story mode progress. This is irreversible!"), + new ResetSettings("Reset ALL your settings. This is irreversible!") ]) ]; @@ -89,7 +90,10 @@ class OptionsMenu extends MusicBeatState menuBG.setGraphicSize(Std.int(menuBG.width * 1.1)); menuBG.updateHitbox(); menuBG.screenCenter(); - menuBG.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + menuBG.antialiasing = true; + } add(menuBG); grpControls = new FlxTypedGroup(); diff --git a/source/OutdatedSubState.hx b/source/OutdatedSubState.hx index f7015c4..f73b3f9 100644 --- a/source/OutdatedSubState.hx +++ b/source/OutdatedSubState.hx @@ -32,6 +32,10 @@ class OutdatedSubState extends MusicBeatState bg.scale.x *= 1.55; bg.scale.y *= 1.55; bg.screenCenter(); + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } add(bg); var kadeLogo:FlxSprite = new FlxSprite(FlxG.width, 0).loadGraphic(Paths.image('KadeEngineLogo')); @@ -40,6 +44,10 @@ class OutdatedSubState extends MusicBeatState kadeLogo.x -= kadeLogo.frameHeight; kadeLogo.y -= 180; kadeLogo.alpha = 0.8; + if(FlxG.save.data.antialiasing) + { + kadeLogo.antialiasing = true; + } add(kadeLogo); var txt:FlxText = new FlxText(0, 0, FlxG.width, diff --git a/source/PlayState.hx b/source/PlayState.hx index 9052a01..ee69f7f 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -463,7 +463,10 @@ class PlayState extends MusicBeatState halloweenBG.animation.addByPrefix('idle', 'halloweem bg0'); halloweenBG.animation.addByPrefix('lightning', 'halloweem bg lightning strike', 24, false); halloweenBG.animation.play('idle'); - halloweenBG.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + halloweenBG.antialiasing = true; + } add(halloweenBG); isHalloween = true; @@ -495,7 +498,10 @@ class PlayState extends MusicBeatState light.visible = false; light.setGraphicSize(Std.int(light.width * 0.85)); light.updateHitbox(); - light.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + light.antialiasing = true; + } phillyCityLights.add(light); } @@ -560,7 +566,10 @@ class PlayState extends MusicBeatState limo.frames = limoTex; limo.animation.addByPrefix('drive', "Limo stage", 24); limo.animation.play('drive'); - limo.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + limo.antialiasing = true; + } fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol', 'week4')); // add(limo); @@ -572,7 +581,10 @@ class PlayState extends MusicBeatState defaultCamZoom = 0.80; var bg:FlxSprite = new FlxSprite(-1000, -500).loadGraphic(Paths.image('christmas/bgWalls', 'week5')); - bg.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } bg.scrollFactor.set(0.2, 0.2); bg.active = false; bg.setGraphicSize(Std.int(bg.width * 0.8)); @@ -582,7 +594,10 @@ class PlayState extends MusicBeatState upperBoppers = new FlxSprite(-240, -90); upperBoppers.frames = Paths.getSparrowAtlas('christmas/upperBop', 'week5'); upperBoppers.animation.addByPrefix('bop', "Upper Crowd Bob", 24, false); - upperBoppers.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + upperBoppers.antialiasing = true; + } upperBoppers.scrollFactor.set(0.33, 0.33); upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.85)); upperBoppers.updateHitbox(); @@ -592,7 +607,10 @@ class PlayState extends MusicBeatState } var bgEscalator:FlxSprite = new FlxSprite(-1100, -600).loadGraphic(Paths.image('christmas/bgEscalator', 'week5')); - bgEscalator.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + bgEscalator.antialiasing = true; + } bgEscalator.scrollFactor.set(0.3, 0.3); bgEscalator.active = false; bgEscalator.setGraphicSize(Std.int(bgEscalator.width * 0.9)); @@ -600,14 +618,20 @@ class PlayState extends MusicBeatState add(bgEscalator); var tree:FlxSprite = new FlxSprite(370, -250).loadGraphic(Paths.image('christmas/christmasTree', 'week5')); - tree.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + tree.antialiasing = true; + } tree.scrollFactor.set(0.40, 0.40); add(tree); bottomBoppers = new FlxSprite(-300, 140); bottomBoppers.frames = Paths.getSparrowAtlas('christmas/bottomBop', 'week5'); bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false); - bottomBoppers.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + bottomBoppers.antialiasing = true; + } bottomBoppers.scrollFactor.set(0.9, 0.9); bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 1)); bottomBoppers.updateHitbox(); @@ -618,13 +642,19 @@ class PlayState extends MusicBeatState var fgSnow:FlxSprite = new FlxSprite(-600, 700).loadGraphic(Paths.image('christmas/fgSnow', 'week5')); fgSnow.active = false; - fgSnow.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + fgSnow.antialiasing = true; + } add(fgSnow); santa = new FlxSprite(-840, 150); santa.frames = Paths.getSparrowAtlas('christmas/santa', 'week5'); santa.animation.addByPrefix('idle', 'santa idle in fear', 24, false); - santa.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + santa.antialiasing = true; + } if (FlxG.save.data.distractions) { add(santa); @@ -634,7 +664,10 @@ class PlayState extends MusicBeatState { curStage = 'mallEvil'; var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG', 'week5')); - bg.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } bg.scrollFactor.set(0.2, 0.2); bg.active = false; bg.setGraphicSize(Std.int(bg.width * 0.8)); @@ -642,12 +675,18 @@ class PlayState extends MusicBeatState add(bg); var evilTree:FlxSprite = new FlxSprite(300, -300).loadGraphic(Paths.image('christmas/evilTree', 'week5')); - evilTree.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + evilTree.antialiasing = true; + } evilTree.scrollFactor.set(0.2, 0.2); add(evilTree); var evilSnow:FlxSprite = new FlxSprite(-200, 700).loadGraphic(Paths.image("christmas/evilSnow", 'week5')); - evilSnow.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + evilSnow.antialiasing = true; + } add(evilSnow); } case 'school': @@ -779,39 +818,15 @@ class PlayState extends MusicBeatState add(waveSpriteFG); */ } - case 'stage': - { - defaultCamZoom = 0.9; - curStage = 'stage'; - var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback')); - bg.antialiasing = true; - bg.scrollFactor.set(0.9, 0.9); - bg.active = false; - add(bg); - - var stageFront:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront')); - stageFront.setGraphicSize(Std.int(stageFront.width * 1.1)); - stageFront.updateHitbox(); - stageFront.antialiasing = true; - stageFront.scrollFactor.set(0.9, 0.9); - stageFront.active = false; - add(stageFront); - - var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains')); - stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9)); - stageCurtains.updateHitbox(); - stageCurtains.antialiasing = true; - stageCurtains.scrollFactor.set(1.3, 1.3); - stageCurtains.active = false; - - add(stageCurtains); - } default: { defaultCamZoom = 0.9; curStage = 'stage'; var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback')); - bg.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + bg.antialiasing = true; + } bg.scrollFactor.set(0.9, 0.9); bg.active = false; add(bg); @@ -819,7 +834,10 @@ class PlayState extends MusicBeatState var stageFront:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront')); stageFront.setGraphicSize(Std.int(stageFront.width * 1.1)); stageFront.updateHitbox(); - stageFront.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + stageFront.antialiasing = true; + } stageFront.scrollFactor.set(0.9, 0.9); stageFront.active = false; add(stageFront); @@ -827,7 +845,10 @@ class PlayState extends MusicBeatState var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains')); stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9)); stageCurtains.updateHitbox(); - stageCurtains.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + stageCurtains.antialiasing = true; + } stageCurtains.scrollFactor.set(1.3, 1.3); stageCurtains.active = false; @@ -1911,7 +1932,10 @@ class PlayState extends MusicBeatState babyArrow.x += Note.swagWidth * i; - babyArrow.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + babyArrow.antialiasing = true; + } babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7)); } @@ -3361,9 +3385,15 @@ class PlayState extends MusicBeatState if (!curStage.startsWith('school')) { rating.setGraphicSize(Std.int(rating.width * 0.7)); - rating.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + rating.antialiasing = true; + } comboSpr.setGraphicSize(Std.int(comboSpr.width * 0.7)); - comboSpr.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + comboSpr.antialiasing = true; + } } else { @@ -3412,7 +3442,10 @@ class PlayState extends MusicBeatState if (!curStage.startsWith('school')) { - numScore.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + numScore.antialiasing = true; + } numScore.setGraphicSize(Std.int(numScore.width * 0.5)); } else diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 8f87cef..daee617 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -143,7 +143,10 @@ class StoryMenuState extends MusicBeatState grpWeekText.add(weekThing); weekThing.screenCenter(X); - weekThing.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + weekThing.antialiasing = true; + } // weekThing.updateHitbox(); // Needs an offset thingie @@ -155,7 +158,10 @@ class StoryMenuState extends MusicBeatState lock.animation.addByPrefix('lock', 'lock'); lock.animation.play('lock'); lock.ID = i; - lock.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + lock.antialiasing = true; + } grpLocks.add(lock); } } diff --git a/source/TitleState.hx b/source/TitleState.hx index 4df0552..0162d75 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -124,7 +124,10 @@ class TitleState extends MusicBeatState } else { logoBl.frames = Paths.getSparrowAtlas('logoBumpin'); } - logoBl.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + logoBl.antialiasing = true; + } logoBl.animation.addByPrefix('bump', 'logo bumpin', 24, false); logoBl.updateHitbox(); // logoBl.screenCenter(); @@ -134,7 +137,10 @@ class TitleState extends MusicBeatState gfDance.frames = Paths.getSparrowAtlas('gfDanceTitle'); gfDance.animation.addByIndices('danceLeft', 'gfDance', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); gfDance.animation.addByIndices('danceRight', 'gfDance', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false); - gfDance.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + gfDance.antialiasing = true; + } add(gfDance); add(logoBl); @@ -142,7 +148,10 @@ class TitleState extends MusicBeatState titleText.frames = Paths.getSparrowAtlas('titleEnter'); titleText.animation.addByPrefix('idle', "Press Enter to Begin", 24); titleText.animation.addByPrefix('press', "ENTER PRESSED", 24); - titleText.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + titleText.antialiasing = true; + } titleText.animation.play('idle'); titleText.updateHitbox(); // titleText.screenCenter(X); @@ -150,7 +159,10 @@ class TitleState extends MusicBeatState var logo:FlxSprite = new FlxSprite().loadGraphic(Paths.image('logo')); logo.screenCenter(); - logo.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + logo.antialiasing = true; + } // add(logo); // FlxTween.tween(logoBl, {y: logoBl.y + 50}, 0.6, {ease: FlxEase.quadInOut, type: PINGPONG}); @@ -176,7 +188,10 @@ class TitleState extends MusicBeatState ngSpr.setGraphicSize(Std.int(ngSpr.width * 0.8)); ngSpr.updateHitbox(); ngSpr.screenCenter(X); - ngSpr.antialiasing = true; + if(FlxG.save.data.antialiasing) + { + ngSpr.antialiasing = true; + } FlxTween.tween(credTextShit, {y: credTextShit.y + 20}, 2.9, {ease: FlxEase.quadInOut, type: PINGPONG});