diff --git a/charts/songs.lua b/charts/songs.lua index 1b6ebd1..f25aad5 100644 --- a/charts/songs.lua +++ b/charts/songs.lua @@ -131,6 +131,14 @@ return { "erect" }, }, + { + name = "winter-horrorland", + difficulties = { + "easy", + "normal", + "hard" + }, + }, { name = "ugh", difficulties = { diff --git a/images/diff/diffList.json b/images/diff/diffList.json new file mode 100644 index 0000000..1d2096c --- /dev/null +++ b/images/diff/diffList.json @@ -0,0 +1,326 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "easy0000", + "_x": "0", + "_y": "152", + "_width": "207", + "_height": "77", + "_frameX": "2", + "_frameY": "2", + "_frameWidth": "203", + "_frameHeight": "73" + }, + { + "_name": "erect0000", + "_x": "0", + "_y": "0", + "_width": "238", + "_height": "77", + "_frameX": "2", + "_frameY": "2", + "_frameWidth": "234", + "_frameHeight": "73" + }, + { + "_name": "hard0000", + "_x": "0", + "_y": "303", + "_width": "214", + "_height": "72", + "_frameX": "2", + "_frameY": "2", + "_frameWidth": "210", + "_frameHeight": "68" + }, + { + "_name": "normal0000", + "_x": "238", + "_y": "0", + "_width": "218", + "_height": "73", + "_frameX": "2", + "_frameY": "2", + "_frameWidth": "214", + "_frameHeight": "69" + }, + { + "_name": "nightmare0000", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0001", + "_x": "238", + "_y": "73", + "_width": "212", + "_height": "75", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0002", + "_x": "0", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0003", + "_x": "238", + "_y": "148", + "_width": "212", + "_height": "75", + "_frameX": "1", + "_frameY": "2", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0004", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0005", + "_x": "456", + "_y": "73", + "_width": "211", + "_height": "73", + "_frameX": "1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0006", + "_x": "0", + "_y": "229", + "_width": "213", + "_height": "74", + "_frameX": "2", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0007", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0008", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0009", + "_x": "238", + "_y": "73", + "_width": "212", + "_height": "75", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0010", + "_x": "0", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0011", + "_x": "238", + "_y": "148", + "_width": "212", + "_height": "75", + "_frameX": "1", + "_frameY": "2", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0012", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0013", + "_x": "456", + "_y": "73", + "_width": "211", + "_height": "73", + "_frameX": "1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0014", + "_x": "0", + "_y": "229", + "_width": "213", + "_height": "74", + "_frameX": "2", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0015", + "_x": "456", + "_y": "0", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0016", + "_x": "238", + "_y": "148", + "_width": "212", + "_height": "75", + "_frameX": "1", + "_frameY": "2", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0017", + "_x": "456", + "_y": "73", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0018", + "_x": "0", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0019", + "_x": "213", + "_y": "229", + "_width": "213", + "_height": "74", + "_frameX": "2", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0020", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0021", + "_x": "456", + "_y": "73", + "_width": "211", + "_height": "73", + "_frameX": "1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0022", + "_x": "0", + "_y": "77", + "_width": "213", + "_height": "75", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0023", + "_x": "211", + "_y": "375", + "_width": "211", + "_height": "73", + "_frameX": "-1", + "_frameY": "1", + "_frameWidth": "211", + "_frameHeight": "74" + }, + { + "_name": "nightmare0024", + "_x": "238", + "_y": "148", + "_width": "212", + "_height": "75", + "_frameX": "1", + "_frameY": "2", + "_frameWidth": "211", + "_frameHeight": "74" + } + ], + "_imagePath": "diffList.png" + } +} \ No newline at end of file diff --git a/images/diff/diffList.png b/images/diff/diffList.png new file mode 100644 index 0000000..36a2872 Binary files /dev/null and b/images/diff/diffList.png differ diff --git a/main.lua b/main.lua index dd2fbea..a4e24c3 100644 --- a/main.lua +++ b/main.lua @@ -16,6 +16,8 @@ local curDiffList = songs[1].difficulties local curDiff = songs[1].difficulties[1] local curDiffInd = 1 +local diffIMG + local curState = nil local stateLoaded = false @@ -50,6 +52,11 @@ local function setup() arrow.layer = 1 arrow.resize = myTypes.Vector2(.5,.5) + diffIMG = myTypes.Sprite("images/diff/diffList.png", "images/diff/diffList.json") --look there was a different plan going in + diffIMG:PlayAnimation(curDiff, 24, false) + diffIMG.position = myTypes.Vector2(200, 320) + diffIMG.layer = 2 + freaky:play() end @@ -73,6 +80,7 @@ function love.update(dt) elseif not curState then myTypes.render.cameraTarget = myTypes.Vector2(0,0) myTypes.updateSprites(dt) + end end @@ -89,7 +97,7 @@ function love.draw() love.graphics.print({{0,0,0}, song.name}, font, 300 + (8 * (index - evilCurIndex)), love.graphics:getHeight()/2 + (50 * (index - evilCurIndex - .7)), 0, 1, 1, 200) end - love.graphics.print({{0,0,0}, curDiff}, font, 400, 660) + --love.graphics.print({{0,0,0}, curDiff}, font, 400, 660) love.graphics.print( {{0,0,0}, string.format("Left: %s, Down: %s, Up: %s, Right: %s \nDownscroll: %s", @@ -145,6 +153,7 @@ function love.keypressed(key, un, is) end curDiffInd = 1 curDiff = curDiffList[1] + diffIMG:PlayAnimation(curDiff, 24, true) scroll:stop() scroll:play() elseif key == "up" then --the solution was so stupid easy @@ -163,6 +172,7 @@ function love.keypressed(key, un, is) end curDiffInd = 1 curDiff = curDiffList[1] + diffIMG:PlayAnimation(curDiff, 24, true) scroll:stop() scroll:play() elseif key == "right" then @@ -173,6 +183,7 @@ function love.keypressed(key, un, is) curDiff = curDiffList[1] curDiffInd = 1 end + diffIMG:PlayAnimation(curDiff, 24, true) scroll:stop() scroll:play() elseif key == "left" then @@ -183,6 +194,7 @@ function love.keypressed(key, un, is) curDiff = curDiffList[#curDiffList] curDiffInd = #curDiffList end + diffIMG:PlayAnimation(curDiff, 24, true) scroll:stop() scroll:play() elseif tonumber(key) and tonumber(key) < 5 then diff --git a/stages/mallEvil.json b/stages/mallEvil.json new file mode 100644 index 0000000..ecd9233 --- /dev/null +++ b/stages/mallEvil.json @@ -0,0 +1,16 @@ +{ + "directory": "", + "defaultZoom": 1, + "isPixelStage": false, + + "boyfriend": [577, -100], + "girlfriend": [50, 254], + "opponent": [-350, 50], + "hide_girlfriend": false, + + "camera_boyfriend": [50, -500], + "camera_opponent": [700, 100], + "camera_girlfriend": [0, 0], + "camera_speed": 1, + "default": true +} diff --git a/stages/mallEvil.lua b/stages/mallEvil.lua new file mode 100644 index 0000000..418209c --- /dev/null +++ b/stages/mallEvil.lua @@ -0,0 +1,31 @@ +local myTypes = require("modules.types") + +local snow = {} + +--ERVIL LE BARON +--RED CIRCLE +--RED ARROW +--RED CIRCLE +--evilfuckeduplebronjames.png +return { + onCreate = function(song) + local bg = myTypes.Image("images/mall/evil/evilBG.png") + bg.position = myTypes.Vector2(-300, -500) + bg.resize = myTypes.Vector2(0.9, 0.9) + bg.modifier = 0.2 + bg.layer = -15 + + local christmasTree = myTypes.Image("images/mall/evil/evilTree.png") + christmasTree.position = myTypes.Vector2(400, -300) + christmasTree.modifier = 0.4 + christmasTree.layer = -14 + + for i = 1, 4 do --repeating cus fuck rectangles + local snowPart = myTypes.Image("images/mall/evil/evilSnow.png") + snowPart.position = myTypes.Vector2(-1000 , 480 + i * 200) + snowPart.layer = -6 - i + + snow[i] = snowPart + end + end +} \ No newline at end of file