diff --git a/characters/bf-pixel.json b/characters/bf-pixel.json index 3bfe45f..739d473 100644 --- a/characters/bf-pixel.json +++ b/characters/bf-pixel.json @@ -8,7 +8,7 @@ ], "anim": "singLEFTmiss", "fps": 24, - "name": "BF Left Miss", + "name": "BF LEFT MISS instance 1", "indices": [] }, { @@ -19,7 +19,7 @@ ], "anim": "singUPmiss", "fps": 24, - "name": "BF Up Miss", + "name": "BF UP MISS instance 1", "indices": [] }, { @@ -30,7 +30,7 @@ ], "anim": "singLEFT", "fps": 24, - "name": "BFLeft", + "name": "BF LEFT NOTE instance 1", "indices": [] }, { @@ -41,7 +41,7 @@ ], "anim": "singRIGHT", "fps": 24, - "name": "BFRight", + "name": "BF RIGHT NOTE instance 1", "indices": [] }, { @@ -52,7 +52,7 @@ ], "anim": "singDOWNmiss", "fps": 24, - "name": "BF Down Miss", + "name": "BF DOWN MISS instance 1", "indices": [] }, { @@ -63,7 +63,7 @@ ], "anim": "singRIGHTmiss", "fps": 24, - "name": "BF Right Miss", + "name": "BF RIGHT MISS instance 1", "indices": [] }, { @@ -74,7 +74,7 @@ ], "anim": "singDOWN", "fps": 24, - "name": "BFDown", + "name": "BF DOWN NOTE instance 1", "indices": [] }, { @@ -85,7 +85,7 @@ ], "anim": "idle", "fps": 24, - "name": "BFIdle", + "name": "BF IDLE instance 1", "indices": [] }, { @@ -96,7 +96,7 @@ ], "anim": "singUP", "fps": 24, - "name": "BFUp", + "name": "BF UP NOTE instance 1", "indices": [] }, { @@ -112,22 +112,22 @@ } ], "no_antialiasing": true, - "image": "sprites/characters/bfPixelNew", + "image": "sprites/characters/bfPixel", "position": [ - -40, - 360 + -400, + 340 ], "healthicon": "bf-pixel", - "flip_x": true, + "flip_x": false, "healthbar_colors": [ 123, 214, 226 ], "camera_position": [ - 200, - -180 + -400, + 200 ], "sing_duration": 4, - "scale": 6 + "scale": 7 } \ No newline at end of file diff --git a/characters/gf-pixel.json b/characters/gf-pixel.json index 32e0e6d..c1233a3 100644 --- a/characters/gf-pixel.json +++ b/characters/gf-pixel.json @@ -70,8 +70,8 @@ "no_antialiasing": true, "image": "sprites/characters/gfPixel", "position": [ - 0, - 0 + -600, + -50 ], "healthicon": "gf", "flip_x": false, @@ -81,9 +81,9 @@ 77 ], "camera_position": [ - -20, - 80 + -630, + 30 ], "sing_duration": 4, - "scale": 5.99999999999999 + "scale": 7 } \ No newline at end of file diff --git a/characters/senpai-angry.json b/characters/senpai-angry.json index 9a5aa09..6f78138 100644 --- a/characters/senpai-angry.json +++ b/characters/senpai-angry.json @@ -1,66 +1,65 @@ { "animations": [ { - "loop": false, - "offsets": [ - 2, - 0 - ], - "fps": 24, - "anim": "idle", - "indices": [], - "name": "Angry Senpai Idle" - }, - { - "loop": false, - "offsets": [ - 5, - 37 - ], - "fps": 24, - "anim": "singUP", - "indices": [], - "name": "Angry Senpai UP NOTE" - }, - { - "loop": false, - "offsets": [ - 40, - 0 - ], - "fps": 24, - "anim": "singLEFT", - "indices": [], - "name": "Angry Senpai LEFT NOTE" - }, - { - "loop": false, "offsets": [ 0, 0 ], + "loop": false, + "anim": "idle", + "fps": 24, + "name": "Angry Senpai Idle instance 1", + "indices": [] + }, + { + "offsets": [ + 0.83, 6.16 + ], + "loop": false, + "fps": 24, + "anim": "singUP", + "indices": [], + "name": "Angry Senpai UP NOTE instance 1" + }, + { + "offsets": [ + 0, + 0 + ], + "loop": false, "fps": 24, "anim": "singRIGHT", "indices": [], - "name": "Angry Senpai RIGHT NOTE" + "name": "Angry Senpai RIGHT NOTE instance 1" }, { - "loop": false, "offsets": [ - 14, + 6.6, 0 ], + "loop": false, + "fps": 24, + "anim": "singLEFT", + "indices": [], + "name": "Angry Senpai LEFT NOTE instance 1" + }, + { + "offsets": [ + 2.33, + 0 + ], + "loop": false, "fps": 24, "anim": "singDOWN", "indices": [], - "name": "Angry Senpai DOWN NOTE" + "name": "Angry Senpai DOWN NOTE instance 1" } ], "no_antialiasing": true, "image": "sprites/characters/senpai", "position": [ - 150, - 360 + -450, + 40 ], "healthicon": "senpai-angry-pixel", "flip_x": false, @@ -70,9 +69,9 @@ 111 ], "camera_position": [ - -240, - -330 + -800, + 0 ], "sing_duration": 4, - "scale": 6 + "scale": 7 } \ No newline at end of file diff --git a/characters/senpai.json b/characters/senpai.json index 9a4e2d7..086fbc1 100644 --- a/characters/senpai.json +++ b/characters/senpai.json @@ -2,25 +2,24 @@ "animations": [ { "offsets": [ - 1, + 0, 0 ], "loop": false, "anim": "idle", "fps": 24, - "name": "Senpai Idle", + "name": "Senpai Idle instance 1", "indices": [] }, { "offsets": [ - 5, - 37 + 0.83, 6.16 ], "loop": false, "fps": 24, "anim": "singUP", "indices": [], - "name": "SENPAI UP NOTE" + "name": "SENPAI UP NOTE instance 1" }, { "offsets": [ @@ -31,36 +30,36 @@ "fps": 24, "anim": "singRIGHT", "indices": [], - "name": "SENPAI RIGHT NOTE" + "name": "SENPAI RIGHT NOTE instance 1" }, { "offsets": [ - 40, + 6.6, 0 ], "loop": false, "fps": 24, "anim": "singLEFT", "indices": [], - "name": "SENPAI LEFT NOTE" + "name": "SENPAI LEFT NOTE instance 1" }, { "offsets": [ - 14, + 2.33, 0 ], "loop": false, "fps": 24, "anim": "singDOWN", "indices": [], - "name": "SENPAI DOWN NOTE" + "name": "SENPAI DOWN NOTE instance 1" } ], "no_antialiasing": true, "image": "sprites/characters/senpai", "position": [ - 150, - 360 + -450, + 40 ], "healthicon": "senpai-pixel", "flip_x": false, @@ -70,9 +69,9 @@ 111 ], "camera_position": [ - -240, - -330 + -800, + 0 ], "sing_duration": 4, - "scale": 6 + "scale": 7 } \ No newline at end of file diff --git a/charts/roses/roses-metadata-erect.json b/charts/roses/roses-metadata-erect.json index ce1d4cf..55e54da 100644 --- a/charts/roses/roses-metadata-erect.json +++ b/charts/roses/roses-metadata-erect.json @@ -12,7 +12,7 @@ "opponent": "senpai-angry", "instrumental": "erect" }, - "stage": "schoolErect", + "stage": "school", "noteStyle": "pixel", "ratings": { "erect": 8, "nightmare": 9 }, "album": "volume3", diff --git a/charts/senpai/senpai-metadata-erect.json b/charts/senpai/senpai-metadata-erect.json index 1855472..02f2d50 100644 --- a/charts/senpai/senpai-metadata-erect.json +++ b/charts/senpai/senpai-metadata-erect.json @@ -11,7 +11,7 @@ "opponent": "senpai", "instrumental": "erect" }, - "stage": "schoolErect", + "stage": "school", "noteStyle": "pixel", "ratings": { "erect": 6, "nightmare": 7 }, "album": "volume3", diff --git a/charts/songs-bf.lua b/charts/songs-bf.lua index 28212bf..3897557 100644 --- a/charts/songs-bf.lua +++ b/charts/songs-bf.lua @@ -167,6 +167,28 @@ local order = { }, icon = "monsterpixel" }, + { + name = "senpai", + difficulties = { + "easy", + "normal", + "hard", + "erect", + "nightmare" + }, + icon = "bfpixel" + }, + { + name = "roses", + difficulties = { + "easy", + "normal", + "hard", + "erect", + "nightmare" + }, + icon = "bfpixel" + }, { name = "ugh", difficulties = { diff --git a/charts/stress/stress-chart-pico.json b/charts/stress/stress-chart-pico.json index 9d143b7..4bb1bde 100644 --- a/charts/stress/stress-chart-pico.json +++ b/charts/stress/stress-chart-pico.json @@ -501,7 +501,7 @@ { "t": 107780.719101124, "e": "SetCameraBop", - "v": { "rate": 1, "intensity": 1.2 } + "v": { "rate": 1, "intensity": 1.2 } }, { "t": 107865.516853933, diff --git a/modules/types/character.lua b/modules/types/character.lua index 9d879f1..c6591d5 100644 --- a/modules/types/character.lua +++ b/modules/types/character.lua @@ -107,8 +107,7 @@ function _G.Character(name) for index, anim in next, sprite.quads do for ind, quad in next, anim do quad.resize = Vector2(parsed.scale, parsed.scale) - quad.offset.x = quad.offset.x * parsed.scale - quad.offset.y = quad.offset.y * parsed.scale + quad.offset = quad.offset:Mul(parsed.scale) end end diff --git a/sprites/characters/bfPixel.png b/sprites/characters/bfPixel.png index 42925d9..c3cbeb3 100644 Binary files a/sprites/characters/bfPixel.png and b/sprites/characters/bfPixel.png differ diff --git a/sprites/weeb/weebTrees.xml b/sprites/weeb/weebTrees.xml new file mode 100644 index 0000000..5142c51 --- /dev/null +++ b/sprites/weeb/weebTrees.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/stages/school.json b/stages/school.json index 63ea7de..a60875a 100644 --- a/stages/school.json +++ b/stages/school.json @@ -1,6 +1,6 @@ { "directory": "week6", - "defaultZoom": 1.05, + "defaultZoom": 1.3, "isPixelStage": true, "boyfriend": [970, 320], diff --git a/stages/school.lua b/stages/school.lua index d11dd04..c466c39 100644 --- a/stages/school.lua +++ b/stages/school.lua @@ -1,36 +1,71 @@ local module = {} -function module.onCreate() - sharedVars.canvasSize = Vector2(311, 161) - sharedVars.screenSize = Vector2(967, 500) - - for index, dir in next, sharedVars.singVectors do - sharedVars.singVectors[index] = dir:Div(5) - end - +function module.onCreate(song) love.graphics.setDefaultFilter("nearest", "nearest", 0) local sky = Image("images/weeb/weebSky.png") sky.modifier = 0 sky.layer = -15 - - - local backTrees = Image("images/weeb/weebBackTrees.png", .1) - backTrees.layer = -14 - backTrees.position = Vector2(-10) + sky.resize = Vector2(8, 8) + sky.position = Vector2(-200, -150) local school = Image("images/weeb/weebSchool.png", .4) school.layer = -10 - backTrees.position = Vector2(-15) + school.position = Vector2(-650, 100) + school.resize = Vector2(7, 7) + school.modifier = 0.85 local road = Image("images/weeb/weebStreet.png", 1) road.layer = -9 - backTrees.position = Vector2(-50, 30) + road.position = Vector2(-750, 120) + road.resize = Vector2(7, 7) local ZHENSHINI = Sprite("sprites/weeb/bgFreaks.png", "sprites/weeb/bgFreaks.json") ZHENSHINI.layer = -2 - backTrees.position = Vector2(-70, 50) + ZHENSHINI.position = Vector2(-800, 500) + + for index, anim in next, ZHENSHINI.quads do + for index, quad in next, anim do + quad.resize = Vector2(6.5, 6.5) + quad.offset = quad.offset:Mul(6.5) + end + end + ZHENSHINI:PlayAnimation((song == "Roses" or song == "Roses Pico" or song == "Roses Erect") and "BG fangirls dissuaded" or "BG girls group", 24, true) + + + local Trees = Sprite("sprites/weeb/weebTrees.png", "sprites/weeb/weebTrees.xml") + Trees.layer = 4 + Trees.position = Vector2(-1800, -1500) + Trees.modifier = 1.1 + + for index, anim in next, Trees.quads do + for index, quad in next, anim do + quad.resize = Vector2(8, 8) + quad.offset = quad.offset:Mul(8) + end + end + + Trees:PlayAnimation("TREES", 24, true) + + local Petals = Sprite("sprites/weeb/petals.png", "sprites/weeb/petals.xml") + Petals.layer = 3.5 + Petals.position = Vector2(-850, 200) + Petals.modifier = 1 + + for index, anim in next, Petals.quads do + for index, quad in next, anim do + quad.resize = Vector2(8, 8) + quad.offset = quad.offset:Mul(8) + end + end + + Petals:PlayAnimation("PETALS ALL", 24, true) + + local BackTrees = Image("images/weeb/weebTreesBack.png") + BackTrees.layer = -2.5 + BackTrees.position = Vector2(-960, -130) + BackTrees.resize = Vector2(8, 8) end return module \ No newline at end of file