Revert "Revert "lots of stuff""

This reverts commit 3d01f74c10.
This commit is contained in:
Spel0
2021-07-14 05:45:28 +03:00
parent 69dd73a898
commit 3184e0bacb
5 changed files with 19 additions and 48 deletions

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