整理代码,网战和普通游戏复用几个函数

This commit is contained in:
MrZ626
2021-02-11 01:25:20 +08:00
parent 950a6b42c2
commit e6cea306c1
4 changed files with 70 additions and 113 deletions

View File

@@ -2,7 +2,7 @@ local gc=love.graphics
local gc_setColor=gc.setColor
local tc=love.touch
local max,sin=math.max,math.sin
local sin=math.sin
local SCR=SCR
local VK=virtualkey
@@ -127,12 +127,10 @@ function scene.update(dt)
local _
local P1=PLAYERS[1]
local GAME=GAME
GAME.frame=GAME.frame+1
touchMoveLastFrame=false
--Update virtualkey animation
updateVirtualkey()
GAME.frame=GAME.frame+1
--Replay
if GAME.replaying then
@@ -153,25 +151,8 @@ function scene.update(dt)
GAME.replaying=_
end
--Counting,include pre-das,directy RETURN,or restart counting
if GAME.frame<=180 then
if GAME.frame==180 then
gameStart()
elseif GAME.frame==60 or GAME.frame==120 then
SFX.play("ready")
end
for p=1,#PLAYERS do
local P=PLAYERS[p]
if P.movDir~=0 then
if P.moving<P.gameEnv.das then
P.moving=P.moving+1
end
else
P.moving=0
end
end
return
end
--Counting, include pre-das
if checkStart()then return end
--Update players
for p=1,#PLAYERS do
@@ -184,35 +165,7 @@ function scene.update(dt)
end
--Warning check
if P1.alive then
if GAME.frame%26==0 and SETTING.warn then
local F=P1.field
local height=0--Max height of row 4~7
for x=4,7 do
for y=#F,1,-1 do
if F[y][x]>0 then
if y>height then
height=y
end
break
end
end
end
GAME.warnLVL0=math.log(height-15+P1.atkBuffer.sum*.8)
end
_=GAME.warnLVL
if _<GAME.warnLVL0 then
_=_*.95+GAME.warnLVL0*.05
elseif _>0 then
_=max(_-.026,0)
end
GAME.warnLVL=_
elseif GAME.warnLVL>0 then
GAME.warnLVL=max(GAME.warnLVL-.026,0)
end
if GAME.warnLVL>1.126 and GAME.frame%30==0 then
SFX.fplay("warning",SETTING.sfx_warn)
end
checkWarning()
end
local function drawAtkPointer(x,y)