Skip to content

Commit

Permalink
thanks bolo
Browse files Browse the repository at this point in the history 
fix downscroll reloadNote being broken
recolor hurt notes (circles are broken)
adjust the notetype splashes to fix anim framerate
better scaling for sus notes
  • Loading branch information
@TheRealJake12
TheRealJake12 committed Jan 22, 2024
1 parent ffeae6a commit 8bec4f3
Show file tree
Hide file tree
Showing 16 changed files with 189 additions and 94 deletions.
Binary file removed art/flashFiles/Default_Notesplashes.fla
View file
Binary file not shown.
Binary file modified art/flashFiles/HURTNOTE_assets.fla
View file
Binary file not shown.
Binary file modified art/flashFiles/MUSTPRESS_assets.fla
View file
Binary file not shown.
Binary file modified art/flashFiles/NOTE_assets.fla
View file
Binary file not shown.
46 changes: 25 additions & 21 deletions assets/preload/data/stages/school.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
{
"staticCam": false,
"positions": {
"gf-pixel": [
580,
430
],
"senpai": [
250,
460
],
"bf-pixel": [
970,
670
]
},
"camZoom": 1.05,
"hasGF": true,
"camPosition": [
600,
500
]
"staticCam": false,
"positions": {
"gf-pixel": [
580,
430
],
"senpai": [
250,
460
],
"senpai-angry": [
250,
460
],
"bf-pixel": [
970,
670
]
},
"camZoom": 1.05,
"hasGF": true,
"camPosition": [
600,
500
]
}
Binary file modified assets/shared/images/notetypes/hurt_Arrows.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/shared/images/notetypes/hurt_Arrows.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<SubTexture name="green alone0000" x="162" y="0" width="157" height="154"/>
<SubTexture name="green hold0000" x="318" y="228" width="50" height="44"/>
<SubTexture name="green tail0000" x="318" y="159" width="50" height="64"/>
<SubTexture name="purple tail0000" x="318" y="159" width="50" height="64"/>
<SubTexture name="pruple tail0000" x="318" y="159" width="50" height="64"/>
<SubTexture name="purple alone0000" x="0" y="159" width="154" height="157"/>
<SubTexture name="purple hold0000" x="318" y="228" width="50" height="44"/>
<SubTexture name="red alone0000" x="159" y="159" width="154" height="157"/>
Expand Down
Binary file modified assets/shared/images/notetypes/splashes/Defaulthurt.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
98 changes: 73 additions & 25 deletions assets/shared/images/notetypes/splashes/Defaulthurt.xml
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="Week7hurt.png">
<TextureAtlas imagePath="Defaulthurt.png">
<!-- Created with Adobe Animate version 22.0.2.168 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="note splash 1 blue0000" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0001" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0002" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0003" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 blue0001" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0002" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0003" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0004" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0005" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0006" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0007" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0008" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 blue0009" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 blue0010" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 blue0011" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 green0000" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0001" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0002" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0003" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 green0001" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0002" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0003" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0004" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0005" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0006" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0007" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0008" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 green0009" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 green0010" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 green0011" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 purple0000" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0001" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0002" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0003" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 purple0001" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0002" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0003" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0004" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0005" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0006" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0007" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0008" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 purple0009" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 purple0010" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 purple0011" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 red0000" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0001" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0002" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0003" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 red0001" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0002" x="527" y="513" width="189" height="270" frameX="-32" frameY="-12" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0003" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0004" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0005" x="494" y="0" width="213" height="265" frameX="-27" frameY="-22" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0006" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0007" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0008" x="0" y="303" width="252" height="291" frameX="-4" frameY="-6" frameWidth="260" frameHeight="298"/>
<SubTexture name="note splash 1 red0009" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 red0010" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 1 red0011" x="0" y="0" width="260" height="298"/>
<SubTexture name="note splash 2 blue0000" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0001" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0002" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0003" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0001" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0002" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0003" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0004" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0005" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0006" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 blue0007" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0000" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0001" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0002" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0003" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0001" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0002" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0003" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0004" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0005" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0006" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 green0007" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0000" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0001" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0002" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0003" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0001" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0002" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0003" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0004" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0005" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0006" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 purple0007" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0000" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0001" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0002" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0003" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0001" x="257" y="565" width="169" height="201" frameX="-45" frameY="-41" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0002" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0003" x="527" y="270" width="225" height="238" frameX="-20" frameY="-19" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0004" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0005" x="257" y="303" width="265" height="257" frameX="0" frameY="-10" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0006" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
<SubTexture name="note splash 2 red0007" x="265" y="0" width="224" height="258" frameX="-50" frameY="0" frameWidth="274" frameHeight="267"/>
</TextureAtlas>
Binary file modified assets/shared/images/notetypes/splashes/Defaultmustpress.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8bec4f3

Please sign in to comment.