From bfb9ed5804303137247f00c377bd31694db271ab Mon Sep 17 00:00:00 2001 From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:21:37 -0500 Subject: [PATCH 1/6] healthicons now match the song's character --- source/ChartingState.hx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 6346c88..1da54ea 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -90,13 +90,29 @@ class ChartingState extends MusicBeatState override function create() { + if (PlayState.SONG != null) + _song = PlayState.SONG; + else + { + _song = { + song: 'Test', + notes: [], + bpm: 150, + needsVoices: true, + player1: 'bf', + player2: 'dad', + speed: 1, + validScore: false + }; + } + curSection = lastSection; gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIcon = new HealthIcon('bf'); - rightIcon = new HealthIcon('dad'); + leftIcon = new HealthIcon(Song.SONG.player1); + rightIcon = new HealthIcon(Song.SONG.player2); leftIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1); @@ -115,22 +131,6 @@ class ChartingState extends MusicBeatState curRenderedNotes = new FlxTypedGroup(); curRenderedSustains = new FlxTypedGroup(); - if (PlayState.SONG != null) - _song = PlayState.SONG; - else - { - _song = { - song: 'Test', - notes: [], - bpm: 150, - needsVoices: true, - player1: 'bf', - player2: 'dad', - speed: 1, - validScore: false - }; - } - FlxG.mouse.visible = true; FlxG.save.bind('funkin', 'ninjamuffin99'); From 8feb1279538489db4f5da3070d836ef83939cde7 Mon Sep 17 00:00:00 2001 From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:25:51 -0500 Subject: [PATCH 2/6] im dumb --- source/ChartingState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 1da54ea..ee1ac92 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -111,8 +111,8 @@ class ChartingState extends MusicBeatState gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIcon = new HealthIcon(Song.SONG.player1); - rightIcon = new HealthIcon(Song.SONG.player2); + leftIcon = new HealthIcon(PlayState.SONG.player1); + rightIcon = new HealthIcon(PlayState.SONG.player2); leftIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1); From e063bb1ccbbd029916065b0b898296a521ea068e Mon Sep 17 00:00:00 2001 From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:38:47 -0500 Subject: [PATCH 3/6] Revert "im dumb" This reverts commit 8feb1279538489db4f5da3070d836ef83939cde7. --- source/ChartingState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index ee1ac92..1da54ea 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -111,8 +111,8 @@ class ChartingState extends MusicBeatState gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIcon = new HealthIcon(PlayState.SONG.player1); - rightIcon = new HealthIcon(PlayState.SONG.player2); + leftIcon = new HealthIcon(Song.SONG.player1); + rightIcon = new HealthIcon(Song.SONG.player2); leftIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1); From cea43982134e386bb3691da29415013191b7a5c6 Mon Sep 17 00:00:00 2001 From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:38:51 -0500 Subject: [PATCH 4/6] Revert "healthicons now match the song's character" This reverts commit bfb9ed5804303137247f00c377bd31694db271ab. --- source/ChartingState.hx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 1da54ea..6346c88 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -90,29 +90,13 @@ class ChartingState extends MusicBeatState override function create() { - if (PlayState.SONG != null) - _song = PlayState.SONG; - else - { - _song = { - song: 'Test', - notes: [], - bpm: 150, - needsVoices: true, - player1: 'bf', - player2: 'dad', - speed: 1, - validScore: false - }; - } - curSection = lastSection; gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIcon = new HealthIcon(Song.SONG.player1); - rightIcon = new HealthIcon(Song.SONG.player2); + leftIcon = new HealthIcon('bf'); + rightIcon = new HealthIcon('dad'); leftIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1); @@ -131,6 +115,22 @@ class ChartingState extends MusicBeatState curRenderedNotes = new FlxTypedGroup(); curRenderedSustains = new FlxTypedGroup(); + if (PlayState.SONG != null) + _song = PlayState.SONG; + else + { + _song = { + song: 'Test', + notes: [], + bpm: 150, + needsVoices: true, + player1: 'bf', + player2: 'dad', + speed: 1, + validScore: false + }; + } + FlxG.mouse.visible = true; FlxG.save.bind('funkin', 'ninjamuffin99'); From 0412b3035cb847548f9d8e24f2f02a0d203a29ab Mon Sep 17 00:00:00 2001 From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:39:14 -0500 Subject: [PATCH 5/6] Revert "Revert "healthicons now match the song's character"" This reverts commit cea43982134e386bb3691da29415013191b7a5c6. --- source/ChartingState.hx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 6346c88..1da54ea 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -90,13 +90,29 @@ class ChartingState extends MusicBeatState override function create() { + if (PlayState.SONG != null) + _song = PlayState.SONG; + else + { + _song = { + song: 'Test', + notes: [], + bpm: 150, + needsVoices: true, + player1: 'bf', + player2: 'dad', + speed: 1, + validScore: false + }; + } + curSection = lastSection; gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIcon = new HealthIcon('bf'); - rightIcon = new HealthIcon('dad'); + leftIcon = new HealthIcon(Song.SONG.player1); + rightIcon = new HealthIcon(Song.SONG.player2); leftIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1); @@ -115,22 +131,6 @@ class ChartingState extends MusicBeatState curRenderedNotes = new FlxTypedGroup(); curRenderedSustains = new FlxTypedGroup(); - if (PlayState.SONG != null) - _song = PlayState.SONG; - else - { - _song = { - song: 'Test', - notes: [], - bpm: 150, - needsVoices: true, - player1: 'bf', - player2: 'dad', - speed: 1, - validScore: false - }; - } - FlxG.mouse.visible = true; FlxG.save.bind('funkin', 'ninjamuffin99'); From 475539296babcf872b52a6ed955a0971d26b4901 Mon Sep 17 00:00:00 2001 From: CyndaquilDAC <65635932+CyndaquilDAC@users.noreply.github.com> Date: Tue, 6 Apr 2021 18:39:23 -0500 Subject: [PATCH 6/6] Revert "Revert "im dumb"" This reverts commit e063bb1ccbbd029916065b0b898296a521ea068e. --- source/ChartingState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 1da54ea..ee1ac92 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -111,8 +111,8 @@ class ChartingState extends MusicBeatState gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); - leftIcon = new HealthIcon(Song.SONG.player1); - rightIcon = new HealthIcon(Song.SONG.player2); + leftIcon = new HealthIcon(PlayState.SONG.player1); + rightIcon = new HealthIcon(PlayState.SONG.player2); leftIcon.scrollFactor.set(1, 1); rightIcon.scrollFactor.set(1, 1);