AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to master 11/11/20

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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);

28
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>>();
@ -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;
/**

2
source/Note.hx
View File

@ -37,6 +37,8 @@ class Note extends FlxSprite
isSustainNote = sustainNote;
x += 50;
// MAKE SURE ITS DEFINITELY OFF SCREEN?
y -= 2000;
this.strumTime = strumTime;
this.noteData = noteData;

13
source/PlayState.hx
View File

@ -30,9 +30,6 @@ import flixel.util.FlxTimer;
import haxe.Json;
import lime.utils.Assets;
//New Audio BS
//import faxe.Faxe;
using StringTools;
class PlayState extends MusicBeatState
@ -811,6 +808,8 @@ class PlayState extends MusicBeatState
dad.playAnim('singLEFT', true);
}
dad.holdTimer = 0;
if (SONG.needsVoices)
vocals.volume = 1;
@ -869,7 +868,7 @@ class PlayState extends MusicBeatState
NGio.unlockMedal(60961);
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
#end
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
FlxG.save.flush();
}
@ -1044,6 +1043,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)
@ -1114,9 +1115,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');
}

6
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'], ['Nintendo Switch', 'Pre-orders now available']];
var curWacky:Array<String> = [];
@ -106,6 +106,10 @@ class TitleState extends MusicBeatState
transIn = FlxTransitionableState.defaultTransIn;
transOut = FlxTransitionableState.defaultTransOut;
// var music:FlxSound = new FlxSound();
// music.loadStream('assets/music/freakyMenu' + TitleState.soundExt);
// FlxG.sound.list.add(music);
// music.play();
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt, 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);