From 3d01f74c108a2c326aa1c511fb2e533c9081ce4a Mon Sep 17 00:00:00 2001
From: Spel0 <75626813+Spel0@users.noreply.github.com>
Date: Tue, 13 Jul 2021 13:50:51 +0300
Subject: [PATCH] Revert "lots of stuff"
This reverts commit 00687fb1b6fc307008d3218d1b32f1807523ffba.
---
Project.xml | 2 +-
source/Character.hx | 41 ++++++++++++++++++++++++++++----
source/GameplayCustomizeState.hx | 7 +++---
source/Paths.hx | 6 ++---
source/PlayState.hx | 11 ++++-----
source/TitleState.hx | 1 -
6 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/Project.xml b/Project.xml
index eeffad6..9516b71 100644
--- a/Project.xml
+++ b/Project.xml
@@ -123,7 +123,7 @@
-
+
diff --git a/source/Character.hx b/source/Character.hx
index b9bc7f8..e4c64ae 100644
--- a/source/Character.hx
+++ b/source/Character.hx
@@ -407,7 +407,7 @@ class Character extends FlxSprite
public function loadOffsetFile(character:String)
{
- var offset:Array = CoolUtil.coolTextFile(Paths.txt('images/characters/' + character + "Offsets", 'shared'));
+ var offset:Array = CoolUtil.coolTextFile(Paths.txt('images/characters/' + character + "Offsets"));
for (i in 0...offset.length)
{
@@ -452,13 +452,13 @@ class Character extends FlxSprite
/**
* FOR GF DANCING SHIT
*/
- public function dance(forced:Bool = false)
+ public function dance()
{
if (!debugMode)
{
switch (curCharacter)
{
- case 'gf' | 'gf-christmas' | 'gf-car' | 'gf-pixel':
+ case 'gf':
if (!animation.curAnim.name.startsWith('hair'))
{
danced = !danced;
@@ -468,6 +468,39 @@ 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;
@@ -476,7 +509,7 @@ class Character extends FlxSprite
else
playAnim('danceLeft');
default:
- playAnim('idle', forced);
+ playAnim('idle');
}
}
}
diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx
index 56e00f4..2748e85 100644
--- a/source/GameplayCustomizeState.hx
+++ b/source/GameplayCustomizeState.hx
@@ -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,9 +193,8 @@ class GameplayCustomizeState extends MusicBeatState
{
super.beatHit();
- bf.playAnim('idle', true);
- dad.dance(true);
- gf.dance();
+ bf.playAnim('idle');
+ dad.dance();
FlxG.camera.zoom += 0.015;
camHUD.zoom += 0.010;
diff --git a/source/Paths.hx b/source/Paths.hx
index 69adc31..5d7b07a 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -53,7 +53,7 @@ class Paths
return 'assets/$file';
}
- inline static public function file(file:String, ?library:String, type:AssetType = TEXT)
+ inline static public function file(file:String, type:AssetType = TEXT, ?library:String)
{
return getPath(file, type, library);
}
@@ -142,7 +142,7 @@ class Paths
return null;
#end
else
- return FlxAtlasFrames.fromSparrow(image('characters/$key', library), file('images/characters/$key.xml', library));
+ return FlxAtlasFrames.fromSparrow(image('characters/$key'), file('images/characters/$key.xml'));
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', library));
+ return FlxAtlasFrames.fromSpriteSheetPacker(image('characters/$key'), file('images/characters/$key.txt'));
return FlxAtlasFrames.fromSpriteSheetPacker(image(key, library), file('images/$key.txt', library));
}
}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 544da27..969568b 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -171,8 +171,6 @@ class PlayState extends MusicBeatState
var notesHitArray:Array = [];
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 = ['dad:blah blah blah', 'bf:coolswag'];
@@ -4175,9 +4173,8 @@ class PlayState extends MusicBeatState
// Conductor.changeBPM(SONG.bpm);
// Dad doesnt interupt his own notes
- if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
- if (curBeat % idleBeat == 0)
- dad.dance(idleToBeat);
+ if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && dad.curCharacter != 'gf')
+ dad.dance();
}
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet);
@@ -4209,9 +4206,9 @@ class PlayState extends MusicBeatState
gf.dance();
}
- if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0)
+ if (!boyfriend.animation.curAnim.name.startsWith("sing"))
{
- boyfriend.playAnim('idle', idleToBeat);
+ boyfriend.playAnim('idle');
}
/*if (!dad.animation.curAnim.name.startsWith("sing"))
diff --git a/source/TitleState.hx b/source/TitleState.hx
index 4df0552..13c4660 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -275,7 +275,6 @@ class TitleState extends MusicBeatState
// FlxG.sound.music.stop();
MainMenuState.firstStart = true;
- MainMenuState.finishedFunnyMove = false;
new FlxTimer().start(2, function(tmr:FlxTimer)
{