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

Merge pull request #1296 from Spel0/a-lot-of-stuff

Browse Source 
Fixes and New Features
This commit is contained in:
Kade M 2021-07-13 18:19:11 -07:00 committed by GitHub
commit c5cb07a830
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/Character.hx
View File

@ -407,7 +407,7 @@ class Character extends FlxSprite
public function loadOffsetFile(character:String)
{
var offset:Array<String> = CoolUtil.coolTextFile(Paths.txt('images/characters/' + character + "Offsets"));
var offset:Array<String> = CoolUtil.coolTextFile(Paths.txt('images/characters/' + character + "Offsets", 'shared'));
for (i in 0...offset.length)
{
@ -452,13 +452,13 @@ class Character extends FlxSprite
/**
* FOR GF DANCING SHIT
*/
public function dance()
public function dance(forced:Bool = false)
{
if (!debugMode)
{
switch (curCharacter)
{
case 'gf':
case 'gf' | 'gf-christmas' | 'gf-car' | 'gf-pixel':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
@ -468,39 +468,6 @@ class Character extends FlxSprite
else
playAnim('danceLeft');
}
case 'gf-christmas':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'gf-car':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'gf-pixel':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
}
case 'spooky':
danced = !danced;
@ -509,7 +476,7 @@ class Character extends FlxSprite
else
playAnim('danceLeft');
default:
playAnim('idle');
playAnim('idle', forced);
}
}
}

7
source/GameplayCustomizeState.hx
View File

@ -52,7 +52,7 @@ class GameplayCustomizeState extends MusicBeatState
curt = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains','shared'));
front = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront','shared'));
Conductor.changeBPM(102);
//Conductor.changeBPM(102);
persistentUpdate = true;
super.create();
@ -193,8 +193,9 @@ class GameplayCustomizeState extends MusicBeatState
{
super.beatHit();
bf.playAnim('idle');
dad.dance();
bf.playAnim('idle', true);
dad.dance(true);
gf.dance();
FlxG.camera.zoom += 0.015;
camHUD.zoom += 0.010;

6
source/Paths.hx
View File

@ -53,7 +53,7 @@ class Paths
return 'assets/$file';
}
inline static public function file(file:String, type:AssetType = TEXT, ?library:String)
inline static public function file(file:String, ?library:String, type:AssetType = TEXT)
{
return getPath(file, type, library);
}
@ -142,7 +142,7 @@ class Paths
return null;
#end
else
return FlxAtlasFrames.fromSparrow(image('characters/$key'), file('images/characters/$key.xml'));
return FlxAtlasFrames.fromSparrow(image('characters/$key', library), file('images/characters/$key.xml', library));
return FlxAtlasFrames.fromSparrow(image(key, library), file('images/$key.xml', library));
}
@ -169,7 +169,7 @@ class Paths
return null;
#end
else
return FlxAtlasFrames.fromSpriteSheetPacker(image('characters/$key'), file('images/characters/$key.txt'));
return FlxAtlasFrames.fromSpriteSheetPacker(image('characters/$key'), file('images/characters/$key.txt', library));
return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library), file('images/$key.txt', library));
}
}

11
source/PlayState.hx
View File

@ -171,6 +171,8 @@ class PlayState extends MusicBeatState
var notesHitArray:Array<Date> = [];
var currentFrames:Int = 0;
var idleToBeat:Bool = true; // change if bf and dad would idle to the beat of the song
var idleBeat:Int = 1; // how frequently bf and dad would play their idle animation(1 - every beat, 2 - every 2 beats and so on)
public var dialogue:Array<String> = ['dad:blah blah blah', 'bf:coolswag'];
@ -4173,8 +4175,9 @@ class PlayState extends MusicBeatState
// Conductor.changeBPM(SONG.bpm);
// Dad doesnt interupt his own notes
if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && dad.curCharacter != 'gf')
dad.dance();
if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
if (curBeat % idleBeat == 0)
dad.dance(idleToBeat);
}
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet);
@ -4206,9 +4209,9 @@ class PlayState extends MusicBeatState
gf.dance();
}
if (!boyfriend.animation.curAnim.name.startsWith("sing"))
if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0)
{
boyfriend.playAnim('idle');
boyfriend.playAnim('idle', idleToBeat);
}
/*if (!dad.animation.curAnim.name.startsWith("sing"))

1
source/TitleState.hx
View File

@ -275,6 +275,7 @@ class TitleState extends MusicBeatState
// FlxG.sound.music.stop();
MainMenuState.firstStart = true;
MainMenuState.finishedFunnyMove = false;
new FlxTimer().start(2, function(tmr:FlxTimer)
{