diff --git a/CHANGELOG.md b/CHANGELOG.md index 97b677da3..114615a79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] +### Fixed +- Cleaned up some charting on South on hard mode +- Fixed some animation timings, should feel both better to play, and watch. + ## [0.2.1.2] - 2020-11-06 ### Fixed - Story mode scores not properly resetting, leading to VERY inflated highscores on the leaderboards. This also requires me to clear the scores that are on the leaderboard right now, sorry! diff --git a/Project.xml b/Project.xml index e7efe94ca..9dd031d07 100644 --- a/Project.xml +++ b/Project.xml @@ -108,4 +108,5 @@ + diff --git a/art/build-Itch-WINDOWS-SECRET.bat b/art/build-Itch-WINDOWS-SECRET.bat new file mode 100644 index 000000000..c75a4e6c0 --- /dev/null +++ b/art/build-Itch-WINDOWS-SECRET.bat @@ -0,0 +1,11 @@ +@echo off +color 0a +cd .. +@echo on +echo BUILDING GAME +lime build windows -debug +echo UPLOADING 64 BIT VERSION TO ITCH +butler push ./export/debug/windows/bin ninja-muffin24/funkin:windows-secretBeta +butler status ninja-muffin24/funkin:windows-secretBeta +echo ITCH SHIT UPDATED LMAOOOOO +pause \ No newline at end of file diff --git a/assets/data/south/south-hard.json b/assets/data/south/south-hard.json index b6fd43518..9ba443868 100644 --- a/assets/data/south/south-hard.json +++ b/assets/data/south/south-hard.json @@ -1 +1 @@ -{"song":{"song":"South","notes":[{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[11636.818181818182,3,0],[11999.818181818182,3,0],[12363.818181818182,0,0],[12545.818181818182,3,0],[12726.818181818182,2,0],[12908.818181818182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[13101.818181818182,0,0],[13454.818181818182,1,0],[13817.818181818182,3,0],[13999.818181818182,3,0],[14181.818181818182,3,200]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14545.818181818182,3,0],[14908.818181818182,3,0],[15272.818181818182,3,0],[15454.818181818182,2,0],[15636.818181818182,0,0],[15817.818181818182,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16008.818181818182,0,0],[16363.818181818182,0,0],[16726.818181818184,2,0],[17090.818181818184,0,0],[17272.818181818184,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[17455,3,0],[17818,3,0],[18182,0,0],[18364,3,0],[18545,2,0],[18727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18920,0,0],[19273,1,0],[19636,3,0],[19818,3,0],[20000,3,200]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20364,3,0],[20727,3,0],[21091,3,0],[21273,2,0],[21455,0,0],[21636,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21827,0,0],[22182,0,0],[22545,2,0],[22909,0,0],[23091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[23273,2,0],[23455,1,0],[23636,0,0],[23818,0,0],[23909,3,0],[24000,2,0],[24182,0,0],[24364,2,0],[24545,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24734,2,0],[25091,2,0],[25455,2,0],[25636,1,0],[25818,0,0],[26000,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26193,0,0],[26545,0,0],[26727,0,0],[26818,2,0],[26909,3,0],[27000,0,0],[27273,1,0],[27455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[27648,2,0],[28000,2,0],[28364,2,0],[28545,3,0],[28727,0,0],[28909,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[29091.181818181816,2,0],[29273.181818181816,1,0],[29454.181818181816,0,0],[29636.181818181816,0,0],[29727.181818181816,3,0],[29818.181818181816,2,0],[30000.181818181816,0,0],[30182.181818181816,2,0],[30363.181818181816,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30552.181818181816,2,0],[30909.181818181816,2,0],[31273.181818181816,2,0],[31454.181818181816,1,0],[31636.181818181816,0,0],[31818.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32011.181818181816,0,0],[32363.181818181816,0,0],[32545.181818181816,0,0],[32636.181818181816,2,0],[32727.181818181816,3,0],[32818.181818181816,0,0],[33091.181818181816,1,0],[33273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33466.181818181816,2,0],[33818.181818181816,2,0],[34182.181818181816,2,0],[34363.181818181816,3,0],[34545.181818181816,0,0],[34727.181818181816,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34918,2,0],[35091,3,0],[35273,0,0],[35455,2,0],[35636,3,0],[35818,0,0],[36000,2,0],[36182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36380,0,0],[36545,2,0],[36727,3,0],[36909,0,0],[37091,0,0],[37273,3,0],[37455,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[37834,2,0],[38000,3,0],[38182,0,0],[38364,2,0],[38545,3,0],[38727,0,0],[38909,2,0],[39091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[39284,0,0],[39727,3,0],[39909,0,0],[40000,3,0],[40182,0,0],[40364,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40736.181818181816,2,0],[40909.181818181816,3,0],[41091.181818181816,0,0],[41273.181818181816,2,0],[41454.181818181816,3,0],[41636.181818181816,0,0],[41818.181818181816,2,0],[42000.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42198.181818181816,0,0],[42363.181818181816,2,0],[42545.181818181816,3,0],[42727.181818181816,0,0],[42909.181818181816,0,0],[43091.181818181816,3,0],[43273.181818181816,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43652.181818181816,2,0],[43818.181818181816,3,0],[44000.181818181816,0,0],[44182.181818181816,2,0],[44363.181818181816,3,0],[44545.181818181816,0,0],[44727.181818181816,2,0],[44909.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45102.181818181816,0,0],[45545.181818181816,3,0],[45727.181818181816,0,0],[45818.181818181816,3,0],[46000.181818181816,0,0],[46182.181818181816,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46554.818181818184,0,0],[46817.818181818184,3,0],[46908.818181818184,1,0],[47181.818181818184,0,0],[47363.818181818184,3,0],[47454.818181818184,1,0],[47726.818181818184,2,0],[47908.818181818184,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48011.818181818184,0,0],[48181.818181818184,2,0],[48363.818181818184,3,0],[48545.818181818184,0,0],[48726.818181818184,3,0],[48908.818181818184,2,0],[49090.818181818184,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[49545,3,0],[49455,0,0],[49636,2,0],[49818,3,0],[50000,0,0],[50182,2,0],[50364,3,0],[50545,0,0],[50636,3,0],[50727,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50914,1,0],[51273,0,0],[51455,3,0],[51727,2,0],[51909,3,0],[52091,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52373,0,0],[52636,3,0],[52727,1,0],[53000,0,0],[53182,3,0],[53273,1,0],[53545,2,0],[53727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[53830,0,0],[54000,2,0],[54182,3,0],[54364,0,0],[54545,3,0],[54727,2,0],[54909,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55363.181818181816,3,0],[55273.181818181816,0,0],[55454.181818181816,2,0],[55636.181818181816,3,0],[55818.181818181816,0,0],[56000.181818181816,2,0],[56182.181818181816,3,0],[56363.181818181816,0,0],[56454.181818181816,3,0],[56545.181818181816,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56732.181818181816,1,0],[57091.181818181816,0,0],[57273.181818181816,3,0],[57545.181818181816,2,0],[57727.181818181816,3,0],[57909.181818181816,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58182,3,0],[58545,3,0],[59000,2,0],[59091,0,0],[58727,1,0],[59364,1,0],[59455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[59657,0,272.7272727272727],[60000,2,0],[60364,2,0],[60545,2,0],[60727,2,181.8181818181818]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[61100,2,0],[61455,2,0],[61636,3,0],[61818,1,0],[62000,0,0],[62182,3,0],[62364,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62550,0,0],[63000,0,0],[63727,0,0],[63364,0,0],[63364,7,0],[63545,3,0],[63818,2,0],[63636,5,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64000.181818181816,3,0],[64363.181818181816,3,0],[64818.181818181816,2,0],[64909.181818181816,0,0],[64545.181818181816,1,0],[65182.181818181816,1,0],[65273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[65475.181818181816,0,272.7272727272727],[65818.18181818182,2,0],[66182.18181818182,2,0],[66363.18181818182,2,0],[66545.18181818182,2,181.8181818181818]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[66918.18181818182,2,0],[67273.18181818182,2,0],[67454.18181818182,3,0],[67636.18181818182,1,0],[67818.18181818182,0,0],[68000.18181818182,3,0],[68182.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[68368.18181818182,0,0],[68818.18181818182,0,0],[69545.18181818182,0,0],[69182.18181818182,0,0],[69182.18181818182,7,0],[69363.18181818182,3,0],[69636.18181818182,2,0],[69454.18181818182,5,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69825,2,0],[70000,3,0],[70273,0,0],[70364,3,0],[70545,2,0],[70636,0,0],[71000,2,0],[70727,3,0],[71091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[71280,2,0],[71636,2,0],[71818,0,0],[72091,2,0],[72273,3,0],[72364,0,0],[72545,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72732,0,0],[73091,0,0],[73273,0,0],[73455,2,0],[73364,3,0],[73636,3,0],[73818,2,0],[74000,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74195,2,0],[74364,3,0],[74545,2,0],[74727,0,0],[74909,1,0],[75091,3,0],[75273,0,0],[75455,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[75643.18181818182,2,0],[75818.18181818182,3,0],[76091.18181818182,0,0],[76182.18181818182,3,0],[76363.18181818182,2,0],[76454.18181818182,0,0],[76818.18181818182,2,0],[76545.18181818182,3,0],[76909.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[77098.18181818182,2,0],[77454.18181818182,2,0],[77636.18181818182,0,0],[77909.18181818182,2,0],[78091.18181818182,3,0],[78182.18181818182,0,0],[78363.18181818182,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[78550.18181818182,0,0],[78909.18181818182,0,0],[79091.18181818182,0,0],[79273.18181818182,2,0],[79182.18181818182,3,0],[79454.18181818182,3,0],[79636.18181818182,2,0],[79818.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[80013.18181818182,2,0],[80182.18181818182,3,0],[80363.18181818182,2,0],[80545.18181818182,0,0],[80727.18181818182,1,0],[80909.18181818182,3,0],[81091.18181818182,0,0],[81273.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}],"bpm":165,"sections":0,"needsVoices":true,"player1":"bf","player2":"spooky","sectionLengths":[],"speed":2.200000000000001},"bpm":165,"sections":62,"notes":[{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[11636.818181818182,3,0],[11999.818181818182,3,0],[12363.818181818182,0,0],[12545.818181818182,3,0],[12726.818181818182,2,0],[12908.818181818182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[13101.818181818182,0,0],[13454.818181818182,1,0],[13817.818181818182,3,0],[13999.818181818182,3,0],[14181.818181818182,3,200]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14545.818181818182,3,0],[14908.818181818182,3,0],[15272.818181818182,3,0],[15454.818181818182,2,0],[15636.818181818182,0,0],[15817.818181818182,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16008.818181818182,0,0],[16363.818181818182,0,0],[16726.818181818184,2,0],[17090.818181818184,0,0],[17272.818181818184,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[17455,3,0],[17818,3,0],[18182,0,0],[18364,3,0],[18545,2,0],[18727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18920,0,0],[19273,1,0],[19636,3,0],[19818,3,0],[20000,3,200]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20364,3,0],[20727,3,0],[21091,3,0],[21273,2,0],[21455,0,0],[21636,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21827,0,0],[22182,0,0],[22545,2,0],[22909,0,0],[23091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[23273,2,0],[23455,1,0],[23636,0,0],[23818,0,0],[23909,3,0],[24000,2,0],[24182,0,0],[24364,2,0],[24545,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24734,2,0],[25091,2,0],[25455,2,0],[25636,1,0],[25818,0,0],[26000,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26193,0,0],[26545,0,0],[26727,0,0],[26818,2,0],[26909,3,0],[27000,0,0],[27273,1,0],[27455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[27648,2,0],[28000,2,0],[28364,2,0],[28545,3,0],[28727,0,0],[28909,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[29091.181818181816,2,0],[29273.181818181816,1,0],[29454.181818181816,0,0],[29636.181818181816,0,0],[29727.181818181816,3,0],[29818.181818181816,2,0],[30000.181818181816,0,0],[30182.181818181816,2,0],[30363.181818181816,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30552.181818181816,2,0],[30909.181818181816,2,0],[31273.181818181816,2,0],[31454.181818181816,1,0],[31636.181818181816,0,0],[31818.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32011.181818181816,0,0],[32363.181818181816,0,0],[32545.181818181816,0,0],[32636.181818181816,2,0],[32727.181818181816,3,0],[32818.181818181816,0,0],[33091.181818181816,1,0],[33273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33466.181818181816,2,0],[33818.181818181816,2,0],[34182.181818181816,2,0],[34363.181818181816,3,0],[34545.181818181816,0,0],[34727.181818181816,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34918,2,0],[35091,3,0],[35273,0,0],[35455,2,0],[35636,3,0],[35818,0,0],[36000,2,0],[36182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36380,0,0],[36545,2,0],[36727,3,0],[36909,0,0],[37091,0,0],[37273,3,0],[37455,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[37834,2,0],[38000,3,0],[38182,0,0],[38364,2,0],[38545,3,0],[38727,0,0],[38909,2,0],[39091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[39284,0,0],[39727,3,0],[39909,0,0],[40000,3,0],[40182,0,0],[40364,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40736.181818181816,2,0],[40909.181818181816,3,0],[41091.181818181816,0,0],[41273.181818181816,2,0],[41454.181818181816,3,0],[41636.181818181816,0,0],[41818.181818181816,2,0],[42000.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42198.181818181816,0,0],[42363.181818181816,2,0],[42545.181818181816,3,0],[42727.181818181816,0,0],[42909.181818181816,0,0],[43091.181818181816,3,0],[43273.181818181816,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43652.181818181816,2,0],[43818.181818181816,3,0],[44000.181818181816,0,0],[44182.181818181816,2,0],[44363.181818181816,3,0],[44545.181818181816,0,0],[44727.181818181816,2,0],[44909.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45102.181818181816,0,0],[45545.181818181816,3,0],[45727.181818181816,0,0],[45818.181818181816,3,0],[46000.181818181816,0,0],[46182.181818181816,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46554.818181818184,0,0],[46817.818181818184,3,0],[46908.818181818184,1,0],[47181.818181818184,0,0],[47363.818181818184,3,0],[47454.818181818184,1,0],[47726.818181818184,2,0],[47908.818181818184,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48011.818181818184,0,0],[48181.818181818184,2,0],[48363.818181818184,3,0],[48545.818181818184,0,0],[48726.818181818184,3,0],[48908.818181818184,2,0],[49090.818181818184,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[49545,3,0],[49455,0,0],[49636,2,0],[49818,3,0],[50000,0,0],[50182,2,0],[50364,3,0],[50545,0,0],[50636,3,0],[50727,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50914,1,0],[51273,0,0],[51455,3,0],[51727,2,0],[51909,3,0],[52091,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52373,0,0],[52636,3,0],[52727,1,0],[53000,0,0],[53182,3,0],[53273,1,0],[53545,2,0],[53727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[53830,0,0],[54000,2,0],[54182,3,0],[54364,0,0],[54545,3,0],[54727,2,0],[54909,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55363.181818181816,3,0],[55273.181818181816,0,0],[55454.181818181816,2,0],[55636.181818181816,3,0],[55818.181818181816,0,0],[56000.181818181816,2,0],[56182.181818181816,3,0],[56363.181818181816,0,0],[56454.181818181816,3,0],[56545.181818181816,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56732.181818181816,1,0],[57091.181818181816,0,0],[57273.181818181816,3,0],[57545.181818181816,2,0],[57727.181818181816,3,0],[57909.181818181816,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58182,3,0],[58545,3,0],[59000,2,0],[59091,0,0],[58727,1,0],[59364,1,0],[59455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[59657,0,272.7272727272727],[60000,2,0],[60364,2,0],[60545,2,0],[60727,2,181.8181818181818]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[61100,2,0],[61455,2,0],[61636,3,0],[61818,1,0],[62000,0,0],[62182,3,0],[62364,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62550,0,0],[63000,0,0],[63727,0,0],[63364,0,0],[63364,7,0],[63545,3,0],[63818,2,0],[63636,5,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64000.181818181816,3,0],[64363.181818181816,3,0],[64818.181818181816,2,0],[64909.181818181816,0,0],[64545.181818181816,1,0],[65182.181818181816,1,0],[65273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[65475.181818181816,0,272.7272727272727],[65818.18181818182,2,0],[66182.18181818182,2,0],[66363.18181818182,2,0],[66545.18181818182,2,181.8181818181818]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[66918.18181818182,2,0],[67273.18181818182,2,0],[67454.18181818182,3,0],[67636.18181818182,1,0],[67818.18181818182,0,0],[68000.18181818182,3,0],[68182.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[68368.18181818182,0,0],[68818.18181818182,0,0],[69545.18181818182,0,0],[69182.18181818182,0,0],[69182.18181818182,7,0],[69363.18181818182,3,0],[69636.18181818182,2,0],[69454.18181818182,5,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69825,2,0],[70000,3,0],[70273,0,0],[70364,3,0],[70545,2,0],[70636,0,0],[71000,2,0],[70727,3,0],[71091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[71280,2,0],[71636,2,0],[71818,0,0],[72091,2,0],[72273,3,0],[72364,0,0],[72545,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72732,0,0],[73091,0,0],[73273,0,0],[73455,2,0],[73364,3,0],[73636,3,0],[73818,2,0],[74000,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74195,2,0],[74364,3,0],[74545,2,0],[74727,0,0],[74909,1,0],[75091,3,0],[75273,0,0],[75455,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[75643.18181818182,2,0],[75818.18181818182,3,0],[76091.18181818182,0,0],[76182.18181818182,3,0],[76363.18181818182,2,0],[76454.18181818182,0,0],[76818.18181818182,2,0],[76545.18181818182,3,0],[76909.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[77098.18181818182,2,0],[77454.18181818182,2,0],[77636.18181818182,0,0],[77909.18181818182,2,0],[78091.18181818182,3,0],[78182.18181818182,0,0],[78363.18181818182,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[78550.18181818182,0,0],[78909.18181818182,0,0],[79091.18181818182,0,0],[79273.18181818182,2,0],[79182.18181818182,3,0],[79454.18181818182,3,0],[79636.18181818182,2,0],[79818.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[80013.18181818182,2,0],[80182.18181818182,3,0],[80363.18181818182,2,0],[80545.18181818182,0,0],[80727.18181818182,1,0],[80909.18181818182,3,0],[81091.18181818182,0,0],[81273.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}]} \ No newline at end of file +{"song":{"song":"South","notes":[{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[11636.818181818182,3,0],[11999.818181818182,3,0],[12363.818181818182,0,0],[12545.818181818182,3,0],[12726.818181818182,2,0],[12908.818181818182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[13101.818181818182,0,0],[13454.818181818182,1,0],[13817.818181818182,3,0],[13999.818181818182,3,0],[14181.818181818182,3,200]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14545.818181818182,3,0],[14908.818181818182,3,0],[15272.818181818182,3,0],[15454.818181818182,2,0],[15636.818181818182,0,0],[15817.818181818182,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16008.818181818182,0,0],[16363.818181818182,0,0],[16726.818181818184,2,0],[17090.818181818184,0,0],[17272.818181818184,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[17455,3,0],[17818,3,0],[18182,0,0],[18364,3,0],[18545,2,0],[18727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18920,0,0],[19273,1,0],[19636,3,0],[19818,3,0],[20000,3,200]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20364,3,0],[20727,3,0],[21091,3,0],[21273,2,0],[21455,0,0],[21636,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21827,0,0],[22182,0,0],[22545,2,0],[22909,0,0],[23091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[23273,2,0],[23455,1,0],[23636,0,0],[23818,0,0],[23909,3,0],[24000,2,0],[24182,0,0],[24364,2,0],[24545,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24734,2,0],[25091,2,0],[25455,2,0],[25636,1,0],[25818,0,0],[26000,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26193,0,0],[26545,0,0],[26727,0,0],[26818,2,0],[26909,3,0],[27000,0,0],[27273,1,0],[27455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[27648,2,0],[28000,2,0],[28364,2,0],[28545,3,0],[28727,0,0],[28909,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[29091.181818181816,2,0],[29273.181818181816,1,0],[29454.181818181816,0,0],[29636.181818181816,0,0],[29727.181818181816,3,0],[29818.181818181816,2,0],[30000.181818181816,0,0],[30182.181818181816,2,0],[30363.181818181816,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30552.181818181816,2,0],[30909.181818181816,2,0],[31273.181818181816,2,0],[31454.181818181816,1,0],[31636.181818181816,0,0],[31818.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32011.181818181816,0,0],[32363.181818181816,0,0],[32545.181818181816,0,0],[32636.181818181816,2,0],[32727.181818181816,3,0],[32818.181818181816,0,0],[33091.181818181816,1,0],[33273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33466.181818181816,2,0],[33818.181818181816,2,0],[34182.181818181816,2,0],[34363.181818181816,3,0],[34545.181818181816,0,0],[34727.181818181816,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34918,2,0],[35091,3,0],[35273,0,0],[35455,2,0],[35636,3,0],[35818,0,0],[36000,2,0],[36182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36380,0,0],[36545,2,0],[36727,3,0],[36909,0,0],[37091,0,0],[37273,3,0],[37455,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[37834,2,0],[38000,3,0],[38182,0,0],[38364,2,0],[38545,3,0],[38727,0,0],[38909,2,0],[39091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[39284,0,0],[39727,3,0],[39909,0,0],[40000,3,0],[40182,0,0],[40364,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40736.181818181816,2,0],[40909.181818181816,3,0],[41091.181818181816,0,0],[41273.181818181816,2,0],[41454.181818181816,3,0],[41636.181818181816,0,0],[41818.181818181816,2,0],[42000.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42198.181818181816,0,0],[42363.181818181816,2,0],[42545.181818181816,3,0],[42727.181818181816,0,0],[42909.181818181816,0,0],[43091.181818181816,3,0],[43273.181818181816,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43652.181818181816,2,0],[43818.181818181816,3,0],[44000.181818181816,0,0],[44182.181818181816,2,0],[44363.181818181816,3,0],[44545.181818181816,0,0],[44727.181818181816,2,0],[44909.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45102.181818181816,0,0],[45545.181818181816,3,0],[45727.181818181816,0,0],[45818.181818181816,3,0],[46000.181818181816,0,0],[46182.181818181816,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46554.818181818184,0,0],[46817.818181818184,3,0],[46908.818181818184,1,0],[47181.818181818184,0,0],[47363.818181818184,3,0],[47454.818181818184,1,0],[47726.818181818184,2,0],[47908.818181818184,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48011.818181818184,0,0],[48181.818181818184,2,0],[48363.818181818184,3,0],[48545.818181818184,0,0],[48726.818181818184,3,0],[48908.818181818184,2,0],[49090.818181818184,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[49545,3,0],[49455,0,0],[49636,2,0],[49818,3,0],[50000,0,0],[50182,2,0],[50364,3,0],[50545,0,0],[50636,3,0],[50727,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50914,1,0],[51273,0,0],[51455,3,0],[51727,2,0],[51909,3,0],[52091,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52373,0,0],[52636,3,0],[52727,1,0],[53000,0,0],[53182,3,0],[53273,1,0],[53545,2,0],[53727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[53830,0,0],[54000,2,0],[54182,3,0],[54364,0,0],[54545,3,0],[54727,2,0],[54909,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55363.181818181816,3,0],[55273.181818181816,0,0],[55454.181818181816,2,0],[55636.181818181816,3,0],[55818.181818181816,0,0],[56000.181818181816,2,0],[56182.181818181816,3,0],[56363.181818181816,0,0],[56454.181818181816,3,0],[56545.181818181816,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56732.181818181816,1,0],[57091.181818181816,0,0],[57273.181818181816,3,0],[57545.181818181816,2,0],[57727.181818181816,3,0],[57909.181818181816,0,0],[57545,4,0],[57636,7,0],[57818,5,0],[58000,7,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58182,3,0],[58545,3,0],[59000,2,0],[59091,0,0],[58727,1,0],[59364,1,0],[59455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[59657,0,272.7272727272727],[60000,2,0],[60364,2,0],[60545,2,0],[60727,2,181.8181818181818]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[61100,2,0],[61455,2,0],[61636,3,0],[61818,1,0],[62000,0,0],[62182,3,0],[62364,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62550,0,0],[63000,0,0],[63727,0,0],[63364,0,0],[63545,3,0],[63818,2,0],[63364,4,0],[63455,7,0],[63636,5,0],[63818,7,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64000.181818181816,3,0],[64363.181818181816,3,0],[64818.181818181816,2,0],[64909.181818181816,0,0],[64545.181818181816,1,0],[65182.181818181816,1,0],[65273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[65475.181818181816,0,272.7272727272727],[65818.18181818182,2,0],[66182.18181818182,2,0],[66363.18181818182,2,0],[66545.18181818182,2,181.8181818181818]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[66918.18181818182,2,0],[67273.18181818182,2,0],[67454.18181818182,3,0],[67636.18181818182,1,0],[67818.18181818182,0,0],[68000.18181818182,3,0],[68182.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[68368.18181818182,0,0],[68818.18181818182,0,0],[69545.18181818182,0,0],[69182.18181818182,0,0],[69363.18181818182,3,0],[69636.18181818182,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69825,2,0],[70000,3,0],[70273,0,0],[70364,3,0],[70545,2,0],[70636,0,0],[71000,2,0],[70727,3,0],[71091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[71280,2,0],[71636,2,0],[71818,0,0],[72091,2,0],[72273,3,0],[72364,0,0],[72545,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72732,0,0],[73091,0,0],[73273,0,0],[73455,2,0],[73364,3,0],[73636,3,0],[73818,2,0],[74000,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74195,2,0],[74364,3,0],[74545,2,0],[74727,0,0],[74909,1,0],[75091,3,0],[75273,0,0],[75455,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[75643.18181818182,2,0],[75818.18181818182,3,0],[76091.18181818182,0,0],[76182.18181818182,3,0],[76363.18181818182,2,0],[76454.18181818182,0,0],[76818.18181818182,2,0],[76545.18181818182,3,0],[76909.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[77098.18181818182,2,0],[77454.18181818182,2,0],[77636.18181818182,0,0],[77909.18181818182,2,0],[78091.18181818182,3,0],[78182.18181818182,0,0],[78363.18181818182,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[78550.18181818182,0,0],[78909.18181818182,0,0],[79091.18181818182,0,0],[79273.18181818182,2,0],[79182.18181818182,3,0],[79454.18181818182,3,0],[79636.18181818182,2,0],[79818.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[80013.18181818182,2,0],[80182.18181818182,3,0],[80363.18181818182,2,0],[80545.18181818182,0,0],[80727.18181818182,1,0],[80909.18181818182,3,0],[81091.18181818182,0,0],[81273.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}],"bpm":165,"sections":0,"needsVoices":true,"player1":"bf","player2":"spooky","sectionLengths":[],"speed":2.200000000000001},"bpm":165,"sections":63,"notes":[{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[11636.818181818182,3,0],[11999.818181818182,3,0],[12363.818181818182,0,0],[12545.818181818182,3,0],[12726.818181818182,2,0],[12908.818181818182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[13101.818181818182,0,0],[13454.818181818182,1,0],[13817.818181818182,3,0],[13999.818181818182,3,0],[14181.818181818182,3,200]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14545.818181818182,3,0],[14908.818181818182,3,0],[15272.818181818182,3,0],[15454.818181818182,2,0],[15636.818181818182,0,0],[15817.818181818182,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16008.818181818182,0,0],[16363.818181818182,0,0],[16726.818181818184,2,0],[17090.818181818184,0,0],[17272.818181818184,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[17455,3,0],[17818,3,0],[18182,0,0],[18364,3,0],[18545,2,0],[18727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18920,0,0],[19273,1,0],[19636,3,0],[19818,3,0],[20000,3,200]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20364,3,0],[20727,3,0],[21091,3,0],[21273,2,0],[21455,0,0],[21636,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[21827,0,0],[22182,0,0],[22545,2,0],[22909,0,0],[23091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[23273,2,0],[23455,1,0],[23636,0,0],[23818,0,0],[23909,3,0],[24000,2,0],[24182,0,0],[24364,2,0],[24545,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24734,2,0],[25091,2,0],[25455,2,0],[25636,1,0],[25818,0,0],[26000,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26193,0,0],[26545,0,0],[26727,0,0],[26818,2,0],[26909,3,0],[27000,0,0],[27273,1,0],[27455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[27648,2,0],[28000,2,0],[28364,2,0],[28545,3,0],[28727,0,0],[28909,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[29091.181818181816,2,0],[29273.181818181816,1,0],[29454.181818181816,0,0],[29636.181818181816,0,0],[29727.181818181816,3,0],[29818.181818181816,2,0],[30000.181818181816,0,0],[30182.181818181816,2,0],[30363.181818181816,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30552.181818181816,2,0],[30909.181818181816,2,0],[31273.181818181816,2,0],[31454.181818181816,1,0],[31636.181818181816,0,0],[31818.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32011.181818181816,0,0],[32363.181818181816,0,0],[32545.181818181816,0,0],[32636.181818181816,2,0],[32727.181818181816,3,0],[32818.181818181816,0,0],[33091.181818181816,1,0],[33273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[33466.181818181816,2,0],[33818.181818181816,2,0],[34182.181818181816,2,0],[34363.181818181816,3,0],[34545.181818181816,0,0],[34727.181818181816,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34918,2,0],[35091,3,0],[35273,0,0],[35455,2,0],[35636,3,0],[35818,0,0],[36000,2,0],[36182,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36380,0,0],[36545,2,0],[36727,3,0],[36909,0,0],[37091,0,0],[37273,3,0],[37455,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[37834,2,0],[38000,3,0],[38182,0,0],[38364,2,0],[38545,3,0],[38727,0,0],[38909,2,0],[39091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[39284,0,0],[39727,3,0],[39909,0,0],[40000,3,0],[40182,0,0],[40364,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40736.181818181816,2,0],[40909.181818181816,3,0],[41091.181818181816,0,0],[41273.181818181816,2,0],[41454.181818181816,3,0],[41636.181818181816,0,0],[41818.181818181816,2,0],[42000.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42198.181818181816,0,0],[42363.181818181816,2,0],[42545.181818181816,3,0],[42727.181818181816,0,0],[42909.181818181816,0,0],[43091.181818181816,3,0],[43273.181818181816,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[43652.181818181816,2,0],[43818.181818181816,3,0],[44000.181818181816,0,0],[44182.181818181816,2,0],[44363.181818181816,3,0],[44545.181818181816,0,0],[44727.181818181816,2,0],[44909.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[45102.181818181816,0,0],[45545.181818181816,3,0],[45727.181818181816,0,0],[45818.181818181816,3,0],[46000.181818181816,0,0],[46182.181818181816,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46554.818181818184,0,0],[46817.818181818184,3,0],[46908.818181818184,1,0],[47181.818181818184,0,0],[47363.818181818184,3,0],[47454.818181818184,1,0],[47726.818181818184,2,0],[47908.818181818184,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48011.818181818184,0,0],[48181.818181818184,2,0],[48363.818181818184,3,0],[48545.818181818184,0,0],[48726.818181818184,3,0],[48908.818181818184,2,0],[49090.818181818184,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[49545,3,0],[49455,0,0],[49636,2,0],[49818,3,0],[50000,0,0],[50182,2,0],[50364,3,0],[50545,0,0],[50636,3,0],[50727,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50914,1,0],[51273,0,0],[51455,3,0],[51727,2,0],[51909,3,0],[52091,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52373,0,0],[52636,3,0],[52727,1,0],[53000,0,0],[53182,3,0],[53273,1,0],[53545,2,0],[53727,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[53830,0,0],[54000,2,0],[54182,3,0],[54364,0,0],[54545,3,0],[54727,2,0],[54909,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[55363.181818181816,3,0],[55273.181818181816,0,0],[55454.181818181816,2,0],[55636.181818181816,3,0],[55818.181818181816,0,0],[56000.181818181816,2,0],[56182.181818181816,3,0],[56363.181818181816,0,0],[56454.181818181816,3,0],[56545.181818181816,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56732.181818181816,1,0],[57091.181818181816,0,0],[57273.181818181816,3,0],[57545.181818181816,2,0],[57727.181818181816,3,0],[57909.181818181816,0,0],[57545,4,0],[57636,7,0],[57818,5,0],[58000,7,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58182,3,0],[58545,3,0],[59000,2,0],[59091,0,0],[58727,1,0],[59364,1,0],[59455,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[59657,0,272.7272727272727],[60000,2,0],[60364,2,0],[60545,2,0],[60727,2,181.8181818181818]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[61100,2,0],[61455,2,0],[61636,3,0],[61818,1,0],[62000,0,0],[62182,3,0],[62364,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62550,0,0],[63000,0,0],[63727,0,0],[63364,0,0],[63545,3,0],[63818,2,0],[63364,4,0],[63455,7,0],[63636,5,0],[63818,7,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64000.181818181816,3,0],[64363.181818181816,3,0],[64818.181818181816,2,0],[64909.181818181816,0,0],[64545.181818181816,1,0],[65182.181818181816,1,0],[65273.181818181816,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[65475.181818181816,0,272.7272727272727],[65818.18181818182,2,0],[66182.18181818182,2,0],[66363.18181818182,2,0],[66545.18181818182,2,181.8181818181818]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[66918.18181818182,2,0],[67273.18181818182,2,0],[67454.18181818182,3,0],[67636.18181818182,1,0],[67818.18181818182,0,0],[68000.18181818182,3,0],[68182.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[68368.18181818182,0,0],[68818.18181818182,0,0],[69545.18181818182,0,0],[69182.18181818182,0,0],[69363.18181818182,3,0],[69636.18181818182,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[69825,2,0],[70000,3,0],[70273,0,0],[70364,3,0],[70545,2,0],[70636,0,0],[71000,2,0],[70727,3,0],[71091,3,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[71280,2,0],[71636,2,0],[71818,0,0],[72091,2,0],[72273,3,0],[72364,0,0],[72545,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[72732,0,0],[73091,0,0],[73273,0,0],[73455,2,0],[73364,3,0],[73636,3,0],[73818,2,0],[74000,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[74195,2,0],[74364,3,0],[74545,2,0],[74727,0,0],[74909,1,0],[75091,3,0],[75273,0,0],[75455,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[75643.18181818182,2,0],[75818.18181818182,3,0],[76091.18181818182,0,0],[76182.18181818182,3,0],[76363.18181818182,2,0],[76454.18181818182,0,0],[76818.18181818182,2,0],[76545.18181818182,3,0],[76909.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[77098.18181818182,2,0],[77454.18181818182,2,0],[77636.18181818182,0,0],[77909.18181818182,2,0],[78091.18181818182,3,0],[78182.18181818182,0,0],[78363.18181818182,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[78550.18181818182,0,0],[78909.18181818182,0,0],[79091.18181818182,0,0],[79273.18181818182,2,0],[79182.18181818182,3,0],[79454.18181818182,3,0],[79636.18181818182,2,0],[79818.18181818182,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[80013.18181818182,2,0],[80182.18181818182,3,0],[80363.18181818182,2,0],[80545.18181818182,0,0],[80727.18181818182,1,0],[80909.18181818182,3,0],[81091.18181818182,0,0],[81273.18181818182,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[]},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0},{"lengthInSteps":16,"bpm":165,"changeBPM":false,"mustHitSection":true,"sectionNotes":[],"typeOfSection":0}]} \ No newline at end of file diff --git a/source/Boyfriend.hx b/source/Boyfriend.hx index 1a8c6cf07..5efc70987 100644 --- a/source/Boyfriend.hx +++ b/source/Boyfriend.hx @@ -3,6 +3,7 @@ package; import flixel.FlxG; import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; +import flixel.util.FlxTimer; using StringTools; @@ -54,6 +55,13 @@ class Boyfriend extends Character override function update(elapsed:Float) { + if (animation.curAnim.name.startsWith('sing')) + { + holdTimer += elapsed; + } + else + holdTimer = 0; + if (animation.curAnim.name.endsWith('miss') && animation.curAnim.finished && !debugMode) { playAnim('idle', true, false, 10); diff --git a/source/Character.hx b/source/Character.hx index da51e2321..813fe4ab6 100644 --- a/source/Character.hx +++ b/source/Character.hx @@ -3,6 +3,8 @@ package; import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; +using StringTools; + class Character extends FlxSprite { public var animOffsets:Map>; @@ -11,6 +13,8 @@ class Character extends FlxSprite public var isPlayer:Bool = false; public var curCharacter:String = 'bf'; + public var holdTimer:Float = 0; + public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false) { animOffsets = new Map>(); @@ -52,6 +56,7 @@ class Character extends FlxSprite addOffset('scared'); playAnim('danceRight'); + case 'dad': // DAD ANIMATION LOADING CODE tex = FlxAtlasFrames.fromSparrow(AssetPaths.DADDY_DEAREST__png, AssetPaths.DADDY_DEAREST__xml); @@ -120,6 +125,29 @@ class Character extends FlxSprite } } + override function update(elapsed:Float) + { + if (curCharacter != 'bf') + { + if (animation.curAnim.name.startsWith('sing')) + { + holdTimer += elapsed; + } + + var dadVar:Float = 4; + + if (curCharacter == 'dad') + dadVar = 6.1; + if (holdTimer >= Conductor.stepCrochet * dadVar * 0.001) + { + dance(); + holdTimer = 0; + } + } + + super.update(elapsed); + } + private var danced:Bool = false; /** diff --git a/source/Note.hx b/source/Note.hx index 748cbe185..06825e717 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -37,6 +37,8 @@ class Note extends FlxSprite isSustainNote = sustainNote; x += 50; + // MAKE SURE ITS DEFINITELY OFF SCREEN? + y -= 2000; this.strumTime = strumTime; this.noteData = noteData; diff --git a/source/PlayState.hx b/source/PlayState.hx index 5a0989afa..17ec105dc 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -30,9 +30,6 @@ import flixel.util.FlxTimer; import haxe.Json; import lime.utils.Assets; -//New Audio BS -//import faxe.Faxe; - using StringTools; class PlayState extends MusicBeatState @@ -811,6 +808,8 @@ class PlayState extends MusicBeatState dad.playAnim('singLEFT', true); } + dad.holdTimer = 0; + if (SONG.needsVoices) vocals.volume = 1; @@ -869,7 +868,7 @@ class PlayState extends MusicBeatState NGio.unlockMedal(60961); Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); #end - + FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.flush(); } @@ -1044,6 +1043,8 @@ class PlayState extends MusicBeatState // FlxG.watch.addQuick('asdfa', upP); if ((upP || rightP || downP || leftP) && !boyfriend.stunned && generatedMusic) { + boyfriend.holdTimer = 0; + var possibleNotes:Array = []; notes.forEachAlive(function(daNote:Note) @@ -1114,9 +1115,9 @@ class PlayState extends MusicBeatState }); } - if (upR || leftR || rightR || downR) + if (boyfriend.holdTimer > Conductor.stepCrochet * 4 * 0.001 && !up && !down && !right && !left) { - if (boyfriend.animation.curAnim.name.startsWith('sing')) + if (boyfriend.animation.curAnim.name.startsWith('sing') && !boyfriend.animation.curAnim.name.endsWith('miss')) { boyfriend.playAnim('idle'); } diff --git a/source/TitleState.hx b/source/TitleState.hx index 51fb8250b..3fc2b4ac5 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -38,7 +38,7 @@ class TitleState extends MusicBeatState ['Ritz dx', 'rest in peace'], ['rate five', 'pls no blam'], ['rhythm gaming', 'ultimate'], ['game of the year', 'forever'], ['you already know', 'we really out here'], ['rise and grind', 'love to luis'], ['like parappa', 'but cooler'], ['album of the year', 'chuckie finster'], ["free gitaroo man", "with love to wandaboy"], ['better than geometry dash', 'fight me robtop'], - ['kiddbrute for president', 'vote now'], ['play dead estate', 'on newgrounds'], ['this is a god damn prototype', 'we workin on it okay'], + ['kiddbrute for president', 'vote now'], ['play dead estate', 'on newgrounds'], ['this a god damn prototype', 'we workin on it okay'], ['WOMEN ARE real', 'this is official'], ['Nintendo Switch', 'Pre-orders now available']]; var curWacky:Array = []; @@ -106,6 +106,10 @@ class TitleState extends MusicBeatState transIn = FlxTransitionableState.defaultTransIn; transOut = FlxTransitionableState.defaultTransOut; + // var music:FlxSound = new FlxSound(); + // music.loadStream('assets/music/freakyMenu' + TitleState.soundExt); + // FlxG.sound.list.add(music); + // music.play(); FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt, 0); FlxG.sound.music.fadeIn(4, 0, 0.7);