diff --git a/assets/shared/images/BOYFRIEND.png b/assets/shared/images/characters/BOYFRIEND.png similarity index 100% rename from assets/shared/images/BOYFRIEND.png rename to assets/shared/images/characters/BOYFRIEND.png diff --git a/assets/shared/images/BOYFRIEND.xml b/assets/shared/images/characters/BOYFRIEND.xml similarity index 100% rename from assets/shared/images/BOYFRIEND.xml rename to assets/shared/images/characters/BOYFRIEND.xml diff --git a/assets/shared/images/DADDY_DEAREST.png b/assets/shared/images/characters/DADDY_DEAREST.png similarity index 100% rename from assets/shared/images/DADDY_DEAREST.png rename to assets/shared/images/characters/DADDY_DEAREST.png diff --git a/assets/shared/images/DADDY_DEAREST.xml b/assets/shared/images/characters/DADDY_DEAREST.xml similarity index 100% rename from assets/shared/images/DADDY_DEAREST.xml rename to assets/shared/images/characters/DADDY_DEAREST.xml diff --git a/assets/shared/images/GF_assets.png b/assets/shared/images/characters/GF_assets.png similarity index 100% rename from assets/shared/images/GF_assets.png rename to assets/shared/images/characters/GF_assets.png diff --git a/assets/shared/images/GF_assets.xml b/assets/shared/images/characters/GF_assets.xml similarity index 100% rename from assets/shared/images/GF_assets.xml rename to assets/shared/images/characters/GF_assets.xml diff --git a/assets/week4/images/Mom_Assets.png b/assets/shared/images/characters/Mom_Assets.png similarity index 100% rename from assets/week4/images/Mom_Assets.png rename to assets/shared/images/characters/Mom_Assets.png diff --git a/assets/week4/images/Mom_Assets.xml b/assets/shared/images/characters/Mom_Assets.xml similarity index 100% rename from assets/week4/images/Mom_Assets.xml rename to assets/shared/images/characters/Mom_Assets.xml diff --git a/assets/week2/images/Monster_Assets.png b/assets/shared/images/characters/Monster_Assets.png similarity index 100% rename from assets/week2/images/Monster_Assets.png rename to assets/shared/images/characters/Monster_Assets.png diff --git a/assets/week2/images/Monster_Assets.xml b/assets/shared/images/characters/Monster_Assets.xml similarity index 100% rename from assets/week2/images/Monster_Assets.xml rename to assets/shared/images/characters/Monster_Assets.xml diff --git a/assets/week3/images/Pico_FNF_assetss.png b/assets/shared/images/characters/Pico_FNF_assetss.png similarity index 100% rename from assets/week3/images/Pico_FNF_assetss.png rename to assets/shared/images/characters/Pico_FNF_assetss.png diff --git a/assets/week3/images/Pico_FNF_assetss.xml b/assets/shared/images/characters/Pico_FNF_assetss.xml similarity index 100% rename from assets/week3/images/Pico_FNF_assetss.xml rename to assets/shared/images/characters/Pico_FNF_assetss.xml diff --git a/assets/week4/images/bfCar.png b/assets/shared/images/characters/bfCar.png similarity index 100% rename from assets/week4/images/bfCar.png rename to assets/shared/images/characters/bfCar.png diff --git a/assets/week4/images/bfCar.xml b/assets/shared/images/characters/bfCar.xml similarity index 100% rename from assets/week4/images/bfCar.xml rename to assets/shared/images/characters/bfCar.xml diff --git a/assets/week5/images/christmas/bfChristmas.png b/assets/shared/images/characters/bfChristmas.png similarity index 100% rename from assets/week5/images/christmas/bfChristmas.png rename to assets/shared/images/characters/bfChristmas.png diff --git a/assets/week5/images/christmas/bfChristmas.xml b/assets/shared/images/characters/bfChristmas.xml similarity index 100% rename from assets/week5/images/christmas/bfChristmas.xml rename to assets/shared/images/characters/bfChristmas.xml diff --git a/assets/week6/images/weeb/bfPixel.png b/assets/shared/images/characters/bfPixel.png similarity index 100% rename from assets/week6/images/weeb/bfPixel.png rename to assets/shared/images/characters/bfPixel.png diff --git a/assets/week6/images/weeb/bfPixel.xml b/assets/shared/images/characters/bfPixel.xml similarity index 100% rename from assets/week6/images/weeb/bfPixel.xml rename to assets/shared/images/characters/bfPixel.xml diff --git a/assets/week6/images/weeb/bfPixelsDEAD.png b/assets/shared/images/characters/bfPixelsDEAD.png similarity index 100% rename from assets/week6/images/weeb/bfPixelsDEAD.png rename to assets/shared/images/characters/bfPixelsDEAD.png diff --git a/assets/week6/images/weeb/bfPixelsDEAD.xml b/assets/shared/images/characters/bfPixelsDEAD.xml similarity index 100% rename from assets/week6/images/weeb/bfPixelsDEAD.xml rename to assets/shared/images/characters/bfPixelsDEAD.xml diff --git a/assets/week4/images/gfCar.png b/assets/shared/images/characters/gfCar.png similarity index 100% rename from assets/week4/images/gfCar.png rename to assets/shared/images/characters/gfCar.png diff --git a/assets/week4/images/gfCar.xml b/assets/shared/images/characters/gfCar.xml similarity index 100% rename from assets/week4/images/gfCar.xml rename to assets/shared/images/characters/gfCar.xml diff --git a/assets/week5/images/christmas/gfChristmas.png b/assets/shared/images/characters/gfChristmas.png similarity index 100% rename from assets/week5/images/christmas/gfChristmas.png rename to assets/shared/images/characters/gfChristmas.png diff --git a/assets/week5/images/christmas/gfChristmas.xml b/assets/shared/images/characters/gfChristmas.xml similarity index 100% rename from assets/week5/images/christmas/gfChristmas.xml rename to assets/shared/images/characters/gfChristmas.xml diff --git a/assets/week6/images/weeb/gfPixel.png b/assets/shared/images/characters/gfPixel.png similarity index 100% rename from assets/week6/images/weeb/gfPixel.png rename to assets/shared/images/characters/gfPixel.png diff --git a/assets/week6/images/weeb/gfPixel.xml b/assets/shared/images/characters/gfPixel.xml similarity index 100% rename from assets/week6/images/weeb/gfPixel.xml rename to assets/shared/images/characters/gfPixel.xml diff --git a/assets/week4/images/momCar.png b/assets/shared/images/characters/momCar.png similarity index 100% rename from assets/week4/images/momCar.png rename to assets/shared/images/characters/momCar.png diff --git a/assets/week4/images/momCar.xml b/assets/shared/images/characters/momCar.xml similarity index 100% rename from assets/week4/images/momCar.xml rename to assets/shared/images/characters/momCar.xml diff --git a/assets/week5/images/christmas/mom_dad_christmas_assets.png b/assets/shared/images/characters/mom_dad_christmas_assets.png similarity index 100% rename from assets/week5/images/christmas/mom_dad_christmas_assets.png rename to assets/shared/images/characters/mom_dad_christmas_assets.png diff --git a/assets/week5/images/christmas/mom_dad_christmas_assets.xml b/assets/shared/images/characters/mom_dad_christmas_assets.xml similarity index 100% rename from assets/week5/images/christmas/mom_dad_christmas_assets.xml rename to assets/shared/images/characters/mom_dad_christmas_assets.xml diff --git a/assets/week5/images/christmas/monsterChristmas.png b/assets/shared/images/characters/monsterChristmas.png similarity index 100% rename from assets/week5/images/christmas/monsterChristmas.png rename to assets/shared/images/characters/monsterChristmas.png diff --git a/assets/week5/images/christmas/monsterChristmas.xml b/assets/shared/images/characters/monsterChristmas.xml similarity index 100% rename from assets/week5/images/christmas/monsterChristmas.xml rename to assets/shared/images/characters/monsterChristmas.xml diff --git a/assets/week6/images/weeb/senpai.png b/assets/shared/images/characters/senpai.png similarity index 100% rename from assets/week6/images/weeb/senpai.png rename to assets/shared/images/characters/senpai.png diff --git a/assets/week6/images/weeb/senpai.xml b/assets/shared/images/characters/senpai.xml similarity index 100% rename from assets/week6/images/weeb/senpai.xml rename to assets/shared/images/characters/senpai.xml diff --git a/assets/week6/images/weeb/spirit.png b/assets/shared/images/characters/spirit.png similarity index 100% rename from assets/week6/images/weeb/spirit.png rename to assets/shared/images/characters/spirit.png diff --git a/assets/week6/images/weeb/spirit.txt b/assets/shared/images/characters/spirit.txt similarity index 100% rename from assets/week6/images/weeb/spirit.txt rename to assets/shared/images/characters/spirit.txt diff --git a/assets/week2/images/spooky_kids_assets.png b/assets/shared/images/characters/spooky_kids_assets.png similarity index 100% rename from assets/week2/images/spooky_kids_assets.png rename to assets/shared/images/characters/spooky_kids_assets.png diff --git a/assets/week2/images/spooky_kids_assets.xml b/assets/shared/images/characters/spooky_kids_assets.xml similarity index 100% rename from assets/week2/images/spooky_kids_assets.xml rename to assets/shared/images/characters/spooky_kids_assets.xml diff --git a/source/Character.hx b/source/Character.hx index a4677aa..3e8367c 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -32,7 +32,7 @@ class Character extends FlxSprite { case 'gf': // GIRLFRIEND CODE - tex = Paths.getSparrowAtlas('GF_assets'); + tex = Paths.getSparrowAtlas('characters/GF_assets'); frames = tex; animation.addByPrefix('cheer', 'GF Cheer', 24, false); animation.addByPrefix('singLEFT', 'GF left note', 24, false); @@ -63,7 +63,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-christmas': - tex = Paths.getSparrowAtlas('christmas/gfChristmas','week5'); + tex = Paths.getSparrowAtlas('characters/gfChristmas'); frames = tex; animation.addByPrefix('cheer', 'GF Cheer', 24, false); animation.addByPrefix('singLEFT', 'GF left note', 24, false); @@ -94,7 +94,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-car': - tex = Paths.getSparrowAtlas('gfCar','week4'); + tex = Paths.getSparrowAtlas('characters/gfCar'); frames = tex; animation.addByIndices('singUP', 'GF Dancing Beat Hair blowing CAR', [0], "", 24, false); animation.addByIndices('danceLeft', 'GF Dancing Beat Hair blowing CAR', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); @@ -107,7 +107,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'gf-pixel': - tex = Paths.getSparrowAtlas('weeb/gfPixel','week6'); + tex = Paths.getSparrowAtlas('characters/gfPixel'); frames = tex; animation.addByIndices('singUP', 'GF IDLE', [2], "", 24, false); animation.addByIndices('danceLeft', 'GF IDLE', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false); @@ -124,7 +124,7 @@ class Character extends FlxSprite case 'dad': // DAD ANIMATION LOADING CODE - tex = Paths.getSparrowAtlas('DADDY_DEAREST','shared'); + tex = Paths.getSparrowAtlas('characters/DADDY_DEAREST'); frames = tex; animation.addByPrefix('idle', 'Dad idle dance', 24); animation.addByPrefix('singUP', 'Dad Sing Note UP', 24); @@ -140,7 +140,7 @@ class Character extends FlxSprite playAnim('idle'); case 'spooky': - tex = Paths.getSparrowAtlas('spooky_kids_assets','week2'); + tex = Paths.getSparrowAtlas('characters/spooky_kids_assets'); frames = tex; animation.addByPrefix('singUP', 'spooky UP NOTE', 24, false); animation.addByPrefix('singDOWN', 'spooky DOWN note', 24, false); @@ -159,7 +159,7 @@ class Character extends FlxSprite playAnim('danceRight'); case 'mom': - tex = Paths.getSparrowAtlas('Mom_Assets','week4'); + tex = Paths.getSparrowAtlas('characters/Mom_Assets'); frames = tex; animation.addByPrefix('idle', "Mom Idle", 24, false); @@ -179,7 +179,7 @@ class Character extends FlxSprite playAnim('idle'); case 'mom-car': - tex = Paths.getSparrowAtlas('momCar','week4'); + tex = Paths.getSparrowAtlas('characters/momCar'); frames = tex; animation.addByPrefix('idle', "Mom Idle", 24, false); @@ -198,7 +198,7 @@ class Character extends FlxSprite playAnim('idle'); case 'monster': - tex = Paths.getSparrowAtlas('Monster_Assets','week2'); + tex = Paths.getSparrowAtlas('characters/Monster_Assets'); frames = tex; animation.addByPrefix('idle', 'monster idle', 24, false); animation.addByPrefix('singUP', 'monster up note', 24, false); @@ -213,7 +213,7 @@ class Character extends FlxSprite addOffset("singDOWN", -30, -40); playAnim('idle'); case 'monster-christmas': - tex = Paths.getSparrowAtlas('christmas/monsterChristmas','week5'); + tex = Paths.getSparrowAtlas('characters/monsterChristmas'); frames = tex; animation.addByPrefix('idle', 'monster idle', 24, false); animation.addByPrefix('singUP', 'monster up note', 24, false); @@ -228,7 +228,7 @@ class Character extends FlxSprite addOffset("singDOWN", -40, -94); playAnim('idle'); case 'pico': - tex = Paths.getSparrowAtlas('Pico_FNF_assetss','week3'); + tex = Paths.getSparrowAtlas('characters/Pico_FNF_assetss'); frames = tex; animation.addByPrefix('idle', "Pico Idle Dance", 24); animation.addByPrefix('singUP', 'pico Up note0', 24, false); @@ -267,7 +267,7 @@ class Character extends FlxSprite flipX = true; case 'bf': - var tex = Paths.getSparrowAtlas('BOYFRIEND','shared'); + var tex = Paths.getSparrowAtlas('characters/BOYFRIEND'); frames = tex; animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); @@ -306,7 +306,7 @@ class Character extends FlxSprite flipX = true; case 'bf-christmas': - var tex = Paths.getSparrowAtlas('christmas/bfChristmas','week5'); + var tex = Paths.getSparrowAtlas('characters/bfChristmas'); frames = tex; animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); @@ -334,7 +334,7 @@ class Character extends FlxSprite flipX = true; case 'bf-car': - var tex = Paths.getSparrowAtlas('bfCar','week4'); + var tex = Paths.getSparrowAtlas('characters/bfCar'); frames = tex; animation.addByPrefix('idle', 'BF idle dance', 24, false); animation.addByPrefix('singUP', 'BF NOTE UP0', 24, false); @@ -359,7 +359,7 @@ class Character extends FlxSprite flipX = true; case 'bf-pixel': - frames = Paths.getSparrowAtlas('weeb/bfPixel','week6'); + frames = Paths.getSparrowAtlas('characters/bfPixel'); animation.addByPrefix('idle', 'BF IDLE', 24, false); animation.addByPrefix('singUP', 'BF UP NOTE', 24, false); animation.addByPrefix('singLEFT', 'BF LEFT NOTE', 24, false); @@ -392,7 +392,7 @@ class Character extends FlxSprite flipX = true; case 'bf-pixel-dead': - frames = Paths.getSparrowAtlas('weeb/bfPixelsDEAD','week6'); + frames = Paths.getSparrowAtlas('characters/bfPixelsDEAD'); animation.addByPrefix('singUP', "BF Dies pixel", 24, false); animation.addByPrefix('firstDeath', "BF Dies pixel", 24, false); animation.addByPrefix('deathLoop', "Retry Loop", 24, true); @@ -410,7 +410,7 @@ class Character extends FlxSprite flipX = true; case 'senpai': - frames = Paths.getSparrowAtlas('weeb/senpai','week6'); + frames = Paths.getSparrowAtlas('characters/senpai'); animation.addByPrefix('idle', 'Senpai Idle', 24, false); animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false); animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false); @@ -430,7 +430,7 @@ class Character extends FlxSprite antialiasing = false; case 'senpai-angry': - frames = Paths.getSparrowAtlas('weeb/senpai','week6'); + frames = Paths.getSparrowAtlas('characters/senpai'); animation.addByPrefix('idle', 'Angry Senpai Idle', 24, false); animation.addByPrefix('singUP', 'Angry Senpai UP NOTE', 24, false); animation.addByPrefix('singLEFT', 'Angry Senpai LEFT NOTE', 24, false); @@ -450,7 +450,7 @@ class Character extends FlxSprite antialiasing = false; case 'spirit': - frames = Paths.getPackerAtlas('weeb/spirit','week6'); + frames = Paths.getPackerAtlas('characters/spirit'); animation.addByPrefix('idle', "idle spirit_", 24, false); animation.addByPrefix('singUP', "up_", 24, false); animation.addByPrefix('singRIGHT', "right_", 24, false); @@ -471,7 +471,7 @@ class Character extends FlxSprite antialiasing = false; case 'parents-christmas': - frames = Paths.getSparrowAtlas('christmas/mom_dad_christmas_assets','week5'); + frames = Paths.getSparrowAtlas('characters/mom_dad_christmas_assets'); animation.addByPrefix('idle', 'Parent Christmas Idle', 24, false); animation.addByPrefix('singUP', 'Parent Up Note Dad', 24, false); animation.addByPrefix('singDOWN', 'Parent Down Note Dad', 24, false); diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 7a7aa98..ddd4478 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -88,12 +88,8 @@ class ChartingState extends MusicBeatState var leftIcon:HealthIcon; var rightIcon:HealthIcon; - var leftIconChar:String; - var rightIconChar:String; - private var lastNote:Note; - override function create() { curSection = lastSection; @@ -119,21 +115,6 @@ class ChartingState extends MusicBeatState gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIconChar = _song.player1; - rightIconChar = _song.player2; - leftIcon = new HealthIcon(leftIconChar); - rightIcon = new HealthIcon(rightIconChar); - leftIcon.scrollFactor.set(1, 1); - rightIcon.scrollFactor.set(1, 1); - - leftIcon.setGraphicSize(0, 45); - rightIcon.setGraphicSize(0, 45); - - add(leftIcon); - add(rightIcon); - - leftIcon.setPosition(0, -100); - rightIcon.setPosition(gridBG.width / 2, -100); gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); add(gridBlackLine); @@ -156,6 +137,20 @@ class ChartingState extends MusicBeatState Conductor.changeBPM(_song.bpm); Conductor.mapBPMChanges(_song); + leftIcon = new HealthIcon(_song.player1); + rightIcon = new HealthIcon(_song.player2); + leftIcon.scrollFactor.set(1, 1); + rightIcon.scrollFactor.set(1, 1); + + leftIcon.setGraphicSize(0, 45); + rightIcon.setGraphicSize(0, 45); + + add(leftIcon); + add(rightIcon); + + leftIcon.setPosition(0, -100); + rightIcon.setPosition(gridBG.width / 2, -100); + bpmTxt = new FlxText(1000, 50, 0, "", 16); bpmTxt.scrollFactor.set(); add(bpmTxt); @@ -305,14 +300,11 @@ class ChartingState extends MusicBeatState var tab_group_assets = new FlxUI(null, UI_box); tab_group_assets.name = "Assets"; - tab_group_assets.add(player1DropDown); - tab_group_assets.add(player2DropDown); + tab_group_assets.add(noteStyleDropDown); tab_group_assets.add(gfVersionDropDown); tab_group_assets.add(stageDropDown); - tab_group_assets.add(noteStyleDropDown); - - - + tab_group_assets.add(player1DropDown); + tab_group_assets.add(player2DropDown); UI_box.addGroup(tab_group_song); UI_box.addGroup(tab_group_assets); @@ -477,9 +469,6 @@ class ChartingState extends MusicBeatState { case 'Must hit section': _song.notes[curSection].mustHitSection = check.checked; - - updateHeads(); - case 'Change BPM': _song.notes[curSection].changeBPM = check.checked; FlxG.log.add('changed bpm shit'); @@ -564,6 +553,8 @@ class ChartingState extends MusicBeatState override function update(elapsed:Float) { + updateHeads(); + curStep = recalculateSteps(); if (FlxG.keys.justPressed.ALT && UI_box.selected_tab == 0) @@ -752,7 +743,7 @@ class ChartingState extends MusicBeatState PlayState.SONG = _song; FlxG.sound.music.stop(); vocals.stop(); - FlxG.switchState(new PlayState()); + LoadingState.loadAndSwitchState(new PlayState()); } if (FlxG.keys.justPressed.E) @@ -1022,21 +1013,19 @@ class ChartingState extends MusicBeatState check_altAnim.checked = sec.altAnim; check_changeBPM.checked = sec.changeBPM; stepperSectionBPM.value = sec.bpm; - - updateHeads(); } function updateHeads():Void { if (check_mustHitSection.checked) { - leftIcon.animation.play(leftIconChar); - rightIcon.animation.play(rightIconChar); + leftIcon.animation.play(_song.player1); + rightIcon.animation.play(_song.player2); } else { - leftIcon.animation.play(rightIconChar); - rightIcon.animation.play(leftIconChar); + leftIcon.animation.play(_song.player2); + rightIcon.animation.play(_song.player1); } } @@ -1266,13 +1255,13 @@ class ChartingState extends MusicBeatState function loadJson(song:String):Void { PlayState.SONG = Song.loadFromJson(song.toLowerCase(), song.toLowerCase()); - FlxG.resetState(); + LoadingState.loadAndSwitchState(new ChartingState()); } function loadAutosave():Void { PlayState.SONG = Song.parseJSONshit(FlxG.save.data.autosave); - FlxG.resetState(); + LoadingState.loadAndSwitchState(new ChartingState()); } function autosaveSong():Void diff --git a/source/HealthIcon.hx b/source/HealthIcon.hx index 2625d95..74f46a1 100644 --- a/source/HealthIcon.hx +++ b/source/HealthIcon.hx @@ -15,7 +15,7 @@ class HealthIcon extends FlxSprite loadGraphic(Paths.image('iconGrid'), true, 150, 150); - + 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); @@ -38,16 +38,13 @@ class HealthIcon extends FlxSprite animation.add('monster', [19, 20], 0, false, isPlayer); animation.add('monster-christmas', [19, 20], 0, false, isPlayer); animation.play(char); - switch(char){ - case 'bf-pixel' | 'senpai' | 'senpai-angry' | 'spirit' | 'gf-pixel': - { - } - default: - { - antialiasing = true; - } + switch(char) + { + case 'bf-pixel' | 'senpai' | 'senpai-angry' | 'spirit' | 'gf-pixel': + antialiasing = false; } + scrollFactor.set(); } diff --git a/source/PlayState.hx b/source/PlayState.hx index 806f80a..a6e084c 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1110,7 +1110,9 @@ class PlayState extends MusicBeatState var luaWiggles:Array = []; + #if windows public static var luaModchart:ModchartState = null; + #end function startCountdown():Void { @@ -1808,11 +1810,13 @@ class PlayState extends MusicBeatState if (FlxG.keys.justPressed.EIGHT) { FlxG.switchState(new AnimationDebug(SONG.player2)); + #if windows if (luaModchart != null) { luaModchart.die(); luaModchart = null; } + #end } #end