diff --git a/CHANGELOG.md b/CHANGELOG.md index 8920cd610..56d2b0e68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Rebindable controls ([Thanks to PKPenguin321 for the menu backbone work](https://github.com/ninjamuffin99/Funkin/pull/288)) ### Changed +- Made it so you lose sliiiightly more health when you miss a note. - Removed the default HaxeFlixel pause screen when the game window loses focus, can get screenshots of the game easier hehehe ### Fixed - Idle animation bug with BF christmas and BF hair blow sprites ([Thanks to Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/237)) diff --git a/art/flashFiles/Pixel_BG_Girls.fla b/art/flashFiles/Pixel_BG_Girls.fla index 2f55aef1d..c831d37ed 100644 Binary files a/art/flashFiles/Pixel_BG_Girls.fla and b/art/flashFiles/Pixel_BG_Girls.fla differ diff --git a/art/flashFiles/Senpai_Assets.fla b/art/flashFiles/Senpai_Assets.fla index fd6a326aa..37ac5f7ed 100644 Binary files a/art/flashFiles/Senpai_Assets.fla and b/art/flashFiles/Senpai_Assets.fla differ diff --git a/art/flashFiles/Text_Boxes.fla b/art/flashFiles/Text_Boxes.fla new file mode 100644 index 000000000..f91e59363 Binary files /dev/null and b/art/flashFiles/Text_Boxes.fla differ diff --git a/assets/images/iconGrid.png b/assets/images/iconGrid.png index acdd61961..9d3b1c059 100644 Binary files a/assets/images/iconGrid.png and b/assets/images/iconGrid.png differ diff --git a/assets/images/weeb/bfPortrait.png b/assets/images/weeb/bfPortrait.png new file mode 100644 index 000000000..bad882a4d Binary files /dev/null and b/assets/images/weeb/bfPortrait.png differ diff --git a/assets/images/weeb/bfPortrait.xml b/assets/images/weeb/bfPortrait.xml new file mode 100644 index 000000000..503e912b8 --- /dev/null +++ b/assets/images/weeb/bfPortrait.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/assets/images/weeb/senpaiPortrait.png b/assets/images/weeb/senpaiPortrait.png new file mode 100644 index 000000000..fb9929027 Binary files /dev/null and b/assets/images/weeb/senpaiPortrait.png differ diff --git a/assets/images/weeb/senpaiPortrait.xml b/assets/images/weeb/senpaiPortrait.xml new file mode 100644 index 000000000..632d37de6 --- /dev/null +++ b/assets/images/weeb/senpaiPortrait.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/source/HealthIcon.hx b/source/HealthIcon.hx index 14fc69ee7..c6f0f5da2 100644 --- a/source/HealthIcon.hx +++ b/source/HealthIcon.hx @@ -13,7 +13,7 @@ class HealthIcon extends FlxSprite animation.add('bf', [0, 1], 0, false, isPlayer); animation.add('bf-car', [0, 1], 0, false, isPlayer); animation.add('bf-christmas', [0, 1], 0, false, isPlayer); - animation.add('bf-pixel', [0, 1], 0, false, isPlayer); + animation.add('bf-pixel', [21, 21], 0, false, isPlayer); animation.add('spooky', [2, 3], 0, false, isPlayer); animation.add('pico', [4, 5], 0, false, isPlayer); animation.add('mom', [6, 7], 0, false, isPlayer); @@ -21,7 +21,7 @@ class HealthIcon extends FlxSprite animation.add('tankman', [8, 9], 0, false, isPlayer); animation.add('face', [10, 11], 0, false, isPlayer); animation.add('dad', [12, 13], 0, false, isPlayer); - animation.add('senpai', [12, 13], 0, false, isPlayer); + animation.add('senpai', [22, 22], 0, false, isPlayer); animation.add('bf-old', [14, 15], 0, false, isPlayer); animation.add('gf', [16], 0, false, isPlayer); animation.add('parents-christmas', [17], 0, false, isPlayer); diff --git a/source/PlayState.hx b/source/PlayState.hx index 3c3f1df7a..6a336ec9c 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1352,7 +1352,7 @@ class PlayState extends MusicBeatState { if (daNote.tooLate || !daNote.wasGoodHit) { - health -= 0.045; + health -= 0.0475; vocals.volume = 0; } @@ -1797,7 +1797,7 @@ class PlayState extends MusicBeatState { if (!boyfriend.stunned) { - health -= 0.035; + health -= 0.04; if (combo > 5) { gf.playAnim('sad');