Made songs only resync when unpausing, fixed limoerect and removed myst
This commit is contained in:
parent
ab39440c2f
commit
092f6d38ac
@ -18,35 +18,20 @@ return {
|
||||
dancers = {}
|
||||
|
||||
local sunset = Image("images/limo/erect/limoSunset.png")
|
||||
sunset.position = Vector2(-100, 0)
|
||||
sunset.position = Vector2(-200, 0)
|
||||
sunset.resize = Vector2(1, 1)
|
||||
sunset.modifier = 0.1
|
||||
sunset.layer = -12
|
||||
|
||||
shootingStar = Sprite("sprites/limo/erect/shooting star.png", "sprites/limo/erect/shooting star.json")
|
||||
shootingStar:PlayAnimation("shooting star idle", 24, true)
|
||||
shootingStar.position = Vector2(400, 0)
|
||||
shootingStar.position = Vector2(800, 0)
|
||||
shootingStar.modifier = 0.12
|
||||
shootingStar.layer = -11
|
||||
|
||||
|
||||
local mistBG1 = Image("images/limo/erect/mistBack.png", .2)
|
||||
mistBG1.position = Vector2(860, 100)
|
||||
mistBG1.resize = Vector2(1.8, 1.3)
|
||||
mistBG1.layer = -10
|
||||
|
||||
local mistBG2 = Image("images/limo/erect/mistBack.png", .2)
|
||||
mistBG2.position = Vector2(-300, 100)
|
||||
mistBG2.resize = Vector2(1.8, 1.3)
|
||||
mistBG2.layer = -10
|
||||
|
||||
mist[1] = mistBG1
|
||||
mist[2] = mistBG2
|
||||
|
||||
|
||||
local road = Sprite("sprites/limo/limoRoad.png", "sprites/limo/limoRoad.json")
|
||||
road:PlayAnimation("COOLROAD", 24, true)
|
||||
road.position = Vector2(-300, 230)
|
||||
road.position = Vector2(-600, 460)
|
||||
road.modifier = 0.6
|
||||
road.layer = -9
|
||||
|
||||
@ -58,52 +43,24 @@ return {
|
||||
|
||||
local limobg = Sprite("sprites/limo/erect/bgLimo.png", "sprites/limo/erect/bgLimo.json")
|
||||
limobg:PlayAnimation("background limo blue", 24, true)
|
||||
limobg.position = Vector2(-100, 350)
|
||||
limobg.position = Vector2(-200, 700)
|
||||
limobg.modifier = 0.6
|
||||
limobg.layer = -8
|
||||
|
||||
|
||||
local mistMid1 = Image("images/limo/erect/mistMid.png", .5)
|
||||
mistMid1.position = Vector2(860, 300)
|
||||
mistMid1.resize = Vector2(1.8, 1.3)
|
||||
mistMid1.layer = -6.5
|
||||
|
||||
local mistMid2 = Image("images/limo/erect/mistMid.png", .5)
|
||||
mistMid2.position = Vector2(-300, 300)
|
||||
mistMid2.resize = Vector2(1.8, 1.3)
|
||||
mistMid2.layer = -6.5
|
||||
|
||||
mist[3] = mistMid1
|
||||
mist[4] = mistMid2
|
||||
|
||||
|
||||
local limoDriver = Sprite("sprites/limo/erect/limoDrive.png", "sprites/limo/erect/limoDrive.json")
|
||||
limoDriver:PlayAnimation("Limo stage", 24, true)
|
||||
limoDriver.position = Vector2(-300, 450)
|
||||
limoDriver.position = Vector2(-400, 760)
|
||||
limoDriver = -6
|
||||
|
||||
for i = 1, 5 do
|
||||
local dancer = Sprite("sprites/limo/limoDancer.png", "sprites/limo/limoDancer.json")
|
||||
dancer.modifier = .6
|
||||
dancer:PlayAnimation("bg dancer sketch PINK", 24, false)
|
||||
dancer.position = Vector2(-10 + i * 150, 155)
|
||||
dancer.position = Vector2(-20 + i * 300, 310)
|
||||
dancer.layer = -6 + i
|
||||
|
||||
dancers[i] = dancer
|
||||
end
|
||||
|
||||
local mistFront1 = Image("images/limo/erect/mistFront.png", .7)
|
||||
mistFront1.position = Vector2(-350, 500)
|
||||
mistFront1.resize = Vector2(1.8, 1.3)
|
||||
mistFront1.layer = 5
|
||||
|
||||
local mistFront2 = Image("images/limo/erect/mistFront.png", .7)
|
||||
mistFront2.position = Vector2(-1630, 500)
|
||||
mistFront2.resize = Vector2(1.8, 1.3)
|
||||
mistFront2.layer = 5
|
||||
|
||||
mist[5] = mistFront1
|
||||
mist[6] = mistFront2
|
||||
end,
|
||||
|
||||
onBeat = function(beat)
|
||||
@ -131,13 +88,4 @@ return {
|
||||
shootingStarCountdown = love.math.random(20, 40)
|
||||
end
|
||||
end,
|
||||
|
||||
onUpdate = function (dt)
|
||||
for index, sh in next, mist do
|
||||
if sh.position.x > 720 then
|
||||
sh.position.x = -1630
|
||||
end
|
||||
sh.position.x = sh.position.x + 5000 * dt
|
||||
end
|
||||
end
|
||||
}
|
@ -522,12 +522,6 @@ local function state(songName, songDifficulty, show)
|
||||
module.onBeat(beat)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
inst:seek((elapsed + offset) / 1000 > 0 and (elapsed + offset) / 1000 or 0, "seconds")
|
||||
if chart.needsVoices then
|
||||
voices:seek((elapsed + offset) / 1000 > 0 and (elapsed + offset) / 1000 or 0, "seconds")
|
||||
end
|
||||
end
|
||||
|
||||
local section = chart.notes[math.floor(step / 16) + 1]
|
||||
@ -1090,6 +1084,13 @@ local function state(songName, songDifficulty, show)
|
||||
end
|
||||
end
|
||||
pauseTime = pauseTime + (socket.gettime() * 1000 - pauseStart)
|
||||
local currentTime = socket.gettime()
|
||||
elapsed = (currentTime - startTime) * 1000 - pauseTime - cdLength
|
||||
|
||||
inst:seek((elapsed + offset) / 1000 > 0 and (elapsed + offset) / 1000 or 0, "seconds")
|
||||
if chart.needsVoices then
|
||||
voices:seek((elapsed + offset) / 1000 > 0 and (elapsed + offset) / 1000 or 0, "seconds")
|
||||
end
|
||||
end
|
||||
elseif dead then
|
||||
gameOverEnd:play()
|
||||
|
Loading…
x
Reference in New Issue
Block a user