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

charts and a bunch of christmas stuff

This commit is contained in:
Cameron Taylor 2021-01-19 21:09:47 -05:00
parent 2e0e2c57e1
commit e61a30ddce
36 changed files with 395 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/flashFiles/BoyFriend_Assets_CHRISTMAS_VARIANT.fla Normal file
View File

Binary file not shown.

BIN
art/flashFiles/Christmas_Background_Assets.fla Normal file
View File

Binary file not shown.

BIN
art/flashFiles/EVIL_Christmas_BG.fla Normal file
View File

Binary file not shown.

BIN
art/flashFiles/GF_ass_sets_CHRISTMAS_VARIANT.fla Normal file
View File

Binary file not shown.

1
assets/data/cocoa/cocoa-easy.json Normal file
View File

File diff suppressed because one or more lines are too long

1
assets/data/cocoa/cocoa-hard.json Normal file
View File

File diff suppressed because one or more lines are too long

2
assets/data/cocoa/cocoa.json
View File

File diff suppressed because one or more lines are too long

2
assets/data/eggnog/eggnog.json
View File

File diff suppressed because one or more lines are too long

1
assets/data/winter-horrorland/winter-horrorland-easy.json Normal file
View File

File diff suppressed because one or more lines are too long

1
assets/data/winter-horrorland/winter-horrorland-hard.json Normal file
View File

File diff suppressed because one or more lines are too long

2
assets/data/winter-horrorland/winter-horrorland.json
View File

File diff suppressed because one or more lines are too long

BIN
assets/images/christmas/bgEscalator.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

BIN
assets/images/christmas/bgWalls.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 913 KiB

BIN
assets/images/christmas/bottomBop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 986 KiB

19
assets/images/christmas/bottomBop.xml Normal file
View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="bottomBop.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Bottom Level Boppers0000" x="0" y="0" width="1975" height="661" frameX="-3" frameY="-13" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0001" x="0" y="0" width="1975" height="661" frameX="-3" frameY="-13" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0002" x="1985" y="0" width="1972" height="664" frameX="-4" frameY="-10" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0003" x="1985" y="0" width="1972" height="664" frameX="-4" frameY="-10" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0004" x="0" y="674" width="1973" height="672" frameX="0" frameY="-2" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0005" x="0" y="674" width="1973" height="672" frameX="0" frameY="-2" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0006" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0007" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0008" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0009" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0010" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0011" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0012" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
<SubTexture name="Bottom Level Boppers0013" x="1983" y="674" width="1973" height="674" frameX="0" frameY="0" frameWidth="1978" frameHeight="674"/>
</TextureAtlas>

BIN
assets/images/christmas/christmasTree.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
assets/images/christmas/christmasWall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 821 KiB

BIN
assets/images/christmas/fgSnow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
assets/images/christmas/gfChristmas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 MiB

227
assets/images/christmas/gfChristmas.xml Normal file
View File

@ -0,0 +1,227 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="gfChristmas.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="GF Cheer0000" x="0" y="0" width="817" height="724"/>
<SubTexture name="GF Cheer0001" x="827" y="0" width="817" height="724"/>
<SubTexture name="GF Cheer0002" x="1654" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0003" x="2481" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0004" x="3308" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0005" x="4135" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0006" x="4962" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0007" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0008" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0009" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0010" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0011" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0012" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0013" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0014" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0015" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0016" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0017" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0018" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0019" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Cheer0020" x="5789" y="0" width="817" height="721" frameX="0" frameY="-3" frameWidth="817" frameHeight="724"/>
<SubTexture name="GF Dancing Beat0000" x="6616" y="0" width="817" height="701" frameX="0" frameY="-14" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0001" x="0" y="734" width="817" height="701" frameX="0" frameY="-14" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0002" x="827" y="734" width="817" height="699" frameX="0" frameY="-16" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0003" x="1654" y="734" width="817" height="699" frameX="0" frameY="-16" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0004" x="2481" y="734" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0005" x="3308" y="734" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0006" x="4135" y="734" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0007" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0008" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0009" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0010" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0011" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0012" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0013" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0014" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat0015" x="0" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0016" x="827" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0017" x="1654" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0018" x="2481" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0019" x="3308" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0020" x="4135" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0021" x="4962" y="1459" width="817" height="705" frameX="0" frameY="-10" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0022" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0023" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0024" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0025" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0026" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0027" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0028" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat0029" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0000" x="827" y="2179" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0001" x="1654" y="2179" width="817" height="702" frameX="0" frameY="-13" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0002" x="2481" y="2179" width="817" height="686" frameX="0" frameY="-29" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0003" x="3308" y="2179" width="817" height="686" frameX="0" frameY="-29" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0004" x="4135" y="2179" width="817" height="674" frameX="0" frameY="-41" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0005" x="4962" y="2179" width="817" height="674" frameX="0" frameY="-41" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0006" x="5789" y="2179" width="817" height="693" frameX="0" frameY="-22" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0007" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0008" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0009" x="4962" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0010" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0011" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0012" x="5789" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0013" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0014" x="6616" y="734" width="817" height="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0015" x="0" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0016" x="827" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0017" x="1654" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0018" x="2481" y="1459" width="817" height="703" frameX="0" frameY="-12" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0019" x="3308" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0020" x="4135" y="1459" width="817" height="704" frameX="0" frameY="-11" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0021" x="4962" y="1459" width="817" height="705" frameX="0" frameY="-10" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0022" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0023" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0024" x="5789" y="1459" width="817" height="710" frameX="0" frameY="-5" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0025" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0026" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0027" x="6616" y="1459" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0028" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Dancing Beat Hair Landing0029" x="0" y="2179" width="817" height="709" frameX="0" frameY="-6" frameWidth="817" frameHeight="715"/>
<SubTexture name="GF Down Note0000" x="6616" y="2179" width="817" height="698" frameX="0" frameY="-6" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0001" x="0" y="2898" width="817" height="698" frameX="0" frameY="-6" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0002" x="827" y="2898" width="817" height="703" frameX="0" frameY="-1" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0003" x="1654" y="2898" width="817" height="703" frameX="0" frameY="-1" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Down Note0004" x="2481" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0005" x="3308" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0006" x="4135" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0007" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0008" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0009" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0010" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0011" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0012" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0013" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0014" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0015" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0016" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0017" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0018" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF Down Note0019" x="4962" y="2898" width="817" height="704"/>
<SubTexture name="GF FEAR 0000" x="5789" y="2898" width="817" height="707"/>
<SubTexture name="GF FEAR 0001" x="6616" y="2898" width="817" height="707"/>
<SubTexture name="GF FEAR 0002" x="0" y="3615" width="817" height="705" frameX="0" frameY="-2" frameWidth="817" frameHeight="707"/>
<SubTexture name="GF FEAR 0003" x="827" y="3615" width="817" height="707"/>
<SubTexture name="GF Right Note0000" x="1654" y="3615" width="817" height="699" frameX="0" frameY="-5" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Right Note0001" x="2481" y="3615" width="817" height="699" frameX="0" frameY="-5" frameWidth="817" frameHeight="704"/>
<SubTexture name="GF Right Note0002" x="3308" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0003" x="4135" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0004" x="4962" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0005" x="5789" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0006" x="6616" y="3615" width="817" height="704"/>
<SubTexture name="GF Right Note0007" x="0" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0008" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0009" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0010" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0011" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0012" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0013" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Right Note0014" x="827" y="4332" width="817" height="704"/>
<SubTexture name="GF Up Note0000" x="1654" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0001" x="2481" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0002" x="3308" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0003" x="4135" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0004" x="4962" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0005" x="5789" y="4332" width="817" height="728"/>
<SubTexture name="GF Up Note0006" x="6616" y="4332" width="817" height="728"/>
<SubTexture name="GF left note0000" x="0" y="5070" width="817" height="700" frameX="0" frameY="-5" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0001" x="827" y="5070" width="817" height="698" frameX="0" frameY="-7" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0002" x="1654" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0003" x="2481" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0004" x="3308" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0005" x="4135" y="5070" width="817" height="705"/>
<SubTexture name="GF left note0006" x="4962" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0007" x="5789" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0008" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0009" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0010" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0011" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0012" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0013" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="GF left note0014" x="6616" y="5070" width="817" height="704" frameX="0" frameY="-1" frameWidth="817" frameHeight="705"/>
<SubTexture name="gf sad0000" x="0" y="5785" width="817" height="701" frameX="0" frameY="-3" frameWidth="817" frameHeight="704"/>
<SubTexture name="gf sad0001" x="0" y="5785" width="817" height="701" frameX="0" frameY="-3" frameWidth="817" frameHeight="704"/>
<SubTexture name="gf sad0002" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0003" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0004" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0005" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0006" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0007" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0008" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0009" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0010" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0011" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0012" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0013" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0014" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0015" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0016" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0017" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0018" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0019" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0020" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0021" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0022" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0023" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0024" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0025" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0026" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0027" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0028" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0029" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0030" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0031" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0032" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0033" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0034" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0035" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0036" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0037" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0038" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0039" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0040" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0041" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0042" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0043" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0044" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0045" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0046" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0047" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0048" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0049" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0050" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0051" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0052" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0053" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0054" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0055" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0056" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0057" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0058" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0059" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0060" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0061" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0062" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0063" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0064" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0065" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0066" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0067" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0068" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0069" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0070" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0071" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0072" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0073" x="3308" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0074" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0075" x="827" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0076" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0077" x="1654" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0078" x="2481" y="5785" width="817" height="704"/>
<SubTexture name="gf sad0079" x="2481" y="5785" width="817" height="704"/>
</TextureAtlas>

BIN
assets/images/christmas/upperBop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 631 KiB

18
assets/images/christmas/upperBop.xml Normal file
View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="upperBop.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Upper Crowd Bob0000" x="0" y="0" width="2247" height="291" frameX="0" frameY="-16" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0001" x="0" y="0" width="2247" height="291" frameX="0" frameY="-16" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0002" x="0" y="301" width="2237" height="297" frameX="-5" frameY="-10" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0003" x="0" y="301" width="2237" height="297" frameX="-5" frameY="-10" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0004" x="0" y="608" width="2235" height="304" frameX="-6" frameY="-3" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0005" x="0" y="608" width="2235" height="304" frameX="-6" frameY="-3" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0006" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0007" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0008" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0009" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0010" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0011" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
<SubTexture name="Upper Crowd Bob0012" x="0" y="922" width="2231" height="307" frameX="-8" frameY="0" frameWidth="2247" frameHeight="307"/>
</TextureAtlas>

BIN
assets/music/Dadbattle.mp3
View File

Binary file not shown.

BIN
assets/music/Dadbattle.ogg
View File

Binary file not shown.

BIN
assets/music/Test_Inst.mp3 Normal file
View File

Binary file not shown.

BIN
assets/music/Test_Inst.ogg Normal file
View File

Binary file not shown.

BIN
assets/music/Test_Voices.mp3 Normal file
View File

Binary file not shown.

BIN
assets/music/Test_Voices.ogg Normal file
View File

Binary file not shown.

BIN
assets/sounds/Lights_Shut_off.mp3 Normal file
View File

Binary file not shown.

BIN
assets/sounds/Lights_Shut_off.ogg Normal file
View File

Binary file not shown.

BIN
assets/sounds/Lights_Turn_On.mp3 Normal file
View File

Binary file not shown.

BIN
assets/sounds/Lights_Turn_On.ogg Normal file
View File

Binary file not shown.

42
source/Character.hx
View File

@ -61,6 +61,37 @@ class Character extends FlxSprite
playAnim('danceRight');
case 'gf-christmas':
tex = FlxAtlasFrames.fromSparrow('assets/images/christmas/gfChristmas.png', 'assets/images/christmas/gfChristmas.xml');
frames = tex;
animation.addByPrefix('cheer', 'GF Cheer', 24, false);
animation.addByPrefix('singLEFT', 'GF left note', 24, false);
animation.addByPrefix('singRIGHT', 'GF Right Note', 24, false);
animation.addByPrefix('singUP', 'GF Up Note', 24, false);
animation.addByPrefix('singDOWN', 'GF Down Note', 24, false);
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');
addOffset('sad', -2, -2);
addOffset('danceLeft', 0, -9);
addOffset('danceRight', 0, -9);
addOffset("singUP", 0, 4);
addOffset("singRIGHT", 0, -20);
addOffset("singLEFT", 0, -19);
addOffset("singDOWN", 0, -20);
addOffset('hairBlow', 45, -8);
addOffset('hairFall', 0, -9);
addOffset('scared', -2, -17);
playAnim('danceRight');
case 'gf-car':
tex = FlxAtlasFrames.fromSparrow('assets/images/gfCar.png', 'assets/images/gfCar.xml');
frames = tex;
@ -392,6 +423,17 @@ class Character extends FlxSprite
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'))
{

12
source/ChartingState.hx
View File

@ -114,11 +114,11 @@ class ChartingState extends MusicBeatState
else
{
_song = {
song: 'Monster',
song: 'Test',
notes: [],
bpm: 95,
bpm: 150,
sections: 0,
needsVoices: false,
needsVoices: true,
player1: 'bf',
player2: 'dad',
sectionLengths: [],
@ -180,8 +180,8 @@ class ChartingState extends MusicBeatState
typingShit = UI_songTitle;
var check_voices = new FlxUICheckBox(10, 25, null, null, "Has voice track", 100);
check_voices.checked = true;
_song.needsVoices = check_voices.checked;
check_voices.checked = _song.needsVoices;
// _song.needsVoices = check_voices.checked;
check_voices.callback = function()
{
_song.needsVoices = check_voices.checked;
@ -360,7 +360,7 @@ class ChartingState extends MusicBeatState
FlxG.sound.playMusic('assets/music/' + daSong + "_Inst" + TitleState.soundExt, 0.6);
// WONT WORK FOR TUTORIAL! REDO LATER
// WONT WORK FOR TUTORIAL OR TEST SONG!!! REDO LATER
vocals = new FlxSound().loadEmbedded("assets/music/" + daSong + "_Voices" + TitleState.soundExt);
FlxG.sound.list.add(vocals);

2
source/FreeplayState.hx
View File

@ -70,7 +70,7 @@ class FreeplayState extends MusicBeatState
{
songs.push('Cocoa');
songs.push('Eggnog');
// songs.push('Milf');
songs.push('Winter-Horrorland');
}
// LOAD MUSIC

76
source/PlayState.hx
View File

@ -93,6 +93,9 @@ class PlayState extends MusicBeatState
var grpLimoDancers:FlxTypedGroup<BackgroundDancer>;
var fastCar:FlxSprite;
var upperBoppers:FlxSprite;
var bottomBoppers:FlxSprite;
var talking:Bool = true;
var songScore:Int = 0;
var scoreTxt:FlxText;
@ -247,6 +250,54 @@ class PlayState extends MusicBeatState
fastCar = new FlxSprite(-300, 160).loadGraphic('assets/images/limo/fastCarLol.png');
// add(limo);
}
else if (SONG.song.toLowerCase() == 'cocoa' || SONG.song.toLowerCase() == 'eggnog')
{
curStage = 'mall';
var bg:FlxSprite = new FlxSprite(-1000, -400).loadGraphic('assets/images/christmas/bgWalls.png');
bg.antialiasing = true;
bg.scrollFactor.set(0.2, 0.2);
bg.active = false;
bg.setGraphicSize(Std.int(bg.width * 0.8));
bg.updateHitbox();
add(bg);
upperBoppers = new FlxSprite(-130, 40);
upperBoppers.frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/upperBop.png', 'assets/images/christmas/upperBop.xml');
upperBoppers.animation.addByPrefix('bop', "Upper Crowd Bob", 24, false);
upperBoppers.antialiasing = true;
upperBoppers.scrollFactor.set(0.33, 0.33);
upperBoppers.setGraphicSize(Std.int(upperBoppers.width * 0.7));
upperBoppers.updateHitbox();
add(upperBoppers);
var bgEscalator:FlxSprite = new FlxSprite(-1000, -430).loadGraphic('assets/images/christmas/bgEscalator.png');
bgEscalator.antialiasing = true;
bgEscalator.scrollFactor.set(0.3, 0.3);
bgEscalator.active = false;
bgEscalator.setGraphicSize(Std.int(bgEscalator.width * 0.8));
bgEscalator.updateHitbox();
add(bgEscalator);
var fgSnow:FlxSprite = new FlxSprite(-400, 700).loadGraphic('assets/images/christmas/fgSnow.png');
fgSnow.active = false;
fgSnow.antialiasing = true;
add(fgSnow);
var tree:FlxSprite = new FlxSprite(300, -250).loadGraphic('assets/images/christmas/christmasTree.png');
tree.antialiasing = true;
tree.scrollFactor.set(0.85, 0.85);
add(tree);
bottomBoppers = new FlxSprite(-280, 220);
bottomBoppers.frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/bottomBop.png', 'assets/images/christmas/bottomBop.xml');
bottomBoppers.animation.addByPrefix('bop', 'Bottom Level Boppers', 24, false);
bottomBoppers.antialiasing = true;
bottomBoppers.scrollFactor.set(0.9, 0.9);
bottomBoppers.setGraphicSize(Std.int(bottomBoppers.width * 0.9));
bottomBoppers.updateHitbox();
add(bottomBoppers);
}
else
{
curStage = 'stage';
@ -278,6 +329,14 @@ class PlayState extends MusicBeatState
var gfVersion:String = 'gf';
switch (curStage)
{
case 'limo':
gfVersion = 'gf-car';
case 'mall':
gfVersion = 'gf-christmas';
}
if (curStage == 'limo')
gfVersion = 'gf-car';
@ -315,6 +374,8 @@ class PlayState extends MusicBeatState
case 'pico':
camPos.x += 600;
dad.y += 300;
case 'parents-christmas':
dad.x -= 500;
}
boyfriend = new Boyfriend(770, 450, SONG.player1);
@ -1302,8 +1363,17 @@ class PlayState extends MusicBeatState
}
}
}
else
else if (possibleNotes[0].noteData == possibleNotes[1].noteData)
{
noteCheck(controlArray[daNote.noteData], daNote);
}
else
{
for (coolNote in possibleNotes)
{
noteCheck(controlArray[coolNote.noteData], coolNote);
}
}
}
else // regular notes?
{
@ -1700,6 +1770,10 @@ class PlayState extends MusicBeatState
switch (curStage)
{
case 'mall':
upperBoppers.animation.play('bop', true);
bottomBoppers.animation.play('bop', true);
case 'limo':
grpLimoDancers.forEach(function(dancer:BackgroundDancer)
{