diff --git a/src/love/images/dds/NOTE_assets.dds b/src/love/images/dds/NOTE_assets.dds new file mode 100644 index 00000000..ade9c7a3 Binary files /dev/null and b/src/love/images/dds/NOTE_assets.dds differ diff --git a/src/love/images/dds/week5/dearest-duo.dds b/src/love/images/dds/characters/dearest-duo.dds similarity index 100% rename from src/love/images/dds/week5/dearest-duo.dds rename to src/love/images/dds/characters/dearest-duo.dds diff --git a/src/love/images/dds/girlfriend.dds b/src/love/images/dds/characters/girlfriend.dds similarity index 100% rename from src/love/images/dds/girlfriend.dds rename to src/love/images/dds/characters/girlfriend.dds diff --git a/src/love/images/dds/holdCovers.dds b/src/love/images/dds/holdCovers.dds new file mode 100644 index 00000000..2190f977 Binary files /dev/null and b/src/love/images/dds/holdCovers.dds differ diff --git a/src/love/images/dds/icons/icon-bf-christmas.dds b/src/love/images/dds/icons/icon-bf-christmas.dds new file mode 100644 index 00000000..b54f9056 Binary files /dev/null and b/src/love/images/dds/icons/icon-bf-christmas.dds differ diff --git a/src/love/images/dds/icons/icon-bf-old.dds b/src/love/images/dds/icons/icon-bf-old.dds new file mode 100644 index 00000000..49370e50 Binary files /dev/null and b/src/love/images/dds/icons/icon-bf-old.dds differ diff --git a/src/love/images/dds/icons/icon-bf.dds b/src/love/images/dds/icons/icon-bf.dds new file mode 100644 index 00000000..b54f9056 Binary files /dev/null and b/src/love/images/dds/icons/icon-bf.dds differ diff --git a/src/love/images/dds/icons/icon-dad.dds b/src/love/images/dds/icons/icon-dad.dds new file mode 100644 index 00000000..ea9f7a88 Binary files /dev/null and b/src/love/images/dds/icons/icon-dad.dds differ diff --git a/src/love/images/dds/icons/icon-darnell.dds b/src/love/images/dds/icons/icon-darnell.dds new file mode 100644 index 00000000..d53b8fd5 Binary files /dev/null and b/src/love/images/dds/icons/icon-darnell.dds differ diff --git a/src/love/images/dds/icons/icon-face.dds b/src/love/images/dds/icons/icon-face.dds new file mode 100644 index 00000000..9c837dd3 Binary files /dev/null and b/src/love/images/dds/icons/icon-face.dds differ diff --git a/src/love/images/dds/icons/icon-gf.dds b/src/love/images/dds/icons/icon-gf.dds new file mode 100644 index 00000000..89e42dbf Binary files /dev/null and b/src/love/images/dds/icons/icon-gf.dds differ diff --git a/src/love/images/dds/icons/icon-mom.dds b/src/love/images/dds/icons/icon-mom.dds new file mode 100644 index 00000000..c2be5243 Binary files /dev/null and b/src/love/images/dds/icons/icon-mom.dds differ diff --git a/src/love/images/dds/icons/icon-monster.dds b/src/love/images/dds/icons/icon-monster.dds new file mode 100644 index 00000000..763e6a03 Binary files /dev/null and b/src/love/images/dds/icons/icon-monster.dds differ diff --git a/src/love/images/dds/icons/icon-parents-christmas.dds b/src/love/images/dds/icons/icon-parents-christmas.dds new file mode 100644 index 00000000..5c5e229f Binary files /dev/null and b/src/love/images/dds/icons/icon-parents-christmas.dds differ diff --git a/src/love/images/dds/icons/icon-parents.dds b/src/love/images/dds/icons/icon-parents.dds new file mode 100644 index 00000000..5c5e229f Binary files /dev/null and b/src/love/images/dds/icons/icon-parents.dds differ diff --git a/src/love/images/dds/icons/icon-pico.dds b/src/love/images/dds/icons/icon-pico.dds new file mode 100644 index 00000000..bae29058 Binary files /dev/null and b/src/love/images/dds/icons/icon-pico.dds differ diff --git a/src/love/images/dds/icons/icon-spooky.dds b/src/love/images/dds/icons/icon-spooky.dds new file mode 100644 index 00000000..2f430df4 Binary files /dev/null and b/src/love/images/dds/icons/icon-spooky.dds differ diff --git a/src/love/images/dds/icons/icon-tankman.dds b/src/love/images/dds/icons/icon-tankman.dds new file mode 100644 index 00000000..0bd60545 Binary files /dev/null and b/src/love/images/dds/icons/icon-tankman.dds differ diff --git a/src/love/images/dds/menu/checkboxanim.xml b/src/love/images/dds/menu/checkboxanim.xml deleted file mode 100644 index 45e18a75..00000000 --- a/src/love/images/dds/menu/checkboxanim.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/love/images/dds/menu/weekend1.dds b/src/love/images/dds/menu/weekend1.dds new file mode 100644 index 00000000..b809e177 Binary files /dev/null and b/src/love/images/dds/menu/weekend1.dds differ diff --git a/src/love/images/dds/resultsScreen/difEasy.dds b/src/love/images/dds/resultsScreen/difEasy.dds new file mode 100644 index 00000000..b9c13b9e Binary files /dev/null and b/src/love/images/dds/resultsScreen/difEasy.dds differ diff --git a/src/love/images/dds/resultsScreen/difErect.dds b/src/love/images/dds/resultsScreen/difErect.dds new file mode 100644 index 00000000..9de7c734 Binary files /dev/null and b/src/love/images/dds/resultsScreen/difErect.dds differ diff --git a/src/love/images/dds/resultsScreen/difHard.dds b/src/love/images/dds/resultsScreen/difHard.dds new file mode 100644 index 00000000..d0fa7c6e Binary files /dev/null and b/src/love/images/dds/resultsScreen/difHard.dds differ diff --git a/src/love/images/dds/resultsScreen/difNightmare.dds b/src/love/images/dds/resultsScreen/difNightmare.dds new file mode 100644 index 00000000..81269a9c Binary files /dev/null and b/src/love/images/dds/resultsScreen/difNightmare.dds differ diff --git a/src/love/images/dds/resultsScreen/difNormal.dds b/src/love/images/dds/resultsScreen/difNormal.dds new file mode 100644 index 00000000..8bf4e706 Binary files /dev/null and b/src/love/images/dds/resultsScreen/difNormal.dds differ diff --git a/src/love/images/dds/resultsScreen/highscoreNew.dds b/src/love/images/dds/resultsScreen/highscoreNew.dds new file mode 100644 index 00000000..6b5ea44f Binary files /dev/null and b/src/love/images/dds/resultsScreen/highscoreNew.dds differ diff --git a/src/love/images/dds/resultsScreen/ratingsPopin.dds b/src/love/images/dds/resultsScreen/ratingsPopin.dds new file mode 100644 index 00000000..35b0aa43 Binary files /dev/null and b/src/love/images/dds/resultsScreen/ratingsPopin.dds differ diff --git a/src/love/images/dds/resultsScreen/resultBoyfriendGOOD.dds b/src/love/images/dds/resultsScreen/resultBoyfriendGOOD.dds new file mode 100644 index 00000000..d3fa511c Binary files /dev/null and b/src/love/images/dds/resultsScreen/resultBoyfriendGOOD.dds differ diff --git a/src/love/images/dds/resultsScreen/resultGirlfriendGOOD.dds b/src/love/images/dds/resultsScreen/resultGirlfriendGOOD.dds new file mode 100644 index 00000000..cb234b6a Binary files /dev/null and b/src/love/images/dds/resultsScreen/resultGirlfriendGOOD.dds differ diff --git a/src/love/images/dds/resultsScreen/results.dds b/src/love/images/dds/resultsScreen/results.dds new file mode 100644 index 00000000..e46dc832 Binary files /dev/null and b/src/love/images/dds/resultsScreen/results.dds differ diff --git a/src/love/images/dds/resultsScreen/score-digital-numbers.dds b/src/love/images/dds/resultsScreen/score-digital-numbers.dds new file mode 100644 index 00000000..0bb2b5c8 Binary files /dev/null and b/src/love/images/dds/resultsScreen/score-digital-numbers.dds differ diff --git a/src/love/images/dds/resultsScreen/scorePopin.dds b/src/love/images/dds/resultsScreen/scorePopin.dds new file mode 100644 index 00000000..e99485e5 Binary files /dev/null and b/src/love/images/dds/resultsScreen/scorePopin.dds differ diff --git a/src/love/images/dds/resultsScreen/soundSystem.dds b/src/love/images/dds/resultsScreen/soundSystem.dds new file mode 100644 index 00000000..c6069c30 Binary files /dev/null and b/src/love/images/dds/resultsScreen/soundSystem.dds differ diff --git a/src/love/images/dds/resultsScreen/tallieNumber.dds b/src/love/images/dds/resultsScreen/tallieNumber.dds new file mode 100644 index 00000000..f61a770e Binary files /dev/null and b/src/love/images/dds/resultsScreen/tallieNumber.dds differ diff --git a/src/love/images/dds/resultsScreen/tardlingSpritesheet.dds b/src/love/images/dds/resultsScreen/tardlingSpritesheet.dds new file mode 100644 index 00000000..1c8e5c86 Binary files /dev/null and b/src/love/images/dds/resultsScreen/tardlingSpritesheet.dds differ diff --git a/src/love/images/dds/resultsScreen/topBarBlack.dds b/src/love/images/dds/resultsScreen/topBarBlack.dds new file mode 100644 index 00000000..c31cd037 Binary files /dev/null and b/src/love/images/dds/resultsScreen/topBarBlack.dds differ diff --git a/src/love/images/dds/weekend1/aBotViz.dds b/src/love/images/dds/weekend1/aBotViz.dds new file mode 100644 index 00000000..78d2c42d Binary files /dev/null and b/src/love/images/dds/weekend1/aBotViz.dds differ diff --git a/src/love/images/png/NOTE_assets.png b/src/love/images/png/NOTE_assets.png new file mode 100644 index 00000000..355f6af6 Binary files /dev/null and b/src/love/images/png/NOTE_assets.png differ diff --git a/src/love/main.lua b/src/love/main.lua index a11e2e42..8d9ea59a 100644 --- a/src/love/main.lua +++ b/src/love/main.lua @@ -229,10 +229,9 @@ function love.load() ["streets"] = require "stages.streets" } + shaders = {} if love.system.getOS() ~= "NX" then - shaders = { - ["rain"] = love.graphics.newShader("shaders/rain.glsl") - } + shaders["rain"] = love.graphics.newShader("shaders/rain.glsl") end -- Load Menus @@ -444,7 +443,7 @@ function love.load() storyMode = false countingDown = false - uiScale = {zoom = 1, x = 1, y = 1, sizeX = 1, sizeY = 1} + uiCam = {zoom = 1, x = 1, y = 1, sizeX = 1, sizeY = 1} musicTime = 0 health = 0 diff --git a/src/love/modding/importMods.lua b/src/love/modding/importMods.lua index 14978979..5031e604 100644 --- a/src/love/modding/importMods.lua +++ b/src/love/modding/importMods.lua @@ -82,4 +82,10 @@ function loadImageFile(path) return love.graphics.newImage(path) end +function getFilePath(path) + local currentMod = importMods.getCurrentMod() + + return currentMod.path .. "/" .. path +end + return importMods \ No newline at end of file diff --git a/src/love/modules/Cover.lua b/src/love/modules/Cover.lua index fa28712a..353ab279 100644 --- a/src/love/modules/Cover.lua +++ b/src/love/modules/Cover.lua @@ -26,9 +26,13 @@ end function cover:update(dt) for i = 1, 4 do if self.covers[1][i].visible then + self.covers[1][i].x = boyfriendArrows[i].x - 5 + self.covers[1][i].y = boyfriendArrows[i].y + 35 self.covers[1][i]:update(dt) end if self.covers[2][i].visible then + self.covers[2][i].x = enemyArrows[i].x - 5 + self.covers[2][i].y = enemyArrows[i].y + 35 self.covers[2][i]:update(dt) end end diff --git a/src/love/modules/constants.lua b/src/love/modules/constants.lua index 0e4cfb42..2ce2cb43 100644 --- a/src/love/modules/constants.lua +++ b/src/love/modules/constants.lua @@ -1,11 +1,40 @@ local CONSTANTS = {} -CONSTANTS.OPTIONS ={ +CONSTANTS.OPTIONS = { SHOW_RESULTS_SCREEN = true, DO_SAVE_DATA = true, DO_MODS = true, } +function hexToRGB(hex) + local r = bit.band(bit.rshift(hex, 16), 0xFF) / 255 + local g = bit.band(bit.rshift(hex, 8), 0xFF) / 255 + local b = bit.band(hex, 0xFF) / 255 + return r, g, b +end + +function decToRGB(dec) + local r = bit.band(bit.rshift(dec, 16), 0xFF) / 255 + local g = bit.band(bit.rshift(dec, 8), 0xFF) / 255 + local b = bit.band(dec, 0xFF) / 255 + return r, g, b +end + +CONSTANTS.RAW_ARROW_COLORS = { + {0xFFC24B99, 0xFFFFFFFF, 0xFF3C1F56}, + {0xFF00FFFF, 0xFFFFFFFF, 0xFF1542B7}, + {0xFF12FA05, 0xFFFFFFFF, 0xFF0A4447}, + {0xFFF9393F, 0xFFFFFFFF, 0xFF651038} +} +CONSTANTS.ARROW_COLORS = {} +for i, v in ipairs(CONSTANTS.RAW_ARROW_COLORS) do + CONSTANTS.ARROW_COLORS[i] = { + {hexToRGB(v[1])}, + {hexToRGB(v[2])}, + {hexToRGB(v[3])} + } +end + CONSTANTS.WEEKS = { ANIM_LIST = { "singLEFT", diff --git a/src/love/modules/deprecated.lua b/src/love/modules/deprecated.lua index dbd2d97c..4d32fb16 100644 --- a/src/love/modules/deprecated.lua +++ b/src/love/modules/deprecated.lua @@ -56,6 +56,11 @@ function weeks.legacyGenerateNotes(self, chart) local arrowsTable = enemyNote and enemyArrows or boyfriendArrows noteObject.x = arrowsTable[id].x + noteObject.shader = love.graphics.newShader("shaders/RGBPallette.glsl") + local r, g, b = CONSTANTS.ARROW_COLORS[id][1], CONSTANTS.ARROW_COLORS[id][2], CONSTANTS.ARROW_COLORS[id][3] + noteObject.shader:send("r", r) + noteObject.shader:send("g", g) + noteObject.shader:send("b", b) table.insert(notesTable[id], noteObject) if holdLength > 0 then @@ -68,6 +73,7 @@ function weeks.legacyGenerateNotes(self, chart) holdNote:animate("hold") holdNote.x = arrowsTable[id].x + holdNote.shader = noteObject.shader table.insert(notesTable[id], holdNote) end @@ -153,6 +159,11 @@ function weeks.cneGenerateNotes(self, chart, metadata) if settings.downscroll then noteObject.sizeY = -1 end noteObject.x = arrowsTable[id].x + noteObject.shader = love.graphics.newShader("shaders/RGBPallette.glsl") + local r, g, b = CONSTANTS.ARROW_COLORS[id][1], CONSTANTS.ARROW_COLORS[id][2], CONSTANTS.ARROW_COLORS[id][3] + noteObject.shader:send("r", r) + noteObject.shader:send("g", g) + noteObject.shader:send("b", b) table.insert(notesTable[id], noteObject) if holdLength > 0 then @@ -165,6 +176,7 @@ function weeks.cneGenerateNotes(self, chart, metadata) holdNote:animate("hold") holdNote.x = arrowsTable[id].x + holdNote.shader = noteObject.shader table.insert(notesTable[id], holdNote) end @@ -174,4 +186,4 @@ function weeks.cneGenerateNotes(self, chart, metadata) ::continue:: end -end \ No newline at end of file +end diff --git a/src/love/modules/graphics.lua b/src/love/modules/graphics.lua index 97cc88b4..6107ac5e 100644 --- a/src/love/modules/graphics.lua +++ b/src/love/modules/graphics.lua @@ -248,6 +248,9 @@ return { danced = false, + shader = nil, + shaderEnabled = true, + setSheet = function(self, imageData) sheet = imageData sheetWidth = sheet:getWidth() @@ -512,16 +515,6 @@ return { height = frameData[self.curFrame].offsetY end else - --[[ if frameData[self.curFrame].offsetWidth == 0 then - width = math.floor(frameData[self.curFrame].width / 2) - else - width = math.floor(frameData[self.curFrame].offsetWidth / 2) + frameData[self.curFrame].offsetX - end - if frameData[self.curFrame].offsetHeight == 0 then - height = math.floor(frameData[self.curFrame].height / 2) - else - height = math.floor(frameData[self.curFrame].offsetHeight / 2) + frameData[self.curFrame].offsetY - end ]] if not frameData[self.curFrame].rotated then if frameData[self.curFrame].offsetWidth == 0 then width = math.floor(frameData[self.curFrame].width / 2) @@ -555,6 +548,13 @@ return { oy = height + anim.offsetX + self.offsetX end + local lastShader = love.graphics.getShader() + if self.shaderEnabled then + love.graphics.setShader(self.shader) + end + local lastColor = {love.graphics.getColor()} + graphics.setColor(lastColor[1], lastColor[2], lastColor[3], lastColor[4] * self.alpha) + if self.visible then --love.graphics.rotate((frameData[self.curFrame].rotated and -math.rad(90) or 0)) love.graphics.draw( @@ -577,6 +577,9 @@ return { self.stencilInfo = nil love.graphics.setStencilTest() end + + love.graphics.setShader(lastShader) + love.graphics.setColor(lastColor) end end, diff --git a/src/love/shaders/RGBPallette.glsl b/src/love/shaders/RGBPallette.glsl new file mode 100644 index 00000000..cc39da5b --- /dev/null +++ b/src/love/shaders/RGBPallette.glsl @@ -0,0 +1,26 @@ +extern vec3 r; +extern vec3 g; +extern vec3 b; +extern float a = 1.0; +extern float mult = 1.0; + +vec4 effect(vec4 _, Image texture, vec2 texture_coords, vec2 screen_coords) +{ + vec4 color = Texel(texture, texture_coords); + + if (color.a == 0.0 || mult == 0.0) { + return color; + } + + vec4 newColor = color; + newColor.rgb = min(color.r * r + color.g * g + color.b * b, vec3(1.0)); + newColor.a = color.a * a; + + color = mix(color, newColor, mult); + + if (color.a > 0.0) { + return color; + } + + return vec4(0.0, 0.0, 0.0, 0.0); +} diff --git a/src/love/sprites/down-arrow.lua b/src/love/sprites/down-arrow.lua index 9ddfbf90..e29d56de 100644 --- a/src/love/sprites/down-arrow.lua +++ b/src/love/sprites/down-arrow.lua @@ -20,18 +20,18 @@ along with this program. If not, see . return graphics.newSprite( images.notes, { - {x = 647, y = 238, width = 157, height = 155, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: arrowDOWN0000 - {x = 0, y = 240, width = 158, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 7: blue alone0000 - {x = 1062, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 5: blue tail0000 - {x = 1282, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 6: blue hold0000 - {x = 0, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 8: down confirm0000 - {x = 244, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 9: down confirm0001 - {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 10: down confirm0002 - {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 11: down confirm0003 - {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 12: down press0000 - {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 13: down press0001 - {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 14: down press0002 - {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 15: down press0003 + {x = 479, y = 234, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 1: arrowDOWN0000 + {x = 1854, y = 1, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 5: blue0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 6: blue hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 7: blue hold piece0000 + {x = 1, y = 1, width = 238, height = 235, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 8: down confirm0000 + {x = 240, y = 1, width = 238, height = 235, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 9: down confirm0001 + {x = 1180, y = 230, width = 220, height = 216, offsetX = -9, offsetY = -10, offsetWidth = 238, offsetHeight = 235, rotated = false}, -- 10: down confirm0002 + {x = 1180, y = 230, width = 220, height = 216, offsetX = -9, offsetY = -10, offsetWidth = 238, offsetHeight = 235, rotated = false}, -- 11: down confirm0003 + {x = 146, y = 395, width = 142, height = 140, offsetX = -4, offsetY = -2, offsetWidth = 149, offsetHeight = 146, rotated = false}, -- 12: down press0000 + {x = 146, y = 395, width = 142, height = 140, offsetX = -4, offsetY = -2, offsetWidth = 149, offsetHeight = 146, rotated = false}, -- 13: down press0001 + {x = 615, y = 389, width = 149, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 14: down press0002 + {x = 615, y = 389, width = 149, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 15: down press0003 }, { ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, diff --git a/src/love/sprites/left-arrow.lua b/src/love/sprites/left-arrow.lua index f8b23dcd..61f8b748 100644 --- a/src/love/sprites/left-arrow.lua +++ b/src/love/sprites/left-arrow.lua @@ -20,26 +20,26 @@ along with this program. If not, see . return graphics.newSprite( images.notes, { - {x = 488, y = 238, width = 155, height = 158, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: arrowLEFT0000 - {x = 972, y = 0, width = 230, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 19: left confirm0000 - {x = 1438, y = 233, width = 220, height = 222, offsetX = -5, offsetY = -5, offsetWidth = 230, offsetHeight = 232}, -- 20: left confirm0001 - {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 21: left confirm0002 - {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 22: left confirm0003 - {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 23: left press0000 - {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 24: left press0001 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 25: left press0002 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 26: left press0003 - {x = 1117, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 43: purple tail0000 - {x = 0, y = 398, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 45: purple alone0000 - {x = 1337, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 44: purple hold0000 + {x = 156, y = 237, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 2: arrowLEFT0000 + {x = 1406, y = 228, width = 218, height = 221, offsetX = -3, offsetY = -4, offsetWidth = 225, offsetHeight = 228, rotated = false}, -- 19: left confirm0000 + {x = 1625, y = 228, width = 218, height = 221, offsetX = -3, offsetY = -4, offsetWidth = 225, offsetHeight = 228, rotated = false}, -- 20: left confirm0001 + {x = 1180, y = 1, width = 225, height = 228, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 21: left confirm0002 + {x = 1180, y = 1, width = 225, height = 228, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 22: left confirm0003 + {x = 289, y = 395, width = 140, height = 142, offsetX = -3, offsetY = -3, offsetWidth = 146, offsetHeight = 149, rotated = false}, -- 23: left press0000 + {x = 289, y = 395, width = 140, height = 142, offsetX = -3, offsetY = -3, offsetWidth = 146, offsetHeight = 149, rotated = false}, -- 24: left press0001 + {x = 765, y = 392, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 25: left press0002 + {x = 765, y = 392, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 26: left press0003 + {x = 795, y = 234, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 27: purple0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 29: purple hold piece0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 28: purple hold end0000 }, { ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, ["confirm"] = {start = 2, stop = 5, speed = 24, offsetX = 0, offsetY = 0}, ["press"] = {start = 6, stop = 9, speed = 24, offsetX = 0, offsetY = 0}, - ["end"] = {start = 10, stop = 10, speed = 0, offsetX = 0, offsetY = 0}, - ["on"] = {start = 11, stop = 11, speed = 0, offsetX = 0, offsetY = 0}, - ["hold"] = {start = 12, stop = 12, speed = 0, offsetX = 0, offsetY = 0} + ["end"] = {start = 12, stop = 12, speed = 0, offsetX = 0, offsetY = 0}, + ["on"] = {start = 10, stop = 10, speed = 0, offsetX = 0, offsetY = 0}, + ["hold"] = {start = 11, stop = 11, speed = 0, offsetX = 0, offsetY = 0} }, "off", false diff --git a/src/love/sprites/old_notes/down-arrow.lua b/src/love/sprites/old_notes/down-arrow.lua new file mode 100644 index 00000000..9ddfbf90 --- /dev/null +++ b/src/love/sprites/old_notes/down-arrow.lua @@ -0,0 +1,46 @@ +--[[---------------------------------------------------------------------------- +This file is part of Friday Night Funkin' Rewritten + +Copyright (C) 2021 HTV04 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +------------------------------------------------------------------------------]] + +return graphics.newSprite( + images.notes, + { + {x = 647, y = 238, width = 157, height = 155, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: arrowDOWN0000 + {x = 0, y = 240, width = 158, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 7: blue alone0000 + {x = 1062, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 5: blue tail0000 + {x = 1282, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 6: blue hold0000 + {x = 0, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 8: down confirm0000 + {x = 244, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 9: down confirm0001 + {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 10: down confirm0002 + {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 11: down confirm0003 + {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 12: down press0000 + {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 13: down press0001 + {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 14: down press0002 + {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 15: down press0003 + }, + { + ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, + ["on"] = {start = 2, stop = 2, speed = 0, offsetX = 0, offsetY = 0}, + ["end"] = {start = 3, stop = 3, speed = 0, offsetX = 0, offsetY = 0}, + ["hold"] = {start = 4, stop = 4, speed = 0, offsetX = 0, offsetY = 0}, + ["confirm"] = {start = 5, stop = 8, speed = 24, offsetX = 0, offsetY = 0}, + ["press"] = {start = 9, stop = 12, speed = 24, offsetX = 0, offsetY = 0} + }, + "off", + false +) diff --git a/src/love/sprites/old_notes/left-arrow.lua b/src/love/sprites/old_notes/left-arrow.lua new file mode 100644 index 00000000..f8b23dcd --- /dev/null +++ b/src/love/sprites/old_notes/left-arrow.lua @@ -0,0 +1,46 @@ +--[[---------------------------------------------------------------------------- +This file is part of Friday Night Funkin' Rewritten + +Copyright (C) 2021 HTV04 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +------------------------------------------------------------------------------]] + +return graphics.newSprite( + images.notes, + { + {x = 488, y = 238, width = 155, height = 158, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: arrowLEFT0000 + {x = 972, y = 0, width = 230, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 19: left confirm0000 + {x = 1438, y = 233, width = 220, height = 222, offsetX = -5, offsetY = -5, offsetWidth = 230, offsetHeight = 232}, -- 20: left confirm0001 + {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 21: left confirm0002 + {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 22: left confirm0003 + {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 23: left press0000 + {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 24: left press0001 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 25: left press0002 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 26: left press0003 + {x = 1117, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 43: purple tail0000 + {x = 0, y = 398, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 45: purple alone0000 + {x = 1337, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 44: purple hold0000 + }, + { + ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, + ["confirm"] = {start = 2, stop = 5, speed = 24, offsetX = 0, offsetY = 0}, + ["press"] = {start = 6, stop = 9, speed = 24, offsetX = 0, offsetY = 0}, + ["end"] = {start = 10, stop = 10, speed = 0, offsetX = 0, offsetY = 0}, + ["on"] = {start = 11, stop = 11, speed = 0, offsetX = 0, offsetY = 0}, + ["hold"] = {start = 12, stop = 12, speed = 0, offsetX = 0, offsetY = 0} + }, + "off", + false +) diff --git a/src/love/sprites/old_notes/receptor.lua b/src/love/sprites/old_notes/receptor.lua new file mode 100644 index 00000000..973607c6 --- /dev/null +++ b/src/love/sprites/old_notes/receptor.lua @@ -0,0 +1,113 @@ +return graphics.newSprite( + images.notes, + { + {x = 488, y = 238, width = 155, height = 158, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: arrowLEFT0000 + {x = 647, y = 238, width = 157, height = 155, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 2: arrowDOWN0000 + {x = 323, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 3: arrowUP0000 + {x = 808, y = 238, width = 155, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 4: arrowRIGHT0000 + {x = 1062, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 5: blue tail0000 + {x = 1282, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 6: blue hold0000 + {x = 0, y = 240, width = 158, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 7: blue alone0000 + {x = 0, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 8: down confirm0000 + {x = 244, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 9: down confirm0001 + {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 10: down confirm0002 + {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 11: down confirm0003 + {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 12: down press0000 + {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 13: down press0001 + {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 14: down press0002 + {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 15: down press0003 + {x = 1007, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 16: green tail0000 + {x = 1227, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 17: green hold0000 + {x = 162, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 18: green alone0000 + {x = 972, y = 0, width = 230, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 19: left confirm0000 + {x = 1438, y = 233, width = 220, height = 222, offsetX = -5, offsetY = -5, offsetWidth = 230, offsetHeight = 232}, -- 20: left confirm0001 + {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 21: left confirm0002 + {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 22: left confirm0003 + {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 23: left press0000 + {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 24: left press0001 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 25: left press0002 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 26: left press0003 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 27: left press0004 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 28: left press0005 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 29: left press0006 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 30: left press0007 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 31: left press0008 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 32: left press0009 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 33: left press0010 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 34: left press0011 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 35: left press0012 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 36: left press0013 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 37: left press0014 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 38: left press0015 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 39: left press0016 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 40: left press0017 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 41: left press0018 + {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 42: left press0019 + {x = 1117, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 43: purple tail0000 + {x = 1337, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 44: purple hold0000 + {x = 0, y = 398, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 45: purple alone0000 + {x = 952, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 46: red tail0000 + {x = 1172, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 47: red hold0000 + {x = 647, y = 397, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 48: red alone0000 + {x = 1669, y = 0, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 49: right confirm0000 + {x = 1669, y = 232, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 50: right confirm0001 + {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 51: right confirm0002 + {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 52: right confirm0003 + {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 53: right press0000 + {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 54: right press0001 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 55: right press0002 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 56: right press0003 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 57: right press0004 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 58: right press0005 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 59: right press0006 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 60: right press0007 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 61: right press0008 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 62: right press0009 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 63: right press0010 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 64: right press0011 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 65: right press0012 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 66: right press0013 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 67: right press0014 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 68: right press0015 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 69: right press0016 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 70: right press0017 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 71: right press0018 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 72: right press0019 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 73: right press0020 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 74: right press0021 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 75: right press0022 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 76: right press0023 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 77: right press0024 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 78: right press0025 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 79: right press0026 + {x = 488, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 80: up confirm0000 + {x = 730, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 81: up confirm0001 + {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 82: up confirm0002 + {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 83: up confirm0003 + {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 84: up press0000 + {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 85: up press0001 + {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 86: up press0002 + {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0} -- 87: up press0003 + }, + { + -- Pressed + ["left press"] = {start = 23, stop = 42, speed = 24, offsetX = 0, offsetY = 0}, + ["down press"] = {start = 12, stop = 15, speed = 24, offsetX = 0, offsetY = 0}, + ["up press"] = {start = 84, stop = 87, speed = 24, offsetX = 0, offsetY = 0}, + ["right press"] = {start = 53, stop = 79, speed = 24, offsetX = 0, offsetY = 0}, + + -- Static + ["left"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, + ["down"] = {start = 2, stop = 2, speed = 0, offsetX = 0, offsetY = 0}, + ["up"] = {start = 3, stop = 3, speed = 0, offsetX = 0, offsetY = 0}, + ["right"] = {start = 4, stop = 4, speed = 0, offsetX = 0, offsetY = 0}, + + -- Confirms + ["left confirm"] = {start = 19, stop = 22, speed = 24, offsetX = 0, offsetY = 0}, + ["down confirm"] = {start = 8, stop = 11, speed = 24, offsetX = 0, offsetY = 0}, + ["up confirm"] = {start = 80, stop = 83, speed = 24, offsetX = 0, offsetY = 0}, + ["right confirm"] = {start = 49, stop = 52, speed = 24, offsetX = 0, offsetY = 0}, + }, + "left", + false +) diff --git a/src/love/sprites/old_notes/right-arrow.lua b/src/love/sprites/old_notes/right-arrow.lua new file mode 100644 index 00000000..7b2ba576 --- /dev/null +++ b/src/love/sprites/old_notes/right-arrow.lua @@ -0,0 +1,46 @@ +--[[---------------------------------------------------------------------------- +This file is part of Friday Night Funkin' Rewritten + +Copyright (C) 2021 HTV04 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +------------------------------------------------------------------------------]] + +return graphics.newSprite( + images.notes, + { + {x = 808, y = 238, width = 155, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 3: arrowRIGHT0000 + {x = 647, y = 397, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 48: red alone0000 + {x = 952, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 46: red tail0000 + {x = 1172, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 47: red hold0000 + {x = 1669, y = 0, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 49: right confirm0000 + {x = 1669, y = 232, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 50: right confirm0001 + {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 51: right confirm0002 + {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 52: right confirm0003 + {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 53: right press0000 + {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 54: right press0001 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 55: right press0002 + {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 56: right press0003 + }, + { + ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, + ["on"] = {start = 2, stop = 2, speed = 0, offsetX = 0, offsetY = 0}, + ["end"] = {start = 3, stop = 3, speed = 0, offsetX = 0, offsetY = 0}, + ["hold"] = {start = 4, stop = 4, speed = 0, offsetX = 0, offsetY = 0}, + ["confirm"] = {start = 5, stop = 8, speed = 24, offsetX = 0, offsetY = 0}, + ["press"] = {start = 9, stop = 12, speed = 24, offsetX = 0, offsetY = 0} + }, + "off", + false +) diff --git a/src/love/sprites/old_notes/up-arrow.lua b/src/love/sprites/old_notes/up-arrow.lua new file mode 100644 index 00000000..4e011a4b --- /dev/null +++ b/src/love/sprites/old_notes/up-arrow.lua @@ -0,0 +1,46 @@ +--[[---------------------------------------------------------------------------- +This file is part of Friday Night Funkin' Rewritten + +Copyright (C) 2021 HTV04 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +------------------------------------------------------------------------------]] + +return graphics.newSprite( + images.notes, + { + {x = 323, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 4: arrowUP0000 + {x = 162, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 18: green alone0000 + {x = 1007, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 16: green tail0000 + {x = 1227, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 17: green hold0000 + {x = 488, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 80: up confirm0000 + {x = 730, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 81: up confirm0001 + {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 82: up confirm0002 + {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 83: up confirm0003 + {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 84: up press0000 + {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 85: up press0001 + {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 86: up press0002 + {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0} -- 87: up press0003 + }, + { + ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, + ["on"] = {start = 2, stop = 2, speed = 0, offsetX = 0, offsetY = 0}, + ["end"] = {start = 3, stop = 3, speed = 0, offsetX = 0, offsetY = 0}, + ["hold"] = {start = 4, stop = 4, speed = 0, offsetX = 0, offsetY = 0}, + ["confirm"] = {start = 5, stop = 8, speed = 24, offsetX = 0, offsetY = 0}, + ["press"] = {start = 9, stop = 12, speed = 24, offsetX = 0, offsetY = 0} + }, + "off", + false +) diff --git a/src/love/sprites/receptor.lua b/src/love/sprites/receptor.lua index 973607c6..2904cb30 100644 --- a/src/love/sprites/receptor.lua +++ b/src/love/sprites/receptor.lua @@ -1,112 +1,75 @@ return graphics.newSprite( images.notes, - { - {x = 488, y = 238, width = 155, height = 158, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 1: arrowLEFT0000 - {x = 647, y = 238, width = 157, height = 155, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 2: arrowDOWN0000 - {x = 323, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 3: arrowUP0000 - {x = 808, y = 238, width = 155, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 4: arrowRIGHT0000 - {x = 1062, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 5: blue tail0000 - {x = 1282, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 6: blue hold0000 - {x = 0, y = 240, width = 158, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 7: blue alone0000 - {x = 0, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 8: down confirm0000 - {x = 244, y = 0, width = 240, height = 236, offsetX = -6, offsetY = 0, offsetWidth = 240, offsetHeight = 236}, -- 9: down confirm0001 - {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 10: down confirm0002 - {x = 1206, y = 235, width = 221, height = 218, offsetX = -12, offsetY = -12, offsetWidth = 240, offsetHeight = 236}, -- 11: down confirm0003 - {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 12: down press0000 - {x = 805, y = 399, width = 143, height = 139, offsetX = -4, offsetY = -3, offsetWidth = 150, offsetHeight = 146}, -- 13: down press0001 - {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 14: down press0002 - {x = 1898, y = 0, width = 150, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 15: down press0003 - {x = 1007, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 16: green tail0000 - {x = 1227, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 17: green hold0000 - {x = 162, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 18: green alone0000 - {x = 972, y = 0, width = 230, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 19: left confirm0000 - {x = 1438, y = 233, width = 220, height = 222, offsetX = -5, offsetY = -5, offsetWidth = 230, offsetHeight = 232}, -- 20: left confirm0001 - {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 21: left confirm0002 - {x = 1438, y = 0, width = 227, height = 229, offsetX = -2, offsetY = -1, offsetWidth = 230, offsetHeight = 232}, -- 22: left confirm0003 - {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 23: left press0000 - {x = 1898, y = 449, width = 139, height = 142, offsetX = -4, offsetY = -3, offsetWidth = 146, offsetHeight = 149}, -- 24: left press0001 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 25: left press0002 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 26: left press0003 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 27: left press0004 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 28: left press0005 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 29: left press0006 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 30: left press0007 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 31: left press0008 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 32: left press0009 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 33: left press0010 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 34: left press0011 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 35: left press0012 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 36: left press0013 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 37: left press0014 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 38: left press0015 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 39: left press0016 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 40: left press0017 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 41: left press0018 - {x = 1898, y = 150, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 42: left press0019 - {x = 1117, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 43: purple tail0000 - {x = 1337, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 44: purple hold0000 - {x = 0, y = 398, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 45: purple alone0000 - {x = 952, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 46: red tail0000 - {x = 1172, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 47: red hold0000 - {x = 647, y = 397, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 48: red alone0000 - {x = 1669, y = 0, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 49: right confirm0000 - {x = 1669, y = 232, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 50: right confirm0001 - {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 51: right confirm0002 - {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 52: right confirm0003 - {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 53: right press0000 - {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 54: right press0001 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 55: right press0002 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 56: right press0003 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 57: right press0004 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 58: right press0005 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 59: right press0006 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 60: right press0007 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 61: right press0008 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 62: right press0009 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 63: right press0010 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 64: right press0011 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 65: right press0012 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 66: right press0013 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 67: right press0014 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 68: right press0015 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 69: right press0016 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 70: right press0017 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 71: right press0018 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 72: right press0019 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 73: right press0020 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 74: right press0021 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 75: right press0022 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 76: right press0023 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 77: right press0024 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 78: right press0025 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 79: right press0026 - {x = 488, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 80: up confirm0000 - {x = 730, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 81: up confirm0001 - {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 82: up confirm0002 - {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 83: up confirm0003 - {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 84: up press0000 - {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 85: up press0001 - {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 86: up press0002 - {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0} -- 87: up press0003 - }, + -- Automatically generated from NOTE_assets.xml + { + {x = 479, y = 234, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 1: arrowDOWN0000 + {x = 156, y = 237, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 2: arrowLEFT0000 + {x = 311, y = 237, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 3: arrowRIGHT0000 + {x = 637, y = 234, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 4: arrowUP0000 + {x = 1854, y = 1, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 5: blue0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 6: blue hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 7: blue hold piece0000 + {x = 1, y = 1, width = 238, height = 235, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 8: down confirm0000 + {x = 240, y = 1, width = 238, height = 235, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 9: down confirm0001 + {x = 1180, y = 230, width = 220, height = 216, offsetX = -9, offsetY = -10, offsetWidth = 238, offsetHeight = 235, rotated = false}, -- 10: down confirm0002 + {x = 1180, y = 230, width = 220, height = 216, offsetX = -9, offsetY = -10, offsetWidth = 238, offsetHeight = 235, rotated = false}, -- 11: down confirm0003 + {x = 146, y = 395, width = 142, height = 140, offsetX = -4, offsetY = -2, offsetWidth = 149, offsetHeight = 146, rotated = false}, -- 12: down press0000 + {x = 146, y = 395, width = 142, height = 140, offsetX = -4, offsetY = -2, offsetWidth = 149, offsetHeight = 146, rotated = false}, -- 13: down press0001 + {x = 615, y = 389, width = 149, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 14: down press0002 + {x = 615, y = 389, width = 149, height = 146, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 15: down press0003 + {x = 1854, y = 156, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 16: green0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 17: green hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 18: green hold piece0000 + {x = 1406, y = 228, width = 218, height = 221, offsetX = -3, offsetY = -4, offsetWidth = 225, offsetHeight = 228, rotated = false}, -- 19: left confirm0000 + {x = 1625, y = 228, width = 218, height = 221, offsetX = -3, offsetY = -4, offsetWidth = 225, offsetHeight = 228, rotated = false}, -- 20: left confirm0001 + {x = 1180, y = 1, width = 225, height = 228, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 21: left confirm0002 + {x = 1180, y = 1, width = 225, height = 228, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 22: left confirm0003 + {x = 289, y = 395, width = 140, height = 142, offsetX = -3, offsetY = -3, offsetWidth = 146, offsetHeight = 149, rotated = false}, -- 23: left press0000 + {x = 289, y = 395, width = 140, height = 142, offsetX = -3, offsetY = -3, offsetWidth = 146, offsetHeight = 149, rotated = false}, -- 24: left press0001 + {x = 765, y = 392, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 25: left press0002 + {x = 765, y = 392, width = 146, height = 149, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 26: left press0003 + {x = 795, y = 234, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 27: purple0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 28: purple hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 29: purple hold piece0000 + {x = 1, y = 237, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 30: red0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 31: red hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 32: red hold piece0000 + {x = 1406, y = 1, width = 223, height = 226, offsetX = -1, offsetY = -3, offsetWidth = 226, offsetHeight = 230, rotated = false}, -- 33: right confirm0000 + {x = 1630, y = 1, width = 223, height = 226, offsetX = -1, offsetY = -3, offsetWidth = 226, offsetHeight = 230, rotated = false}, -- 34: right confirm0001 + {x = 953, y = 1, width = 226, height = 230, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 35: right confirm0002 + {x = 953, y = 1, width = 226, height = 230, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 36: right confirm0003 + {x = 912, y = 444, width = 138, height = 141, offsetX = -4, offsetY = -5, offsetWidth = 148, offsetHeight = 152, rotated = false}, -- 37: right press0000 + {x = 912, y = 444, width = 138, height = 141, offsetX = -4, offsetY = -5, offsetWidth = 148, offsetHeight = 152, rotated = false}, -- 38: right press0001 + {x = 466, y = 389, width = 148, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 39: right press0002 + {x = 466, y = 389, width = 148, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 40: right press0003 + {x = 479, y = 1, width = 236, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 41: up confirm0000 + {x = 716, y = 1, width = 236, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 42: up confirm0001 + {x = 953, y = 232, width = 214, height = 211, offsetX = -11, offsetY = -10, offsetWidth = 236, offsetHeight = 232, rotated = false}, -- 43: up confirm0002 + {x = 953, y = 232, width = 214, height = 211, offsetX = -11, offsetY = -10, offsetWidth = 236, offsetHeight = 232, rotated = false}, -- 44: up confirm0003 + {x = 1, y = 395, width = 144, height = 141, offsetX = -5, offsetY = -4, offsetWidth = 153, offsetHeight = 150, rotated = false}, -- 45: up press0000 + {x = 1, y = 395, width = 144, height = 141, offsetX = -5, offsetY = -4, offsetWidth = 153, offsetHeight = 150, rotated = false}, -- 46: up press0001 + {x = 1844, y = 311, width = 153, height = 150, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 47: up press0002 + {x = 1844, y = 311, width = 153, height = 150, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false} -- 48: up press0003 + }, + { -- Pressed - ["left press"] = {start = 23, stop = 42, speed = 24, offsetX = 0, offsetY = 0}, + ["left press"] = {start = 23, stop = 26, speed = 24, offsetX = 0, offsetY = 0}, ["down press"] = {start = 12, stop = 15, speed = 24, offsetX = 0, offsetY = 0}, - ["up press"] = {start = 84, stop = 87, speed = 24, offsetX = 0, offsetY = 0}, - ["right press"] = {start = 53, stop = 79, speed = 24, offsetX = 0, offsetY = 0}, + ["up press"] = {start = 45, stop = 48, speed = 24, offsetX = 0, offsetY = 0}, + ["right press"] = {start = 37, stop = 40, speed = 24, offsetX = 0, offsetY = 0}, -- Static - ["left"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, - ["down"] = {start = 2, stop = 2, speed = 0, offsetX = 0, offsetY = 0}, - ["up"] = {start = 3, stop = 3, speed = 0, offsetX = 0, offsetY = 0}, - ["right"] = {start = 4, stop = 4, speed = 0, offsetX = 0, offsetY = 0}, + ["left"] = {start = 2, stop = 2, speed = 0, offsetX = 0, offsetY = 0}, + ["down"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, + ["up"] = {start = 4, stop = 4, speed = 0, offsetX = 0, offsetY = 0}, + ["right"] = {start = 3, stop = 3, speed = 0, offsetX = 0, offsetY = 0}, -- Confirms ["left confirm"] = {start = 19, stop = 22, speed = 24, offsetX = 0, offsetY = 0}, ["down confirm"] = {start = 8, stop = 11, speed = 24, offsetX = 0, offsetY = 0}, - ["up confirm"] = {start = 80, stop = 83, speed = 24, offsetX = 0, offsetY = 0}, - ["right confirm"] = {start = 49, stop = 52, speed = 24, offsetX = 0, offsetY = 0}, + ["up confirm"] = {start = 41, stop = 44, speed = 24, offsetX = 0, offsetY = 0}, + ["right confirm"] = {start = 33, stop = 36, speed = 24, offsetX = 0, offsetY = 0}, }, "left", false diff --git a/src/love/sprites/right-arrow.lua b/src/love/sprites/right-arrow.lua index 7b2ba576..0706b5e9 100644 --- a/src/love/sprites/right-arrow.lua +++ b/src/love/sprites/right-arrow.lua @@ -20,18 +20,18 @@ along with this program. If not, see . return graphics.newSprite( images.notes, { - {x = 808, y = 238, width = 155, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 3: arrowRIGHT0000 - {x = 647, y = 397, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 48: red alone0000 - {x = 952, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 46: red tail0000 - {x = 1172, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 47: red hold0000 - {x = 1669, y = 0, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 49: right confirm0000 - {x = 1669, y = 232, width = 225, height = 228, offsetX = -1, offsetY = -2, offsetWidth = 228, offsetHeight = 231}, -- 50: right confirm0001 - {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 51: right confirm0002 - {x = 1206, y = 0, width = 228, height = 231, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 52: right confirm0003 - {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 53: right press0000 - {x = 469, y = 400, width = 139, height = 142, offsetX = -3, offsetY = -7, offsetWidth = 149, offsetHeight = 152}, -- 54: right press0001 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 55: right press0002 - {x = 316, y = 398, width = 149, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 56: right press0003 + {x = 311, y = 237, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 3: arrowRIGHT0000 + {x = 1, y = 237, width = 154, height = 157, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 30: red0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 31: red hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 32: red hold piece0000 + {x = 1406, y = 1, width = 223, height = 226, offsetX = -1, offsetY = -3, offsetWidth = 226, offsetHeight = 230, rotated = false}, -- 33: right confirm0000 + {x = 1630, y = 1, width = 223, height = 226, offsetX = -1, offsetY = -3, offsetWidth = 226, offsetHeight = 230, rotated = false}, -- 34: right confirm0001 + {x = 953, y = 1, width = 226, height = 230, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 35: right confirm0002 + {x = 953, y = 1, width = 226, height = 230, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 36: right confirm0003 + {x = 912, y = 444, width = 138, height = 141, offsetX = -4, offsetY = -5, offsetWidth = 148, offsetHeight = 152, rotated = false}, -- 37: right press0000 + {x = 912, y = 444, width = 138, height = 141, offsetX = -4, offsetY = -5, offsetWidth = 148, offsetHeight = 152, rotated = false}, -- 38: right press0001 + {x = 466, y = 389, width = 148, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 39: right press0002 + {x = 466, y = 389, width = 148, height = 152, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 40: right press0003 }, { ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, diff --git a/src/love/sprites/up-arrow.lua b/src/love/sprites/up-arrow.lua index 4e011a4b..09073292 100644 --- a/src/love/sprites/up-arrow.lua +++ b/src/love/sprites/up-arrow.lua @@ -20,18 +20,18 @@ along with this program. If not, see . return graphics.newSprite( images.notes, { - {x = 323, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 4: arrowUP0000 - {x = 162, y = 240, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 18: green alone0000 - {x = 1007, y = 452, width = 51, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 16: green tail0000 - {x = 1227, y = 457, width = 51, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 17: green hold0000 - {x = 488, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 80: up confirm0000 - {x = 730, y = 0, width = 238, height = 234, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 81: up confirm0001 - {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 82: up confirm0002 - {x = 972, y = 236, width = 216, height = 212, offsetX = -11, offsetY = -11, offsetWidth = 238, offsetHeight = 234}, -- 83: up confirm0003 - {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 84: up press0000 - {x = 1898, y = 303, width = 144, height = 142, offsetX = -6, offsetY = -4, offsetWidth = 154, offsetHeight = 151}, -- 85: up press0001 - {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0}, -- 86: up press0002 - {x = 158, y = 398, width = 154, height = 151, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0} -- 87: up press0003 + {x = 637, y = 234, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 4: arrowUP0000 + {x = 1854, y = 156, width = 157, height = 154, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 16: green0000 + {x = 1051, y = 444, width = 50, height = 64, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 17: green hold end0000 + {x = 1102, y = 444, width = 50, height = 44, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 18: green hold piece0000 + {x = 479, y = 1, width = 236, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 41: up confirm0000 + {x = 716, y = 1, width = 236, height = 232, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 42: up confirm0001 + {x = 953, y = 232, width = 214, height = 211, offsetX = -11, offsetY = -10, offsetWidth = 236, offsetHeight = 232, rotated = false}, -- 43: up confirm0002 + {x = 953, y = 232, width = 214, height = 211, offsetX = -11, offsetY = -10, offsetWidth = 236, offsetHeight = 232, rotated = false}, -- 44: up confirm0003 + {x = 1, y = 395, width = 144, height = 141, offsetX = -5, offsetY = -4, offsetWidth = 153, offsetHeight = 150, rotated = false}, -- 45: up press0000 + {x = 1, y = 395, width = 144, height = 141, offsetX = -5, offsetY = -4, offsetWidth = 153, offsetHeight = 150, rotated = false}, -- 46: up press0001 + {x = 1844, y = 311, width = 153, height = 150, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false}, -- 47: up press0002 + {x = 1844, y = 311, width = 153, height = 150, offsetX = 0, offsetY = 0, offsetWidth = 0, offsetHeight = 0, rotated = false} -- 48: up press0003 }, { ["off"] = {start = 1, stop = 1, speed = 0, offsetX = 0, offsetY = 0}, diff --git a/src/love/states/weeks.lua b/src/love/states/weeks.lua index f4c4292a..c7ac03c3 100644 --- a/src/love/states/weeks.lua +++ b/src/love/states/weeks.lua @@ -94,7 +94,7 @@ return { } images = { - notes = love.graphics.newImage(graphics.imagePath("notes")), + notes = love.graphics.newImage(graphics.imagePath("NOTE_assets")), numbers = love.graphics.newImage(graphics.imagePath("numbers")), } @@ -323,7 +323,7 @@ return { 0.7, function() Gamestate.switch(resultsScreen, { - diff = string.lower(CURDIFF), + diff = string.lower(CURDIFF or "normal"), song = not storyMode and SONGNAME or weekDesc[weekNum], artist = not storyMode and ARTIST or nil, scores = { @@ -404,6 +404,24 @@ return { enemyArrows[i].y = -55 boyfriendArrows[i].y = -55 else + if not pixel then + enemyArrows[i].shader = love.graphics.newShader("shaders/RGBPallette.glsl") + boyfriendArrows[i].shader = love.graphics.newShader("shaders/RGBPallette.glsl") + + enemyArrows[i].shaderEnabled = false + boyfriendArrows[i].shaderEnabled = false + + local r = CONSTANTS.ARROW_COLORS[i][1] + local g = CONSTANTS.ARROW_COLORS[i][2] + local b = CONSTANTS.ARROW_COLORS[i][3] + + enemyArrows[i].shader:send("r", r) + enemyArrows[i].shader:send("g", g) + enemyArrows[i].shader:send("b", b) + boyfriendArrows[i].shader:send("r", r) + boyfriendArrows[i].shader:send("g", g) + boyfriendArrows[i].shader:send("b", b) + end if settings.middleScroll then boyfriendArrows[i].x = -410 + 165 * i -- ew stuff @@ -503,6 +521,11 @@ return { local arrowsTable = enemyNote and enemyArrows or boyfriendArrows noteObject.x = arrowsTable[data].x + noteObject.shader = love.graphics.newShader("shaders/RGBPallette.glsl") + local r, g, b = CONSTANTS.ARROW_COLORS[data][1], CONSTANTS.ARROW_COLORS[data][2], CONSTANTS.ARROW_COLORS[data][3] + noteObject.shader:send("r", r) + noteObject.shader:send("g", g) + noteObject.shader:send("b", b) table.insert(notesTable[data], noteObject) if holdTime > 0 then for k = 71 / speed, holdTime, 71 / speed do @@ -514,6 +537,7 @@ return { holdNote:animate("hold") holdNote.x = arrowsTable[data].x + holdNote.shader = noteObject.shader table.insert(notesTable[data], holdNote) end @@ -554,7 +578,7 @@ return { end, -- Gross countdown script - setupCountdown = function(self, countNumVal) + setupCountdown = function(self, countNumVal, func) local countNumVal = countNumVal or 4 lastReportedPlaytime = 0 if countNumVal == 4 then @@ -572,7 +596,7 @@ return { Timer.after( (60/bpm), -- one beat function() - self:setupCountdown(countNumVal - 1) + self:setupCountdown(countNumVal - 1, func) end ) else @@ -584,7 +608,7 @@ return { {0}, "linear", function() - if countNumVal ~= 1 then self:setupCountdown(countNumVal - 1) + if countNumVal ~= 1 then self:setupCountdown(countNumVal - 1, func) else countingDown = false previousFrameTime = love.timer.getTime() * 1000 @@ -595,6 +619,7 @@ return { if voicesBF then voicesBF:play() end if voicesEnemy then voicesEnemy:play() end beatHandler.setBeat(0) + if func then func() end end end ) @@ -741,7 +766,7 @@ return { elseif event.name == "ZoomCamera" then if type(event.value) == "number" then camera.zoom = event.value - uiScale.zoom = event.value + uiCam.zoom = event.value elseif type(event.value) == "table" then event.value.mode = event.value.mode or "stage" if event.value.mode == "stage" then @@ -777,12 +802,12 @@ return { if (beatHandler.onBeat() and beatHandler.getBeat() % camera.camBopInterval == 0 and camera.zooming and camera.zoom < 1.35 and not camera.locked) then camera.zoom = camera.zoom + 0.015 * camera.camBopIntensity - uiScale.zoom = uiScale.zoom + 0.03 * camera.camBopIntensity + uiCam.zoom = uiCam.zoom + 0.03 * camera.camBopIntensity end if camera.zooming and not camera.locked then camera.zoom = util.lerp(camera.defaultZoom, camera.zoom, util.clamp(1 - (dt * 3.125), 0, 1)) - uiScale.zoom = util.lerp(1, uiScale.zoom, util.clamp(1 - (dt * 3.125), 0, 1)) + uiCam.zoom = util.lerp(1, uiCam.zoom, util.clamp(1 - (dt * 3.125), 0, 1)) end if girlfriend then girlfriend:update(dt) end @@ -862,47 +887,70 @@ return { end end + if not pixel then + if enemyArrow:getAnimName() ~= CONSTANTS.WEEKS.NOTE_LIST[i] then + enemyArrow.shaderEnabled = true + else + enemyArrow.shaderEnabled = false + end + + if boyfriendArrow:getAnimName() ~= CONSTANTS.WEEKS.NOTE_LIST[i] then + boyfriendArrow.shaderEnabled = true + else + boyfriendArrow.shaderEnabled = false + end + end + if #enemyNote > 0 then - if (enemyNote[1].time - musicTime <= 0) then - enemyArrow:animate(CONSTANTS.WEEKS.NOTE_LIST[i] .. " confirm", false) - useAltAnims = false - - local whohit = enemy - -- default to true if nothing is returned - local continue = (Gamestate.onNoteHit(enemy, enemyNote[1].ver, "EnemyHit", i) == nil or false) and true or false - - if continue then - if enemyNote[1]:getAnimName() == "hold" or enemyNote[1]:getAnimName() == "end" then - if enemyNote[1]:getAnimName() == "hold" then - HoldCover:show(i, 2) - else - HoldCover:hide(i, 2) - end - if useAltAnims then - if whohit and whohit.holdTimer > whohit.maxHoldTimer then whohit:animate(curAnim .. " alt", _psychmod and true or false) end - else - if whohit and whohit.holdTimer > whohit.maxHoldTimer then whohit:animate(curAnim, (_psychmod and true or false)) end - end - else - NoteSplash:new( - { - anim = CONSTANTS.WEEKS.NOTE_LIST[i] .. tostring(love.math.random(1, 2)), - posX = enemyArrow.x, - posY = enemyArrow.y, - }, - i - ) - if useAltAnims then - if whohit then whohit:animate(curAnim .. " alt", false) end + for j = 1, #enemyNote do + local ableTohit = true + if enemyNote[j].hitNote ~= nil then + ableTohit = enemyNote[j].hitNote + end + + if (enemyNote[j].time - musicTime <= 0) and ableTohit then + enemyArrow:animate(CONSTANTS.WEEKS.NOTE_LIST[i] .. " confirm", false) + useAltAnims = false + + local whohit = enemy + -- default to true if nothing is returned + local continue = (Gamestate.onNoteHit(enemy, enemyNote[j].ver, "EnemyHit", i) == nil or false) and true or false + + if continue then + if enemyNote[j]:getAnimName() == "hold" or enemyNote[j]:getAnimName() == "end" then + if enemyNote[j]:getAnimName() == "hold" then + HoldCover:show(i, 2, enemyNote[j].x, enemyNote[j].y) + else + HoldCover:hide(i, 2) + end + if useAltAnims then + if whohit and whohit.holdTimer > whohit.maxHoldTimer then whohit:animate(curAnim .. " alt", _psychmod and true or false) end + else + if whohit and whohit.holdTimer > whohit.maxHoldTimer then whohit:animate(curAnim, (_psychmod and true or false)) end + end else - if whohit then whohit:animate(curAnim, false) end + NoteSplash:new( + { + anim = CONSTANTS.WEEKS.NOTE_LIST[i] .. tostring(love.math.random(1, 2)), + posX = enemyArrow.x, + posY = enemyArrow.y, + }, + i + ) + if useAltAnims then + if whohit then whohit:animate(curAnim .. " alt", false) end + else + if whohit then whohit:animate(curAnim, false) end + end end end - end - - if whohit then whohit.lastHit = musicTime end + + if whohit then whohit.lastHit = musicTime end + + table.remove(enemyNote, 1) - table.remove(enemyNote, 1) + break + end end end @@ -944,7 +992,7 @@ return { if boyfriendNote[1]:getAnimName() == "hold" or boyfriendNote[1]:getAnimName() == "end" then if boyfriendNote[1]:getAnimName() == "hold" then - HoldCover:show(i, 1) + HoldCover:show(i, 1, boyfriendNote[1].x, boyfriendNote[1].y) else HoldCover:hide(i, 1) end @@ -1113,7 +1161,7 @@ return { if #boyfriendNote > 0 and input:down(curInput) and ((boyfriendNote[1].y <= boyfriendArrow.y)) and (boyfriendNote[1]:getAnimName() == "hold" or boyfriendNote[1]:getAnimName() == "end") then if boyfriendNote[1]:getAnimName() == "hold" then - HoldCover:show(i, 1) + HoldCover:show(i, 1, boyfriendNote[1].x, boyfriendNote[1].y) else HoldCover:hide(i, 1) end @@ -1228,7 +1276,8 @@ return { else love.graphics.scale(0.7, -0.7) end - love.graphics.scale(uiScale.zoom, uiScale.zoom) + love.graphics.scale(uiCam.zoom, uiCam.zoom) + love.graphics.translate(uiCam.x, uiCam.y) graphics.setColor(1, 1, 1) for i = 1, 4 do @@ -1265,7 +1314,7 @@ return { love.graphics.push() love.graphics.push() for j = #enemyNotes[i], 1, -1 do - if enemyNotes[i][j].y <= 600 then + if enemyNotes[i][j].y <= 600 and enemyNotes[i][j].y >= -600 then local animName = enemyNotes[i][j]:getAnimName() if settings.middleScroll then graphics.setColor(1, 1, 1, 0.8 * enemyNotes[i][j].alpha) @@ -1288,7 +1337,7 @@ return { love.graphics.pop() love.graphics.push() for j = #boyfriendNotes[i], 1, -1 do - if boyfriendNotes[i][j].y <= 600 then + if boyfriendNotes[i][j].y <= 600 and boyfriendNotes[i][j].y >= -600 then local animName = boyfriendNotes[i][j]:getAnimName() graphics.setColor(1, 1, 1, math.min(1, (500 + (boyfriendNotes[i][j].y)) / 75) * boyfriendNotes[i][j].alpha) @@ -1350,7 +1399,8 @@ return { love.graphics.push() love.graphics.translate(push:getWidth() / 2, push:getHeight() / 2) love.graphics.scale(0.7, 0.7) - love.graphics.scale(uiScale.zoom, uiScale.zoom) + love.graphics.scale(uiCam.zoom, uiCam.zoom) + love.graphics.translate(uiCam.x, uiCam.y) love.graphics.push() graphics.setColor(0,0,0,settings.scrollUnderlayTrans) local baseX = boyfriendArrows[1].x - (boyfriendArrows[1]:getFrameWidth(CONSTANTS.WEEKS.NOTE_LIST[i])/2) * (pixel and 8 or 0) + (pixel and -15 or 0) @@ -1384,11 +1434,11 @@ return { self:healthbarText("Score: " .. score .. " | Misses: " .. misses .. " | Accuracy: " .. ((math.floor(ratingPercent * 10000) / 100)) .. "%") - if settings.botPlay then + --[[ if settings.botPlay then botplayY = botplayY + math.sin(love.timer.getTime()) * 0.15 uitext("BOTPLAY", -85, botplayY, 0, 2, 2, 0, 0, 0, 0, botplayAlpha[1]) graphics.setColor(1, 1, 1) - end + end ]] love.graphics.pop() end, diff --git a/src/love/weeks/week4.lua b/src/love/weeks/week4.lua index c89403f3..80c5ce3b 100644 --- a/src/love/weeks/week4.lua +++ b/src/love/weeks/week4.lua @@ -76,11 +76,11 @@ return { -- Hardcoded M.I.L.F camera scaling if song == 3 and musicTime > 56000 and musicTime < 67000 and musicThres ~= oldMusicThres and math.fmod(absMusicTime, 60000 / bpm) < 100 then if camScaleTimer then Timer.cancel(camScaleTimer) end - if uiScaleTimer then Timer.cancel(uiScaleTimer) end + if uiCamTimer then Timer.cancel(uiCamTimer) end camScaleTimer = Timer.tween((60 / bpm) / 16, camera, {zoom = camera.zoom * 1.05}, "out-quad", function() camScaleTimer = Timer.tween((60 / bpm), camera, {zoom = camera.defaultZoom}, "out-quad") end) - uiScaleTimer = Timer.tween((60 / bpm) / 16, uiScale, {zoom = uiScale.zoom * 1.03}, "out-quad", function() camScaleTimer = Timer.tween((60 / bpm), uiScale, {x = 1, y = 1}, "out-quad") end) + uiCamTimer = Timer.tween((60 / bpm) / 16, uiCam, {zoom = uiCam.zoom * 1.03}, "out-quad", function() camScaleTimer = Timer.tween((60 / bpm), uiCam, {x = 1, y = 1}, "out-quad") end) camera.zooming = false elseif song == 3 and musicTime > 67000 then camera.zooming = true @@ -88,7 +88,7 @@ return { if not camera.zooming then camera.zoom = util.lerp(camera.defaultZoom, camera.zoom, util.clamp(1 - (dt * 3.125), 0, 1)) - uiScale.zoom = util.lerp(1, uiScale.zoom, util.clamp(1 - (dt * 3.125), 0, 1)) + uiCam.zoom = util.lerp(1, uiCam.zoom, util.clamp(1 - (dt * 3.125), 0, 1)) end -- so the camera actually unzooms weeks:checkSongOver()