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

ugh and stress animations

This commit is contained in:
Cameron Taylor 2021-04-10 18:23:56 -04:00
parent e3ea518e7d
commit 1dfae62926
11 changed files with 186 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
art/flashFiles/tankman_fnf_lip_sync_back_ta_dave.swf
View File

Binary file not shown.

2
assets/preload/data/stress/stress-hard.json
View File

File diff suppressed because one or more lines are too long

2
assets/preload/data/ugh/ugh-hard.json
View File

File diff suppressed because one or more lines are too long

BIN
assets/preload/images/main_menu.fla
View File

Binary file not shown.

BIN
assets/shared/images/characters/tankmanCaptain.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 833 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

236
assets/shared/images/characters/tankmanCaptain.xml
View File

@ -2,105 +2,139 @@
<TextureAtlas imagePath="tankmanCaptain.png">
<!-- Created with Adobe Animate version 21.0.0.35450 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Tankman DOWN note0000" x="0" y="0" width="565" height="452" frameX="-10" frameY="-20" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0001" x="0" y="0" width="565" height="452" frameX="-10" frameY="-20" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0002" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0003" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0004" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0005" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0006" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0007" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0008" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note0009" x="575" y="0" width="579" height="469" frameX="0" frameY="0" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note MISS0000" x="0" y="0" width="565" height="452" frameX="-13" frameY="-18" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note MISS0001" x="0" y="0" width="565" height="452" frameX="-13" frameY="-18" frameWidth="579" frameHeight="472"/>
<SubTexture name="Tankman DOWN note MISS0002" x="1164" y="0" width="585" height="468" frameX="-3" frameY="0" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0003" x="1164" y="0" width="585" height="468" frameX="-3" frameY="0" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0004" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0005" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0006" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0007" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0008" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0009" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0010" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0011" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0012" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0013" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman DOWN note MISS0014" x="1759" y="0" width="591" height="462" frameX="0" frameY="-6" frameWidth="591" frameHeight="470"/>
<SubTexture name="Tankman Idle Dance0000" x="2360" y="0" width="425" height="553" frameX="-1" frameY="-19" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0001" x="2360" y="0" width="425" height="553" frameX="-1" frameY="-19" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0002" x="2795" y="0" width="427" height="556" frameX="0" frameY="-17" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0003" x="2795" y="0" width="427" height="556" frameX="0" frameY="-17" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0004" x="3232" y="0" width="425" height="561" frameX="-4" frameY="-12" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0005" x="3232" y="0" width="425" height="561" frameX="-4" frameY="-12" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0006" x="3667" y="0" width="428" height="572" frameX="-3" frameY="-1" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0007" x="0" y="582" width="429" height="572" frameX="-2" frameY="-1" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0008" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0009" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0010" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0011" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0012" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance0013" x="439" y="582" width="429" height="573" frameX="-2" frameY="0" frameWidth="431" frameHeight="573"/>
<SubTexture name="Tankman Note Left0000" x="878" y="582" width="500" height="525" frameX="0" frameY="-15" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0001" x="878" y="582" width="500" height="525" frameX="0" frameY="-15" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0002" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0003" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0004" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0005" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0006" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left0007" x="1388" y="582" width="485" height="542" frameX="-18" frameY="0" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left MISS0000" x="878" y="582" width="500" height="525" frameX="0" frameY="-16" frameWidth="503" frameHeight="542"/>
<SubTexture name="Tankman Note Left MISS0001" x="1883" y="582" width="494" height="543" frameX="-16" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0002" x="1883" y="582" width="494" height="543" frameX="-16" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0003" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0004" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0005" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0006" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0007" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0008" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Note Left MISS0009" x="2387" y="582" width="496" height="543" frameX="-14" frameY="0" frameWidth="510" frameHeight="543"/>
<SubTexture name="Tankman Right Note0000" x="2893" y="582" width="484" height="558" frameX="-11" frameY="-3" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0001" x="2893" y="582" width="484" height="558" frameX="-11" frameY="-3" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0002" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0003" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0004" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0005" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0006" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0007" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0008" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note0009" x="3387" y="582" width="482" height="561" frameX="0" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0000" x="2893" y="582" width="484" height="558" frameX="-21" frameY="0" frameWidth="495" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0001" x="0" y="1165" width="489" height="560" frameX="0" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0002" x="0" y="1165" width="489" height="560" frameX="0" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0003" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0004" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0005" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0006" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0007" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman Right Note MISS0008" x="499" y="1165" width="489" height="560" frameX="-5" frameY="-1" frameWidth="505" frameHeight="561"/>
<SubTexture name="Tankman UP note0000" x="998" y="1165" width="491" height="619" frameX="0" frameY="0" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0001" x="998" y="1165" width="491" height="619" frameX="0" frameY="0" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0002" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0003" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0004" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0005" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0006" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0007" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0008" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note0009" x="1499" y="1165" width="497" height="611" frameX="-7" frameY="-10" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note MISS0000" x="998" y="1165" width="491" height="619" frameX="0" frameY="0" frameWidth="504" frameHeight="621"/>
<SubTexture name="Tankman UP note MISS0001" x="2006" y="1165" width="491" height="601" frameX="-2" frameY="-19" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0002" x="2006" y="1165" width="491" height="601" frameX="-2" frameY="-19" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0003" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0004" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0005" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0006" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0007" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0008" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0009" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0010" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0011" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0012" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0013" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="Tankman UP note MISS0014" x="2507" y="1165" width="485" height="607" frameX="-5" frameY="-13" frameWidth="493" frameHeight="620"/>
<SubTexture name="PRETTY GOOD tankman instance 10000" x="487" y="1180" width="432" height="563" frameX="-99" frameY="-26" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10001" x="0" y="1186" width="432" height="563" frameX="-99" frameY="-26" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10002" x="1473" y="1587" width="403" height="589" frameX="-130" frameY="0" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10003" x="3337" y="1615" width="403" height="589" frameX="-130" frameY="0" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10004" x="1880" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10005" x="1880" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10006" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10007" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10008" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10009" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10010" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10011" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10012" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10013" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10014" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10015" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10016" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10017" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10018" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10019" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10020" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10021" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10022" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10023" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10024" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10025" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10026" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10027" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10028" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10029" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10030" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10031" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10032" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10033" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10034" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10035" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10036" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10037" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10038" x="2288" y="1706" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10039" x="436" y="1747" width="404" height="580" frameX="-129" frameY="-9" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10040" x="1353" y="2180" width="408" height="556" frameX="-120" frameY="-33" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10041" x="3103" y="2208" width="408" height="556" frameX="-120" frameY="-33" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10042" x="999" y="0" width="528" height="561" frameX="0" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10043" x="999" y="0" width="528" height="561" frameX="0" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10044" x="1531" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10045" x="2059" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10046" x="2059" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10047" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10048" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10049" x="3115" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10050" x="999" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10051" x="999" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10052" x="1527" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10053" x="1527" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10054" x="2055" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10055" x="2055" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10056" x="2583" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10057" x="2583" y="565" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10058" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10059" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10060" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10061" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10062" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10063" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10064" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10065" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="PRETTY GOOD tankman instance 10066" x="2587" y="0" width="524" height="561" frameX="-5" frameY="-28" frameWidth="533" frameHeight="589"/>
<SubTexture name="TANKMAN UGH instance 10000" x="844" y="2234" width="391" height="555" frameX="-7" frameY="-9" frameWidth="403" frameHeight="564"/>
<SubTexture name="TANKMAN UGH instance 10001" x="844" y="2234" width="391" height="555" frameX="-7" frameY="-9" frameWidth="403" frameHeight="564"/>
<SubTexture name="TANKMAN UGH instance 10002" x="3515" y="2208" width="401" height="562" frameX="-1" frameY="-2" frameWidth="403" frameHeight="564"/>
<SubTexture name="TANKMAN UGH instance 10003" x="3515" y="2208" width="401" height="562" frameX="-1" frameY="-2" frameWidth="403" frameHeight="564"/>
<SubTexture name="TANKMAN UGH instance 10004" x="0" y="1753" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10005" x="0" y="1753" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10006" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10007" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10008" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10009" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10010" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10011" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10012" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10013" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10014" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="TANKMAN UGH instance 10015" x="2696" y="2127" width="403" height="564"/>
<SubTexture name="Tankman DOWN note instance 10000" x="1473" y="1130" width="565" height="453" frameX="-11" frameY="-20" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10001" x="1473" y="1130" width="565" height="453" frameX="-11" frameY="-20" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10002" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10003" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10004" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10005" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10006" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10007" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10008" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman DOWN note instance 10009" x="3111" y="565" width="580" height="469" frameX="0" frameY="0" frameWidth="580" frameHeight="473"/>
<SubTexture name="Tankman Idle Dance instance 10000" x="923" y="1676" width="426" height="554" frameX="-1" frameY="-19" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10001" x="923" y="1676" width="426" height="554" frameX="-1" frameY="-19" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10002" x="2905" y="1567" width="428" height="556" frameX="0" frameY="-17" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10003" x="2905" y="1567" width="428" height="556" frameX="0" frameY="-17" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10004" x="3643" y="0" width="425" height="560" frameX="-5" frameY="-13" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10005" x="3643" y="0" width="425" height="560" frameX="-5" frameY="-13" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10006" x="2474" y="1130" width="427" height="572" frameX="-5" frameY="-1" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10007" x="2042" y="1130" width="428" height="572" frameX="-4" frameY="-1" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10008" x="3617" y="1038" width="428" height="573" frameX="-4" frameY="0" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10009" x="3617" y="1038" width="428" height="573" frameX="-4" frameY="0" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10010" x="3617" y="1038" width="428" height="573" frameX="-4" frameY="0" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10011" x="3617" y="1038" width="428" height="573" frameX="-4" frameY="0" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10012" x="3617" y="1038" width="428" height="573" frameX="-4" frameY="0" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Idle Dance instance 10013" x="3617" y="1038" width="428" height="573" frameX="-4" frameY="0" frameWidth="432" frameHeight="573"/>
<SubTexture name="Tankman Note Left instance 10000" x="3111" y="1038" width="502" height="525" frameX="0" frameY="-16" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10001" x="3111" y="1038" width="502" height="525" frameX="0" frameY="-16" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10002" x="983" y="1130" width="486" height="542" frameX="-18" frameY="0" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10003" x="983" y="1130" width="486" height="542" frameX="-18" frameY="0" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10004" x="983" y="1130" width="486" height="542" frameX="-18" frameY="0" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10005" x="983" y="1130" width="486" height="542" frameX="-18" frameY="0" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10006" x="983" y="1130" width="486" height="542" frameX="-18" frameY="0" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Note Left instance 10007" x="983" y="1130" width="486" height="542" frameX="-18" frameY="0" frameWidth="504" frameHeight="542"/>
<SubTexture name="Tankman Right Note instance 10000" x="0" y="625" width="483" height="557" frameX="-12" frameY="-3" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10001" x="0" y="625" width="483" height="557" frameX="-12" frameY="-3" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10002" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10003" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10004" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10005" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10006" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10007" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10008" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman Right Note instance 10009" x="496" y="616" width="483" height="560" frameX="0" frameY="0" frameWidth="495" frameHeight="560"/>
<SubTexture name="Tankman UP note instance 10000" x="0" y="0" width="492" height="621" frameX="0" frameY="0" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10001" x="0" y="0" width="492" height="621" frameX="0" frameY="0" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10002" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10003" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10004" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10005" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10006" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10007" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10008" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
<SubTexture name="Tankman UP note instance 10009" x="496" y="0" width="499" height="612" frameX="-7" frameY="-11" frameWidth="506" frameHeight="623"/>
</TextureAtlas>

2
assets/shared/images/characters/tankmanOffsets.txt
View File

@ -7,3 +7,5 @@ singUPmiss 53 84
singRIGHTmiss -1 -3
singLEFTmiss -30 16
singDOWNmiss 69 -99
singUPalt 24 56
singDOWNalt 98 -90

22
source/Character.hx
View File

@ -457,25 +457,31 @@ class Character extends FlxSprite
if (isPlayer)
{
quickAnimAdd('singLEFT', 'Tankman Note Left0');
quickAnimAdd('singRIGHT', 'Tankman Right Note0');
quickAnimAdd('singLEFT', 'Tankman Note Left ');
quickAnimAdd('singRIGHT', 'Tankman Right Note ');
quickAnimAdd('singLEFTmiss', 'Tankman Note Left MISS');
quickAnimAdd('singRIGHTmiss', 'Tankman Right Note MISS');
}
else
{
// Need to be flipped! REDO THIS LATER
quickAnimAdd('singLEFT', 'Tankman Right Note0');
quickAnimAdd('singRIGHT', 'Tankman Note Left0');
quickAnimAdd('singLEFT', 'Tankman Right Note ');
quickAnimAdd('singRIGHT', 'Tankman Note Left ');
quickAnimAdd('singLEFTmiss', 'Tankman Right Note MISS');
quickAnimAdd('singRIGHTmiss', 'Tankman Note Left MISS');
}
quickAnimAdd('singUP', 'Tankman UP note0');
quickAnimAdd('singDOWN', 'Tankman DOWN note0');
quickAnimAdd('singUP', 'Tankman UP note ');
quickAnimAdd('singDOWN', 'Tankman DOWN note ');
quickAnimAdd('singUPmiss', 'Tankman UP note MISS');
quickAnimAdd('singDOWNmiss', 'Tankman DOWN note MISS');
// PRETTY GOOD tankman
// TANKMAN UGH instanc
quickAnimAdd('singDOWN-alt', 'PRETTY GOOD');
quickAnimAdd('singUP-alt', 'TANKMAN UGH');
loadOffsetFile(curCharacter);
playAnim('idle');
@ -637,6 +643,10 @@ class Character extends FlxSprite
// lol weed
// playAnim('shoot' + FlxG.random.int(1, 4), true);
case 'tankman':
if (!animation.curAnim.name.endsWith('DOWN-alt'))
playAnim('idle');
case 'spooky':
danced = !danced;

23
source/ChartingState.hx
View File

@ -478,6 +478,9 @@ class ChartingState extends MusicBeatState
strumLine.y = getYfromStrum((Conductor.songPosition - sectionStartTime()) % (Conductor.stepCrochet * _song.notes[curSection].lengthInSteps));
if (FlxG.keys.justPressed.X)
toggleAltAnimNote();
if (curBeat % 4 == 0 && curStep >= 16 * (curSection + 1))
{
trace(curStep);
@ -686,6 +689,21 @@ class ChartingState extends MusicBeatState
updateGrid();
}
function toggleAltAnimNote():Void
{
if (curSelectedNote != null)
{
if (curSelectedNote[3] != null)
{
trace('ALT NOTE SHIT');
curSelectedNote[3] = !curSelectedNote[3];
trace(curSelectedNote[3]);
}
else
curSelectedNote[3] = true;
}
}
function recalculateSteps():Int
{
var lastChange:BPMChangeEvent = {
@ -945,14 +963,15 @@ class ChartingState extends MusicBeatState
var noteStrum = getStrumTime(dummyArrow.y) + sectionStartTime();
var noteData = Math.floor(FlxG.mouse.x / GRID_SIZE);
var noteSus = 0;
var noteAlt = false;
_song.notes[curSection].sectionNotes.push([noteStrum, noteData, noteSus]);
_song.notes[curSection].sectionNotes.push([noteStrum, noteData, noteSus, noteAlt]);
curSelectedNote = _song.notes[curSection].sectionNotes[_song.notes[curSection].sectionNotes.length - 1];
if (FlxG.keys.pressed.CONTROL)
{
_song.notes[curSection].sectionNotes.push([noteStrum, (noteData + 4) % 8, noteSus]);
_song.notes[curSection].sectionNotes.push([noteStrum, (noteData + 4) % 8, noteSus, noteAlt]);
}
trace(noteStrum);

8
source/Note.hx
View File

@ -25,8 +25,12 @@ class Note extends FlxSprite
public var tooLate:Bool = false;
public var wasGoodHit:Bool = false;
public var prevNote:Note;
private var willMiss:Bool = false;
public var altNote:Bool = false;
public var invisNote:Bool = false;
public var sustainLength:Float = 0;
public var isSustainNote:Bool = false;
@ -210,11 +214,11 @@ class Note extends FlxSprite
else
{
if (strumTime > Conductor.songPosition - Conductor.safeZoneOffset)
{ // The * 0.5 is so that it's easier to hit them too late, instead of too early
{ // The * 0.5 is so that it's easier to hit them too late, instead of too early
if (strumTime < Conductor.songPosition + (Conductor.safeZoneOffset * 0.5))
canBeHit = true;
}
else
else
{
canBeHit = true;
willMiss = true;

4
source/PlayState.hx
View File

@ -1578,6 +1578,7 @@ class PlayState extends MusicBeatState
var swagNote:Note = new Note(daStrumTime, daNoteData, oldNote);
swagNote.sustainLength = songNotes[2];
swagNote.altNote = songNotes[3];
swagNote.scrollFactor.set(0, 0);
var susLength:Float = swagNote.sustainLength;
@ -2146,6 +2147,9 @@ class PlayState extends MusicBeatState
altAnim = '-alt';
}
if (daNote.altNote)
altAnim = '-alt';
switch (Math.abs(daNote.noteData))
{
case 0: