test

Removed the annoying window reopening for all states unless it's actually needed
last test
2025-09-10 09:36:09 +07:00 · 2025-09-10 09:03:35 +07:00 · 2025-09-09 17:42:25 +07:00 · 2025-09-09 17:20:38 +07:00 · 2025-09-09 17:16:24 +07:00 · 2025-09-09 17:12:01 +07:00
386 changed files with 133539 additions and 90844 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,4 +8,22 @@ log.log
 runthegame.bat
 settings.json
 TaggedEngine.love
-TaggedEngine.exe
+TaggedEngine.exe
+run this shit.cmd
+src.love
+love-11.5-win64/changes.txt
+love-11.5-win64/game.ico
+love-11.5-win64/license.txt
+love-11.5-win64/love.dll
+love-11.5-win64/love.exe
+love-11.5-win64/love.ico
+love-11.5-win64/lovec.exe
+love-11.5-win64/lua51.dll
+love-11.5-win64/mpg123.dll
+love-11.5-win64/msvcp120.dll
+love-11.5-win64/msvcr120.dll
+love-11.5-win64/OpenAL32.dll
+love-11.5-win64/readme.txt
+love-11.5-win64/SDL2.dll
+
+modules/tagged-gamejolt/credentials.lua
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
+[submodule "modules/tagged-gamejolt"]
+	path = modules/tagged-gamejolt
+	url = https://git.squog.ru/TaggedCrew/tagged-gamejolt/
--- a/README.md
+++ b/README.md
@ -1,18 +1,33 @@
-# TaggedEngine
+<h1 align="center"><img src="art/Title.png"></h1>

-TaggedEngine: FNF in LUA, better than ever.
+<h2 align="center"> TaggedEngine: FNF in LUA, better than ever.</h2>

-# HOW TO USE
+> [!NOTE]
+> This engine is INDEV, expect game-breaking bugs and issues.

-### [Download Link](https://sourceforge.net/projects/taggedengine/)
-### [Link to the modding documentation](https://git.squog.ru/TaggedEngine/TaggedEngine/wiki)
+<iframe src="https://widgets.gamejolt.com/package/v1?key=MBoKxcYu&theme=light" frameborder="0" width="500" height="245"></iframe>

+<h1 align="center"> Usage</h1>

-# Contributions
-### [entar](https://git.squog.ru/entar) - Engine owner. Main coder, porter.
-### [idk](https://git.squog.ru/IDK1033) - Engine co-owner. Secondary coder, porter.
-### MarkedAman - MarkedEngine assets, some MRK mixes (not added yet)
-### Pankdoe - MRK mixes voicelines (note added yet)
---------------------------------------------------------------------------------------
+<h3 align="center"> <a href="https://sourceforge.net/projects/taggedengine/">Download Link</a></h3>
+<h3 align="center"> <a href="https://git.squog.ru/TaggedEngine/TaggedEngine/wiki">Link to the modding documentation</a></h3>

-#### You can be here! Just make a pull request and i'll review it!
+<h1></h1>
+
+<h3 align="center">
+You are free to fork, change, remove and redistribute this engine as long as you don't put malware or brainrot there.
+</h3>
+
+<h1 align="center">
+<a href="LICENSE">License</a>
+</h1>
+
+<h1 align="center"> Contributions</h1>
+<h4 align = "center"><img src="art/entar.png"></h4>
+<h3 align="center">  <a href="https://git.squog.ru/entar"> entar - Engine owner. Main coder, porter. </a> </h3>
+<h1></h1>
+<h4 align = "center"><img src="art/idk.png"></h4>
+<h3 align="center"> <a href="https://git.squog.ru/IDK1033"> idk - Engine co-owner. Secondary coder, porter. <a> </h3>
+
+<h1></h1>
+<h4 align="center"> You can be here! Just make a pull request and i'll review it! </h4>
--- a/art/README.md
+++ b/art/README.md
@ -0,0 +1 @@
+# REMOVE THIS WHEN BUILDING, THIS EXISTS PURELY FOR THE SQUOGIT PAGE
--- a/art/Title.png
+++ b/art/Title.png
--- a/art/entar.png
+++ b/art/entar.png
--- a/art/idk.png
+++ b/art/idk.png
--- a/characters/bf-pixel.json
+++ b/characters/bf-pixel.json
@ -8,7 +8,7 @@
 			],
 			"anim": "singLEFTmiss",
 			"fps": 24,
-			"name": "BF Left Miss",
+			"name": "BF LEFT MISS instance 1",
 			"indices": []
 		},
 		{
@ -19,7 +19,7 @@
 			],
 			"anim": "singUPmiss",
 			"fps": 24,
-			"name": "BF Up Miss",
+			"name": "BF UP MISS instance 1",
 			"indices": []
 		},
 		{
@ -30,7 +30,7 @@
 			],
 			"anim": "singLEFT",
 			"fps": 24,
-			"name": "BFLeft",
+			"name": "BF LEFT NOTE instance 1",
 			"indices": []
 		},
 		{
@ -41,7 +41,7 @@
 			],
 			"anim": "singRIGHT",
 			"fps": 24,
-			"name": "BFRight",
+			"name": "BF RIGHT NOTE instance 1",
 			"indices": []
 		},
 		{
@ -52,7 +52,7 @@
 			],
 			"anim": "singDOWNmiss",
 			"fps": 24,
-			"name": "BF Down Miss",
+			"name": "BF DOWN MISS instance 1",
 			"indices": []
 		},
 		{
@ -63,7 +63,7 @@
 			],
 			"anim": "singRIGHTmiss",
 			"fps": 24,
-			"name": "BF Right Miss",
+			"name": "BF RIGHT MISS instance 1",
 			"indices": []
 		},
 		{
@ -74,7 +74,7 @@
 			],
 			"anim": "singDOWN",
 			"fps": 24,
-			"name": "BFDown",
+			"name": "BF DOWN NOTE instance 1",
 			"indices": []
 		},
 		{
@ -85,7 +85,7 @@
 			],
 			"anim": "idle",
 			"fps": 24,
-			"name": "BFIdle",
+			"name": "BF IDLE instance 1",
 			"indices": []
 		},
 		{
@ -96,7 +96,7 @@
 			],
 			"anim": "singUP",
 			"fps": 24,
-			"name": "BFUp",
+			"name": "BF UP NOTE instance 1",
 			"indices": []
 		},
 		{
@ -112,22 +112,22 @@
 		}
 	],
 	"no_antialiasing": true,
-	"image": "sprites/characters/bfPixelNew",
+	"image": "sprites/characters/bfPixel",
 	"position": [
-		-40,
-		360
+		-400,
+		340
 	],
 	"healthicon": "bf-pixel",
-	"flip_x": true,
+	"flip_x": false,
 	"healthbar_colors": [
 		123,
 		214,
 		226
 	],
 	"camera_position": [
-		200,
-		-180
+		-400,
+		200
 	],
 	"sing_duration": 4,
-	"scale": 6
+	"scale": 7
 }
--- a/characters/dad.json
+++ b/characters/dad.json
@ -8,7 +8,7 @@
 			"loop": false,
 			"anim": "singLEFT",
 			"fps": 24,
-			"name": "Dad Sing Note LEFT",
+			"name": "singLEFT",
 			"indices": []
 		},
 		{
@ -19,7 +19,7 @@
 			"loop": false,
 			"anim": "singDOWN",
 			"fps": 24,
-			"name": "Dad Sing Note DOWN",
+			"name": "singDOWN",
 			"indices": []
 		},
 		{
@ -30,7 +30,7 @@
 			"loop": false,
 			"anim": "singUP",
 			"fps": 24,
-			"name": "Dad Sing Note UP",
+			"name": "singUP",
 			"indices": []
 		},
 		{
@ -41,7 +41,7 @@
 			"loop": false,
 			"anim": "singRIGHT",
 			"fps": 24,
-			"name": "Dad Sing Note RIGHT",
+			"name": "singRIGHT",
 			"indices": []
 		},
 		{
@ -52,7 +52,7 @@
 			"loop": false,
 			"anim": "idle",
 			"fps": 24,
-			"name": "Dad idle dance",
+			"name": "idle",
 			"indices": []
 		},
 		{
@ -69,7 +69,7 @@
 				12,
 				12
 			],
-			"name": "Dad idle dance"
+			"name": "idle"
 		},
 		{
 			"offsets": [
@ -121,7 +121,7 @@
 		}
 	],
 	"no_antialiasing": false,
-	"image": "sprites/characters/DADDY_DEAREST",
+	"image": "sprites/characters/daddyDearest",
 	"position": [
 		-400,
 		320
--- a/characters/darnell.json
+++ b/characters/darnell.json
@ -200,7 +200,7 @@
 	"no_antialiasing": false,
 	"image": "sprites/characters/darnell",
 	"position": [
-		-250,
+		-350,
 		250
 	],
 	"healthicon": "darnell",
@ -212,8 +212,9 @@
 	],
 	"camera_position": [
 		-800,
-		0
+		-150
 	],
 	"sing_duration": 8,
-	"scale": 1
+	"scale": 1,
+	"starter_frame": 1
 }
--- a/characters/eeveefriend.json
+++ b/characters/eeveefriend.json
@ -0,0 +1,144 @@
+{
+	"animations": [
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": false,
+			"fps": 12,
+			"anim": "danceLeft",
+			"indices": [],
+			"name": "eeveefriend idle"
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": true,
+			"fps": 12,
+			"anim": "sad2",
+			"indices": [
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1
+			],
+			"name": "eeveefriend two miss"
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": true,
+			"fps": 12,
+			"anim": "sad3",
+			"indices": [
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1
+			],
+			"name": "eeveefriend three miss"
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": true,
+			"fps": 12,
+			"anim": "sad4",
+			"indices": [
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1
+			],
+			"name": "eeveefriend four miss"
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": true,
+			"fps": 12,
+			"anim": "die",
+			"indices": [],
+			"name": "eeveefriend die"
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "danceRight",
+			"fps": 12,
+			"name": "eeveefriend idle",
+			"indices": []
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"indices": [
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1,
+				0,
+				1
+			],
+			"fps": 12,
+			"anim": "sad1",
+			"loop": false,
+			"name": "eeveefriend one miss"
+		}
+	],
+	"no_antialiasing": true,
+	"image": "sprites/characters/secret/eeveefriend",
+	"position": [
+		0,
+		390
+	],
+	"healthicon": "pika",
+	"flip_x": false,
+	"healthbar_colors": [
+		70,
+		70,
+		70
+	],
+	"camera_position": [
+		-170,
+		-230
+	],
+	"sing_duration": 4,
+	"scale": 8
+}
--- a/characters/gf-christmas.json
+++ b/characters/gf-christmas.json
@ -185,8 +185,8 @@
 		0
 	],
 	"camera_position": [
-		-600,
-		-130
+		-1230,
+		-200
 	],
 	"sing_duration": 4,
 	"scale": 1
--- a/characters/gf-pixel.json
+++ b/characters/gf-pixel.json
@ -70,8 +70,8 @@
 	"no_antialiasing": true,
 	"image": "sprites/characters/gfPixel",
 	"position": [
-		0,
-		0
+		-600,
+		-50
 	],
 	"healthicon": "gf",
 	"flip_x": false,
@ -81,9 +81,9 @@
 		77
 	],
 	"camera_position": [
-		-20,
-		80
+		-630,
+		30
 	],
 	"sing_duration": 4,
-	"scale": 5.99999999999999
+	"scale": 7
 }
--- a/characters/nene-christmas.json
+++ b/characters/nene-christmas.json
@ -22,7 +22,7 @@
 			"fps": 24,
 			"anim": "combo50",
 			"loop": false,
-			"name": "combo celebration 1 nene xmas0"
+			"name": "combo celebration 1 nene xmas"
 		},
 		{
 			"offsets": [17, -5],
@ -38,7 +38,7 @@
 			"fps": 24,
 			"anim": "combo100",
 			"loop": false,
-			"name": "ComboFawn0"
+			"name": "ComboFawn"
 		},
 		{
 			"offsets": [0, 52],
@ -46,7 +46,7 @@
 			"fps": 24,
 			"anim": "raiseKnife",
 			"loop": false,
-			"name": "knife raise xmas0"
+			"name": "knife raise xmas"
 		},
 		{
 			"offsets": [-99, 52],
@ -54,7 +54,7 @@
 			"fps": 24,
 			"anim": "idleKnife",
 			"loop": false,
-			"name": "knife high held xmas0"
+			"name": "knife high held xmas"
 		},
 		{
 			"offsets": [135, 52],
@ -62,12 +62,12 @@
 			"fps": 24,
 			"anim": "lowerKnife",
 			"loop": false,
-			"name": "knife lower xmas0"
+			"name": "knife lower xmas"
 		}
 	],
 	"vocals_file": "",
 	"no_antialiasing": false,
-	"image": "characters/mallPico/neneChristmas",
+	"image": "sprites/characters/neneChristmas",
 	"position": [0, 200],
 	"healthicon": "face",
 	"flip_x": false,
@ -75,5 +75,6 @@
 	"camera_position": [-50, 100],
 	"sing_duration": 6.1,
 	"scale": 1,
-	"_editor_isPlayer": false
+	"_editor_isPlayer": false,
+	"starter_frame": 1
 }
--- a/characters/nene-christmas.lua
+++ b/characters/nene-christmas.lua
@ -0,0 +1,119 @@
+---@type engine.module
+local module = {}
+local abot, sound, rate, channels, bg, eyes, char
+local spectrum = {}
+local visualizers = {}
+
+require("modules.luafft")
+local logging = require("modules.logging")
+
+local function divide(list, factor)
+    for i, v in ipairs(list) do
+        list[i] = list[i] / factor
+    end
+end
+
+---@param character engine.character
+function module.onAdded(character)
+    char = character
+    abot = Atlas("sprites/characters/abot/abotSystem")
+    abot:PlayAnimation("")
+    abot.layer = character.sprite.layer - .1
+    abot.position = character.sprite.position:Add(Vector2(100, 200))
+
+    for i = 1, 7 do
+        local viz = Rect("sprites/characters/abot/aBotViz.png", "sprites/characters/abot/aBotViz.xml")
+        if i > 1 then
+            viz.position = abot.position:Add(Vector2(i * 80 + 55, 60))
+        else
+            -- don't question my code choices, i really tried. 
+            -- The bugs didn't even make sense atp so yeah.
+            -- - entar
+            viz.position = abot.position:Add(Vector2(100000000, 10000000))
+        end
+        viz.layer = abot.layer - 0.1
+        viz:Frame(string.format("viz%s", i), 5)
+        visualizers[i] = viz
+    end
+
+    bg = Image("sprites/characters/abot/stereoBG.png")
+    bg.layer = abot.layer - 0.2
+    bg.position = abot.position:Add(Vector2(153, 43))
+
+    eyes = Atlas("sprites/characters/abot/systemEyes")
+    eyes.layer = abot.layer - 0.1
+    eyes.position = abot.position:Add(Vector2(45, 250))
+    eyes:PlayAnimation("a bot eyes lookin")
+end
+
+function module.onCreate(song)
+    local audiopath = string.format("songs/%s/Inst.ogg", song)
+    print(audiopath)
+    sound = love.sound.newSoundData(audiopath)
+    rate = sound:getSampleRate()
+    channels = sound:getChannels()
+end
+
+function module.onBeat(beat)
+    -- if beat % 2 == 0 then
+    abot:PlayAnimation()
+    -- end
+end
+
+function module.onUpdate(dt, el)
+    abot.layer = char.sprite.layer - .1
+    bg.layer = abot.layer - 0.2
+    eyes.layer = bg.layer
+
+    abot.position = char.sprite.position:Add(Vector2(-100, 300)):Add(char.stagePosition)
+
+    bg.position = abot.position:Add(Vector2(153, 43))
+    eyes.position = abot.position:Add(Vector2(45, 250))
+
+    pcall(function ()
+        local curSample = inst:tell('samples')
+
+        local wave = {}
+        local size = next_possible_size(2048)
+        if channels == 2 then
+            for i = curSample, (curSample + (size - 1) / 2) do
+                local sample = (sound:getSample(i * 2) + sound:getSample(i * 2 + 1)) * 0.5
+                table.insert(wave, complex.new(sample, 0))
+            end
+        else
+            for i = curSample, curSample + (size - 1) do
+                local sample = (sound:getSample(i * 2) + sound:getSample(i * 2 + 1)) * 0.5
+                table.insert(wave, complex.new(sample, 0))
+                table.insert(wave, complex.new(sound:getSample(i), 0))
+            end
+        end
+
+        local spec = fft(wave, false)
+
+        divide(spec, size / 2)
+
+        spectrum = spec
+        local division = 142.857142857
+
+        for i=2, (#spectrum/division) do
+            local n = spectrum[i]:abs()
+            
+            visualizers[i]:Frame(string.format("viz%s", i), math.floor(n / 0.06) > 5 and 0 or 5 - math.floor(n / 0.06))
+            visualizers[i].layer = abot.layer - 0.1
+            visualizers[i].position = abot.position:Add(Vector2(i * 80 + 55, 60))
+        end
+    end)
+end
+
+function module.onClose()
+
+end
+
+function module.onEvent(event)
+    if event.name == "FocusCamera" then
+        local str = event.vars.char == 1 and "a bot eyes lookin" or "a bot eyes lookin"
+        eyes:PlayAnimation(str)
+    end
+end
+
+return module
--- a/characters/nene.json
+++ b/characters/nene.json
@ -73,12 +73,8 @@
 			"fps": 24,
 			"anim": "hairBlow",
 			"indices": [
-				0,
-				1,
-				2,
-				3
 			],
-			"name": "HairBlow0"
+			"name": "Idle"
 		},
 		{
 			"loop": false,
@ -89,20 +85,25 @@
 			"fps": 24,
 			"anim": "hairFall",
 			"indices": [
-				0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
 			  ],
-			"name": "HairBlow0"
+			"name": "Idle"
 		}
 	],
 	"vocals_file": "",
 	"no_antialiasing": false,
 	"image": "sprites/characters/Nene",
-	"position": [0, 200],
+	"position": [-200, 400],
 	"healthicon": "face",
 	"flip_x": false,
 	"healthbar_colors": [161, 161, 161],
 	"camera_position": [-150, 100],
 	"sing_duration": 6.1,
 	"scale": 1,
-	"_editor_isPlayer": false
+	"_editor_isPlayer": false,
+	"starter_frame": 1,
+	"stage_positions": {
+		"tank": [500, -330],
+		"tankErect": [650, -260],
+		"philly": [320, 80]
+	}
 }
--- a/characters/nene.lua
+++ b/characters/nene.lua
@ -0,0 +1,119 @@
+---@type engine.module
+local module = {}
+local abot, sound, rate, channels, bg, eyes, char
+local spectrum = {}
+local visualizers = {}
+
+require("modules.luafft")
+local logging = require("modules.logging")
+
+local function divide(list, factor)
+    for i, v in ipairs(list) do
+        list[i] = list[i] / factor
+    end
+end
+
+---@param character engine.character
+function module.onAdded(character)
+    char = character
+    abot = Atlas("sprites/characters/abot/abotSystem")
+    abot:PlayAnimation("")
+    abot.layer = character.sprite.layer - .1
+    abot.position = character.sprite.position:Add(Vector2(100, 200))
+
+    for i = 1, 7 do
+        local viz = Rect("sprites/characters/abot/aBotViz.png", "sprites/characters/abot/aBotViz.xml")
+        if i > 1 then
+            viz.position = abot.position:Add(Vector2(i * 80 + 55, 60))
+        else
+            -- don't question my code choices, i really tried. 
+            -- The bugs didn't even make sense atp so yeah.
+            -- - entar
+            viz.position = abot.position:Add(Vector2(100000000, 10000000))
+        end
+        viz.layer = abot.layer - 0.1
+        viz:Frame(string.format("viz%s", i), 5)
+        visualizers[i] = viz
+    end
+
+    bg = Image("sprites/characters/abot/stereoBG.png")
+    bg.layer = abot.layer - 0.2
+    bg.position = abot.position:Add(Vector2(153, 43))
+
+    eyes = Atlas("sprites/characters/abot/systemEyes")
+    eyes.layer = abot.layer - 0.1
+    eyes.position = abot.position:Add(Vector2(45, 250))
+    eyes:PlayAnimation("a bot eyes lookin")
+end
+
+function module.onCreate(song)
+    local audiopath = string.format("songs/%s/Inst.ogg", song)
+    print(audiopath)
+    sound = love.sound.newSoundData(audiopath)
+    rate = sound:getSampleRate()
+    channels = sound:getChannels()
+end
+
+function module.onBeat(beat)
+    -- if beat % 2 == 0 then
+    abot:PlayAnimation()
+    -- end
+end
+
+function module.onUpdate(dt, el)
+    abot.layer = char.sprite.layer - .1
+    bg.layer = abot.layer - 0.2
+    eyes.layer = bg.layer
+
+    abot.position = char.sprite.position:Add(Vector2(-100, 300)):Add(char.stagePosition)
+
+    bg.position = abot.position:Add(Vector2(153, 43))
+    eyes.position = abot.position:Add(Vector2(45, 250))
+
+    pcall(function ()
+        local curSample = inst:tell('samples')
+
+        local wave = {}
+        local size = next_possible_size(2048)
+        if channels == 2 then
+            for i = curSample, (curSample + (size - 1) / 2) do
+                local sample = (sound:getSample(i * 2) + sound:getSample(i * 2 + 1)) * 0.5
+                table.insert(wave, complex.new(sample, 0))
+            end
+        else
+            for i = curSample, curSample + (size - 1) do
+                local sample = (sound:getSample(i * 2) + sound:getSample(i * 2 + 1)) * 0.5
+                table.insert(wave, complex.new(sample, 0))
+                table.insert(wave, complex.new(sound:getSample(i), 0))
+            end
+        end
+
+        local spec = fft(wave, false)
+
+        divide(spec, size / 2)
+
+        spectrum = spec
+        local division = 142.857142857
+
+        for i=2, (#spectrum/division) do
+            local n = spectrum[i]:abs()
+            
+            visualizers[i]:Frame(string.format("viz%s", i), math.floor(n / 0.06) > 5 and 0 or 5 - math.floor(n / 0.06))
+            visualizers[i].layer = abot.layer - 0.1
+            visualizers[i].position = abot.position:Add(Vector2(i * 80 + 55, 60))
+        end
+    end)
+end
+
+function module.onClose()
+
+end
+
+function module.onEvent(event)
+    if event.name == "FocusCamera" then
+        local str = event.vars.char == 1 and "a bot eyes lookin" or "a bot eyes lookin"
+        eyes:PlayAnimation(str)
+    end
+end
+
+return module
--- a/characters/otis-speaker.json
+++ b/characters/otis-speaker.json
@ -0,0 +1,59 @@
+{
+	"animations": [
+		{
+			"offsets": [0, 0],
+			"indices": [],
+			"fps": 24,
+			"anim": "idle",
+			"loop": false,
+			"name": "otis idle"
+		},
+		{
+			"offsets": [0, 13],
+			"indices": [],
+			"fps": 24,
+			"anim": "shoot1",
+			"loop": false,
+			"name": "shoot back"
+		},
+		{
+			"offsets": [-35, 21],
+			"indices": [],
+			"fps": 24,
+			"anim": "shoot2",
+			"loop": false,
+			"name": "shoot back low"
+		},
+		{
+			"offsets": [238, 96],
+			"indices": [],
+			"fps": 24,
+			"anim": "shoot3",
+			"loop": false,
+			"name": "shoot forward"
+		},
+		{
+			"offsets": [260, 23],
+			"indices": [],
+			"fps": 24,
+			"anim": "shoot4",
+			"loop": false,
+			"name": "shoot forward low"
+		}
+	],
+	"vocals_file": "",
+	"no_antialiasing": false,
+	"image": "sprites/characters/otisSpeaker",
+	"position": [-40, 110],
+	"healthicon": "face",
+	"flip_x": false,
+	"healthbar_colors": [161, 161, 161],
+	"camera_position": [-150, 100],
+	"sing_duration": 6.1,
+	"scale": 1,
+	"_editor_isPlayer": false,
+	"starter_frame": 1,
+	"stage_positions": {
+		"tank": [500, -330]
+	}
+}
--- a/characters/otis-speaker.lua
+++ b/characters/otis-speaker.lua
@ -0,0 +1,119 @@
+---@type engine.module
+local module = {}
+local abot, sound, rate, channels, bg, eyes, char
+local spectrum = {}
+local visualizers = {}
+
+require("modules.luafft")
+local logging = require("modules.logging")
+
+local function divide(list, factor)
+    for i, v in ipairs(list) do
+        list[i] = list[i] / factor
+    end
+end
+
+---@param character engine.character
+function module.onAdded(character)
+    char = character
+    abot = Atlas("sprites/characters/abot/abotSystem")
+    abot:PlayAnimation("")
+    abot.layer = character.sprite.layer - .1
+    abot.position = character.sprite.position:Add(Vector2(0, 0))
+
+    for i = 1, 7 do
+        local viz = Rect("sprites/characters/abot/aBotViz.png", "sprites/characters/abot/aBotViz.xml")
+        if i > 1 then
+            viz.position = abot.position:Add(Vector2(i * 80 + 55, 60))
+        else
+            -- don't question my code choices, i really tried. 
+            -- The bugs didn't even make sense atp so yeah.
+            -- - entar
+            viz.position = abot.position:Add(Vector2(100000000, 10000000))
+        end
+        viz.layer = abot.layer - 0.1
+        viz:Frame(string.format("viz%s", i), 5)
+        visualizers[i] = viz
+    end
+
+    bg = Image("sprites/characters/abot/stereoBG.png")
+    bg.layer = abot.layer - 0.2
+    bg.position = abot.position:Add(Vector2(153, 43))
+
+    eyes = Atlas("sprites/characters/abot/systemEyes")
+    eyes.layer = abot.layer - 0.1
+    eyes.position = abot.position:Add(Vector2(45, 250))
+    eyes:PlayAnimation("a bot eyes lookin")
+end
+
+function module.onCreate(song)
+    local audiopath = string.format("songs/%s/Inst.ogg", song)
+    print(audiopath)
+    sound = love.sound.newSoundData(audiopath)
+    rate = sound:getSampleRate()
+    channels = sound:getChannels()
+end
+
+function module.onBeat(beat)
+    -- if beat % 2 == 0 then
+    abot:PlayAnimation()
+    -- end
+end
+
+function module.onUpdate(dt, el)
+    abot.layer = char.sprite.layer - .1
+    bg.layer = abot.layer - 0.2
+    eyes.layer = bg.layer
+
+    abot.position = char.sprite.position:Add(Vector2(-80, 320)):Add(char.stagePosition)
+
+    bg.position = abot.position:Add(Vector2(153, 43))
+    eyes.position = abot.position:Add(Vector2(45, 250))
+
+    pcall(function ()
+        local curSample = inst:tell('samples')
+
+        local wave = {}
+        local size = next_possible_size(2048)
+        if channels == 2 then
+            for i = curSample, (curSample + (size - 1) / 2) do
+                local sample = (sound:getSample(i * 2) + sound:getSample(i * 2 + 1)) * 0.5
+                table.insert(wave, complex.new(sample, 0))
+            end
+        else
+            for i = curSample, curSample + (size - 1) do
+                local sample = (sound:getSample(i * 2) + sound:getSample(i * 2 + 1)) * 0.5
+                table.insert(wave, complex.new(sample, 0))
+                table.insert(wave, complex.new(sound:getSample(i), 0))
+            end
+        end
+
+        local spec = fft(wave, false)
+
+        divide(spec, size / 2)
+
+        spectrum = spec
+        local division = 142.857142857
+
+        for i=2, (#spectrum/division) do
+            local n = spectrum[i]:abs()
+            
+            visualizers[i]:Frame(string.format("viz%s", i), math.floor(n / 0.06) > 5 and 0 or 5 - math.floor(n / 0.06))
+            visualizers[i].layer = abot.layer - 0.1
+            visualizers[i].position = abot.position:Add(Vector2(i * 80 + 55, 60))
+        end
+    end)
+end
+
+function module.onClose()
+
+end
+
+function module.onEvent(event)
+    if event.name == "FocusCamera" then
+        local str = event.vars.char == 1 and "a bot eyes lookin" or "a bot eyes lookin"
+        eyes:PlayAnimation(str)
+    end
+end
+
+return module
--- a/characters/pico-pixel.json
+++ b/characters/pico-pixel.json
@ -0,0 +1,133 @@
+{
+	"animations": [
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singLEFTmiss",
+			"fps": 24,
+			"name": "leftmiss",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singUPmiss",
+			"fps": 24,
+			"name": "upmiss",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singLEFT",
+			"fps": 24,
+			"name": "left",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singRIGHT",
+			"fps": 24,
+			"name": "right",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singDOWNmiss",
+			"fps": 24,
+			"name": "downmiss",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				-4,
+				0
+			],
+			"anim": "singRIGHTmiss",
+			"fps": 24,
+			"name": "rightmiss",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singDOWN",
+			"fps": 24,
+			"name": "down",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "idle",
+			"fps": 24,
+			"name": "idle",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singUP",
+			"fps": 24,
+			"name": "up",
+			"indices": []
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": false,
+			"fps": 24,
+			"anim": "hey",
+			"indices": [],
+			"name": "hey"
+		}
+	],
+	"no_antialiasing": true,
+	"image": "sprites/characters/picoPixel",
+	"position": [
+		-550,
+		280
+	],
+	"healthicon": "bf-pixel",
+	"flip_x": false,
+	"healthbar_colors": [
+		123,
+		214,
+		226
+	],
+	"camera_position": [
+		-400,
+		200
+	],
+	"sing_duration": 4,
+	"scale": 7
+}
--- a/characters/pico-playable-dead.json
+++ b/characters/pico-playable-dead.json
@ -1,31 +1,31 @@
-{
-	"animations": [
-		{
-			"loop": false,
-			"offsets": [225, 125],
-			"anim": "firstDeath",
-			"fps": 24,
-			"name": "Pico Death Stab",
-			"indices": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]
-		},
-		{
-			"offsets": [225, 125],
-			"indices": [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
-			"fps": 24,
-			"anim": "deathLoop",
-			"loop": true,
-			"name": "Pico Death Stab"
-		}
-	],
-	"vocals_file": "",
-	"no_antialiasing": false,
-	"image": "characters/Pico_Death",
-	"position": [15, 335],
-	"healthicon": "pico",
-	"flip_x": true,
-	"healthbar_colors": [183, 216, 85],
-	"camera_position": [0, 0],
-	"sing_duration": 4,
-	"scale": 1,
-	"_editor_isPlayer": true
+{
+	"animations": [
+		{
+			"loop": false,
+			"offsets": [225, 125],
+			"anim": "firstDeath",
+			"fps": 24,
+			"name": "Pico Death Stab",
+			"indices": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47]
+		},
+		{
+			"offsets": [225, 125],
+			"indices": [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63],
+			"fps": 24,
+			"anim": "deathLoop",
+			"loop": true,
+			"name": "Pico Death Stab"
+		}
+	],
+	"vocals_file": "",
+	"no_antialiasing": false,
+	"image": "characters/Pico_Death",
+	"position": [15, 335],
+	"healthicon": "pico",
+	"flip_x": true,
+	"healthbar_colors": [183, 216, 85],
+	"camera_position": [0, 0],
+	"sing_duration": 4,
+	"scale": 1,
+	"_editor_isPlayer": true
 }
--- a/characters/pico-playable.json
+++ b/characters/pico-playable.json
@ -110,6 +110,17 @@
 			"name": "Pico HEY!!",
 			"indices": []
 		},
+		{
+			"loop": false,
+			"offsets": [
+				39,
+				2
+			],
+			"anim": "cheer",
+			"fps": 24,
+			"name": "Pico YEAH cheer",
+			"indices": []
+		},
 		{
 			"loop": false,
 			"offsets": [
@ -142,11 +153,44 @@
 			"fps": 24,
 			"name": "Pico Shoot Hip Full",
 			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				259,
+				237
+			],
+			"anim": "burp",
+			"fps": 24,
+			"name": "burpshit",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				30,
+				0
+			],
+			"anim": "burpSmile",
+			"fps": 24,
+			"name": "burpsmile",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				259,
+				237
+			],
+			"anim": "shit",
+			"fps": 24,
+			"name": "shit",
+			"indices": []
 		}
 	],
 	"vocals_file": "pico",
 	"no_antialiasing": false,
-	"image": "sprites/characters/Pico_Playable",
+	"image": "sprites/characters/Pico",
 	"position": [
 		0,
 		600
@ -164,5 +208,9 @@
 	],
 	"sing_duration": 4,
 	"scale": 1,
-	"_editor_isPlayer": true
+	"_editor_isPlayer": true,
+	"starter_frame": 1,
+	"stage_positions": {
+		"tankErect": [1100, -200]
+	}
 }
--- a/characters/pico-player.json
+++ b/characters/pico-player.json
@ -244,7 +244,7 @@
 		}
 	],
 	"no_antialiasing": false,
-	"image": "sprites/characters/picoSG",
+	"image": "sprites/characters/PicoIHateFunkinCrew",
 	"position": [
 		0,
 		600
--- a/characters/pico.json
+++ b/characters/pico.json
@ -84,7 +84,7 @@
 			],
 			"loop": false,
 			"fps": 24,
-			"anim": "singLEFTmiss",
+			"anim": "singRIGHTmiss",
 			"indices": [],
 			"name": "Pico Note Right Miss"
 		},
@ -95,7 +95,7 @@
 			],
 			"loop": false,
 			"fps": 24,
-			"anim": "singRIGHTmiss",
+			"anim": "singLEFTmiss",
 			"indices": [],
 			"name": "Pico NOTE LEFT miss"
 		},
@ -142,11 +142,33 @@
 			"fps": 24,
 			"name": "Pico Shoot Hip Full",
 			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				259,
+				237
+			],
+			"anim": "burp",
+			"fps": 24,
+			"name": "burpshit",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				259,
+				237
+			],
+			"anim": "shit",
+			"fps": 24,
+			"name": "shit",
+			"indices": []
 		}
 	],
 	"vocals_file": "pico",
 	"no_antialiasing": false,
-	"image": "sprites/characters/Pico",
+	"image": "sprites/characters/PicoIHateFunkinCrew",
 	"position": [
 		0,
 		600
@ -163,5 +185,7 @@
 		0
 	],
 	"sing_duration": 4,
-	"scale": 1
+	"scale": 1,
+	"_editor_isPlayer": true,
+	"starter_frame": 1
 }
--- a/characters/pikafriend.json
+++ b/characters/pikafriend.json
@ -0,0 +1,100 @@
+{
+	"animations": [
+		{
+			"loop": false,
+			"offsets": [
+				-1,
+				0
+			],
+			"anim": "idle",
+			"fps": 12,
+			"name": "Pikafriend idle",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singLEFT",
+			"fps": 12,
+			"name": "Pikafriend left",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singRIGHT",
+			"fps": 12,
+			"name": "Pikafriend right",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singDOWN",
+			"fps": 12,
+			"name": "Pikafriend down",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singUP",
+			"fps": 12,
+			"name": "Pikafriend up",
+			"indices": []
+		},
+		{
+			"loop": true,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "hit",
+			"fps": 3,
+			"name": "Pikafriend hurt",
+			"indices": []
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"indices": [],
+			"fps": 12,
+			"anim": "death",
+			"loop": true,
+			"name": "Pikafriend death"
+		}
+	],
+	"no_antialiasing": true,
+	"image": "sprites/characters/secret/pikafriend",
+	"position": [
+		0,
+		390
+	],
+	"healthicon": "pika",
+	"flip_x": false,
+	"healthbar_colors": [
+		0,
+		255,
+		0
+	],
+	"camera_position": [
+		-170,
+		-230
+	],
+	"sing_duration": 4,
+	"scale": 8
+}
--- a/characters/senpai-angry.json
+++ b/characters/senpai-angry.json
@ -1,66 +1,65 @@
 {
 	"animations": [
 		{
-			"loop": false,
-			"offsets": [
-				2,
-				0
-			],
-			"fps": 24,
-			"anim": "idle",
-			"indices": [],
-			"name": "Angry Senpai Idle"
-		},
-		{
-			"loop": false,
-			"offsets": [
-				5,
-				37
-			],
-			"fps": 24,
-			"anim": "singUP",
-			"indices": [],
-			"name": "Angry Senpai UP NOTE"
-		},
-		{
-			"loop": false,
-			"offsets": [
-				40,
-				0
-			],
-			"fps": 24,
-			"anim": "singLEFT",
-			"indices": [],
-			"name": "Angry Senpai LEFT NOTE"
-		},
-		{
-			"loop": false,
 			"offsets": [
 				0,
 				0
 			],
+			"loop": false,
+			"anim": "idle",
+			"fps": 24,
+			"name": "Angry Senpai Idle instance 1",
+			"indices": []
+		},
+		{
+			"offsets": [
+				0.83, 6.16
+			],
+			"loop": false,
+			"fps": 24,
+			"anim": "singUP",
+			"indices": [],
+			"name": "Angry Senpai UP NOTE instance 1"
+		},
+		{
+			"offsets": [
+				0,
+				0
+			],
+			"loop": false,
 			"fps": 24,
 			"anim": "singRIGHT",
 			"indices": [],
-			"name": "Angry Senpai RIGHT NOTE"
+			"name": "Angry Senpai RIGHT NOTE instance 1"
 		},
 		{
-			"loop": false,
 			"offsets": [
-				14,
+				6.6,
 				0
 			],
+			"loop": false,
+			"fps": 24,
+			"anim": "singLEFT",
+			"indices": [],
+			"name": "Angry Senpai LEFT NOTE instance 1"
+		},
+		{
+			"offsets": [
+				2.33,
+				0
+			],
+			"loop": false,
 			"fps": 24,
 			"anim": "singDOWN",
 			"indices": [],
-			"name": "Angry Senpai DOWN NOTE"
+			"name": "Angry Senpai DOWN NOTE instance 1"
 		}
 	],
 	"no_antialiasing": true,
 	"image": "sprites/characters/senpai",
 	"position": [
-		150,
-		360
+		-450,
+		40
 	],
 	"healthicon": "senpai-angry-pixel",
 	"flip_x": false,
@ -70,9 +69,9 @@
 		111
 	],
 	"camera_position": [
-		-240,
-		-330
+		-800,
+		0
 	],
 	"sing_duration": 4,
-	"scale": 6
+	"scale": 7
 }
--- a/characters/senpai.json
+++ b/characters/senpai.json
@ -2,25 +2,24 @@
 	"animations": [
 		{
 			"offsets": [
-				1,
+				0,
 				0
 			],
 			"loop": false,
 			"anim": "idle",
 			"fps": 24,
-			"name": "Senpai Idle",
+			"name": "Senpai Idle instance 1",
 			"indices": []
 		},
 		{
 			"offsets": [
-				5,
-				37
+				0.83, 6.16
 			],
 			"loop": false,
 			"fps": 24,
 			"anim": "singUP",
 			"indices": [],
-			"name": "SENPAI UP NOTE"
+			"name": "SENPAI UP NOTE instance 1"
 		},
 		{
 			"offsets": [
@ -31,36 +30,36 @@
 			"fps": 24,
 			"anim": "singRIGHT",
 			"indices": [],
-			"name": "SENPAI RIGHT NOTE"
+			"name": "SENPAI RIGHT NOTE instance 1"
 		},
 		{
 			"offsets": [
-				40,
+				6.6,
 				0
 			],
 			"loop": false,
 			"fps": 24,
 			"anim": "singLEFT",
 			"indices": [],
-			"name": "SENPAI LEFT NOTE"
+			"name": "SENPAI LEFT NOTE instance 1"
 		},
 		{
 			"offsets": [
-				14,
+				2.33,
 				0
 			],
 			"loop": false,
 			"fps": 24,
 			"anim": "singDOWN",
 			"indices": [],
-			"name": "SENPAI DOWN NOTE"
+			"name": "SENPAI DOWN NOTE instance 1"
 		}
 	],
 	"no_antialiasing": true,
 	"image": "sprites/characters/senpai",
 	"position": [
-		150,
-		360
+		-450,
+		40
 	],
 	"healthicon": "senpai-pixel",
 	"flip_x": false,
@ -70,9 +69,9 @@
 		111
 	],
 	"camera_position": [
-		-240,
-		-330
+		-800,
+		0
 	],
 	"sing_duration": 4,
-	"scale": 6
+	"scale": 7
 }
--- a/characters/somari.json
+++ b/characters/somari.json
@ -0,0 +1,78 @@
+{
+	"animations": [
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "idle",
+			"fps": 12,
+			"name": "somari idle",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singLEFT",
+			"fps": 12,
+			"name": "somari left",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singRIGHT",
+			"fps": 12,
+			"name": "somari right",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singDOWN",
+			"fps": 12,
+			"name": "somari down",
+			"indices": []
+		},
+		{
+			"loop": false,
+			"offsets": [
+				0,
+				0
+			],
+			"anim": "singUP",
+			"fps": 12,
+			"name": "somari up",
+			"indices": []
+		}
+	],
+	"no_antialiasing": true,
+	"image": "sprites/characters/secret/Somari",
+	"position": [
+		0,
+		390
+	],
+	"healthicon": "somari",
+	"flip_x": false,
+	"healthbar_colors": [
+		255,
+		0,
+		0
+	],
+	"camera_position": [
+		-170,
+		-230
+	],
+	"sing_duration": 4,
+	"scale": 8
+}
--- a/characters/spirit.json
+++ b/characters/spirit.json
@ -1,78 +1,55 @@
 {
 	"animations": [
 		{
-			"offsets": [
-				-218,
-				-280
-			],
 			"loop": false,
+			"offsets": [-27.25, -35],
+			"fps": 24,
 			"anim": "idle",
-			"fps": 24,
-			"name": "idle spirit_",
-			"indices": []
+			"indices": [],
+			"name": "idle spirit_"
 		},
 		{
-			"offsets": [
-				-200,
-				-280
-			],
 			"loop": false,
+			"offsets": [-25, -35],
+			"fps": 24,
 			"anim": "singLEFT",
-			"fps": 24,
-			"name": "left_",
-			"indices": []
+			"indices": [],
+			"name": "left_"
 		},
 		{
-			"offsets": [
-				170,
-				110
-			],
 			"loop": false,
+			"offsets": [21.25, 13.75],
+			"fps": 24,
 			"anim": "singDOWN",
-			"fps": 24,
-			"name": "spirit down_",
-			"indices": []
+			"indices": [],
+			"name": "spirit down_"
 		},
 		{
-			"offsets": [
-				-220,
-				-280
-			],
 			"loop": false,
+			"offsets": [-27.5, -35],
+			"fps": 24,
 			"anim": "singRIGHT",
-			"fps": 24,
-			"name": "right_",
-			"indices": []
+			"indices": [],
+			"name": "right_"
 		},
 		{
-			"offsets": [
-				-220,
-				-240
-			],
 			"loop": false,
-			"anim": "singUP",
+			"offsets": [-27.5, -30],
 			"fps": 24,
-			"name": "up_",
-			"indices": []
+			"anim": "singUP",
+			"indices": [],
+			"name": "up_"
 		}
 	],
+	"vocals_file": "spirit",
 	"no_antialiasing": true,
 	"image": "sprites/characters/spirit",
-	"position": [
-		-150,
-		100
-	],
+	"position": [-800, -100],
 	"healthicon": "spirit-pixel",
 	"flip_x": false,
-	"healthbar_colors": [
-		255,
-		60,
-		110
-	],
-	"camera_position": [
-		0,
-		0
-	],
+	"healthbar_colors": [255, 60, 110],
+	"camera_position": [-800, 0],
 	"sing_duration": 4,
-	"scale": 6
+	"scale": 7,
+	"_editor_isPlayer": false
 }
--- a/characters/spooky.json
+++ b/characters/spooky.json
@ -8,7 +8,7 @@
 			],
 			"anim": "hey",
 			"fps": 24,
-			"name": "spooky kids YEAH!!",
+			"name": "Cheer",
 			"indices": []
 		},
 		{
@ -19,7 +19,7 @@
 			],
 			"anim": "singLEFT",
 			"fps": 24,
-			"name": "note sing left",
+			"name": "SingLEFT",
 			"indices": []
 		},
 		{
@ -30,7 +30,7 @@
 			],
 			"anim": "singRIGHT",
 			"fps": 24,
-			"name": "spooky sing right",
+			"name": "SingRIGHT",
 			"indices": []
 		},
 		{
@ -41,7 +41,7 @@
 			],
 			"anim": "singDOWN",
 			"fps": 24,
-			"name": "spooky DOWN note",
+			"name": "SingDOWN",
 			"indices": []
 		},
 		{
@ -53,15 +53,15 @@
 			"fps": 24,
 			"anim": "danceLeft",
 			"indices": [
-				0,
 				1,
 				2,
 				3,
 				4,
 				5,
-				6
+				6,
+				7
 			],
-			"name": "spooky dance idle"
+			"name": "Idle"
 		},
 		{
 			"loop": false,
@ -81,9 +81,9 @@
 				13,
 				14,
 				15,
-				0
+				1
 			],
-			"name": "spooky dance idle"
+			"name": "Idle"
 		},
 		{
 			"loop": false,
@ -94,11 +94,11 @@
 			"fps": 24,
 			"anim": "singUP",
 			"indices": [],
-			"name": "spooky UP NOTE"
+			"name": "SingUP"
 		}
 	],
 	"no_antialiasing": false,
-	"image": "sprites/characters/spooky_kids_assets",
+	"image": "sprites/characters/SpookyKids",
 	"position": [
 		-400,
 		540
@ -116,5 +116,6 @@
 	],
 	"sing_duration": 4,
 	"scale": 1,
-	"dancing": true
+	"dancing": true,
+	"starter_frame": 1
 }
--- a/characters/tankman-bloody.json
+++ b/characters/tankman-bloody.json
@ -0,0 +1,79 @@
+{
+	"animations": [
+		{
+			"offsets": [0, 52],
+			"indices": [],
+			"fps": 24,
+			"anim": "idle",
+			"loop": false,
+			"name": "Tankman Idle bloody"
+		},
+		{
+			"offsets": [-90, 15],
+			"indices": [],
+			"fps": 24,
+			"anim": "singLEFT",
+			"loop": false,
+			"name": "Tankman Right Note bloody"
+		},
+		{
+			"offsets": [-62, -105],
+			"indices": [],
+			"fps": 24,
+			"anim": "singDOWN",
+			"loop": false,
+			"name": "Tankman DOWN note bloody"
+		},
+		{
+			"offsets": [-47, 165],
+			"indices": [],
+			"fps": 24,
+			"anim": "singUP",
+			"loop": false,
+			"name": "Tankman UP note bloody"
+		},
+		{
+			"offsets": [23, 17],
+			"indices": [],
+			"fps": 24,
+			"anim": "singRIGHT",
+			"loop": false,
+			"name": "Tankman Note Left bloody"
+		},
+		{
+			"offsets": [110, 117],
+			"indices": [],
+			"fps": 30,
+			"anim": "redheadsAnim",
+			"loop": false,
+			"name": "redheads anim"
+		},
+		{
+			"offsets": [0, 90],
+			"indices": [],
+			"fps": 30,
+			"anim": "hehPrettyGood",
+			"loop": false,
+			"name": "pretty good anim"
+		}
+	],
+	"vocals_file": "",
+	"no_antialiasing": false,
+	"image": "sprites/characters/tankmanCaptainBloody",
+	"position": [0, 480],
+	"healthicon": "tankman-bloody",
+	"flip_x": true,
+	"healthbar_colors": [
+		225,
+		225,
+		225
+	],
+	"camera_position": [-900, -20],
+	"sing_duration": 6.1,
+	"scale": 1,
+	"_editor_isPlayer": false,
+	"starter_frame": 1,
+	"stage_positions": {
+		"tank": [500, -330]
+	}
+}
--- a/charts/2hot/2hot-chart-pico.json
+++ b/charts/2hot/2hot-chart-pico.json
--- a/charts/2hot/2hot-metadata-pico.json
+++ b/charts/2hot/2hot-metadata-pico.json
@ -4,10 +4,10 @@
  "artist": "Kawai Sprite",
  "charter": "Jenny Crowe + Spazkid + ninjamuffin99",
  "playData": {
-    "stage": "philly",
+    "stage": "streets",
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "darnell"
    },
    "ratings": { "easy": 3, "normal": 4, "hard": 5 },
--- a/charts/2hot/script.lua
+++ b/charts/2hot/script.lua
@ -0,0 +1,55 @@
+local logging = require "modules.logging"
+---@type engine.module
+local module = {}
+
+local explosion
+
+function module.onCreate()
+    explosion = Sprite("images/blazin/SpraypaintExplosion.png","images/blazin/SpraypaintExplosion.xml")
+
+    explosion.layer = 10.5
+    explosion.position = Vector2()
+    explosion.alpha = 0
+end
+
+function module.noteHit(note)
+    --print(note, logging.dump(note.raw))
+    if note.raw.k == "weekend-1-cockgun" then
+       sharedVars.characters.bf:PlayAnimation("cock")
+       print("cock")
+    elseif note.raw.k == "weekend-1-kneecan" then
+       sharedVars.characters.bf:PlayAnimation("CanHit")
+    elseif note.raw.k == "weekend-1-firegun" then
+        sharedVars.characters.bf:PlayAnimation("shoot")
+        evilcan:PlayAnimation("Can Shot")
+        evilcan.position = Vector2(10000, 100000)
+        explosion.alpha = 1
+        explosion:PlayAnimation("Explosion 1 movie", 24, false)
+
+       print("shoot")
+    end
+end
+
+function module.onMiss(note)
+    if note.raw.k == "weekend-1-cockgun" or note.raw.k == "weekend-1-firegun" then
+        sharedVars.health = 0
+        print("missed")
+    end
+end
+
+function module.opponentNoteHit(note)
+    if note.raw.k == "weekend-1-lightcan" then
+       sharedVars.characters.dad:PlayAnimation("lightCan") 
+    elseif note.raw.k == "weekend-1-kickcan" then
+       sharedVars.characters.dad:PlayAnimation("kickCan")
+       evilcan:PlayAnimation("Can Start")
+        evilcan.position = Vector2(500, 700)
+        evilcan.alpha = 1
+    end
+end
+
+function module.onUpdate()
+    if explosion and explosion.ended then explosion.alpha = 0 end
+end
+
+return module
--- a/charts/blammed/blammed-chart-erect.json
+++ b/charts/blammed/blammed-chart-erect.json
--- a/charts/blammed/blammed-chart-pico.json
+++ b/charts/blammed/blammed-chart-pico.json
--- a/charts/blammed/blammed-chart.json
+++ b/charts/blammed/blammed-chart.json
--- a/charts/blammed/blammed-metadata-pico.json
+++ b/charts/blammed/blammed-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "Blammed Pico",
  "artist": "Metaroom (feat. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "pico",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/blazin/blazin-chart-pico.json
+++ b/charts/blazin/blazin-chart-pico.json
--- a/charts/blazin/blazin-metadata-pico.json
+++ b/charts/blazin/blazin-metadata-pico.json
@ -7,7 +7,7 @@
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-blazin",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "darnell-blazin"
    },
    "stage": "phillyBlazin",
--- a/charts/bopeebo/bopeebo-chart-erect.json
+++ b/charts/bopeebo/bopeebo-chart-erect.json
--- a/charts/bopeebo/bopeebo-chart-pico.json
+++ b/charts/bopeebo/bopeebo-chart-pico.json
@ -5,319 +5,319 @@
    {
      "t": 0,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 2400,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 4200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    {
      "t": 4800,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 7200,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 9000,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    {
      "t": 9600,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 12000,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 14400,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 16800,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 18600,
      "e": "PlayAnimation",
-      "v": { "target": "bf", "anim": "hey", "force": true }
+      "v": { "force": true, "anim": "hey", "target": "bf" }
    },
    { "t": 19050, "e": "SetCameraBop", "v": { "rate": 1, "intensity": 0.6 } },
    {
      "t": 19200,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 21600,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 24000,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 26400,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 28200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    {
      "t": 28800,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 31200,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 31275,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
    },
    {
      "t": 33600,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 33675,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.85, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.85 }
    },
    {
      "t": 37200,
      "e": "FocusCamera",
-      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 37275,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
    },
    {
      "t": 37800,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 38250, "e": "SetCameraBop", "v": { "rate": 20, "intensity": 0.6 } },
    {
      "t": 38400,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 38475,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.85 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.85, "mode": "direct" }
    },
    { "t": 40650, "e": "SetCameraBop", "v": { "rate": 1, "intensity": 0.7 } },
    {
      "t": 40800,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 42600,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    {
      "t": 43200,
      "e": "FocusCamera",
-      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 43275,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
    },
    {
      "t": 45600,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 45675,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.85, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.85 }
    },
    {
      "t": 47400,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    {
      "t": 48000,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 50400,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 52800,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 55200,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 57000,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 57450, "e": "SetCameraBop", "v": { "rate": 1, "intensity": 0.6 } },
    {
      "t": 57600,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 58500,
      "e": "FocusCamera",
-      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 58575,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
    },
    {
      "t": 60000,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 60075,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.9 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.9, "mode": "direct" }
    },
    {
      "t": 62400,
      "e": "FocusCamera",
-      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 62475,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
    },
    { "t": 64650, "e": "SetCameraBop", "v": { "rate": 1, "intensity": 0.4 } },
    {
      "t": 64800,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 64875,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.9, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.9 }
    },
    {
      "t": 66600,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 67050, "e": "SetCameraBop", "v": { "rate": 1, "intensity": 0.6 } },
    {
      "t": 67200,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 67275,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
    },
    {
      "t": 69600,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 69675,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.9 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.9, "mode": "direct" }
    },
    {
      "t": 72000,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 72075,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
    },
    {
      "t": 74400,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 74475,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.9, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.9 }
    },
    {
      "t": 76200,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.85 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.85, "mode": "direct" }
    },
    {
      "t": 76200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    {
      "t": 77100,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 79200,
      "e": "FocusCamera",
-      "v": { "x": 200, "duration": 4, "y": 80, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 200, "y": 80, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 79275,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.75, "mode": "direct" }
+      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.75 }
    },
    { "t": 79500, "e": "SetCameraBop", "v": { "rate": 10, "intensity": 0.4 } },
    {
      "t": 80100,
      "e": "ZoomCamera",
-      "v": { "duration": 16, "ease": "expoOut", "mode": "direct", "zoom": 0.7 }
+      "v": { "ease": "expoOut", "duration": 16, "zoom": 0.7, "mode": "direct" }
    }
  ],
  "notes": {
@ -1016,6 +1016,7 @@
      { "t": 54900, "d": 2 },
      { "t": 55200, "d": 1, "l": 225 },
      { "t": 55500, "d": 3 },
+      { "t": 55575, "d": 1 },
      { "t": 55650, "d": 0 },
      { "t": 55800, "d": 2 },
      { "t": 55950, "d": 3 },
@ -1143,5 +1144,5 @@
      { "t": 80100, "d": 1, "l": 375 }
    ]
  },
-  "generatedBy": "Friday Night Funkin' - v0.6.0 (chart-null-fixes:3dd6a89) PROTOTYPE"
+  "generatedBy": "Friday Night Funkin' - v0.6.4"
 }
--- a/charts/bopeebo/bopeebo-chart.json
+++ b/charts/bopeebo/bopeebo-chart.json
@ -7,112 +7,107 @@
    {
      "t": 4200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 4800, "e": "FocusCamera", "v": 1 },
    { "t": 7200, "e": "FocusCamera", "v": 0 },
    {
      "t": 9000,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 9600, "e": "FocusCamera", "v": 1 },
    { "t": 12000, "e": "FocusCamera", "v": 0 },
    {
      "t": 13800,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 14400, "e": "FocusCamera", "v": 1 },
    { "t": 16800, "e": "FocusCamera", "v": 0 },
    {
      "t": 18600,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 19200, "e": "FocusCamera", "v": 1 },
    { "t": 21600, "e": "FocusCamera", "v": 0 },
    {
      "t": 23400,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 24000, "e": "FocusCamera", "v": 1 },
    { "t": 26400, "e": "FocusCamera", "v": 0 },
    {
      "t": 28200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 28800, "e": "FocusCamera", "v": 1 },
    { "t": 31200, "e": "FocusCamera", "v": 0 },
    {
      "t": 33000,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 33600, "e": "FocusCamera", "v": 1 },
    { "t": 36000, "e": "FocusCamera", "v": 0 },
    {
      "t": 37800,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 38400, "e": "FocusCamera", "v": 1 },
    { "t": 40800, "e": "FocusCamera", "v": 0 },
    {
      "t": 42600,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 43200, "e": "FocusCamera", "v": 1 },
    { "t": 45600, "e": "FocusCamera", "v": 0 },
-    {
-      "t": 47400,
-      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
-    },
    { "t": 48000, "e": "FocusCamera", "v": 1 },
    { "t": 50400, "e": "FocusCamera", "v": 0 },
    {
      "t": 52200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 52800, "e": "FocusCamera", "v": 1 },
    { "t": 55200, "e": "FocusCamera", "v": 0 },
    {
      "t": 57000,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 57600, "e": "FocusCamera", "v": 1 },
    { "t": 60000, "e": "FocusCamera", "v": 0 },
    {
      "t": 61800,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 62400, "e": "FocusCamera", "v": 1 },
    { "t": 64800, "e": "FocusCamera", "v": 0 },
    {
      "t": 66600,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 67200, "e": "FocusCamera", "v": 1 },
    { "t": 69600, "e": "FocusCamera", "v": 0 },
    {
      "t": 71400,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    },
    { "t": 72000, "e": "FocusCamera", "v": 1 },
    { "t": 74400, "e": "FocusCamera", "v": 0 },
    {
      "t": 76200,
      "e": "PlayAnimation",
-      "v": { "force": true, "anim": "hey", "target": "bf" }
+      "v": { "target": "bf", "anim": "hey", "force": true }
    }
  ],
  "notes": {
@ -206,6 +201,110 @@
      { "t": 75300, "d": 2 },
      { "t": 75600, "d": 1, "l": 600 }
    ],
+    "normal": [
+      { "t": 0, "d": 6 },
+      { "t": 600, "d": 7, "l": 475 },
+      { "t": 1200, "d": 7, "l": 600 },
+      { "t": 2400, "d": 2 },
+      { "t": 3000, "d": 3, "l": 475 },
+      { "t": 3600, "d": 3, "l": 600 },
+      { "t": 4800, "d": 5, "l": 325 },
+      { "t": 5400, "d": 4, "l": 300 },
+      { "t": 6000, "d": 7, "l": 600 },
+      { "t": 7200, "d": 1, "l": 300 },
+      { "t": 7800, "d": 0, "l": 300 },
+      { "t": 8400, "d": 3, "l": 600 },
+      { "t": 9600, "d": 5, "l": 624.999999999999 },
+      { "t": 10500, "d": 4 },
+      { "t": 10800, "d": 5, "l": 600 },
+      { "t": 12000, "d": 1, "l": 624.999999999999 },
+      { "t": 12900, "d": 0 },
+      { "t": 13200, "d": 1, "l": 600 },
+      { "t": 14400, "d": 7 },
+      { "t": 14700, "d": 5 },
+      { "t": 15300, "d": 4 },
+      { "t": 15600, "d": 6, "l": 600 },
+      { "t": 16800, "d": 3 },
+      { "t": 17100, "d": 1 },
+      { "t": 17700, "d": 0 },
+      { "t": 18000, "d": 2, "l": 600 },
+      { "t": 19200, "d": 4, "l": 349.999999999997 },
+      { "t": 19800, "d": 5, "l": 900 },
+      { "t": 21600, "d": 0, "l": 324.999999999999 },
+      { "t": 22200, "d": 1, "l": 900 },
+      { "t": 24000, "d": 5 },
+      { "t": 24300, "d": 7 },
+      { "t": 24600, "d": 4, "l": 900 },
+      { "t": 26400, "d": 1 },
+      { "t": 26700, "d": 3 },
+      { "t": 27000, "d": 0, "l": 900 },
+      { "t": 28800, "d": 6, "l": 324.999999999999 },
+      { "t": 29400, "d": 4, "l": 1200 },
+      { "t": 31200, "d": 2, "l": 324.999999999999 },
+      { "t": 31800, "d": 0, "l": 1200 },
+      { "t": 33300, "d": 6 },
+      { "t": 33600, "d": 4, "l": 300 },
+      { "t": 34500, "d": 6 },
+      { "t": 34800, "d": 5, "l": 600 },
+      { "t": 35700, "d": 2 },
+      { "t": 36000, "d": 0, "l": 324.999999999999 },
+      { "t": 36900, "d": 2 },
+      { "t": 37200, "d": 1, "l": 600 },
+      { "t": 38400, "d": 6, "l": 450 },
+      { "t": 39000, "d": 7, "l": 300 },
+      { "t": 39600, "d": 4, "l": 600 },
+      { "t": 40800, "d": 2, "l": 450 },
+      { "t": 41400, "d": 3, "l": 300 },
+      { "t": 42000, "d": 0, "l": 600 },
+      { "t": 43200, "d": 5 },
+      { "t": 43800, "d": 6 },
+      { "t": 44400, "d": 5 },
+      { "t": 44700, "d": 5 },
+      { "t": 45000, "d": 6 },
+      { "t": 45600, "d": 1 },
+      { "t": 46200, "d": 2 },
+      { "t": 46800, "d": 1 },
+      { "t": 47100, "d": 1 },
+      { "t": 47400, "d": 2 },
+      { "t": 48000, "d": 6, "l": 450 },
+      { "t": 48600, "d": 7, "l": 300 },
+      { "t": 49200, "d": 4, "l": 450 },
+      { "t": 50400, "d": 2, "l": 450 },
+      { "t": 51000, "d": 3, "l": 300 },
+      { "t": 51600, "d": 0, "l": 450 },
+      { "t": 52800, "d": 7, "l": 1800 },
+      { "t": 55200, "d": 3, "l": 1800 },
+      { "t": 57600, "d": 6 },
+      { "t": 57900, "d": 7 },
+      { "t": 58200, "d": 4, "l": 1200 },
+      { "t": 60000, "d": 2 },
+      { "t": 60300, "d": 3 },
+      { "t": 60600, "d": 0, "l": 1200 },
+      { "t": 62100, "d": 6 },
+      { "t": 62400, "d": 4, "l": 349.999999999997 },
+      { "t": 63300, "d": 6 },
+      { "t": 63600, "d": 5, "l": 600 },
+      { "t": 64500, "d": 2 },
+      { "t": 64800, "d": 0, "l": 324.999999999994 },
+      { "t": 65700, "d": 2 },
+      { "t": 66000, "d": 1, "l": 600 },
+      { "t": 67200, "d": 6, "l": 325.000000000003 },
+      { "t": 67800, "d": 4 },
+      { "t": 68100, "d": 7 },
+      { "t": 68400, "d": 5, "l": 600 },
+      { "t": 69600, "d": 2, "l": 300 },
+      { "t": 70200, "d": 0 },
+      { "t": 70500, "d": 3 },
+      { "t": 70800, "d": 1, "l": 600 },
+      { "t": 71700, "d": 6 },
+      { "t": 72000, "d": 4, "l": 325.000000000003 },
+      { "t": 72900, "d": 6 },
+      { "t": 73200, "d": 5, "l": 600 },
+      { "t": 74100, "d": 2 },
+      { "t": 74400, "d": 0, "l": 274.999999999997 },
+      { "t": 75300, "d": 2 },
+      { "t": 75600, "d": 1, "l": 600 }
+    ],
    "hard": [
      { "t": 0, "d": 6 },
      { "t": 600, "d": 7, "l": 600 },
@ -331,111 +430,7 @@
      { "t": 75300, "d": 2 },
      { "t": 75375, "d": 0 },
      { "t": 75600, "d": 1, "l": 600 }
-    ],
-    "normal": [
-      { "t": 0, "d": 6 },
-      { "t": 600, "d": 7, "l": 475 },
-      { "t": 1200, "d": 7, "l": 600 },
-      { "t": 2400, "d": 2 },
-      { "t": 3000, "d": 3, "l": 475 },
-      { "t": 3600, "d": 3, "l": 600 },
-      { "t": 4800, "d": 5, "l": 325 },
-      { "t": 5400, "d": 4, "l": 300 },
-      { "t": 6000, "d": 7, "l": 600 },
-      { "t": 7200, "d": 1, "l": 300 },
-      { "t": 7800, "d": 0, "l": 300 },
-      { "t": 8400, "d": 3, "l": 600 },
-      { "t": 9600, "d": 5, "l": 624.999999999999 },
-      { "t": 10500, "d": 4 },
-      { "t": 10800, "d": 5, "l": 600 },
-      { "t": 12000, "d": 1, "l": 624.999999999999 },
-      { "t": 12900, "d": 0 },
-      { "t": 13200, "d": 1, "l": 600 },
-      { "t": 14400, "d": 7 },
-      { "t": 14700, "d": 5 },
-      { "t": 15300, "d": 4 },
-      { "t": 15600, "d": 6, "l": 600 },
-      { "t": 16800, "d": 3 },
-      { "t": 17100, "d": 1 },
-      { "t": 17700, "d": 0 },
-      { "t": 18000, "d": 2, "l": 600 },
-      { "t": 19200, "d": 4, "l": 349.999999999997 },
-      { "t": 19800, "d": 5, "l": 900 },
-      { "t": 21600, "d": 0, "l": 324.999999999999 },
-      { "t": 22200, "d": 1, "l": 900 },
-      { "t": 24000, "d": 5 },
-      { "t": 24300, "d": 7 },
-      { "t": 24600, "d": 4, "l": 900 },
-      { "t": 26400, "d": 1 },
-      { "t": 26700, "d": 3 },
-      { "t": 27000, "d": 0, "l": 900 },
-      { "t": 28800, "d": 6, "l": 324.999999999999 },
-      { "t": 29400, "d": 4, "l": 1200 },
-      { "t": 31200, "d": 2, "l": 324.999999999999 },
-      { "t": 31800, "d": 0, "l": 1200 },
-      { "t": 33300, "d": 6 },
-      { "t": 33600, "d": 4, "l": 300 },
-      { "t": 34500, "d": 6 },
-      { "t": 34800, "d": 5, "l": 600 },
-      { "t": 35700, "d": 2 },
-      { "t": 36000, "d": 0, "l": 324.999999999999 },
-      { "t": 36900, "d": 2 },
-      { "t": 37200, "d": 1, "l": 600 },
-      { "t": 38400, "d": 6, "l": 450 },
-      { "t": 39000, "d": 7, "l": 300 },
-      { "t": 39600, "d": 4, "l": 600 },
-      { "t": 40800, "d": 2, "l": 450 },
-      { "t": 41400, "d": 3, "l": 300 },
-      { "t": 42000, "d": 0, "l": 600 },
-      { "t": 43200, "d": 5 },
-      { "t": 43800, "d": 6 },
-      { "t": 44400, "d": 5 },
-      { "t": 44700, "d": 5 },
-      { "t": 45000, "d": 6 },
-      { "t": 45600, "d": 1 },
-      { "t": 46200, "d": 2 },
-      { "t": 46800, "d": 1 },
-      { "t": 47100, "d": 1 },
-      { "t": 47400, "d": 2 },
-      { "t": 48000, "d": 6, "l": 450 },
-      { "t": 48600, "d": 7, "l": 300 },
-      { "t": 49200, "d": 4, "l": 450 },
-      { "t": 50400, "d": 2, "l": 450 },
-      { "t": 51000, "d": 3, "l": 300 },
-      { "t": 51600, "d": 0, "l": 450 },
-      { "t": 52800, "d": 7, "l": 1800 },
-      { "t": 55200, "d": 3, "l": 1800 },
-      { "t": 57600, "d": 6 },
-      { "t": 57900, "d": 7 },
-      { "t": 58200, "d": 4, "l": 1200 },
-      { "t": 60000, "d": 2 },
-      { "t": 60300, "d": 3 },
-      { "t": 60600, "d": 0, "l": 1200 },
-      { "t": 62100, "d": 6 },
-      { "t": 62400, "d": 4, "l": 349.999999999997 },
-      { "t": 63300, "d": 6 },
-      { "t": 63600, "d": 5, "l": 600 },
-      { "t": 64500, "d": 2 },
-      { "t": 64800, "d": 0, "l": 324.999999999994 },
-      { "t": 65700, "d": 2 },
-      { "t": 66000, "d": 1, "l": 600 },
-      { "t": 67200, "d": 6, "l": 325.000000000003 },
-      { "t": 67800, "d": 4 },
-      { "t": 68100, "d": 7 },
-      { "t": 68400, "d": 5, "l": 600 },
-      { "t": 69600, "d": 2, "l": 300 },
-      { "t": 70200, "d": 0 },
-      { "t": 70500, "d": 3 },
-      { "t": 70800, "d": 1, "l": 600 },
-      { "t": 71700, "d": 6 },
-      { "t": 72000, "d": 4, "l": 325.000000000003 },
-      { "t": 72900, "d": 6 },
-      { "t": 73200, "d": 5, "l": 600 },
-      { "t": 74100, "d": 2 },
-      { "t": 74400, "d": 0, "l": 274.999999999997 },
-      { "t": 75300, "d": 2 },
-      { "t": 75600, "d": 1, "l": 600 }
    ]
  },
-  "generatedBy": "Friday Night Funkin' - v0.6.0 (rewrite/master:869726f) PROTOTYPE"
+  "generatedBy": "Friday Night Funkin' - v0.6.4 (HEAD:0b976b0) PROTOTYPE"
 }
--- a/charts/bopeebo/bopeebo-metadata-pico.json
+++ b/charts/bopeebo/bopeebo-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "Bopeebo Pico",
  "artist": "ThatAndyGuy (feat. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "dad",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/cocoa/cocoa-chart-erect.json
+++ b/charts/cocoa/cocoa-chart-erect.json
--- a/charts/cocoa/cocoa-chart-pico.json
+++ b/charts/cocoa/cocoa-chart-pico.json
--- a/charts/cocoa/cocoa-chart.json
+++ b/charts/cocoa/cocoa-chart.json
--- a/charts/cocoa/cocoa-metadata-erect.json
+++ b/charts/cocoa/cocoa-metadata-erect.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "songName": "Cocoa Erect",
  "artist": "Saster",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["erect", "nightmare"],
    "characters": {
--- a/charts/cocoa/cocoa-metadata-pico.json
+++ b/charts/cocoa/cocoa-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "Cocoa Pico",
  "artist": "Six Impala (feat. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-christmas",
-      "girlfriend": "gf-christmas",
+      "girlfriend": "nene-christmas",
      "opponent": "parents-christmas",
      "instrumental": "pico",
      "opponentVocals": ["parents-christmas"],
--- a/charts/dadbattle/dadbattle-chart-erect.json
+++ b/charts/dadbattle/dadbattle-chart-erect.json
--- a/charts/dadbattle/dadbattle-chart-pico.json
+++ b/charts/dadbattle/dadbattle-chart-pico.json
--- a/charts/dadbattle/dadbattle-metadata-pico.json
+++ b/charts/dadbattle/dadbattle-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "DadBattle Pico",
  "artist": "TeraVex (ft. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "dad",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/darnell/darnell-chart-bf.json
+++ b/charts/darnell/darnell-chart-bf.json
--- a/charts/darnell/darnell-chart-erect.json
+++ b/charts/darnell/darnell-chart-erect.json
--- a/charts/darnell/darnell-chart-pico.json
+++ b/charts/darnell/darnell-chart-pico.json
--- a/charts/darnell/darnell-chart.json
+++ b/charts/darnell/darnell-chart.json
--- a/charts/darnell/darnell-metadata-bf.json
+++ b/charts/darnell/darnell-metadata-bf.json
@ -1,8 +1,8 @@
 {
  "version": "2.2.4",
-  "songName": "Darnell (BF Mix)",
+  "songName": "Darnell (BF",
  "artist": "Saruky",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
@ -12,7 +12,7 @@
      "instrumental": "bf",
      "altInstrumentals": []
    },
-    "stage": "philly",
+    "stage": "streetsErect",
    "noteStyle": "funkin",
    "ratings": { "easy": 3, "normal": 4, "hard": 5 },
    "album": "volume4",
--- a/charts/darnell/darnell-metadata-erect.json
+++ b/charts/darnell/darnell-metadata-erect.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "songName": "Darnell Erect",
  "artist": "Kawai Sprite",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "divisions": 96,
  "looped": false,
  "playData": {
@ -10,14 +10,14 @@
    "difficulties": ["erect", "nightmare"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "darnell",
      "instrumental": "erect",
      "altInstrumentals": [],
      "opponentVocals": ["darnell"],
      "playerVocals": ["pico"]
    },
-    "stage": "philly",
+    "stage": "streetsErect",
    "noteStyle": "funkin",
    "album": "expansion2",
    "stickerPack": "bonus-weekend1",
--- a/charts/darnell/darnell-metadata-pico.json
+++ b/charts/darnell/darnell-metadata-pico.json
@ -9,12 +9,12 @@
    "characters": {
      "album": "volume3",
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "darnell",
      "instrumental": "",
      "altInstrumentals": ["bf"]
    },
-    "stage": "philly",
+    "stage": "streets",
    "noteStyle": "funkin",
    "stickerPack": "bonus-weekend1",
    "ratings": { "easy": 2, "normal": 3, "hard": 4 },
--- a/charts/darnell/script.lua
+++ b/charts/darnell/script.lua
@ -0,0 +1,43 @@
+local videopath = "videos/darnellCutscene.ogv"
+local video = love.graphics.newVideo(videopath)
+
+local module = {}
+local started = false
+
+function module.onCreate()
+    if gameMode == "storymode" then
+    -- print("evil")
+        video:play()
+        sharedVars.canStart = false
+        sharedVars.shouldCountdown = false
+        sharedVars.cutscene = true
+    end
+end
+
+function module.onUpdate()
+    if not video:isPlaying() and not started then
+    -- print("evil")
+        sharedVars.canStart = true
+        sharedVars.shouldCountdown = true
+        started = true
+        sharedVars.cutscene = false
+        
+    end
+end
+
+function module.drawAboveCanvas()
+    if not started then
+    -- print("evil")
+        love.graphics.draw(video, 0, 0, 0, 1280 / video:getWidth(), 720 / video:getHeight())
+    end
+end
+
+function module.onClose()
+    if video then
+        video:pause()
+        video:release()
+        video = nil
+    end
+end
+
+return module
--- a/charts/eggnog/eggnog-chart-erect.json
+++ b/charts/eggnog/eggnog-chart-erect.json
@ -5,357 +5,357 @@
    {
      "t": 0.714285714289872,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 107.714285714286,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
    },
    {
      "t": 2785.71428571429,
      "e": "FocusCamera",
-      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 3642.71428571429,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.2 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.2, "mode": "stage" }
    },
    {
      "t": 6857.71428571429,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
    },
    {
      "t": 7071.42857142857,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 9642.71428571429,
      "e": "FocusCamera",
-      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 10500.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.2 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.2, "mode": "stage" }
    },
    {
      "t": 13928.5714285714,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 13982.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 17142.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 19714.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
    },
    {
      "t": 21000.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 21214.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 24000.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 25500.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 25553.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
    },
    {
      "t": 26571.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.15 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.15, "mode": "stage" }
    },
    {
      "t": 27642.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 27857.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 32571.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 32625.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 34071.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 34125.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 37714.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
    },
    {
      "t": 39428.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 41142.7142857143,
      "e": "FocusCamera",
-      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
+      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
    },
    {
      "t": 41196.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
    },
    {
      "t": 47035.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.89, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.89 }
    },
    {
      "t": 48000.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 48053.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 54857.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 54911.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 56571.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 56624.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 58285.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 58339.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 60000.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 60053.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 61714.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 61768.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 63428.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 63481.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 65142.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 67071.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 67125.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 68785.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 68838.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 72000.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 73928.7142857143,
      "e": "FocusCamera",
-      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
+      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
    },
    {
      "t": 73982.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
    },
    {
      "t": 75857.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 75910.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 78857.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 80571.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
    },
    {
      "t": 82285.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 82339.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
    },
    {
      "t": 84000.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
    },
    {
      "t": 85500.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 85714.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 87857.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.15 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.15, "mode": "stage" }
    },
    {
      "t": 88928.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 89142.7142857143,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 90857.7142857143,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.9 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.9, "mode": "stage" }
    },
    {
      "t": 91285.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 91339.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 93000.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 0 }
+      "v": { "x": 0, "duration": 4, "y": 0, "char": 0, "ease": "CLASSIC" }
    },
    {
      "t": 93053.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
    },
    {
      "t": 96214.7142857143,
      "e": "FocusCamera",
-      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
+      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
    },
    {
      "t": 96268.7142857143,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 101142.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.89 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.89, "mode": "stage" }
    },
    {
      "t": 102750.142857143,
@ -365,7 +365,7 @@
    {
      "t": 102856.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
    },
    {
      "t": 106178.142857143,
@ -375,22 +375,22 @@
    {
      "t": 106500.714285714,
      "e": "FocusCamera",
-      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 106553.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 107785.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.1, "mode": "stage" }
    },
    {
      "t": 108857.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1.15 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1.15, "mode": "stage" }
    },
    {
      "t": 109607.142857143,
@ -400,42 +400,42 @@
    {
      "t": 109714.714285714,
      "e": "FocusCamera",
-      "v": { "x": -230, "duration": 32, "y": -80, "char": 2, "ease": "expoOut" }
+      "v": { "duration": 32, "x": -230, "y": -80, "ease": "expoOut", "char": 2 }
    },
    {
      "t": 109768.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
    },
    {
      "t": 111428.714285714,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.89, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.89 }
    },
    {
      "t": 113142.714285714,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.82, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.82 }
    },
    {
      "t": 114857.714285714,
      "e": "ZoomCamera",
-      "v": { "duration": 32, "ease": "expoOut", "zoom": 0.89, "mode": "stage" }
+      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 0.89 }
    },
    {
      "t": 116571.714285714,
      "e": "FocusCamera",
-      "v": { "x": 0, "duration": 4, "y": 0, "char": 1, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 0, "y": 0, "ease": "CLASSIC", "char": 1 }
    },
    {
      "t": 116625.714285714,
      "e": "ZoomCamera",
-      "v": { "ease": "expoOut", "duration": 32, "mode": "stage", "zoom": 1 }
+      "v": { "duration": 32, "ease": "expoOut", "zoom": 1, "mode": "stage" }
    },
    {
      "t": 118285.714285714,
      "e": "FocusCamera",
-      "v": { "x": 100, "duration": 4, "y": 100, "char": 0, "ease": "CLASSIC" }
+      "v": { "duration": 4, "x": 100, "y": 100, "ease": "CLASSIC", "char": 0 }
    },
    {
      "t": 119678.142857143,
@ -446,21 +446,21 @@
      "t": 119785.714285714,
      "e": "FocusCamera",
      "v": {
-        "duration": 46,
        "x": -230,
+        "duration": 46,
        "y": -80,
-        "ease": "quadInOut",
-        "char": 2
+        "char": 2,
+        "ease": "quadInOut"
      }
    },
    {
      "t": 119839.714285714,
      "e": "ZoomCamera",
      "v": {
-        "duration": 46,
        "ease": "quadInOut",
-        "zoom": 0.82,
-        "mode": "stage"
+        "duration": 46,
+        "mode": "stage",
+        "zoom": 0.82
      }
    }
  ],
@ -546,6 +546,7 @@
      { "t": 16285.7142857143, "d": 5 },
      { "t": 16500, "d": 4 },
      { "t": 16714.2857142857, "d": 7 },
+      { "t": 16767.8571428571, "d": 4 },
      { "t": 16928.5714285714, "d": 6 },
      { "t": 17142.8571428571, "d": 3 },
      { "t": 17196.4285714286, "d": 2 },
@ -574,6 +575,7 @@
      { "t": 23142.8571428571, "d": 5 },
      { "t": 23357.1428571429, "d": 6 },
      { "t": 23571.4285714286, "d": 4 },
+      { "t": 23625, "d": 7 },
      { "t": 23785.7142857143, "d": 5 },
      { "t": 24000, "d": 3 },
      { "t": 24053.5714285714, "d": 2 },
@ -916,6 +918,7 @@
      { "t": 73071.4285714286, "d": 2 },
      { "t": 73285.7142857143, "d": 3 },
      { "t": 73500, "d": 0 },
+      { "t": 73714.2857142857, "d": 6 },
      { "t": 73928.5714285714, "d": 1 },
      { "t": 73928.5714285714, "d": 4 },
      { "t": 74142.8571428571, "d": 2 },
@ -1352,6 +1355,7 @@
      { "t": 16285.7142857143, "d": 5 },
      { "t": 16500, "d": 4 },
      { "t": 16714.2857142857, "d": 7 },
+      { "t": 16767.8571428571, "d": 4 },
      { "t": 16928.5714285714, "d": 6 },
      { "t": 17142.8571428571, "d": 2 },
      { "t": 17196.4285714286, "d": 3 },
@ -1380,6 +1384,7 @@
      { "t": 23142.8571428571, "d": 5 },
      { "t": 23357.1428571429, "d": 6 },
      { "t": 23571.4285714286, "d": 4 },
+      { "t": 23625, "d": 7 },
      { "t": 23785.7142857143, "d": 5 },
      { "t": 24000, "d": 2 },
      { "t": 24053.5714285714, "d": 3 },
@ -1726,6 +1731,7 @@
      { "t": 73071.4285714286, "d": 2 },
      { "t": 73285.7142857143, "d": 3 },
      { "t": 73500, "d": 0 },
+      { "t": 73714.2857142857, "d": 6 },
      { "t": 73928.5714285714, "d": 1 },
      { "t": 73928.5714285714, "d": 4 },
      { "t": 74142.8571428571, "d": 2 },
@ -2082,5 +2088,5 @@
      { "t": 121928.571428571, "d": 1, "l": 2343.75 }
    ]
  },
-  "generatedBy": "Friday Night Funkin' - v0.3.2 (rewrite/master:2f96429:MODIFIED)"
+  "generatedBy": "Friday Night Funkin' - v0.7.0 (master:dcac362) PROTOTYPE"
 }
--- a/charts/eggnog/eggnog-chart-pico.json
+++ b/charts/eggnog/eggnog-chart-pico.json
--- a/charts/eggnog/eggnog-chart.json
+++ b/charts/eggnog/eggnog-chart.json
--- a/charts/eggnog/eggnog-metadata-erect.json
+++ b/charts/eggnog/eggnog-metadata-erect.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "songName": "Eggnog Erect",
  "artist": "Saruky",
-  "charter": "fabs + SpazKid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["erect", "nightmare"],
    "characters": {
--- a/charts/eggnog/eggnog-metadata-pico.json
+++ b/charts/eggnog/eggnog-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "Eggnog Pico",
  "artist": "Teravex (ft. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-christmas",
-      "girlfriend": "gf-christmas",
+      "girlfriend": "nene-christmas",
      "opponent": "parents-christmas",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/fresh/fresh-chart-erect.json
+++ b/charts/fresh/fresh-chart-erect.json
--- a/charts/fresh/fresh-chart-pico.json
+++ b/charts/fresh/fresh-chart-pico.json
--- a/charts/fresh/fresh-chart.json
+++ b/charts/fresh/fresh-chart.json
--- a/charts/fresh/fresh-metadata-pico.json
+++ b/charts/fresh/fresh-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "Fresh Pico",
  "artist": "Xploshi (ft. Saster)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "dad",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/guns/guns-chart-pico.json
+++ b/charts/guns/guns-chart-pico.json
--- a/charts/guns/guns-chart.json
+++ b/charts/guns/guns-chart.json
--- a/charts/guns/guns-metadata-pico.json
+++ b/charts/guns/guns-metadata-pico.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "songName": "Guns Pico",
  "artist": "tsuyunoshi (ft. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "divisions": 96,
  "looped": false,
  "offsets": {
@ -13,12 +13,12 @@
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "tankman",
      "instrumental": "pico",
      "altInstrumentals": []
    },
-    "stage": "tank",
+    "stage": "tankErect",
    "noteStyle": "funkin",
    "ratings": { "easy": 3, "normal": 4, "hard": 5 },
    "album": "volume4",
--- a/charts/high/high-chart-erect.json
+++ b/charts/high/high-chart-erect.json
--- a/charts/lit-up/lit-up-chart-bf.json
+++ b/charts/lit-up/lit-up-chart-bf.json
--- a/charts/lit-up/lit-up-chart-pico.json
+++ b/charts/lit-up/lit-up-chart-pico.json
--- a/charts/lit-up/lit-up-chart.json
+++ b/charts/lit-up/lit-up-chart.json
--- a/charts/lit-up/lit-up-metadata-bf.json
+++ b/charts/lit-up/lit-up-metadata-bf.json
@ -1,8 +1,8 @@
 {
  "version": "2.2.4",
-  "songName": "Lit Up (BF Mix)",
+  "songName": "Lit Up (BF",
  "artist": "Saruky",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "divisions": 96,
  "looped": false,
  "playData": {
@ -17,7 +17,7 @@
      "opponentVocals": ["darnell"],
      "playerVocals": ["bf"]
    },
-    "stage": "philly",
+    "stage": "streetsErect",
    "noteStyle": "funkin",
    "album": "expansion2",
    "ratings": { "easy": 4, "normal": 5, "hard": 6 },
--- a/charts/lit-up/lit-up-metadata-pico.json
+++ b/charts/lit-up/lit-up-metadata-pico.json
@ -7,10 +7,10 @@
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "darnell"
    },
-    "stage": "philly",
+    "stage": "streets",
    "noteStyle": "funkin",
    "ratings": { "easy": 2, "normal": 3, "hard": 4 },
    "songVariations": ["bf"],
--- a/charts/monster/monster-chart.json
+++ b/charts/monster/monster-chart.json
--- a/charts/monster/monster-metadata.json
+++ b/charts/monster/monster-metadata.json
@ -6,7 +6,7 @@
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": { "player": "bf", "girlfriend": "gf", "opponent": "monster" },
-    "stage": "spooky",
+    "stage": "spookyMansion",
    "noteStyle": "funkin",
    "ratings": { "easy": 1, "normal": 2, "hard": 2 },
    "album": "volume1",
--- a/charts/philly-nice/philly-nice-chart-erect.json
+++ b/charts/philly-nice/philly-nice-chart-erect.json
--- a/charts/philly-nice/philly-nice-chart-pico.json
+++ b/charts/philly-nice/philly-nice-chart-pico.json
--- a/charts/philly-nice/philly-nice-chart.json
+++ b/charts/philly-nice/philly-nice-chart.json
@ -1,22 +1,69 @@
 {
+  "version": "2.0.0",
+  "scrollSpeed": { "easy": 1.6, "normal": 1.8, "hard": 2 },
  "events": [
-    { "e": "FocusCamera", "t": 0, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 2914, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 8400, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 14057, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 19542, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 24685, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 30171, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 35657, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 41142, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 46628, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 52114, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 57600, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 63085, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 68571, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 74057, "v": { "char": 0 } },
-    { "e": "FocusCamera", "t": 79542, "v": { "char": 1 } },
-    { "e": "FocusCamera", "t": 85028, "v": { "char": 0 } }
+    { "t": 0, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 2914, "e": "FocusCamera", "v": { "char": 1 } },
+    { "t": 8400, "e": "FocusCamera", "v": { "char": 0 } },
+    {
+      "t": 13714.2857142857,
+      "e": "PlayAnimation",
+      "v": { "target": "boyfriend", "force": true, "anim": "hey" }
+    },
+    {
+      "t": 13714.2857142857,
+      "e": "PlayAnimation",
+      "v": { "anim": "cheer", "force": true, "target": "gf" }
+    },
+    { "t": 14057, "e": "FocusCamera", "v": { "char": 1 } },
+    { "t": 19542, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 24685, "e": "FocusCamera", "v": { "char": 1 } },
+    {
+      "t": 24728.5714285714,
+      "e": "PlayAnimation",
+      "v": { "target": "boyfriend", "force": true, "anim": "hey" }
+    },
+    { "t": 30171, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 35657, "e": "FocusCamera", "v": { "char": 1 } },
+    {
+      "t": 35700,
+      "e": "PlayAnimation",
+      "v": { "target": "boyfriend", "force": true, "anim": "hey" }
+    },
+    { "t": 41142, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 46628, "e": "FocusCamera", "v": { "char": 1 } },
+    {
+      "t": 46671.4285714286,
+      "e": "PlayAnimation",
+      "v": { "target": "boyfriend", "force": true, "anim": "hey" }
+    },
+    { "t": 52114, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 57600, "e": "FocusCamera", "v": { "char": 1 } },
+    {
+      "t": 57642.8571428571,
+      "e": "PlayAnimation",
+      "v": { "target": "boyfriend", "force": true, "anim": "hey" }
+    },
+    {
+      "t": 57685.7142857143,
+      "e": "ZoomCamera",
+      "v": { "duration": 12, "ease": "expoOut", "zoom": 1.05, "mode": "stage" }
+    },
+    { "t": 63085, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 68571, "e": "FocusCamera", "v": { "char": 1 } },
+    { "t": 74057, "e": "FocusCamera", "v": { "char": 0 } },
+    { "t": 79542, "e": "FocusCamera", "v": { "char": 1 } },
+    {
+      "t": 79585.7142857143,
+      "e": "PlayAnimation",
+      "v": { "target": "boyfriend", "force": true, "anim": "hey" }
+    },
+    {
+      "t": 79628.5714285714,
+      "e": "ZoomCamera",
+      "v": { "duration": 24, "ease": "expoOut", "zoom": 1, "mode": "stage" }
+    },
+    { "t": 85028, "e": "FocusCamera", "v": { "char": 0 } }
  ],
  "notes": {
    "easy": [
@ -673,6 +720,7 @@
      { "t": 27257, "d": 5 },
      { "t": 27600, "d": 4 },
      { "t": 27771, "d": 5 },
+      { "t": 27857.1428571429, "d": 4 },
      { "t": 27942, "d": 7 },
      { "t": 28114.2857142857, "d": 4 },
      { "t": 28285.7142857143, "d": 7 },
@ -737,6 +785,7 @@
      { "t": 39771.5714285714, "d": 6 },
      { "t": 39942.5714285714, "d": 7 },
      { "t": 40114.5714285714, "d": 6 },
+      { "t": 40242.8571428571, "d": 7 },
      { "t": 40285.5714285714, "d": 4 },
      { "t": 40457.5714285714, "d": 6 },
      { "t": 40628.5714285714, "d": 7 },
@ -985,6 +1034,7 @@
      { "t": 83657, "d": 6 },
      { "t": 83828, "d": 7 },
      { "t": 84000, "d": 6 },
+      { "t": 84128.5714285714, "d": 7 },
      { "t": 84171, "d": 4 },
      { "t": 84342, "d": 6 },
      { "t": 84514, "d": 7 },
@ -1025,7 +1075,5 @@
      { "t": 90514.2857142857, "d": 1 }
    ]
  },
-  "scrollSpeed": { "easy": 1.6, "normal": 1.8, "hard": 2 },
-  "generatedBy": "Friday Night Funkin' - v0.3.0 (chart-editor-port-legacy:76a614e) PROTOTYPE",
-  "version": "2.0.0"
+  "generatedBy": "Friday Night Funkin' - v0.7.0 (rewrite/master:25e04cf) PROTOTYPE"
 }
--- a/charts/philly-nice/philly-nice-metadata-pico.json
+++ b/charts/philly-nice/philly-nice-metadata-pico.json
@ -7,7 +7,7 @@
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "pico",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/philly-nice/philly-nice-metadata.json
+++ b/charts/philly-nice/philly-nice-metadata.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "timeFormat": "ms",
  "artist": "Kawai Sprite",
-  "charter": "ninjamuffin99 + MtH",
+  "charter": "ninjamuffin99 + MtH + Spazkid",
  "playData": {
    "stage": "philly",
    "characters": {
--- a/charts/pico/pico-chart-erect.json
+++ b/charts/pico/pico-chart-erect.json
--- a/charts/pico/pico-chart-pico.json
+++ b/charts/pico/pico-chart-pico.json
--- a/charts/pico/pico-chart.json
+++ b/charts/pico/pico-chart.json
@ -1,6 +1,6 @@
 {
  "version": "2.0.0",
-  "scrollSpeed": { "easy": 1.5, "hard": 1.6, "normal": 1.6 },
+  "scrollSpeed": { "easy": 1.5, "normal": 1.6, "hard": 1.6 },
  "events": [
    { "t": 0, "e": "FocusCamera", "v": { "char": 0 } },
    { "t": 3799, "e": "FocusCamera", "v": { "char": 1 } },
@ -191,6 +191,271 @@
      { "t": 79200, "d": 2, "l": 300 },
      { "t": 79600, "d": 1, "l": 300 }
    ],
+    "normal": [
+      { "t": 3799, "d": 6 },
+      { "t": 3999, "d": 7 },
+      { "t": 4200, "d": 6 },
+      { "t": 4600, "d": 4 },
+      { "t": 5000, "d": 4 },
+      { "t": 5400, "d": 6 },
+      { "t": 5600, "d": 7 },
+      { "t": 5800, "d": 6 },
+      { "t": 6200, "d": 4 },
+      { "t": 6999, "d": 6 },
+      { "t": 7199, "d": 7 },
+      { "t": 7399, "d": 6 },
+      { "t": 7799, "d": 4 },
+      { "t": 8200, "d": 4 },
+      { "t": 8600, "d": 6 },
+      { "t": 8800, "d": 7 },
+      { "t": 9000, "d": 6 },
+      { "t": 9400, "d": 4 },
+      { "t": 10200, "d": 2 },
+      { "t": 10400, "d": 3 },
+      { "t": 10600, "d": 2 },
+      { "t": 11000, "d": 0 },
+      { "t": 11400, "d": 0 },
+      { "t": 11800, "d": 2 },
+      { "t": 12000, "d": 3 },
+      { "t": 12200, "d": 2 },
+      { "t": 12600, "d": 0 },
+      { "t": 13399, "d": 2 },
+      { "t": 13599, "d": 3 },
+      { "t": 13799, "d": 2 },
+      { "t": 14199, "d": 0 },
+      { "t": 14599, "d": 0 },
+      { "t": 14999, "d": 2 },
+      { "t": 15199, "d": 3 },
+      { "t": 15399, "d": 2 },
+      { "t": 15799, "d": 0 },
+      { "t": 16199, "d": 6 },
+      { "t": 16800, "d": 7 },
+      { "t": 17000, "d": 4 },
+      { "t": 17200, "d": 5 },
+      { "t": 17800, "d": 7 },
+      { "t": 18400, "d": 7 },
+      { "t": 18600, "d": 4 },
+      { "t": 18800, "d": 5 },
+      { "t": 19400, "d": 7 },
+      { "t": 20000, "d": 6 },
+      { "t": 20200, "d": 4 },
+      { "t": 20400, "d": 5 },
+      { "t": 21000, "d": 6 },
+      { "t": 21600, "d": 7 },
+      { "t": 21800, "d": 4 },
+      { "t": 22000, "d": 5 },
+      { "t": 22600, "d": 2 },
+      { "t": 23200, "d": 3 },
+      { "t": 23400, "d": 0 },
+      { "t": 23600, "d": 1 },
+      { "t": 24200, "d": 3 },
+      { "t": 24800, "d": 3 },
+      { "t": 25000, "d": 0 },
+      { "t": 25200, "d": 1 },
+      { "t": 25799, "d": 3 },
+      { "t": 26399, "d": 2 },
+      { "t": 26599, "d": 0 },
+      { "t": 26799, "d": 1 },
+      { "t": 27399, "d": 2 },
+      { "t": 27999, "d": 3 },
+      { "t": 28199, "d": 0 },
+      { "t": 28399, "d": 1 },
+      { "t": 28999, "d": 4 },
+      { "t": 29199, "d": 7 },
+      { "t": 29599, "d": 6 },
+      { "t": 29999, "d": 5 },
+      { "t": 30399, "d": 6 },
+      { "t": 30599, "d": 7 },
+      { "t": 30799, "d": 7 },
+      { "t": 31000, "d": 6 },
+      { "t": 31199, "d": 4, "l": 300 },
+      { "t": 31599, "d": 5, "l": 200 },
+      { "t": 32199, "d": 7 },
+      { "t": 32399, "d": 5 },
+      { "t": 32800, "d": 7 },
+      { "t": 33200, "d": 5 },
+      { "t": 33600, "d": 4 },
+      { "t": 33800, "d": 4 },
+      { "t": 34000, "d": 7 },
+      { "t": 34200, "d": 7 },
+      { "t": 34400, "d": 6, "l": 300 },
+      { "t": 34800, "d": 5, "l": 300 },
+      { "t": 35400, "d": 0 },
+      { "t": 35600, "d": 3 },
+      { "t": 36000, "d": 2 },
+      { "t": 36400, "d": 1 },
+      { "t": 36800, "d": 2 },
+      { "t": 37000, "d": 3 },
+      { "t": 37200, "d": 3 },
+      { "t": 37400, "d": 2 },
+      { "t": 37600, "d": 0, "l": 300 },
+      { "t": 38000, "d": 1, "l": 200 },
+      { "t": 38400, "d": 2 },
+      { "t": 38600, "d": 3 },
+      { "t": 38800, "d": 1 },
+      { "t": 39200, "d": 3 },
+      { "t": 39600, "d": 1 },
+      { "t": 40000, "d": 0 },
+      { "t": 40200, "d": 0 },
+      { "t": 40400, "d": 3 },
+      { "t": 40600, "d": 3 },
+      { "t": 40800, "d": 2, "l": 300 },
+      { "t": 41200, "d": 1, "l": 300 },
+      { "t": 41800, "d": 6 },
+      { "t": 42400, "d": 7 },
+      { "t": 42600, "d": 4 },
+      { "t": 42700, "d": 7 },
+      { "t": 42800, "d": 5 },
+      { "t": 43400, "d": 6 },
+      { "t": 44000, "d": 7 },
+      { "t": 44200, "d": 4 },
+      { "t": 44300, "d": 7 },
+      { "t": 44400, "d": 5 },
+      { "t": 45000, "d": 7 },
+      { "t": 45600, "d": 6 },
+      { "t": 45800, "d": 4 },
+      { "t": 45900, "d": 7 },
+      { "t": 46000, "d": 5 },
+      { "t": 46600, "d": 6 },
+      { "t": 47000, "d": 4 },
+      { "t": 47200, "d": 7 },
+      { "t": 47400, "d": 4 },
+      { "t": 47500, "d": 7 },
+      { "t": 47600, "d": 5 },
+      { "t": 48200, "d": 2 },
+      { "t": 48800, "d": 3 },
+      { "t": 49000, "d": 0 },
+      { "t": 49100, "d": 3 },
+      { "t": 49200, "d": 1 },
+      { "t": 49800, "d": 2 },
+      { "t": 50400, "d": 3 },
+      { "t": 50600, "d": 0 },
+      { "t": 50700, "d": 3 },
+      { "t": 50800, "d": 1 },
+      { "t": 51399, "d": 3 },
+      { "t": 51999, "d": 2 },
+      { "t": 52199, "d": 0 },
+      { "t": 52299, "d": 3 },
+      { "t": 52399, "d": 1 },
+      { "t": 52999, "d": 2 },
+      { "t": 53400, "d": 0 },
+      { "t": 53599, "d": 3 },
+      { "t": 53799, "d": 0 },
+      { "t": 53899, "d": 3 },
+      { "t": 53999, "d": 1 },
+      { "t": 54399, "d": 2, "l": 200 },
+      { "t": 54599, "d": 6 },
+      { "t": 54999, "d": 3 },
+      { "t": 55000, "d": 4 },
+      { "t": 55199, "d": 7 },
+      { "t": 55199, "d": 1 },
+      { "t": 55399, "d": 4 },
+      { "t": 55499, "d": 7 },
+      { "t": 55599, "d": 5 },
+      { "t": 55599, "d": 3 },
+      { "t": 55999, "d": 0 },
+      { "t": 56199, "d": 6 },
+      { "t": 56399, "d": 0 },
+      { "t": 56599, "d": 3 },
+      { "t": 56600, "d": 4 },
+      { "t": 56799, "d": 7 },
+      { "t": 56799, "d": 1, "l": 200 },
+      { "t": 56999, "d": 4 },
+      { "t": 57099, "d": 7 },
+      { "t": 57199, "d": 5 },
+      { "t": 57599, "d": 2, "l": 200 },
+      { "t": 57799, "d": 7 },
+      { "t": 58199, "d": 3 },
+      { "t": 58200, "d": 4 },
+      { "t": 58399, "d": 6 },
+      { "t": 58399, "d": 1 },
+      { "t": 58599, "d": 4 },
+      { "t": 58699, "d": 7 },
+      { "t": 58799, "d": 5 },
+      { "t": 58799, "d": 3 },
+      { "t": 59199, "d": 0 },
+      { "t": 59399, "d": 6 },
+      { "t": 59399, "d": 2 },
+      { "t": 59599, "d": 0 },
+      { "t": 59799, "d": 3 },
+      { "t": 59800, "d": 4 },
+      { "t": 59999, "d": 7 },
+      { "t": 59999, "d": 2 },
+      { "t": 60199, "d": 4 },
+      { "t": 60199, "d": 2 },
+      { "t": 60299, "d": 7 },
+      { "t": 60399, "d": 5 },
+      { "t": 60399, "d": 0 },
+      { "t": 60599, "d": 0 },
+      { "t": 60999, "d": 2 },
+      { "t": 61400, "d": 0 },
+      { "t": 61599, "d": 3 },
+      { "t": 61799, "d": 0 },
+      { "t": 61899, "d": 3 },
+      { "t": 61999, "d": 1 },
+      { "t": 62599, "d": 2 },
+      { "t": 63000, "d": 0 },
+      { "t": 63199, "d": 3 },
+      { "t": 63399, "d": 0 },
+      { "t": 63499, "d": 3 },
+      { "t": 63599, "d": 1 },
+      { "t": 64199, "d": 3 },
+      { "t": 64600, "d": 0 },
+      { "t": 64799, "d": 2 },
+      { "t": 64999, "d": 0 },
+      { "t": 65099, "d": 3 },
+      { "t": 65199, "d": 1 },
+      { "t": 65800, "d": 2 },
+      { "t": 66200, "d": 0 },
+      { "t": 66400, "d": 3 },
+      { "t": 66600, "d": 0 },
+      { "t": 66700, "d": 3 },
+      { "t": 66800, "d": 1 },
+      { "t": 67400, "d": 4 },
+      { "t": 67600, "d": 7 },
+      { "t": 68000, "d": 6 },
+      { "t": 68400, "d": 5 },
+      { "t": 68800, "d": 6 },
+      { "t": 69000, "d": 7 },
+      { "t": 69100, "d": 4 },
+      { "t": 69200, "d": 7 },
+      { "t": 69400, "d": 6 },
+      { "t": 69600, "d": 4, "l": 300 },
+      { "t": 70000, "d": 5, "l": 200 },
+      { "t": 70600, "d": 7 },
+      { "t": 70800, "d": 5 },
+      { "t": 71200, "d": 7 },
+      { "t": 71400, "d": 5 },
+      { "t": 71800, "d": 7 },
+      { "t": 72000, "d": 4 },
+      { "t": 72200, "d": 4 },
+      { "t": 72400, "d": 7 },
+      { "t": 72600, "d": 7 },
+      { "t": 72800, "d": 6, "l": 300 },
+      { "t": 73200, "d": 5, "l": 300 },
+      { "t": 73800, "d": 0 },
+      { "t": 74000, "d": 3 },
+      { "t": 74400, "d": 2 },
+      { "t": 74800, "d": 1 },
+      { "t": 75200, "d": 2 },
+      { "t": 75400, "d": 3 },
+      { "t": 75500, "d": 0 },
+      { "t": 75600, "d": 3 },
+      { "t": 75800, "d": 2 },
+      { "t": 76000, "d": 0, "l": 300 },
+      { "t": 76400, "d": 1, "l": 200 },
+      { "t": 76800, "d": 2 },
+      { "t": 77000, "d": 3 },
+      { "t": 77200, "d": 1 },
+      { "t": 77600, "d": 3 },
+      { "t": 78000, "d": 1 },
+      { "t": 78400, "d": 0 },
+      { "t": 78600, "d": 0 },
+      { "t": 78800, "d": 3 },
+      { "t": 79000, "d": 3 },
+      { "t": 79200, "d": 2, "l": 300 },
+      { "t": 79600, "d": 1, "l": 300 }
+    ],
    "hard": [
      { "t": 3799, "d": 6 },
      { "t": 3999, "d": 7 },
@ -519,271 +784,6 @@
      { "t": 79000, "d": 3 },
      { "t": 79200, "d": 2, "l": 300 },
      { "t": 79600, "d": 1, "l": 300 }
-    ],
-    "normal": [
-      { "t": 3799, "d": 6 },
-      { "t": 3999, "d": 7 },
-      { "t": 4200, "d": 6 },
-      { "t": 4600, "d": 4 },
-      { "t": 5000, "d": 4 },
-      { "t": 5400, "d": 6 },
-      { "t": 5600, "d": 7 },
-      { "t": 5800, "d": 6 },
-      { "t": 6200, "d": 4 },
-      { "t": 6999, "d": 6 },
-      { "t": 7199, "d": 7 },
-      { "t": 7399, "d": 6 },
-      { "t": 7799, "d": 4 },
-      { "t": 8200, "d": 4 },
-      { "t": 8600, "d": 6 },
-      { "t": 8800, "d": 7 },
-      { "t": 9000, "d": 6 },
-      { "t": 9400, "d": 4 },
-      { "t": 10200, "d": 2 },
-      { "t": 10400, "d": 3 },
-      { "t": 10600, "d": 2 },
-      { "t": 11000, "d": 0 },
-      { "t": 11400, "d": 0 },
-      { "t": 11800, "d": 2 },
-      { "t": 12000, "d": 3 },
-      { "t": 12200, "d": 2 },
-      { "t": 12600, "d": 0 },
-      { "t": 13399, "d": 2 },
-      { "t": 13599, "d": 3 },
-      { "t": 13799, "d": 2 },
-      { "t": 14199, "d": 0 },
-      { "t": 14599, "d": 0 },
-      { "t": 14999, "d": 2 },
-      { "t": 15199, "d": 3 },
-      { "t": 15399, "d": 2 },
-      { "t": 15799, "d": 0 },
-      { "t": 16199, "d": 6 },
-      { "t": 16800, "d": 7 },
-      { "t": 17000, "d": 4 },
-      { "t": 17200, "d": 5 },
-      { "t": 17800, "d": 7 },
-      { "t": 18400, "d": 7 },
-      { "t": 18600, "d": 4 },
-      { "t": 18800, "d": 5 },
-      { "t": 19400, "d": 7 },
-      { "t": 20000, "d": 6 },
-      { "t": 20200, "d": 4 },
-      { "t": 20400, "d": 5 },
-      { "t": 21000, "d": 6 },
-      { "t": 21600, "d": 7 },
-      { "t": 21800, "d": 4 },
-      { "t": 22000, "d": 5 },
-      { "t": 22600, "d": 2 },
-      { "t": 23200, "d": 3 },
-      { "t": 23400, "d": 0 },
-      { "t": 23600, "d": 1 },
-      { "t": 24200, "d": 3 },
-      { "t": 24800, "d": 3 },
-      { "t": 25000, "d": 0 },
-      { "t": 25200, "d": 1 },
-      { "t": 25799, "d": 3 },
-      { "t": 26399, "d": 2 },
-      { "t": 26599, "d": 0 },
-      { "t": 26799, "d": 1 },
-      { "t": 27399, "d": 2 },
-      { "t": 27999, "d": 3 },
-      { "t": 28199, "d": 0 },
-      { "t": 28399, "d": 1 },
-      { "t": 28999, "d": 4 },
-      { "t": 29199, "d": 7 },
-      { "t": 29599, "d": 6 },
-      { "t": 29999, "d": 5 },
-      { "t": 30399, "d": 6 },
-      { "t": 30599, "d": 7 },
-      { "t": 30799, "d": 7 },
-      { "t": 31000, "d": 6 },
-      { "t": 31199, "d": 4, "l": 300 },
-      { "t": 31599, "d": 5, "l": 200 },
-      { "t": 32199, "d": 7 },
-      { "t": 32399, "d": 5 },
-      { "t": 32800, "d": 7 },
-      { "t": 33200, "d": 5 },
-      { "t": 33600, "d": 4 },
-      { "t": 33800, "d": 4 },
-      { "t": 34000, "d": 7 },
-      { "t": 34200, "d": 7 },
-      { "t": 34400, "d": 6, "l": 300 },
-      { "t": 34800, "d": 5, "l": 300 },
-      { "t": 35400, "d": 0 },
-      { "t": 35600, "d": 3 },
-      { "t": 36000, "d": 2 },
-      { "t": 36400, "d": 1 },
-      { "t": 36800, "d": 2 },
-      { "t": 37000, "d": 3 },
-      { "t": 37200, "d": 3 },
-      { "t": 37400, "d": 2 },
-      { "t": 37600, "d": 0, "l": 300 },
-      { "t": 38000, "d": 1, "l": 200 },
-      { "t": 38400, "d": 2 },
-      { "t": 38600, "d": 3 },
-      { "t": 38800, "d": 1 },
-      { "t": 39200, "d": 3 },
-      { "t": 39600, "d": 1 },
-      { "t": 40000, "d": 0 },
-      { "t": 40200, "d": 0 },
-      { "t": 40400, "d": 3 },
-      { "t": 40600, "d": 3 },
-      { "t": 40800, "d": 2, "l": 300 },
-      { "t": 41200, "d": 1, "l": 300 },
-      { "t": 41800, "d": 6 },
-      { "t": 42400, "d": 7 },
-      { "t": 42600, "d": 4 },
-      { "t": 42700, "d": 7 },
-      { "t": 42800, "d": 5 },
-      { "t": 43400, "d": 6 },
-      { "t": 44000, "d": 7 },
-      { "t": 44200, "d": 4 },
-      { "t": 44300, "d": 7 },
-      { "t": 44400, "d": 5 },
-      { "t": 45000, "d": 7 },
-      { "t": 45600, "d": 6 },
-      { "t": 45800, "d": 4 },
-      { "t": 45900, "d": 7 },
-      { "t": 46000, "d": 5 },
-      { "t": 46600, "d": 6 },
-      { "t": 47000, "d": 4 },
-      { "t": 47200, "d": 7 },
-      { "t": 47400, "d": 4 },
-      { "t": 47500, "d": 7 },
-      { "t": 47600, "d": 5 },
-      { "t": 48200, "d": 2 },
-      { "t": 48800, "d": 3 },
-      { "t": 49000, "d": 0 },
-      { "t": 49100, "d": 3 },
-      { "t": 49200, "d": 1 },
-      { "t": 49800, "d": 2 },
-      { "t": 50400, "d": 3 },
-      { "t": 50600, "d": 0 },
-      { "t": 50700, "d": 3 },
-      { "t": 50800, "d": 1 },
-      { "t": 51399, "d": 3 },
-      { "t": 51999, "d": 2 },
-      { "t": 52199, "d": 0 },
-      { "t": 52299, "d": 3 },
-      { "t": 52399, "d": 1 },
-      { "t": 52999, "d": 2 },
-      { "t": 53400, "d": 0 },
-      { "t": 53599, "d": 3 },
-      { "t": 53799, "d": 0 },
-      { "t": 53899, "d": 3 },
-      { "t": 53999, "d": 1 },
-      { "t": 54399, "d": 2, "l": 200 },
-      { "t": 54599, "d": 6 },
-      { "t": 54999, "d": 3 },
-      { "t": 55000, "d": 4 },
-      { "t": 55199, "d": 7 },
-      { "t": 55199, "d": 1 },
-      { "t": 55399, "d": 4 },
-      { "t": 55499, "d": 7 },
-      { "t": 55599, "d": 5 },
-      { "t": 55599, "d": 3 },
-      { "t": 55999, "d": 0 },
-      { "t": 56199, "d": 6 },
-      { "t": 56399, "d": 0 },
-      { "t": 56599, "d": 3 },
-      { "t": 56600, "d": 4 },
-      { "t": 56799, "d": 7 },
-      { "t": 56799, "d": 1, "l": 200 },
-      { "t": 56999, "d": 4 },
-      { "t": 57099, "d": 7 },
-      { "t": 57199, "d": 5 },
-      { "t": 57599, "d": 2, "l": 200 },
-      { "t": 57799, "d": 7 },
-      { "t": 58199, "d": 3 },
-      { "t": 58200, "d": 4 },
-      { "t": 58399, "d": 6 },
-      { "t": 58399, "d": 1 },
-      { "t": 58599, "d": 4 },
-      { "t": 58699, "d": 7 },
-      { "t": 58799, "d": 5 },
-      { "t": 58799, "d": 3 },
-      { "t": 59199, "d": 0 },
-      { "t": 59399, "d": 6 },
-      { "t": 59399, "d": 2 },
-      { "t": 59599, "d": 0 },
-      { "t": 59799, "d": 3 },
-      { "t": 59800, "d": 4 },
-      { "t": 59999, "d": 7 },
-      { "t": 59999, "d": 2 },
-      { "t": 60199, "d": 4 },
-      { "t": 60199, "d": 2 },
-      { "t": 60299, "d": 7 },
-      { "t": 60399, "d": 5 },
-      { "t": 60399, "d": 0 },
-      { "t": 60599, "d": 0 },
-      { "t": 60999, "d": 2 },
-      { "t": 61400, "d": 0 },
-      { "t": 61599, "d": 3 },
-      { "t": 61799, "d": 0 },
-      { "t": 61899, "d": 3 },
-      { "t": 61999, "d": 1 },
-      { "t": 62599, "d": 2 },
-      { "t": 63000, "d": 0 },
-      { "t": 63199, "d": 3 },
-      { "t": 63399, "d": 0 },
-      { "t": 63499, "d": 3 },
-      { "t": 63599, "d": 1 },
-      { "t": 64199, "d": 3 },
-      { "t": 64600, "d": 0 },
-      { "t": 64799, "d": 2 },
-      { "t": 64999, "d": 0 },
-      { "t": 65099, "d": 3 },
-      { "t": 65199, "d": 1 },
-      { "t": 65800, "d": 2 },
-      { "t": 66200, "d": 0 },
-      { "t": 66400, "d": 3 },
-      { "t": 66600, "d": 0 },
-      { "t": 66700, "d": 3 },
-      { "t": 66800, "d": 1 },
-      { "t": 67400, "d": 4 },
-      { "t": 67600, "d": 7 },
-      { "t": 68000, "d": 6 },
-      { "t": 68400, "d": 5 },
-      { "t": 68800, "d": 6 },
-      { "t": 69000, "d": 7 },
-      { "t": 69100, "d": 4 },
-      { "t": 69200, "d": 7 },
-      { "t": 69400, "d": 6 },
-      { "t": 69600, "d": 4, "l": 300 },
-      { "t": 70000, "d": 5, "l": 200 },
-      { "t": 70600, "d": 7 },
-      { "t": 70800, "d": 5 },
-      { "t": 71200, "d": 7 },
-      { "t": 71400, "d": 5 },
-      { "t": 71800, "d": 7 },
-      { "t": 72000, "d": 4 },
-      { "t": 72200, "d": 4 },
-      { "t": 72400, "d": 7 },
-      { "t": 72600, "d": 7 },
-      { "t": 72800, "d": 6, "l": 300 },
-      { "t": 73200, "d": 5, "l": 300 },
-      { "t": 73800, "d": 0 },
-      { "t": 74000, "d": 3 },
-      { "t": 74400, "d": 2 },
-      { "t": 74800, "d": 1 },
-      { "t": 75200, "d": 2 },
-      { "t": 75400, "d": 3 },
-      { "t": 75500, "d": 0 },
-      { "t": 75600, "d": 3 },
-      { "t": 75800, "d": 2 },
-      { "t": 76000, "d": 0, "l": 300 },
-      { "t": 76400, "d": 1, "l": 200 },
-      { "t": 76800, "d": 2 },
-      { "t": 77000, "d": 3 },
-      { "t": 77200, "d": 1 },
-      { "t": 77600, "d": 3 },
-      { "t": 78000, "d": 1 },
-      { "t": 78400, "d": 0 },
-      { "t": 78600, "d": 0 },
-      { "t": 78800, "d": 3 },
-      { "t": 79000, "d": 3 },
-      { "t": 79200, "d": 2, "l": 300 },
-      { "t": 79600, "d": 1, "l": 300 }
    ]
  },
  "generatedBy": "Friday Night Funkin' - v0.6.0 (rewrite/master:17bf492) PROTOTYPE"
--- a/charts/pico/pico-metadata-pico.json
+++ b/charts/pico/pico-metadata-pico.json
@ -2,12 +2,12 @@
  "version": "2.2.4",
  "songName": "Pico Pico",
  "artist": "Metaroom (ft. Saster)",
-  "charter": "Fabs",
+  "charter": "fabs",
  "playData": {
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-playable",
-      "girlfriend": "gf",
+      "girlfriend": "nene",
      "opponent": "pico",
      "instrumental": "pico",
      "altInstrumentals": []
--- a/charts/roses/roses-chart-erect.json
+++ b/charts/roses/roses-chart-erect.json
--- a/charts/roses/roses-chart-pico.json
+++ b/charts/roses/roses-chart-pico.json
@ -1,6 +1,6 @@
 {
  "version": "2.0.0",
-  "scrollSpeed": { "easy": 2.1, "hard": 2.6, "normal": 2.3 },
+  "scrollSpeed": { "easy": 2.1, "normal": 2.3, "hard": 2.6 },
  "events": [
    {
      "t": 0,
--- a/charts/roses/roses-chart.json
+++ b/charts/roses/roses-chart.json
@ -31,7 +31,8 @@
      { "t": 1000, "d": 4, "l": 250 },
      { "t": 1375, "d": 5 },
      { "t": 1875, "d": 6 },
-      { "t": 2375, "d": 6 },
+      { "t": 2125, "d": 6 },
+      { "t": 2375, "d": 6, "l": 406.25 },
      { "t": 3000, "d": 7, "l": 250 },
      { "t": 3375, "d": 7 },
      { "t": 3625, "d": 4 },
@ -209,7 +210,8 @@
      { "t": 65000, "d": 4, "l": 250 },
      { "t": 65375, "d": 5 },
      { "t": 65875, "d": 6 },
-      { "t": 66375, "d": 6 },
+      { "t": 66125, "d": 6 },
+      { "t": 66375, "d": 6, "l": 375 },
      { "t": 67000, "d": 7, "l": 250 },
      { "t": 67375, "d": 7 },
      { "t": 67625, "d": 4 },
@ -218,7 +220,8 @@
      { "t": 69000, "d": 0, "l": 250 },
      { "t": 69375, "d": 1 },
      { "t": 69875, "d": 2 },
-      { "t": 70375, "d": 2 },
+      { "t": 70125, "d": 2 },
+      { "t": 70375, "d": 2, "l": 375 },
      { "t": 71000, "d": 3, "l": 250 },
      { "t": 71375, "d": 3 },
      { "t": 71625, "d": 0 },
@ -287,9 +290,9 @@
      { "t": 1375, "d": 5 },
      { "t": 1875, "d": 6 },
      { "t": 2125, "d": 6 },
-      { "t": 2375, "d": 4 },
-      { "t": 2500, "d": 5 },
-      { "t": 2625, "d": 4, "l": 166.666666666667 },
+      { "t": 2375, "d": 6, "l": 187.5 },
+      { "t": 2625, "d": 5 },
+      { "t": 2750, "d": 4 },
      { "t": 3000, "d": 7, "l": 250 },
      { "t": 3375, "d": 7 },
      { "t": 3625, "d": 4 },
@ -567,9 +570,9 @@
      { "t": 65375, "d": 5 },
      { "t": 65875, "d": 6 },
      { "t": 66125, "d": 6 },
-      { "t": 66375, "d": 4 },
-      { "t": 66500, "d": 5 },
-      { "t": 66625, "d": 4, "l": 166.666666666657 },
+      { "t": 66375, "d": 6, "l": 187.5 },
+      { "t": 66625, "d": 5 },
+      { "t": 66750, "d": 4 },
      { "t": 67000, "d": 7, "l": 250 },
      { "t": 67375, "d": 7 },
      { "t": 67625, "d": 4 },
@ -671,8 +674,7 @@
      { "t": 1375, "d": 5 },
      { "t": 1875, "d": 6 },
      { "t": 2125, "d": 6 },
-      { "t": 2375, "d": 6 },
-      { "t": 2500, "d": 4 },
+      { "t": 2375, "d": 6, "l": 187.5 },
      { "t": 2625, "d": 5 },
      { "t": 2750, "d": 4 },
      { "t": 3000, "d": 7, "l": 250 },
@ -755,6 +757,7 @@
      { "t": 22250, "d": 3 },
      { "t": 22500, "d": 0 },
      { "t": 22750, "d": 2 },
+      { "t": 22937.5, "d": 2 },
      { "t": 23000, "d": 3 },
      { "t": 23250, "d": 1 },
      { "t": 23500, "d": 0 },
@ -801,7 +804,7 @@
      { "t": 31375, "d": 3 },
      { "t": 31625, "d": 0 },
      { "t": 31750, "d": 3 },
-      { "t": 32000, "d": 4 },
+      { "t": 32000, "d": 4, "l": 125 },
      { "t": 32250, "d": 5 },
      { "t": 32375, "d": 4 },
      { "t": 32500, "d": 7 },
@ -1011,8 +1014,7 @@
      { "t": 65375, "d": 5 },
      { "t": 65875, "d": 6 },
      { "t": 66125, "d": 6 },
-      { "t": 66375, "d": 6 },
-      { "t": 66500, "d": 4 },
+      { "t": 66375, "d": 6, "l": 187.5 },
      { "t": 66625, "d": 5 },
      { "t": 66750, "d": 4 },
      { "t": 67000, "d": 7, "l": 250 },
@ -1133,5 +1135,5 @@
      { "t": 87875, "d": 3 }
    ]
  },
-  "generatedBy": "Friday Night Funkin' - v0.6.0 (rewrite/master:4891e54) PROTOTYPE"
+  "generatedBy": "Friday Night Funkin' - v0.6.4"
 }
--- a/charts/roses/roses-metadata-erect.json
+++ b/charts/roses/roses-metadata-erect.json
@ -1,7 +1,7 @@
 {
  "version": "2.2.4",
  "songName": "Roses Erect",
-  "charter": "Jenny + Fabs + SpazKid",
+  "charter": "Jenny Crowe + fabs + Spazkid",
  "artist": "Kawai Sprite",
  "looped": false,
  "playData": {
@ -12,7 +12,7 @@
      "opponent": "senpai-angry",
      "instrumental": "erect"
    },
-    "stage": "schoolErect",
+    "stage": "school",
    "noteStyle": "pixel",
    "ratings": { "erect": 8, "nightmare": 9 },
    "album": "volume3",
--- a/charts/roses/roses-metadata-pico.json
+++ b/charts/roses/roses-metadata-pico.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "songName": "Roses Pico",
  "artist": "Xploshi (ft. Saruky)",
-  "charter": "Fabs + Spazkid",
+  "charter": "fabs + Spazkid",
  "divisions": 96,
  "looped": false,
  "playData": {
@ -10,12 +10,12 @@
    "difficulties": ["easy", "normal", "hard"],
    "characters": {
      "player": "pico-pixel",
-      "girlfriend": "gf-pixel",
+      "girlfriend": "nene-pixel",
      "opponent": "senpai-angry",
      "instrumental": "pico",
      "altInstrumentals": []
    },
-    "stage": "schoolPico",
+    "stage": "school",
    "noteStyle": "pixel",
    "album": "expansion2",
    "ratings": { "easy": 2, "normal": 3, "hard": 4 },
--- a/charts/roses/roses-metadata.json
+++ b/charts/roses/roses-metadata.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "timeFormat": "ms",
  "artist": "Kawai Sprite",
-  "charter": "ninjamuffin99 + MtH",
+  "charter": "ninjamuffin99 + MtH + Spazkid",
  "offsets": {
    "instrumental": 0.0,
    "altInstrumentals": {
--- a/charts/satin-panties/satin-panties-chart-erect.json
+++ b/charts/satin-panties/satin-panties-chart-erect.json
@ -1,6 +1,6 @@
 {
  "version": "2.0.0",
-  "scrollSpeed": { "nightmare": 2.6, "erect": 2.4 },
+  "scrollSpeed": { "erect": 2.4, "nightmare": 2.6 },
  "events": [
    {
      "t": 0,
--- a/charts/satin-panties/satin-panties-chart.json
+++ b/charts/satin-panties/satin-panties-chart.json
--- a/charts/satin-panties/satin-panties-metadata.json
+++ b/charts/satin-panties/satin-panties-metadata.json
@ -2,7 +2,7 @@
  "version": "2.2.4",
  "songName": "Satin Panties",
  "artist": "Kawai Sprite",
-  "charter": "ninjamuffin99 + MtH",
+  "charter": "ninjamuffin99 + MtH + Spazkid",
  "timeFormat": "ms",
  "timeChanges": [{ "t": 0, "bpm": 110, "n": 4, "d": 4, "bt": [4, 4, 4, 4] }],
  "playData": {
--- a/charts/senpai/senpai-chart-erect.json
+++ b/charts/senpai/senpai-chart-erect.json
@ -1,6 +1,6 @@
 {
  "version": "2.0.0",
-  "scrollSpeed": { "nightmare": 2.8, "erect": 2.2 },
+  "scrollSpeed": { "erect": 2.2, "nightmare": 2.8 },
  "events": [
    { "t": 0, "e": "FocusCamera", "v": { "char": 1, "x": 0, "y": 0 } },
    {
--- a/charts/senpai/senpai-chart-pico.json
+++ b/charts/senpai/senpai-chart-pico.json
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
entar	ce1f6b91f5	test	2025-09-10 09:36:09 +07:00
entar	e09d1281ac	Removed the annoying window reopening for all states unless it's actually needed	2025-09-10 09:03:35 +07:00
entar	2df39b8b44	last test	2025-09-09 17:42:25 +07:00
entar	50ebf7a177	help me	2025-09-09 17:20:38 +07:00
entar	c737117f7f	im dying	2025-09-09 17:16:24 +07:00
entar	a142674fa0	Tesst	2025-09-09 17:12:01 +07:00
entar	5d8b9a9d94	no 3.0	2025-09-09 17:04:00 +07:00
entar	432d4ab146	no. 2.0	2025-09-09 16:51:10 +07:00
entar	82af59b5a2	no.	2025-09-09 16:34:09 +07:00
entar	4aae94f39e	test	2025-09-09 16:18:38 +07:00
entar	ae8d0dd85c	no,	2025-09-09 16:16:15 +07:00
entar	e921eeb430	Weekend-1 main	2025-09-09 16:15:38 +07:00
entar	b1bf0c5406	yes.	2025-09-06 20:43:02 +07:00
entar	0fb3f33525	Fixed stage names and changed philly stage zoom	2025-09-06 11:10:57 +07:00
AGU	dfbb9ca3eb	New menuBG.png and added Senpai/Sprit pixel icons - Also made "something" like 4% more based. NOTE: Nene-Pixel still does not fucking exist	2025-09-05 15:50:58 -04:00
entar	de86d3df8d	Sum stuff	2025-09-05 15:32:36 +07:00
entar	f10cc491be	Merge branch 'main' of https://git.squog.ru/TaggedCrew/TaggedEngine	2025-09-05 15:30:48 +07:00
entar	578ce18fba	Fixed anchor on Sprites, added GameJolt login and 2 trophies.	2025-09-05 15:30:44 +07:00
entar	f7655cb484	Fixed anchor on Sprites, added gamejolt login and 2 trophies	2025-09-05 15:30:19 +07:00
entar	9e3592f6e4	Update README.md	2025-09-05 15:00:15 +07:00
entar	f16a2e5317	Fixes for pico mixes metadatas, fixes for christmas	2025-09-04 18:07:06 +07:00
AGU	53105d1250	nothing special 👀	2025-09-02 15:25:09 -04:00
entar	deecf600f9	V-slice 0.4.8 charts	2025-09-02 17:15:10 +07:00
entar	d6520f8644	Some stuff for freeplay	2025-09-02 15:57:52 +07:00
entar	4868be724f	Moved players strumlines closer to their v-slice positions, changed schoolEvil to use the new resizing method	2025-09-02 12:58:41 +07:00
entar	bf4c3642bc	pico-pixel	2025-09-02 07:36:54 +07:00
AGU	1d951b2c9c	Added Roses/Senpai Pico Mix also removed the nonexistent thorns pico mix	2025-09-01 13:11:45 -04:00
AGU	67aa712f88	Thorns is functional erect stages at a later date becuase i had to MANUALLY convert spirit's txt file into an xml	2025-09-01 13:00:16 -04:00
entar	316b92552d	NO WATER, also put strumlines closer together yeah, also made holdnotes actually match the cover positions now	2025-09-01 23:13:01 +07:00
entar	d08037727c	Sprite:Resize(size)	2025-09-01 21:53:00 +07:00
entar	d5fb8f56ee	Fixed bf-pixel, gf-pixel, senpai, senpai-angry, added school stage, added senpai and roses, converted weebTrees from some unforseen format to XML	2025-09-01 21:29:55 +07:00
entar	19c86a3284	Added SetCameraBop	2025-09-01 21:27:45 +07:00
entar	cb654a69a1	Made camera look actually more like v-slice	2025-09-01 14:32:36 +07:00
entar	b53356f55f	pruple end hold > purple hold end (Again)	2025-09-01 10:06:07 +07:00
entar	e01b4f213b	Fixed "Double-bop" on some songs like High Erect	2025-09-01 10:03:32 +07:00
AGU	e478c47208	ok maybe IM the idiot	2025-08-31 21:46:46 -04:00
AGU	bf9b74c1f0	Entar forgot to consider Nightmare part of the Erect variation	2025-08-31 21:22:55 -04:00
entar	d763c4fd9a	Fixed volume getting stuck when you lower it	2025-08-31 15:12:14 +07:00
entar	abf7d1fd9e	Nene character everywhere except week 2, stress pico mix without intro and outro cutscenes	2025-08-31 14:59:58 +07:00
entar	77fa5257c1	Merge branch 'main' of https://git.squog.ru/TaggedCrew/TaggedEngine	2025-08-31 08:42:03 +07:00
entar	ad7f4fcc3b	Nene stuff and some week 6 assets for the future	2025-08-31 08:40:51 +07:00
AGU	7a72d4aaad	Added the tankErect stage and assets. tip: dont ask IDK about secretEVILvariable	2025-08-30 17:47:06 -04:00
entar	b109fe2161	Started adding nene visualizer (currently only on dadbattle pico mix), added characterscripts (characters/character.lua)	2025-08-27 12:54:34 +07:00
entar	96288d1c90	Add art/README.md	2025-08-22 15:03:06 +07:00
entar	7dd2742093	Merge branch 'main' of https://git.squog.ru/TaggedCrew/TaggedEngine	2025-08-22 14:48:26 +07:00
entar	73553488cf	Added sustain covers	2025-08-22 14:48:23 +07:00
entar	031aa3cc1e	Update README.md	2025-08-22 12:14:07 +07:00
entar	b6df88d066	readme credits arts	2025-08-22 11:47:05 +07:00
entar	691e9b802b	Update README.md	2025-08-22 11:29:02 +07:00
entar	6bf7e07578	Art	2025-08-22 11:05:19 +07:00
entar	a0c326e9db	Update README.md	2025-08-22 10:54:22 +07:00
entar	2c78554e21	Fixed pico, Fixed Dad, Fixed spooky kids, removed last silly billy and dbtg mentions	2025-08-18 21:26:21 +07:00
				`@ -0,0 +1 @@`
				`# REMOVE THIS WHEN BUILDING, THIS EXISTS PURELY FOR THE SQUOGIT PAGE`