Skip to content

Commit

Permalink
changelog and update shit
Browse files Browse the repository at this point in the history
  • Loading branch information
ninjamuffin99 committed Dec 11, 2020
1 parent b110f8b commit 8d8f586
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.3" company="ninjamuffin99" />
<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.4" company="ninjamuffin99" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down
2 changes: 1 addition & 1 deletion source/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import lime.utils.Assets;

class FreeplayState extends MusicBeatState
{
var songs:Array<String> = ["Pico", "Philly", "Blammed", "Bopeebo", "Dadbattle", "Fresh", "Tutorial"];
var songs:Array<String> = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial"];

var selector:FlxText;
var curSelected:Int = 0;
Expand Down
7 changes: 6 additions & 1 deletion source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,7 @@ class PlayState extends MusicBeatState

var trainCars:Int = 8;
var trainFinishing:Bool = false;
var trainCooldown:Int = 0;

function trainStart():Void
{
Expand Down Expand Up @@ -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)
Expand All @@ -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();
}
}
Expand Down

0 comments on commit 8d8f586

Please sign in to comment.