cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-17 20:32:53 +00:00
Code Issues Releases Wiki Activity

charts and fixins

Browse source
This commit is contained in:
Cameron Taylor 2020-12-11 00:57:42 -05:00
parent 8780f93c21
commit 6db82462f0
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -5,6 +5,8 @@ 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). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [UNRELEASED] ## [UNRELEASED]
### Changed
- Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you
### Fixed ### Fixed
- Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37)) - Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37))

2
assets/data/blammed/blammed.json
View file

File diff suppressed because one or more lines are too long

2
source/Character.hx
View file

@ -239,7 +239,7 @@ class Character extends FlxSprite
playAnim('idle'); playAnim('idle');
case 'monster': case 'monster':
playAnim('idle'); playAnim('idle');
case 'lucky': case 'pico':
playAnim('idle'); playAnim('idle');
} }
} }

7
source/PlayState.hx
View file

@ -179,7 +179,7 @@ class PlayState extends MusicBeatState
var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(AssetPaths.behindTrain__png); var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(AssetPaths.behindTrain__png);
add(streetBehind); add(streetBehind);
phillyTrain = new FlxSprite(2000, 300).loadGraphic(AssetPaths.train__png); phillyTrain = new FlxSprite(2000, 360).loadGraphic(AssetPaths.train__png);
add(phillyTrain); add(phillyTrain);
trainSound = new FlxSound().loadEmbedded('assets/sounds/train_passes' + TitleState.soundExt); trainSound = new FlxSound().loadEmbedded('assets/sounds/train_passes' + TitleState.soundExt);
@ -1242,7 +1242,7 @@ class PlayState extends MusicBeatState
{ {
if (!boyfriend.stunned) if (!boyfriend.stunned)
{ {
health -= 0.06; health -= 0.025;
if (combo > 5) if (combo > 5)
{ {
gf.playAnim('sad'); gf.playAnim('sad');
@ -1419,6 +1419,7 @@ class PlayState extends MusicBeatState
// trainSound.stop(); // trainSound.stop();
// trainSound.time = 0; // trainSound.time = 0;
trainCars = 8; trainCars = 8;
trainFinishing = false;
startedMoving = false; startedMoving = false;
} }
@ -1526,7 +1527,7 @@ class PlayState extends MusicBeatState
phillyCityLights.members[curLight].alpha = 1; phillyCityLights.members[curLight].alpha = 1;
} }
if (totalBeats % 8 == 4 && FlxG.random.bool(40) && !trainMoving) if (totalBeats % 8 == 4 && FlxG.random.bool(30) && !trainMoving)
{ {
trainStart(); trainStart();
} }

2
source/TitleState.hx
View file

@ -69,7 +69,7 @@ class TitleState extends MusicBeatState
} }
#if SKIP_TO_PLAYSTATE #if SKIP_TO_PLAYSTATE
FlxG.switchState(new FreeplayState()); FlxG.switchState(new ChartingState());
#else #else
startIntro(); startIntro();
#end #end