diff --git a/Features/FlxCamera/source/input/PlayerControls.hx b/Features/FlxCamera/source/input/PlayerControls.hx index beb0696f8..ed102c3dc 100644 --- a/Features/FlxCamera/source/input/PlayerControls.hx +++ b/Features/FlxCamera/source/input/PlayerControls.hx @@ -105,10 +105,17 @@ abstract VirtualPad(FlxVirtualPad) from FlxVirtualPad to FlxVirtualPad { return switch(input) { + #if (flixel >= version("6.0.0")) + case Input.LEFT : this.getButton(FlxVirtualInputID.LEFT).pressed; + case Input.RIGHT: this.getButton(FlxVirtualInputID.RIGHT).pressed; + case Input.UP : this.getButton(FlxVirtualInputID.UP).pressed; + case Input.DOWN : this.getButton(FlxVirtualInputID.DOWN).pressed; + #else case Input.LEFT : this.buttonLeft.pressed; case Input.RIGHT: this.buttonRight.pressed; case Input.UP : this.buttonUp.pressed; case Input.DOWN : this.buttonDown.pressed; + #end default: false; } } diff --git a/Features/FlxFSM/Project.xml b/Features/FlxFSM/Project.xml index eaf5c4c57..f75afcbf2 100644 --- a/Features/FlxFSM/Project.xml +++ b/Features/FlxFSM/Project.xml @@ -31,7 +31,8 @@ - + + @@ -65,6 +66,7 @@ + diff --git a/Features/FlxFSM/assets/powerup.png b/Features/FlxFSM/assets/images/powerup.png similarity index 100% rename from Features/FlxFSM/assets/powerup.png rename to Features/FlxFSM/assets/images/powerup.png diff --git a/Features/FlxFSM/assets/slime.png b/Features/FlxFSM/assets/images/slime.png similarity index 100% rename from Features/FlxFSM/assets/slime.png rename to Features/FlxFSM/assets/images/slime.png diff --git a/Features/FlxFSM/assets/tiles.png b/Features/FlxFSM/assets/images/tiles.png similarity index 100% rename from Features/FlxFSM/assets/tiles.png rename to Features/FlxFSM/assets/images/tiles.png diff --git a/Features/FlxFSM/assets/sounds/groundpound.mp3 b/Features/FlxFSM/assets/sounds/groundpound.mp3 new file mode 100644 index 000000000..eced6a8b4 Binary files /dev/null and b/Features/FlxFSM/assets/sounds/groundpound.mp3 differ diff --git a/Features/FlxFSM/assets/groundpound.ogg b/Features/FlxFSM/assets/sounds/groundpound.ogg similarity index 100% rename from Features/FlxFSM/assets/groundpound.ogg rename to Features/FlxFSM/assets/sounds/groundpound.ogg diff --git a/Features/FlxFSM/assets/sounds/groundpoundfinish.mp3 b/Features/FlxFSM/assets/sounds/groundpoundfinish.mp3 new file mode 100644 index 000000000..ead8f04dc Binary files /dev/null and b/Features/FlxFSM/assets/sounds/groundpoundfinish.mp3 differ diff --git a/Features/FlxFSM/assets/groundpoundfinish.ogg b/Features/FlxFSM/assets/sounds/groundpoundfinish.ogg similarity index 100% rename from Features/FlxFSM/assets/groundpoundfinish.ogg rename to Features/FlxFSM/assets/sounds/groundpoundfinish.ogg diff --git a/Features/FlxFSM/assets/sounds/happynewyear.mp3 b/Features/FlxFSM/assets/sounds/happynewyear.mp3 new file mode 100644 index 000000000..f03b01817 Binary files /dev/null and b/Features/FlxFSM/assets/sounds/happynewyear.mp3 differ diff --git a/Features/FlxFSM/assets/happynewyear.ogg b/Features/FlxFSM/assets/sounds/happynewyear.ogg similarity index 100% rename from Features/FlxFSM/assets/happynewyear.ogg rename to Features/FlxFSM/assets/sounds/happynewyear.ogg diff --git a/Features/FlxFSM/assets/sounds/jump.mp3 b/Features/FlxFSM/assets/sounds/jump.mp3 new file mode 100644 index 000000000..735e4e4ef Binary files /dev/null and b/Features/FlxFSM/assets/sounds/jump.mp3 differ diff --git a/Features/FlxFSM/assets/jump.ogg b/Features/FlxFSM/assets/sounds/jump.ogg similarity index 100% rename from Features/FlxFSM/assets/jump.ogg rename to Features/FlxFSM/assets/sounds/jump.ogg diff --git a/Features/FlxFSM/assets/sounds/powerup.mp3 b/Features/FlxFSM/assets/sounds/powerup.mp3 new file mode 100644 index 000000000..6e0d0a308 Binary files /dev/null and b/Features/FlxFSM/assets/sounds/powerup.mp3 differ diff --git a/Features/FlxFSM/assets/powerup.ogg b/Features/FlxFSM/assets/sounds/powerup.ogg similarity index 100% rename from Features/FlxFSM/assets/powerup.ogg rename to Features/FlxFSM/assets/sounds/powerup.ogg diff --git a/Features/FlxFSM/assets/sounds/superjump.mp3 b/Features/FlxFSM/assets/sounds/superjump.mp3 new file mode 100644 index 000000000..9eba7edb9 Binary files /dev/null and b/Features/FlxFSM/assets/sounds/superjump.mp3 differ diff --git a/Features/FlxFSM/assets/superjump.ogg b/Features/FlxFSM/assets/sounds/superjump.ogg similarity index 100% rename from Features/FlxFSM/assets/superjump.ogg rename to Features/FlxFSM/assets/sounds/superjump.ogg diff --git a/Features/FlxFSM/assets/sounds/walk.mp3 b/Features/FlxFSM/assets/sounds/walk.mp3 new file mode 100644 index 000000000..dd45a8a61 Binary files /dev/null and b/Features/FlxFSM/assets/sounds/walk.mp3 differ diff --git a/Features/FlxFSM/assets/walk.ogg b/Features/FlxFSM/assets/sounds/walk.ogg similarity index 100% rename from Features/FlxFSM/assets/walk.ogg rename to Features/FlxFSM/assets/sounds/walk.ogg diff --git a/Features/FlxFSM/source/PlayState.hx b/Features/FlxFSM/source/PlayState.hx index 1c05d507e..af071a560 100644 --- a/Features/FlxFSM/source/PlayState.hx +++ b/Features/FlxFSM/source/PlayState.hx @@ -33,7 +33,7 @@ class PlayState extends FlxState // Music by 8-BITek // Licensed under CC BY-NC-ND 3.0 // https://www.newgrounds.com/audio/listen/1341678 - FlxG.sound.playMusic("assets/happynewyear.ogg", 0); + FlxG.sound.playMusic("assets/sounds/happynewyear", 0); FlxG.sound.music.fadeIn(2, 0, 0.2); final J = 99; @@ -66,16 +66,16 @@ class PlayState extends FlxState final tileSize = 16; _map = new FlxTilemap(); - _map.loadMapFromArray(data, 20, 15, "assets/tiles.png", tileSize, tileSize); + _map.loadMapFromArray(data, 20, 15, "assets/images/tiles.png", tileSize, tileSize); add(_map); _slime = new Slime(192, 128); add(_slime); - _superJump = new FlxSprite((superJumpIndex % columns) * tileSize, Std.int(superJumpIndex / columns) * tileSize, "assets/powerup.png"); + _superJump = new FlxSprite((superJumpIndex % columns) * tileSize, Std.int(superJumpIndex / columns) * tileSize, "assets/images/powerup.png"); add(_superJump); - _groundPound = new FlxSprite((groundPoundIndex % columns) * tileSize, Std.int(groundPoundIndex / columns) * tileSize, "assets/powerup.png"); + _groundPound = new FlxSprite((groundPoundIndex % columns) * tileSize, Std.int(groundPoundIndex / columns) * tileSize, "assets/images/powerup.png"); _groundPound.flipY = true; _groundPound.y += 4; add(_groundPound); @@ -92,14 +92,14 @@ class PlayState extends FlxState FlxG.overlap(_slime, _superJump, function (_, _) { - FlxG.sound.play("assets/powerup.ogg"); + FlxG.sound.play("assets/sounds/powerup"); _slime.addSuperJump(); _superJump.kill(); }); FlxG.overlap(_slime, _groundPound, function (_, _) { - FlxG.sound.play("assets/powerup.ogg"); + FlxG.sound.play("assets/sounds/powerup"); _slime.addGroundPound(); _groundPound.kill(); startGroundPoundInfoTween(); diff --git a/Features/FlxFSM/source/Slime.hx b/Features/FlxFSM/source/Slime.hx index d5e38105c..1d86bbd1e 100644 --- a/Features/FlxFSM/source/Slime.hx +++ b/Features/FlxFSM/source/Slime.hx @@ -15,7 +15,7 @@ class Slime extends FlxSprite { super(X, Y); - loadGraphic("assets/slime.png", true, 16, 16); + loadGraphic("assets/images/slime.png", true, 16, 16); setFacingFlip(LEFT, true, false); setFacingFlip(RIGHT, false, false); facing = RIGHT; @@ -100,7 +100,7 @@ class Idle extends FlxFSMState override function enter(owner:Slime, fsm:FlxFSM):Void { - walkSnd = FlxG.sound.load("assets/walk.ogg", 0.4); + walkSnd = FlxG.sound.load("assets/sounds/walk", 0.4); owner.animation.play("standing"); } @@ -131,7 +131,7 @@ class Jump extends FlxFSMState { override function enter(owner:Slime, fsm:FlxFSM):Void { - FlxG.sound.play("assets/jump.ogg", FlxG.random.float(0.9, 1.0)); + FlxG.sound.play("assets/sounds/jump", FlxG.random.float(0.9, 1.0)); owner.animation.play("jumping"); owner.velocity.y = -200; } @@ -150,7 +150,7 @@ class SuperJump extends Jump { override function enter(owner:Slime, fsm:FlxFSM):Void { - FlxG.sound.play("assets/superjump.ogg", FlxG.random.float(0.9, 1.0)); + FlxG.sound.play("assets/sounds/superjump", FlxG.random.float(0.9, 1.0)); owner.animation.play("jumping"); owner.velocity.y = -300; } @@ -162,7 +162,7 @@ class GroundPound extends FlxFSMState override function enter(owner:Slime, fsm:FlxFSM):Void { - FlxG.sound.play("assets/groundpound.ogg"); + FlxG.sound.play("assets/sounds/groundpound"); owner.animation.play("pound"); owner.velocity.x = 0; owner.acceleration.x = 0; @@ -187,7 +187,7 @@ class GroundPoundFinish extends FlxFSMState { override function enter(owner:Slime, fsm:FlxFSM):Void { - FlxG.sound.play("assets/groundpoundfinish.ogg"); + FlxG.sound.play("assets/sounds/groundpoundfinish"); owner.animation.play("landing"); FlxG.camera.shake(0.025, 0.25); owner.velocity.x = 0; diff --git a/Input/FlxAction/source/Player.hx b/Input/FlxAction/source/Player.hx index 968c4fcd5..59ee563c1 100644 --- a/Input/FlxAction/source/Player.hx +++ b/Input/FlxAction/source/Player.hx @@ -144,10 +144,17 @@ class Player extends FlxSprite function updateDigital():Void { + #if (flixel >= version("6.0.0")) + _virtualPad.getButton(UP).color = FlxColor.WHITE; + _virtualPad.getButton(DOWN).color = FlxColor.WHITE; + _virtualPad.getButton(LEFT).color = FlxColor.WHITE; + _virtualPad.getButton(RIGHT).color = FlxColor.WHITE; + #else _virtualPad.buttonUp.color = FlxColor.WHITE; _virtualPad.buttonDown.color = FlxColor.WHITE; _virtualPad.buttonLeft.color = FlxColor.WHITE; _virtualPad.buttonRight.color = FlxColor.WHITE; + #end if (down.triggered) {