update to master 11/11/20

This commit is contained in:
Brandon
2020-11-11 05:00:13 -05:00
parent 926f7dd6ff
commit c742c89601
9 changed files with 68 additions and 8 deletions

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>>();
@ -52,6 +56,7 @@ class Character extends FlxSprite
addOffset('scared');
playAnim('danceRight');
case 'dad':
// DAD ANIMATION LOADING CODE
tex = FlxAtlasFrames.fromSparrow(AssetPaths.DADDY_DEAREST__png, AssetPaths.DADDY_DEAREST__xml);
@ -120,6 +125,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;
/**