From ceba27472c11ea12f8fdf49724e119cf84b57c48 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 11 Dec 2020 00:57:42 -0500
Subject: [PATCH] charts and fixins
---
CHANGELOG.md | 2 ++
source/Character.hx | 2 +-
source/PlayState.hx | 7 ++++---
source/TitleState.hx | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d82781021..a9dda5dd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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).
## [UNRELEASED]
+### Changed
+- Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you
### Fixed
- Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37))
diff --git a/source/Character.hx b/source/Character.hx
index f29efc018..f79dfa3d1 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -239,7 +239,7 @@ class Character extends FlxSprite
playAnim('idle');
case 'monster':
playAnim('idle');
- case 'lucky':
+ case 'pico':
playAnim('idle');
}
}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index d0ce1e592..f4d1b5486 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -179,7 +179,7 @@ class PlayState extends MusicBeatState
var streetBehind:FlxSprite = new FlxSprite(-40, 50).loadGraphic(AssetPaths.behindTrain__png);
add(streetBehind);
- phillyTrain = new FlxSprite(2000, 300).loadGraphic(AssetPaths.train__png);
+ phillyTrain = new FlxSprite(2000, 360).loadGraphic(AssetPaths.train__png);
add(phillyTrain);
trainSound = new FlxSound().loadEmbedded('assets/sounds/train_passes' + TitleState.soundExt);
@@ -1242,7 +1242,7 @@ class PlayState extends MusicBeatState
{
if (!boyfriend.stunned)
{
- health -= 0.06;
+ health -= 0.025;
if (combo > 5)
{
gf.playAnim('sad');
@@ -1419,6 +1419,7 @@ class PlayState extends MusicBeatState
// trainSound.stop();
// trainSound.time = 0;
trainCars = 8;
+ trainFinishing = false;
startedMoving = false;
}
@@ -1526,7 +1527,7 @@ class PlayState extends MusicBeatState
phillyCityLights.members[curLight].alpha = 1;
}
- if (totalBeats % 8 == 4 && FlxG.random.bool(40) && !trainMoving)
+ if (totalBeats % 8 == 4 && FlxG.random.bool(30) && !trainMoving)
{
trainStart();
}
diff --git a/source/TitleState.hx b/source/TitleState.hx
index 59eed5b70..ba0012ec6 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -69,7 +69,7 @@ class TitleState extends MusicBeatState
}
#if SKIP_TO_PLAYSTATE
- FlxG.switchState(new FreeplayState());
+ FlxG.switchState(new ChartingState());
#else
startIntro();
#end