diff --git a/appveyor-linux.yml b/appveyor-linux.yml
index 8cc98de..dc06bb0 100644
--- a/appveyor-linux.yml
+++ b/appveyor-linux.yml
@@ -9,7 +9,7 @@ install:
- cd /home/appveyor
- sudo add-apt-repository ppa:haxe/releases -y
- sudo apt update
- - sudo apt install neko tar -y
+ - sudo apt install neko tar gcc-multilib g++-multilib -y
- wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz
- mkdir $HAXE_INSTALLDIR
- tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR
@@ -32,7 +32,6 @@ install:
- haxelib run lime rebuild extension-webm linux
- haxelib install linc_luajit
- haxelib install actuate
- - haxelib git extension-webm https://github.com/KadeDev/extension-webm
- haxelib list
- cd /home/appveyor/projects/kade-engine-linux
diff --git a/assets/shared/images/NOTE_assets.png b/assets/shared/images/NOTE_assets.png
index 7d50636..8e9f3a0 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 82a997a..6e80b13 100644
--- a/assets/shared/images/NOTE_assets.xml
+++ b/assets/shared/images/NOTE_assets.xml
@@ -1,53 +1,92 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/source/KeyBinds.hx b/source/KeyBinds.hx
index 2514ea1..b9c704d 100644
--- a/source/KeyBinds.hx
+++ b/source/KeyBinds.hx
@@ -72,8 +72,12 @@ class KeyBinds
FlxG.save.data.gprightBind = "DPAD_RIGHT";
trace("No GRIGHT");
}
+ if(FlxG.save.data.killBind == null){
+ FlxG.save.data.killBind = "R";
+ trace("No KILL");
+ }
trace('${FlxG.save.data.leftBind}-${FlxG.save.data.downBind}-${FlxG.save.data.upBind}-${FlxG.save.data.rightBind}');
}
-}
\ No newline at end of file
+}
diff --git a/source/Note.hx b/source/Note.hx
index cdb9cb2..ec67490 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', 'green0');
- animation.addByPrefix('redScroll', 'red0');
- animation.addByPrefix('blueScroll', 'blue0');
- animation.addByPrefix('purpleScroll', 'purple0');
+ 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('purpleholdend', 'pruple end hold');
- animation.addByPrefix('greenholdend', 'green hold end');
- animation.addByPrefix('redholdend', 'red hold end');
- animation.addByPrefix('blueholdend', 'blue hold end');
+ 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('purplehold', 'purple hold piece');
- animation.addByPrefix('greenhold', 'green hold piece');
- animation.addByPrefix('redhold', 'red hold piece');
- animation.addByPrefix('bluehold', 'blue hold piece');
+ 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');
setGraphicSize(Std.int(width * 0.7));
updateHitbox();
@@ -235,4 +235,4 @@ class Note extends FlxSprite
alpha = 0.3;
}
}
-}
\ No newline at end of file
+}
diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx
index 8d0c323..f2e3a0b 100644
--- a/source/PauseSubState.hx
+++ b/source/PauseSubState.hx
@@ -111,19 +111,18 @@ class PauseSubState extends MusicBeatSubstate
var gamepad:FlxGamepad = FlxG.gamepads.lastActive;
- var upP = controls.UP_P;
- var downP = controls.DOWN_P;
- var leftP = controls.LEFT_P;
- var rightP = controls.RIGHT_P;
- var accepted = controls.ACCEPT;
+ var upPcontroller:Bool = false;
+ var downPcontroller:Bool = false;
+ var leftPcontroller:Bool = false;
+ var rightPcontroller:Bool = false;
var oldOffset:Float = 0;
if (gamepad != null && KeyBinds.gamepad)
{
- upP = gamepad.justPressed.DPAD_UP;
- downP = gamepad.justPressed.DPAD_DOWN;
- leftP = gamepad.justPressed.DPAD_LEFT;
- rightP = gamepad.justPressed.DPAD_RIGHT;
+ upPcontroller = gamepad.justPressed.DPAD_UP;
+ downPcontroller = gamepad.justPressed.DPAD_DOWN;
+ leftPcontroller = gamepad.justPressed.DPAD_LEFT;
+ rightPcontroller = gamepad.justPressed.DPAD_RIGHT;
}
// pre lowercasing the song name (update)
@@ -134,17 +133,18 @@ class PauseSubState extends MusicBeatSubstate
}
var songPath = 'assets/data/' + songLowercase + '/';
- if (upP)
+ if (controls.UP_P || upPcontroller)
{
changeSelection(-1);
- }else if (downP)
+ }
+ else if (controls.DOWN_P || downPcontroller)
{
changeSelection(1);
}
#if cpp
- else if (leftP)
+ else if (controls.LEFT_P || leftPcontroller)
{
oldOffset = PlayState.songOffset;
PlayState.songOffset -= 1;
@@ -171,7 +171,8 @@ class PauseSubState extends MusicBeatSubstate
cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
offsetChanged = true;
}
- }else if (rightP)
+ }
+ else if (controls.RIGHT_P || rightPcontroller)
{
oldOffset = PlayState.songOffset;
PlayState.songOffset += 1;
@@ -199,7 +200,7 @@ class PauseSubState extends MusicBeatSubstate
}
#end
- if (accepted)
+ if (controls.ACCEPT)
{
var daSelected:String = menuItems[curSelected];
diff --git a/source/PlayState.hx b/source/PlayState.hx
index b64c705..daca7ed 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -1733,73 +1733,73 @@ class PlayState extends MusicBeatState
babyArrow.animation.add('confirm', [12, 16], 24, false);
}
- case 'normal':
- babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
- 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', 'arrowLEFT');
- babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'left 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 2:
- babyArrow.x += Note.swagWidth * 2;
- 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', 'arrowRIGHT');
- babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
- }
+ 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');
- default:
- babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
- 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));
- 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', 'arrowLEFT');
- babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'left 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 2:
- babyArrow.x += Note.swagWidth * 2;
- 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', 'arrowRIGHT');
- babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
- babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
+ 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);
+ 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);
}
+
+ 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.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);
+ 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.updateHitbox();