mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-28 21:19:27 +00:00
call me senpai
This commit is contained in:
parent
e36fde2160
commit
e4b90928ba
|
@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
### Added
|
### Added
|
||||||
- Rebindable controls ([Thanks to PKPenguin321 for the menu backbone work](https://github.com/ninjamuffin99/Funkin/pull/288))
|
- Rebindable controls ([Thanks to PKPenguin321 for the menu backbone work](https://github.com/ninjamuffin99/Funkin/pull/288))
|
||||||
### Changed
|
### 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
|
- Removed the default HaxeFlixel pause screen when the game window loses focus, can get screenshots of the game easier hehehe
|
||||||
### Fixed
|
### 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))
|
- 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))
|
||||||
|
|
Binary file not shown.
Binary file not shown.
BIN
art/flashFiles/Text_Boxes.fla
Normal file
BIN
art/flashFiles/Text_Boxes.fla
Normal file
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 142 KiB After Width: | Height: | Size: 144 KiB |
BIN
assets/images/weeb/bfPortrait.png
Normal file
BIN
assets/images/weeb/bfPortrait.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.5 KiB |
14
assets/images/weeb/bfPortrait.xml
Normal file
14
assets/images/weeb/bfPortrait.xml
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<TextureAtlas imagePath="bfPortrait.png">
|
||||||
|
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||||
|
<!-- http://www.adobe.com/products/animate.html -->
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10000" x="0" y="0" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10001" x="259" y="0" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10002" x="259" y="0" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10003" x="0" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10004" x="0" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10005" x="259" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10006" x="259" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10007" x="259" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Boyfriend portrait enter instance 10008" x="259" y="155" width="249" height="145"/>
|
||||||
|
</TextureAtlas>
|
BIN
assets/images/weeb/senpaiPortrait.png
Normal file
BIN
assets/images/weeb/senpaiPortrait.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
14
assets/images/weeb/senpaiPortrait.xml
Normal file
14
assets/images/weeb/senpaiPortrait.xml
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<TextureAtlas imagePath="senpaiPortrait.png">
|
||||||
|
<!-- Created with Adobe Animate version 20.0.0.17400 -->
|
||||||
|
<!-- http://www.adobe.com/products/animate.html -->
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10000" x="0" y="0" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10001" x="259" y="0" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10002" x="259" y="0" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10003" x="0" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10004" x="0" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10005" x="259" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10006" x="259" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10007" x="259" y="155" width="249" height="145"/>
|
||||||
|
<SubTexture name="Senpai Portrait Enter instance 10008" x="259" y="155" width="249" height="145"/>
|
||||||
|
</TextureAtlas>
|
|
@ -13,7 +13,7 @@ class HealthIcon extends FlxSprite
|
||||||
animation.add('bf', [0, 1], 0, false, isPlayer);
|
animation.add('bf', [0, 1], 0, false, isPlayer);
|
||||||
animation.add('bf-car', [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-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('spooky', [2, 3], 0, false, isPlayer);
|
||||||
animation.add('pico', [4, 5], 0, false, isPlayer);
|
animation.add('pico', [4, 5], 0, false, isPlayer);
|
||||||
animation.add('mom', [6, 7], 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('tankman', [8, 9], 0, false, isPlayer);
|
||||||
animation.add('face', [10, 11], 0, false, isPlayer);
|
animation.add('face', [10, 11], 0, false, isPlayer);
|
||||||
animation.add('dad', [12, 13], 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('bf-old', [14, 15], 0, false, isPlayer);
|
||||||
animation.add('gf', [16], 0, false, isPlayer);
|
animation.add('gf', [16], 0, false, isPlayer);
|
||||||
animation.add('parents-christmas', [17], 0, false, isPlayer);
|
animation.add('parents-christmas', [17], 0, false, isPlayer);
|
||||||
|
|
|
@ -1352,7 +1352,7 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
if (daNote.tooLate || !daNote.wasGoodHit)
|
if (daNote.tooLate || !daNote.wasGoodHit)
|
||||||
{
|
{
|
||||||
health -= 0.045;
|
health -= 0.0475;
|
||||||
vocals.volume = 0;
|
vocals.volume = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1797,7 +1797,7 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
if (!boyfriend.stunned)
|
if (!boyfriend.stunned)
|
||||||
{
|
{
|
||||||
health -= 0.035;
|
health -= 0.04;
|
||||||
if (combo > 5)
|
if (combo > 5)
|
||||||
{
|
{
|
||||||
gf.playAnim('sad');
|
gf.playAnim('sad');
|
||||||
|
|
Loading…
Reference in a new issue