diff --git a/characters/spirit.json b/characters/spirit.json
index ef9570f..2ae68b5 100644
--- a/characters/spirit.json
+++ b/characters/spirit.json
@@ -1,78 +1,55 @@
{
"animations": [
{
- "offsets": [
- -218,
- -280
- ],
"loop": false,
+ "offsets": [-27.25, -35],
+ "fps": 24,
"anim": "idle",
- "fps": 24,
- "name": "idle spirit_",
- "indices": []
+ "indices": [],
+ "name": "idle spirit_"
},
{
- "offsets": [
- -200,
- -280
- ],
"loop": false,
+ "offsets": [-25, -35],
+ "fps": 24,
"anim": "singLEFT",
- "fps": 24,
- "name": "left_",
- "indices": []
+ "indices": [],
+ "name": "left_"
},
{
- "offsets": [
- 170,
- 110
- ],
"loop": false,
+ "offsets": [21.25, 13.75],
+ "fps": 24,
"anim": "singDOWN",
- "fps": 24,
- "name": "spirit down_",
- "indices": []
+ "indices": [],
+ "name": "spirit down_"
},
{
- "offsets": [
- -220,
- -280
- ],
"loop": false,
+ "offsets": [-27.5, -35],
+ "fps": 24,
"anim": "singRIGHT",
- "fps": 24,
- "name": "right_",
- "indices": []
+ "indices": [],
+ "name": "right_"
},
{
- "offsets": [
- -220,
- -240
- ],
"loop": false,
- "anim": "singUP",
+ "offsets": [-27.5, -30],
"fps": 24,
- "name": "up_",
- "indices": []
+ "anim": "singUP",
+ "indices": [],
+ "name": "up_"
}
],
+ "vocals_file": "spirit",
"no_antialiasing": true,
"image": "sprites/characters/spirit",
- "position": [
- -150,
- 100
- ],
+ "position": [-800, -100],
"healthicon": "spirit-pixel",
"flip_x": false,
- "healthbar_colors": [
- 255,
- 60,
- 110
- ],
- "camera_position": [
- 0,
- 0
- ],
+ "healthbar_colors": [255, 60, 110],
+ "camera_position": [-800, 0],
"sing_duration": 4,
- "scale": 6
+ "scale": 7,
+ "_editor_isPlayer": false
}
\ No newline at end of file
diff --git a/charts/roses/roses-metadata-pico.json b/charts/roses/roses-metadata-pico.json
index 92dc507..fa8c8e5 100644
--- a/charts/roses/roses-metadata-pico.json
+++ b/charts/roses/roses-metadata-pico.json
@@ -15,7 +15,7 @@
"instrumental": "pico",
"altInstrumentals": []
},
- "stage": "schoolPico",
+ "stage": "school",
"noteStyle": "pixel",
"album": "expansion2",
"ratings": { "easy": 2, "normal": 3, "hard": 4 },
diff --git a/charts/senpai/senpai-metadata-pico.json b/charts/senpai/senpai-metadata-pico.json
index bf0968b..0638a70 100644
--- a/charts/senpai/senpai-metadata-pico.json
+++ b/charts/senpai/senpai-metadata-pico.json
@@ -18,7 +18,7 @@
"opponentVocals": ["senpai"],
"playerVocals": ["pico"]
},
- "stage": "schoolPico",
+ "stage": "school",
"noteStyle": "pixel",
"album": "expansion2",
"ratings": { "easy": 1, "normal": 2, "hard": 3 },
diff --git a/charts/songs-bf.lua b/charts/songs-bf.lua
index 3897557..586b55e 100644
--- a/charts/songs-bf.lua
+++ b/charts/songs-bf.lua
@@ -189,6 +189,17 @@ local order = {
},
icon = "bfpixel"
},
+ {
+ name = "thorns",
+ difficulties = {
+ "easy",
+ "normal",
+ "hard",
+ "erect",
+ "nightmare"
+ },
+ icon = "bfpixel"
+ },
{
name = "ugh",
difficulties = {
diff --git a/charts/songs-pico.lua b/charts/songs-pico.lua
index c9da834..508b56e 100644
--- a/charts/songs-pico.lua
+++ b/charts/songs-pico.lua
@@ -89,6 +89,33 @@ local order = {
},
icon = "parents-christmaspixel"
},
+ {
+ name = "senpai",
+ difficulties = {
+ "easy",
+ "normal",
+ "hard"
+ },
+ icon = "bfpixel"
+ },
+ {
+ name = "roses",
+ difficulties = {
+ "easy",
+ "normal",
+ "hard"
+ },
+ icon = "bfpixel"
+ },
+ {
+ name = "thorns",
+ difficulties = {
+ "easy",
+ "normal",
+ "hard"
+ },
+ icon = "bfpixel"
+ },
{
name = "ugh",
difficulties = {
diff --git a/charts/thorns/thorns-metadata-erect.json b/charts/thorns/thorns-metadata-erect.json
index c1da56f..ec67332 100644
--- a/charts/thorns/thorns-metadata-erect.json
+++ b/charts/thorns/thorns-metadata-erect.json
@@ -11,7 +11,7 @@
"opponent": "spirit",
"instrumental": "erect"
},
- "stage": "schoolEvilErect",
+ "stage": "schoolEvil",
"noteStyle": "pixel",
"ratings": { "erect": 9, "nightmare": 10 },
"album": "volume3",
diff --git a/images/weeb/bgFreaks.png b/images/weeb/bgFreaks.png
deleted file mode 100644
index 12800ca..0000000
Binary files a/images/weeb/bgFreaks.png and /dev/null differ
diff --git a/images/weeb/bgFreaks.xml b/images/weeb/bgFreaks.xml
deleted file mode 100644
index 40c04f4..0000000
--- a/images/weeb/bgFreaks.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/images/weeb/weebTrees.png b/images/weeb/weebTrees.png
deleted file mode 100644
index 9071e9a..0000000
Binary files a/images/weeb/weebTrees.png and /dev/null differ
diff --git a/images/weeb/weebTrees.txt b/images/weeb/weebTrees.txt
deleted file mode 100644
index 7846c00..0000000
--- a/images/weeb/weebTrees.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-trees_0 = 0 0 512 512
-trees_1 = 513 0 512 512
-trees_2 = 1539 1026 512 512
-trees_3 = 2052 513 512 512
-trees_4 = 2565 0 512 512
-trees_5 = 3078 0 512 512
-trees_6 = 2565 513 512 512
-trees_7 = 2052 1026 512 512
-trees_8 = 2565 1026 512 512
-trees_9 = 3078 513 512 512
-trees_10 = 1026 0 512 512
-trees_11 = 0 513 512 512
-trees_12 = 513 513 512 512
-trees_13 = 0 1026 512 512
-trees_14 = 513 1026 512 512
-trees_15 = 1026 513 512 512
-trees_16 = 1026 1026 512 512
-trees_17 = 1539 0 512 512
-trees_18 = 1539 513 512 512
-trees_19 = 2052 0 512 512
\ No newline at end of file
diff --git a/images/weeb/weebTrees.xml b/images/weeb/weebTrees.xml
deleted file mode 100644
index ba229dc..0000000
--- a/images/weeb/weebTrees.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sprites/characters/spirit.xml b/sprites/characters/spirit.xml
new file mode 100644
index 0000000..5d01341
--- /dev/null
+++ b/sprites/characters/spirit.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/images/weeb/animatedEvilSchool.png b/sprites/weeb/animatedEvilSchool.png
similarity index 100%
rename from images/weeb/animatedEvilSchool.png
rename to sprites/weeb/animatedEvilSchool.png
diff --git a/images/weeb/animatedEvilSchool.xml b/sprites/weeb/animatedEvilSchool.xml
similarity index 100%
rename from images/weeb/animatedEvilSchool.xml
rename to sprites/weeb/animatedEvilSchool.xml
diff --git a/stages/schoolEvil.json b/stages/schoolEvil.json
new file mode 100644
index 0000000..8884da4
--- /dev/null
+++ b/stages/schoolEvil.json
@@ -0,0 +1,15 @@
+{
+ "directory": "week6",
+ "defaultZoom": 1.1,
+ "isPixelStage": true,
+
+ "boyfriend": [970, 320],
+ "girlfriend": [580, 430],
+ "opponent": [100, 100],
+ "hide_girlfriend": false,
+
+ "camera_boyfriend": [-100, -100],
+ "camera_opponent": [0, 0],
+ "camera_girlfriend": [0, 0],
+ "camera_speed": 1
+}
\ No newline at end of file
diff --git a/stages/schoolEvil.lua b/stages/schoolEvil.lua
new file mode 100644
index 0000000..961e148
--- /dev/null
+++ b/stages/schoolEvil.lua
@@ -0,0 +1,24 @@
+local module = {}
+
+function module.onCreate(song)
+ love.graphics.setDefaultFilter("nearest", "nearest", 0)
+
+ --yup
+ --this is it
+ --the entire fucking stage
+ --right here
+ local bg = Sprite("sprites/weeb/animatedEvilSchool.png", "sprites/weeb/animatedEvilSchool.xml")
+ bg.layer = -15
+ bg.resize = Vector2(8, 8)
+ bg.position = Vector2(-1600, -1300)
+ bg:PlayAnimation("background 2 instance 1", 24, true)
+
+ for index, anim in next, bg.quads do
+ for index, quad in next, anim do
+ quad.resize = Vector2(8, 8)
+ quad.offset = quad.offset:Mul(8)
+ end
+ end
+end
+
+return module
\ No newline at end of file