From 4d986aef0872368713a45c2aeeecc2ae738a278c Mon Sep 17 00:00:00 2001 From: AGU <55attemps@gmail.com> Date: Sat, 7 Jun 2025 10:17:02 -0400 Subject: [PATCH] Mall Erect + Song Select "Fix" literally all we had to do was copy paste our difficulty select code and swap some variables around why didnt we try this sooner --- charts/cocoa/cocoa-erect.json | 2 +- charts/cocoa/cocoa-nightmare.json | 2 +- charts/eggnog/eggnog-erect.json | 2 +- charts/eggnog/eggnog-nightmare.json | 2 +- main.lua | 10 ++++++ stages/mallErect.json | 16 +++++++++ stages/mallErect.lua | 56 +++++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 stages/mallErect.json create mode 100644 stages/mallErect.lua diff --git a/charts/cocoa/cocoa-erect.json b/charts/cocoa/cocoa-erect.json index 737d791..92af129 100644 --- a/charts/cocoa/cocoa-erect.json +++ b/charts/cocoa/cocoa-erect.json @@ -4319,7 +4319,7 @@ "offset": 0, "song": "Cocoa Erect", "validScore": true, - "stage": "mall", + "stage": "mallErect", "needsVoices": true, "format": "psych_v1", "speed": 2.9, diff --git a/charts/cocoa/cocoa-nightmare.json b/charts/cocoa/cocoa-nightmare.json index 9b3d38e..87f51aa 100644 --- a/charts/cocoa/cocoa-nightmare.json +++ b/charts/cocoa/cocoa-nightmare.json @@ -3778,7 +3778,7 @@ "validScore": true, "needsVoices": true, "generatedBy": "Psych Engine v1.0-prerelease - Chart Editor V-Slice Importer", - "stage": "mall", + "stage": "mallErect", "bpm": 174, "format": "psych_v1_convert", "speed": 2.7, diff --git a/charts/eggnog/eggnog-erect.json b/charts/eggnog/eggnog-erect.json index ac81bf8..9b42de1 100644 --- a/charts/eggnog/eggnog-erect.json +++ b/charts/eggnog/eggnog-erect.json @@ -4677,7 +4677,7 @@ "events": [], "player3": null, "song": "Eggnog Erect", - "stage": "mall", + "stage": "mallErect", "needsVoices": true, "validScore": true, "speed": 2.5, diff --git a/charts/eggnog/eggnog-nightmare.json b/charts/eggnog/eggnog-nightmare.json index 2ab6320..8a9cb1b 100644 --- a/charts/eggnog/eggnog-nightmare.json +++ b/charts/eggnog/eggnog-nightmare.json @@ -4532,7 +4532,7 @@ "song": "Eggnog Erect", "validScore": true, "needsVoices": true, - "stage": "mall", + "stage": "mallErect", "bpm": 140, "speed": 2.7 } diff --git a/main.lua b/main.lua index 3db735f..525eef9 100644 --- a/main.lua +++ b/main.lua @@ -127,6 +127,16 @@ function love.keypressed(key, un, is) end curDiffInd = 1 curDiff = curDiffList[1] + elseif key == "up" then --the solution was so stupid easy + if songs[curIndex - 1] then + curSong = songs[curIndex - 1] + curIndex = curIndex - 1 + else + curSong = songs[1] + curIndex = 1 + end + curDiffInd = 1 + curDiff = curDiffList[1] elseif key == "right" then if curDiffList[curDiffInd + 1] then curDiff = curDiffList[curDiffInd + 1] diff --git a/stages/mallErect.json b/stages/mallErect.json new file mode 100644 index 0000000..ae9e7a7 --- /dev/null +++ b/stages/mallErect.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 +} diff --git a/stages/mallErect.lua b/stages/mallErect.lua new file mode 100644 index 0000000..8ed5ffe --- /dev/null +++ b/stages/mallErect.lua @@ -0,0 +1,56 @@ +local myTypes = require("modules.types") +local upperBop, bottomBop, santa + +local snow = {} + +return { + onCreate = function(song) + local bg = myTypes.Image("images/mall/erect/bgWalls.png") + bg.position = myTypes.Vector2(-650, -440) + bg.resize = myTypes.Vector2(0.9, 0.9) + bg.modifier = 0.2 + + upperBop = myTypes.Sprite("sprites/mall/erect/upperBop.png", "sprites/mall/erect/upperBop.json") + upperBop:PlayAnimation("upperBop", 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/erect/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/erect/christmasTree.png") + christmasTree.position = myTypes.Vector2(370, -250) + christmasTree.modifier = 0.4 + + local fog = myTypes.Image("images/mall/erect/white.png") + fog.position = myTypes.Vector2(-1100, 200) + fog.resize = myTypes.Vector2(0.9, 0.9) + fog.modifier = 0.85 + + 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/erect/bottomBop.png", "sprites/mall/erect/bottomBop.json") + bottomBop:PlayAnimation("bottomBop", 24, false) + bottomBop.position = myTypes.Vector2(-350, 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("upperBop", 24, false) + bottomBop:PlayAnimation("bottomBop", 24, false) + santa:PlayAnimation("santa idle in fear", 24, false) + end + end +} \ No newline at end of file