Light debloat + Some Missing Content

Also, limoErect and mall stages.

ALSO ALSO song selection is less weird.

charts/eggnog/eggnog-hard.json

@@ -2927,7 +2927,7 @@
 		"player2": "parents-christmas",
 		"player3": null,
 		"song": "Eggnog",
-		"stage": "stage",
+		"stage": "mall",
 		"needsVoices": true,
 		"validScore": true,
 		"bpm": 150,

charts/high/high-erect.json

@@ -4172,7 +4172,7 @@
 		"gfVersion": "gf-car",
 		"song": "High Erect",
 		"needsVoices": true,
-		"stage": "limo",
+		"stage": "limoErect",
 		"validScore": true,
 		"bpm": 125,
 		"speed": 2.4

charts/satin-panties/satin-panties-erect.json

@@ -1,6 +1,6 @@
 {
 	"song": {
-		"player1": "bf",
+		"player1": "bf-car",
 		"player2": "mom-car",
 		"notes": [
 			{
@@ -6630,7 +6630,7 @@
 		"events": [],
 		"player3": null,
 		"song": "Satin Panties Erect",
-		"stage": "limo",
+		"stage": "limoErect",
 		"needsVoices": true,
 		"validScore": true,
 		"speed": 2.6,

charts/satin-panties/satin-panties-nightmare.json

@@ -1,6 +1,6 @@
 {
 	"song": {
-		"player1": "bf",
+		"player1": "bf-car",
 		"player2": "mom-car",
 		"notes": [
 			{
@@ -6225,7 +6225,7 @@
 		"events": [],
 		"player3": null,
 		"song": "Satin Panties Erect",
-		"stage": "limo",
+		"stage": "limoErect",
 		"needsVoices": true,
 		"validScore": true,
 		"speed": 2.6,

charts/songs.lua

@@ -4,7 +4,7 @@ return {
         difficulties = {
             "easy",
             "normal",
-            "hard",
+            "hard"
         },
     },
     {
@@ -13,7 +13,8 @@ return {
             "easy",
             "normal",
             "hard",
-            "erect"
+            "erect",
+            "nightmare"
         },
     },
     {
@@ -22,7 +23,8 @@ return {
             "easy",
             "normal",
             "hard",
-            "erect"
+            "erect",
+            "nightmare"
         },
     },
     {
@@ -31,7 +33,18 @@ return {
             "easy",
             "normal",
             "hard",
-            "erect"
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "spookeez",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
         },
     },
     {
@@ -40,7 +53,56 @@ return {
             "easy",
             "normal",
             "hard",
-            "erect"
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "monster",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard"
+        },
+    },
+    {
+        name = "pico",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "philly-nice",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "blammed",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "satin-panties",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
         },
     },
     {
@@ -50,6 +112,7 @@ return {
             "normal",
             "hard",
             "erect",
+            "nightmare"
         },
     },
     {
@@ -60,4 +123,114 @@ return {
             "hard"
         },
     },
+    {
+        name = "cocoa",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "eggnog",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "winter-horrorland",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard"
+        },
+    },
+    {
+        name = "senpai",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "roses",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "thorns",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "ugh",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "guns",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard"
+        },
+    },
+    {
+        name = "stress",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard"
+        },
+    },
+    {
+        name = "darnell",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard",
+            "erect",
+            "nightmare"
+        },
+    },
+    {
+        name = "lit-up",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard"
+        },
+    },
+    {
+        name = "2hot",
+        difficulties = {
+            "easy",
+            "normal",
+            "hard"
+        },
+    }
 }

main.lua

@@ -125,6 +125,7 @@ function love.keypressed(key, un, is)
           else
             curDiffList = curSong.difficulties
           end
+          curDiffInd = 1
           curDiff = curDiffList[1]
         elseif key == "right" then
           if curDiffList[curDiffInd + 1] then
@@ -134,6 +135,17 @@ function love.keypressed(key, un, is)
             curDiff = curDiffList[1]
             curDiffInd = 1
           end
+        elseif key == "left" then
+          if curDiffList[curDiffInd - 1] then
+            curDiff = curDiffList[curDiffInd - 1]
+            curDiffInd = curDiffInd - 1
+          elseif curDiffList[5] then
+            curDiff = curDiffList[5]
+            curDiffInd = 5
+          else
+            curDiff = curDiffList[3]
+            curDiffInd = 3
+          end
         elseif tonumber(key) and tonumber(key) < 5 then
           if key == "0" then
             settings.Downscroll = not settings.Downscroll

sprites/limo/erect/bgLimo.json

@@ -0,0 +1,51 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "background limo blue0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2196",
+				"_height": "383",
+				"_frameX": "-20",
+				"_frameY": "-6",
+				"_frameWidth": "2216",
+				"_frameHeight": "389"
+			},
+			{
+				"_name": "background limo blue0001",
+				"_x": "0",
+				"_y": "388",
+				"_width": "2216",
+				"_height": "385",
+				"_frameX": "0",
+				"_frameY": "-4",
+				"_frameWidth": "2216",
+				"_frameHeight": "389"
+			},
+			{
+				"_name": "background limo blue0002",
+				"_x": "0",
+				"_y": "778",
+				"_width": "2196",
+				"_height": "388",
+				"_frameX": "-20",
+				"_frameY": "-1",
+				"_frameWidth": "2216",
+				"_frameHeight": "389"
+			},
+			{
+				"_name": "background limo blue0003",
+				"_x": "0",
+				"_y": "1171",
+				"_width": "2196",
+				"_height": "389",
+				"_frameX": "-20",
+				"_frameY": "0",
+				"_frameWidth": "2216",
+				"_frameHeight": "389"
+			}
+		],
+		"_imagePath": "bgLimo.png"
+	}
+}

sprites/limo/erect/limoDrive.json

@@ -0,0 +1,47 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "Limo stage0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2052",
+				"_height": "654",
+				"_frameX": "0",
+				"_frameY": "-3",
+				"_frameWidth": "2052",
+				"_frameHeight": "657"
+			},
+			{
+				"_name": "Limo stage0001",
+				"_x": "0",
+				"_y": "659",
+				"_width": "2052",
+				"_height": "655",
+				"_frameX": "0",
+				"_frameY": "-2",
+				"_frameWidth": "2052",
+				"_frameHeight": "657"
+			},
+			{
+				"_name": "Limo stage0002",
+				"_x": "0",
+				"_y": "1319",
+				"_width": "2052",
+				"_height": "657"
+			},
+			{
+				"_name": "Limo stage0003",
+				"_x": "0",
+				"_y": "1981",
+				"_width": "2052",
+				"_height": "654",
+				"_frameX": "0",
+				"_frameY": "-3",
+				"_frameWidth": "2052",
+				"_frameHeight": "657"
+			}
+		],
+		"_imagePath": "limoDrive.png"
+	}
+}

sprites/limo/erect/shooting star.json

@@ -0,0 +1,337 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "shooting star idle0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "1",
+				"_height": "1",
+				"_frameX": "1",
+				"_frameY": "1",
+				"_frameWidth": "1",
+				"_frameHeight": "1"
+			},
+			{
+				"_name": "shooting star0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "19",
+				"_height": "17",
+				"_frameX": "-312",
+				"_frameY": "-1",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0001",
+				"_x": "0",
+				"_y": "0",
+				"_width": "19",
+				"_height": "17",
+				"_frameX": "-312",
+				"_frameY": "-1",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0002",
+				"_x": "24",
+				"_y": "0",
+				"_width": "20",
+				"_height": "19",
+				"_frameX": "-307",
+				"_frameY": "0",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0003",
+				"_x": "24",
+				"_y": "0",
+				"_width": "20",
+				"_height": "19",
+				"_frameX": "-307",
+				"_frameY": "0",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0004",
+				"_x": "49",
+				"_y": "0",
+				"_width": "23",
+				"_height": "22",
+				"_frameX": "-303",
+				"_frameY": "0",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0005",
+				"_x": "49",
+				"_y": "0",
+				"_width": "23",
+				"_height": "22",
+				"_frameX": "-303",
+				"_frameY": "0",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0006",
+				"_x": "77",
+				"_y": "0",
+				"_width": "24",
+				"_height": "22",
+				"_frameX": "-298",
+				"_frameY": "-2",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0007",
+				"_x": "77",
+				"_y": "0",
+				"_width": "24",
+				"_height": "22",
+				"_frameX": "-298",
+				"_frameY": "-2",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0008",
+				"_x": "106",
+				"_y": "0",
+				"_width": "64",
+				"_height": "37",
+				"_frameX": "-253",
+				"_frameY": "-10",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0009",
+				"_x": "106",
+				"_y": "0",
+				"_width": "64",
+				"_height": "37",
+				"_frameX": "-253",
+				"_frameY": "-10",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0010",
+				"_x": "175",
+				"_y": "0",
+				"_width": "180",
+				"_height": "93",
+				"_frameX": "-119",
+				"_frameY": "-18",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0011",
+				"_x": "175",
+				"_y": "0",
+				"_width": "180",
+				"_height": "93",
+				"_frameX": "-119",
+				"_frameY": "-18",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0012",
+				"_x": "0",
+				"_y": "98",
+				"_width": "212",
+				"_height": "136",
+				"_frameX": "-46",
+				"_frameY": "-32",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0013",
+				"_x": "0",
+				"_y": "98",
+				"_width": "212",
+				"_height": "136",
+				"_frameX": "-46",
+				"_frameY": "-32",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0014",
+				"_x": "217",
+				"_y": "98",
+				"_width": "219",
+				"_height": "153",
+				"_frameX": "-15",
+				"_frameY": "-44",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0015",
+				"_x": "217",
+				"_y": "98",
+				"_width": "219",
+				"_height": "153",
+				"_frameX": "-15",
+				"_frameY": "-44",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0016",
+				"_x": "0",
+				"_y": "256",
+				"_width": "196",
+				"_height": "146",
+				"_frameX": "-5",
+				"_frameY": "-60",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0017",
+				"_x": "0",
+				"_y": "256",
+				"_width": "196",
+				"_height": "146",
+				"_frameX": "-5",
+				"_frameY": "-60",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0018",
+				"_x": "201",
+				"_y": "256",
+				"_width": "68",
+				"_height": "73",
+				"_frameX": "-3",
+				"_frameY": "-139",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0019",
+				"_x": "201",
+				"_y": "256",
+				"_width": "68",
+				"_height": "73",
+				"_frameX": "-3",
+				"_frameY": "-139",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0020",
+				"_x": "274",
+				"_y": "256",
+				"_width": "56",
+				"_height": "61",
+				"_frameX": "-2",
+				"_frameY": "-153",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0021",
+				"_x": "274",
+				"_y": "256",
+				"_width": "56",
+				"_height": "61",
+				"_frameX": "-2",
+				"_frameY": "-153",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0022",
+				"_x": "335",
+				"_y": "256",
+				"_width": "50",
+				"_height": "57",
+				"_frameX": "0",
+				"_frameY": "-160",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0023",
+				"_x": "335",
+				"_y": "256",
+				"_width": "50",
+				"_height": "57",
+				"_frameX": "0",
+				"_frameY": "-160",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0024",
+				"_x": "390",
+				"_y": "256",
+				"_width": "14",
+				"_height": "14",
+				"_frameX": "0",
+				"_frameY": "-203",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0025",
+				"_x": "390",
+				"_y": "256",
+				"_width": "14",
+				"_height": "14",
+				"_frameX": "0",
+				"_frameY": "-203",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0026",
+				"_x": "409",
+				"_y": "256",
+				"_width": "12",
+				"_height": "13",
+				"_frameX": "0",
+				"_frameY": "-205",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0027",
+				"_x": "409",
+				"_y": "256",
+				"_width": "12",
+				"_height": "13",
+				"_frameX": "0",
+				"_frameY": "-205",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			},
+			{
+				"_name": "shooting star0028",
+				"_x": "426",
+				"_y": "256",
+				"_width": "0",
+				"_height": "0",
+				"_frameX": "-139",
+				"_frameY": "-520",
+				"_frameWidth": "331",
+				"_frameHeight": "218"
+			}
+		],
+		"_imagePath": "shooting star.png"
+	}
+}

sprites/mall/bottomBop.json

@@ -0,0 +1,161 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "Bottom Level Boppers0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "1975",
+				"_height": "661",
+				"_frameX": "-3",
+				"_frameY": "-13",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0001",
+				"_x": "0",
+				"_y": "0",
+				"_width": "1975",
+				"_height": "661",
+				"_frameX": "-3",
+				"_frameY": "-13",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0002",
+				"_x": "1985",
+				"_y": "0",
+				"_width": "1972",
+				"_height": "664",
+				"_frameX": "-4",
+				"_frameY": "-10",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0003",
+				"_x": "1985",
+				"_y": "0",
+				"_width": "1972",
+				"_height": "664",
+				"_frameX": "-4",
+				"_frameY": "-10",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0004",
+				"_x": "0",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "672",
+				"_frameX": "0",
+				"_frameY": "-2",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0005",
+				"_x": "0",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "672",
+				"_frameX": "0",
+				"_frameY": "-2",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0006",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0007",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0008",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0009",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0010",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0011",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0012",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			},
+			{
+				"_name": "Bottom Level Boppers0013",
+				"_x": "1983",
+				"_y": "674",
+				"_width": "1973",
+				"_height": "674",
+				"_frameX": "0",
+				"_frameY": "0",
+				"_frameWidth": "1978",
+				"_frameHeight": "674"
+			}
+		],
+		"_imagePath": "bottomBop.png"
+	}
+}

sprites/mall/erect/bottomBop.json

@@ -0,0 +1,161 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "bottomBop0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2253",
+				"_height": "690",
+				"_frameX": "0",
+				"_frameY": "-16",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0001",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2253",
+				"_height": "690",
+				"_frameX": "0",
+				"_frameY": "-16",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0002",
+				"_x": "2258",
+				"_y": "0",
+				"_width": "2250",
+				"_height": "697",
+				"_frameX": "-3",
+				"_frameY": "-9",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0003",
+				"_x": "2258",
+				"_y": "0",
+				"_width": "2250",
+				"_height": "697",
+				"_frameX": "-3",
+				"_frameY": "-9",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0004",
+				"_x": "0",
+				"_y": "702",
+				"_width": "2249",
+				"_height": "704",
+				"_frameX": "-3",
+				"_frameY": "-2",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0005",
+				"_x": "2254",
+				"_y": "702",
+				"_width": "2249",
+				"_height": "704",
+				"_frameX": "-3",
+				"_frameY": "-2",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0006",
+				"_x": "0",
+				"_y": "1411",
+				"_width": "2250",
+				"_height": "705",
+				"_frameX": "-2",
+				"_frameY": "-1",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0007",
+				"_x": "2255",
+				"_y": "1411",
+				"_width": "2250",
+				"_height": "705",
+				"_frameX": "-2",
+				"_frameY": "-1",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0008",
+				"_x": "0",
+				"_y": "2121",
+				"_width": "2250",
+				"_height": "706",
+				"_frameX": "-2",
+				"_frameY": "0",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0009",
+				"_x": "0",
+				"_y": "2121",
+				"_width": "2250",
+				"_height": "706",
+				"_frameX": "-2",
+				"_frameY": "0",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0010",
+				"_x": "2255",
+				"_y": "2121",
+				"_width": "2250",
+				"_height": "706",
+				"_frameX": "-2",
+				"_frameY": "0",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0011",
+				"_x": "2255",
+				"_y": "2121",
+				"_width": "2250",
+				"_height": "706",
+				"_frameX": "-2",
+				"_frameY": "0",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0012",
+				"_x": "2255",
+				"_y": "2121",
+				"_width": "2250",
+				"_height": "706",
+				"_frameX": "-2",
+				"_frameY": "0",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			},
+			{
+				"_name": "bottomBop0013",
+				"_x": "2255",
+				"_y": "2121",
+				"_width": "2250",
+				"_height": "706",
+				"_frameX": "-2",
+				"_frameY": "0",
+				"_frameWidth": "2253",
+				"_frameHeight": "706"
+			}
+		],
+		"_imagePath": "bottomBop.png"
+	}
+}

sprites/mall/erect/upperBop.json

@@ -0,0 +1,161 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "upperBop0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2259",
+				"_height": "288",
+				"_frameX": "0",
+				"_frameY": "-16",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0001",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2259",
+				"_height": "288",
+				"_frameX": "0",
+				"_frameY": "-16",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0002",
+				"_x": "0",
+				"_y": "293",
+				"_width": "2249",
+				"_height": "294",
+				"_frameX": "-5",
+				"_frameY": "-10",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0003",
+				"_x": "0",
+				"_y": "293",
+				"_width": "2249",
+				"_height": "294",
+				"_frameX": "-5",
+				"_frameY": "-10",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0004",
+				"_x": "0",
+				"_y": "592",
+				"_width": "2247",
+				"_height": "301",
+				"_frameX": "-6",
+				"_frameY": "-2",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0005",
+				"_x": "0",
+				"_y": "592",
+				"_width": "2247",
+				"_height": "301",
+				"_frameX": "-6",
+				"_frameY": "-2",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0006",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0007",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0008",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0009",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0010",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0011",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0012",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			},
+			{
+				"_name": "upperBop0013",
+				"_x": "0",
+				"_y": "898",
+				"_width": "2243",
+				"_height": "302",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2259",
+				"_frameHeight": "303"
+			}
+		],
+		"_imagePath": "upperBop.png"
+	}
+}

sprites/mall/santa.json

@@ -0,0 +1,161 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "santa idle in fear0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "663",
+				"_height": "722",
+				"_frameX": "0",
+				"_frameY": "-25",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0001",
+				"_x": "673",
+				"_y": "0",
+				"_width": "662",
+				"_height": "722",
+				"_frameX": "-1",
+				"_frameY": "-25",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0002",
+				"_x": "1345",
+				"_y": "0",
+				"_width": "658",
+				"_height": "724",
+				"_frameX": "-3",
+				"_frameY": "-24",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0003",
+				"_x": "2013",
+				"_y": "0",
+				"_width": "658",
+				"_height": "723",
+				"_frameX": "-3",
+				"_frameY": "-24",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0004",
+				"_x": "2681",
+				"_y": "0",
+				"_width": "650",
+				"_height": "732",
+				"_frameX": "-7",
+				"_frameY": "-16",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0005",
+				"_x": "3341",
+				"_y": "0",
+				"_width": "650",
+				"_height": "732",
+				"_frameX": "-7",
+				"_frameY": "-16",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0006",
+				"_x": "0",
+				"_y": "742",
+				"_width": "650",
+				"_height": "735",
+				"_frameX": "-7",
+				"_frameY": "-13",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0007",
+				"_x": "660",
+				"_y": "742",
+				"_width": "650",
+				"_height": "735",
+				"_frameX": "-7",
+				"_frameY": "-13",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0008",
+				"_x": "1320",
+				"_y": "742",
+				"_width": "650",
+				"_height": "747",
+				"_frameX": "-7",
+				"_frameY": "-1",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0009",
+				"_x": "1980",
+				"_y": "742",
+				"_width": "650",
+				"_height": "748",
+				"_frameX": "-7",
+				"_frameY": "0",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0010",
+				"_x": "2640",
+				"_y": "742",
+				"_width": "650",
+				"_height": "748",
+				"_frameX": "-7",
+				"_frameY": "0",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0011",
+				"_x": "3300",
+				"_y": "742",
+				"_width": "650",
+				"_height": "748",
+				"_frameX": "-7",
+				"_frameY": "0",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0012",
+				"_x": "1980",
+				"_y": "742",
+				"_width": "650",
+				"_height": "748",
+				"_frameX": "-7",
+				"_frameY": "0",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			},
+			{
+				"_name": "santa idle in fear0013",
+				"_x": "2640",
+				"_y": "742",
+				"_width": "650",
+				"_height": "748",
+				"_frameX": "-7",
+				"_frameY": "0",
+				"_frameWidth": "663",
+				"_frameHeight": "748"
+			}
+		],
+		"_imagePath": "santa.png"
+	}
+}

sprites/mall/upperBop.json

@@ -0,0 +1,150 @@
+{
+	"TextureAtlas": {
+		"SubTexture": [
+			{
+				"_name": "Upper Crowd Bob0000",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2247",
+				"_height": "291",
+				"_frameX": "0",
+				"_frameY": "-16",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0001",
+				"_x": "0",
+				"_y": "0",
+				"_width": "2247",
+				"_height": "291",
+				"_frameX": "0",
+				"_frameY": "-16",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0002",
+				"_x": "0",
+				"_y": "301",
+				"_width": "2237",
+				"_height": "297",
+				"_frameX": "-5",
+				"_frameY": "-10",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0003",
+				"_x": "0",
+				"_y": "301",
+				"_width": "2237",
+				"_height": "297",
+				"_frameX": "-5",
+				"_frameY": "-10",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0004",
+				"_x": "0",
+				"_y": "608",
+				"_width": "2235",
+				"_height": "304",
+				"_frameX": "-6",
+				"_frameY": "-3",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0005",
+				"_x": "0",
+				"_y": "608",
+				"_width": "2235",
+				"_height": "304",
+				"_frameX": "-6",
+				"_frameY": "-3",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0006",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0007",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0008",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0009",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0010",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0011",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			},
+			{
+				"_name": "Upper Crowd Bob0012",
+				"_x": "0",
+				"_y": "922",
+				"_width": "2231",
+				"_height": "307",
+				"_frameX": "-8",
+				"_frameY": "0",
+				"_frameWidth": "2247",
+				"_frameHeight": "307"
+			}
+		],
+		"_imagePath": "upperBop.png"
+	}
+}

stages/limoErect.json

@@ -0,0 +1,15 @@
+{
+	"directory": "week4",
+	"defaultZoom": 0.9,
+	"isPixelStage": false,
+
+	"boyfriend": [500, -140],
+	"girlfriend": [470, -50],
+	"opponent": [100, 100],
+	"hide_girlfriend": false,
+
+	"camera_boyfriend": [-200, 0],
+	"camera_opponent": [0, 0],
+	"camera_girlfriend": [0, 0],
+	"camera_speed": 1
+}

stages/limoErect.lua

@@ -0,0 +1,81 @@
+local myTypes = require("modules.types")
+
+local dancers = {}
+
+local curSong 
+
+local shootingStar
+
+local shootingStarCountdown = love.math.random(20, 40)
+
+return {
+    onCreate = function(song)
+        curSong = song
+
+        dancers = {}
+
+        local sunset = myTypes.Image("images/limo/erect/limoSunset.png")
+        sunset.position = myTypes.Vector2(-100, 0)
+        sunset.resize = myTypes.Vector2(1, 1)
+        sunset.modifier = 0.1
+
+        shootingStar = myTypes.Sprite("sprites/limo/erect/shooting star.png", "sprites/limo/erect/shooting star.json")
+        shootingStar:PlayAnimation("shooting star idle", 24, true)
+        shootingStar.position = myTypes.Vector2(200, 0)
+        shootingStar.modifier = 0.12
+
+        local road = myTypes.Sprite("sprites/limo/limoRoad.png", "sprites/limo/limoRoad.json")
+        road:PlayAnimation("COOLROAD", 24, true)
+        road.position = myTypes.Vector2(-300, 230)
+        road.modifier = 0.6
+
+        --nevermind
+        --[[local backFog = myTypes.Image("images/limo/erect/mistBack.png")
+        backFog.position = myTypes.Vector2(-100, 0)
+        backFog.modifier = 0.6]]
+
+        local limobg = myTypes.Sprite("sprites/limo/erect/bgLimo.png", "sprites/limo/erect/bgLimo.json")
+        limobg:PlayAnimation("background limo blue", 24, true)
+        limobg.position = myTypes.Vector2(-100, 350)
+        limobg.modifier = 0.6
+
+        local limoDriver = myTypes.Sprite("sprites/limo/erect/limoDrive.png", "sprites/limo/erect/limoDrive.json")
+        limoDriver:PlayAnimation("Limo stage", 24, true)
+        limoDriver.position = myTypes.Vector2(-300, 450)
+
+        for i = 1, 5 do
+            local dancer = myTypes.Sprite("sprites/limo/limoDancer.png", "sprites/limo/limoDancer.json")
+            dancer.modifier = .6
+            dancer:PlayAnimation("bg dancer sketch PINK", 24, false)
+            dancer.position = myTypes.Vector2(-10 + i * 150, 155)
+
+            dancers[i] = dancer
+        end
+    end,
+
+    onBeat = function(beat)
+        if beat % 2 == 0 then
+            for index, dancer in next, dancers do
+                dancer.allowedFrames = {
+                    1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
+                }
+                dancer.allowedFrame = 1
+                dancer:PlayAnimation("bg dancer sketch PINK", 24, false)
+            end
+        else
+            for index, dancer in next, dancers do
+                dancer.allowedFrames = {
+                    16,17,18,19,20,21,22,23,24,25,26,27,28,29
+                }
+                dancer.allowedFrame = 1
+                dancer:PlayAnimation("bg dancer sketch PINK", 24, false)
+            end
+            
+        end
+        shootingStarCountdown = shootingStarCountdown - 1
+        if shootingStarCountdown <=0 then
+            shootingStar:PlayAnimation("shooting star", 24, false)
+            shootingStarCountdown = love.math.random(20, 40)
+        end
+    end
+}

stages/mall.json

@@ -0,0 +1,16 @@
+{
+	"directory": "",
+	"defaultZoom": 0.8,
+	"isPixelStage": false,
+
+	"boyfriend": [577, -100],
+	"girlfriend": [50, 254],
+	"opponent": [-350, -100],
+	"hide_girlfriend": false,
+
+	"camera_boyfriend": [50, -500],
+	"camera_opponent": [-50, 150],
+	"camera_girlfriend": [0, 0],
+	"camera_speed": 1,
+	"default": true
+}

stages/mall.lua

@@ -0,0 +1,51 @@
+local myTypes = require("modules.types")
+local upperBop, bottomBop, santa
+
+local snow = {}
+
+return {
+    onCreate = function(song)
+        local bg = myTypes.Image("images/mall/bgWalls.png")
+        bg.position = myTypes.Vector2(-600, -440)
+        bg.resize = myTypes.Vector2(0.8, 0.8)
+        bg.modifier = 0.2
+
+        upperBop = myTypes.Sprite("sprites/mall/upperBop.png", "sprites/mall/upperBop.json")
+        upperBop:PlayAnimation("Upper Crowd Bob", 24, false)
+        upperBop.position = myTypes.Vector2(-240, -40)
+        upperBop.modifier = 0.33
+        upperBop.resize = myTypes.Vector2(0.85, 0.85)
+
+        local escalator = myTypes.Image("images/mall/bgEscalator.png")
+        escalator.position = myTypes.Vector2(-1100, -540)
+        escalator.resize = myTypes.Vector2(0.9, 0.9)
+        escalator.modifier = 0.3
+
+        local christmasTree = myTypes.Image("images/mall/christmasTree.png")
+        christmasTree.position = myTypes.Vector2(370, -250)
+        christmasTree.modifier = 0.4
+
+        for i = 1, 4 do --repeating cus fuck rectangles
+            local snowPart = myTypes.Image("images/mall/fgSnow.png")
+            snowPart.position = myTypes.Vector2(-1150 , 480 + i * 200)
+
+            snow[i] = snowPart
+        end
+
+        bottomBop = myTypes.Sprite("sprites/mall/bottomBop.png", "sprites/mall/bottomBop.json")
+        bottomBop:PlayAnimation("Bottom Level Boppers", 24, false)
+        bottomBop.position = myTypes.Vector2(-300, 120)
+        bottomBop.modifier = 0.9
+
+        santa = myTypes.Sprite("sprites/mall/santa.png", "sprites/mall/santa.json")
+        santa:PlayAnimation("santa idle in fear", 24, false)
+        santa.position = myTypes.Vector2(-600, 140)
+    end,
+    onBeat = function(beat)
+        if beat % 2 == 0 then
+            upperBop:PlayAnimation("Upper Crowd Bob", 24, false)
+            bottomBop:PlayAnimation("Bottom Level Boppers", 24, false)
+            santa:PlayAnimation("santa idle in fear", 24, false)
+        end
+    end
+}