diff --git a/characters/gf-christmas.json b/characters/gf-christmas.json index f2eb6ce..7f4e472 100644 --- a/characters/gf-christmas.json +++ b/characters/gf-christmas.json @@ -185,8 +185,8 @@ 0 ], "camera_position": [ - -600, - -130 + -1230, + -200 ], "sing_duration": 4, "scale": 1 diff --git a/charts/blammed/blammed-metadata-erect.json b/charts/blammed/blammed-metadata-erect.json index c98d385..d804edb 100644 --- a/charts/blammed/blammed-metadata-erect.json +++ b/charts/blammed/blammed-metadata-erect.json @@ -11,7 +11,7 @@ "opponent": "pico", "instrumental": "erect" }, - "stage": "phillyTrainErect", + "stage": "phillyErect", "noteStyle": "funkin", "ratings": { "erect": 11, "nightmare": 12 }, "album": "volume3", diff --git a/charts/blammed/blammed-metadata-pico.json b/charts/blammed/blammed-metadata-pico.json index 4c0d1c2..deec1c3 100644 --- a/charts/blammed/blammed-metadata-pico.json +++ b/charts/blammed/blammed-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Blammed (Pico Mix)", + "songName": "Blammed Pico", "artist": "Metaroom (feat. Saruky)", "charter": "fabs + Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "phillyTrainErect", + "stage": "phillyErect", "noteStyle": "funkin", "ratings": { "easy": 3, "normal": 4, "hard": 5 }, "album": "volume4", diff --git a/charts/blammed/blammed-metadata.json b/charts/blammed/blammed-metadata.json index 739696f..6a513eb 100644 --- a/charts/blammed/blammed-metadata.json +++ b/charts/blammed/blammed-metadata.json @@ -4,7 +4,7 @@ "artist": "Kawai Sprite", "charter": "ninjamuffin99 + MtH", "playData": { - "stage": "phillyTrain", + "stage": "philly", "characters": { "player": "bf", "girlfriend": "gf", diff --git a/charts/bopeebo/bopeebo-metadata-erect.json b/charts/bopeebo/bopeebo-metadata-erect.json index 9b9c3b8..e8bfa64 100644 --- a/charts/bopeebo/bopeebo-metadata-erect.json +++ b/charts/bopeebo/bopeebo-metadata-erect.json @@ -11,7 +11,7 @@ "opponent": "dad", "instrumental": "erect" }, - "stage": "mainStageErect", + "stage": "stageErect", "noteStyle": "funkin", "ratings": { "erect": 7, "nightmare": 8 }, "album": "volume3", diff --git a/charts/bopeebo/bopeebo-metadata-pico.json b/charts/bopeebo/bopeebo-metadata-pico.json index e56ff50..b9b0b15 100644 --- a/charts/bopeebo/bopeebo-metadata-pico.json +++ b/charts/bopeebo/bopeebo-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Bopeebo (Pico Mix)", + "songName": "Bopeebo Pico", "artist": "ThatAndyGuy (feat. Saruky)", "charter": "fabs + Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "mainStageErect", + "stage": "stageErect", "noteStyle": "funkin", "ratings": { "easy": 1, "normal": 2, "hard": 3 }, "album": "volume4", diff --git a/charts/bopeebo/bopeebo-metadata.json b/charts/bopeebo/bopeebo-metadata.json index 3ab1adc..91aef33 100644 --- a/charts/bopeebo/bopeebo-metadata.json +++ b/charts/bopeebo/bopeebo-metadata.json @@ -19,7 +19,7 @@ "instrumental": "", "altInstrumentals": ["pico"] }, - "stage": "mainStage", + "stage": "stage", "noteStyle": "funkin", "album": "volume1", "previewStart": 0, diff --git a/charts/cocoa/cocoa-metadata-erect.json b/charts/cocoa/cocoa-metadata-erect.json index 0219ed0..287a3af 100644 --- a/charts/cocoa/cocoa-metadata-erect.json +++ b/charts/cocoa/cocoa-metadata-erect.json @@ -12,7 +12,7 @@ "instrumental": "erect", "altInstrumentals": [] }, - "stage": "mallXmasErect", + "stage": "mallErect", "noteStyle": "funkin", "ratings": { "erect": 7, "nightmare": 8 }, "album": "volume4", diff --git a/charts/cocoa/cocoa-metadata-pico.json b/charts/cocoa/cocoa-metadata-pico.json index 3e57dce..16674ad 100644 --- a/charts/cocoa/cocoa-metadata-pico.json +++ b/charts/cocoa/cocoa-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Cocoa (Pico Mix)", + "songName": "Cocoa Pico", "artist": "Six Impala (feat. Saruky)", "charter": "fabs + Spazkid", "playData": { @@ -13,7 +13,7 @@ "opponentVocals": ["parents-christmas"], "playerVocals": ["pico-christmas"] }, - "stage": "mallXmasErect", + "stage": "mallErect", "noteStyle": "funkin", "album": "expansion2", "ratings": { "easy": 2, "normal": 3, "hard": 4 }, diff --git a/charts/cocoa/cocoa-metadata.json b/charts/cocoa/cocoa-metadata.json index 27e2e02..a3aa67d 100644 --- a/charts/cocoa/cocoa-metadata.json +++ b/charts/cocoa/cocoa-metadata.json @@ -5,7 +5,7 @@ "charter": "ninjamuffin99 + MtH", "playData": { "songVariations": ["erect", "pico"], - "stage": "mallXmas", + "stage": "mall", "characters": { "player": "bf-christmas", "girlfriend": "gf-christmas", diff --git a/charts/dadbattle/dadbattle-metadata-erect.json b/charts/dadbattle/dadbattle-metadata-erect.json index 3f12f8f..1a87e0f 100644 --- a/charts/dadbattle/dadbattle-metadata-erect.json +++ b/charts/dadbattle/dadbattle-metadata-erect.json @@ -12,7 +12,7 @@ "opponent": "dad", "instrumental": "erect" }, - "stage": "mainStageErect", + "stage": "stageErect", "noteStyle": "funkin", "ratings": { "erect": 9, "nightmare": 10 }, "album": "volume3", diff --git a/charts/dadbattle/dadbattle-metadata-pico.json b/charts/dadbattle/dadbattle-metadata-pico.json index 677a163..5cc9d44 100644 --- a/charts/dadbattle/dadbattle-metadata-pico.json +++ b/charts/dadbattle/dadbattle-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "DadBattle (Pico Mix)", + "songName": "DadBattle Pico", "artist": "TeraVex (ft. Saruky)", "charter": "fabs + Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "mainStageErect", + "stage": "stageErect", "noteStyle": "funkin", "ratings": { "easy": 3, "normal": 4, "hard": 5 }, "album": "volume4", diff --git a/charts/dadbattle/dadbattle-metadata.json b/charts/dadbattle/dadbattle-metadata.json index d397b98..fd025ba 100644 --- a/charts/dadbattle/dadbattle-metadata.json +++ b/charts/dadbattle/dadbattle-metadata.json @@ -15,7 +15,7 @@ "opponent": "dad", "altInstrumentals": ["pico"] }, - "stage": "mainStage", + "stage": "stage", "noteStyle": "funkin", "album": "volume1", "previewStart": 0, diff --git a/charts/darnell/darnell-metadata-bf.json b/charts/darnell/darnell-metadata-bf.json index 3adae6b..5d41cc9 100644 --- a/charts/darnell/darnell-metadata-bf.json +++ b/charts/darnell/darnell-metadata-bf.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Darnell (BF Mix)", + "songName": "Darnell (BF", "artist": "Saruky", "charter": "fabs + Spazkid", "playData": { diff --git a/charts/eggnog/eggnog-metadata-erect.json b/charts/eggnog/eggnog-metadata-erect.json index 78d1bdf..16e41c0 100644 --- a/charts/eggnog/eggnog-metadata-erect.json +++ b/charts/eggnog/eggnog-metadata-erect.json @@ -11,7 +11,7 @@ "opponent": "parents-christmas", "instrumental": "erect" }, - "stage": "mallXmasErect", + "stage": "mallErect", "noteStyle": "funkin", "ratings": { "erect": 6, "nightmare": 7 }, "album": "expansion1", diff --git a/charts/eggnog/eggnog-metadata-pico.json b/charts/eggnog/eggnog-metadata-pico.json index d95f353..21daf03 100644 --- a/charts/eggnog/eggnog-metadata-pico.json +++ b/charts/eggnog/eggnog-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Eggnog (Pico Mix)", + "songName": "Eggnog Pico", "artist": "Teravex (ft. Saruky)", "charter": "fabs + Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "mallXmasErect", + "stage": "mallErect", "noteStyle": "funkin", "ratings": { "easy": 3, "normal": 4, "hard": 5 }, "album": "volume4", diff --git a/charts/eggnog/eggnog-metadata.json b/charts/eggnog/eggnog-metadata.json index e796655..af43d2f 100644 --- a/charts/eggnog/eggnog-metadata.json +++ b/charts/eggnog/eggnog-metadata.json @@ -4,7 +4,7 @@ "artist": "Kawai Sprite", "charter": "ninjamuffin99 + MtH", "playData": { - "stage": "mallXmas", + "stage": "mall", "characters": { "player": "bf-christmas", "girlfriend": "gf-christmas", diff --git a/charts/fresh/fresh-metadata-erect.json b/charts/fresh/fresh-metadata-erect.json index cbcf492..7bacaa1 100644 --- a/charts/fresh/fresh-metadata-erect.json +++ b/charts/fresh/fresh-metadata-erect.json @@ -11,7 +11,7 @@ "opponent": "dad", "instrumental": "erect" }, - "stage": "mainStageErect", + "stage": "stageErect", "noteStyle": "funkin", "ratings": { "erect": 6, "nightmare": 7 }, "album": "volume3", diff --git a/charts/fresh/fresh-metadata-pico.json b/charts/fresh/fresh-metadata-pico.json index 66f64ed..3c8a078 100644 --- a/charts/fresh/fresh-metadata-pico.json +++ b/charts/fresh/fresh-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Fresh (Pico Mix)", + "songName": "Fresh Pico", "artist": "Xploshi (ft. Saster)", "charter": "fabs + Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "mainStageErect", + "stage": "stageErect", "noteStyle": "funkin", "ratings": { "easy": 2, "normal": 3, "hard": 4 }, "album": "volume4", diff --git a/charts/fresh/fresh-metadata.json b/charts/fresh/fresh-metadata.json index de6ee1a..7ca80a1 100644 --- a/charts/fresh/fresh-metadata.json +++ b/charts/fresh/fresh-metadata.json @@ -5,7 +5,7 @@ "charter": "ninjamuffin99 + MtH", "playData": { "album": "volume1", - "stage": "mainStage", + "stage": "stage", "characters": { "player": "bf", "girlfriend": "gf", diff --git a/charts/guns/guns-metadata-pico.json b/charts/guns/guns-metadata-pico.json index 6af356f..11020c0 100644 --- a/charts/guns/guns-metadata-pico.json +++ b/charts/guns/guns-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Guns (Pico Mix)", + "songName": "Guns Pico", "artist": "tsuyunoshi (ft. Saruky)", "charter": "fabs + Spazkid", "divisions": 96, @@ -18,7 +18,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "tankmanBattlefieldErect", + "stage": "tankErect", "noteStyle": "funkin", "ratings": { "easy": 3, "normal": 4, "hard": 5 }, "album": "volume4", diff --git a/charts/guns/guns-metadata.json b/charts/guns/guns-metadata.json index f6ea6ab..d77353a 100644 --- a/charts/guns/guns-metadata.json +++ b/charts/guns/guns-metadata.json @@ -4,7 +4,7 @@ "artist": "Kawai Sprite", "charter": "MtH", "playData": { - "stage": "tankmanBattlefield", + "stage": "tank", "songVariations": ["pico"], "characters": { "player": "bf", diff --git a/charts/lit-up/lit-up-metadata-bf.json b/charts/lit-up/lit-up-metadata-bf.json index 465c266..b78af81 100644 --- a/charts/lit-up/lit-up-metadata-bf.json +++ b/charts/lit-up/lit-up-metadata-bf.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Lit Up (BF Mix)", + "songName": "Lit Up (BF", "artist": "Saruky", "charter": "fabs + Spazkid", "divisions": 96, diff --git a/charts/philly-nice/philly-nice-metadata-erect.json b/charts/philly-nice/philly-nice-metadata-erect.json index bf91807..afcdec6 100644 --- a/charts/philly-nice/philly-nice-metadata-erect.json +++ b/charts/philly-nice/philly-nice-metadata-erect.json @@ -11,7 +11,7 @@ "opponent": "pico", "instrumental": "erect" }, - "stage": "phillyTrainErect", + "stage": "phillyErect", "noteStyle": "funkin", "ratings": { "erect": 8, "nightmare": 9 }, "album": "volume3", diff --git a/charts/philly-nice/philly-nice-metadata-pico.json b/charts/philly-nice/philly-nice-metadata-pico.json index 1fc89a8..73a29d2 100644 --- a/charts/philly-nice/philly-nice-metadata-pico.json +++ b/charts/philly-nice/philly-nice-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Philly Nice (Pico Mix)", + "songName": "Philly Nice Pico", "artist": "tsuyunoshi (ft. Saruky)", "charter": "Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "phillyTrainErect", + "stage": "phillyErect", "noteStyle": "funkin", "ratings": { "easy": 2, "normal": 3, "hard": 4 }, "album": "volume4", diff --git a/charts/philly-nice/philly-nice-metadata.json b/charts/philly-nice/philly-nice-metadata.json index 70db1a8..b4eef25 100644 --- a/charts/philly-nice/philly-nice-metadata.json +++ b/charts/philly-nice/philly-nice-metadata.json @@ -4,7 +4,7 @@ "artist": "Kawai Sprite", "charter": "ninjamuffin99 + MtH + Spazkid", "playData": { - "stage": "phillyTrain", + "stage": "philly", "characters": { "player": "bf", "girlfriend": "gf", diff --git a/charts/pico/pico-metadata-erect.json b/charts/pico/pico-metadata-erect.json index 5ddd692..05481b6 100644 --- a/charts/pico/pico-metadata-erect.json +++ b/charts/pico/pico-metadata-erect.json @@ -12,7 +12,7 @@ "instrumental": "erect", "altInstrumentals": [] }, - "stage": "phillyTrainErect", + "stage": "phillyErect", "noteStyle": "funkin", "ratings": { "erect": 9, "nightmare": 10 }, "album": "volume3", diff --git a/charts/pico/pico-metadata-pico.json b/charts/pico/pico-metadata-pico.json index d201561..14bf9df 100644 --- a/charts/pico/pico-metadata-pico.json +++ b/charts/pico/pico-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Pico (Pico Mix)", + "songName": "Pico Pico", "artist": "Metaroom (ft. Saster)", "charter": "fabs", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "phillyTrainErect", + "stage": "phillyErect", "noteStyle": "funkin", "ratings": { "easy": 2, "normal": 3, "hard": 4 }, "album": "expansion2", diff --git a/charts/pico/pico-metadata.json b/charts/pico/pico-metadata.json index be3db74..fc14985 100644 --- a/charts/pico/pico-metadata.json +++ b/charts/pico/pico-metadata.json @@ -5,7 +5,7 @@ "charter": "ninjamuffin99 + MtH", "playData": { "album": "volume1", - "stage": "phillyTrain", + "stage": "philly", "characters": { "player": "bf", "girlfriend": "gf", "opponent": "pico" }, "songVariations": ["erect", "pico"], "difficulties": ["easy", "normal", "hard"], diff --git a/charts/roses/roses-metadata-pico.json b/charts/roses/roses-metadata-pico.json index 8ef9ace..8e2b196 100644 --- a/charts/roses/roses-metadata-pico.json +++ b/charts/roses/roses-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Roses (Pico Mix)", + "songName": "Roses Pico", "artist": "Xploshi (ft. Saruky)", "charter": "fabs + Spazkid", "divisions": 96, diff --git a/charts/senpai/senpai-metadata-pico.json b/charts/senpai/senpai-metadata-pico.json index 4547882..c80bc86 100644 --- a/charts/senpai/senpai-metadata-pico.json +++ b/charts/senpai/senpai-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Senpai (Pico Mix)", + "songName": "Senpai Pico", "artist": "Tee Lopes (Feat. Saruky)", "charter": "fabs + Spazkid", "divisions": 96, diff --git a/charts/south/south-metadata-pico.json b/charts/south/south-metadata-pico.json index b8e4989..70cb839 100644 --- a/charts/south/south-metadata-pico.json +++ b/charts/south/south-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "South (Pico Mix)", + "songName": "South Pico", "artist": "Six Impala (feat. Saster)", "charter": "fabs + Spazkid", "playData": { diff --git a/charts/spookeez/spookeez-metadata-pico.json b/charts/spookeez/spookeez-metadata-pico.json index 94b26a7..bf6218c 100644 --- a/charts/spookeez/spookeez-metadata-pico.json +++ b/charts/spookeez/spookeez-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Spookeez (Pico Mix)", + "songName": "Spookeez Pico", "artist": "Six Impala (feat. Saster)", "charter": "fabs + Spazkid", "playData": { diff --git a/charts/stress/stress-metadata-pico.json b/charts/stress/stress-metadata-pico.json index c2ff74c..f0ccb69 100644 --- a/charts/stress/stress-metadata-pico.json +++ b/charts/stress/stress-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Stress (Pico Mix)", + "songName": "Stress Pico", "artist": "Saruky", "charter": "fabs + Spazkid", "divisions": 96, @@ -11,13 +11,13 @@ "characters": { "player": "pico-holding-nene", "girlfriend": "otis-speaker", - "opponent": "tankman-bloody", + "opponent": "tankman", "instrumental": "pico", "altInstrumentals": [], "opponentVocals": ["tankman"], "playerVocals": ["pico"] }, - "stage": "tankmanBattlefieldErect", + "stage": "tankErect", "noteStyle": "funkin", "album": "expansion2", "ratings": { "easy": 4, "normal": 5, "hard": 6 }, diff --git a/charts/stress/stress-metadata.json b/charts/stress/stress-metadata.json index 22ab275..78386b3 100644 --- a/charts/stress/stress-metadata.json +++ b/charts/stress/stress-metadata.json @@ -12,7 +12,7 @@ "instrumental": "", "altInstrumentals": ["pico"] }, - "stage": "tankmanBattlefield", + "stage": "tank", "songVariations": ["pico"], "noteStyle": "funkin", "ratings": { "easy": 3, "normal": 4, "hard": 5 }, diff --git a/charts/tutorial/tutorial-metadata.json b/charts/tutorial/tutorial-metadata.json index dc2e020..5463d18 100644 --- a/charts/tutorial/tutorial-metadata.json +++ b/charts/tutorial/tutorial-metadata.json @@ -5,7 +5,7 @@ "charter": "ninjamuffin99 + MtH", "playData": { "ratings": { "easy": 0, "normal": 0, "hard": 1 }, - "stage": "mainStage", + "stage": "stage", "characters": { "player": "bf", "opponent": "gf" }, "difficulties": ["easy", "normal", "hard"], "noteStyle": "funkin", diff --git a/charts/ugh/ugh-metadata-erect.json b/charts/ugh/ugh-metadata-erect.json index 007711b..ede4408 100644 --- a/charts/ugh/ugh-metadata-erect.json +++ b/charts/ugh/ugh-metadata-erect.json @@ -12,7 +12,7 @@ "instrumental": "erect", "altInstrumentals": [] }, - "stage": "tankmanBattlefieldErect", + "stage": "tankErect", "noteStyle": "funkin", "ratings": { "erect": 8, "nightmare": 9 }, "album": "volume4", diff --git a/charts/ugh/ugh-metadata-pico.json b/charts/ugh/ugh-metadata-pico.json index fb98515..c5c1781 100644 --- a/charts/ugh/ugh-metadata-pico.json +++ b/charts/ugh/ugh-metadata-pico.json @@ -1,6 +1,6 @@ { "version": "2.2.4", - "songName": "Ugh (Pico Mix)", + "songName": "Ugh Pico", "artist": "tsuyunoshi (ft. Saruky)", "charter": "fabs + Spazkid", "playData": { @@ -12,7 +12,7 @@ "instrumental": "pico", "altInstrumentals": [] }, - "stage": "tankmanBattlefieldErect", + "stage": "tankErect", "noteStyle": "funkin", "ratings": { "easy": 2, "normal": 3, "hard": 4 }, "album": "volume4", diff --git a/charts/ugh/ugh-metadata.json b/charts/ugh/ugh-metadata.json index 6be979e..1cb424d 100644 --- a/charts/ugh/ugh-metadata.json +++ b/charts/ugh/ugh-metadata.json @@ -13,7 +13,7 @@ "altInstrumentals": ["pico"] }, "songVariations": ["erect", "pico"], - "stage": "tankmanBattlefield", + "stage": "tank", "noteStyle": "funkin", "ratings": { "easy": 2, "normal": 3, "hard": 4 }, "album": "volume2", diff --git a/images/healthBar.png b/images/healthBar.png new file mode 100644 index 0000000..8bfec94 Binary files /dev/null and b/images/healthBar.png differ diff --git a/modules/types/render.lua b/modules/types/render.lua index 52bf9bb..8f53be5 100644 --- a/modules/types/render.lua +++ b/modules/types/render.lua @@ -439,6 +439,7 @@ function module.drawUI() if thing.isImage then local cameraOffset = thing.ui and Vector2() or module.cameraPosition + local sizex, sizey = thing:getWidth(), thing:getHeight() if type(thing.shader) == "string" and loadedShaders[thing.shader] then love.graphics.setShader(loadedShaders[thing.shader]) elseif thing.shader then @@ -448,7 +449,9 @@ function module.drawUI() end love.graphics.draw(thing.image, thing.position.x + cameraOffset.x * thing.modifier + render.offset.x, thing.position.y + cameraOffset.y * thing.modifier + render.offset.y, thing.rotation, - thing.resize.x * (thing.flipX and -1 or 1), thing.resize.y * (thing.flipY and -1 or 1)) + thing.resize.x * (thing.flipX and -1 or 1), thing.resize.y * (thing.flipY and -1 or 1), + thing.anchor.x * sizex, + thing.anchor.y * sizey) love.graphics.setShader(defaultShader) elseif thing.isSprite then local sprite = thing @@ -843,4 +846,4 @@ end render.sprites = Sprites render.sprite = Sprite -return module +return module \ No newline at end of file diff --git a/stages/mallErect.lua b/stages/mallErect.lua index 7b122c6..af4647d 100644 --- a/stages/mallErect.lua +++ b/stages/mallErect.lua @@ -13,14 +13,14 @@ local dirs = { return { onCreate = function(song) local bg = Image("images/mall/erect/bgWalls.png") - bg.position = Vector2(-700, -440) + bg.position = Vector2(-1000, -440) bg.resize = Vector2(0.9, 0.9) bg.modifier = 0.2 bg.layer = -10 upperBop = Sprite("sprites/mall/erect/upperBop.png", "sprites/mall/erect/upperBop.json") upperBop:PlayAnimation("upperBop", 24, false) - upperBop.position = Vector2(-480, -40) + upperBop.position = Vector2(-480, -80) upperBop.modifier = 0.33 upperBop.resize = Vector2(0.85, 0.85) upperBop.layer = -9 diff --git a/stages/school.lua b/stages/school.lua index b697118..a5e521a 100644 --- a/stages/school.lua +++ b/stages/school.lua @@ -32,7 +32,6 @@ function module.onCreate(song) Trees.position = Vector2(-1800, -1500) Trees.modifier = 1.1 Trees:Resize(8) - Trees:PlayAnimation("TREES", 24, true) local Petals = Sprite("sprites/weeb/petals.png", "sprites/weeb/petals.xml") diff --git a/stages/secretStageOne.lua b/stages/secretStageOne.lua index a751c97..71f14f5 100644 --- a/stages/secretStageOne.lua +++ b/stages/secretStageOne.lua @@ -1,3 +1,4 @@ +---@type engine.module local module = {} --local skyScroll = {} @@ -45,4 +46,8 @@ function module.onCreate(song) pikaPlat.modifier = 0 end +function module.onUpdate() + love.graphics.setDefaultFilter("nearest", "nearest", 0) +end + return module \ No newline at end of file diff --git a/states/creditsstate.lua b/states/creditsstate.lua index 938d951..37451c4 100644 --- a/states/creditsstate.lua +++ b/states/creditsstate.lua @@ -8,7 +8,7 @@ local credits = { icon = "images/credits/idk.png" }, { - name = "MarkedAman \n(Assets, DadBattle MRK Mix)", + name = "MarkedAman \n(Assets, DadBattle MRK)", icon = "images/credits/aman.png" }, { diff --git a/states/playstate.lua b/states/playstate.lua index e01d4dc..d1a3b71 100644 --- a/states/playstate.lua +++ b/states/playstate.lua @@ -66,6 +66,36 @@ local covers = { "Red" } +local healthbarShader = [[ + extern number opr; + extern number og; + extern number ob; + extern number pr; + extern number pg; + extern number pb; + extern number h; + + vec4 effect( vec4 color, Image texture, vec2 texture_coords, vec2 screen_coords ){ + vec4 pixel = Texel(texture, texture_coords); + + if (pixel.r == 0) { + return pixel; + } + + if (1 - texture_coords.x < h / 2) { + pixel.r = pr; + pixel.g = pg; + pixel.b = pb; + } else { + pixel.r = opr; + pixel.g = og; + pixel.b = ob; + } + + return pixel; + } +]] + local function state(songName, songDifficulty, show) ---@type engine.state local state = {} -- Returns needed functions for the state to work after loading it properly @@ -147,7 +177,6 @@ local function state(songName, songDifficulty, show) local icons = {} - local data = love.filesystem.getSaveDirectory() local ui = { @@ -180,6 +209,16 @@ local function state(songName, songDifficulty, show) local opponentHoldCovers = {} local splashes = {} + local shader = love.graphics.newShader(healthbarShader) + + local healthBar = Image("images/healthBar.png") + healthBar.anchor = Vector2(0.5, 0.5) + healthBar.shader = shader + healthBar.position = Vector2(960, 50) + healthBar.ui = true + healthBar.resize = Vector2(1.5, 1.5) + healthBar.layer = 15 + local keyBinds = {} -- loaded from settings.json, if anything's wrong then try rebinding in the menu local offset = 0 @@ -789,6 +828,8 @@ local function state(songName, songDifficulty, show) end end + shader:send("h", health) + if health <= 0 then die() elseif health > 2 then @@ -826,32 +867,15 @@ local function state(songName, songDifficulty, show) -- HEALTH BAR if playing and ui.health then - love.graphics.setColor(characters.dad and characters.dad.colors[1] / 255 or 0, - characters.dad and characters.dad.colors[2] / 255 or 1, - characters.dad and characters.dad.colors[1] / 255 or 0 - ) - love.graphics.rectangle("fill", 560 + render.offset.x, (settings.Downscroll and 30 or 960) + render.offset.y, - 800, 30) - love.graphics.setColor(characters.bf.colors[1] / 255, characters.bf.colors[2] / 255, - characters.bf.colors[3] / 255) - love.graphics.rectangle("fill", (1360 - health * 400) + render.offset.x, - (settings.Downscroll and 30 or 960) + render.offset.y, health * 400, 30) - - love.graphics.setColor(0, 0, 0) - love.graphics.rectangle("line", 560 + render.offset.x, (settings.Downscroll and 30 or 960) + render.offset.y, - 800, 30) - - love.graphics.setColor(1, 1, 1) - if ui.healthIcons then love.graphics.draw(icons.bf.image, health > .2 and icons.bf.alive or icons.bf.dead, - (1510 - health * 400) + render.offset.x - (75 - 150 * iconZoom / 2), + (1110 - (health - 1) * 460) + render.offset.x - (75 - 150 * iconZoom / 2), (settings.Downscroll and 0 or 930) + render.offset.y + (75 - 150 * iconZoom / 2), 0, -iconZoom, iconZoom) if characters.dad then love.graphics.draw(icons.dad.image, health < 1.8 and icons.dad.alive or icons.dad.dead, - (1210 - health * 400) + render.offset.x + (75 - 150 * iconZoom / 2), + (810 - (health - 1) * 460) + render.offset.x + (75 - 150 * iconZoom / 2), (settings.Downscroll and 0 or 930) + render.offset.y + (75 - 150 * iconZoom / 2), 0, iconZoom, iconZoom) end @@ -939,6 +963,9 @@ local function state(songName, songDifficulty, show) if not characters.bf.hasStagePosition then characters.bf.stagePosition = Vector2(stage.boyfriend[1], stage.boyfriend[2]) end + shader:send("pr", characters.bf.colors[1] / 255) + shader:send("pg", characters.bf.colors[2] / 255) + shader:send("pb", characters.bf.colors[3] / 255) local image = love.graphics.newImage(string.format("images/icons/icon-%s.png", characters.bf.icon)) icons.bf = { @@ -948,6 +975,10 @@ local function state(songName, songDifficulty, show) 150, 0, 150, 150, image) } + shader:send("opr", 0) + shader:send("og", 0) + shader:send("ob", 0) + if metadata.playData.characters.opponent and metadata.playData.characters.opponent ~= "none" then -- you can have no player2 but always player1 characters.dad = Character(metadata.playData.characters.opponent) characters.dad:PlayAnimation(characters.dad.animInfo.idle and "idle" or "danceLeft") @@ -964,6 +995,10 @@ local function state(songName, songDifficulty, show) dead = love.graphics .newQuad(150, 0, 150, 150, image) } + + shader:send("opr", characters.dad.colors[1] / 255) + shader:send("og", characters.dad.colors[2] / 255) + shader:send("ob", characters.dad.colors[3] / 255) end conductor.stepCrochet = conductor:calculateCrochet(metadata.timeChanges[1].bpm) / 4 diff --git a/states/secretcodestate.lua b/states/secretcodestate.lua index 6cd4be0..bfb29b2 100644 --- a/states/secretcodestate.lua +++ b/states/secretcodestate.lua @@ -52,7 +52,7 @@ 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 eneteredCode == "grndad" then + elseif enteredCode == "grndad" then ominousText = "Same umbrella, different vain." else letter1 = ""