微调几乎所有模式左侧信息位置,对齐hold框中间

This commit is contained in:
MrZ626
2021-08-09 02:22:15 +08:00
parent 3452ae1d66
commit e7e568f67a
82 changed files with 204 additions and 207 deletions

View File

@@ -138,7 +138,7 @@ return{--返回一个table你也可以在之前定义一些常量或者函数
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)--把计算出来的剩余行数r显示出来
mStr(r,63,265)--把计算出来的剩余行数r显示出来
PLY.draw.drawTargetLine(P,r)--使用自带的境界高度线绘制函数
end,
score=function(P)return{P.stat.time,P.stat.piece}end,--游戏结束时需要保存的本局关键信息

View File

@@ -37,10 +37,10 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.modeData.wave,69,200)
mStr("22",69,320)
mText(drawableText.wave,69,260)
mText(drawableText.nextWave,69,380)
mStr(P.modeData.wave,63,200)
mStr("22",63,320)
mText(drawableText.wave,63,260)
mText(drawableText.nextWave,63,380)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -45,10 +45,10 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.modeData.wave,69,200)
mStr(20+4*math.min(math.floor(P.modeData.wave/10),2),69,320)
mText(drawableText.wave,69,260)
mText(drawableText.nextWave,69,380)
mStr(P.modeData.wave,63,200)
mStr(20+4*math.min(math.floor(P.modeData.wave/10),2),63,320)
mText(drawableText.wave,63,260)
mText(drawableText.nextWave,63,380)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -15,8 +15,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.stat.atk,69,310)
mText(drawableText.atk,69,380)
mStr(P.stat.atk,63,310)
mText(drawableText.atk,63,380)
end,
score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -15,8 +15,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.stat.atk,69,310)
mText(drawableText.atk,69,380)
mStr(P.stat.atk,63,310)
mText(drawableText.atk,63,380)
end,
score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -14,8 +14,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.stat.atk,69,310)
mText(drawableText.atk,69,380)
mStr(P.stat.atk,63,310)
mText(drawableText.atk,63,380)
end,
score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -15,8 +15,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.stat.atk,69,310)
mText(drawableText.atk,69,380)
mStr(P.stat.atk,63,310)
mText(drawableText.atk,63,380)
end,
score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -9,11 +9,11 @@ return{
bg='glow',bgm='push',
},
mesDisp=function(P)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
end,
score=function(P)return{min(P.stat.row,200),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -13,11 +13,11 @@ return{
bg='rgb',bgm='push',
},
mesDisp=function(P)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
gc.push('transform')
PLY.draw.applyFieldOffset(P)
gc.setColor(1,1,1,.1)

View File

@@ -14,11 +14,11 @@ return{
bg='rgb',bgm='push',
},
mesDisp=function(P)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
gc.push('transform')
PLY.draw.applyFieldOffset(P)
gc.setColor(1,1,1,.1)

View File

@@ -10,11 +10,11 @@ return{
bg='glow',bgm='push',
},
mesDisp=function(P)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
gc.push('transform')
PLY.draw.applyFieldOffset(P)
gc.setColor(1,1,1,.1)

View File

@@ -13,11 +13,11 @@ return{
bg='rgb',bgm='far',
},
mesDisp=function(P)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
gc.push('transform')
PLY.draw.applyFieldOffset(P)
gc.setColor(1,1,1,.1)

View File

@@ -45,11 +45,11 @@ return{
--Texts
gc.setColor(.8,.8,.8)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
end,
score=function(P)return{min(P.stat.row,40),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -54,10 +54,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.combo,69,310)
mStr(P.modeData.maxCombo,69,400)
mText(drawableText.combo,69,358)
mText(drawableText.maxcmb,69,450)
mStr(P.combo,63,310)
mStr(P.modeData.maxCombo,63,400)
mText(drawableText.combo,63,358)
mText(drawableText.maxcmb,63,450)
end,
score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Combo "..STRING.time(D[2])end,

View File

@@ -52,10 +52,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.combo,69,310)
mStr(P.modeData.maxCombo,69,400)
mText(drawableText.combo,69,358)
mText(drawableText.maxcmb,69,450)
mStr(P.combo,63,310)
mStr(P.modeData.maxCombo,63,400)
mText(drawableText.combo,63,358)
mText(drawableText.maxcmb,63,450)
end,
score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Combo "..STRING.time(D[2])end,

View File

@@ -1,5 +1,3 @@
local gc=love.graphics
return{
color=COLOR.lBlue,
env={
@@ -37,8 +35,8 @@ return{
mesDisp=function(P)
setFont(75)
local r=P.modeData.target*.1
mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),69,210)
mText(drawableText.speedLV,69,290)
mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210)
mText(drawableText.speedLV,63,290)
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
end,
score=function(P)return{P.stat.score,P.stat.row}end,

View File

@@ -74,7 +74,7 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(P.stat.row,69,225)
mText(drawableText.line,69,290)
mStr(P.stat.row,63,225)
mText(drawableText.line,63,290)
end,
}

View File

@@ -50,8 +50,8 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(P.stat.row,69,225)
mText(drawableText.line,69,290)
mStr(P.stat.row,63,225)
mText(drawableText.line,63,290)
gc.push('transform')
PLY.draw.applyFieldOffset(P)
if P.modeData.showMark==0 then

View File

@@ -44,10 +44,10 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.modeData.wave,69,200)
mStr(P.modeData.rpm,69,320)
mText(drawableText.wave,69,260)
mText(drawableText.rpm,69,380)
mStr(P.modeData.wave,63,200)
mStr(P.modeData.rpm,63,320)
mText(drawableText.wave,63,260)
mText(drawableText.rpm,63,380)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -44,10 +44,10 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.modeData.wave,69,200)
mStr(P.modeData.rpm,69,320)
mText(drawableText.wave,69,260)
mText(drawableText.rpm,69,380)
mStr(P.modeData.wave,63,200)
mStr(P.modeData.rpm,63,320)
mText(drawableText.wave,63,260)
mText(drawableText.rpm,63,380)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -24,7 +24,7 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(100-P.stat.dig,69,265)
mStr(100-P.stat.dig,63,265)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,
scoreDisp=function(D)return STRING.time(D[1]).." "..D[2].." Pieces"end,

View File

@@ -21,7 +21,7 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(10-P.stat.dig,69,265)
mStr(10-P.stat.dig,63,265)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,
scoreDisp=function(D)return STRING.time(D[1]).." "..D[2].." Pieces"end,

View File

@@ -24,7 +24,7 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(400-P.stat.dig,69,265)
mStr(400-P.stat.dig,63,265)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,
scoreDisp=function(D)return STRING.time(D[1]).." "..D[2].." Pieces"end,

View File

@@ -24,7 +24,7 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(40-P.stat.dig,69,265)
mStr(40-P.stat.dig,63,265)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,
scoreDisp=function(D)return STRING.time(D[1]).." "..D[2].." Pieces"end,

View File

@@ -23,8 +23,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.row}end,
scoreDisp=function(D)return D[1].." Waves "..D[2].." Lines"end,

View File

@@ -22,8 +22,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.row}end,
scoreDisp=function(D)return D[1].." Waves "..D[2].." Lines"end,

View File

@@ -82,9 +82,11 @@ return{
bg='blockfall',bgm='reason',
},
mesDisp=function(P)
setFont(70)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,265)
setFont(55)
local r=100-P.stat.row
if r<0 then r=0 end
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{math.min(P.stat.row,100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -12,9 +12,11 @@ return{
bg='blockfall',bgm='reason',
},
mesDisp=function(P)
setFont(70)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,265)
setFont(55)
local r=100-P.stat.row
if r<0 then r=0 end
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{min(P.stat.row,100),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -7,9 +7,9 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
}

View File

@@ -44,11 +44,11 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.stat.dig,69,190)
mStr(P.stat.atk,69,310)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,420)
mText(drawableText.line,69,243)
mText(drawableText.atk,69,363)
mText(drawableText.eff,69,475)
mStr(P.stat.dig,63,190)
mStr(P.stat.atk,63,310)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,420)
mText(drawableText.line,63,243)
mText(drawableText.atk,63,363)
mText(drawableText.eff,63,475)
end,
}

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local dropSpeed={50,40,30,25,20,15,12,9,7,5,4,3,2,1,1,.5,.5,.25,.25}
return{

View File

@@ -1,5 +1,3 @@
local gc=love.graphics
return{
color=COLOR.magenta,
env={

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local dropSpeed={50,40,30,24,18,14,10,8,6,5,4,3,2,1,1,.5,.5,.25,.25}
return{

View File

@@ -41,16 +41,16 @@ return{
},
slowMark=true,
mesDisp=function(P)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.grade,69,170)
mText(drawableText.line,63,300)
mText(drawableText.techrash,63,420)
mText(drawableText.grade,63,170)
setFont(55)
mStr(P.modeData.rankName,69,110)
mStr(P.modeData.rankName,63,110)
setFont(20)
mStr(("%.1f"):format(P.modeData.rankPoint/10),69,198)
mStr(("%.1f"):format(P.modeData.rankPoint/10),63,198)
setFont(75)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
mStr(P.stat.row,63,220)
mStr(P.stat.clears[4],63,340)
end,
score=function(P)return{P.modeData.rankPoint,P.stat.score}end,
scoreDisp=function(D)return sectionName[math.floor(D[1]/10)+1].." "..D[2]end,

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local function score(P)
local D=P.modeData

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local death_lock={12,11,10,9,8, 7,7,7,7,6}
local death_wait={10,9, 8, 7,6, 6,6,5,5,4}
local death_fall={10,9, 8, 7,6, 6,5,5,4,4}

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local rush_lock={20,18,16,15,14}
local rush_wait={12,10, 9, 8, 7}
local rush_fall={18,16,14,13,12}

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local rush_lock={20,18,16,15,14, 14,13,12,11,11}
local rush_wait={12,11,11,10,10, 10,10, 9, 9, 9}
local rush_fall={18,16,14,13,12, 12,11,11,10,10}

View File

@@ -1,5 +1,3 @@
local gc=love.graphics
return{
color=COLOR.black,
env={

View File

@@ -1,4 +1,3 @@
local gc=love.graphics
local death_lock={12,11,10,9,8, 7,7,7,6,6}
local death_wait={10, 9, 8,7,6, 6,5,4,4,3}
local death_fall={10, 9, 8,7,6, 5,5,4,3,3}

View File

@@ -9,13 +9,15 @@ return{
bg='rgb',bgm='truth',
},
mesDisp=function(P)
setFont(45)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,220)
setFont(55)
local r=100-P.stat.row
if r<0 then r=0 end
mStr(r,63,220)
PLY.draw.drawTargetLine(P,r)
setFont(70)
mStr(P.stat.pc,69,300)
mText(drawableText.pc,69,380)
mStr(P.stat.pc,63,300)
mText(drawableText.pc,63,380)
end,
score=function(P)return{P.stat.pc,P.stat.time}end,
scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end,

View File

@@ -23,8 +23,8 @@ return{
},
mesDisp=function(P)
setFont(70)
mStr(P.stat.pc,69,300)
mText(drawableText.pc,69,380)
mStr(P.stat.pc,63,300)
mText(drawableText.pc,63,380)
end,
score=function(P)return{P.stat.pc,P.stat.time}end,
scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end,

View File

@@ -9,13 +9,15 @@ return{
bg='rgb',bgm='moonbeam',
},
mesDisp=function(P)
setFont(45)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,220)
setFont(55)
local r=100-P.stat.row
if r<0 then r=0 end
mStr(r,63,220)
PLY.draw.drawTargetLine(P,r)
setFont(70)
mStr(P.stat.pc,69,300)
mText(drawableText.pc,69,380)
mStr(P.stat.pc,63,300)
mText(drawableText.pc,63,380)
end,
score=function(P)return{P.stat.pc,P.stat.time}end,
scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end,

View File

@@ -7,13 +7,15 @@ return{
bg='rgb',bgm='truth',
},
mesDisp=function(P)
setFont(45)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,220)
setFont(55)
local r=100-P.stat.row
if r<0 then r=0 end
mStr(r,63,220)
PLY.draw.drawTargetLine(P,r)
setFont(70)
mStr(P.stat.pc,69,300)
mText(drawableText.pc,69,380)
mStr(P.stat.pc,63,300)
mText(drawableText.pc,63,380)
end,
score=function(P)return{P.stat.pc,P.stat.time}end,
scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end,

View File

@@ -58,8 +58,8 @@ return{
end,
mesDisp=function(P)
setFont(70)
mStr(P.stat.pc,69,300)
mText(drawableText.pc,69,380)
mStr(P.stat.pc,63,300)
mText(drawableText.pc,63,380)
end,
score=function(P)return{P.stat.pc,P.stat.time}end,
scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end,

View File

@@ -49,8 +49,8 @@ return{
end,
mesDisp=function(P)
setFont(70)
mStr(P.stat.pc,69,300)
mText(drawableText.pc,69,380)
mStr(P.stat.pc,63,300)
mText(drawableText.pc,63,380)
end,
score=function(P)return{P.stat.pc,P.stat.time}end,
scoreDisp=function(D)return D[1].." PCs "..STRING.time(D[2])end,

View File

@@ -48,15 +48,15 @@ return{
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
setFont(30)
mStr(P.modeData.bpm,69,178)
mStr(P.modeData.bpm,63,178)
gc.setLineWidth(4)
gc.circle('line',69,200,30)
gc.circle('line',63,200,30)
local beat=P.modeData.counter/P.modeData.beatFrame
gc.setColor(1,1,1,1-beat)
gc.setLineWidth(3)
gc.circle('line',69,200,30+45*beat)
gc.circle('line',63,200,30+45*beat)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -48,15 +48,15 @@ return{
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
setFont(30)
mStr(P.modeData.bpm,69,178)
mStr(P.modeData.bpm,63,178)
gc.setLineWidth(4)
gc.circle('line',69,200,30)
gc.circle('line',63,200,30)
local beat=P.modeData.counter/P.modeData.beatFrame
gc.setColor(1,1,1,1-beat)
gc.setLineWidth(3)
gc.circle('line',69,200,30+45*beat)
gc.circle('line',63,200,30+45*beat)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -54,15 +54,15 @@ return{
PLY.draw.drawProgress(P.stat.row,P.modeData.target)
setFont(30)
mStr(P.modeData.bpm,69,178)
mStr(P.modeData.bpm,63,178)
gc.setLineWidth(4)
gc.circle('line',69,200,30)
gc.circle('line',63,200,30)
local beat=P.modeData.counter/P.modeData.beatFrame
gc.setColor(1,1,1,1-beat)
gc.setLineWidth(3)
gc.circle('line',69,200,30+45*beat)
gc.circle('line',63,200,30+45*beat)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.time}end,
scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end,

View File

@@ -8,10 +8,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -11,7 +11,7 @@ return{
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
getRank=function(P)

View File

@@ -10,7 +10,7 @@ return{
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
getRank=function(P)

View File

@@ -11,7 +11,7 @@ return{
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -10,7 +10,7 @@ return{
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -11,7 +11,7 @@ return{
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
getRank=function(P)

View File

@@ -9,7 +9,7 @@ return{
setFont(55)
local r=1000-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -9,7 +9,7 @@ return{
setFont(55)
local r=100-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -9,7 +9,7 @@ return{
setFont(55)
local r=10-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -9,7 +9,7 @@ return{
setFont(55)
local r=20-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -9,7 +9,7 @@ return{
setFont(55)
local r=400-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -9,7 +9,7 @@ return{
setFont(55)
local r=40-P.stat.row
if r<0 then r=0 end
mStr(r,69,265)
mStr(r,63,265)
PLY.draw.drawTargetLine(P,r)
end,
score=function(P)return{P.stat.time,P.stat.piece}end,

View File

@@ -12,7 +12,7 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.stat.piece,69,265)
mStr(P.stat.piece,63,265)
end,
score=function(P)return{P.stat.piece,P.stat.time}end,
scoreDisp=function(D)return D[1].." Pieces".." "..STRING.time(D[2])end,

View File

@@ -9,7 +9,7 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.stat.piece,69,265)
mStr(P.stat.piece,63,265)
end,
score=function(P)return{P.stat.piece,P.stat.time}end,
scoreDisp=function(D)return D[1].." Pieces".." "..STRING.time(D[2])end,

View File

@@ -11,7 +11,7 @@ return{
},
mesDisp=function(P)
setFont(55)
mStr(P.stat.piece,69,265)
mStr(P.stat.piece,63,265)
end,
score=function(P)return{P.stat.piece,P.stat.time}end,
scoreDisp=function(D)return D[1].." Pieces".." "..STRING.time(D[2])end,

View File

@@ -24,8 +24,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -31,8 +31,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -25,8 +25,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -30,8 +30,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -30,8 +30,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.wave,69,310)
mText(drawableText.wave,69,375)
mStr(P.modeData.wave,63,310)
mText(drawableText.wave,63,375)
end,
score=function(P)return{P.modeData.wave,P.stat.time}end,
scoreDisp=function(D)return D[1].." Waves "..STRING.time(D[2])end,

View File

@@ -11,10 +11,10 @@ return{
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -24,10 +24,10 @@ return{
slowMark=true,
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -9,10 +9,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -21,10 +21,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -9,10 +9,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -21,10 +21,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -9,10 +9,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -21,10 +21,10 @@ return{
},
mesDisp=function(P)
setFont(45)
mStr(("%.1f"):format(P.stat.atk),69,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
mStr(("%.1f"):format(P.stat.atk),63,190)
mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
mText(drawableText.atk,63,243)
mText(drawableText.eff,63,363)
end,
score=function(P)return{P.stat.atk<=100 and math.floor(P.stat.atk)or 100,P.stat.time}end,
scoreDisp=function(D)return D[1].." Attack "..STRING.time(D[2])end,

View File

@@ -20,8 +20,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.tsd,69,250)
mText(drawableText.tsd,69,315)
mStr(P.modeData.tsd,63,250)
mText(drawableText.tsd,63,315)
end,
score=function(P)return{P.modeData.tsd,P.stat.time}end,
scoreDisp=function(D)return D[1].."TSD "..STRING.time(D[2])end,

View File

@@ -20,8 +20,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.tsd,69,250)
mText(drawableText.tsd,69,315)
mStr(P.modeData.tsd,63,250)
mText(drawableText.tsd,63,315)
end,
score=function(P)return{P.modeData.tsd,P.stat.time}end,
scoreDisp=function(D)return D[1].."TSD "..STRING.time(D[2])end,

View File

@@ -29,8 +29,8 @@ return{
},
mesDisp=function(P)
setFont(65)
mStr(P.modeData.tsd,69,250)
mText(drawableText.tsd,69,315)
mStr(P.modeData.tsd,63,250)
mText(drawableText.tsd,63,315)
gc.push('transform')
PLY.draw.applyFieldOffset(P)
gc.translate(0,P.fieldBeneath+P.fieldUp)

View File

@@ -9,7 +9,7 @@ return{
mesDisp=function(P)
setFont(70)
local R=200-P.stat.row
mStr(R>=0 and R or 0,69,265)
mStr(R>=0 and R or 0,63,265)
end,
score=function(P)return{P.stat.score}end,
scoreDisp=function(D)return tostring(D[1])end,

View File

@@ -620,7 +620,7 @@ function draw.drawProgress(s1,s2)
end
function draw.drawRoyaleInfo(P)
setFont(35)
mStr(#PLY_ALIVE.."/"..#PLAYERS,69,175)
mStr(#PLY_ALIVE.."/"..#PLAYERS,63,175)
mStr(P.modeData.ko,80,215)
gc.draw(drawableText.ko,60-drawableText.ko:getWidth(),222)
setFont(20)
@@ -628,10 +628,10 @@ function draw.drawRoyaleInfo(P)
gc.print(P.badge,103,227)
gc.setColor(.97,.97,.97)
setFont(25)
gc.print(text.powerUp[P.strength],18,290)
mDraw(text.powerUp[P.strength],63,290)
gc.setColor(1,1,1)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,260)
gc.draw(IMG.badgeIcon,16*i+6,260)
end
end