diff --git a/charts/songs-bf.lua b/charts/songs-bf.lua index 586b55e..e1c1b76 100644 --- a/charts/songs-bf.lua +++ b/charts/songs-bf.lua @@ -176,7 +176,7 @@ local order = { "erect", "nightmare" }, - icon = "bfpixel" + icon = "senpaipixel" }, { name = "roses", @@ -187,7 +187,7 @@ local order = { "erect", "nightmare" }, - icon = "bfpixel" + icon = "senpaipixel" }, { name = "thorns", @@ -198,7 +198,7 @@ local order = { "erect", "nightmare" }, - icon = "bfpixel" + icon = "spiritpixel" }, { name = "ugh", diff --git a/charts/songs-pico.lua b/charts/songs-pico.lua index 5bb3762..6face28 100644 --- a/charts/songs-pico.lua +++ b/charts/songs-pico.lua @@ -96,7 +96,7 @@ local order = { "normal", "hard" }, - icon = "bfpixel" + icon = "senpaipixel" }, { name = "roses", @@ -105,7 +105,7 @@ local order = { "normal", "hard" }, - icon = "bfpixel" + icon = "senpaipixel" }, { name = "ugh", diff --git a/images/menuBG.png b/images/menuBG.png index 6586348..83bf0a5 100644 Binary files a/images/menuBG.png and b/images/menuBG.png differ diff --git a/sprites/freeplay/icons/senpaipixel.json b/sprites/freeplay/icons/senpaipixel.json new file mode 100644 index 0000000..ce4ce51 --- /dev/null +++ b/sprites/freeplay/icons/senpaipixel.json @@ -0,0 +1,75 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "idle0001", + "_x": "36", + "_y": "0", + "_width": "36", + "_height": "34", + "_frameX": "-10", + "_frameY": "-4", + "_frameWidth": "55", + "_frameHeight": "40" + }, + { + "_name": "confirm0001", + "_x": "36", + "_y": "0", + "_width": "36", + "_height": "34", + "_frameX": "-10", + "_frameY": "-4", + "_frameWidth": "55", + "_frameHeight": "40" + }, + { + "_name": "confirm0002", + "_x": "0", + "_y": "0", + "_width": "36", + "_height": "35", + "_frameX": "-10", + "_frameY": "-3", + "_frameWidth": "55", + "_frameHeight": "40" + }, + { + "_name": "confirm0003", + "_x": "108", + "_y": "0", + "_width": "36", + "_height": "33", + "_frameX": "-9", + "_frameY": "-4", + "_frameWidth": "55", + "_frameHeight": "40" + }, + { + "_name": "confirm0004", + "_x": "72", + "_y": "0", + "_width": "36", + "_height": "34", + "_frameX": "-9", + "_frameY": "-4", + "_frameWidth": "55", + "_frameHeight": "40" + }, + { + "_name": "confirm-hold0001", + "_x": "72", + "_y": "0", + "_width": "36", + "_height": "34", + "_frameX": "-9", + "_frameY": "-4", + "_frameWidth": "55", + "_frameHeight": "40" + } + ], + "_imagePath": "senpaipixel.png", + "_width": "144", + "_height": "35" + } +} \ No newline at end of file diff --git a/sprites/freeplay/icons/senpaipixel.xml b/sprites/freeplay/icons/senpaipixel.xml deleted file mode 100644 index 5872bb2..0000000 --- a/sprites/freeplay/icons/senpaipixel.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/sprites/freeplay/icons/spiritpixel.json b/sprites/freeplay/icons/spiritpixel.json new file mode 100644 index 0000000..1b0c33f --- /dev/null +++ b/sprites/freeplay/icons/spiritpixel.json @@ -0,0 +1,75 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "idle0001", + "_x": "0", + "_y": "39", + "_width": "37", + "_height": "38", + "_frameX": "-7", + "_frameY": "-1", + "_frameWidth": "45", + "_frameHeight": "40" + }, + { + "_name": "confirm0001", + "_x": "0", + "_y": "39", + "_width": "37", + "_height": "38", + "_frameX": "-7", + "_frameY": "-1", + "_frameWidth": "45", + "_frameHeight": "40" + }, + { + "_name": "confirm0002", + "_x": "0", + "_y": "115", + "_width": "36", + "_height": "34", + "_frameX": "-8", + "_frameY": "-6", + "_frameWidth": "45", + "_frameHeight": "40" + }, + { + "_name": "confirm0003", + "_x": "0", + "_y": "0", + "_width": "38", + "_height": "39", + "_frameX": "-4", + "_frameY": "-1", + "_frameWidth": "45", + "_frameHeight": "40" + }, + { + "_name": "confirm0004", + "_x": "0", + "_y": "77", + "_width": "36", + "_height": "38", + "_frameX": "-6", + "_frameY": "-2", + "_frameWidth": "45", + "_frameHeight": "40" + }, + { + "_name": "confirm-hold0001", + "_x": "0", + "_y": "77", + "_width": "36", + "_height": "38", + "_frameX": "-6", + "_frameY": "-2", + "_frameWidth": "45", + "_frameHeight": "40" + } + ], + "_imagePath": "spiritpixel.png", + "_width": "38", + "_height": "149" + } +} \ No newline at end of file diff --git a/sprites/freeplay/icons/spiritpixel.xml b/sprites/freeplay/icons/spiritpixel.xml deleted file mode 100644 index 8afba17..0000000 --- a/sprites/freeplay/icons/spiritpixel.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/states/secretcodestate.lua b/states/secretcodestate.lua index bfb29b2..3fdfa9e 100644 --- a/states/secretcodestate.lua +++ b/states/secretcodestate.lua @@ -52,8 +52,6 @@ return function() if enteringLetter == 6 then if enteredCode == "somari" then state.changeState("playstate", "somari", "normal") --i dont think this can load erect sonds but idk - elseif enteredCode == "grndad" then - ominousText = "Same umbrella, different vain." else letter1 = "" letter2 = "" @@ -61,8 +59,14 @@ return function() letter4 = "" letter5 = "" letter6 = "" - ominousText = "Invalid." enteringLetter = 1 + if enteredCode == "grndad" then + ominousText = "Same umbrella, different vain." + elseif enteredCode == "pride" then + ominousText = "HELL FUCKING YEAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH" + else + ominousText = "Invalid." + end end elseif enteringLetter > 6 then enteringLetter = enteringLetter + 1