cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

gf assets and offsets update

This commit is contained in:
Cameron Taylor 2020-12-11 06:45:00 -05:00
parent 487a1f1faa
commit eb017da89e
7 changed files with 215 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Made it less punishing to ATTEMPT to hit a note and miss, rather than let it pass you
### Fixed
- Song desync of you paused and unpaused frequently ([shoutouts SonicBlam](https://github.com/ninjamuffin99/Funkin/issues/37))
- Animation offsets when GF is scared
## [0.2.3] - 2020-12-04
### Added

BIN
art/GF_ass_sets.fla
View File

Binary file not shown.

2
assets/data/blammed/blammed-easy.json
View File

File diff suppressed because one or more lines are too long

BIN
assets/images/GF_assets.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 5.7 MiB

342
assets/images/GF_assets.xml
View File

@ -53,145 +53,205 @@
<SubTexture name="GF Dancing Beat0027" x="709" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat0028" x="1418" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat0029" x="1418" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Down Note0000" x="2127" y="1325" width="699" height="631" frameX="-2" frameY="-6" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0001" x="2836" y="1325" width="703" height="631" frameX="0" frameY="-6" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0002" x="3549" y="1325" width="703" height="636" frameX="0" frameY="-1" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0003" x="4262" y="1325" width="699" height="636" frameX="-2" frameY="-1" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0004" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0005" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0006" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0007" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0008" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0009" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0010" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0011" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0012" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0013" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0014" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0015" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0016" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0017" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0018" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0019" x="4971" y="1325" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF FEAR 0000" x="5680" y="1325" width="699" height="640"/>
<SubTexture name="GF FEAR 0001" x="6389" y="1325" width="699" height="640"/>
<SubTexture name="GF FEAR 0002" x="7098" y="1325" width="699" height="638" frameX="0" frameY="-2" frameWidth="699" frameHeight="640"/>
<SubTexture name="GF FEAR 0003" x="0" y="1978" width="699" height="640"/>
<SubTexture name="GF Right Note0000" x="709" y="1978" width="699" height="632" frameX="-2" frameY="-5" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0001" x="1418" y="1978" width="703" height="632" frameX="0" frameY="-5" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0002" x="2131" y="1978" width="703" height="637"/>
<SubTexture name="GF Right Note0003" x="2844" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0004" x="3553" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0005" x="4262" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0006" x="4971" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0007" x="4971" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0008" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0009" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0010" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0011" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0012" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0013" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0014" x="5680" y="1978" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Up Note0000" x="6389" y="1978" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0001" x="7098" y="1978" width="703" height="661"/>
<SubTexture name="GF Up Note0002" x="0" y="2649" width="703" height="661"/>
<SubTexture name="GF Up Note0003" x="713" y="2649" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0004" x="1422" y="2649" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0005" x="1422" y="2649" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0006" x="1422" y="2649" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF left note0000" x="2131" y="2649" width="699" height="633" frameX="-2" frameY="-5" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0001" x="2840" y="2649" width="703" height="631" frameX="0" frameY="-7" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0002" x="3553" y="2649" width="703" height="638"/>
<SubTexture name="GF left note0003" x="4266" y="2649" width="699" height="638" frameX="-2" frameY="0" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0004" x="4975" y="2649" width="699" height="638" frameX="-2" frameY="0" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0005" x="5684" y="2649" width="699" height="638" frameX="-2" frameY="0" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0006" x="6393" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0007" x="6393" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0008" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0009" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0010" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0011" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0012" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0013" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0014" x="7102" y="2649" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="gf sad0000" x="0" y="3320" width="699" height="633" frameX="0" frameY="-3" frameWidth="699" frameHeight="636"/>
<SubTexture name="gf sad0001" x="0" y="3320" width="699" height="633" frameX="0" frameY="-3" frameWidth="699" frameHeight="636"/>
<SubTexture name="gf sad0002" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0003" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0004" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0005" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0006" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0007" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0008" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0009" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0010" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0011" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0012" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0013" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0014" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0015" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0016" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0017" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0018" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0019" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0020" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0021" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0022" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0023" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0024" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0025" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0026" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0027" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0028" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0029" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0030" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0031" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0032" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0033" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0034" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0035" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0036" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0037" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0038" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0039" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0040" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0041" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0042" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0043" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0044" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0045" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0046" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0047" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0048" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0049" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0050" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0051" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0052" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0053" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0054" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0055" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0056" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0057" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0058" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0059" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0060" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0061" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0062" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0063" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0064" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0065" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0066" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0067" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0068" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0069" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0070" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0071" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0072" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0073" x="2836" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0074" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0075" x="709" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0076" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0077" x="1418" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0078" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="gf sad0079" x="2127" y="3320" width="699" height="636"/>
<SubTexture name="GF Dancing Beat Hair Landing0000" x="2127" y="1325" width="699" height="635" frameX="-2" frameY="-13" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0001" x="2836" y="1325" width="703" height="635" frameX="0" frameY="-13" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0002" x="3549" y="1325" width="703" height="619" frameX="0" frameY="-29" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0003" x="4262" y="1325" width="699" height="619" frameX="-2" frameY="-29" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0004" x="4971" y="1325" width="699" height="607" frameX="-2" frameY="-41" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0005" x="5680" y="1325" width="699" height="607" frameX="-2" frameY="-41" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0006" x="6389" y="1325" width="699" height="626" frameX="-2" frameY="-22" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0007" x="709" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0008" x="709" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0009" x="709" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0010" x="1418" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0011" x="1418" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0012" x="1418" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0013" x="2127" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0014" x="2127" y="667" width="699" height="648" frameX="-2" frameY="0" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0015" x="2836" y="667" width="699" height="636" frameX="-2" frameY="-12" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0016" x="3545" y="667" width="703" height="636" frameX="0" frameY="-12" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0017" x="4258" y="667" width="703" height="636" frameX="0" frameY="-12" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0018" x="4971" y="667" width="699" height="636" frameX="-2" frameY="-12" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0019" x="5680" y="667" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0020" x="6389" y="667" width="699" height="637" frameX="-2" frameY="-11" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0021" x="7098" y="667" width="699" height="638" frameX="-2" frameY="-10" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0022" x="0" y="1325" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0023" x="0" y="1325" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0024" x="0" y="1325" width="699" height="643" frameX="-2" frameY="-5" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0025" x="709" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0026" x="709" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0027" x="709" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0028" x="1418" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair Landing0029" x="1418" y="1325" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
<SubTexture name="GF Dancing Beat Hair blowing0000" x="7098" y="1325" width="701" height="636" frameX="-45" frameY="-13" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0001" x="0" y="1978" width="703" height="636" frameX="-45" frameY="-13" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0002" x="713" y="1978" width="748" height="628" frameX="0" frameY="-21" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0003" x="1471" y="1978" width="699" height="627" frameX="-47" frameY="-22" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0004" x="2180" y="1978" width="701" height="638" frameX="-45" frameY="-11" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0005" x="2891" y="1978" width="701" height="638" frameX="-45" frameY="-11" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0006" x="3602" y="1978" width="739" height="636" frameX="-7" frameY="-13" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0007" x="4351" y="1978" width="699" height="647" frameX="-47" frameY="-2" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0008" x="5060" y="1978" width="728" height="639" frameX="-18" frameY="-10" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0009" x="5798" y="1978" width="699" height="638" frameX="-47" frameY="-11" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0010" x="6507" y="1978" width="699" height="649" frameX="-47" frameY="0" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0011" x="6507" y="1978" width="699" height="649" frameX="-47" frameY="0" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0012" x="7216" y="1978" width="726" height="641" frameX="-20" frameY="-8" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0013" x="0" y="2637" width="699" height="648" frameX="-47" frameY="-1" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0014" x="709" y="2637" width="725" height="640" frameX="-21" frameY="-9" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0015" x="1444" y="2637" width="699" height="625" frameX="-47" frameY="-24" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0016" x="2153" y="2637" width="703" height="634" frameX="-45" frameY="-15" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0017" x="2866" y="2637" width="703" height="631" frameX="-45" frameY="-18" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0018" x="3579" y="2637" width="709" height="623" frameX="-37" frameY="-26" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0019" x="4298" y="2637" width="699" height="634" frameX="-47" frameY="-15" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0020" x="5007" y="2637" width="710" height="626" frameX="-36" frameY="-23" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0021" x="5727" y="2637" width="699" height="630" frameX="-47" frameY="-19" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0022" x="6436" y="2637" width="699" height="646" frameX="-47" frameY="-3" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0023" x="6436" y="2637" width="699" height="646" frameX="-47" frameY="-3" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0024" x="7145" y="2637" width="715" height="638" frameX="-31" frameY="-11" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0025" x="0" y="3295" width="699" height="647" frameX="-47" frameY="-2" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0026" x="709" y="3295" width="716" height="639" frameX="-30" frameY="-10" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0027" x="1435" y="3295" width="699" height="638" frameX="-47" frameY="-11" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0028" x="2144" y="3295" width="699" height="646" frameX="-47" frameY="-3" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Dancing Beat Hair blowing0029" x="2144" y="3295" width="699" height="646" frameX="-47" frameY="-3" frameWidth="748" frameHeight="649"/>
<SubTexture name="GF Down Note0000" x="2853" y="3295" width="699" height="631" frameX="-2" frameY="-6" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0001" x="3562" y="3295" width="703" height="631" frameX="0" frameY="-6" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0002" x="4275" y="3295" width="703" height="636" frameX="0" frameY="-1" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0003" x="4988" y="3295" width="699" height="636" frameX="-2" frameY="-1" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0004" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0005" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0006" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0007" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0008" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0009" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0010" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0011" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0012" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0013" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0014" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0015" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0016" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0017" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0018" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Down Note0019" x="5697" y="3295" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF FEAR 0000" x="6406" y="3295" width="699" height="640"/>
<SubTexture name="GF FEAR 0001" x="7115" y="3295" width="699" height="640"/>
<SubTexture name="GF FEAR 0002" x="0" y="3952" width="699" height="638" frameX="0" frameY="-2" frameWidth="699" frameHeight="640"/>
<SubTexture name="GF FEAR 0003" x="709" y="3952" width="699" height="640"/>
<SubTexture name="GF Right Note0000" x="1418" y="3952" width="699" height="632" frameX="-2" frameY="-5" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0001" x="2127" y="3952" width="703" height="632" frameX="0" frameY="-5" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0002" x="2840" y="3952" width="703" height="637"/>
<SubTexture name="GF Right Note0003" x="3553" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0004" x="4262" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0005" x="4971" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0006" x="5680" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0007" x="5680" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0008" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0009" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0010" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0011" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0012" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0013" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Right Note0014" x="6389" y="3952" width="699" height="637" frameX="-2" frameY="0" frameWidth="703" frameHeight="637"/>
<SubTexture name="GF Up Note0000" x="7098" y="3952" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0001" x="0" y="4623" width="703" height="661"/>
<SubTexture name="GF Up Note0002" x="713" y="4623" width="703" height="661"/>
<SubTexture name="GF Up Note0003" x="1426" y="4623" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0004" x="2135" y="4623" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0005" x="2135" y="4623" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF Up Note0006" x="2135" y="4623" width="699" height="661" frameX="-2" frameY="0" frameWidth="703" frameHeight="661"/>
<SubTexture name="GF left note0000" x="2844" y="4623" width="699" height="633" frameX="-2" frameY="-5" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0001" x="3553" y="4623" width="703" height="631" frameX="0" frameY="-7" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0002" x="4266" y="4623" width="703" height="638"/>
<SubTexture name="GF left note0003" x="4979" y="4623" width="699" height="638" frameX="-2" frameY="0" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0004" x="5688" y="4623" width="699" height="638" frameX="-2" frameY="0" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0005" x="6397" y="4623" width="699" height="638" frameX="-2" frameY="0" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0006" x="7106" y="4623" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0007" x="7106" y="4623" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0008" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0009" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0010" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0011" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0012" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0013" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="GF left note0014" x="0" y="5294" width="699" height="637" frameX="-2" frameY="-1" frameWidth="703" frameHeight="638"/>
<SubTexture name="gf sad0000" x="709" y="5294" width="699" height="633" frameX="0" frameY="-3" frameWidth="699" frameHeight="636"/>
<SubTexture name="gf sad0001" x="709" y="5294" width="699" height="633" frameX="0" frameY="-3" frameWidth="699" frameHeight="636"/>
<SubTexture name="gf sad0002" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0003" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0004" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0005" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0006" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0007" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0008" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0009" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0010" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0011" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0012" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0013" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0014" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0015" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0016" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0017" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0018" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0019" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0020" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0021" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0022" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0023" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0024" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0025" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0026" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0027" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0028" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0029" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0030" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0031" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0032" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0033" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0034" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0035" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0036" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0037" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0038" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0039" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0040" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0041" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0042" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0043" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0044" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0045" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0046" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0047" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0048" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0049" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0050" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0051" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0052" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0053" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0054" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0055" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0056" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0057" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0058" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0059" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0060" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0061" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0062" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0063" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0064" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0065" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0066" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0067" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0068" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0069" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0070" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0071" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0072" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0073" x="3545" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0074" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0075" x="1418" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0076" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0077" x="2127" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0078" x="2836" y="5294" width="699" height="636"/>
<SubTexture name="gf sad0079" x="2836" y="5294" width="699" height="636"/>
</TextureAtlas>

7
source/Character.hx
View File

@ -41,7 +41,8 @@ class Character extends FlxSprite
animation.addByIndices('sad', 'gf sad', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "", 24, false);
animation.addByIndices('danceLeft', 'GF Dancing Beat', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
animation.addByIndices('danceRight', 'GF Dancing Beat', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
animation.addByIndices('hairBlow', "GF Dancing Beat Hair blowing", [0, 1, 2, 3], "", 24);
animation.addByIndices('hairFall', "GF Dancing Beat Hair Landing", [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11], "", 24, false);
animation.addByPrefix('scared', 'GF FEAR', 24);
addOffset('cheer');
@ -53,8 +54,10 @@ class Character extends FlxSprite
addOffset("singRIGHT", 0, -20);
addOffset("singLEFT", 0, -19);
addOffset("singDOWN", 0, -20);
addOffset('hairBlow', 45, -8);
addOffset('hairFall', 0, -9);
addOffset('scared');
addOffset('scared', -2, -17);
playAnim('danceRight');

7
source/FreeplayState.hx
View File

@ -48,6 +48,13 @@ class FreeplayState extends MusicBeatState
songs.push('South');
}
if (StoryMenuState.weekUnlocked[3] || isDebug)
{
songs.push('Pico');
songs.push('Philly');
songs.push('Blammed');
}
// LOAD MUSIC
// LOAD CHARACTERS