cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-01-23 04:58:36 +00:00
Code Issues Releases Wiki Activity

some animation touchups

Browse source
This commit is contained in:
Cameron Taylor 2020-11-10 19:09:48 -08:00
parent 33a92a0a87
commit ce2dc75839
5 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Fixed
- Cleaned up some charting on South on hard mode
- Fixed some animation timings, should feel both better to play, and watch.
## [0.2.1.2] - 2020-11-06
### Fixed

8
source/Boyfriend.hx
View file

@ -3,6 +3,7 @@ package;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.util.FlxTimer;
using StringTools;
@ -54,6 +55,13 @@ class Boyfriend extends Character
override function update(elapsed:Float)
{
if (animation.curAnim.name.startsWith('sing'))
{
holdTimer += elapsed;
}
else
holdTimer = 0;
if (animation.curAnim.name.endsWith('miss') && animation.curAnim.finished && !debugMode)
{
playAnim('idle', true, false, 10);

27
source/Character.hx
View file

@ -3,6 +3,8 @@ package;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
using StringTools;
class Character extends FlxSprite
{
public var animOffsets:Map<String, Array<Dynamic>>;
@ -11,6 +13,8 @@ class Character extends FlxSprite
public var isPlayer:Bool = false;
public var curCharacter:String = 'bf';
public var holdTimer:Float = 0;
public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false)
{
animOffsets = new Map<String, Array<Dynamic>>();
@ -106,6 +110,29 @@ class Character extends FlxSprite
}
}
override function update(elapsed:Float)
{
if (curCharacter != 'bf')
{
if (animation.curAnim.name.startsWith('sing'))
{
holdTimer += elapsed;
}
var dadVar:Float = 4;
if (curCharacter == 'dad')
dadVar = 6.1;
if (holdTimer >= Conductor.stepCrochet * dadVar * 0.001)
{
dance();
holdTimer = 0;
}
}
super.update(elapsed);
}
private var danced:Bool = false;
/**

8
source/PlayState.hx
View file

@ -783,6 +783,8 @@ class PlayState extends MusicBeatState
dad.playAnim('singLEFT', true);
}
dad.holdTimer = 0;
if (SONG.needsVoices)
vocals.volume = 1;
@ -1012,6 +1014,8 @@ class PlayState extends MusicBeatState
// FlxG.watch.addQuick('asdfa', upP);
if ((upP || rightP || downP || leftP) && !boyfriend.stunned && generatedMusic)
{
boyfriend.holdTimer = 0;
var possibleNotes:Array<Note> = [];
notes.forEachAlive(function(daNote:Note)
@ -1082,9 +1086,9 @@ class PlayState extends MusicBeatState
});
}
if (upR || leftR || rightR || downR)
if (boyfriend.holdTimer > Conductor.stepCrochet * 4 * 0.001 && !up && !down && !right && !left)
{
if (boyfriend.animation.curAnim.name.startsWith('sing'))
if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss'))
{
boyfriend.playAnim('idle');
}

2
source/TitleState.hx
View file

@ -38,7 +38,7 @@ class TitleState extends MusicBeatState
['Ritz dx', 'rest in peace'], ['rate five', 'pls no blam'], ['rhythm gaming', 'ultimate'], ['game of the year', 'forever'],
['you already know', 'we really out here'], ['rise and grind', 'love to luis'], ['like parappa', 'but cooler'],
['album of the year', 'chuckie finster'], ["free gitaroo man", "with love to wandaboy"], ['better than geometry dash', 'fight me robtop'],
['kiddbrute for president', 'vote now'], ['play dead estate', 'on newgrounds'], ['this is a god damn prototype', 'we workin on it okay'],
['kiddbrute for president', 'vote now'], ['play dead estate', 'on newgrounds'], ['this a god damn prototype', 'we workin on it okay'],
['WOMEN ARE real', 'this is official']];
var curWacky:Array<String> = [];