Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/poec987/FNF-V3
Browse files Browse the repository at this point in the history
  • Loading branch information
@poec987
poec987 committed Jun 28, 2024
2 parents 6537da9 + 6041e75 commit 274d5b0
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 107 deletions.
Binary file modified assets/shared/images/characters/spooky_kids_assets.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 40 additions & 90 deletions assets/shared/images/characters/spooky_kids_assets.xml
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="spooky_kids_assets.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="note sing left0000" x="0" y="0" width="556" height="527" frameX="0" frameY="-2" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0001" x="0" y="0" width="556" height="527" frameX="0" frameY="-2" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0002" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0003" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0004" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0005" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0006" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0007" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0008" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0009" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0010" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0011" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0012" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0013" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="note sing left0014" x="566" y="0" width="559" height="531" frameX="-5" frameY="0" frameWidth="564" frameHeight="531"/>
<SubTexture name="spooky DOWN note0000" x="1135" y="0" width="463" height="408" frameX="0" frameY="-4" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0001" x="1135" y="0" width="463" height="408" frameX="0" frameY="-4" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0002" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0003" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0004" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0005" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0006" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0007" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0008" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0009" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0010" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0011" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0012" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0013" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0014" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0015" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0016" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0017" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0018" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0019" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0020" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0021" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0022" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0023" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky DOWN note0024" x="1608" y="0" width="448" height="409" frameX="-8" frameY="0" frameWidth="463" frameHeight="412"/>
<SubTexture name="spooky UP NOTE0000" x="2066" y="0" width="399" height="571" frameX="-1" frameY="0" frameWidth="406" frameHeight="571"/>
<SubTexture name="spooky UP NOTE0001" x="2066" y="0" width="399" height="571" frameX="-1" frameY="0" frameWidth="406" frameHeight="571"/>
<SubTexture name="spooky UP NOTE0002" x="2475" y="0" width="406" height="566" frameX="0" frameY="-5" frameWidth="406" frameHeight="571"/>
<SubTexture name="spooky UP NOTE0003" x="2475" y="0" width="406" height="566" frameX="0" frameY="-5" frameWidth="406" frameHeight="571"/>
<SubTexture name="spooky UP NOTE0004" x="2475" y="0" width="406" height="566" frameX="0" frameY="-5" frameWidth="406" frameHeight="571"/>
<SubTexture name="spooky dance idle0000" x="2891" y="0" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0001" x="2891" y="0" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0002" x="3282" y="0" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0003" x="3282" y="0" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0004" x="3671" y="0" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0005" x="3671" y="0" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0006" x="0" y="581" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0007" x="0" y="581" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0008" x="364" y="581" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0009" x="364" y="581" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0010" x="866" y="581" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0011" x="866" y="581" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0012" x="3671" y="0" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0013" x="3671" y="0" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0014" x="0" y="581" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky dance idle0015" x="0" y="581" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
<SubTexture name="spooky sing right0000" x="1357" y="581" width="442" height="524" frameX="0" frameY="-9" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0001" x="1357" y="581" width="442" height="524" frameX="0" frameY="-9" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0002" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0003" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0004" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0005" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0006" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0007" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0008" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0009" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0010" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0011" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0012" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0013" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0014" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0015" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0016" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0017" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0018" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0019" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0020" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0021" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0022" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0023" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<SubTexture name="spooky sing right0024" x="1809" y="581" width="437" height="533" frameX="0" frameY="0" frameWidth="442" frameHeight="533"/>
<?xml version='1.0' encoding='utf-8'?>
<TextureAtlas imagePath="spooky_kids_assets.png"><SubTexture name="spooky dance idle0000" x="0" y="573" width="505" height="538" frameX="-45" frameY="-35" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky dance idle0001" x="1247" y="515" width="367" height="474" frameX="-101" frameY="-84" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky dance idle0002" x="505" y="573" width="505" height="538" frameX="-61" frameY="-35" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky LEFT note0000" x="539" y="1111" width="545" height="489" frameX="0" frameY="-89" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky LEFT note0001" x="539" y="1111" width="545" height="489" frameX="0" frameY="-89" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky LEFT note0002" x="539" y="1111" width="545" height="489" frameX="0" frameY="-89" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky LEFT note0003" x="0" y="1618" width="531" height="413" frameX="0" frameY="-167" frameWidth="611" frameHeight="602" />
<SubTexture name="spooky LEFT note0004" x="0" y="1618" width="531" height="413" frameX="0" frameY="-167" frameWidth="611" frameHeight="602" />
<SubTexture name="spooky LEFT note0005" x="0" y="1618" width="531" height="413" frameX="0" frameY="-167" frameWidth="611" frameHeight="602" />
<SubTexture name="spooky LEFT note0006" x="1762" y="0" width="526" height="467" frameX="0" frameY="-109" frameWidth="611" frameHeight="602" />
<SubTexture name="spooky LEFT note0007" x="1762" y="0" width="526" height="467" frameX="0" frameY="-109" frameWidth="611" frameHeight="602" />
<SubTexture name="spooky LEFT note0008" x="1762" y="0" width="526" height="467" frameX="0" frameY="-109" frameWidth="611" frameHeight="602" />
<SubTexture name="spooky DOWN note0000" x="1762" y="467" width="406" height="397" frameX="-87" frameY="-169" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0001" x="1762" y="467" width="406" height="397" frameX="-87" frameY="-169" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0002" x="1762" y="467" width="406" height="397" frameX="-87" frameY="-169" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0003" x="1762" y="1248" width="445" height="350" frameX="-76" frameY="-226" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0004" x="1762" y="1248" width="445" height="350" frameX="-76" frameY="-226" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0005" x="1762" y="1248" width="445" height="350" frameX="-76" frameY="-226" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0006" x="1762" y="864" width="431" height="384" frameX="-73" frameY="-198" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0007" x="1762" y="864" width="431" height="384" frameX="-73" frameY="-198" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky DOWN note0008" x="1762" y="864" width="431" height="384" frameX="-73" frameY="-198" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0000" x="409" y="0" width="394" height="562" frameX="-85" frameY="-8" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0001" x="409" y="0" width="394" height="562" frameX="-85" frameY="-8" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0002" x="409" y="0" width="394" height="562" frameX="-85" frameY="-8" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0003" x="0" y="0" width="409" height="573" frameX="-82" frameY="0" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0004" x="0" y="0" width="409" height="573" frameX="-82" frameY="0" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0005" x="0" y="0" width="409" height="573" frameX="-82" frameY="0" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0006" x="803" y="0" width="444" height="560" frameX="-97" frameY="0" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0007" x="803" y="0" width="444" height="560" frameX="-97" frameY="0" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky UP NOTE0008" x="803" y="0" width="444" height="560" frameX="-97" frameY="0" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0000" x="0" y="1111" width="539" height="507" frameX="-61" frameY="-71" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0001" x="0" y="1111" width="539" height="507" frameX="-61" frameY="-71" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0002" x="0" y="1111" width="539" height="507" frameX="-61" frameY="-71" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0003" x="1084" y="1111" width="510" height="469" frameX="-101" frameY="-114" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0004" x="1084" y="1111" width="510" height="469" frameX="-101" frameY="-114" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0005" x="1084" y="1111" width="510" height="469" frameX="-101" frameY="-114" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0006" x="1247" y="0" width="515" height="515" frameX="-96" frameY="-73" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0007" x="1247" y="0" width="515" height="515" frameX="-96" frameY="-73" frameWidth="611" frameHeight="607" />
<SubTexture name="spooky sing right0008" x="1247" y="0" width="515" height="515" frameX="-96" frameY="-73" frameWidth="611" frameHeight="607" />
</TextureAtlas>
24 changes: 7 additions & 17 deletions source/Character.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,22 +163,20 @@ class Character extends FlxSprite
case 'spooky':
tex = Paths.getSparrowAtlas('characters/spooky_kids_assets');
frames = tex;
animation.addByPrefix('singUP', 'spooky UP NOTE', 24, false);
animation.addByPrefix('singDOWN', 'spooky DOWN note', 24, false);
animation.addByPrefix('singLEFT', 'note sing left', 24, false);
animation.addByPrefix('singRIGHT', 'spooky sing right', 24, false);
animation.addByIndices('danceLeft', 'spooky dance idle', [0, 2, 6], "", 12, false);
animation.addByIndices('danceRight', 'spooky dance idle', [8, 10, 12, 14], "", 12, false);
animation.addByPrefix('singUP', 'spooky UP NOTE', 30, false);
animation.addByPrefix('singDOWN', 'spooky DOWN note', 30, false);
animation.addByPrefix('singLEFT', 'spooky LEFT note', 30, false);
animation.addByPrefix('singRIGHT', 'spooky sing right', 30, false);
animation.addByPrefix('idle', 'spooky dance idle', 30, true);

addOffset('danceLeft');
addOffset('danceRight');
addOffset('idle');

addOffset("singUP", -20, 26);
addOffset("singRIGHT", -130, -14);
addOffset("singLEFT", 130, -10);
addOffset("singDOWN", -50, -130);

playAnim('danceRight');
playAnim('idle');
case 'mom':
tex = Paths.getSparrowAtlas('characters/Mom_Assets');
frames = tex;
Expand Down Expand Up @@ -689,14 +687,6 @@ class Character extends FlxSprite
else
playAnim('danceLeft');
}

case 'spooky':
danced = !danced;

if (danced)
playAnim('danceRight');
else
playAnim('danceLeft');
default:
playAnim('idle');
}
Expand Down

0 comments on commit 274d5b0

Please sign in to comment.