diff --git a/charts/high/high-erect.json b/charts/high/high-erect.json index 2b43ad0..bd3fcaa 100644 --- a/charts/high/high-erect.json +++ b/charts/high/high-erect.json @@ -4169,7 +4169,7 @@ "mustHitSection": true } ], - "gfVersion": "gf", + "gfVersion": "gf-car", "song": "High Erect", "needsVoices": true, "stage": "limo", diff --git a/charts/target-practice/target-practice-hard.json b/charts/target-practice/target-practice-hard.json index d514461..9245ea8 100644 --- a/charts/target-practice/target-practice-hard.json +++ b/charts/target-practice/target-practice-hard.json @@ -11281,7 +11281,7 @@ "sections": 0, "needsVoices": true, "validScore": true, - "stage": "arenanew", + "stage": "stage", "bpm": 245, "speed": 3.1 } diff --git a/modules/states/playstate.lua b/modules/states/playstate.lua index 6af05ab..bc2238a 100644 --- a/modules/states/playstate.lua +++ b/modules/states/playstate.lua @@ -142,7 +142,6 @@ local function state(songName, songDifficulty) ratings[rating] = ratings[rating] + 1 characters.bf:PlayAnimation("sing"..directions[closestNote.direction]) closestNote.pressed = true - receptors[dir]:PlayAnimation(string.lower(directions[dir]).." confirm", 5, false) notes[closestIndex] = nil closestNote:destroy() end @@ -234,7 +233,7 @@ local function state(songName, songDifficulty) ratings.miss = ratings.miss + 1 end else - note.sprite.position = myTypes.Vector2(20 + 79 * (note.direction - 1), settings.Downscroll and 430 - (note.position-elapsed) or note.position - elapsed) + note.sprite.position = myTypes.Vector2(50 + 79 * (note.direction - 1), settings.Downscroll and 430 - (note.position-elapsed) or note.position - elapsed) if note.position - elapsed < 10 then notes[index] = nil if section.altAnim or note.altAnim then @@ -248,12 +247,6 @@ local function state(songName, songDifficulty) end end - for index, receptor in next, receptors do - if receptor.ended and receptor.animation ~= "arrow"..directions[index] and receptor.animation ~= "" then - receptor:PlayAnimation("arrow"..directions[index], 25, false) - end - end - zoom = myMath.lerp(zoom, 1, .05) @@ -332,8 +325,8 @@ local function state(songName, songDifficulty) end for i = 0, 3 do - local receptor = myTypes.Sprite("sprites/NOTE_assets.png", "sprites/NOTE_assets.json") - receptor:PlayAnimation("arrow"..directions[i+1], 25, false) + local receptor = myTypes.Rect("sprites/NOTE_assets.png", "sprites/NOTE_assets.json") + receptor:Frame("arrow"..directions[i+1], 0) receptor.position = myTypes.Vector2(600 + (79* i), settings.Downscroll and 0 or 430) @@ -346,7 +339,7 @@ local function state(songName, songDifficulty) local receptor = myTypes.Rect("sprites/NOTE_assets.png", "sprites/NOTE_assets.json") receptor:Frame("arrow"..directions[i+1], 0) - receptor.position = myTypes.Vector2(20 + 79 * i, settings.Downscroll and 0 or 430) + receptor.position = myTypes.Vector2(50 + 79 * i, settings.Downscroll and 0 or 430) receptor.ui = true -- So it doesnt move with the camera. end diff --git a/sprites/NOTE_assets.json b/sprites/NOTE_assets.json index b338985..beaab5b 100644 --- a/sprites/NOTE_assets.json +++ b/sprites/NOTE_assets.json @@ -3,198 +3,250 @@ "SubTexture": [ { "_name": "arrowLEFT0000", - "_x": "488", - "_y": "238", - "_width": "155", - "_height": "158" + "_x": "683", + "_y": "1", + "_width": "154", + "_height": "157", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "155", + "_frameHeight": "158" }, { "_name": "arrowDOWN0000", - "_x": "647", - "_y": "238", - "_width": "157", - "_height": "155" + "_x": "830", + "_y": "589", + "_width": "156", + "_height": "154", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "157", + "_frameHeight": "155" }, { "_name": "arrowRIGHT0000", - "_x": "808", - "_y": "238", - "_width": "155", - "_height": "157" + "_x": "835", + "_y": "321", + "_width": "154", + "_height": "156", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "155", + "_frameHeight": "157" }, { "_name": "arrowUP0000", - "_x": "323", - "_y": "240", + "_x": "846", + "_y": "161", "_width": "157", - "_height": "154" + "_height": "153", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "157", + "_frameHeight": "154" }, { "_name": "blue hold end0000", - "_x": "1062", - "_y": "452", - "_width": "51", - "_height": "64" + "_x": "152", + "_y": "947", + "_width": "50", + "_height": "63", + "_frameX": "-1", + "_frameY": "-1", + "_frameWidth": "51", + "_frameHeight": "64" }, { "_name": "blue hold piece0000", - "_x": "1282", - "_y": "457", - "_width": "51", - "_height": "44" + "_x": "757", + "_y": "976", + "_width": "50", + "_height": "44", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "51", + "_frameHeight": "44" }, { "_name": "blue0000", - "_x": "0", - "_y": "240", - "_width": "158", - "_height": "154" + "_x": "670", + "_y": "668", + "_width": "157", + "_height": "154", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "158", + "_frameHeight": "154" }, { "_name": "down confirm0000", - "_x": "0", - "_y": "0", - "_width": "240", - "_height": "236", - "_frameX": "-12", - "_frameY": "0", - "_frameWidth": "240", + "_x": "1", + "_y": "1", + "_width": "235", + "_height": "222", + "_frameX": "-8", + "_frameY": "-7", + "_frameWidth": "246", "_frameHeight": "236" }, { "_name": "down confirm0001", - "_x": "244", - "_y": "0", - "_width": "240", - "_height": "236", - "_frameX": "-12", - "_frameY": "0", - "_frameWidth": "240", + "_x": "1", + "_y": "450", + "_width": "229", + "_height": "219", + "_frameX": "-8", + "_frameY": "-7", + "_frameWidth": "246", "_frameHeight": "236" }, { "_name": "down confirm0002", - "_x": "1206", - "_y": "235", - "_width": "221", - "_height": "218", - "_frameX": "-12", - "_frameY": "-12", - "_frameWidth": "240", + "_x": "233", + "_y": "669", + "_width": "210", + "_height": "200", + "_frameX": "-14", + "_frameY": "-17", + "_frameWidth": "246", "_frameHeight": "236" }, { "_name": "down confirm0003", - "_x": "1206", - "_y": "235", - "_width": "221", - "_height": "218", - "_frameX": "-12", - "_frameY": "-12", - "_frameWidth": "240", + "_x": "233", + "_y": "669", + "_width": "210", + "_height": "200", + "_frameX": "-14", + "_frameY": "-17", + "_frameWidth": "246", "_frameHeight": "236" }, { "_name": "down press0000", - "_x": "805", - "_y": "399", - "_width": "143", + "_x": "364", + "_y": "885", + "_width": "142", "_height": "139", - "_frameX": "-4", + "_frameX": "-5", "_frameY": "-3", "_frameWidth": "150", "_frameHeight": "146" }, { "_name": "down press0001", - "_x": "805", - "_y": "399", - "_width": "143", + "_x": "364", + "_y": "885", + "_width": "142", "_height": "139", - "_frameX": "-4", + "_frameX": "-5", "_frameY": "-3", "_frameWidth": "150", "_frameHeight": "146" }, { "_name": "down press0002", - "_x": "1898", - "_y": "0", - "_width": "150", - "_height": "146" + "_x": "830", + "_y": "746", + "_width": "148", + "_height": "146", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "150", + "_frameHeight": "146" }, { "_name": "down press0003", - "_x": "1898", - "_y": "0", - "_width": "150", - "_height": "146" + "_x": "830", + "_y": "746", + "_width": "148", + "_height": "146", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "150", + "_frameHeight": "146" }, { "_name": "green hold end0000", - "_x": "1007", - "_y": "452", - "_width": "51", - "_height": "64" + "_x": "651", + "_y": "976", + "_width": "50", + "_height": "63", + "_frameX": "-1", + "_frameY": "-1", + "_frameWidth": "51", + "_frameHeight": "64" }, { "_name": "green hold piece0000", - "_x": "1227", - "_y": "457", - "_width": "51", - "_height": "44" + "_x": "675", + "_y": "589", + "_width": "50", + "_height": "44", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "51", + "_frameHeight": "44" }, { "_name": "green0000", - "_x": "162", - "_y": "240", + "_x": "675", + "_y": "432", "_width": "157", - "_height": "154" + "_height": "154", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "157", + "_frameHeight": "154" }, { "_name": "left confirm0000", - "_x": "972", - "_y": "0", - "_width": "230", - "_height": "232" + "_x": "459", + "_y": "1", + "_width": "221", + "_height": "214", + "_frameX": "-2", + "_frameY": "-7", + "_frameWidth": "230", + "_frameHeight": "232" }, { "_name": "left confirm0001", - "_x": "1438", - "_y": "233", - "_width": "220", - "_height": "222", - "_frameX": "-5", - "_frameY": "-5", + "_x": "455", + "_y": "668", + "_width": "212", + "_height": "214", + "_frameX": "-7", + "_frameY": "-7", "_frameWidth": "230", "_frameHeight": "232" }, { "_name": "left confirm0002", - "_x": "1438", - "_y": "0", - "_width": "227", - "_height": "229", - "_frameX": "-2", - "_frameY": "-1", + "_x": "469", + "_y": "218", + "_width": "217", + "_height": "211", + "_frameX": "-5", + "_frameY": "-8", "_frameWidth": "230", "_frameHeight": "232" }, { "_name": "left confirm0003", - "_x": "1438", - "_y": "0", - "_width": "227", - "_height": "229", - "_frameX": "-2", - "_frameY": "-1", + "_x": "469", + "_y": "218", + "_width": "217", + "_height": "211", + "_frameX": "-5", + "_frameY": "-8", "_frameWidth": "230", "_frameHeight": "232" }, { "_name": "left press0000", - "_x": "1898", - "_y": "449", + "_x": "509", + "_y": "885", "_width": "139", "_height": "142", "_frameX": "-4", @@ -204,8 +256,8 @@ }, { "_name": "left press0001", - "_x": "1898", - "_y": "449", + "_x": "509", + "_y": "885", "_width": "139", "_height": "142", "_frameX": "-4", @@ -215,478 +267,700 @@ }, { "_name": "left press0002", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0003", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0004", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0005", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0006", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0007", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0008", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0009", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0010", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0011", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0012", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0013", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0014", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0015", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0016", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0017", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0018", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "left press0019", - "_x": "1898", - "_y": "150", + "_x": "670", + "_y": "825", "_width": "146", - "_height": "149" + "_height": "148", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "146", + "_frameHeight": "149" }, { "_name": "pruple end hold0000", - "_x": "1117", - "_y": "452", - "_width": "51", - "_height": "64" + "_x": "704", + "_y": "976", + "_width": "50", + "_height": "63", + "_frameX": "-1", + "_frameY": "-1", + "_frameWidth": "51", + "_frameHeight": "64" }, { "_name": "purple hold piece0000", - "_x": "1337", - "_y": "457", - "_width": "51", - "_height": "44" + "_x": "728", + "_y": "589", + "_width": "50", + "_height": "44", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "51", + "_frameHeight": "44" }, { "_name": "purple0000", - "_x": "0", - "_y": "398", + "_x": "689", + "_y": "161", "_width": "154", - "_height": "157" + "_height": "157", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "154", + "_frameHeight": "157" }, { "_name": "red hold end0000", - "_x": "952", - "_y": "452", - "_width": "51", - "_height": "64" + "_x": "152", + "_y": "880", + "_width": "50", + "_height": "64", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "51", + "_frameHeight": "64" }, { "_name": "red hold piece0000", - "_x": "1172", - "_y": "457", - "_width": "51", - "_height": "44" + "_x": "689", + "_y": "321", + "_width": "50", + "_height": "44", + "_frameX": "-1", + "_frameY": "-0", + "_frameWidth": "51", + "_frameHeight": "44" }, { "_name": "red0000", - "_x": "647", - "_y": "397", + "_x": "840", + "_y": "1", "_width": "154", - "_height": "157" + "_height": "157", + "_frameX": "-0", + "_frameY": "-0", + "_frameWidth": "154", + "_frameHeight": "157" }, { "_name": "right confirm0000", - "_x": "1669", - "_y": "0", - "_width": "225", - "_height": "228", - "_frameX": "-1", - "_frameY": "-2", + "_x": "455", + "_y": "450", + "_width": "217", + "_height": "215", + "_frameX": "-3", + "_frameY": "-9", "_frameWidth": "228", "_frameHeight": "231" }, { "_name": "right confirm0001", - "_x": "1669", - "_y": "232", - "_width": "225", - "_height": "228", - "_frameX": "-1", - "_frameY": "-2", + "_x": "239", + "_y": "1", + "_width": "217", + "_height": "218", + "_frameX": "-3", + "_frameY": "-5", "_frameWidth": "228", "_frameHeight": "231" }, { "_name": "right confirm0002", - "_x": "1206", - "_y": "0", - "_width": "228", - "_height": "231" + "_x": "233", + "_y": "450", + "_width": "219", + "_height": "216", + "_frameX": "-3", + "_frameY": "-7", + "_frameWidth": "228", + "_frameHeight": "231" }, { "_name": "right confirm0003", - "_x": "1206", - "_y": "0", - "_width": "228", - "_height": "231" + "_x": "233", + "_y": "450", + "_width": "219", + "_height": "216", + "_frameX": "-3", + "_frameY": "-7", + "_frameWidth": "228", + "_frameHeight": "231" }, { "_name": "right press0000", - "_x": "469", - "_y": "400", - "_width": "139", - "_height": "142", + "_x": "997", + "_y": "1", + "_width": "138", + "_height": "141", "_frameX": "-3", - "_frameY": "-7", + "_frameY": "-8", "_frameWidth": "149", "_frameHeight": "152" }, { "_name": "right press0001", - "_x": "469", - "_y": "400", - "_width": "139", - "_height": "142", + "_x": "997", + "_y": "1", + "_width": "138", + "_height": "141", "_frameX": "-3", - "_frameY": "-7", + "_frameY": "-8", "_frameWidth": "149", "_frameHeight": "152" }, { "_name": "right press0002", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0003", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0004", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0005", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0006", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0007", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0008", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0009", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0010", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0011", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0012", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0013", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0014", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0015", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0016", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0017", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0018", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0019", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0020", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0021", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0022", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0023", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0024", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0025", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "right press0026", - "_x": "316", - "_y": "398", - "_width": "149", - "_height": "152" + "_x": "1", + "_y": "880", + "_width": "148", + "_height": "151", + "_frameX": "-0", + "_frameY": "-1", + "_frameWidth": "149", + "_frameHeight": "152" }, { "_name": "up confirm0000", - "_x": "488", - "_y": "0", - "_width": "238", - "_height": "234" + "_x": "1", + "_y": "226", + "_width": "234", + "_height": "221", + "_frameX": "-4", + "_frameY": "-7", + "_frameWidth": "238", + "_frameHeight": "234" }, { "_name": "up confirm0001", - "_x": "730", - "_y": "0", - "_width": "238", - "_height": "234" + "_x": "238", + "_y": "226", + "_width": "228", + "_height": "221", + "_frameX": "-4", + "_frameY": "-7", + "_frameWidth": "238", + "_frameHeight": "234" }, { "_name": "up confirm0002", - "_x": "972", - "_y": "236", - "_width": "216", - "_height": "212", - "_frameX": "-11", - "_frameY": "-11", + "_x": "1", + "_y": "672", + "_width": "204", + "_height": "205", + "_frameX": "-16", + "_frameY": "-13", "_frameWidth": "238", "_frameHeight": "234" }, { "_name": "up confirm0003", - "_x": "972", - "_y": "236", - "_width": "216", - "_height": "212", - "_frameX": "-11", - "_frameY": "-11", + "_x": "1", + "_y": "672", + "_width": "204", + "_height": "205", + "_frameX": "-16", + "_frameY": "-13", "_frameWidth": "238", "_frameHeight": "234" }, { "_name": "up press0000", - "_x": "1898", - "_y": "303", + "_x": "819", + "_y": "895", "_width": "144", - "_height": "142", + "_height": "141", "_frameX": "-6", - "_frameY": "-4", + "_frameY": "-5", "_frameWidth": "154", "_frameHeight": "151" }, { "_name": "up press0001", - "_x": "1898", - "_y": "303", + "_x": "819", + "_y": "895", "_width": "144", - "_height": "142", + "_height": "141", "_frameX": "-6", - "_frameY": "-4", + "_frameY": "-5", "_frameWidth": "154", "_frameHeight": "151" }, { "_name": "up press0002", - "_x": "158", - "_y": "398", - "_width": "154", - "_height": "151" + "_x": "208", + "_y": "872", + "_width": "153", + "_height": "150", + "_frameX": "-1", + "_frameY": "-1", + "_frameWidth": "154", + "_frameHeight": "151" }, { "_name": "up press0003", - "_x": "158", - "_y": "398", - "_width": "154", - "_height": "151" + "_x": "208", + "_y": "872", + "_width": "153", + "_height": "150", + "_frameX": "-1", + "_frameY": "-1", + "_frameWidth": "154", + "_frameHeight": "151" } ], - "_imagePath": "NOTE_assets.png" + "_imagePath": "texture.png", + "_width": "1136", + "_height": "1040" } } \ No newline at end of file diff --git a/sprites/NOTE_assets.png b/sprites/NOTE_assets.png index 39ea40a..df0de2d 100644 Binary files a/sprites/NOTE_assets.png and b/sprites/NOTE_assets.png differ diff --git a/stages/stage.lua b/stages/stage.lua index 4026599..73fdf67 100644 --- a/stages/stage.lua +++ b/stages/stage.lua @@ -3,12 +3,13 @@ local myTypes = require("modules.types") return { onCreate = function(song) local back = myTypes.Image("images/stage/stageback.png") - back.position = myTypes.Vector2(-1000, 50) + back.position = myTypes.Vector2(-800, 50) local front = myTypes.Image("images/stage/stagefront.png") front.position = myTypes.Vector2(-900, 1000) local curtains = myTypes.Image("images/stage/stagecurtains.png") - curtains.position = myTypes.Vector2(-1000, 50) + curtains.position = myTypes.Vector2(-1150, 50) + curtains.modifier = 1.3 end } \ No newline at end of file