fix sound length rounding to seconds (#645)

This allows people to add addons using `mods/<mymod>/addons/<myaddon>/`

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+ko_fi: codename_engine

.github/workflows/linux.yml

@@ -2,11 +2,12 @@
 name: Linux Build
 on:
   push:
+  workflow_dispatch:
 jobs:
   build:
     name: Linux Build
     permissions: write-all
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Pulling the source
         uses: actions/checkout@v2
@@ -25,22 +26,27 @@ jobs:
             export/release/linux/obj/
           restore-keys: |
             cache-build-linux
+      - name: Installing LibVLC
+        run: |
+          sudo apt-get install libvlc-dev libvlccore-dev
       - name: Installing/Updating libraries
         run: |
-          haxe -cp commandline -D analyzer-optimize --run Main setup
+          haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
           haxelib run lime build linux
+      # - name: Tar files
+      #   run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Codename Engine
-          path: export/release/linux/bin
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v2
-        with:
-          name: Update-Linux
-          path: export/release/linux/bin/CodenameEngine
+          path: export/release/linux/bin/
+      # - name: Uploading artifact (executable)
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: Update-Linux
+      #     path: export/release/linux/bin/CodenameEngine
       - name: Clearing already existing cache
         uses: actions/github-script@v6
         with:

.github/workflows/macos.yml

@@ -2,11 +2,12 @@
 name: Mac OS Build
 on:
   push:
+  workflow_dispatch:
 jobs:
   build:
     name: Mac OS Build
     permissions: write-all
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - name: Pulling the new commit
         uses: actions/checkout@v2
@@ -27,20 +28,22 @@ jobs:
             cache-build-mac
       - name: Installing/Updating libraries
         run: |
-          haxe -cp commandline -D analyzer-optimize --run Main setup
+          haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
           haxelib run lime build mac
+      - name: Tar files
+        run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Codename Engine
-          path: export/release/macos/bin
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v2
-        with:
-          name: Update-Mac
-          path: export/release/macos/bin/CodenameEngine
+          path: CodenameEngine.tar.gz
+      # - name: Uploading artifact (executable)
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: Update-Mac
+      #     path: export/release/macos/bin/CodenameEngine
       - name: Clearing already existing cache
         uses: actions/github-script@v6
         with:

.github/workflows/windows.yml

@@ -2,6 +2,7 @@
 name: Windows Build
 on:
   push:
+  workflow_dispatch:
 jobs:
   build:
     name: Windows Build
@@ -27,20 +28,20 @@ jobs:
             cache-build-windows
       - name: Installing/Updating libraries
         run: |
-          haxe -cp commandline -D analyzer-optimize --run Main setup
+          haxe -cp commandline -D analyzer-optimize --run Main setup -s
       - name: Building the game
         run: |
           haxelib run lime build windows
       - name: Uploading artifact (entire build)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Codename Engine
           path: export/release/windows/bin
-      - name: Uploading artifact (executable)
-        uses: actions/upload-artifact@v2
-        with:
-          name: Update-Windows
-          path: export/release/windows/bin/CodenameEngine.exe
+      # - name: Uploading artifact (executable)
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: Update-Windows
+      #     path: export/release/windows/bin/CodenameEngine.exe
       - name: Clearing already existing cache
         uses: actions/github-script@v6
         with:

.gitignore

@@ -4,4 +4,9 @@ latest/windows/obj/
 latest/windows/haxe/
 .vscode/*
 !.vscode/settings.json
-.haxelib/
+!.vscode/tasks.json
+.haxelib/
+pages/
+docs/doc.xml
+mods/*
+!mods/readme.txt

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
-    "editor.detectIndentation": false,
-    "editor.insertSpaces": false,
+	"editor.detectIndentation": false,
+	"editor.insertSpaces": false,
 	"files.associations": {
 		"*.hx": "haxe",
 		"*.hscript": "haxe",

.vscode/tasks.json

@@ -0,0 +1,32 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "lime",
+			"command": "test",
+			"problemMatcher": [
+				"$haxe-absolute",
+				"$haxe",
+				"$haxe-error",
+				"$haxe-trace"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"label": "lime: test (active configuration)"
+		},
+		{
+			"type": "lime",
+			"command": "build",
+			"problemMatcher": [
+				"$haxe-absolute",
+				"$haxe",
+				"$haxe-error",
+				"$haxe-trace"
+			],
+			"group": "build",
+			"label": "lime: build (active configuration)"
+		}
+	]
+}

BETAMESSAGE.md

@@ -0,0 +1,61 @@
+# Codename Engine v0.4.idk
+
+### This is the first ever public release of Codename Engine **BETA**.
+Shoutout to the people who stuck with us throughout the alpha and supported us! \
+<br />
+
+# Features available in this version:
+- ### Simple but advanced modding system!
+	- Mods have been reworked to run in it's entirety instead of just limited to songs.
+	- Uses an advanced scripting system based on haxe which is capable of modifying the game beyond source code.
+		- Uses a system of events based on actions going on in the game allowing change of those actions to your needs. (ex. when a player hits a note, when it confirms on a menu etc.)
+		- Ability to bind scripts to characters or stages.
+		- Ability to bind scripts to states/menus.
+		- Ability to create your own states/classes just like source code.
+		- Ability to create even more advanced stuff using systems like ndll.
+	- Uses a brand new song structure for cleanliness.
+		- Uses a brand new chart format for optimization and extensibility.
+		- Uses meta system for storing important values instead of in the chart file.
+	- Characters, stages, weeks use an xml format for cleanliness.
+	- Native custom shaders support.
+	- Native 3D renderer.
+	- Addon system for adding scripts or skins to run in any mod.
+	- Ability to add your own options.
+- ### Multiple Overhauls
+	- Settings are more streamlined.
+	- Strumlines are more flexible than before (unlike base game's hardcoded 2)
+	- Characters are also flexible (unlike base game's hardcoded 3)
+	- New input system
+	- New accuracy and misses system, added to fix the base game UI.
+	- New options, including:
+	    - Controls rebinds (for P1 and P2)
+	    - Downscroll
+	    - Ghost Tapping
+	- Countless of rewrites around the code (menus, gameplay, system etc.)
+- ### New Features
+	- Opponent & Co-op modes
+	- New volume change SFX (no more loud flixel beep, customizable)
+	- New FPS counter allowing you to see advanced info by pressing F3 (infos can be selected and copied too when in advanced).
+	- (Windows) FNF is no longer blurry on 125-150% DPI
+    - FNF auto fixes audio on state change when you plug in/out your headphones.
+    - FNF auto applies dark titlebar
+	- Week 7 uses softcoded cutscenes (no MP4)
+	- Auto updating: Once the engine updates, a prompt will be available at launch. If you accept to update, the engine will auto install the newest version. All of the following update files will be downloaded from the GitHub releases:
+    	- `Update-Windows.exe` - Containing the latest Windows executable. (~60mb)
+    	- `Update-Assets.zip` - Every asset change from the latest version to the 	newest. If upgrading from even older version, all of the `Update-Assets.zip` 	files for the versions in between and the latest one will be downloaded.
+- ### Optimizations
+	- optimizations idk fill this with stuff
+	- Memory has been optimized (most of the game runs < 500mb)
+    - Usage of [flxanimate](https://github.com/Dot-Stuff/flxanimate) on big sprites, such as Girlfriend to save memory.
+    - Ability to add more optimizations to your mod using the `Low Memory Mode` option.
+
+- ### Editors
+	- Charter
+		- Has been reworked entirely to have new, more streamlined UI.
+		- idk too lazy to fill this in
+	- Undos/Redos supported 
+	- Warning on closing unsaved work
+	- Clean UI (for ocd freaks)
+	- Mature Chart editor (Character editor rework soon)
+	- Features not found in other editors!
+- Every single state & substate can be modified via HScript (`data/statesStateName.hx`)

FEATURES.md

@@ -5,7 +5,7 @@ _**QOL = Quality of Life**_
 
 <details>
   <summary><h2>Player QOL Features</h2></summary>
-  
+
 - New input system
 - New accuracy and misses system, added to fix the base game UI.
 - New options, including:
@@ -17,7 +17,7 @@ _**QOL = Quality of Life**_
     - Usage of [flxanimate](https://github.com/Dot-Stuff/flxanimate) on big sprites, such as Girlfriend to save memory.
     - You can further optimize it on certain stages by enabling `Low Memory Mode` in `Options > Appearance`.
 - New volume change SFX (no more loud flixel beep, customizable)
-- New FPS counter allowing you to see advanced info by pressing F3.
+- New FPS counter allowing you to see advanced info by pressing F3 (infos can be selected and copied too when in advanced).
 - Simple but advanced modding system (press TAB on main menu)
 - **Windows only:**
     - (Windows) FNF is no longer blurry on 125-150% DPI
@@ -71,6 +71,12 @@ _**QOL = Quality of Life**_
         - Characters are located in `data/weeks/characters`.
         - Weeks are located in `data/weeks/weeks/`
         - If you need to rearrange the weeks in-game, you can use the `data/weeks/weeks.txt` file.
+	- Editors for Charts and Characters (Stage coming soon)
+		- Undos/Redos supported
+		- Warning on closing unsaved work
+		- Clean UI (for ocd freaks)
+		- Mature Chart editor (Character editor rework soon)
+		- Features not found in other editors!
     - Every single state & substate can be modified via HScript (`data/states/StateName.hx`)
 - **Instances launched via `lime test windows` will automatically use assets from source.**
 </details>

PATCHNOTES.md

@@ -0,0 +1,80 @@
+# The Charter Update
+## All major chart editors are finished as of this update (finally...)
+## Engine goes from alpha to beta state : D
+
+<details>
+  <summary><h2>Patch Notes</h2></summary>
+
+- CHARTER FEATURES
+	- BIG BOY FEATURES
+		- Ability to add Note Types in the charter
+		- In-engine Difficulty Creation is now implemented
+		- Snaps for notes/events in the charter
+		- Multiple Vocals Support (per strumline)
+		- Playback speed in the charter
+		- New SEXY editor assets by paige and nex!!!! (and lunar, does 16x16 even count??? 😭)
+		- NEW EVENTS (Camera events, play animation, scroll speed change)
+		- Events window is now scrollable (more events, more room)
+		- Custom Properities in Meta AND Character (Editable in Charter and Character Editor :D) (accessible with SONG.meta.customValues.[property] and [character].extras.[property])
+	- SMALLER BUT STILL COOL
+		- Multiple Icons now show up on strumlines with multiple characters in the charter
+		- Note hoverer to show where your note is going to be placed
+		- Editor UI got some slight reworks (top bar/elements)
+		- Event files can be packed together into one (image/script/json all in a .pack file)
+		- Optimized notes in the charter (Faster loading, can handle a billion now so cool neeo!!)
+		- Editor Song pos now stays the same even after playtesting
+		- Other smaller stuff i forgot 😭
+	- BUG FIXES:
+		- COPY PASTED EVENTS NOW WON'T BREAK!!!
+		- Song position line no longer jitters
+		- UNDOs are more stable now
+		- Drags work much better
+		- Freezes fixed (deleting strumlines)
+- ENGINE FEATURES
+	- BIG BOY FEATURES
+		- Position custom characters in the stage xml using char="" attribute
+		- Aseprite sprites support (for characters and many more)
+		- Edit Draw calls directly from the sprite (sprite.onDraw = (spr:FlxSprite) -> {spr.draw();})
+		- Addons will now properly function together (changed how state scripts and scripts overall load)
+		- MusicBeatTransition is more scriptable
+		- Moddable Game Over Events!!
+		- Reworked Lagless Credits Codename Engine's Contributors Menu
+		- New Credit Method for GitHub accounts (also lagless) in Mod Credits (First gets the data normally, if fails uses the ratelimited api)
+		- MANY OG GAME WEEK STUFF!! (still wip and softcoded and also many reworks by nex!)
+		- Senpai Cutscene got reworked! (https://github.com/CodenameCrew/CodenameEngine/assets/87421482/3b3f32fc-78d1-40fa-8398-776554cab1d6)
+		- Thorns got reworked with a cool chromatic aberration effect! (https://github.com/CodenameCrew/CodenameEngine/assets/87421482/73d9f7c5-1c9c-407e-baf0-e8e2c381ecbb)
+		- Winter Horrorland got reworked with a bloody vignette effect! (https://github.com/CodenameCrew/CodenameEngine/assets/87421482/1e10c3e2-32dc-4de2-b31a-d9d577d516da - https://github.com/CodenameCrew/CodenameEngine/assets/87421482/cad852c3-1ee2-409e-a70e-b3571ab5cf7b)
+	- SMALLER BUT STILL COOL
+		- Ability to set Controls.hx variables (Being able to block inputs or even trigger them (needs to be in an if statement))
+		- You can now easily check if a cutscene was played (by default is disabled and makes it auto play or not; Check startCutscene() code for more details in PlayState)
+		- onScriptCreated event in global.hx
+		- Addons priority (Being able to set addons to load before or after a mod)
+		- Added Script.fromString to add scripts without making pesky new files!!
+		- 9 Splice Sprites can render smaller than their intended size
+		- Ability to turn off gitaroo easter egg (finally...)
+		- Auto complete for certain text fields (characters/stages/notetypes)
+	- HSCRIPT FEATURES:
+		- Added "is" for checking var type
+		- Maps are now iterable (for (key=>value in map))
+		- FIXED CRASH ON EMPTY SCRIPTS!!!!!
+- BUG FIXES
+	- Fix events to be more stable
+	- Fix for onBeat sprites type with also customizable beat intervals and offset (and decide if also skipping negative beats so for example before the song starts)
+	- Fix for pressing F5 in an editor breaking it
+	- Fix when getting GitHub data and a redirect happens
+	- Fix for healthbar incorrectly colored in opponent mode
+	- Video cutscenes are ALOT more stable (thanks majigsaw :D)
+	- 3D now works again (so cool i love away3d in 2024)
+	- Lots and lots of grammar and wording fixes (so true bro -lunar)
+	- Lots and lots of other optimizations made
+- CHANGES
+	- onDestroy has been renamed to destroy in all instances
+	- Strumline Pos X in editors is now a ratio (0.25 for bf, 0.75 for dad)
+	- BY DEFAULT when in Story Mode, the arrows tween in only when there was a transition
+	- onBeatHit renamed to beatHit in gameover substate (stepHit added)
+	- Alt Animation Events can now control both poses and idle (may need to be readded in pre existing charts)
+	- Some other shit idk ill add it whenever someone tells me backward compat is broke 💔
+</details>
+
+thanks so much for the support and always being there, it really does mean alot to us < 3
+we are one step closer to turning beta so we really can't wait !

README.md

@@ -4,31 +4,22 @@
 ### Mods created with beta versions of Codename may not be compatible with the release version
 Known issues in the beta:
 - Some options are missing
-- Week 5 has no monster animation
-- Week 6 still have no dialogue
-- Week 7 have no running tankman
 
 Build instructions are below. Press TAB on the main menu to switch mods.
 
-Also, `lime test windows` uses the source assets folder instead of the export one for easier development.
+Also, the command `.\cne test` uses the source assets folder instead of the export one for easier development (Although you can still use `lime test windows` normally).
 
 ## Codename Engine
 
-Codename Engine is a new Friday Night Funkin' Engine aimed for easier modding, along with extensiblity and ease of use.
-
-### It includes many new features, as seen [here](FEATURES.md)
+Codename Engine is a new Friday Night Funkin' Engine aimed at simplifying modding, along with extensiblity and ease of use.<br>
+### Before making issues or need help with something, check our website [HERE](https://codename-engine.com/) (it contains a wiki of how to mod with EXAMPLES, an api, lists of mods made with Codename Engine and more)!!!
+#### The Engine includes many new features, as seen [here](FEATURES.md)<br>
+#### Wanna see the new features added in the most recent update? Click [here](PATCHNOTES.md)<br>
 
 ## How to download
 
-Latest builds for the engine can be found in the [Actions](https://github.com/YoshiCrafter29/CodenameEngine/actions) tab.
-
-<details>
-  <summary><h2>Credits</h2></summary>
-
-- Credits to [Ne_Eo](https://twitter.com/Ne_Eo_Twitch) and the [3D-HaxeFlixel](https://github.com/lunarcleint/3D-HaxeFlixel) repository for Away3D Flixel support
-- Credits to the [FlxAnimate](https://github.com/Dot-Stuff/flxanimate) team for the Animate Atlas support.
-- Credits to Smokey555 for the backup Animate Atlas to spritesheet code.
-</details>
+Latest builds for the engine can be found in the [Actions](https://github.com/YoshiCrafter29/CodenameEngine/actions) tab.<br>
+In the future (when the engine won't be a WIP anymore) we're gonna also publish the engine on platforms like Gamebanana; stay tuned!
 
 <details>
   <summary><h2>How to build</h2></summary>
@@ -39,24 +30,10 @@ Latest builds for the engine can be found in the [Actions](https://github.com/Yo
 
 ##### Tested on Windows 10 21H2
 1. Install [version 4.2.5 of Haxe](https://haxe.org/download/version/4.2.5/).
-2. Download [Visual Studio Build Tools](https://aka.ms/vs/17/release/vs_BuildTools.exe)
-3. Wait for the Visual Studio Installer to install
-4. On the Visual Studio installer screen, go to the "Individual components" tab and only select those options:
-    - MSVC v143 VS 2022 C++ x64/x86 build tools (Latest)
-    - Windows 10/11 SDK (any works)
-5. This is what your Installation details panel should look like. Once correct, press "Install".
-    - ⚠ This will download around 1.07 GB of data from the internet, and will require around 5.5 GB of available space on your computer.
-
-<p align="center">
-<img src="https://github.com/YoshiCrafter29/CodenameEngine/blob/main/art/github/windows-installation-details.png?raw=true" />
-</p>
-
-6. Once the installation is done, close Visual Studio Installer.
-7. Download and install [`git-scm`](https://git-scm.com/download/win).
+2. Download and install [`git-scm`](https://git-scm.com/download/win).
     - Leave all installation options as default.
-8. Open the Codename Engine source folder, click on the address bar and type `cmd` to open a command prompt window.
-9. On the command prompt, run `update.bat`, and wait for the libraries to install.
-10. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
+3. Run `update.bat` using cmd or double-clicking it, and wait for the libraries to install.
+4. Once the libraries are installed, run `haxelib run lime test windows` to compile and launch the game (may take a long time)
     - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test windows` directly.
 </details>
 <details>
@@ -80,8 +57,33 @@ Latest builds for the engine can be found in the [Actions](https://github.com/Yo
 4. Open a terminal in the Codename Engine source folder, and run `update.sh`.
 5. Once the libraries are installed, run `haxelib run lime test mac` to compile and launch the game (may take a long time)
     - ℹ You can run `haxelib run lime setup` to make the lime command global, allowing you to execute `lime test mac` directly.
-
-
 </details>
-            
+</details>
+
+<details>
+  <summary><h2>What can you do or not do</h2></summary>
+
+  ### You can:
+  - Download and play the engine with its mods and modpacks
+  - Mod and fork the engine (without using it for illicit purposes)
+  - Contribute to the engine (for example through *Pull Requests*, *Issues*, etc)
+  - Create a sub engine with Codename Engine as **TEMPLATE** with **CREDITS** (for example leaving the *credits menu submenu with the GitHub contributors* and putting the *[main devs](https://github.com/CodenameCrew)* in a *README* specifying that it's a *sub engine from Codename Engine*)
+  - Release excutable mods that use Codename Engine as source (Specifing that uses Codename Engine by for example the same way written above this)
+  - Release modpacks
+
+  ### You can't:
+  - Create a *side/new/etc* engine (or mod that doesn't use Codename Engine) using Codename Engine's code
+  - Steal code from Codename Engine for another different project that is not Codename Engine related (Codename Engine mods excluded) without properly crediting
+  - Release the entire Codename Engine on platforms (Mods that use Codename Engine as source are fine, if it's specified even better)
+
+  #### *If you need more info or feel like asking to do something which is not listed here, ask us directly on our discord (linked in the wiki)!*
+</details>
+
+<details>
+  <summary><h2>Credits</h2></summary>
+
+- Credits to [Ne_Eo](https://twitter.com/Ne_Eo_Twitch) and the [3D-HaxeFlixel](https://github.com/lunarcleint/3D-HaxeFlixel) repository for Away3D Flixel support
+- Credits to the [FlxAnimate](https://github.com/Dot-Stuff/flxanimate) team for the Animate Atlas support
+- Credits to Smokey555 for the backup Animate Atlas to spritesheet code
+- Credits to MAJigsaw77 for [hxvlc](https://github.com/MAJigsaw77/hxvlc) (video cutscene/mp4 support) and [hxdiscord_rpc](https://github.com/MAJigsaw77/hxdiscord_rpc) (discord rpc integration)
 </details>

TODO.md

@@ -11,27 +11,51 @@
 	- [x] Fix the strumlines bar when zooming out
 	- [x] Algorithm to make note placements faster & sorted out
 	- [x] Play here working
-	- [ ] Events (including Camera Movement)
-	- [ ] Custom Notes
-	- [ ] Metadata Editing
-	- [ ] Cap zoom in & out
+	- [x] Cap zoom in & out
+	- [x] Events (including Camera Movement)
+	- [x] Metadata Editing
+	- [ ] Custom Notetypes
+	- [ ] Reorderable Strumlines
 	- [ ] Step based zooming
-- [ ] Use latest hxCodec
-- [ ] Re-export gf-christmas, gf-car and gf-tankmen with padding
-- [ ] Multiple state scripts & Multiple global scripts
-- [ ] Re-add shader camera stuff
-- [ ] Make update.bat use libs.xml instead of hmm.json
-- [ ] New Switch Mod menu
-- [ ] Port shader camera stuff over to new flixel fork
-- [ ] Add note offset
-- [ ] Dialogue
-- [ ] Finish Base Game port
+	- [ ] Add Undo to more actions
+	- [ ] New Chart Button
+	- [ ] Bug fixes
+		- [ ] Zooming in causing notes to disappear
+		- [ ] Holds disappear too early
+		- [ ] Time signature fixes
+		- [ ] BPM Changes Events
 - [ ] Character Editor
+	- [x] Animation Editing
+	- [x] Animation Deletion/Creationg
+	- [x] Character Info Editing
+	- [x] Character Saving
+	- [x] Add Undos to Actions
+	- [ ] Change Stage
+	- [ ] New Character Button
+- [ ] Port Videos to a more stable video lib
+- [ ] Optimization to Editors
+- [ ] Fix Ratings Lag
+- [x] Re-export gf-christmas, gf-car and gf-tankmen with padding
+- [x] Re-add shader camera stuff
+- [x] Make update.bat use libs.xml instead of hmm.json
+- [ ] New Switch Mod menu
+- [x] Port shader camera stuff over to new flixel fork
+- [ ] Add note offset
+- [x] Dialogue
+- [ ] Finish Base Game port
+- [x] Add credits
+- [ ] Verbose mode (`--verbose`)
+- [ ] Tooltips
 - [ ] Fix bugs
 
 ## `v1.1.0`
 - [ ] Charter Waveforms (maybe in v1.1.0, dont wanna slow shit down)
 - [ ] Custom classes
+	- [ ] Proper super overrides (FlxText_HSX doesn't allow overrides for update because of this)
+	- [ ] Custom Class extending Custom Classes
+	- [ ] Statics on Custom Classes
+	- [ ] Fix Bugs
 - [ ] Full 3D support via stages files
-- [ ] Multithread sprites loading (for faster load times) ?
-- [ ] Stage Editor
+- [ ] Multithread sprites and assets loading (for faster load times) ?
+- [ ] Stage Editor
+- [ ] Optimize flxanimate isOnScreen

alsoft.txt

@@ -0,0 +1,14 @@
+[general]
+sample-type=float32
+stereo-mode=speakers
+stereo-encoding=panpot
+hrtf=false
+cf_level=0
+resampler=fast_bsinc24
+front-stablizer=false
+output-limiter=false
+volume-adjust=0
+[decoder]
+hq-mode=false
+distance-comp=false
+nfc=false

art/generateDoc.bat

@@ -1,7 +1,8 @@
 @ECHO OFF
 cd ..
 echo Building Game...
-lime build windows --haxeflag="--macro include('scripting')" --haxeflag="-xml docs/doc.xml"
-echo Generating Documentation...
-haxelib run dox -i docs --include funkin --include scripting
-echo Done!
+lime build windows --haxeflag="-xml docs/doc.xml" -D doc-gen -D DOCUMENTATION --no-output
+echo art
+
+echo Generated the api xml file at docs/doc.xml
+echo Please put this in codename-website/api-generator/api/doc.xml

art/readme.txt

@@ -1,30 +1,30 @@
- __                 /                                  
-/ _   _ |_ |_ .  _                                     
-\__) (- |_ |_ | | )                                    
-                                                       
- __                                                    
-|_   _  _  _  |                                        
-|   |  (- (_| |( \/                                    
-                 /                                     
-                                                       
- _   _     _                                           
-(_) | )   (_|                                          
-                                                       
- __                                                    
-|_   _ .  _|  _        _  .  _  |_  |_       _  _  |_  
-|   |  | (_| (_| \/   | ) | (_) | ) |_   \/ (- (_| | ) 
-                 /          _/           /             
+ __                 /
+/ _   _ |_ |_ .  _
+\__) (- |_ |_ | | )
+
+ __
+|_   _  _  _  |
+|   |  (- (_| |( \/
+                 /
+
+ _   _     _
+(_) | )   (_|
+
+ __
+|_   _ .  _|  _        _  .  _  |_  |_       _  _  |_
+|   |  | (_| (_| \/   | ) | (_) | ) |_   \/ (- (_| | )
+                 /          _/           /
 
 HEY
 Thanks for downloadin Friday Night FUNKIN'
 If you downloaded this from any other place than ninja-muffin24.itch.io/FUNKIN
-You might be in DANGER!!! 
+You might be in DANGER!!!
 
 The Itch.io release is the only official source for the desktop (PC, Mac, Linux) versions of the game!
 As of right now, the game is FREE! If you paid for it, you got SCAMMED!
 
 Now that that's out of the way....
-THANKS FOR DOWNLOADIN. 
+THANKS FOR DOWNLOADIN.
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-
     PERMISSIONS XDDDD
@@ -77,16 +77,16 @@ I love Tom Fulp.
 - Cameron ♪(´▽｀)
 
 ##################################################################################
-                                                                                  
- _   _   _____   _      _    ____   ____     ___    _   _   _   _   ____    ____  
-| \ | | | ____| | |    | |  / ___| |  _ \   / _ \  | | | | | \ | | |  _ \  / ___| 
-|  \| | |  _|   | | /\ | | | |  _  | |_) | | | | | | | | | |  \| | | | | | \___ \ 
+
+ _   _   _____   _      _    ____   ____     ___    _   _   _   _   ____    ____
+| \ | | | ____| | |    | |  / ___| |  _ \   / _ \  | | | | | \ | | |  _ \  / ___|
+|  \| | |  _|   | | /\ | | | |  _  | |_) | | | | | | | | | |  \| | | | | | \___ \
 | |\  | | |___   \ V  V /  | |_| | |  _ <  | |_| | | |_| | | |\  | | |_| |  ___) |
-|_| \_| |_____|   \_/\_/    \____| |_| \_\  \___/   \___/  |_| \_| |____/  |____/ 
- _       _  _     ___    ___       __              _       _  _       _        _  
-|_ |  | |_ |_) \_/ | |_|  |  |\ | /__     |_      |_ |  | |_ |_) \_/ / \ |\ | |_  
+|_| \_| |_____|   \_/\_/    \____| |_| \_\  \___/   \___/  |_| \_| |____/  |____/
+ _       _  _     ___    ___       __              _       _  _       _        _
+|_ |  | |_ |_) \_/ | |_|  |  |\ | /__     |_      |_ |  | |_ |_) \_/ / \ |\ | |_
 |_  \/  |_ | \  |  | | | _|_ | \| \_| o   |_)\/   |_  \/  |_ | \  |  \_/ | \| |_ o
-                                      /      /                                    
-                                                                                  
+                                      /      /
+
 ##################################################################################
 i stole this from stamper.

assets/data/characters/bf-car.xml

@@ -1,12 +1,18 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="true" flipX="true" x="0" y="350" icon="bf" camx="25">
-	<anim name="idle"          anim="BF idle dance"      fps="24" loop="false" x="-5"  y="0"/>
-	<anim name="singUP"        anim="BF NOTE UP0"        fps="24" loop="false" x="-29" y="27"/>
-	<anim name="singLEFT"      anim="BF NOTE LEFT0"      fps="24" loop="false" x="12"  y="-6"/>
-	<anim name="singRIGHT"     anim="BF NOTE RIGHT0"     fps="24" loop="false" x="-38" y="-7"/>
-	<anim name="singDOWN"      anim="BF NOTE DOWN0"      fps="24" loop="false" x="-10" y="-50"/>
-	<anim name="singUPmiss"    anim="BF NOTE UP MISS"    fps="24" loop="false" x="-29" y="27"/>
-	<anim name="singLEFTmiss"  anim="BF NOTE LEFT MISS"  fps="24" loop="false" x="12"  y="24"/>
-	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" fps="24" loop="false" x="-30" y="21"/>
-	<anim name="singDOWNmiss"  anim="BF NOTE DOWN MISS"  fps="24" loop="false" x="-11" y="-19"/>
+<character isPlayer="true" flipX="true" x="0" y="350" icon="bf" camx="25" color="#31B0D1">
+	<anim name="idle"           anim="BF idle dance"      fps="24" loop="false" x="-5"  y="0"/>
+	<anim name="singUP"         anim="BF NOTE UP0"        fps="24" loop="false" x="-29" y="27"/>
+	<anim name="singLEFT"       anim="BF NOTE LEFT0"      fps="24" loop="false" x="12"  y="-6"/>
+	<anim name="singRIGHT"      anim="BF NOTE RIGHT0"     fps="24" loop="false" x="-38" y="-7"/>
+	<anim name="singDOWN"       anim="BF NOTE DOWN0"      fps="24" loop="false" x="-10" y="-50"/>
+	<anim name="singUPmiss"     anim="BF NOTE UP MISS"    fps="24" loop="false" x="-29" y="27"/>
+	<anim name="singLEFTmiss"   anim="BF NOTE LEFT MISS"  fps="24" loop="false" x="12"  y="24"/>
+	<anim name="singRIGHTmiss"  anim="BF NOTE RIGHT MISS" fps="24" loop="false" x="-30" y="21"/>
+	<anim name="singDOWNmiss"   anim="BF NOTE DOWN MISS"  fps="24" loop="false" x="-11" y="-19"/>
+	<!-- funny loop -->
+	<anim name="idle-loop"      anim="BF idle dance"      fps="24" loop="true" x="-5"  y="0" indices="10..13"/>
+	<anim name="singUP-loop"    anim="BF NOTE UP0"        fps="24" loop="true" x="-29" y="27" indices="11..14"/>
+	<anim name="singLEFT-loop"  anim="BF NOTE LEFT0"      fps="24" loop="true" x="12"  y="-6" indices="12..15"/>
+	<anim name="singRIGHT-loop" anim="BF NOTE RIGHT0"     fps="24" loop="true" x="-38" y="-7" indices="58..61"/>
+	<anim name="singDOWN-loop"  anim="BF NOTE DOWN0"      fps="24" loop="true" x="-10" y="-50" indices="26..29"/>
 </character>

assets/data/characters/bf-christmas.xml

@@ -1,13 +1,13 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="true" flipX="true" x="0" y="350" icon="bf">
-	<anim name="idle"          anim="BF idle dance"      fps="24" loop="false" x="-5"  y="0"/>
-	<anim name="singUP"        anim="BF NOTE UP0"        fps="24" loop="false" x="-29" y="27"/>
-	<anim name="singLEFT"      anim="BF NOTE LEFT0"      fps="24" loop="false" x="12"  y="-6"/>
-	<anim name="singRIGHT"     anim="BF NOTE RIGHT0"     fps="24" loop="false" x="-38" y="-7"/>
-	<anim name="singDOWN"      anim="BF NOTE DOWN0"      fps="24" loop="false" x="-10" y="-50"/>
-	<anim name="singUPmiss"    anim="BF NOTE UP MISS"    fps="24" loop="false" x="-29" y="27"/>
-	<anim name="singLEFTmiss"  anim="BF NOTE LEFT MISS"  fps="24" loop="false" x="12"  y="24"/>
-	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" fps="24" loop="false" x="-30" y="21"/>
-	<anim name="singDOWNmiss"  anim="BF NOTE DOWN MISS"  fps="24" loop="false" x="-11" y="-19"/>
-	<anim name="hey"           anim="BF HEY"             fps="24" loop="false" x="7"   y="4"/>
+<character isPlayer="true" flipX="true" x="0" y="350" icon="bf" camy="55" color="#31B0D1">
+	<anim name="idle" anim="BF idle dance" x="-5" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="BF NOTE UP0" x="-39" y="27" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="BF NOTE LEFT0" x="6" y="-7" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="BF NOTE RIGHT0" x="-48" y="-6" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="BF NOTE DOWN0" x="-17" y="-50" fps="24" loop="false"/>
+	<anim name="singUPmiss" anim="BF NOTE UP MISS" x="-35" y="27" fps="24" loop="false"/>
+	<anim name="singLEFTmiss" anim="BF NOTE LEFT MISS" x="6" y="19" fps="24" loop="false"/>
+	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" x="-44" y="22" fps="24" loop="false"/>
+	<anim name="singDOWNmiss" anim="BF NOTE DOWN MISS" x="-16" y="-19" fps="24" loop="false"/>
+	<anim name="hey" anim="BF HEY" x="-3" y="6" fps="24" loop="false"/>
 </character>

assets/data/characters/bf-dead.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="true" flipX="true" x="0" y="350">
+<character isPlayer="true" flipX="true" x="0" y="350" color="#31B0D1">
 	<anim name="firstDeath"     anim="BF dies"          fps="24"    loop="false" x="37" y="11"/>
 	<anim name="deathLoop"      anim="BF Dead Loop"     fps="24"    loop="false" x="37" y="5"/>
 	<anim name="deathConfirm"   anim="BF Dead confirm"  fps="24"    loop="false" x="37" y="69"/>

assets/data/characters/bf-holding-gf-dead.xml

@@ -0,0 +1,6 @@
+<!DOCTYPE codename-engine-character>
+<character x="-50" y="330" isGF="false" flipX="true" isPlayer="true" antialiasing="true" sprite="bf-holding-gf-dead" color="#31B0D1">
+	<anim x="0" loop="false" y="0" fps="24" anim="BF Dies with GF" name="firstDeath"/>
+	<anim x="0" loop="false" y="-17" fps="24" anim="BF Dead with GF Loop" name="deathLoop"/>
+	<anim x="0" loop="false" y="14" fps="24" anim="RETRY confirm holding gf" name="deathConfirm"/>
+</character>

assets/data/characters/bf-holding-gf.xml

@@ -1,13 +1,13 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="true" flipX="true" x="0" y="350" icon="bf">
-	<anim name="idle"          anim="BF idle dance"      fps="24" loop="false"/>
-	<anim name="singUP"        anim="BF NOTE UP0"        fps="24" loop="false" x="-29" y="10"/>
-	<anim name="singLEFT"      anim="BF NOTE LEFT0"      fps="24" loop="false" x="12"  y="7"/>
-	<anim name="singRIGHT"     anim="BF NOTE RIGHT0"     fps="24" loop="false" x="-41" y="23"/>
-	<anim name="singDOWN"      anim="BF NOTE DOWN0"      fps="24" loop="false" x="-10" y="-10"/>
-	<anim name="singUPmiss"    anim="BF NOTE UP MISS"    fps="24" loop="false" x="-29" y="10"/>
-	<anim name="singLEFTmiss"  anim="BF NOTE LEFT MISS"  fps="24" loop="false" x="12"  y="7"/>
-	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" fps="24" loop="false" x="-41" y="23"/>
-	<anim name="singDOWNmiss"  anim="BF NOTE DOWN MISS"  fps="24" loop="false" x="-10" y="-10"/>
-	<anim name="bfCatch"       anim="BF catches GF"      fps="24" loop="false" x="0"   y="0"/>
-</character>
+<character y="350" sprite="bf-holding-gf" flipX="true" isPlayer="true" icon="bf" color="#31B0D1" gameOverChar="bf-holding-gf-dead">
+	<anim name="idle" anim="BF idle dance" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="BF NOTE UP0" x="-42" y="9" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="BF NOTE LEFT0" x="11" y="2" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="BF NOTE RIGHT0" x="-46" y="21" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="BF NOTE DOWN0" x="-16" y="-14" fps="24" loop="false"/>
+	<anim name="singUPmiss" anim="BF NOTE UP MISS" x="-39" y="8" fps="24" loop="false"/>
+	<anim name="singLEFTmiss" anim="BF NOTE LEFT MISS" x="10" y="3" fps="24" loop="false"/>
+	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" x="-41" y="37" fps="24" loop="false"/>
+	<anim name="singDOWNmiss" anim="BF NOTE DOWN MISS" x="-15" y="-11" fps="24" loop="false"/>
+	<anim name="bfCatch" anim="BF catches GF" x="6" y="90" fps="24" loop="false"/>
+</character>

assets/data/characters/bf-pixel-dead.xml

@@ -0,0 +1,6 @@
+<!DOCTYPE codename-engine-character>
+<character icon="bf-pixel-dead" x="200" y="570" isGF="false" scale="6" flipX="true" isPlayer="true" antialiasing="false" sprite="bf-pixel-dead" color="#7BD6F6">
+	<anim x="0" loop="false" y="0" fps="24" anim="BF Dies pixel" name="firstDeath"/>
+	<anim x="-5" loop="true" y="-2" fps="24" anim="Retry Loop" name="deathLoop"/>
+	<anim x="-5" loop="false" y="-2" fps="24" anim="RETRY CONFIRM" name="deathConfirm"/>
+</character>

assets/data/characters/bf-pixel.xml

@@ -1,10 +1,12 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="true" flipX="true" x="200" y="570" antialiasing="false" scale="6" camx="-200" camy="-20">
-	<anim name="idle"       anim="BF IDLE" fps="24" loop="false" x="0" y="0" />
-
-	<!-- Offsets are actually multiplied by scale -->
-	<anim name="singLEFT"   anim="BF LEFT NOTE"     fps="24" loop="false"   x="0" y="0" />
-	<anim name="singDOWN"   anim="BF DOWN NOTE"     fps="24" loop="false"   x="0" y="0" />
-	<anim name="singUP"     anim="BF UP NOTE"       fps="24" loop="false"   x="0" y="0" />
-	<anim name="singRIGHT"  anim="BF RIGHT NOTE"    fps="24" loop="false"   x="0" y="0" />
-</character>
+<character x="200" y="570" sprite="bf-pixel" scale="6" antialiasing="false" flipX="true" isPlayer="true" icon="bf-pixel" color="#7BD6F6" gameOverChar="bf-pixel-dead">
+	<anim name="idle" anim="BF IDLE" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="BF LEFT NOTE" x="-1" y="0" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="BF DOWN NOTE" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="BF UP NOTE" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="BF RIGHT NOTE" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUPmiss" anim="BF UP MISS" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singLEFTmiss" anim="BF LEFT MISS" x="-1" y="0" fps="24" loop="false"/>
+	<anim name="singRIGHTmiss" anim="BF RIGHT MISS" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singDOWNmiss" anim="BF DOWN MISS" x="0" y="0" fps="24" loop="false"/>
+</character>

assets/data/characters/bf.xml

@@ -1,14 +1,18 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="true" flipX="true" x="0" y="350">
-	<anim name="idle"          anim="BF idle dance"      fps="24" loop="false" x="-5"  y="0"/>
-	<anim name="singUP"        anim="BF NOTE UP0"        fps="24" loop="false" x="-29" y="27"/>
-	<anim name="singLEFT"      anim="BF NOTE LEFT0"      fps="24" loop="false" x="12"  y="-6"/>
-	<anim name="singRIGHT"     anim="BF NOTE RIGHT0"     fps="24" loop="false" x="-38" y="-7"/>
-	<anim name="singDOWN"      anim="BF NOTE DOWN0"      fps="24" loop="false" x="-10" y="-50"/>
-	<anim name="singUPmiss"    anim="BF NOTE UP MISS"    fps="24" loop="false" x="-29" y="27"/>
-	<anim name="singLEFTmiss"  anim="BF NOTE LEFT MISS"  fps="24" loop="false" x="12"  y="24"/>
-	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" fps="24" loop="false" x="-30" y="21"/>
-	<anim name="singDOWNmiss"  anim="BF NOTE DOWN MISS"  fps="24" loop="false" x="-11" y="-19"/>
-	<anim name="hey"           anim="BF HEY"             fps="24" loop="false" x="7"   y="4"/>
-	<anim name="scared"        anim="BF idle shaking"    fps="24" loop="true"  x="-4"  y="0"/>
-</character>
+<character y="350" sprite="bf" flipX="true" isPlayer="true" icon="bf" color="#31B0D1">
+	<anim name="idle" anim="BF idle dance" x="-5" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="BF NOTE UP0" x="-39" y="27" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="BF NOTE LEFT0" x="6" y="-7" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="BF NOTE RIGHT0" x="-48" y="-6" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="BF NOTE DOWN0" x="-17" y="-50" fps="24" loop="false"/>
+	<anim name="singUPmiss" anim="BF NOTE UP MISS" x="-35" y="27" fps="24" loop="false"/>
+	<anim name="singLEFTmiss" anim="BF NOTE LEFT MISS" x="6" y="19" fps="24" loop="false"/>
+	<anim name="singRIGHTmiss" anim="BF NOTE RIGHT MISS" x="-44" y="22" fps="24" loop="false"/>
+	<anim name="singDOWNmiss" anim="BF NOTE DOWN MISS" x="-16" y="-19" fps="24" loop="false"/>
+	<anim name="hey" anim="BF HEY" x="-3" y="6" fps="24" loop="false"/>
+	<anim name="scared" anim="BF idle shaking" x="-6" y="1" fps="24" loop="true"/>
+	<anim name="hit" anim="BF hit" x="13" y="19" fps="24" loop="false"/>
+	<anim name="pre-attack" anim="bf pre attack" x="-47" y="-36" fps="24" loop="false"/>
+	<anim name="attack" anim="boyfriend attack" x="289" y="270" fps="24" loop="false"/>
+	<anim name="dodge" anim="boyfriend dodge" x="-8" y="-13" fps="24" loop="false"/>
+</character>

assets/data/characters/da.xml

@@ -1,8 +1,13 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" holdTime="6.1" icon="dad" y="150">
-	<anim name="idle"      anim="Dad idle dance"      fps="24" loop="false" x="0" y="0"/>
-	<anim name="singUP"    anim="Dad Sing note UP"    fps="24" loop="false" x="-2" y="50"/>
-	<anim name="singLEFT"  anim="dad sing note right"  fps="24" loop="false" x="-2" y="10"/>
-	<anim name="singRIGHT" anim="Dad Sing Note LEFT" fps="24" loop="false" x="-5" y="27"/>
-	<anim name="singDOWN"  anim="Dad Sing Note DOWN"  fps="24" loop="false" x="0" y="-30"/>
+<character isPlayer="false" flipX="false" holdTime="6.1" icon="dad" y="150" color="#AF66CE">
+	<anim name="idle"           anim="Dad idle dance"      fps="24" loop="false" x="0" y="0"/>
+	<anim name="singUP"         anim="Dad Sing note UP"    fps="24" loop="false" x="-2" y="50"/>
+	<anim name="singLEFT"       anim="dad sing note right"  fps="24" loop="false" x="-2" y="10"/>
+	<anim name="singRIGHT"      anim="Dad Sing Note LEFT" fps="24" loop="false" x="-5" y="27"/>
+	<anim name="singDOWN"       anim="Dad Sing Note DOWN"  fps="24" loop="false" x="0" y="-30"/>
+	<!-- funny loop -->
+	<anim name="idle-loop"      anim="Dad idle dance"      fps="24" loop="true" x="0" y="0" indices="10,11,12,12"/>
+	<anim name="singUP-loop"    anim="Dad Sing note UP"    fps="24" loop="true" x="-6" y="50" indices="56,57,58,59"/>
+	<anim name="singLEFT-loop"  anim="dad sing note right"  fps="24" loop="true" x="-10" y="10" indices="12,13,14,15"/>
+	<anim name="singRIGHT-loop" anim="Dad Sing Note LEFT" fps="24" loop="true" x="0" y="27" indices="15,16,17,18"/>
 </character>

assets/data/characters/dad.xml

@@ -1,8 +1,12 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" holdTime="6.1">
-	<anim name="idle"      anim="Dad idle dance"      fps="24" loop="false" x="0" y="0"/>
-	<anim name="singUP"    anim="Dad Sing note UP"    fps="24" loop="false" x="-6" y="50"/>
-	<anim name="singLEFT"  anim="dad sing note right"  fps="24" loop="false" x="-10" y="10"/>
-	<anim name="singRIGHT" anim="Dad Sing Note LEFT" fps="24" loop="false" x="0" y="27"/>
-	<anim name="singDOWN"  anim="Dad Sing Note DOWN"  fps="24" loop="false" x="0" y="-30"/>
-</character>
+<character sprite="dad" icon="dad" color="#AF66CE" holdTime="6.1">
+	<anim name="idle" anim="Dad idle dance" x="0" y="0" fps="24" loop="false" indices="2..12,0,1"/>
+	<anim name="singUP" anim="Dad Sing note UP" x="-10" y="50" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="dad sing note right" x="-10" y="10" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Dad Sing Note LEFT" x="-4" y="26" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="Dad Sing Note DOWN" x="2" y="-31" fps="24" loop="false"/>
+	<anim name="idle-loop" anim="Dad idle dance" x="0" y="0" fps="24" loop="true" indices="10..12,12"/>
+	<anim name="singUP-loop" anim="Dad Sing note UP" x="-10" y="50" fps="24" loop="true" indices="56..59"/>
+	<anim name="singLEFT-loop" anim="dad sing note right" x="-10" y="10" fps="24" loop="true" indices="12..15"/>
+	<anim name="singRIGHT-loop" anim="Dad Sing Note LEFT" x="-4" y="26" fps="24" loop="true" indices="15..18"/>
+</character>

assets/data/characters/gf-car.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" isGF="true" x="75" y="335">
-	<anim name="danceLeft"  anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
-	<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
+<character isPlayer="false" flipX="false" isGF="true" x="75" y="335" icon="gf" color="#A5004D">
+	<anim name="danceLeft"  anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="0..15" />
+	<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="16..30" />
 </character>

assets/data/characters/gf-christmas.xml

@@ -1,14 +1,14 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" isGF="true"  x="115" y="325">
-	<anim name="cheer"      anim="GF Cheer"                     fps="24" loop="false" />
-	<anim name="singUP"     anim="GF Up Note"                   fps="24" loop="false" x="0"  y="4" />
-	<anim name="singLEFT"   anim="GF left note"                 fps="24" loop="false" x="0"  y="-19" />
-	<anim name="singRIGHT"  anim="GF Right Note"                fps="24" loop="false" x="0"  y="-20" />
-	<anim name="singDOWN"   anim="GF Down Note"                 fps="24" loop="false" x="0"  y="-20" />
-	<anim name="danceLeft"  anim="GF Dancing Beat"              fps="24" loop="false" x="0"  y="-9" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
-	<anim name="danceRight" anim="GF Dancing Beat"              fps="24" loop="false" x="0"  y="-9" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
-	<anim name="hairBlow"   anim="GF Dancing Beat Hair blowing" fps="24" loop="false" x="45" y="-8" indices="0,1,2,3" />
-	<anim name="hairFall"   anim="GF Dancing Beat Hair Landing" fps="24" loop="false" x="0"  y="-9" indices="0,1,2,3,4,5,6,7,8,9,10,11" />
-	<anim name="scared"     anim="GF FEAR"                      fps="24" loop="true"  x="-2" y="-17" />
-	<anim name="sad"        anim="gf sad"                       fps="24" loop="true"  x="-2"  y="-21" indices="0,1,2,3,4,5,6,7,8,9,10,11,12" />
-</character>
+<character x="115" y="325" sprite="gf-christmas" icon="gf" color="#A5004D" isGF="true">
+	<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="0..14"/>
+	<anim name="danceRight" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="15..30"/>
+	<anim name="singUP" anim="GF Up Note" x="0" y="-9" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="GF Down Note" x="0" y="-9" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="GF left note" x="0" y="-9" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="GF Right Note" x="0" y="-9" fps="24" loop="false"/>
+	<anim name="scared" anim="GF FEAR" x="0" y="-9" fps="24" loop="true"/>
+	<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" x="0" y="-9" fps="24" loop="false" indices="0..3"/>
+	<anim name="hairFall" anim="GF Dancing Beat Hair Landing" x="0" y="-9" fps="24" loop="false" indices="0..11"/>
+	<anim name="cheer" anim="GF Cheer" x="0" y="-9" fps="24" loop="false"/>
+	<anim name="sad" anim="gf sad" x="-51" y="306" fps="24" loop="true" indices="0..12"/>
+</character>

assets/data/characters/gf-pixel.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="180" y="300" antialiasing="false" scale="6" camx="180" camy="300">
-	<anim name="danceLeft"  anim="GF IDLE" fps="24" loop="false" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" x="0" y="0" />
-	<anim name="danceRight"  anim="GF IDLE" fps="24" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" x="0" y="0" />
-</character>
+<character x="180" y="300" sprite="gf-pixel" scale="6" antialiasing="false" camx="180" camy="300" icon="gf-pixel" color="#C70660">
+	<anim name="danceLeft" anim="GF IDLE" x="0" y="0" fps="24" loop="false" indices="0..14"/>
+	<anim name="danceRight" anim="GF IDLE" x="0" y="0" fps="24" loop="false" indices="15..30"/>
+</character>

assets/data/characters/gf-tankmen.xml

@@ -1,7 +1,7 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" isGF="true" x="100" y="275">
-	<anim name="danceLeft"      anim="GF Dancing at Gunpoint" fps="24" loop="false" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
-	<anim name="danceRight"     anim="GF Dancing at Gunpoint" fps="24" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
-	<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" fps="24" loop="true" />
-	<anim name="sad"            anim="GF Crying at Gunpoint"  fps="24" loop="true" indices="0,1,2,3,4,5,6,7,8,9,10,11,12"/>
-</character>
+<character sprite="gf-tankmen" icon="gf" color="#A5004D" isGF="true">
+	<anim name="danceLeft" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="false" indices="0..14"/>
+	<anim name="danceRight" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="false" indices="15..30"/>
+	<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="true"/>
+	<anim name="sad" anim="GF Crying at Gunpoint" x="-315" y="6" fps="24" loop="true" indices="0..12"/>
+</character>

assets/data/characters/gf.xml

@@ -1,14 +1,14 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" isGF="true" x="100" y="275">
-	<anim name="cheer"      anim="GF Cheer"                     fps="24" loop="false" />
-	<anim name="singUP"     anim="GF Up Note"                   fps="24" loop="false" x="0" y="0" />
-	<anim name="singLEFT"   anim="GF left note"                 fps="24" loop="false" x="0" y="0" />
-	<anim name="singRIGHT"  anim="GF Right Note"                fps="24" loop="false" x="0" y="0" />
-	<anim name="singDOWN"   anim="GF Down Note"                 fps="24" loop="false" x="0" y="0" />
-	<anim name="danceLeft"  anim="GF Dancing Beat"              fps="24" loop="false" x="0" y="0" indices="30,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
-	<anim name="danceRight" anim="GF Dancing Beat"              fps="24" loop="false" x="0" y="0" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
-	<anim name="hairBlow"   anim="GF Dancing Beat Hair blowing" fps="24" loop="false" x="0" y="0" indices="0,1,2,3" />
-	<anim name="hairFall"   anim="GF Dancing Beat Hair Landing" fps="24" loop="false" x="0" y="0" indices="0,1,2,3,4,5,6,7,8,9,10,11" />
-	<anim name="scared"     anim="GF FEAR"                      fps="24" loop="true"  x="0" y="0" />
-	<anim name="sad"        anim="gf sad"                       fps="24" loop="true"  x="0" y="0" indices="0,1,2,3,4,5,6,7,8,9,10,11,12" />
-</character>
+<character x="100" y="275" sprite="gf" icon="gf" color="#A5004D" isGF="true">
+	<anim name="cheer" anim="GF Cheer" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="GF Up Note" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="GF left note" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="GF Right Note" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="GF Down Note" x="0" y="0" fps="24" loop="false"/>
+	<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="0" fps="24" loop="false" indices="0..14"/>
+	<anim name="danceRight" anim="GF Dancing Beat" x="0" y="0" fps="24" loop="false" indices="15..30"/>
+	<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" x="0" y="0" fps="24" loop="true" indices="0,1,2,3"/>
+	<anim name="hairFall" anim="GF Dancing Beat Hair Landing" x="0" y="0" fps="24" loop="false" indices="0..11"/>
+	<anim name="scared" anim="GF FEAR" x="0" y="0" fps="24" loop="true"/>
+	<anim name="sad" anim="gf sad" x="0" y="0" fps="24" loop="true" indices="0..12"/>
+</character>

assets/data/characters/mom-car.xml

@@ -1,10 +1,13 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" icon="mom">
-	<anim name="idle"      anim="Mom Idle"      fps="24" loop="false" />
-	<anim name="singUP"    anim="Mom Up Pose"   fps="24" loop="false" x="14" y="71"/>
-	<anim name="singDOWN"  anim="MOM DOWN POSE" fps="24" loop="false" x="20" y="-160"/>
-	<anim name="singLEFT"  anim="Mom Left Pose" fps="24" loop="false" x="250" y="-23"/>
-	<!-- ANIMATION IS CALLED MOM LEFT POSE BUT ITS FOR THE RIGHT -->
-	<!-- CUZ DAVE IS DUMB! -->
-	<anim name="singRIGHT" anim="Mom Pose Left" fps="24" loop="false" x="10" y="-60"/>
-</character>
+<character sprite="mom-car" icon="mom" color="#D8558E">
+	<anim name="idle" anim="Mom Idle" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="Mom Up Pose" x="-1" y="81" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="MOM DOWN POSE" x="-12" y="-160" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Mom Left Pose" x="250" y="-23" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Mom Pose Left" x="-15" y="-55" fps="24" loop="false"/>
+	<anim name="idle-loop" anim="Mom Idle" x="0" y="0" fps="24" loop="true" indices="10..13"/>
+	<anim name="singUP-loop" anim="Mom Up Pose" x="-1" y="81" fps="24" loop="true" indices="11..14"/>
+	<anim name="singDOWN-loop" anim="MOM DOWN POSE" x="-12" y="-160" fps="24" loop="true" indices="11..14"/>
+	<anim name="singLEFT-loop" anim="Mom Left Pose" x="250" y="-23" fps="24" loop="true" indices="6..9"/>
+	<anim name="singRIGHT-loop" anim="Mom Pose Left" x="-15" y="-55" fps="24" loop="true" indices="6..9"/>
+</character>

assets/data/characters/mom.xml

@@ -1,10 +1,14 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false">
-	<anim name="idle"      anim="Mom Idle"      fps="24" loop="false" />
-	<anim name="singUP"    anim="Mom Up Pose"   fps="24" loop="false" x="14" y="71"/>
-	<anim name="singDOWN"  anim="MOM DOWN POSE" fps="24" loop="false" x="20" y="-160"/>
-	<anim name="singLEFT"  anim="Mom Left Pose" fps="24" loop="false" x="250" y="-23"/>
-	<!-- ANIMATION IS CALLED MOM LEFT POSE BUT ITS FOR THE RIGHT -->
-	<!-- CUZ DAVE IS DUMB! -->
-	<anim name="singRIGHT" anim="Mom Pose Left" fps="24" loop="false" x="10" y="-60"/>
-</character>
+<character sprite="mom" icon="mom" color="#D8558E">
+	<anim name="idle" anim="Mom Idle" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="Mom Up Pose" x="13" y="67" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="MOM DOWN POSE" x="8" y="-173" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Mom Left Pose" x="282" y="-28" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Mom Pose Left" x="-20" y="-60" fps="24" loop="false"/>
+	<anim name="idle-loop" anim="Mom Idle" x="0" y="0" fps="24" loop="true" indices="10..13"/>
+	<anim name="singUP-loop" anim="Mom Up Pose" x="13" y="67" fps="24" loop="true" indices="11..14"/>
+	<anim name="singDOWN-loop" anim="MOM DOWN POSE" x="8" y="-173" fps="24" loop="true" indices="11..14"/>
+	<anim name="singLEFT-loop" anim="Mom Left Pose" x="282" y="-28" fps="24" loop="true" indices="6..9"/>
+	<anim name="singRIGHT-loop" anim="Mom Pose Left" x="-20" y="-60" fps="24" loop="true" indices="6..9"/>
+</character>
+	

assets/data/characters/monster-christmas.xml

@@ -1,8 +1,8 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="0" y="130" icon="monster">
-	<anim name="idle"      anim="monster idle"       fps="24" loop="false" x="0"   y="0"/>
-	<anim name="singUP"    anim="monster up note"    fps="24" loop="false" x="-20" y="50"/>
-	<anim name="singRIGHT" anim="Monster left note"  fps="24" loop="false" x="-30" y="0"/>
-	<anim name="singLEFT"  anim="Monster Right note" fps="24" loop="false" x="-51" y="0"/>
-	<anim name="singDOWN"  anim="monster down"       fps="24" loop="false" x="-40" y="-94"/>
-</character>
+<character y="130" sprite="monster-christmas" icon="monster" color="#F3FF6E">
+	<anim name="idle" anim="monster idle" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="monster up note" x="-26" y="57" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Monster left note" x="-34" y="10" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Monster Right note" x="-41" y="5" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="monster down" x="-50" y="-92" fps="24" loop="false"/>
+</character>

assets/data/characters/monster.xml

@@ -1,8 +1,8 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="0" y="100">
-	<anim name="idle"      anim="monster idle"       fps="24" loop="false" />
-	<anim name="singUP"    anim="monster up note"    fps="24" loop="false" x="-20" y="94"/>
-	<anim name="singRIGHT"  anim="Monster left note"  fps="24" loop="false" x="-30" y="20"/>
-	<anim name="singLEFT" anim="Monster Right note" fps="24" loop="false" x="-51" y="30"/>
-	<anim name="singDOWN"  anim="monster down"       fps="24" loop="false" x="-50" y="-80"/>
-</character>
+<character y="100" sprite="monster" icon="monster" color="#F3FF6E">
+	<anim name="idle" anim="monster idle" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="monster up note" x="-26" y="92" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Monster left note" x="-34" y="10" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Monster Right note" x="-41" y="10" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="monster down" x="-50" y="-87" fps="24" loop="false"/>
+</character>

assets/data/characters/parents-christmas.xml

@@ -1,12 +1,25 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="-500" y="0">
-	<anim name="idle"          anim="Parent Christmas Idle" fps="24" loop="false"/>
-	<anim name="singUP"        anim="Parent Up Note Dad"    fps="24" loop="false" x="-47" y="24"/>
-	<anim name="singDOWN"      anim="Parent Down Note Dad"  fps="24" loop="false" x="-31" y="-29"/>
-	<anim name="singLEFT"      anim="Parent Left Note Dad"  fps="24" loop="false" x="-30" y="16"/>
-	<anim name="singRIGHT"     anim="Parent Right Note Dad" fps="24" loop="false" x="-1" y="-23"/>
-	<anim name="singUP-alt"    anim="Parent Up Note Mom"    fps="24" loop="false" x="-47" y="24"/>
-	<anim name="singDOWN-alt"  anim="Parent Down Note Mom"  fps="24" loop="false" x="-30" y="-27"/>
-	<anim name="singLEFT-alt"  anim="Parent Left Note Mom"  fps="24" loop="false" x="-30" y="15"/>
-	<anim name="singRIGHT-alt" anim="Parent Right Note Mom" fps="24" loop="false" x="-1" y="-24"/>
-</character>
+<character x="-500" sprite="parents-christmas" icon="parents-christmas" color="#C45EAE">
+	<!--Dad Animations-->
+	<anim name="idle" anim="Parent Christmas Idle" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="Parent Up Note Dad" x="-47" y="25" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="Parent Down Note Dad" x="-33" y="-25" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Parent Left Note Dad" x="-28" y="20" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Parent Right Note Dad" x="0" y="-20" fps="24" loop="false"/>
+	<!--Dad Loop Animations-->
+	<anim name="idle-loop" anim="Parent Christmas Idle" x="0" y="0" fps="24" loop="true" indices="11,11..13"/>
+	<anim name="singUP-loop" anim="Parent Up Note Dad" x="-47" y="25" fps="24" loop="true" indices="10..13"/>
+	<anim name="singDOWN-loop" anim="Parent Down Note Dad" x="-33" y="-25" fps="24" loop="true" indices="11..14"/>
+	<anim name="singLEFT-loop" anim="Parent Left Note Dad" x="-28" y="20" fps="24" loop="true" indices="12..15"/>
+	<anim name="singRIGHT-loop" anim="Parent Right Note Dad" x="0" y="-20" fps="24" loop="true" indices="12..15"/>
+	<!--Mom Animations-->
+	<anim name="singUP-alt" anim="Parent Up Note Mom" x="-47" y="28" fps="24" loop="false"/>
+	<anim name="singDOWN-alt" anim="Parent Down Note Mom" x="-33" y="-25" fps="24" loop="false"/>
+	<anim name="singLEFT-alt" anim="Parent Left Note Mom" x="-28" y="19" fps="24" loop="false"/>
+	<anim name="singRIGHT-alt" anim="Parent Right Note Mom" x="0" y="-19" fps="24" loop="false"/>
+	<!--Mom Loop Animations-->
+	<anim name="singUP-alt-loop" anim="Parent Up Note Mom" x="-47" y="28" fps="24" loop="true" indices="10..13"/>
+	<anim name="singDOWN-alt-loop" anim="Parent Down Note Mom" x="-33" y="-25" fps="24" loop="true" indices="11..14"/>
+	<anim name="singLEFT-alt-loop" anim="Parent Left Note Mom" x="-28" y="19" fps="24" loop="true" indices="11..14"/>
+	<anim name="singRIGHT-alt-loop" anim="Parent Right Note Mom" x="0" y="-19" fps="24" loop="true" indices="11..14"/>
+</character>

assets/data/characters/pico-speakers.xml

@@ -1,16 +1,11 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" icon="pico" x="-50" y="-120" camx="195" camy="365">
-	<!-- Left Animations -->
-	<anim name="shoot1" anim="Pico shoot 1" fps="24" loop="false" indices="0,1,2,3" />
-	<anim name="idle1"  anim="Pico shoot 1" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
-
-	<anim name="shoot2" anim="Pico shoot 2" fps="24" loop="false" indices="0,1,2,3" />
-	<anim name="idle2"  anim="Pico shoot 2" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
-
-	<!-- Right Animations-->
-	<anim name="shoot3" anim="Pico shoot 3" fps="24" loop="false" indices="0,1,2,3" />
-	<anim name="idle3"  anim="Pico shoot 3" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
-
-	<anim name="shoot4" anim="Pico shoot 4" fps="24" loop="false" indices="0,1,2,3" />
-	<anim name="idle4"  anim="Pico shoot 4" fps="24" loop="false" indices="4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24" />
-</character>
+<character x="115" y="-85" sprite="pico-speakers" camx="195" camy="360" icon="pico" color="#B7D855">
+	<anim name="idle1" anim="Pico shoot 1" x="0" y="0" fps="24" loop="false" indices="4..24"/>
+	<anim name="idle2" anim="Pico shoot 2" x="0" y="0" fps="24" loop="false" indices="4..24"/>
+	<anim name="idle3" anim="Pico shoot 3" x="0" y="0" fps="24" loop="false" indices="4..24"/>
+	<anim name="idle4" anim="Pico shoot 4" x="0" y="0" fps="24" loop="false" indices="4..24"/>
+	<anim name="shoot1" anim="Pico shoot 1" x="0" y="0" fps="24" loop="false" indices="0..3"/>
+	<anim name="shoot2" anim="Pico shoot 2" x="0" y="0" fps="24" loop="false" indices="0..3"/>
+	<anim name="shoot3" anim="Pico shoot 3" x="0" y="0" fps="24" loop="false" indices="0..3"/>
+	<anim name="shoot4" anim="Pico shoot 4" x="0" y="0" fps="24" loop="false" indices="0..3"/>
+</character>

assets/data/characters/pico.xml

@@ -1,16 +1,12 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="true" x="100" y="300" camx="-100">
-	<anim name="idle" anim="Pico Idle Dance" fps="24" loop="false"/>
-
-	<!-- Sing Animations -->
-	<anim name="singLEFT"  anim="Pico Note Right0" fps="24" loop="false" x="65" y="9" />
-	<anim name="singDOWN"  anim="Pico Down Note0"  fps="24" loop="false" x="200" y="-70" />
-	<anim name="singUP"    anim="pico Up note0"    fps="24" loop="false" x="-20" y="50" />
-	<anim name="singRIGHT" anim="Pico NOTE LEFT0"  fps="24" loop="false" x="-51" y="0" />
-
-	<!-- Miss Animations -->
-	<anim name="singLEFTmiss"  anim="Pico Note Right Miss" fps="24" loop="false" x="62"  y="64" />
-	<anim name="singDOWNmiss"  anim="Pico Down Note MISS"  fps="24" loop="false" x="200" y="-70" />
-	<anim name="singUPmiss"    anim="pico Up note miss"    fps="24" loop="false" x="-19" y="67" />
-	<anim name="singRIGHTmiss" anim="Pico NOTE LEFT miss"  fps="24" loop="false" x="-60" y="41" />
-</character>
+<character x="100" y="300" sprite="pico" flipX="true" camx="-100" icon="pico" color="#B7D855">
+	<anim name="idle" anim="Pico Idle Dance" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Pico Note Right0" x="56" y="1" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="Pico Down Note0" x="193" y="-82" fps="24" loop="false"/>
+	<anim name="singUP" anim="pico Up note0" x="-31" y="30" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Pico NOTE LEFT0" x="-83" y="-11" fps="24" loop="false"/>
+	<anim name="singLEFTmiss" anim="Pico Note Right Miss" x="57" y="47" fps="24" loop="false"/>
+	<anim name="singDOWNmiss" anim="Pico Down Note MISS" x="193" y="-40" fps="24" loop="false"/>
+	<anim name="singUPmiss" anim="pico Up note miss" x="-19" y="67" fps="24" loop="false"/>
+	<anim name="singRIGHTmiss" anim="Pico NOTE LEFT miss" x="-77" y="25" fps="24" loop="false"/>
+</character>

assets/data/characters/senpai-angry.xml

@@ -1,10 +1,8 @@
 <!DOCTYPE codename-engine-character>
-<character sprite="senpai" isPlayer="false" flipX="false" x="150" y="360" antialiasing="false" scale="6" icon="senpai" camx="100">
-	<anim name="idle" anim="Angry Senpai Idle" fps="24" loop="false" x="0" y="0" />
-
-	<!-- Offsets are actually multiplied by scale -->
-	<anim name="singLEFT"   anim="Angry Senpai LEFT NOTE"     fps="24" loop="false"   x="7" y="0" />
-	<anim name="singDOWN"   anim="Angry Senpai DOWN NOTE"     fps="24" loop="false"   x="2" y="0" />
-	<anim name="singUP"     anim="Angry Senpai UP NOTE"       fps="24" loop="false"   x="1" y="6" />
-	<anim name="singRIGHT"  anim="Angry Senpai RIGHT NOTE"    fps="24" loop="false"   x="0" y="0" />
-</character>
+<character x="150" y="360" sprite="senpai" scale="6" antialiasing="false" camx="100" camy="87" icon="senpai" color="#FFAA6F" isGF="false">
+	<anim name="idle" anim="Angry Senpai Idle" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Angry Senpai LEFT NOTE" x="3" y="0" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="Angry Senpai DOWN NOTE" x="-1" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="Angry Senpai UP NOTE" x="0" y="6" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Angry Senpai RIGHT NOTE" x="-1" y="0" fps="24" loop="false"/>
+</character>

assets/data/characters/senpai.xml

@@ -1,10 +1,9 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="150" y="360" antialiasing="false" scale="6" camx="100">
-	<anim name="idle" anim="Senpai Idle" fps="12" loop="false" x="0" y="0" />
-
-	<!-- Offsets are actually multiplied by scale -->
-	<anim name="singLEFT"   anim="SENPAI LEFT NOTE"     fps="12" loop="false"   x="7" y="0" />
-	<anim name="singDOWN"   anim="SENPAI DOWN NOTE"     fps="12" loop="false"   x="2" y="0" />
-	<anim name="singUP"     anim="SENPAI UP NOTE"       fps="12" loop="false"   x="1" y="6" />
-	<anim name="singRIGHT"  anim="SENPAI RIGHT NOTE"    fps="12" loop="false"   x="0" y="0" />
-</character>
+<character x="150" y="360" sprite="senpai" scale="6" antialiasing="false" camx="100" camy="87" icon="senpai" color="#FFAA6F" interval="2">
+	<anim name="danceLeft" anim="Senpai Idle instance" x="0" y="0" fps="24" loop="false" indices="0..15"/>
+	<anim name="danceRight" anim="Senpai Idle instance" x="0" y="0" fps="24" loop="false" indices="16..31"/>
+	<anim name="singLEFT" anim="SENPAI LEFT NOTE" x="4" y="0" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="SENPAI DOWN NOTE" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singUP" anim="SENPAI UP NOTE" x="0" y="6" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="SENPAI RIGHT NOTE" x="0" y="0" fps="24" loop="false"/>
+</character>

assets/data/characters/spirit.hx

@@ -0,0 +1,16 @@
+import flixel.addons.effects.FlxTrail;
+
+var self = this;
+var trail:FlxTrail;
+function postCreate() {
+	trail = new FlxTrail(self, null, 4, 24, 0.3, 0.069);
+}
+
+var toAdd:Bool = true;  // Using this just to make sure
+function update(elpased) {
+	if(toAdd) {
+		toAdd = false;
+		PlayState.instance.insert(PlayState.instance.members.indexOf(self), trail);
+		disableScript();
+	}
+}

assets/data/characters/spirit.xml

@@ -1,10 +1,8 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="70" y="380" antialiasing="false" scale="6" camx="100">
-	<anim name="idle" anim="idle spirit_" fps="24" loop="false" x="0" y="0" />
-
-	<!-- Offsets are actually multiplied by scale -->
-	<anim name="singLEFT"   anim="left_"     fps="24" loop="false"   x="3" y="0" />
-	<anim name="singDOWN"   anim="spirit down_"     fps="24" loop="false"   x="65" y="65" />
-	<anim name="singUP"     anim="up_"       fps="24" loop="false"   x="0" y="7" />
-	<anim name="singRIGHT"  anim="right_"    fps="24" loop="false"   x="0" y="0" />
-</character>
+<character x="70" y="380" sprite="spirit" scale="6" antialiasing="false" camx="100" icon="spirit" color="#FF3C6E">
+	<anim name="idle" anim="idle spirit_" x="0" y="1" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="left_" x="4" y="-1" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="spirit down_" x="66" y="64" fps="24" loop="false"/>
+	<anim name="singUP" anim="up_" x="-1" y="8" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="right_" x="-2" y="0" fps="24" loop="false"/>
+</character>

assets/data/characters/spooky.xml

@@ -1,9 +1,9 @@
 <!DOCTYPE codename-engine-character>
-<character isPlayer="false" flipX="false" x="0" y="200">
-	<anim name="danceLeft"  anim="spooky dance idle" fps="12" loop="false" x="0" y="0"      indices="0,2,6"/>
-	<anim name="danceRight" anim="spooky dance idle" fps="12" loop="false" x="0" y="0"      indices="8,10,12,14"/>
-	<anim name="singUP"     anim="spooky UP NOTE"    fps="24" loop="false" x="-20" y="26"/>
-	<anim name="singLEFT"   anim="note sing left"    fps="24" loop="false" x="130" y="-10"/>
-	<anim name="singRIGHT"  anim="spooky sing right" fps="24" loop="false" x="-130" y="-14"/>
-	<anim name="singDOWN"   anim="spooky DOWN note"  fps="24" loop="false" x="-50" y="-130"/>
-</character>
+<character y="200" sprite="spooky" icon="spooky" color="#C5995A">
+	<anim name="danceLeft" anim="spooky dance idle" x="0" y="0" fps="24" loop="false" indices="0..6"/>
+	<anim name="danceRight" anim="spooky dance idle" x="0" y="0" fps="24" loop="false" indices="8..14"/>
+	<anim name="singUP" anim="spooky UP NOTE" x="-20" y="26" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="note sing left" x="119" y="-11" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="spooky sing right" x="-150" y="-11" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="spooky DOWN note" x="-77" y="-136" fps="24" loop="false"/>
+</character>

assets/data/characters/tankman.xml

@@ -1,15 +1,10 @@
 <!DOCTYPE codename-engine-character>
-
-<!-- tankman actually have player offsets !-->
-<character isPlayer="true" flipX="true" x="0" y="180" camx="0">
-	<anim name="idle"      anim="Tankman Idle Dance instance 100" fps="24" loop="false" x="0" y="0" />
-	<anim name="singRIGHT" anim="Tankman Right Note instance 1000" fps="24" loop="false" x="-1" y="-7" />
-	<anim name="singDOWN"  anim="Tankman DOWN note instance 1000" fps="24" loop="false" x="98" y="-90" />
-	<anim name="singUP"    anim="Tankman UP note instance 1000" fps="24" loop="false" x="24" y="56" />
-	<anim name="singLEFT"  anim="Tankman Note Left instance 1000" fps="24" loop="false" x="100" y="-14" />
-
-	<!-- Heh! Pretty Good! -->
-	<anim name="singDOWN-alt" anim="PRETTY GOOD tankman instance 100" fps="24" loop="false" x="98" y="-90" />
-	<!-- Ugh! -->
-	<anim name="singUP-alt" anim="TANKMAN UGH instance 100" fps="30" loop="false" x="24" y="56" />
-</character>
+<character y="180" sprite="tankman" flipX="true" isPlayer="true" icon="tankman" color="#FFFFFF" isGF="false">
+	<anim name="idle" anim="Tankman Idle Dance instance 100" x="0" y="0" fps="24" loop="false"/>
+	<anim name="singRIGHT" anim="Tankman Right Note instance 1000" x="-24" y="-13" fps="24" loop="false"/>
+	<anim name="singDOWN" anim="Tankman DOWN note instance 1000" x="75" y="-105" fps="24" loop="false"/>
+	<anim name="singUP" anim="Tankman UP note instance 1000" x="27" y="53" fps="24" loop="false"/>
+	<anim name="singLEFT" anim="Tankman Note Left instance 1000" x="92" y="-28" fps="24" loop="false"/>
+	<anim name="good!" anim="PRETTY GOOD tankman instance 100" x="100" y="17" fps="24" loop="false"/>
+	<anim name="singUP-alt" anim="TANKMAN UGH instance 100" x="-13" y="-9" fps="30" loop="false"/>
+</character>

assets/data/config/menuItems.txt

@@ -1,3 +1,4 @@
 story mode
 freeplay
-options
+options
+credits

assets/data/config/options.xml

@@ -1,14 +0,0 @@
-<!DOCTYPE codename-mod-options>
-<!-- TEMPLATE FOR CUSTOM OPTIONS!!! -->
-<menu name="Mod Options" desc="Modify mod options here">
-	<checkbox id="checkboxExample" name="Checkbox example" />
-	<choice id="choiceExample" name="Choice Example">
-		<value name="Disabled" value="disabled" />
-		<value name="This Only" value="thisonly" />
-		<value name="All" value="all" />
-	</choice>
-
-	<menu name="Submenu Example" desc="Submenu test">
-		<checkbox id="levelOfIdk2" name="Level of idk" />
-	</menu>
-</menu>

assets/data/dialogue/boxes/default.xml

@@ -1,21 +1,21 @@
 <!DOCTYPE codename-engine-dialogue-box>
-<dialoguebox scale="0.9" y="75">
+<dialoguebox y="75">
 	<!--
 		Node containing all text settings
-	 -->
+	-->
 	<text font="vcr.ttf" x="107" y="206" width="1053" color="#000000" size="40"/>
 
 	<!--
 		All positions for characters
 	-->
-	<charpos name="left" x="-500" y="184" />
+	<charpos name="left" x="-500" y="184" flipBubble="true" />
 	<charpos name="middle" x="0" y="184" />
-	<charpos name="right" x="500" y="184" flipBubble="true" />
+	<charpos name="right" x="500" y="184" />
 
 	<!--
 		All animations for the dialogue box
 		For example, if you wanna add an "angry" animation, add an animation named "angry" (box idle), and "angry-open" (not needed, for box apparition)
-	 -->
+	-->
 	<anim name="normal" anim="speech bubble normal" fps="24" loop="true" x="-30"/>
 	<anim name="normal-open" anim="Speech Bubble Normal Open" fps="24" />
 

assets/data/dialogue/boxes/hating-simulator.hx

@@ -0,0 +1,61 @@
+var loopedTimah:FlxTimer;  // Hey! a man has fallen into the river in lego city! and if youre asking why this is here, you shall disappear!  - Nex
+var bgFade:FlxSprite;
+var hand:FlxSprite;
+
+function postCreate() {
+	bgFade = new FlxSprite().makeSolid(FlxG.width + 100, FlxG.height + 100, 0xFFB3DFd8);
+	bgFade.screenCenter();
+	bgFade.scrollFactor.set();
+	bgFade.alpha = 0;
+	cutscene.insert(0, bgFade);
+
+	loopedTimah = new FlxTimer().start(0.83, function(tmr:FlxTimer)
+	{
+		bgFade.alpha += (1 / 5) * 0.7;
+		if (bgFade.alpha > 0.7)
+			bgFade.alpha = 0.7;
+	}, 5);
+
+	hand = new FlxSprite(0, 600).loadGraphic(Paths.image('stages/school/ui/hand_textbox'));
+	hand.scale.set(4, 4);
+	hand.updateHitbox();
+}
+
+var finished:Bool = false;
+function close(event) {
+	if(finished) return;
+	else event.cancelled = true;
+	cutscene.canProceed = false;
+
+	cutscene.curMusic?.fadeOut(1, 0);
+	for(c in cutscene.charMap) c.visible = false;
+
+	loopedTimah.cancel();
+	loopedTimah = new FlxTimer().start(0.2, function(tmr:FlxTimer)
+	{
+		if (tmr.elapsedLoops <= 5) {
+			cutscene.dialogueBox.alpha -= 1 / 5;
+			cutscene.dialogueBox.text.alpha -= 1 / 5;
+			bgFade.alpha -= (1 / 5) * 0.7;
+			hand.alpha -= 1 / 5;
+		} else {
+			finished = true;
+			cutscene.close();
+		}
+	}, 6);
+}
+
+var time:Float = 0;
+function update(elapsed:Float) {
+	if(hand.visible = dialogueEnded) {
+		hand.x = 1060 + Math.sin((time += elapsed) * Math.PI * 2) * 12;
+		hand.x -= hand.x % hand.scale.x;
+		hand.y -= hand.y % hand.scale.y;
+	}
+}
+
+function postPlayBubbleAnim() {
+	cutscene.remove(hand);
+	if(active && visible)
+		cutscene.add(hand);
+}

assets/data/dialogue/boxes/hating-simulator.xml

@@ -0,0 +1,21 @@
+<!DOCTYPE codename-engine-dialogue-box>
+<dialoguebox sprite="pixel/dialogueBox" antialiasing="false" graphicSizex="1227" x="-67" y="-325" textSound="pixel/pixelText" nextSound="pixel/clickText" updateHitbox="true">
+	<!--
+		Node containing all text settings
+	-->
+	<text font="pixel.otf" x="239" y="218" width="768" color="#3f2021" size="32" antialiasing="false" borderSize="1" borderStyle="shadow" borderColor="#D89494" shadowOffsetX="2" shadowOffsetY="2"/>
+
+	<!--
+		All positions for characters
+	-->
+	<charpos name="left" x="-500" y="184" />
+	<charpos name="middle" x="0" y="184" />
+	<charpos name="right" x="490" y="184" />
+
+	<!--
+		All animations for the dialogue box
+		For example, if you wanna add an "angry" animation, add an animation named "angry" (box idle), and "angry-open" (not needed, for box apparition)
+	-->
+	<anim name="normal-firstOpen" anim="Text Box Appear instance 10" fps="24" />
+	<anim name="angry-firstOpen" anim="Text Box Bump Appear instance 10" x="-16" y="-59" fps="24" />
+</dialoguebox>

assets/data/dialogue/boxes/spirit-creepy-box.hx

@@ -0,0 +1,43 @@
+import flixel.tweens.FlxTweenType;
+
+var aberration:CustomShader = null;
+var spirit:FlxSprite;
+function postCreate() {
+	spirit = new FlxSprite(320, 170).loadGraphic(Paths.image('game/cutscenes/weeb/spiritFaceForward'));
+	spirit.setGraphicSize(Std.int(spirit.width * 6));
+	if(Options.gameplayShaders) {
+		spirit.shader = aberration = new CustomShader('chromaticAberration');
+		FlxTween.num(-0.003, 0.003, 3, {ease: FlxEase.sineInOut, type: FlxTweenType.PINGPONG}, function(num) { if(aberration == null) return; aberration.redOff = [0, -num]; aberration.blueOff = [0, num]; });
+	}
+	cutscene.add(spirit);
+
+	FlxG.camera._fxFadeAlpha = 0;
+	cutscene.dialogueCamera.bgColor = FlxColor.fromRGBFloat(1, 1, 1, 0.3);
+}
+
+var finished:Bool = false;
+function close(event) {
+	if(finished) return;
+	else event.cancelled = true;
+	cutscene.canProceed = false;
+
+	cutscene.curMusic?.fadeOut(1, 0);
+	for(c in cutscene.charMap) c.visible = false;
+
+	spirit.destroy();
+	spirit.shader = aberration = null;
+	new FlxTimer().start(0.4, function(swagTimer:FlxTimer) {
+		cutscene.dialogueCamera.alpha -= 0.15;
+
+		if(cutscene.dialogueCamera.alpha > 0) swagTimer.reset();
+		else {
+			finished = true;
+			cutscene.close();
+		}
+	});
+}
+
+function popupChar(event) {
+	if(!active || event.char.positionName != "left") return;
+	event.char.color = FlxColor.BLACK;
+}

assets/data/dialogue/boxes/spirit-creepy-box.xml

@@ -0,0 +1,20 @@
+<!DOCTYPE codename-engine-dialogue-box>
+<dialoguebox sprite="pixel/dialogueBox-evil" antialiasing="false" graphicSizex="1344" y="107" textSound="pixel/pixelText" nextSound="pixel/clickText" updateHitbox="true">
+	<!--
+		Node containing all text settings
+	-->
+	<text font="pixel.otf" x="265" y="220" width="768" color="#FFFFFF" size="32" antialiasing="false" borderSize="2" borderStyle="shadow" borderColor="#000000" />
+
+	<!--
+		All positions for characters
+	-->
+	<charpos name="left" x="-510" y="183" />
+	<charpos name="middle" x="0" y="183" />
+	<charpos name="right" x="510" y="183" />
+
+	<!--
+		All animations for the dialogue box
+		For example, if you wanna add an "angry" animation, add an animation named "angry" (box idle), and "angry-open" (not needed, for box apparition)
+	-->
+	<anim name="normal-firstOpen" anim="Spirit Textbox spawn instance 10" fps="24" />
+</dialoguebox>

assets/data/dialogue/characters/pixelBf.hx

@@ -0,0 +1,3 @@
+function postHide() {
+	if(curTween != null) curTween.percent = 1;
+}

assets/data/dialogue/characters/pixelBf.xml

@@ -0,0 +1,4 @@
+<!DOCTYPE codename-engine-dialogue-character>
+<character sprite="pixel/boyfriend" x="570" y="-599" graphicSizex="1334" antialiasing="false" textSound="pixel/pixelText">
+	<anim name="normal-show" anim="Boyfriend portrait enter instance 10" fps="24" />
+</character>

assets/data/dialogue/characters/senpai.hx

@@ -0,0 +1,6 @@
+function postHide() {
+	if(curTween != null) {
+		if(getAnimName() == 'angry-show') curTween.cancel();
+		else curTween.percent = 1;
+	}
+}

assets/data/dialogue/characters/senpai.xml

@@ -0,0 +1,5 @@
+<!DOCTYPE codename-engine-dialogue-character>
+<character sprite="pixel/senpai" x="-392" y="-599" graphicSizex="1334" antialiasing="false" textSound="pixel/pixelText">
+	<anim name="normal-show" anim="Senpai Portrait Enter instance 10" fps="24" x="4.4" />
+	<anim name="angry-show" anim="Senpai Portrait Angry instance 10" x="-56" y="-9" fps="24" />
+</character>

assets/data/discord.hx

@@ -0,0 +1,50 @@
+import funkin.backend.utils.DiscordUtil;
+
+function onGameOver() {
+	DiscordUtil.changePresence('Game Over', PlayState.SONG.meta.displayName + " (" + PlayState.difficulty + ")");
+}
+
+function onDiscordPresenceUpdate(e) {
+	var data = e.presence;
+
+	if(data.button1Label == null)
+		data.button1Label = "Codename Engine Discord";
+	if(data.button1Url == null)
+		data.button1Url = "https://discord.gg/2NTCdsQvx4";
+}
+
+function onPlayStateUpdate() {
+	DiscordUtil.changeSongPresence(
+		PlayState.instance.detailsText,
+		(PlayState.instance.paused ? "Paused - " : "") + PlayState.SONG.meta.displayName + " (" + PlayState.difficulty + ")",
+		PlayState.instance.inst,
+		PlayState.instance.getIconRPC()
+	);
+}
+
+function onMenuLoaded(name:String) {
+	// Name is either "Main Menu", "Freeplay", "Title Screen", "Options Menu", "Credits Menu", "Beta Warning", "Update Available Screen", "Update Screen"
+	DiscordUtil.changePresenceSince("In the Menus", null);
+}
+
+function onEditorTreeLoaded(name:String) {
+	switch(name) {
+		case "Character Editor":
+			DiscordUtil.changePresenceSince("Choosing a Character", null);
+		case "Chart Editor":
+			DiscordUtil.changePresenceSince("Choosing a Chart", null);
+		case "Stage Editor":
+			DiscordUtil.changePresenceSince("Choosing a Stage", null);
+	}
+}
+
+function onEditorLoaded(name:String, editingThing:String) {
+	switch(name) {
+		case "Character Editor":
+			DiscordUtil.changePresenceSince("Editing a Character", editingThing);
+		case "Chart Editor":
+			DiscordUtil.changePresenceSince("Editing a Chart", editingThing);
+		case "Stage Editor":
+			DiscordUtil.changePresenceSince("Editing a Stage", editingThing);
+	}
+}

assets/data/global.hx

@@ -1,3 +1,3 @@
-function update(elapsed)
-    if (FlxG.keys.justPressed.F5)
-        FlxG.resetState();
+//
+function update(elapsed:Float)
+	if (FlxG.keys.justPressed.F5) FlxG.resetState();

assets/data/notes/Alt Anim Note.hx

@@ -0,0 +1,2 @@
+function onNoteHit(event) if (event.noteType == "Alt Anim Note") event.animSuffix = "-alt";
+function onPlayerMiss(event) if (event.noteType == "Alt Anim Note") event.animSuffix = "miss-alt";

assets/data/notes/No Anim Note.hx

@@ -0,0 +1,2 @@
+function onNoteHit(event) if (event.noteType == "No Anim Note") event.animCancelled = true;
+function onPlayerMiss(event) if (event.noteType == "No Anim Note") event.animCancelled = true;

assets/data/scripts/pixel.hx

@@ -1,8 +1,10 @@
+//
 import funkin.game.HudCamera;
-import funkin.scripting.events.NoteHitEvent;
+import funkin.backend.scripting.events.NoteHitEvent;
 
 public var pixelNotesForBF = true;
 public var pixelNotesForDad = true;
+public var pixelSplashes = true;
 public var enablePixelUI = true;
 public var enablePixelGameOver = true;
 public var enableCameraHacks = Options.week6PixelPerfect;
@@ -34,6 +36,12 @@ function onNoteCreation(event) {
 	note.updateHitbox();
 }
 
+function onPostNoteCreation(event) {
+	var splashes = event.note;
+	if (pixelSplashes)
+		splashes.splash = "pixel-default";
+}
+
 function onStrumCreation(event) {
 	if (event.player == 1 && !pixelNotesForBF) return;
 	if (event.player == 0 && !pixelNotesForDad) return;
@@ -82,16 +90,13 @@ function postCreate() {
 		PauseSubState.script = 'data/scripts/week6-pause';
 	}
 	if (enableCameraHacks) {
-		FlxG.camera.antialiasing = false;
-		FlxG.camera.pixelPerfectRender = true;
-
-
-		iconP1.antialiasing = false;
-		iconP2.antialiasing = false;
+		camGame.pixelPerfectRender = true;
+		camGame.antialiasing = false;
 
 		makeCameraPixely(camGame);
 		defaultCamZoom /= daPixelZoom;
 	}
+
 	if (enablePixelGameOver) {
 		gameOverSong = "pixel/gameOver";
 		lossSFX = "pixel/gameOverSFX";
@@ -100,7 +105,7 @@ function postCreate() {
 }
 
 function onStartCountdown() {
-	var newNoteCamera = new HudCamera();
+	/*var newNoteCamera = new HudCamera();
 	newNoteCamera.bgColor = 0; // transparent
 	FlxG.cameras.add(newNoteCamera, false);
 
@@ -114,7 +119,7 @@ function onStartCountdown() {
 			i++;
 		}
 	}
-	makeCameraPixely(newNoteCamera);
+	makeCameraPixely(newNoteCamera);*/
 }
 
 /**
@@ -122,6 +127,8 @@ function onStartCountdown() {
  */
 public function makeCameraPixely(cam) {
 	cam.pixelPerfectRender = true;
+	if(!enableCameraHacks) return;
+
 	cam.zoom /= Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y) * daPixelZoom;
 
 	var shad = new CustomShader('pixelZoomShader');
@@ -153,16 +160,18 @@ function postUpdate(elapsed) {
 	if (enableCameraHacks) {
 		for(p in strumLines)
 			p.notes.forEach(function(n) {
+				if(n.isSustainNote) return; // hacky fix for hold
 				n.y -= n.y % daPixelZoom;
 				n.x -= n.x % daPixelZoom;
 			});
 	}
 
+	var zoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
 	for(e in pixellyCameras) {
 		if (!e.exists) continue;
-		e.zoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
+		e.zoom = zoom;
 	}
 	for(e in pixellyShaders) {
-		e.pixelZoom = 1 / daPixelZoom / Math.min(FlxG.scaleMode.scale.x, FlxG.scaleMode.scale.y);
+		e.pixelZoom = zoom;
 	}
 }

assets/data/scripts/week6-pause.hx

@@ -73,7 +73,8 @@ function confText(text) {
 }
 
 function destroy() {
-	FlxG.cameras.remove(pauseCam);
+	if(FlxG.cameras.list.contains(pauseCam))
+		FlxG.cameras.remove(pauseCam);
 }
 
 var canDoShit = true;
@@ -91,15 +92,11 @@ function update(elapsed) {
 
 	if (!canDoShit) return;
 	var oldSec = curSelected;
-	if (controls.DOWN_P)
-		changeSelection(1, false);
-	if (controls.UP_P)
-		changeSelection(-1);
 
-	if (oldSec != curSelected) {
+	changeSelection((controls.UP_P ? -1 : 0) + (controls.DOWN_P ? 1 : 0) - FlxG.mouse.wheel);
+
+	if (oldSec != curSelected)
 		FlxG.sound.play(Paths.sound(isThorns ? 'pixel/type' : 'pixel/pixelText'));
-	}
-
 
 	if (controls.ACCEPT) {
 		FlxG.sound.play(Paths.sound(isThorns ? 'pixel/ANGRY' : 'pixel/clickText'));
@@ -117,7 +114,7 @@ function update(elapsed) {
 	}
 }
 
-function changeSelection(change) {
+function changeSelection(change) {  // this overrides the function inside of the normal pause btw, so no event gets called  - Nex
 	curSelected += change;
 
 	if (curSelected < 0)

assets/data/scripts/week7-balledLines.hx

@@ -0,0 +1,15 @@
+var sound:Sound;
+
+function create()
+	sound = Paths.sound('jeffGameover/jeffGameover-' + FlxG.random.int(1, 25, !Options.naughtyness ? [1, 3, 8, 13, 17, 21] : null));
+
+function beatHit(cur:Int) {
+	if(cur != 0) return;
+
+	FlxG.sound.music.volume = 0.2;
+	FlxG.sound.play(sound, 1, false, null, true, function()
+	{
+		if (!isEnding)
+			FlxG.sound.music.fadeIn(4, 0.2, 1);
+	});
+}

assets/data/splashes/default.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-splashes>
-<splashes sprite="game/splashes/default" alpha="0.6"> 
+<splashes sprite="game/splashes/default" alpha="0.6">
 	<strum id="0"> <!-- LEFT -->
 		<anim name="splashleft1" anim="note impact 1 purple" fps="24" x="0" y="0" />
 		<anim name="splashleft2" anim="note impact 2 purple" fps="24" x="0" y="0" />

assets/data/splashes/pixel-default.xml

@@ -0,0 +1,20 @@
+<!DOCTYPE codename-engine-splashes>
+<!--Pixel Splashes by APurples!!-->
+<splashes sprite="stages/school/ui/pixel-splashes" alpha="0.6" antialiasing="false" scale="3.5">
+	<strum id="0"> <!-- LEFT -->
+		<anim name="splashleft1" anim="splash purple 1" fps="24" x="-1" y="-2" />
+		<anim name="splashleft2" anim="splash purple 2" fps="24" x="-1" y="-2" />
+	</strum>
+	<strum id="1"> <!-- DOWN -->
+		<anim name="splashdown1" anim="splash blue 1" fps="24" x="-1" y="-2" />
+		<anim name="splashdown2" anim="splash blue 2" fps="24" x="-1" y="-2" />
+	</strum>
+	<strum id="2"> <!-- UP -->
+		<anim name="splashup1" anim="splash green 1" fps="24" x="-1" y="-2" />
+		<anim name="splashup2" anim="splash green 2" fps="24" x="-1" y="-2" />
+	</strum>
+	<strum id="3"> <!-- RIGHT -->
+		<anim name="splashright1" anim="splash red 1" fps="24" x="-1" y="-2" />
+		<anim name="splashright2" anim="splash red 2" fps="24" x="-1" y="-2" />
+	</strum>
+</splashes>

assets/data/splashes/pixel-secret.xml

@@ -0,0 +1,16 @@
+<!DOCTYPE codename-engine-splashes>
+<!--Pixel Splashes by APurples!!-->
+<splashes sprite="stages/school/ui/pixel-secret-splashes" alpha="0.6" antialiasing="false" scale="3.5">
+	<strum id="0"> <!-- LEFT -->
+		<anim name="splashleft1" anim="splash purple 1" fps="24" x="-3"/>
+	</strum>
+	<strum id="1"> <!-- DOWN -->
+		<anim name="splashdown1" anim="splash blue 1" fps="24" x="-3"/>
+	</strum>
+	<strum id="2"> <!-- UP -->
+		<anim name="splashup1" anim="splash green 1" fps="24" x="-3"/>
+	</strum>
+	<strum id="3"> <!-- RIGHT -->
+		<anim name="splashright1" anim="splash red 1" fps="24" x="-3"/>
+	</strum>
+</splashes>

assets/data/splashes/secret.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-splashes>
-<splashes sprite="game/splashes/secret" alpha="0.6" scale="0.75"> 
+<splashes sprite="game/splashes/secret" alpha="0.6" scale="0.75">
 	<strum id="0"> <!-- LEFT -->
 		<anim name="splash purple" anim="splash purple" fps="24" x="0" y="0" />
 	</strum>

assets/data/stages/limo.hx

@@ -1,39 +1,43 @@
 var fastCarCanDrive:Bool = true;
 
-function create() {
+function create()
 	resetFastCar();
-}
-function update(elapsed:Float) {
+
+function update(elapsed:Float)
+{
 	if (!fastCarCanDrive && fastCar.x > 2000) {
 		resetFastCar();
 		fastCarCanDrive = true;
 	}
 
+	var offset = Math.sin(curBeatFloat / 4) * Math.cos(curBeatFloat / 16) * 85;
+
 	// back limo drive
 	if (Options.lowMemoryMode) {
-		bgLimo.frameOffset.x = Math.sin(curBeatFloat / 4) * Math.cos(curBeatFloat / 16) * 85;
+		bgLimo.frameOffset.x = offset;
 	} else {
 		for(e in [bgLimo, dancer1, dancer2, dancer3, dancer4, dancer5]) {
-			e.frameOffset.x = Math.sin(curBeatFloat / 4) * Math.cos(curBeatFloat / 16) * 85;
+			e.frameOffset.x = offset;
 		}
 	}
 }
-function beatHit(curBeat:Int) {
+function beatHit(curBeat:Int)
 	if (FlxG.random.bool(10) && fastCarCanDrive)
 		fastCarDrive();
-}
 
-
-function resetFastCar() {
+function resetFastCar()
+{
 	fastCar.x = -12600;
 	fastCar.y = FlxG.random.int(140, 250);
 	fastCar.velocity.x = 0;
+	fastCar.moves = false;
 	fastCarCanDrive = true;
 }
 function fastCarDrive()
 {
 	FlxG.sound.play(Paths.soundRandom('carPass', 0, 1), 0.7);
 
-	fastCar.velocity.x = (FlxG.random.int(170, 220) / FlxG.elapsed) * 3;
+	fastCar.velocity.x = FlxG.random.int(170, 220) * 60 * 3;
+	fastCar.moves = true;
 	fastCarCanDrive = false;
 }

assets/data/stages/limo.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="0.9" name="limo" folder="stages/limo/">
+<stage zoom="0.9" name="limo" folder="stages/limo/" startCamPosY="400">
 	<!-- BG LIMOS !-->
 	<sprite name="skyBG" x="-120" y="-50" sprite="limoSunset" scroll="0.1" zoomfactor="0"/>
 	<sprite name="bgLimo" x="-200" y="480" sprite="bgLimo" scroll="0.4" zoomfactor="0.55" />
@@ -7,23 +7,23 @@
 	<!-- ONLY FOR INSTANCES WITH LOW MEMORY MODE DISABLED -->
 	<high-memory>
 		<!-- DANCERS !-->
-		<sprite name="dancer1" x="130" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55">
+		<sprite name="dancer1" x="130" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer2" x="500" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55">
+		<sprite name="dancer2" x="500" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer3" x="870" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55">
+		<sprite name="dancer3" x="870" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer4" x="1240" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55">
+		<sprite name="dancer4" x="1240" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
-		<sprite name="dancer5" x="1610" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55">
+		<sprite name="dancer5" x="1610" y="80" sprite="limoDancer" scroll="0.4" zoomfactor="0.55" type="onbeat" beatInterval="1">
 			<anim name="danceLeft" anim="bg dancer sketch PINK" loop="false" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14" />
 			<anim name="danceRight" anim="bg dancer sketch PINK" loop="false" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
 		</sprite>
@@ -37,7 +37,7 @@
 	<girlfriend />
 	<sprite name="limo" x="-120" y="550" sprite="limoDrive" />
 	<boyfriend x="1030" y="-120" camxoffset="-300"/>
-	
+
 	<high-memory>
 		<sprite name="overlayShit" x="-500" y="480" sprite="limoOverlay" scroll="0">
 			<property name="alpha" type="float" value="0.5" />

assets/data/stages/mall-evil.hx

@@ -0,0 +1,24 @@
+var idk:CustomShader = null;
+function create() {
+	if(!Options.gameplayShaders) {
+		disableScript();
+		return;
+	}
+
+	idk = new CustomShader('coloredVignette');
+	idk.color = [1, 0, 0];
+	camGame.addShader(idk);
+}
+
+var adder:Int = 0;
+function postUpdate(elapsed:Float) {  // Doing it like this so at least the red bump doesnt look too much instant
+	var toAdd:Int = lerp(adder, 0, elapsed);
+	idk.amount = camGame.zoom * camHUD.zoom + toAdd;
+	idk.strength = (camGame.zoom - camHUD.zoom + toAdd) * 5;
+	if(adder > 0) adder -= 0.0001 * camZoomingStrength;
+}
+
+function beatHit() {
+	if(Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < maxCamZoom && curBeat % camZoomingInterval == 0)
+		adder = 0.05 * camZoomingStrength;
+}

assets/data/stages/mall-evil.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="1.05" name="mall-evil" folder="stages/mall/">
+<stage zoom="1.05" name="mall-evil" folder="stages/mall/" startCamPosY="400" startCamPosX="1300">
 	<sprite name="bg" x="-400" y="-500" sprite="evilBG" scroll="0.2"/>
 	<sprite name="evilTree" x="300" y="-300" sprite="evilTree" scroll="0.2"/>
 	<sprite name="evilSnow" x="-200" y="700" sprite="evilSnow" />

assets/data/stages/mall.xml

@@ -1,20 +1,21 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="0.8" name="mall" folder="stages/mall/">
-	<sprite name="bg" x="-1000" y="-500" sprite="bgWalls" scroll="0.2"/>
-	
-	<high-memory>
-		<sprite name="upperBoppers" x="-240" y="-90" sprite="upperBop" scroll="0.2" />
-	</high-memory>
-	<sprite name="bgEscalator" x="-1100" y="-600" sprite="bgEscalator" scroll="0.3" scale="0.9" updateHitbox="true"/>
-	<sprite name="tree" x="370" y="-250" sprite="christmasTree" scroll="0.4"/>
-	<sprite name="bottomBoppers" x="-300" y="140" sprite="bottomBop" scroll="0.9"/>
-	<sprite name="fgSnow" x="-600" y="700" sprite="fgSnow"/>
-	
-	<high-memory>
-		<sprite name="santa" x="-840" y="150" sprite="santa"/>
-	</high-memory>
+<stage zoom="0.8" name="mall" folder="stages/mall/" startCamPosY="450" startCamPosX="500">
+	<sprite name="bg" x="-1380" y="-620" sprite="bgWalls" scale="0.8" scroll="0.2"/>
 
-	<girlfriend />
-	<dad />
-	<boyfriend x="870" camyoffset="-200"/>
-</stage>
+	<high-memory>
+		<sprite name="upperBoppers" x="-400" y="-60" sprite="upperBop" scale="0.85" scroll="0.33" type="onbeat" beatInterval="1"/>
+	</high-memory>
+	<sprite name="bgEscalator" x="-1090" y="-540" sprite="bgEscalator" scroll="0.3" scale="0.9" updateHitbox="true"/>
+	<sprite name="tree" x="370" y="-250" sprite="christmasTree" scroll="0.4"/>
+	<sprite name="bottomBoppers" x="-297" y="120" sprite="bottomBop" scroll="0.9" type="onbeat" beatInterval="1"/>
+	<sprite name="fgSnow" x="-600" y="680" sprite="fgSnow"/>
+
+
+	<girlfriend x="540" y="110"/>
+	<dad/>
+	<boyfriend x="1030" camyoffset="-150" camxoffset="-150"/>
+
+	<high-memory>
+		<sprite name="santa" x="-840" y="150" sprite="santa" type="onbeat" beatInterval="1"/>
+	</high-memory>
+</stage>

assets/data/stages/philly.hx

@@ -1,3 +1,4 @@
+//
 import funkin.game.PlayState;
 
 // phillyTrain is automatically added by Stage.hx
@@ -19,6 +20,7 @@ var trainCooldown:Int = 0;
 
 function create() {
 	// defaultCamZoom = 0.5;
+	phillyTrain.moves = true;  // Def value false in funkinsprite
 	light.color = colors[curColor];
 	trainSound = FlxG.sound.load(Paths.sound("train_passes"));
 }
@@ -89,7 +91,7 @@ function updateTrainPos():Void
 
 function trainReset():Void
 {
-	gf.playAnim('hairFall');
+	gf.playAnim('hairFall', true);
 	phillyTrain.x = FlxG.width + 200;
 	trainMoving = false;
 	// trainSound.stop();

assets/data/stages/philly.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="1.05" name="philly" folder="stages/philly/">
+<stage zoom="1.05" name="philly" folder="stages/philly/" startCamPosY="510" startCamPosX="950">
 	<sprite name="bg" x="-100" y="0" sprite="sky" scroll="0.1" zoomfactor="0"/>
 	<sprite name="city" x="-10" y="0" sprite="city" scroll="0.3" scale="0.85" updateHitbox="true" zoomfactor="0.3"/>
 	<sprite name="light" x="-10" y="0" sprite="win" scroll="0.3" scale="0.85" updateHitbox="true" zoomfactor="0.3"/>

assets/data/stages/school-evil.hx

@@ -1,4 +1,8 @@
 function create() {
-	importScript("data/scripts/pixel");
 	isSpooky = true;
+
+	// Make transition work between school types
+	if(PlayState.smoothTransitionData?.stage == "school") PlayState.smoothTransitionData.stage = curStage;
+
+	disableScript();
 }

assets/data/stages/school-evil.xml

@@ -1,5 +1,6 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="1" name="school-evil" folder="stages/school/" >
+<stage zoom="1" name="school-evil" folder="stages/school/" startCamPosY="550" startCamPosX="600">
+	<use-extension script="pixel"/>
 	<sprite name="bg" x="400" y="200" sprite="animatedEvilSchool"
 		antialiasing="false" scale="6" scrollx="0.8" scrolly="0.9" type="loop"/>
 </stage>

assets/data/stages/school.hx

@@ -1,14 +1,10 @@
+//
 function create() {
-	importScript("data/scripts/pixel");
-	if (PlayState.SONG.song == "Roses") {
-		flabbergastGirls();
+	if (PlayState.SONG.meta.name.toLowerCase() == "roses") {
+		bgGirls.animation.remove("danceLeft");
+		bgGirls.animation.remove("danceRight");
+		bgGirls.animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false);
+		bgGirls.animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false);
 	}
-}
-
-public function flabbergastGirls() {
-	bgGirls.animation.remove("danceLeft");
-	bgGirls.animation.remove("danceRight");
-	bgGirls.animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false);
-	bgGirls.animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false);
-	bgGirls.animation.play("danceLeft", true);
+	bgGirls.animation.play("danceLeft", true); // horrible fix, please fix later
 }

assets/data/stages/school.xml

@@ -1,5 +1,7 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="1" folder="stages/school/" >
+<stage zoom="1" folder="stages/school/" startCamPosY="550" startCamPosX="600">
+	<use-extension script="pixel"/>
+
 	<sprite name="bgSky" x="-12" y="0" sprite="weebSky"
 		antialiasing="false" scale="6" scroll="0.1" updateHitbox="true"/>
 
@@ -11,17 +13,19 @@
 
 
 	<sprite name="fgTrees" x="-30" y="130" sprite="weebTreesBack"
-		antialiasing="false" scale="4.8" scroll="0.9" updateHitbox="true" type="loop"/>
+		antialiasing="false" scale="4.797" scroll="0.9" updateHitbox="true" type="loop"/>
 
-	<sprite name="bgTrees" x="-1180" y="-1600" sprite="weebTrees"
-		antialiasing="false" scale="8.4" scroll="0.85" updateHitbox="true" type="loop"/>
+	<sprite name="bgTrees" x="-590" y="-800" sprite="weebTrees" antialiasing="false" scale="5.102" scroll="0.85" updateHitbox="true" type="loop">
+		<!-- Frame 19 isnt used in og -->
+		<anim name="trees" anim="trees" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19" fps="12" loop="true"/>
+	</sprite>
 
 	<high-memory>
 		<sprite name="treeLeaves" x="-200" y="-40" sprite="petals"
 			antialiasing="false" scale="6" scroll="0.85" updateHitbox="true" type="loop"/>
 	</high-memory>
 
-	<sprite name="bgGirls" x="-100" y="190" sprite="bgFreaks" scroll="0.9" scale="6" antialiasing="false" updateHitbox="true">
+	<sprite name="bgGirls" x="-100" y="190" sprite="bgFreaks" scroll="0.9" scale="6" antialiasing="false" updateHitbox="true" type="onbeat" beatInterval="1">
 		<anim name="danceLeft" anim="BG girls group" indices="0,1,2,3,4,5,6,7,8,9,10,11,12,13" fps="24" loop="false"/>
 		<anim name="danceRight" anim="BG girls group" indices="15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" fps="24" loop="false"/>
 	</sprite>

assets/data/stages/spooky.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="1.05" name="spooky" folder="stages/spooky/">
+<stage zoom="1.05" name="spooky" folder="stages/spooky/" startCamPosY="400" startCamPosX="600">
 	<sprite name="bg" x="-200" y="-100" sprite="halloween_bg" anim="idle" type="none" scale="1.05">
 		<anim name="idle" anim="halloweem bg0" type="loop" />
 		<anim name="lightning" anim="halloweem bg lightning strike" loop="false"/>

assets/data/stages/stage.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="0.9" name="stage" folder="stages/default/">
+<stage zoom="0.9" name="stage" folder="stages/default/" startCamPosY="600" startCamPosX="1000">
 	<sprite name="bg"               x="-600" y="-200"   sprite="stageback"       scroll="0.9" />
 	<sprite name="stageFront"       x="-600" y="600"    sprite="stagefront"      scroll="0.9" />
 	<girlfriend />

assets/data/stages/tank.hx

@@ -1,9 +1,19 @@
 var tankAngle:Float = FlxG.random.int(-90, 45);
 var tankSpeed:Float = FlxG.random.float(5, 7);
 
+function postCreate() if(PlayState.isStoryMode)
+	GameOverSubstate.script = 'data/scripts/week7-balledLines';
+
 function update(elapsed:Float) {
 	tankAngle += elapsed * tankSpeed;
 	tankRolling.angle = tankAngle - 90 + 15;
 	tankRolling.x = 400 + (1500 * Math.cos(Math.PI / 180 * (1 * tankAngle + 180)));
 	tankRolling.y = 1300 + (1100 * Math.sin(Math.PI / 180 * (1 * tankAngle + 180)));
+}
+
+function onPostCountdown(event) {
+	if(!playCutscenes || event.sprite == null) return;
+	var lastIndex:Int = members.indexOf(event.sprite);
+	remove(event.sprite);
+	insert(lastIndex + 4, event.sprite);
 }

assets/data/stages/tank.xml

@@ -1,8 +1,6 @@
 <!DOCTYPE codename-engine-stage>
-<stage zoom="0.9" name="tank" folder="stages/tank/">
+<stage zoom="0.9" name="tank" folder="stages/tank/" startCamPosY="400" startCamPosX="300">
 	<!-- BG STUFF -->
-	<sprite name="tankBg" x="-500" y="0" sprite="tankBg" scroll="0" zoomfactor="0"/>
-	
 	<sprite name="tankSky" x="-400" y="-600" sprite="tankSky" scroll="0" zoomfactor="0"/>
 	<high-memory>
 		<sprite name="tankClouds" x="-350" y="0" sprite="tankClouds" scroll="0.1" zoomfactor="0">
@@ -17,7 +15,7 @@
 	<high-memory>
 		<sprite name="smokeLeft" x="-200" y="-100" sprite="smokeLeft" scroll="0.4" zoomfactor="0.6"/>
 		<sprite name="smokeRight" x="1100" y="-100" sprite="smokeRight" scroll="0.4" zoomfactor="0.6"/>
-		<sprite name="tankWatchtower" x="100" y="50" sprite="tankWatchtower" scroll="0.5" onBeat="true" zoomfactor="0.7"/>
+		<sprite name="tankWatchtower" x="100" y="50" sprite="tankWatchtower" scroll="0.5" type="onbeat" zoomfactor="0.7"/>
 	</high-memory>
 	<sprite name="tankRolling" x="300" y="300" sprite="tankRolling" scroll="0.5" zoomfactor="0.8" type="loop"/>
 	<sprite name="tankGround" x="-420" y="-150" sprite="tankGround" scale="1.15" updateHitbox="true" zoomfactor="1.0"/>
@@ -28,13 +26,13 @@
 	<boyfriend x="810"/>
 
 	<!-- FOREGROUND TANKMANS -->
-	
+
 	<high-memory>
-		<sprite name="tank0" x="-500" y="650" sprite="tank0" scrollx="1.7" scrolly="1.5" onBeat="true" zoomfactor="1.25"/>
-		<sprite name="tank1" x="-300" y="750" sprite="tank1" scrollx="2" scrolly="0.2" onBeat="true" zoomfactor="1.25"/>
-		<sprite name="tank2" x="450" y="940" sprite="tank2" scroll="1.5" onBeat="true" zoomfactor="1.25"/>
-		<sprite name="tank4" x="1300" y="900" sprite="tank4" scroll="1.5" onBeat="true" zoomfactor="1.25"/>
-		<sprite name="tank5" x="1620" y="700" sprite="tank5" scroll="1.5" onBeat="true" zoomfactor="1.25"/>
-		<sprite name="tank3" x="1300" y="1200" sprite="tank3" scrollx="3.5" scrolly="2.5" onBeat="true" zoomfactor="1.25"/>
+		<sprite name="tank0" x="-500" y="650" sprite="tank0" scrollx="1.7" scrolly="1.5" type="onbeat" zoomfactor="1.25"/>
+		<sprite name="tank1" x="-300" y="750" sprite="tank1" scrollx="2" scrolly="0.2" type="onbeat" zoomfactor="1.25"/>
+		<sprite name="tank2" x="450" y="940" sprite="tank2" scroll="1.5" type="onbeat" zoomfactor="1.25"/>
+		<sprite name="tank4" x="1300" y="900" sprite="tank4" scroll="1.5" type="onbeat" zoomfactor="1.25"/>
+		<sprite name="tank5" x="1620" y="700" sprite="tank5" scroll="1.5" type="onbeat" zoomfactor="1.25"/>
+		<sprite name="tank3" x="1300" y="1200" sprite="tank3" scrollx="3.5" scrolly="2.5" type="onbeat" zoomfactor="1.25"/>
 	</high-memory>
 </stage>