Fixed bf-pixel, gf-pixel, senpai, senpai-angry, added school stage, added senpai and roses, converted weebTrees from some unforseen format to XML
This commit is contained in:
parent
19c86a3284
commit
d5fb8f56ee
@ -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
|
||||
}
|
@ -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
|
||||
}
|
@ -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
|
||||
}
|
@ -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
|
||||
}
|
@ -12,7 +12,7 @@
|
||||
"opponent": "senpai-angry",
|
||||
"instrumental": "erect"
|
||||
},
|
||||
"stage": "schoolErect",
|
||||
"stage": "school",
|
||||
"noteStyle": "pixel",
|
||||
"ratings": { "erect": 8, "nightmare": 9 },
|
||||
"album": "volume3",
|
||||
|
@ -11,7 +11,7 @@
|
||||
"opponent": "senpai",
|
||||
"instrumental": "erect"
|
||||
},
|
||||
"stage": "schoolErect",
|
||||
"stage": "school",
|
||||
"noteStyle": "pixel",
|
||||
"ratings": { "erect": 6, "nightmare": 7 },
|
||||
"album": "volume3",
|
||||
|
@ -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 = {
|
||||
|
@ -501,7 +501,7 @@
|
||||
{
|
||||
"t": 107780.719101124,
|
||||
"e": "SetCameraBop",
|
||||
"v": { "rate": 1, "intensity": 1.2 }
|
||||
"v": { "rate": 1, "intensity": 1.2 }
|
||||
},
|
||||
{
|
||||
"t": 107865.516853933,
|
||||
|
@ -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
|
||||
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 12 KiB |
23
sprites/weeb/weebTrees.xml
Normal file
23
sprites/weeb/weebTrees.xml
Normal file
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextureAtlas imagePath="weebTrees.png">
|
||||
<SubTexture name="TREES0000" x="0" y="0" width="512" height="512" />
|
||||
<SubTexture name="TREES0001" x="513" y="0" width="512" height="512" />
|
||||
<SubTexture name="TREES0002" x="1539" y="1026" width="512" height="512" />
|
||||
<SubTexture name="TREES0003" x="2052" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0004" x="2565" y="0" width="512" height="512" />
|
||||
<SubTexture name="TREES0005" x="3078" y="0" width="512" height="512" />
|
||||
<SubTexture name="TREES0006" x="2565" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0007" x="2052" y="1026" width="512" height="512" />
|
||||
<SubTexture name="TREES0008" x="2565" y="1026" width="512" height="512" />
|
||||
<SubTexture name="TREES0009" x="3078" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0010" x="1026" y="0" width="512" height="512" />
|
||||
<SubTexture name="TREES0011" x="0" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0012" x="513" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0013" x="0" y="1026" width="512" height="512" />
|
||||
<SubTexture name="TREES0014" x="513" y="1026" width="512" height="512" />
|
||||
<SubTexture name="TREES0015" x="1026" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0016" x="1026" y="1026" width="512" height="512" />
|
||||
<SubTexture name="TREES0017" x="1539" y="0" width="512" height="512" />
|
||||
<SubTexture name="TREES0018" x="1539" y="513" width="512" height="512" />
|
||||
<SubTexture name="TREES0019" x="2052" y="0" width="512" height="512" />
|
||||
</TextureAtlas>
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"directory": "week6",
|
||||
"defaultZoom": 1.05,
|
||||
"defaultZoom": 1.3,
|
||||
"isPixelStage": true,
|
||||
|
||||
"boyfriend": [970, 320],
|
||||
|
@ -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
|
Loading…
x
Reference in New Issue
Block a user