fixed the dad bullshit

This commit is contained in:
Cameron Taylor 2020-10-04 15:27:49 -07:00
parent dbbd0c2851
commit de17188ae4
7 changed files with 166 additions and 175 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 792 KiB

View File

@ -2,128 +2,21 @@
<TextureAtlas imagePath="DADDY_DEAREST.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Dad Sing Note DOWN0000" x="1369" y="0" width="470" height="730" frameX="0" frameY="-5" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0001" x="1369" y="0" width="470" height="730" frameX="0" frameY="-5" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0002" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0003" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0004" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0005" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0006" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0007" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0008" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0009" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0010" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0011" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0012" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0013" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0014" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note DOWN0015" x="1839" y="0" width="463" height="735" frameX="-3" frameY="0" frameWidth="470" frameHeight="735"/>
<SubTexture name="Dad Sing Note LEFT0000" x="0" y="0" width="465" height="792" frameX="0" frameY="-1" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0001" x="0" y="0" width="465" height="792" frameX="0" frameY="-1" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0002" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0003" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0004" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0005" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0006" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0007" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0008" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0009" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0010" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0011" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0012" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0013" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0014" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0015" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0016" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0017" x="917" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing Note LEFT0018" x="465" y="0" width="452" height="793" frameX="0" frameY="0" frameWidth="465" frameHeight="793"/>
<SubTexture name="Dad Sing note UP0000" x="2302" y="0" width="408" height="818" frameX="-1" frameY="0" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0001" x="2302" y="0" width="408" height="818" frameX="-1" frameY="0" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0002" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0003" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0004" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0005" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0006" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0007" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0008" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0009" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0010" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0011" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0012" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0013" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0014" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0015" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0016" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0017" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0018" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0019" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0020" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0021" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0022" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0023" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0024" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0025" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0026" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0027" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0028" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0029" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0030" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0031" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0032" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0033" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0034" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0035" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0036" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0037" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0038" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0039" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0040" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0041" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0042" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0043" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0044" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0045" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0046" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0047" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0048" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0049" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0050" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0051" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0052" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0053" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0054" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0055" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0056" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0057" x="3118" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0058" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad Sing note UP0059" x="2710" y="0" width="408" height="809" frameX="0" frameY="-8" frameWidth="409" frameHeight="818"/>
<SubTexture name="Dad idle dance0000" x="1369" y="730" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0001" x="1369" y="730" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0002" x="3526" y="0" width="429" height="759" frameX="0" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0003" x="3526" y="0" width="429" height="759" frameX="0" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0004" x="0" y="792" width="424" height="757" frameX="-2" frameY="-10" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0005" x="0" y="792" width="424" height="757" frameX="-2" frameY="-10" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0006" x="3526" y="759" width="423" height="759" frameX="-3" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0007" x="3526" y="759" width="423" height="759" frameX="-3" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0008" x="424" y="793" width="419" height="766" frameX="-5" frameY="-1" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0009" x="424" y="793" width="419" height="766" frameX="-5" frameY="-1" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0010" x="1788" y="735" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0011" x="1788" y="735" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0012" x="1369" y="730" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="dad sing note right0000" x="3093" y="809" width="371" height="777" frameX="0" frameY="0" frameWidth="383" frameHeight="777"/>
<SubTexture name="dad sing note right0001" x="3093" y="809" width="371" height="777" frameX="0" frameY="0" frameWidth="383" frameHeight="777"/>
<SubTexture name="dad sing note right0002" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0003" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0004" x="2710" y="809" width="383" height="777"/>
<SubTexture name="dad sing note right0005" x="2710" y="809" width="383" height="777"/>
<SubTexture name="dad sing note right0006" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0007" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0008" x="2710" y="809" width="383" height="777"/>
<SubTexture name="dad sing note right0009" x="2710" y="809" width="383" height="777"/>
<SubTexture name="dad sing note right0010" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0011" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0012" x="2710" y="809" width="383" height="777"/>
<SubTexture name="dad sing note right0013" x="2710" y="809" width="383" height="777"/>
<SubTexture name="dad sing note right0014" x="843" y="793" width="383" height="777"/>
<SubTexture name="dad sing note right0015" x="843" y="793" width="383" height="777"/>
<SubTexture name="Dad Sing Note DOWN0000" x="0" y="792" width="470" height="730"/>
<SubTexture name="Dad Sing Note LEFT0000" x="424" y="3055" width="370" height="777"/>
<SubTexture name="Dad Sing Note RIGHT0000" x="0" y="0" width="465" height="792"/>
<SubTexture name="Dad Sing Note UP0000" x="0" y="1522" width="408" height="818"/>
<SubTexture name="Dad idle dance0000" x="0" y="2340" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0001" x="0" y="2340" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0002" x="465" y="0" width="429" height="759" frameX="0" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0003" x="465" y="0" width="429" height="759" frameX="0" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0004" x="0" y="3107" width="424" height="757" frameX="-2" frameY="-10" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0005" x="0" y="3107" width="424" height="757" frameX="-2" frameY="-10" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0006" x="470" y="759" width="423" height="759" frameX="-3" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0007" x="470" y="759" width="423" height="759" frameX="-3" frameY="-8" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0008" x="419" y="2289" width="419" height="766" frameX="-5" frameY="-1" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0009" x="419" y="2289" width="419" height="766" frameX="-5" frameY="-1" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0010" x="408" y="1522" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0011" x="408" y="1522" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
<SubTexture name="Dad idle dance0012" x="0" y="2340" width="419" height="767" frameX="-6" frameY="0" frameWidth="429" frameHeight="767"/>
</TextureAtlas>

View File

@ -4,16 +4,11 @@ import flixel.FlxG;
import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
class Boyfriend extends FlxSprite
class Boyfriend extends Character
{
public var animOffsets:Map<String, Array<Dynamic>>;
public var debugMode:Bool = false;
public function new(x:Float, y:Float)
{
super(x, y);
animOffsets = new Map<String, Array<Dynamic>>();
var tex = FlxAtlasFrames.fromSparrow(AssetPaths.BOYFRIEND__png, AssetPaths.BOYFRIEND__xml);
frames = tex;
@ -37,20 +32,4 @@ class Boyfriend extends FlxSprite
{
super.update(elapsed);
}
public function playAnim(AnimName:String, Force:Bool = false, Reversed:Bool = false, Frame:Int = 0):Void
{
animation.play(AnimName, Force, Reversed, Frame);
var daOffset = animOffsets.get(animation.curAnim.name);
if (animOffsets.exists(animation.curAnim.name))
{
offset.set(daOffset[0], daOffset[1]);
}
}
public function addOffset(name:String, x:Float = 0, y:Float = 0)
{
animOffsets[name] = [x, y];
}
}

31
source/Character.hx Normal file
View File

@ -0,0 +1,31 @@
package;
import flixel.FlxSprite;
class Character extends FlxSprite
{
public var animOffsets:Map<String, Array<Dynamic>>;
public var debugMode:Bool = false;
public function new(x:Float, y:Float)
{
animOffsets = new Map<String, Array<Dynamic>>();
super(x, y);
}
public function playAnim(AnimName:String, Force:Bool = false, Reversed:Bool = false, Frame:Int = 0):Void
{
animation.play(AnimName, Force, Reversed, Frame);
var daOffset = animOffsets.get(animation.curAnim.name);
if (animOffsets.exists(animation.curAnim.name))
{
offset.set(daOffset[0], daOffset[1]);
}
}
public function addOffset(name:String, x:Float = 0, y:Float = 0)
{
animOffsets[name] = [x, y];
}
}

View File

@ -1,6 +1,7 @@
package;
import flixel.FlxG;
import flixel.FlxObject;
import flixel.FlxSprite;
import flixel.FlxState;
import flixel.addons.display.FlxGridOverlay;
@ -13,42 +14,75 @@ import flixel.text.FlxText;
class Charting extends FlxState
{
var bf:Boyfriend;
var dad:Dad;
var char:Character;
var textAnim:FlxText;
var dumbTexts:FlxTypedGroup<FlxText>;
var animList:Array<String> = [];
var curAnim:Int = 0;
var isDad:Bool = false;
var camFollow:FlxObject;
public function new(isDad:Bool = false)
{
super();
this.isDad = isDad;
}
override function create()
{
FlxG.sound.music.stop();
var gridBG:FlxSprite = FlxGridOverlay.create(4, 4);
var gridBG:FlxSprite = FlxGridOverlay.create(10, 10);
gridBG.scrollFactor.set(0.5, 0.5);
add(gridBG);
bf = new Boyfriend(0, 0);
bf.screenCenter();
bf.debugMode = true;
add(bf);
if (isDad)
{
dad = new Dad(0, 0);
dad.screenCenter();
dad.debugMode = true;
add(dad);
char = dad;
}
else
{
bf = new Boyfriend(0, 0);
bf.screenCenter();
bf.debugMode = true;
add(bf);
char = bf;
}
dumbTexts = new FlxTypedGroup<FlxText>();
add(dumbTexts);
textAnim = new FlxText();
textAnim = new FlxText(300, 16);
textAnim.size = 26;
textAnim.scrollFactor.set();
add(textAnim);
genBoyOffsets();
camFollow = new FlxObject(0, 0, 2, 2);
camFollow.screenCenter();
add(camFollow);
FlxG.camera.follow(camFollow);
super.create();
}
function genBoyOffsets(pushList:Bool = true):Void
{
var daLoop:Int = 0;
for (anim => offsets in bf.animOffsets)
for (anim => offsets in char.animOffsets)
{
var text:FlxText = new FlxText(10, 20 + (18 * daLoop), 0, anim + ": " + offsets, 15);
text.scrollFactor.set();
dumbTexts.add(text);
if (pushList)
@ -69,8 +103,33 @@ class Charting extends FlxState
override function update(elapsed:Float)
{
textAnim.setPosition(bf.x, bf.y - 60);
textAnim.text = bf.animation.curAnim.name;
textAnim.text = char.animation.curAnim.name;
if (FlxG.keys.justPressed.E)
FlxG.camera.zoom += 0.25;
if (FlxG.keys.justPressed.Q)
FlxG.camera.zoom -= 0.25;
if (FlxG.keys.pressed.I || FlxG.keys.pressed.J || FlxG.keys.pressed.K || FlxG.keys.pressed.L)
{
if (FlxG.keys.pressed.I)
camFollow.velocity.y = -90;
else if (FlxG.keys.pressed.K)
camFollow.velocity.y = 90;
else
camFollow.velocity.y = 0;
if (FlxG.keys.pressed.J)
camFollow.velocity.x = -90;
else if (FlxG.keys.pressed.L)
camFollow.velocity.x = 90;
else
camFollow.velocity.x = 0;
}
else
{
camFollow.velocity.set();
}
if (FlxG.keys.justPressed.W)
{
@ -90,7 +149,10 @@ class Charting extends FlxState
if (FlxG.keys.justPressed.S || FlxG.keys.justPressed.W || FlxG.keys.justPressed.SPACE)
{
bf.animation.play(animList[curAnim]);
char.playAnim(animList[curAnim]);
updateTexts();
genBoyOffsets(false);
}
var upP = FlxG.keys.anyJustPressed([UP]);
@ -98,20 +160,26 @@ class Charting extends FlxState
var downP = FlxG.keys.anyJustPressed([DOWN]);
var leftP = FlxG.keys.anyJustPressed([LEFT]);
var holdShift = FlxG.keys.pressed.SHIFT;
var multiplier = 1;
if (holdShift)
multiplier = 10;
if (upP || rightP || downP || leftP)
{
updateTexts();
if (upP)
bf.animOffsets.get(animList[curAnim])[1] += 1;
char.animOffsets.get(animList[curAnim])[1] += 1 * multiplier;
if (downP)
bf.animOffsets.get(animList[curAnim])[1] -= 1;
char.animOffsets.get(animList[curAnim])[1] -= 1 * multiplier;
if (leftP)
bf.animOffsets.get(animList[curAnim])[0] += 1;
char.animOffsets.get(animList[curAnim])[0] += 1 * multiplier;
if (rightP)
bf.animOffsets.get(animList[curAnim])[0] -= 1;
char.animOffsets.get(animList[curAnim])[0] -= 1 * multiplier;
updateTexts();
genBoyOffsets(false);
char.playAnim(animList[curAnim]);
}
super.update(elapsed);

25
source/Dad.hx Normal file
View File

@ -0,0 +1,25 @@
package;
import flixel.graphics.frames.FlxAtlasFrames;
class Dad extends Character
{
public function new(x:Float, y:Float)
{
super(x, y);
var dadTex = FlxAtlasFrames.fromSparrow(AssetPaths.DADDY_DEAREST__png, AssetPaths.DADDY_DEAREST__xml);
frames = dadTex;
animation.addByPrefix('idle', 'Dad idle dance', 24);
animation.addByPrefix('singUP', 'Dad Sing Note UP', 24);
animation.addByPrefix('singRIGHT', 'Dad Sing Note UP', 24);
animation.addByPrefix('singDOWN', 'Dad Sing Note DOWN', 24);
animation.addByPrefix('singLEFT', 'Dad Sing Note RIGHT', 24);
playAnim('idle');
addOffset('idle');
addOffset("singUP", -6, 50);
addOffset("singRIGHT", -6, 50);
addOffset("singLEFT", -10, 10);
addOffset("singDOWN", 0, -30);
}
}

View File

@ -33,7 +33,7 @@ class PlayState extends FlxState
private var canHitText:FlxText;
private var dad:FlxSprite;
private var dad:Dad;
private var boyfriend:Boyfriend;
private var notes:FlxTypedGroup<Note>;
@ -53,15 +53,8 @@ class PlayState extends FlxState
bg.scrollFactor.set(0.5, 0.5);
add(bg);
dad = new FlxSprite(100, 100).loadGraphic(AssetPaths.DADDY_DEAREST__png);
var dadTex = FlxAtlasFrames.fromSparrow(AssetPaths.DADDY_DEAREST__png, AssetPaths.DADDY_DEAREST__xml);
dad.frames = dadTex;
dad.animation.addByPrefix('idle', 'Dad idle dance', 24);
dad.animation.addByPrefix('singUP', 'Dad Sing note UP', 24);
dad.animation.addByPrefix('singRIGHT', 'Dad Sing note UP', 24);
dad.animation.addByPrefix('singDOWN', 'Dad Sing Note DOWN', 24);
dad.animation.addByPrefix('singLEFT', 'dad sing note right', 24);
dad.animation.play('idle');
dad = new Dad(100, 100);
add(dad);
boyfriend = new Boyfriend(770, 450);
@ -240,6 +233,8 @@ class PlayState extends FlxState
if (FlxG.keys.justPressed.NINE)
FlxG.switchState(new Charting());
if (FlxG.keys.justPressed.EIGHT)
FlxG.switchState(new Charting(true));
Conductor.songPosition = FlxG.sound.music.time;
var playerTurn:Int = totalBeats % 8;
@ -297,13 +292,13 @@ class PlayState extends FlxState
switch (Math.abs(daNote.noteData))
{
case 1:
dad.animation.play('singUP');
dad.playAnim('singUP');
case 2:
dad.animation.play('singRIGHT');
dad.playAnim('singRIGHT');
case 3:
dad.animation.play('singDOWN');
dad.playAnim('singDOWN');
case 4:
dad.animation.play('singLEFT');
dad.playAnim('singLEFT');
}
daNote.kill();