diff --git a/assets/preload/music/freakyMenu.mp3 b/assets/preload/music/freakyMenu.mp3
deleted file mode 100644
index 8132bfe..0000000
Binary files a/assets/preload/music/freakyMenu.mp3 and /dev/null differ
diff --git a/assets/preload/music/freakyMenu.ogg b/assets/preload/music/freakyMenu.ogg
index 372111d..e5e2b4d 100644
Binary files a/assets/preload/music/freakyMenu.ogg and b/assets/preload/music/freakyMenu.ogg differ
diff --git a/assets/shared/images/NOTE_assets.png b/assets/shared/images/NOTE_assets.png
index b439400..3259d0b 100644
Binary files a/assets/shared/images/NOTE_assets.png and b/assets/shared/images/NOTE_assets.png differ
diff --git a/assets/shared/images/NOTE_assets.xml b/assets/shared/images/NOTE_assets.xml
index 744f378..76224ce 100644
--- a/assets/shared/images/NOTE_assets.xml
+++ b/assets/shared/images/NOTE_assets.xml
@@ -1,49 +1,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
index 2ff4465..4f80d31 100644
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@@ -64,6 +64,21 @@ class FreeplayState extends MusicBeatState
{
var data:Array = initSonglist[i].split(':');
var meta = new SongMetadata(data[0], Std.parseInt(data[2]), data[1]);
+ #if debug
+ songs.push(meta);
+ var format = StringTools.replace(meta.songName, " ", "-");
+ switch (format) {
+ case 'Dad-Battle': format = 'Dadbattle';
+ case 'Philly-Nice': format = 'Philly';
+ }
+
+ var diffs = [];
+ FreeplayState.loadDiff(0,format,meta.songName,diffs);
+ FreeplayState.loadDiff(1,format,meta.songName,diffs);
+ FreeplayState.loadDiff(2,format,meta.songName,diffs);
+ FreeplayState.songData.set(meta.songName,diffs);
+ trace('loaded diffs for ' + meta.songName);
+ #else
if(Std.parseInt(data[2]) <= FlxG.save.data.weekUnlocked - 1)
{
songs.push(meta);
@@ -80,6 +95,7 @@ class FreeplayState extends MusicBeatState
FreeplayState.songData.set(meta.songName,diffs);
trace('loaded diffs for ' + meta.songName);
}
+ #end
}
//trace("\n" + diffList);
diff --git a/source/KeyBindMenu.hx b/source/KeyBindMenu.hx
index d5a3d41..ff826bb 100644
--- a/source/KeyBindMenu.hx
+++ b/source/KeyBindMenu.hx
@@ -320,7 +320,7 @@ class KeyBindMenu extends FlxSubState
var shouldReturn:Bool = true;
- var notAllowed:Array = ["START", "RIGHT_TRIGGER", "LEFT_TRIGGER"];
+ var notAllowed:Array = ["START"];
for(x in 0...gpKeys.length)
{
diff --git a/source/Note.hx b/source/Note.hx
index 72264a4..8a44b40 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -99,20 +99,20 @@ class Note extends FlxSprite
default:
frames = Paths.getSparrowAtlas('NOTE_assets');
- animation.addByPrefix('greenScroll', 'green instance 1');
- animation.addByPrefix('redScroll', 'red instance 1');
- animation.addByPrefix('blueScroll', 'blue instance 1');
- animation.addByPrefix('purpleScroll', 'purple instance 1');
+ animation.addByPrefix('greenScroll', 'green0');
+ animation.addByPrefix('redScroll', 'red0');
+ animation.addByPrefix('blueScroll', 'blue0');
+ animation.addByPrefix('purpleScroll', 'purple0');
- animation.addByPrefix('purpleholdend', 'pruple end hold instance 1');
- animation.addByPrefix('greenholdend', 'green hold end instance 1');
- animation.addByPrefix('redholdend', 'red hold end instance 1');
- animation.addByPrefix('blueholdend', 'blue hold end instance 1');
+ animation.addByPrefix('purpleholdend', 'pruple end hold');
+ animation.addByPrefix('greenholdend', 'green hold end');
+ animation.addByPrefix('redholdend', 'red hold end');
+ animation.addByPrefix('blueholdend', 'blue hold end');
- animation.addByPrefix('purplehold', 'purple hold piece instance 1');
- animation.addByPrefix('greenhold', 'green hold piece instance 1');
- animation.addByPrefix('redhold', 'red hold piece instance 1');
- animation.addByPrefix('bluehold', 'blue hold piece instance 1');
+ animation.addByPrefix('purplehold', 'purple hold piece');
+ animation.addByPrefix('greenhold', 'green hold piece');
+ animation.addByPrefix('redhold', 'red hold piece');
+ animation.addByPrefix('bluehold', 'blue hold piece');
setGraphicSize(Std.int(width * 0.7));
updateHitbox();
diff --git a/source/PlayState.hx b/source/PlayState.hx
index c95cae2..78b547e 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -1735,70 +1735,70 @@ class PlayState extends MusicBeatState
case 'normal':
babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
- babyArrow.animation.addByPrefix('green', 'arrow static instance 1');
- babyArrow.animation.addByPrefix('blue', 'arrow static instance 2');
- babyArrow.animation.addByPrefix('purple', 'arrow static instance 3');
- babyArrow.animation.addByPrefix('red', 'arrow static instance 4');
-
+ babyArrow.animation.addByPrefix('green', 'arrowUP');
+ babyArrow.animation.addByPrefix('blue', 'arrowDOWN');
+ babyArrow.animation.addByPrefix('purple', 'arrowLEFT');
+ babyArrow.animation.addByPrefix('red', 'arrowRIGHT');
+
babyArrow.antialiasing = true;
babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7));
-
+
switch (Math.abs(i))
{
- case 0:
- babyArrow.x += Note.swagWidth * 0;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 1');
- babyArrow.animation.addByPrefix('pressed', 'left press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'left confirm instance 1', 24, false);
- case 1:
- babyArrow.x += Note.swagWidth * 1;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 2');
- babyArrow.animation.addByPrefix('pressed', 'down press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'down confirm instance 1', 24, false);
case 2:
babyArrow.x += Note.swagWidth * 2;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 4');
- babyArrow.animation.addByPrefix('pressed', 'up press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'up confirm instance 1', 24, false);
+ babyArrow.animation.addByPrefix('static', 'arrowUP');
+ babyArrow.animation.addByPrefix('pressed', 'up press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'up confirm', 24, false);
case 3:
babyArrow.x += Note.swagWidth * 3;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 3');
- babyArrow.animation.addByPrefix('pressed', 'right press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'right confirm instance 1', 24, false);
- }
+ babyArrow.animation.addByPrefix('static', 'arrowRIGHT');
+ babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
+ case 1:
+ babyArrow.x += Note.swagWidth * 1;
+ babyArrow.animation.addByPrefix('static', 'arrowDOWN');
+ babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
+ case 0:
+ babyArrow.x += Note.swagWidth * 0;
+ babyArrow.animation.addByPrefix('static', 'arrowLEFT');
+ babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
+ }
default:
babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
- babyArrow.animation.addByPrefix('green', 'arrow static instance 1');
- babyArrow.animation.addByPrefix('blue', 'arrow static instance 2');
- babyArrow.animation.addByPrefix('purple', 'arrow static instance 3');
- babyArrow.animation.addByPrefix('red', 'arrow static instance 4');
+ babyArrow.animation.addByPrefix('green', 'arrowUP');
+ babyArrow.animation.addByPrefix('blue', 'arrowDOWN');
+ babyArrow.animation.addByPrefix('purple', 'arrowLEFT');
+ babyArrow.animation.addByPrefix('red', 'arrowRIGHT');
babyArrow.antialiasing = true;
babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7));
switch (Math.abs(i))
{
- case 0:
- babyArrow.x += Note.swagWidth * 0;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 1');
- babyArrow.animation.addByPrefix('pressed', 'left press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'left confirm instance 1', 24, false);
- case 1:
- babyArrow.x += Note.swagWidth * 1;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 2');
- babyArrow.animation.addByPrefix('pressed', 'down press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'down confirm instance 1', 24, false);
case 2:
babyArrow.x += Note.swagWidth * 2;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 4');
- babyArrow.animation.addByPrefix('pressed', 'up press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'up confirm instance 1', 24, false);
+ babyArrow.animation.addByPrefix('static', 'arrowUP');
+ babyArrow.animation.addByPrefix('pressed', 'up press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'up confirm', 24, false);
case 3:
babyArrow.x += Note.swagWidth * 3;
- babyArrow.animation.addByPrefix('static', 'arrow static instance 3');
- babyArrow.animation.addByPrefix('pressed', 'right press instance 1', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'right confirm instance 1', 24, false);
+ babyArrow.animation.addByPrefix('static', 'arrowRIGHT');
+ babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
+ case 1:
+ babyArrow.x += Note.swagWidth * 1;
+ babyArrow.animation.addByPrefix('static', 'arrowDOWN');
+ babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
+ case 0:
+ babyArrow.x += Note.swagWidth * 0;
+ babyArrow.animation.addByPrefix('static', 'arrowLEFT');
+ babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
+ babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
}
}
@@ -2682,7 +2682,7 @@ class PlayState extends MusicBeatState
});
}
- if (!inCutscene)
+ if (!inCutscene && songStarted)
keyShit();
diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx
index 120d4fa..2d55303 100644
--- a/source/StoryMenuState.hx
+++ b/source/StoryMenuState.hx
@@ -78,7 +78,14 @@ class StoryMenuState extends MusicBeatState
function unlockWeeks():Array
{
- var weeks:Array = [true];
+ var weeks:Array = [];
+ #if debug
+ for(i in 0...weekNames.length)
+ weeks.push(true);
+ return weeks;
+ #end
+
+ weeks.push(true);
for(i in 0...FlxG.save.data.weekUnlocked)
{
@@ -212,6 +219,19 @@ class StoryMenuState extends MusicBeatState
updateText();
+
+ var bullShit:Int = 0;
+
+ for (item in grpWeekText.members)
+ {
+ item.targetY = bullShit - curWeek;
+ if (item.targetY == Std.int(0) && weekUnlocked[curWeek])
+ item.alpha = 1;
+ else
+ item.alpha = 0.6;
+ bullShit++;
+ }
+
trace("Line 165");
super.create();