diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ecb8ada42..e5b59f9b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [UNRELEASED] +### Added +- 3 NEW SONGS BY KAWAISPRITE. Pico, Philly, and Blammed. +- NEW CHARACTER, PICO. Based off the classic Flash game "Pico's School" by Tom Fulp +- NEW LEVEL WOW! PHILLY BABEEEE ### Changed - Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you ### Fixed diff --git a/Project.xml b/Project.xml index 2dc527c06d..b150255b95 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ - + diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index d1e369bd3c..7c45fb287d 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -12,7 +12,7 @@ import lime.utils.Assets; class FreeplayState extends MusicBeatState { - var songs:Array = ["Pico", "Philly", "Blammed", "Bopeebo", "Dadbattle", "Fresh", "Tutorial"]; + var songs:Array = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial"]; var selector:FlxText; var curSelected:Int = 0; diff --git a/source/PlayState.hx b/source/PlayState.hx index 7dec60e542..450a5a87e2 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1377,6 +1377,7 @@ class PlayState extends MusicBeatState var trainCars:Int = 8; var trainFinishing:Bool = false; + var trainCooldown:Int = 0; function trainStart():Void { @@ -1516,6 +1517,9 @@ class PlayState extends MusicBeatState switch (curStage) { case "philly": + if (!trainMoving) + trainCooldown += 1; + if (totalBeats % 4 == 0) { phillyCityLights.forEach(function(light:FlxSprite) @@ -1529,8 +1533,9 @@ class PlayState extends MusicBeatState phillyCityLights.members[curLight].alpha = 1; } - if (totalBeats % 8 == 4 && FlxG.random.bool(30) && !trainMoving) + if (totalBeats % 8 == 4 && FlxG.random.bool(30) && !trainMoving && trainCooldown > 8) { + trainCooldown = FlxG.random.int(-4, 0); trainStart(); } }