updated changelog

week unlockin shit
oops no options lolol
2020-12-27 13:19:06 -05:00 · 2020-12-27 05:57:45 -05:00 · 2020-12-27 05:42:06 -05:00 · 2020-12-27 05:37:04 -05:00 · 2020-12-27 03:13:51 -05:00 · 2020-12-26 21:46:22 -05:00
102 changed files with 751 additions and 242 deletions
@@ -4,8 +4,20 @@ 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]
+## [0.2.5] - 2020-12-27
+### Added
+- MOMMY GF, 3 NEW ASS SONGS BY KAWAISPRITE, NEW ART BY PHANTOMARCADE,WOOOOOOAH!!!!
+- Different icons depending on which character you are against, art by EVILSK8R!!
+- Autosave to chart editor
+- Clear section button to note editor
+- Swap button in note editor
+- a new boot text or two
+- automatic check for when you're on an old version of the game! 
+### Changed
+- Made Spookeez on Normal easier.
+- Mouse is now visible in note editor
 ### Fixed
+- Crash when playing Week 3 and then playing a non-week 3 song
 - When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
 - IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))

@@ -2,7 +2,7 @@
 <project>
 	<!-- _________________________ Application Settings _________________________ -->

-	<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.4.1" company="ninjamuffin99" />
+	<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.5" company="ninjamuffin99" />

 	<!--Switch Export with Unique ApplicationID and Icon-->
 	<set name="APP_ID" value="0x0100f6c013bbc000" />
@@ -58,6 +58,7 @@
 	<!-- _______________________________ Libraries ______________________________ -->

 	<haxelib name="flixel" />
+	<haxedev set='webgl' />

 	<!--In case you want to use the addons package-->
 	<haxelib name="flixel-addons" />
@@ -8,9 +8,9 @@ Support the project on the itch.io page: https://ninja-muffin24.itch.io/funkin

 ## Credits / shoutouts

- [ninjamuffin99 (me!)](twitter.com/ninja_muffin99) - Programmer
- [PhantomArcade3K](twitter.com/phantomarcade3k) and [Evilsk8r](twitter.com/evilsk8r) - Art
- [Kawaisprite](twitter.com/kawaisprite) - Musician
+- [ninjamuffin99 (me!)](https://twitter.com/ninja_muffin99) - Programmer
+- [PhantomArcade3K](https://twitter.com/phantomarcade3k) and [Evilsk8r](https://twitter.com/evilsk8r) - Art
+- [Kawaisprite](https://twitter.com/kawaisprite) - Musician

 This game was made with love to Newgrounds and it's community. Extra love to Tom Fulp.

@@ -62,4 +62,4 @@ To run it for your desktop (Windows, Mac, Linux) it's a bit more complicated. I

 ### Additional guides

- [Command line basics](https://ninjamuffin99.newgrounds.com/news/post/1090480)
+- [Command line basics](https://ninjamuffin99.newgrounds.com/news/post/1090480)
@@ -0,0 +1,15 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build windows -final -clean
+echo UPLOADING 64 BIT VERSION TO ITCH
+butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-64bit
+lime build windows -final -32
+echo UPLOADING 32 BIT VERSION TO ITCH
+butler push ./export/release/windows/bin ninja-muffin24/funkin:windows-32bit
+butler status ninja-muffin24/funkin:windows-32bit
+butler status ninja-muffin24/funkin:windows-64bit
+echo ITCH SHIT UPDATED LMAOOOOO
+pause
@@ -0,0 +1,12 @@
+@echo off
+color 0a
+cd ..
+@echo on
+echo BUILDING GAME
+lime build html5 -final -Dng
+echo ZIPPING
+cd export
+7z a -tzip -r swag release\html5\bin
+start .
+start https://www.newgrounds.com/projects/games/1528775
+pause
@@ -27,4 +27,6 @@ too many people--my head hurts
 newgrounds--forever
 refined taste in music--if i say so myself
 his name isnt keith--dumb eggy lol
-his name isnt evan--silly tiktok
+his name isnt evan--silly tiktok
+stream chuckie finster--on spotify
+never forget to--pray to god
@@ -11,5 +11,6 @@ Luis
 GeoKureli
 Will Blanton
 SrPelo
+Austin East

 BIT BOY - MIKE WELSH
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="Mom_Assets.png">
+	<!-- Created with Adobe Animate version 20.0.0.17400 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="MOM DOWN POSE0000" x="0" y="0" width="410" height="613" frameX="-4" frameY="0" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0001" x="0" y="0" width="410" height="613" frameX="-4" frameY="0" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0002" x="420" y="0" width="403" height="597" frameX="0" frameY="-16" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0003" x="420" y="0" width="403" height="597" frameX="0" frameY="-16" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0004" x="833" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0005" x="833" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0006" x="1246" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0007" x="1246" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0008" x="833" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0009" x="833" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0010" x="1246" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0011" x="1246" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0012" x="833" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0013" x="1659" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="MOM DOWN POSE0014" x="1659" y="0" width="403" height="600" frameX="0" frameY="-13" frameWidth="414" frameHeight="613"/>
+	<SubTexture name="Mom Idle0000" x="2072" y="0" width="386" height="826" frameX="-4" frameY="-2" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0001" x="2072" y="0" width="386" height="826" frameX="-4" frameY="-2" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0002" x="2468" y="0" width="386" height="815" frameX="-4" frameY="-14" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0003" x="2468" y="0" width="386" height="815" frameX="-4" frameY="-14" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0004" x="2864" y="0" width="386" height="822" frameX="-1" frameY="-7" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0005" x="2864" y="0" width="386" height="822" frameX="-1" frameY="-7" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0006" x="3260" y="0" width="386" height="824" frameX="0" frameY="-5" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0007" x="3260" y="0" width="386" height="824" frameX="0" frameY="-5" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0008" x="3656" y="0" width="386" height="828" frameX="0" frameY="-1" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0009" x="3656" y="0" width="386" height="828" frameX="0" frameY="-1" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0010" x="0" y="838" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0011" x="0" y="838" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0012" x="396" y="838" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle0013" x="396" y="838" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Left Pose0000" x="792" y="838" width="602" height="818" frameX="0" frameY="0" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0001" x="792" y="838" width="602" height="818" frameX="0" frameY="0" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0002" x="1404" y="838" width="596" height="803" frameX="-11" frameY="-15" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0003" x="1404" y="838" width="596" height="803" frameX="-11" frameY="-15" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0004" x="2010" y="838" width="596" height="807" frameX="-11" frameY="-11" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0005" x="2010" y="838" width="596" height="807" frameX="-11" frameY="-11" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0006" x="2616" y="838" width="596" height="807" frameX="-11" frameY="-11" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0007" x="2616" y="838" width="596" height="807" frameX="-11" frameY="-11" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0008" x="2010" y="838" width="596" height="807" frameX="-11" frameY="-11" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Left Pose0009" x="2010" y="838" width="596" height="807" frameX="-11" frameY="-11" frameWidth="607" frameHeight="818"/>
+	<SubTexture name="Mom Pose Left0000" x="3222" y="838" width="578" height="771"/>
+	<SubTexture name="Mom Pose Left0001" x="3222" y="838" width="578" height="771"/>
+	<SubTexture name="Mom Pose Left0002" x="0" y="1677" width="564" height="762" frameX="0" frameY="-9" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0003" x="0" y="1677" width="564" height="762" frameX="0" frameY="-9" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0004" x="574" y="1677" width="564" height="764" frameX="0" frameY="-7" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0005" x="574" y="1677" width="564" height="764" frameX="0" frameY="-7" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0006" x="1148" y="1677" width="564" height="764" frameX="0" frameY="-7" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0007" x="1148" y="1677" width="564" height="764" frameX="0" frameY="-7" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0008" x="574" y="1677" width="564" height="764" frameX="0" frameY="-7" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Pose Left0009" x="574" y="1677" width="564" height="764" frameX="0" frameY="-7" frameWidth="578" frameHeight="771"/>
+	<SubTexture name="Mom Up Pose0000" x="1722" y="1677" width="392" height="846" frameX="0" frameY="-9" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0001" x="1722" y="1677" width="392" height="846" frameX="0" frameY="-9" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0002" x="2124" y="1677" width="388" height="862" frameX="-7" frameY="0" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0003" x="2124" y="1677" width="388" height="862" frameX="-7" frameY="0" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0004" x="2522" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0005" x="2522" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0006" x="2920" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0007" x="2920" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0008" x="2522" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0009" x="2522" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0010" x="2920" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0011" x="2920" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0012" x="2522" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0013" x="2522" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+	<SubTexture name="Mom Up Pose0014" x="2920" y="1677" width="388" height="861" frameX="-7" frameY="-1" frameWidth="395" frameHeight="862"/>
+</TextureAtlas>
@@ -5,17 +5,24 @@
 	<SubTexture name="EASY0000" x="0" y="0" width="196" height="65"/>
 	<SubTexture name="HARD0000" x="206" y="0" width="211" height="67"/>
 	<SubTexture name="NORMAL0000" x="427" y="0" width="308" height="67"/>
+	<SubTexture name="WEEK 40000" x="0" y="275" width="355" height="89"/>
+	<SubTexture name="WEEK10000" x="0" y="77" width="360" height="89"/>
 	<SubTexture name="WEEK1 select0000" x="0" y="77" width="360" height="89"/>
 	<SubTexture name="WEEK1 select0001" x="370" y="77" width="360" height="89"/>
+	<SubTexture name="WEEK20000" x="0" y="470" width="361" height="87"/>
+	<SubTexture name="Week 30000" x="0" y="176" width="358" height="89"/>
 	<SubTexture name="Week 3 press0000" x="0" y="176" width="358" height="89"/>
 	<SubTexture name="Week 3 press0001" x="368" y="176" width="358" height="89"/>
-	<SubTexture name="arrow left0000" x="736" y="176" width="48" height="85"/>
-	<SubTexture name="arrow push left0000" x="794" y="176" width="42" height="75"/>
-	<SubTexture name="arrow push right0000" x="846" y="176" width="41" height="74"/>
-	<SubTexture name="arrow right0000" x="897" y="176" width="47" height="85"/>
-	<SubTexture name="lock0000" x="954" y="176" width="67" height="93"/>
-	<SubTexture name="tutorial selected0000" x="0" y="279" width="443" height="82"/>
-	<SubTexture name="tutorial selected0001" x="453" y="279" width="443" height="82"/>
-	<SubTexture name="week2 select0000" x="0" y="371" width="361" height="87"/>
-	<SubTexture name="week2 select0001" x="371" y="371" width="361" height="87"/>
+	<SubTexture name="Week 4 press0000" x="0" y="275" width="355" height="89"/>
+	<SubTexture name="Week 4 press0001" x="365" y="275" width="355" height="89"/>
+	<SubTexture name="arrow left0000" x="730" y="275" width="48" height="85"/>
+	<SubTexture name="arrow push left0000" x="788" y="275" width="42" height="75"/>
+	<SubTexture name="arrow push right0000" x="840" y="275" width="41" height="74"/>
+	<SubTexture name="arrow right0000" x="891" y="275" width="47" height="85"/>
+	<SubTexture name="lock0000" x="948" y="275" width="67" height="93"/>
+	<SubTexture name="tutorial0000" x="0" y="378" width="443" height="82"/>
+	<SubTexture name="tutorial selected0000" x="0" y="378" width="443" height="82"/>
+	<SubTexture name="tutorial selected0001" x="453" y="378" width="443" height="82"/>
+	<SubTexture name="week2 select0000" x="0" y="470" width="361" height="87"/>
+	<SubTexture name="week2 select0001" x="371" y="470" width="361" height="87"/>
 </TextureAtlas>
@@ -86,34 +86,48 @@
 	<SubTexture name="GF Dancing Beat WHITE0027" x="2836" y="1435" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
 	<SubTexture name="GF Dancing Beat WHITE0028" x="3545" y="1435" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
 	<SubTexture name="GF Dancing Beat WHITE0029" x="3545" y="1435" width="699" height="642" frameX="-2" frameY="-6" frameWidth="703" frameHeight="648"/>
-	<SubTexture name="Pico Idle Dance0000" x="4254" y="1435" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0001" x="4254" y="1435" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0002" x="4699" y="1435" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0003" x="4699" y="1435" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0004" x="5151" y="1435" width="448" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0005" x="5609" y="1435" width="444" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0006" x="6063" y="1435" width="444" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0007" x="6517" y="1435" width="442" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0008" x="6969" y="1435" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0009" x="6969" y="1435" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0010" x="6969" y="1435" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0011" x="6969" y="1435" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0012" x="6969" y="1435" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="Pico Idle Dance0013" x="6969" y="1435" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
-	<SubTexture name="spooky dance idle BLACK LINES0000" x="7422" y="1435" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0001" x="7422" y="1435" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0002" x="7813" y="1435" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0003" x="7813" y="1435" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0004" x="0" y="2088" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0005" x="0" y="2088" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0006" x="367" y="2088" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0007" x="367" y="2088" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0008" x="731" y="2088" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0009" x="731" y="2088" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0010" x="1233" y="2088" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0011" x="1233" y="2088" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0012" x="0" y="2088" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0013" x="0" y="2088" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0014" x="367" y="2088" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
-	<SubTexture name="spooky dance idle BLACK LINES0015" x="367" y="2088" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="Mom Idle BLACK LINES0000" x="4254" y="1435" width="386" height="826" frameX="-4" frameY="-2" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0001" x="4254" y="1435" width="386" height="826" frameX="-4" frameY="-2" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0002" x="4650" y="1435" width="386" height="815" frameX="-4" frameY="-14" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0003" x="4650" y="1435" width="386" height="815" frameX="-4" frameY="-14" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0004" x="5046" y="1435" width="386" height="822" frameX="-1" frameY="-7" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0005" x="5046" y="1435" width="386" height="822" frameX="-1" frameY="-7" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0006" x="5442" y="1435" width="386" height="824" frameX="0" frameY="-5" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0007" x="5442" y="1435" width="386" height="824" frameX="0" frameY="-5" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0008" x="5838" y="1435" width="386" height="828" frameX="0" frameY="-1" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0009" x="5838" y="1435" width="386" height="828" frameX="0" frameY="-1" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0010" x="6234" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0011" x="6234" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0012" x="6630" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Mom Idle BLACK LINES0013" x="6630" y="1435" width="386" height="829" frameX="0" frameY="0" frameWidth="390" frameHeight="829"/>
+	<SubTexture name="Pico Idle Dance0000" x="7026" y="1435" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0001" x="7026" y="1435" width="435" height="461" frameX="-18" frameY="-13" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0002" x="7471" y="1435" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0003" x="7471" y="1435" width="442" height="468" frameX="-11" frameY="-6" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0004" x="0" y="2274" width="448" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0005" x="458" y="2274" width="444" height="469" frameX="-1" frameY="-6" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0006" x="912" y="2274" width="444" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0007" x="1366" y="2274" width="442" height="474" frameX="-1" frameY="-1" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0008" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0009" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0010" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0011" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0012" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="Pico Idle Dance0013" x="1818" y="2274" width="443" height="475" frameX="0" frameY="0" frameWidth="453" frameHeight="475"/>
+	<SubTexture name="spooky dance idle BLACK LINES0000" x="2271" y="2274" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0001" x="2271" y="2274" width="381" height="549" frameX="-50" frameY="0" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0002" x="2662" y="2274" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0003" x="2662" y="2274" width="379" height="541" frameX="-55" frameY="-8" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0004" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0005" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0006" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0007" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0008" x="3782" y="2274" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0009" x="3782" y="2274" width="492" height="532" frameX="0" frameY="-16" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0010" x="4284" y="2274" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0011" x="4284" y="2274" width="481" height="524" frameX="-7" frameY="-20" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0012" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0013" x="3051" y="2274" width="357" height="484" frameX="-79" frameY="-61" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0014" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
+	<SubTexture name="spooky dance idle BLACK LINES0015" x="3418" y="2274" width="354" height="494" frameX="-78" frameY="-52" frameWidth="492" frameHeight="549"/>
 </TextureAtlas>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextureAtlas imagePath="healthHeads.png">
-	<!-- Created with Adobe Animate version 20.0.0.17400 -->
-	<!-- http://www.adobe.com/products/animate.html -->
-	<SubTexture name="Boys instance 10000" x="0" y="126" width="180" height="118" frameX="0" frameY="0" frameWidth="190" frameHeight="121"/>
-	<SubTexture name="Boys instance 10001" x="0" y="0" width="190" height="121"/>
-</TextureAtlas>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="bgLimo.png">
+	<!-- Created with Adobe Animate version 20.0.0.17400 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="background limo pink0000" x="0" y="0" width="2199" height="379" frameX="-19" frameY="-5" frameWidth="2218" frameHeight="384"/>
+	<SubTexture name="background limo pink0001" x="0" y="389" width="2218" height="380" frameX="0" frameY="-4" frameWidth="2218" frameHeight="384"/>
+	<SubTexture name="background limo pink0002" x="0" y="779" width="2199" height="384" frameX="-19" frameY="0" frameWidth="2218" frameHeight="384"/>
+	<SubTexture name="background limo pink0003" x="0" y="1173" width="2199" height="384" frameX="-19" frameY="0" frameWidth="2218" frameHeight="384"/>
+</TextureAtlas>
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="limoDancer.png">
+	<!-- Created with Adobe Animate version 20.0.0.17400 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="bg dancer sketch PINK0000" x="0" y="0" width="394" height="394" frameX="0" frameY="-15" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0001" x="0" y="0" width="394" height="394" frameX="0" frameY="-15" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0002" x="404" y="0" width="394" height="391" frameX="0" frameY="-18" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0003" x="404" y="0" width="394" height="391" frameX="0" frameY="-18" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0004" x="404" y="0" width="394" height="391" frameX="0" frameY="-18" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0005" x="808" y="0" width="395" height="390" frameX="0" frameY="-19" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0006" x="808" y="0" width="395" height="390" frameX="0" frameY="-19" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0007" x="1213" y="0" width="389" height="385" frameX="-6" frameY="-24" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0008" x="1213" y="0" width="389" height="385" frameX="-6" frameY="-24" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0009" x="1612" y="0" width="249" height="358" frameX="-123" frameY="-52" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0010" x="1612" y="0" width="249" height="358" frameX="-123" frameY="-52" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0011" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0012" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0013" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0014" x="0" y="404" width="251" height="362" frameX="-121" frameY="-48" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0015" x="261" y="404" width="404" height="410" frameX="-113" frameY="0" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0016" x="261" y="404" width="404" height="410" frameX="-113" frameY="0" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0017" x="675" y="404" width="394" height="404" frameX="-120" frameY="-5" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0018" x="675" y="404" width="394" height="404" frameX="-120" frameY="-5" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0019" x="675" y="404" width="394" height="404" frameX="-120" frameY="-5" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0020" x="1079" y="404" width="395" height="404" frameX="-119" frameY="-5" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0021" x="1079" y="404" width="395" height="404" frameX="-119" frameY="-5" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0022" x="1484" y="404" width="395" height="402" frameX="-119" frameY="-7" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0023" x="1484" y="404" width="395" height="402" frameX="-119" frameY="-7" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0024" x="0" y="824" width="254" height="361" frameX="-141" frameY="-49" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0025" x="0" y="824" width="254" height="361" frameX="-141" frameY="-49" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0026" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0027" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0028" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
+	<SubTexture name="bg dancer sketch PINK0029" x="264" y="824" width="254" height="361" frameX="-139" frameY="-49" frameWidth="517" frameHeight="410"/>
+</TextureAtlas>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="limoDrive.png">
+	<!-- Created with Adobe Animate version 20.0.0.17400 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="Limo stage0000" x="0" y="0" width="2048" height="646"/>
+	<SubTexture name="Limo stage0001" x="0" y="656" width="2048" height="646"/>
+	<SubTexture name="Limo stage0002" x="0" y="1312" width="2048" height="646"/>
+	<SubTexture name="Limo stage0003" x="0" y="0" width="2048" height="646"/>
+</TextureAtlas>
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextureAtlas imagePath="lucky_guitar_assets.png">
-	<!-- Created with Adobe Animate version 20.0.1.19255 -->
-	<!-- http://www.adobe.com/products/animate.html -->
-	<SubTexture name="lucky DOWN note0000" x="0" y="0" width="654" height="489" frameX="-258" frameY="-87" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0001" x="654" y="0" width="811" height="573" frameX="0" frameY="-6" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0002" x="654" y="0" width="811" height="573" frameX="0" frameY="-6" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0003" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0004" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0005" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0006" x="2129" y="0" width="754" height="544" frameX="-136" frameY="-30" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0007" x="2129" y="0" width="754" height="544" frameX="-136" frameY="-30" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0008" x="2129" y="0" width="754" height="544" frameX="-136" frameY="-30" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0009" x="2883" y="0" width="667" height="519" frameX="-216" frameY="-55" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0010" x="2883" y="0" width="667" height="519" frameX="-216" frameY="-55" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0011" x="2883" y="0" width="667" height="519" frameX="-216" frameY="-55" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0012" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0013" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0014" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0015" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0016" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0017" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0018" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0019" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0020" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0021" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0022" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0023" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky DOWN note0024" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
-	<SubTexture name="lucky UP NOTE0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0003" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0004" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0005" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0006" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0007" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0008" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0009" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0010" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0011" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0012" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0013" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0014" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0015" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0016" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0017" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky UP NOTE0018" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky guitar idle0000" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0001" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0002" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0003" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0004" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0005" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0006" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0007" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0008" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0009" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0010" x="730" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0011" x="730" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0012" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0013" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0014" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0015" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0016" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0017" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0018" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0019" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0020" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0021" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0022" x="1347" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0023" x="1347" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0024" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0025" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0026" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0027" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0028" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0029" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0030" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0031" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0032" x="1964" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0033" x="1964" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0034" x="2694" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky guitar idle0035" x="2694" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
-	<SubTexture name="lucky sing left0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0003" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0004" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0005" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0006" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0007" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0008" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0009" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0010" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0011" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0012" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0013" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0014" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0015" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0016" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0017" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing left0018" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0003" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0004" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0005" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0006" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0007" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0008" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0009" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0010" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0011" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0012" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0013" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0014" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0015" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0016" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0017" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-	<SubTexture name="lucky sing right0018" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
-</TextureAtlas>
@@ -48,7 +48,6 @@ class Alphabet extends FlxSpriteGroup
 		this.text = text;
 		isBold = bold;

-
 		if (text != "")
 		{
 			if (typed)
@@ -73,13 +72,13 @@ class Alphabet extends FlxSpriteGroup
 			// {
 			// }

-			if (character == " ")
+			if (character == " " || character == "-")
 			{
 				lastWasSpace = true;
 			}

 			if (AlphaCharacter.alphabet.indexOf(character.toLowerCase()) != -1)
-			//if (AlphaCharacter.alphabet.contains(character.toLowerCase()))
+				// if (AlphaCharacter.alphabet.contains(character.toLowerCase()))
 			{
 				if (lastSprite != null)
 				{
@@ -123,7 +122,6 @@ class Alphabet extends FlxSpriteGroup
 		_finalText = text;
 		doSplitWords();

-
 		// trace(arrayShit);

 		var loopNum:Int = 0;
@@ -140,7 +138,6 @@ class Alphabet extends FlxSpriteGroup
 				xPosResetted = true;
 				xPos = 0;
 				curRow += 1;
-
 			}

 			if (splitWords[loopNum] == " ")
@@ -157,7 +154,7 @@ class Alphabet extends FlxSpriteGroup
 			#end

 			if (AlphaCharacter.alphabet.indexOf(splitWords[loopNum].toLowerCase()) != -1 || isNumber || isSymbol)
-			//if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol)
+				// if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol)

 			{
 				if (lastSprite != null && !xPosResetted)
@@ -0,0 +1,30 @@
+package;
+
+import flixel.FlxSprite;
+import flixel.graphics.frames.FlxAtlasFrames;
+
+class BackgroundDancer extends FlxSprite
+{
+	public function new(x:Float, y:Float)
+	{
+		super(x, y);
+
+		frames = FlxAtlasFrames.fromSparrow(AssetPaths.limoDancer__png, AssetPaths.limoDancer__xml);
+		animation.addByIndices('danceLeft', 'bg dancer sketch PINK', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
+		animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
+		animation.play('danceLeft');
+		antialiasing = true;
+	}
+
+	var danceDir:Bool = false;
+
+	public function dance():Void
+	{
+		danceDir = !danceDir;
+
+		if (danceDir)
+			animation.play('danceRight', true);
+		else
+			animation.play('danceLeft', true);
+	}
+}
@@ -0,0 +1,34 @@
+package;
+
+import flixel.util.FlxColor;
+import openfl.display.ShaderParameter;
+
+typedef BlendModeShader =
+{
+	var uBlendColor:ShaderParameter<Float>;
+}
+
+class BlendModeEffect
+{
+	public var shader(default, null):BlendModeShader;
+
+	@:isVar
+	public var color(default, set):FlxColor;
+
+	public function new(shader:BlendModeShader, color:FlxColor):Void
+	{
+		shader.uBlendColor.value = [];
+		this.shader = shader;
+		this.color = color;
+	}
+
+	function set_color(color:FlxColor):FlxColor
+	{
+		shader.uBlendColor.value[0] = color.redFloat;
+		shader.uBlendColor.value[1] = color.greenFloat;
+		shader.uBlendColor.value[2] = color.blueFloat;
+		shader.uBlendColor.value[3] = color.alphaFloat;
+
+		return this.color = color;
+	}
+}
@@ -96,6 +96,25 @@ class Character extends FlxSprite
 				addOffset("singDOWN", -50, -130);

 				playAnim('danceRight');
+			case 'mom':
+				tex = FlxAtlasFrames.fromSparrow(AssetPaths.Mom_Assets__png, AssetPaths.Mom_Assets__xml);
+				frames = tex;
+
+				animation.addByPrefix('idle', "Mom Idle", 24, false);
+				animation.addByPrefix('singUP', "Mom Up Pose", 24, false);
+				animation.addByPrefix('singDOWN', "MOM DOWN POSE", 24, false);
+				animation.addByPrefix('singLEFT', 'Mom Left Pose', 24, false);
+				// ANIMATION IS CALLED MOM LEFT POSE BUT ITS FOR THE RIGHT
+				// CUZ DAVE IS DUMB!
+				animation.addByPrefix('singRIGHT', 'Mom Pose Left', 24, false);
+
+				playAnim('idle');
+
+				addOffset('idle');
+				addOffset("singUP", 14, 71);
+				addOffset("singRIGHT", 10, -60);
+				addOffset("singLEFT", 250, -23);
+				addOffset("singDOWN", 20, -160);
 			case 'monster':
 				tex = FlxAtlasFrames.fromSparrow(AssetPaths.Monster_Assets__png, AssetPaths.Monster_Assets__xml);
 				frames = tex;
@@ -229,6 +248,8 @@ class Character extends FlxSprite
 	{
 		switch (curCharacter)
 		{
+			case 'mom':
+				playAnim('idle');
 			case 'bf':

 			case 'gf':
@@ -102,6 +102,9 @@ class ChartingState extends MusicBeatState
 			};
 		}

+		FlxG.mouse.visible = true;
+		FlxG.save.bind('funkin', 'ninjamuffin99');
+
 		tempBpm = _song.bpm;

 		addSection();
@@ -175,6 +178,8 @@ class ChartingState extends MusicBeatState
 			loadJson(_song.song.toLowerCase());
 		});

+		var loadAutosaveBtn:FlxButton = new FlxButton(reloadSongJson.x, reloadSongJson.y + 30, 'load autosave', loadAutosave);
+
 		var stepperSpeed:FlxUINumericStepper = new FlxUINumericStepper(10, 80, 0.1, 1, 0.1, 10, 1);
 		stepperSpeed.value = _song.speed;
 		stepperSpeed.name = 'song_speed';
@@ -183,7 +188,7 @@ class ChartingState extends MusicBeatState
 		stepperBPM.value = Conductor.bpm;
 		stepperBPM.name = 'song_bpm';

-		var characters:Array<String> = ["bf", 'dad', 'gf', 'spooky', 'monster', 'pico'];
+		var characters:Array<String> = ["bf", 'dad', 'gf', 'spooky', 'monster', 'pico', 'mom'];

 		var player1DropDown = new FlxUIDropDownMenu(10, 100, FlxUIDropDownMenu.makeStrIdLabelArray(characters, true), function(character:String)
 		{
@@ -206,6 +211,7 @@ class ChartingState extends MusicBeatState
 		tab_group_song.add(saveButton);
 		tab_group_song.add(reloadSong);
 		tab_group_song.add(reloadSongJson);
+		tab_group_song.add(loadAutosaveBtn);
 		tab_group_song.add(stepperBPM);
 		tab_group_song.add(stepperSpeed);
 		tab_group_song.add(player1DropDown);
@@ -235,13 +241,26 @@ class ChartingState extends MusicBeatState
 		stepperSectionBPM.value = Conductor.bpm;
 		stepperSectionBPM.name = 'section_bpm';

-		var stepperCopy:FlxUINumericStepper = new FlxUINumericStepper(110, 30, 1, 1, -999, 999, 0);
+		var stepperCopy:FlxUINumericStepper = new FlxUINumericStepper(110, 130, 1, 1, -999, 999, 0);

-		var copyButton:FlxButton = new FlxButton(110, 8, "Copy last section", function()
+		var copyButton:FlxButton = new FlxButton(10, 130, "Copy last section", function()
 		{
 			copySection(Std.int(stepperCopy.value));
 		});

+		var clearSectionButton:FlxButton = new FlxButton(10, 150, "Clear", clearSection);
+
+		var swapSection:FlxButton = new FlxButton(10, 170, "Swap section", function()
+		{
+			for (i in 0..._song.notes[curSection].sectionNotes.length)
+			{
+				var note = _song.notes[curSection].sectionNotes[i];
+				note[1] = (note[1] + 4) % 8;
+				_song.notes[curSection].sectionNotes[i] = note;
+				updateGrid();
+			}
+		});
+
 		check_mustHitSection = new FlxUICheckBox(10, 30, null, null, "Must hit section", 100);
 		check_mustHitSection.name = 'check_mustHit';
 		check_mustHitSection.checked = true;
@@ -256,6 +275,8 @@ class ChartingState extends MusicBeatState
 		tab_group_section.add(check_mustHitSection);
 		tab_group_section.add(check_changeBPM);
 		tab_group_section.add(copyButton);
+		tab_group_section.add(clearSectionButton);
+		tab_group_section.add(swapSection);

 		UI_box.addGroup(tab_group_section);
 	}
@@ -489,21 +510,43 @@ class ChartingState extends MusicBeatState
 					changeSection(curSection);
 			}

-			if (FlxG.keys.pressed.W || FlxG.keys.pressed.S)
+			if (!FlxG.keys.pressed.SHIFT)
 			{
-				FlxG.sound.music.pause();
-				vocals.pause();
-
-				var daTime:Float = 700 * FlxG.elapsed;
-
-				if (FlxG.keys.pressed.W)
+				if (FlxG.keys.pressed.W || FlxG.keys.pressed.S)
 				{
-					FlxG.sound.music.time -= daTime;
-				}
-				else
-					FlxG.sound.music.time += daTime;
+					FlxG.sound.music.pause();
+					vocals.pause();

-				vocals.time = FlxG.sound.music.time;
+					var daTime:Float = 700 * FlxG.elapsed;
+
+					if (FlxG.keys.pressed.W)
+					{
+						FlxG.sound.music.time -= daTime;
+					}
+					else
+						FlxG.sound.music.time += daTime;
+
+					vocals.time = FlxG.sound.music.time;
+				}
+			}
+			else
+			{
+				if (FlxG.keys.justPressed.W || FlxG.keys.justPressed.S)
+				{
+					FlxG.sound.music.pause();
+					vocals.pause();
+
+					var daTime:Float = Conductor.stepCrochet * 2;
+
+					if (FlxG.keys.justPressed.W)
+					{
+						FlxG.sound.music.time -= daTime;
+					}
+					else
+						FlxG.sound.music.time += daTime;
+
+					vocals.time = FlxG.sound.music.time;
+				}
 			}
 		}

@@ -722,6 +765,13 @@ class ChartingState extends MusicBeatState
 		updateGrid();
 	}

+	function clearSection():Void
+	{
+		_song.notes[curSection].sectionNotes = [];
+
+		updateGrid();
+	}
+
 	function clearSong():Void
 	{
 		for (daSection in 0..._song.notes.length)
@@ -747,6 +797,8 @@ class ChartingState extends MusicBeatState

 		updateGrid();
 		updateNoteUI();
+
+		autosaveSong();
 	}

 	function getStrumTime(yPos:Float):Float
@@ -807,11 +859,21 @@ class ChartingState extends MusicBeatState
 		FlxG.resetState();
 	}

-	var mp3File:Sound;
-	var waveForm:FlxSprite;
-
-	function drawWave():Void
+	function loadAutosave():Void
 	{
+		PlayState.SONG = Song.parseJSONshit(FlxG.save.data.autosave);
+		FlxG.resetState();
+	}
+
+	function autosaveSong():Void
+	{
+		FlxG.save.data.autosave = Json.stringify({
+			"song": _song,
+			"bpm": Conductor.bpm,
+			"sections": _song.notes.length,
+			'notes': _song.notes
+		});
+		FlxG.save.flush();
 	}

 	private function saveLevel()
@@ -55,6 +55,13 @@ class FreeplayState extends MusicBeatState
 			songs.push('Blammed');
 		}

+		if (StoryMenuState.weekUnlocked[4] || isDebug)
+		{
+			songs.push('Satin-Panties');
+			songs.push('High');
+			songs.push('Milf');
+		}
+
 		// LOAD MUSIC

 		// LOAD CHARACTERS
@@ -0,0 +1,26 @@
+package;
+
+import flixel.FlxSprite;
+
+class HealthIcon extends FlxSprite
+{
+	public function new(char:String = 'bf', isPlayer:Bool = false)
+	{
+		super();
+
+		loadGraphic(AssetPaths.iconGrid__png, true, 150, 150);
+
+		antialiasing = true;
+		animation.add('bf', [0, 1], 0, false, isPlayer);
+		animation.add('spooky', [2, 3], 0, false, isPlayer);
+		animation.add('pico', [4, 5], 0, false, isPlayer);
+		animation.add('mom', [6, 7], 0, false, isPlayer);
+		animation.add('tankman', [8, 9], 0, false, isPlayer);
+		animation.add('face', [10, 11], 0, false, isPlayer);
+		animation.add('dad', [12, 13], 0, false, isPlayer);
+		animation.add('bf-old', [14, 15], 0, false, isPlayer);
+		animation.add('gf', [16], 0, false, isPlayer);
+		animation.play(char);
+		scrollFactor.set();
+	}
+}
@@ -13,6 +13,8 @@ import flixel.util.FlxColor;
 import io.newgrounds.NG;
 import lime.app.Application;

+using StringTools;
+
 class MainMenuState extends MusicBeatState
 {
 	var curSelected:Int = 0;
@@ -87,7 +89,14 @@ class MainMenuState extends MusicBeatState
 		versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
 		add(versionShit);

-		NG.core.calls.event.logEvent('swag').send();
+		if (versionShit.text.trim() != NGio.GAME_VER.trim() && !OutdatedSubState.leftState)
+		{
+			trace('OLD VERSION!');
+
+			FlxG.switchState(new OutdatedSubState());
+		}
+
+		// NG.core.calls.event.logEvent('swag').send();

 		changeItem();

@@ -22,6 +22,7 @@ class MenuCharacter extends FlxSprite
 		animation.addByPrefix('dad', "Dad idle dance BLACK LINE", 24);
 		animation.addByPrefix('spooky', "spooky dance idle BLACK LINES", 24);
 		animation.addByPrefix('pico', "Pico Idle Dance", 24);
+		animation.addByPrefix('mom', "Mom Idle BLACK LINES", 24);

 		animation.play(character);
 		updateHitbox();
@@ -23,6 +23,7 @@ class MenuItem extends FlxSpriteGroup
 		week.animation.addByPrefix('week1', "WEEK1 select", 24);
 		week.animation.addByPrefix('week2', "week2 select", 24);
 		week.animation.addByPrefix('week3', "Week 3 press", 24);
+		week.animation.addByPrefix('week4', "Week 4 press", 24);
 		add(week);

 		week.animation.play('week' + weekNum);
@@ -2,11 +2,16 @@ package;

 import flixel.FlxG;
 import flixel.util.FlxSignal;
+import flixel.util.FlxTimer;
 import io.newgrounds.NG;
 import io.newgrounds.components.ScoreBoardComponent.Period;
 import io.newgrounds.objects.Medal;
 import io.newgrounds.objects.Score;
 import io.newgrounds.objects.ScoreBoard;
+import io.newgrounds.objects.events.Response;
+import io.newgrounds.objects.events.Result.GetCurrentVersionResult;
+import io.newgrounds.objects.events.Result.GetVersionResult;
+import lime.app.Application;
 import openfl.display.Stage;

 /**
@@ -22,9 +27,27 @@ class NGio
 	public static var ngDataLoaded(default, null):FlxSignal = new FlxSignal();
 	public static var ngScoresLoaded(default, null):FlxSignal = new FlxSignal();

+	public static var GAME_VER:String = "";
+	public static var gotOnlineVer:Bool = false;
+
 	public static function noLogin(api:String)
 	{
+		trace('INIT NOLOGIN');
+		GAME_VER = "v" + Application.current.meta.get('version');
+
 		NG.create(api);
+
+		new FlxTimer().start(2, function(tmr:FlxTimer)
+		{
+			var call = NG.core.calls.app.getCurrentVersion(GAME_VER).addDataHandler(function(response:Response<GetCurrentVersionResult>)
+			{
+				GAME_VER = response.result.data.current_version;
+				trace('CURRENT NG VERSION: ' + GAME_VER);
+				gotOnlineVer = true;
+			});
+
+			call.send();
+		});
 	}

 	public function new(api:String, encKey:String, ?sessionId:String)
@@ -153,11 +176,8 @@ class NGio

 	inline static public function logEvent(event:String)
 	{
-		if (isLoggedIn)
-		{
-			NG.core.calls.event.logEvent(event);
-			trace('should have logged: ' + event);
-		}
+		NG.core.calls.event.logEvent(event).send();
+		trace('should have logged: ' + event);
 	}

 	inline static public function unlockMedal(id:Int)
@@ -0,0 +1,45 @@
+package;
+
+import flixel.FlxG;
+import flixel.FlxSprite;
+import flixel.FlxSubState;
+import flixel.text.FlxText;
+import flixel.util.FlxColor;
+import lime.app.Application;
+
+class OutdatedSubState extends MusicBeatState
+{
+	public static var leftState:Bool = false;
+
+	override function create()
+	{
+		super.create();
+		var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
+		add(bg);
+		var ver = "v" + Application.current.meta.get('version');
+		var txt:FlxText = new FlxText(0, 0, FlxG.width,
+			"HEY! You're running an outdated version of the game!\nCurrent version is "
+			+ ver
+			+ " while the most recent version is "
+			+ NGio.GAME_VER
+			+ "! Press Space to go to itch.io, or ESCAPE to ignore this!!",
+			32);
+		txt.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, CENTER);
+		txt.screenCenter();
+		add(txt);
+	}
+
+	override function update(elapsed:Float)
+	{
+		if (controls.ACCEPT)
+		{
+			FlxG.openURL("https://ninja-muffin24.itch.io/funkin");
+		}
+		if (controls.BACK)
+		{
+			leftState = true;
+			FlxG.switchState(new MainMenuState());
+		}
+		super.update(elapsed);
+	}
+}
@@ -0,0 +1,33 @@
+package;
+
+import flixel.system.FlxAssets.FlxShader;
+
+class OverlayShader extends FlxShader
+{
+	@:glFragmentSource('
+		#pragma header
+		uniform vec4 uBlendColor;
+
+		vec3 blendLighten(base:Vec3, blend:Vec3) : Vec3 {
+			return mix(
+				1.0 - 2.0 * (1.0 - base) * (1.0 - blend),
+				2.0 * base * blend,
+				step( base, vec3(0.5) )
+			);
+		}
+
+		vec4 blendLighten(vec4 base, vec4 blend, float opacity)
+		{
+			return (blendLighten(base, blend) * opacity + base * (1.0 - opacity));
+		}
+
+		void main()
+		{
+			vec4 base = texture2D(bitmap, openfl_TextureCoordv);
+			gl_FragColor = blendLighten(base, uBlendColor, uBlendColor.a);
+		}')
+	public function new()
+	{
+		super();
+	}
+}
@@ -46,7 +46,7 @@ class PauseSubState extends MusicBeatSubstate

 		changeSelection();

-		cameras = [FlxG.cameras.list[1]];
+		cameras = [FlxG.cameras.list[FlxG.cameras.list.length - 1]];
 	}

 	override function update(elapsed:Float)
@@ -29,6 +29,8 @@ import flixel.util.FlxStringUtil;
 import flixel.util.FlxTimer;
 import haxe.Json;
 import lime.utils.Assets;
+import openfl.display.BlendMode;
+import openfl.filters.ShaderFilter;

 using StringTools;

@@ -73,7 +75,8 @@ class PlayState extends MusicBeatState
 	private var generatedMusic:Bool = false;
 	private var startingSong:Bool = false;

-	private var healthHeads:FlxSprite;
+	private var iconP1:HealthIcon;
+	private var iconP2:HealthIcon;
 	private var camHUD:FlxCamera;
 	private var camGame:FlxCamera;

@@ -86,12 +89,18 @@ class PlayState extends MusicBeatState
 	var phillyTrain:FlxSprite;
 	var trainSound:FlxSound;

+	var limo:FlxSprite;
+	var grpLimoDancers:FlxTypedGroup<BackgroundDancer>;
+	var fastCar:FlxSprite;
+
 	var talking:Bool = true;
 	var songScore:Int = 0;
 	var scoreTxt:FlxText;

 	public static var campaignScore:Int = 0;

+	var defaultCamZoom:Float = 1.05;
+
 	override public function create()
 	{
 		// var gameCam:FlxCamera = FlxG.camera;
@@ -135,6 +144,7 @@ class PlayState extends MusicBeatState

 		if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
 		{
+			curStage = "spooky";
 			halloweenLevel = true;

 			var hallowTex = FlxAtlasFrames.fromSparrow(AssetPaths.halloween_bg__png, AssetPaths.halloween_bg__xml);
@@ -190,8 +200,56 @@ class PlayState extends MusicBeatState
 			var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(AssetPaths.street__png);
 			add(street);
 		}
+		else if (SONG.song.toLowerCase() == 'milf' || SONG.song.toLowerCase() == 'satin-panties' || SONG.song.toLowerCase() == 'high')
+		{
+			curStage = 'limo';
+			defaultCamZoom = 0.90;
+
+			var skyBG:FlxSprite = new FlxSprite(-120, -50).loadGraphic(AssetPaths.limoSunset__png);
+			skyBG.scrollFactor.set(0.1, 0.1);
+			add(skyBG);
+
+			var bgLimo:FlxSprite = new FlxSprite(-200, 480);
+			bgLimo.frames = FlxAtlasFrames.fromSparrow(AssetPaths.bgLimo__png, AssetPaths.bgLimo__xml);
+			bgLimo.animation.addByPrefix('drive', "background limo pink", 24);
+			bgLimo.animation.play('drive');
+			bgLimo.scrollFactor.set(0.4, 0.4);
+			add(bgLimo);
+
+			grpLimoDancers = new FlxTypedGroup<BackgroundDancer>();
+			add(grpLimoDancers);
+
+			for (i in 0...5)
+			{
+				var dancer:BackgroundDancer = new BackgroundDancer((370 * i) + 130, bgLimo.y - 400);
+				dancer.scrollFactor.set(0.4, 0.4);
+				grpLimoDancers.add(dancer);
+			}
+
+			var overlayShit:FlxSprite = new FlxSprite(-500, -600).loadGraphic(AssetPaths.limoOverlay__png);
+			overlayShit.alpha = 0.5;
+			// add(overlayShit);
+
+			// var shaderBullshit = new BlendModeEffect(new OverlayShader(), FlxColor.RED);
+
+			// FlxG.camera.setFilters([new ShaderFilter(cast shaderBullshit.shader)]);
+
+			// overlayShit.shader = shaderBullshit;
+
+			var limoTex = FlxAtlasFrames.fromSparrow(AssetPaths.limoDrive__png, AssetPaths.limoDrive__xml);
+
+			limo = new FlxSprite(-120, 550);
+			limo.frames = limoTex;
+			limo.animation.addByPrefix('drive', "Limo stage", 24);
+			limo.animation.play('drive');
+			limo.antialiasing = true;
+
+			fastCar = new FlxSprite(-300, 160).loadGraphic(AssetPaths.fastCarLol__png);
+			// add(limo);
+		}
 		else
 		{
+			curStage = 'stage';
 			var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.stageback__png);
 			// bg.setGraphicSize(Std.int(bg.width * 2.5));
 			// bg.updateHitbox();
@@ -223,6 +281,10 @@ class PlayState extends MusicBeatState
 		gf.antialiasing = true;
 		add(gf);

+		// Shitty layering but whatev it works LOL
+		if (curStage == 'limo')
+			add(limo);
+
 		dad = new Character(100, 100, SONG.player2);
 		add(dad);

@@ -253,6 +315,19 @@ class PlayState extends MusicBeatState
 		boyfriend = new Boyfriend(770, 450);
 		add(boyfriend);

+		// REPOSITIONING PER STAGE
+		switch (curStage)
+		{
+			case 'limo':
+				{
+					boyfriend.y -= 220;
+					boyfriend.x += 260;
+
+					resetFastCar();
+					add(fastCar);
+				}
+		}
+
 		var doof:DialogueBox = new DialogueBox(false, dialogue);
 		// doof.x += 70;
 		doof.y = FlxG.height * 0.5;
@@ -284,7 +359,7 @@ class PlayState extends MusicBeatState

 		FlxG.camera.follow(camFollow, LOCKON, 0.04);
 		// FlxG.camera.setScrollBounds(0, FlxG.width, 0, FlxG.height);
-		FlxG.camera.zoom = 1.05;
+		FlxG.camera.zoom = defaultCamZoom;

 		FlxG.worldBounds.set(0, 0, FlxG.width, FlxG.height);

@@ -307,17 +382,14 @@ class PlayState extends MusicBeatState
 		scoreTxt.scrollFactor.set();
 		add(scoreTxt);

-		healthHeads = new FlxSprite();
-		var headTex = FlxAtlasFrames.fromSparrow(AssetPaths.healthHeads__png, AssetPaths.healthHeads__xml);
-		healthHeads.frames = headTex;
-		healthHeads.animation.add('healthy', [0]);
-		healthHeads.animation.add('unhealthy', [1]);
-		healthHeads.y = healthBar.y - (healthHeads.height / 2);
-		healthHeads.scrollFactor.set();
-		healthHeads.antialiasing = true;
-		add(healthHeads);
+		iconP1 = new HealthIcon(SONG.player1, true);
+		iconP1.y = healthBar.y - (iconP1.height / 2);
+		add(iconP1);
+
+		iconP2 = new HealthIcon(SONG.player2, false);
+		iconP2.y = healthBar.y - (iconP2.height / 2);
+		add(iconP2);

-		// healthBar.visible = healthHeads.visible = healthBarBG.visible = false;
 		if (isStoryMode)
 		{
 			// TEMP for now, later get rid of startCountdown()
@@ -331,7 +403,8 @@ class PlayState extends MusicBeatState
 		notes.cameras = [camHUD];
 		healthBar.cameras = [camHUD];
 		healthBarBG.cameras = [camHUD];
-		healthHeads.cameras = [camHUD];
+		iconP1.cameras = [camHUD];
+		iconP2.cameras = [camHUD];
 		scoreTxt.cameras = [camHUD];
 		doof.cameras = [camHUD];

@@ -349,6 +422,7 @@ class PlayState extends MusicBeatState
 	}

 	var startTimer:FlxTimer;
+	var perfectMode:Bool = false;

 	function startCountdown():Void
 	{
@@ -654,6 +728,18 @@ class PlayState extends MusicBeatState

 	override public function update(elapsed:Float)
 	{
+		#if !debug
+		perfectMode = false;
+		#end
+
+		if (FlxG.keys.justPressed.NINE)
+		{
+			if (iconP1.animation.curAnim.name == 'bf-old')
+				iconP1.animation.play(SONG.player1);
+			else
+				iconP1.animation.play('bf-old');
+		}
+
 		switch (curStage)
 		{
 			case 'philly':
@@ -692,17 +778,24 @@ class PlayState extends MusicBeatState
 		// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
 		// FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight);

-		healthHeads.setGraphicSize(Std.int(FlxMath.lerp(150, healthHeads.width, 0.50)));
-		healthHeads.updateHitbox();
-		healthHeads.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01)) - (healthHeads.width / 2);
+		iconP1.setGraphicSize(Std.int(FlxMath.lerp(150, iconP1.width, 0.50)));
+		iconP2.setGraphicSize(Std.int(FlxMath.lerp(150, iconP2.width, 0.50)));
+
+		iconP1.updateHitbox();
+		iconP2.updateHitbox();
+
+		var iconOffset:Int = 26;
+
+		iconP1.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01) - iconOffset);
+		iconP2.x = healthBar.x + (healthBar.width * (FlxMath.remapToRange(healthBar.percent, 0, 100, 100, 0) * 0.01)) - (iconP2.width - iconOffset);

 		if (health > 2)
 			health = 2;

 		if (healthBar.percent < 20)
-			healthHeads.animation.play('unhealthy');
+			iconP1.animation.curAnim.curFrame = 1;
 		else
-			healthHeads.animation.play('healthy');
+			iconP1.animation.curAnim.curFrame = 0;

 		/* if (FlxG.keys.justPressed.NINE)
 			FlxG.switchState(new Charting()); */
@@ -755,6 +848,8 @@ class PlayState extends MusicBeatState
 			{
 				camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100);
 				// camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210);
+				if (dad.curCharacter == 'mom')
+					camFollow.y = dad.getMidpoint().y;
 				vocals.volume = 1;

 				if (SONG.song.toLowerCase() == 'tutorial')
@@ -767,6 +862,11 @@ class PlayState extends MusicBeatState
 			{
 				camFollow.setPosition(boyfriend.getMidpoint().x - 100, boyfriend.getMidpoint().y - 100);

+				if (curStage == 'limo')
+				{
+					camFollow.x = boyfriend.getMidpoint().x - 300;
+				}
+
 				if (SONG.song.toLowerCase() == 'tutorial')
 				{
 					FlxTween.tween(FlxG.camera, {zoom: 1}, (Conductor.stepCrochet * 4 / 1000), {ease: FlxEase.elasticInOut});
@@ -776,7 +876,7 @@ class PlayState extends MusicBeatState

 		if (camZooming)
 		{
-			FlxG.camera.zoom = FlxMath.lerp(1.05, FlxG.camera.zoom, 0.95);
+			FlxG.camera.zoom = FlxMath.lerp(defaultCamZoom, FlxG.camera.zoom, 0.95);
 			camHUD.zoom = FlxMath.lerp(1, camHUD.zoom, 0.95);
 		}

@@ -899,7 +999,7 @@ class PlayState extends MusicBeatState
 					daNote.destroy();
 				}

-				daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
+				daNote.y = (strumLine.y - (Conductor.songPosition - daNote.strumTime) * (0.45 * FlxMath.roundDecimal(PlayState.SONG.speed, 2)));

 				// WIP interpolation shit? Need to fix the pause issue
 				// daNote.y = (strumLine.y - (songTime - daNote.strumTime) * (0.45 * PlayState.SONG.speed));
@@ -974,11 +1074,13 @@ class PlayState extends MusicBeatState
 				trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);

 				PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]);
+				FlxG.sound.music.stop();
 				FlxG.switchState(new PlayState());
 			}
 		}
 		else
 		{
+			trace('WENT BACK TO FREEPLAY??');
 			FlxG.switchState(new FreeplayState());
 		}
 	}
@@ -1147,6 +1249,9 @@ class PlayState extends MusicBeatState
 			{
 				for (daNote in possibleNotes)
 				{
+					if (perfectMode)
+						noteCheck(true, daNote);
+
 					switch (daNote.noteData)
 					{
 						case 2: // NOTES YOU JUST PRESSED
@@ -1382,6 +1487,28 @@ class PlayState extends MusicBeatState
 		}
 	}

+	var fastCarCanDrive:Bool = true;
+
+	function resetFastCar():Void
+	{
+		fastCar.x = -12600;
+		fastCar.y = FlxG.random.int(140, 250);
+		fastCar.velocity.x = 0;
+		fastCarCanDrive = true;
+	}
+
+	function fastCarDrive()
+	{
+		FlxG.sound.play('assets/sounds/carPass' + FlxG.random.int(0, 1) + TitleState.soundExt, 0.7);
+
+		fastCar.velocity.x = (FlxG.random.int(170, 220) / FlxG.elapsed) * 3;
+		fastCarCanDrive = false;
+		new FlxTimer().start(2, function(tmr:FlxTimer)
+		{
+			resetFastCar();
+		});
+	}
+
 	var trainMoving:Bool = false;
 	var trainFrameTiming:Float = 0;

@@ -1494,14 +1621,24 @@ class PlayState extends MusicBeatState
 		}
 		// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);

+		// HARDCODING FOR MILF ZOOMS!
+		if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat <= 200 && camZooming && FlxG.camera.zoom < 1.35)
+		{
+			FlxG.camera.zoom += 0.015;
+			camHUD.zoom += 0.03;
+		}
+
 		if (camZooming && FlxG.camera.zoom < 1.35 && totalBeats % 4 == 0)
 		{
 			FlxG.camera.zoom += 0.015;
 			camHUD.zoom += 0.03;
 		}

-		healthHeads.setGraphicSize(Std.int(healthHeads.width + 30));
-		healthHeads.updateHitbox();
+		iconP1.setGraphicSize(Std.int(iconP1.width + 30));
+		iconP2.setGraphicSize(Std.int(iconP2.width + 30));
+
+		iconP1.updateHitbox();
+		iconP2.updateHitbox();

 		if (totalBeats % gfSpeed == 0)
 		{
@@ -1523,6 +1660,14 @@ class PlayState extends MusicBeatState

 		switch (curStage)
 		{
+			case 'limo':
+				grpLimoDancers.forEach(function(dancer:BackgroundDancer)
+				{
+					dancer.dance();
+				});
+
+				if (FlxG.random.bool(10) && fastCarCanDrive)
+					fastCarDrive();
 			case "philly":
 				if (!trainMoving)
 					trainCooldown += 1;
@@ -58,10 +58,6 @@ class Song
 			// LOL GOING THROUGH THE BULLSHIT TO CLEAN IDK WHATS STRANGE
 		}

-		var swagShit:SwagSong = cast Json.parse(rawJson).song;
-		swagShit.validScore = true;
-		trace(swagShit.notes[0]);
-
 		// FIX THE CASTING ON WINDOWS/NATIVE
 		// Windows???
 		// trace(songData);
@@ -80,6 +76,13 @@ class Song
 				daBpm = songData.bpm;
 				daSectionLengths = songData.sectionLengths; */

+		return parseJSONshit(rawJson);
+	}
+
+	public static function parseJSONshit(rawJson:String):SwagSong
+	{
+		var swagShit:SwagSong = cast Json.parse(rawJson).song;
+		swagShit.validScore = true;
 		return swagShit;
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Cameron Taylor	1cc08a2241	updated changelog	2020-12-27 13:19:06 -05:00
Cameron Taylor	054ae8a216	week unlockin shit	2020-12-27 05:57:45 -05:00
Cameron Taylor	3e3197711e	oops no options lolol	2020-12-27 05:42:06 -05:00
Cameron Taylor	57d4e1fda2	maybe ready to go???	2020-12-27 05:37:04 -05:00
Cameron Taylor	5fa5f2bac5	bg dancers coded	2020-12-27 03:13:51 -05:00
Cameron Taylor	2ba49b1e64	CHARTS	2020-12-26 21:46:22 -05:00
Cameron Taylor	3fa66ee1d1	charts and shit fixied	2020-12-25 18:24:20 -05:00
Cameron Taylor	c6a904483e	changelog	2020-12-25 04:10:28 -05:00
Cameron Taylor	141c1dd414	AUTOSAVE FOR NOTE EDITOR!	2020-12-25 04:09:14 -05:00
Cameron Taylor	471ba66b71	dumb lol!	2020-12-25 03:40:01 -05:00
Cameron Taylor	e1df3e98f6	outdated check	2020-12-25 00:17:21 -05:00
Cameron Taylor	087d735aa3	charted HIGH	2020-12-24 23:47:43 -05:00
Cameron Taylor	b17e9be7d0	moved flash files	2020-12-24 18:24:11 -05:00
Cameron Taylor	822e0b57b2	cool shit mommy gf	2020-12-22 20:55:03 -05:00
Cameron Taylor	4347b74e13	mom chart	2020-12-22 19:57:55 -05:00
Cameron Taylor	d61bc175b7	newgrounds build script	2020-12-21 18:06:39 -05:00
Cameron Taylor	b20620c075	songs	2020-12-21 17:20:57 -05:00
Cameron Taylor	341bc7ca29	poop	2020-12-21 16:23:22 -05:00
Cameron TaylorandGitHub	2230e44fa6	Merge pull request #92 from dinkstr/patch-1 Fix broken Twitter links in readme :)	2020-12-20 13:05:05 -08:00
Cameron Taylor	cfeaf5cbc6	fix crash	2020-12-17 15:03:33 -05:00
dinkstrandGitHub	f92b82a886	Fix broken Twitter links in readme :)	2020-12-17 14:21:09 +00:00