SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

玩家ui场地坐标原点向下移动70单位

Browse Source
This commit is contained in:
MrZ626
2020-12-08 14:06:44 +08:00
parent d018265175
commit fc39239be1
76 changed files with 263 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
document/mode.txt
View File

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

23
parts/gametoolfunc.lua
View File

@@ -475,28 +475,31 @@ function loadGame(M,ifQuickPlay)
end
end
function resetPlayerPosition()
local l=#PLAYERS
PLAYERS[1]:setPosition(340,15)
if l==2 then
PLAYERS[2]:setPosition(965,360,.5)
elseif l==49 then
local L=PLAYERS.alive
L[1]:setPosition(340,75)
if #L<=5 then
if L[2]then L[2]:setPosition(965,390,.5)end
if L[3]then L[3]:setPosition(965,30,.5)end
if L[4]then L[4]:setPosition(20,390,.5)end
if L[5]then L[5]:setPosition(20,30,.5)end
elseif #L==49 then
local n=2
for i=1,4 do for j=1,6 do
PLAYERS[n]:setPosition(78*i-54,115*j-98,.09)
L[n]:setPosition(78*i-54,115*j-98,.09)
n=n+1
end end
for i=9,12 do for j=1,6 do
PLAYERS[n]:setPosition(78*i+267,115*j-98,.09)
L[n]:setPosition(78*i+267,115*j-98,.09)
n=n+1
end end
elseif l==99 then
elseif #L==99 then
local n=2
for i=1,7 do for j=1,7 do
PLAYERS[n]:setPosition(46*i-36,97*j-72,.068)
L[n]:setPosition(46*i-36,97*j-72,.068)
n=n+1
end end
for i=15,21 do for j=1,7 do
PLAYERS[n]:setPosition(46*i+264,97*j-72,.068)
L[n]:setPosition(46*i+264,97*j-72,.068)
n=n+1
end end
end

12
parts/modes/GM.lua
View File

@@ -41,14 +41,14 @@ return{
PLAYERS[1].modeData.event="M7"
end,
mesDisp=function(P)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.grade,69,240)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
mText(drawableText.grade,69,170)
setFont(55)
mStr(P.modeData.event,69,180)
mStr(P.modeData.event,69,110)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
end,
score=function(P)return{P.modeData.point,P.stat.score}end,
scoreDisp=function(D)return sectionName[int(D[1]*.1)+1].." "..D[2]end,

8
parts/modes/attacker_hard.lua
View File

@@ -43,10 +43,10 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(P.modeData.event,69,270)
mStr("22",69,390)
mText(drawableText.wave,69,330)
mText(drawableText.nextWave,69,450)
mStr(P.modeData.event,69,200)
mStr("22",69,320)
mText(drawableText.wave,69,260)
mText(drawableText.nextWave,69,380)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

8
parts/modes/attacker_ultimate.lua
View File

@@ -50,14 +50,14 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(P.modeData.event,69,270)
mStr(P.modeData.event,69,200)
mStr(
P.modeData.event<10 and 20
or P.modeData.event<20 and 24
or 28
,69,390)
mText(drawableText.wave,69,330)
mText(drawableText.nextWave,69,450)
,69,320)
mText(drawableText.wave,69,260)
mText(drawableText.nextWave,69,380)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

8
parts/modes/blind_easy.lua
View File

@@ -14,11 +14,11 @@ return{
PLY.newPlayer(1)
end,
mesDisp=function(P)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
end,
score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

10
parts/modes/blind_hard.lua
View File

@@ -18,13 +18,13 @@ return{
PLY.newPlayer(1)
end,
mesDisp=function(P)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
gc.setColor(1,1,1,.2)
gc.draw(IMG.electric,124,176,0,2.6)
gc.draw(IMG.electric,124,106,0,2.6)
end,
score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

10
parts/modes/blind_lunatic.lua
View File

@@ -19,13 +19,13 @@ return{
PLY.newPlayer(1)
end,
mesDisp=function(P)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
gc.setColor(1,1,1,.2)
gc.draw(IMG.electric,124,176,0,2.6)
gc.draw(IMG.electric,124,106,0,2.6)
end,
score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

10
parts/modes/blind_normal.lua
View File

@@ -15,13 +15,13 @@ return{
PLY.newPlayer(1)
end,
mesDisp=function(P)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
gc.setColor(1,1,1,.2)
gc.draw(IMG.electric,124,176,0,2.6)
gc.draw(IMG.electric,124,106,0,2.6)
end,
score=function(P)return{min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

10
parts/modes/blind_ultimate.lua
View File

@@ -18,13 +18,13 @@ return{
PLY.newPlayer(1)
end,
mesDisp=function(P)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
gc.setColor(1,1,1,.2)
gc.draw(IMG.electric,124,176,0,2.6)
gc.draw(IMG.electric,124,106,0,2.6)
end,
score=function(P)return{min(P.stat.row,100),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

14
parts/modes/blind_wtf.lua
View File

@@ -34,7 +34,7 @@ return{
--Frame
gc.setColor(.5,.5,.5)
gc.push("transform")
gc.translate(150,70)
gc.translate(150,0)
gc.rectangle("line",-1,-11,302,612)--Boarder
gc.rectangle("line",301,-3,15,604)--AtkBuffer boarder
gc.rectangle("line",-16,-3,15,604)--B2b bar boarder
@@ -45,16 +45,16 @@ return{
--Figures
local t=Timer()
gc.setColor(1,1,1,.5+.2*sin(t))
gc.draw(IMG.hbm,-276,-16,0,1.5)
gc.draw(IMG.electric,476,212,0,2.6)
gc.draw(IMG.hbm,-276,-86,0,1.5)
gc.draw(IMG.electric,476,142,0,2.6)
--Texts
gc.setColor(.8,.8,.8)
mText(drawableText.line,69,370)
mText(drawableText.techrash,69,490)
mText(drawableText.line,69,300)
mText(drawableText.techrash,69,420)
setFont(75)
mStr(P.stat.row,69,290)
mStr(P.stat.clears[4],69,410)
mStr(P.stat.row,69,220)
mStr(P.stat.clears[4],69,340)
end,
score=function(P)return{min(P.stat.row,40),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

8
parts/modes/c4wtrain_lunatic.lua
View File

@@ -46,10 +46,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.combo,69,380)
mStr(P.modeData.point,69,470)
mText(drawableText.combo,69,428)
mText(drawableText.maxcmb,69,520)
mStr(P.combo,69,310)
mStr(P.modeData.point,69,400)
mText(drawableText.combo,69,358)
mText(drawableText.maxcmb,69,450)
end,
score=function(P)return{min(P.modeData.point,100),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Combo "..toTime(D[2])end,

8
parts/modes/c4wtrain_normal.lua
View File

@@ -44,10 +44,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.combo,69,380)
mStr(P.modeData.point,69,470)
mText(drawableText.combo,69,428)
mText(drawableText.maxcmb,69,520)
mStr(P.combo,69,310)
mStr(P.modeData.point,69,400)
mText(drawableText.combo,69,358)
mText(drawableText.maxcmb,69,450)
end,
score=function(P)return{min(P.modeData.point,100),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Combo "..toTime(D[2])end,

10
parts/modes/classic_fast.lua
View File

@@ -39,12 +39,12 @@ return{
mesDisp=function(P)
setFont(75)
local r=P.gameEnv.target*.1
mStr(r<11 and 18 or r<22 and r+8 or r==22 and"00"or r==23 and"0a"or format("%x",r*10-220),69,280)
mText(drawableText.speedLV,69,360)
mStr(r<11 and 18 or r<22 and r+8 or r==22 and"00"or r==23 and"0a"or format("%x",r*10-220),69,210)
mText(drawableText.speedLV,69,290)
setFont(45)
mStr(P.stat.row,69,390)
mStr(P.gameEnv.target,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.stat.row,69,320)
mStr(P.gameEnv.target,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{P.stat.score,P.stat.row}end,
scoreDisp=function(D)return D[1].." "..D[2].." Lines"end,

8
parts/modes/custom_clear.lua
View File

@@ -38,7 +38,7 @@ local function checkClear(P)
P.field[_],P.visTime[_]=nil
end
setField(P,P.modeData.point+1)
SYSFX.newShade(1.4,.6,.8,.6,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
SYSFX.newShade(1.4,.6,.8,.6,P.absFieldX,P.absFieldY,300*P.size,610*P.size)
SFX.play("blip_1")
else
P:win("finish")
@@ -75,11 +75,11 @@ return{
mesDisp=function(P)
setFont(55)
if P.gameEnv.target>1e10 then
mStr(P.stat.row,69,295)
mText(drawableText.line,69,360)
mStr(P.stat.row,69,225)
mText(drawableText.line,69,290)
else
local R=P.gameEnv.target-P.stat.row
mStr(R>=0 and R or 0,69,310)
mStr(R>=0 and R or 0,69,240)
end
end,
}

8
parts/modes/custom_puzzle.lua
View File

@@ -22,7 +22,7 @@ local function puzzleCheck(P)
FREEROW.discard(P.visTime[_])
P.field[_],P.visTime[_]=nil
end
SYSFX.newShade(1.4,.3,1,.3,P.x+150*P.size,P.y+60*P.size,300*P.size,610*P.size)
SYSFX.newShade(1.4,.3,1,.3,P.absFieldX,P.absFieldY,300*P.size,610*P.size)
SFX.play("reach")
P.modeData.event=0
else
@@ -53,15 +53,15 @@ return{
mesDisp=function(P)
local dx,dy=P.fieldOff.x,P.fieldOff.y
setFont(55)
mStr(P.stat.row,69,295)
mText(drawableText.line,69,360)
mStr(P.stat.row,69,225)
mText(drawableText.line,69,290)
if P.modeData.event==0 then
local m=puzzleMark
local F=FIELD[P.modeData.point+1]
for y=1,20 do for x=1,10 do
local T=F[y][x]
if T~=0 then
gc.draw(m[T],150+30*x-30+dx,70+600-30*y+dy)
gc.draw(m[T],150+30*x-30+dx,600-30*y+dy)
end
end end
end

8
parts/modes/defender_lunatic.lua
View File

@@ -49,10 +49,10 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(P.modeData.event,69,270)
mStr(P.modeData.point,69,390)
mText(drawableText.wave,69,330)
mText(drawableText.rpm,69,450)
mStr(P.modeData.event,69,200)
mStr(P.modeData.point,69,320)
mText(drawableText.wave,69,260)
mText(drawableText.rpm,69,380)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

8
parts/modes/defender_normal.lua
View File

@@ -49,10 +49,10 @@ return{
end,
mesDisp=function(P)
setFont(55)
mStr(P.modeData.event,69,270)
mStr(P.modeData.point,69,390)
mText(drawableText.wave,69,330)
mText(drawableText.rpm,69,450)
mStr(P.modeData.event,69,200)
mStr(P.modeData.point,69,320)
mText(drawableText.wave,69,260)
mText(drawableText.rpm,69,380)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

2
parts/modes/dig_10.lua
View File

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

2
parts/modes/dig_100.lua
View File

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

2
parts/modes/dig_40.lua
View File

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

2
parts/modes/dig_400.lua
View File

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

4
parts/modes/dig_hard.lua
View File

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

4
parts/modes/dig_ultimate.lua
View File

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

2
parts/modes/drought_lunatic.lua
View File

@@ -104,7 +104,7 @@ return{
mesDisp=function(P)
setFont(70)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,335)
mStr(R>=0 and R or 0,69,265)
end,
score=function(P)return{min(P.stat.row,100),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

2
parts/modes/drought_normal.lua
View File

@@ -18,7 +18,7 @@ return{
mesDisp=function(P)
setFont(70)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,335)
mStr(R>=0 and R or 0,69,265)
end,
score=function(P)return{min(P.stat.row,100),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

8
parts/modes/infinite.lua
View File

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

12
parts/modes/infinite_dig.lua
View File

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

6
parts/modes/marathon_hard.lua
View File

@@ -32,9 +32,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,390)
mStr(P.gameEnv.target,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.stat.row,69,320)
mStr(P.gameEnv.target,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

6
parts/modes/marathon_normal.lua
View File

@@ -29,9 +29,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,390)
mStr(P.modeData.point+10,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.stat.row,69,320)
mStr(P.modeData.point+10,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

6
parts/modes/marathon_ultimate.lua
View File

@@ -36,9 +36,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.stat.row,69,390)
mStr(P.modeData.point+10,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.stat.row,69,320)
mStr(P.modeData.point+10,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(D[2])end,

6
parts/modes/master_advance.lua
View File

@@ -58,9 +58,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.point,69,390)
mStr((P.modeData.event+1)*100,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.modeData.point,69,320)
mStr((P.modeData.event+1)*100,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{P.modeData.point,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."P "..toTime(D[2])end,

6
parts/modes/master_beginner.lua
View File

@@ -60,9 +60,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.point,69,390)
mStr((P.modeData.event+1)*100,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.modeData.point,69,320)
mStr((P.modeData.event+1)*100,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{P.modeData.point,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."P "..toTime(D[2])end,

6
parts/modes/master_final.lua
View File

@@ -57,9 +57,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.point,69,390)
mStr((P.modeData.event+1)*100,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.modeData.point,69,320)
mStr((P.modeData.event+1)*100,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{P.modeData.point,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."P "..toTime(D[2])end,

8
parts/modes/master_phantasm.lua
View File

@@ -52,7 +52,7 @@ local function check_LVup(P)
for i=1,10 do
P:createClearingFX(i,1.5)
end
SYSFX.newShade(2.5,1,1,1,P.x+150*P.size,P.y+370*P.size,300*P.size,300*P.size)
SYSFX.newShade(2.5,1,1,1,P.absFieldX,P.y+300*P.size,300*P.size,300*P.size)
ENV.lock=13
ENV.wait=6
@@ -150,9 +150,9 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(P.modeData.point,69,390)
mStr(P.gameEnv.target,69,440)
gc.rectangle("fill",25,445,90,4)
mStr(P.modeData.point,69,320)
mStr(P.gameEnv.target,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{P.result=="WIN"and 260 or P.modeData.point,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."P "..toTime(D[2])end,

6
parts/modes/pcchallenge_hard.lua
View File

@@ -15,11 +15,11 @@ return{
mesDisp=function(P)
setFont(45)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,320)
mStr(R>=0 and R or 0,69,250)
setFont(75)
mStr(P.stat.pc,69,420)
mText(drawableText.pc,69,502)
mStr(P.stat.pc,69,350)
mText(drawableText.pc,69,432)
end,
score=function(P)return{P.stat.pc,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." PCs "..toTime(D[2])end,

6
parts/modes/pcchallenge_lunatic.lua
View File

@@ -15,11 +15,11 @@ return{
mesDisp=function(P)
setFont(45)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,320)
mStr(R>=0 and R or 0,69,250)
setFont(75)
mStr(P.stat.pc,69,420)
mText(drawableText.pc,69,502)
mStr(P.stat.pc,69,350)
mText(drawableText.pc,69,432)
end,
score=function(P)return{P.stat.pc,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." PCs "..toTime(D[2])end,

6
parts/modes/pcchallenge_normal.lua
View File

@@ -13,11 +13,11 @@ return{
mesDisp=function(P)
setFont(45)
local R=100-P.stat.row
mStr(R>=0 and R or 0,69,320)
mStr(R>=0 and R or 0,69,250)
setFont(75)
mStr(P.stat.pc,69,420)
mText(drawableText.pc,69,502)
mStr(P.stat.pc,69,350)
mText(drawableText.pc,69,432)
end,
score=function(P)return{P.stat.pc,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." PCs "..toTime(D[2])end,

4
parts/modes/pctrain_lunatic.lua
View File

@@ -70,8 +70,8 @@ return{
end,
mesDisp=function(P)
setFont(75)
mStr(P.stat.pc,69,400)
mText(drawableText.pc,69,482)
mStr(P.stat.pc,69,330)
mText(drawableText.pc,69,412)
end,
score=function(P)return{P.stat.pc,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." PCs "..toTime(D[2])end,

4
parts/modes/pctrain_normal.lua
View File

@@ -62,8 +62,8 @@ return{
end,
mesDisp=function(P)
setFont(75)
mStr(P.stat.pc,69,400)
mText(drawableText.pc,69,482)
mStr(P.stat.pc,69,330)
mText(drawableText.pc,69,412)
end,
score=function(P)return{P.stat.pc,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." PCs "..toTime(D[2])end,

2
parts/modes/sprintFix.lua
View File

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

2
parts/modes/sprintLock.lua
View File

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

2
parts/modes/sprintMPH.lua
View File

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

2
parts/modes/sprintPenta.lua
View File

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

2
parts/modes/sprint_10.lua
View File

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

2
parts/modes/sprint_100.lua
View File

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

2
parts/modes/sprint_1000.lua
View File

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

2
parts/modes/sprint_20.lua
View File

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

2
parts/modes/sprint_40.lua
View File

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

2
parts/modes/sprint_400.lua
View File

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

4
parts/modes/survivor_easy.lua
View File

@@ -27,8 +27,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,380)
mText(drawableText.wave,69,445)
mStr(P.modeData.event,69,310)
mText(drawableText.wave,69,375)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

4
parts/modes/survivor_hard.lua
View File

@@ -33,8 +33,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,380)
mText(drawableText.wave,69,445)
mStr(P.modeData.event,69,310)
mText(drawableText.wave,69,375)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

4
parts/modes/survivor_lunatic.lua
View File

@@ -28,8 +28,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,380)
mText(drawableText.wave,69,445)
mStr(P.modeData.event,69,310)
mText(drawableText.wave,69,375)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

4
parts/modes/survivor_normal.lua
View File

@@ -32,8 +32,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,380)
mText(drawableText.wave,69,445)
mStr(P.modeData.event,69,310)
mText(drawableText.wave,69,375)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

4
parts/modes/survivor_ultimate.lua
View File

@@ -34,8 +34,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,380)
mText(drawableText.wave,69,445)
mStr(P.modeData.event,69,310)
mText(drawableText.wave,69,375)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Waves "..toTime(D[2])end,

8
parts/modes/tech_finesse.lua
View File

@@ -17,10 +17,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_finesse2.lua
View File

@@ -29,10 +29,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_hard.lua
View File

@@ -16,10 +16,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_hard2.lua
View File

@@ -26,10 +26,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_lunatic.lua
View File

@@ -16,10 +16,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_lunatic2.lua
View File

@@ -26,10 +26,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_normal.lua
View File

@@ -16,10 +16,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

8
parts/modes/tech_normal2.lua
View File

@@ -26,10 +26,10 @@ return{
end,
mesDisp=function(P)
setFont(45)
mStr(format("%.1f",P.stat.atk),69,260)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,380)
mText(drawableText.atk,69,313)
mText(drawableText.eff,69,433)
mStr(format("%.1f",P.stat.atk),69,190)
mStr(format("%.2f",P.stat.atk/P.stat.row),69,310)
mText(drawableText.atk,69,243)
mText(drawableText.eff,69,363)
end,
score=function(P)return{P.stat.atk<=200 and int(P.stat.atk)or 200,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Attack "..toTime(D[2])end,

12
parts/modes/techmino49_easy.lua
View File

@@ -58,17 +58,17 @@ return{
end,
mesDisp=function(P)
setFont(35)
mStr(#PLAYERS.alive.."/49",69,245)
mStr(P.modeData.point,80,285)
gc.draw(drawableText.ko,23,295)
mStr(#PLAYERS.alive.."/49",69,175)
mStr(P.modeData.point,80,215)
gc.draw(drawableText.ko,23,225)
setFont(20)
gc.setColor(1,.5,0,.6)
gc.print(P.badge,103,297)
gc.print(P.badge,103,227)
gc.setColor(1,1,1)
setFont(25)
gc.print(powerUp[P.strength],18,360)
gc.print(powerUp[P.strength],18,290)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,330)
gc.draw(IMG.badgeIcon,16*i+12,260)
end
end,
score=function(P)return{P.modeData.event,P.modeData.point}end,

12
parts/modes/techmino49_hard.lua
View File

@@ -58,17 +58,17 @@ return{
end,
mesDisp=function(P)
setFont(35)
mStr(#PLAYERS.alive.."/49",69,245)
mStr(P.modeData.point,80,285)
gc.draw(drawableText.ko,23,295)
mStr(#PLAYERS.alive.."/49",69,175)
mStr(P.modeData.point,80,215)
gc.draw(drawableText.ko,23,225)
setFont(20)
gc.setColor(1,.5,0,.6)
gc.print(P.badge,103,297)
gc.print(P.badge,103,227)
gc.setColor(1,1,1)
setFont(25)
gc.print(powerUp[P.strength],18,360)
gc.print(powerUp[P.strength],18,290)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,330)
gc.draw(IMG.badgeIcon,16*i+12,260)
end
end,
score=function(P)return{P.modeData.event,P.modeData.point}end,

12
parts/modes/techmino49_ultimate.lua
View File

@@ -58,17 +58,17 @@ return{
end,
mesDisp=function(P)
setFont(35)
mStr(#PLAYERS.alive.."/49",69,245)
mStr(P.modeData.point,80,285)
gc.draw(drawableText.ko,23,295)
mStr(#PLAYERS.alive.."/49",69,175)
mStr(P.modeData.point,80,215)
gc.draw(drawableText.ko,23,225)
setFont(20)
gc.setColor(1,.5,0,.6)
gc.print(P.badge,103,297)
gc.print(P.badge,103,227)
gc.setColor(1,1,1)
setFont(25)
gc.print(powerUp[P.strength],18,360)
gc.print(powerUp[P.strength],18,290)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,330)
gc.draw(IMG.badgeIcon,16*i+12,260)
end
end,
score=function(P)return{P.modeData.event,P.modeData.point}end,

12
parts/modes/techmino99_easy.lua
View File

@@ -58,17 +58,17 @@ return{
end,
mesDisp=function(P)
setFont(35)
mStr(#PLAYERS.alive.."/99",69,245)
mStr(P.modeData.point,80,285)
gc.draw(drawableText.ko,23,295)
mStr(#PLAYERS.alive.."/99",69,175)
mStr(P.modeData.point,80,215)
gc.draw(drawableText.ko,23,225)
setFont(20)
gc.setColor(1,.5,0,.6)
gc.print(P.badge,103,297)
gc.print(P.badge,103,227)
gc.setColor(1,1,1)
setFont(25)
gc.print(powerUp[P.strength],18,360)
gc.print(powerUp[P.strength],18,290)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,330)
gc.draw(IMG.badgeIcon,16*i+12,260)
end
end,
score=function(P)return{P.modeData.event,P.modeData.point}end,

12
parts/modes/techmino99_hard.lua
View File

@@ -58,17 +58,17 @@ return{
end,
mesDisp=function(P)
setFont(35)
mStr(#PLAYERS.alive.."/99",69,245)
mStr(P.modeData.point,80,285)
gc.draw(drawableText.ko,23,295)
mStr(#PLAYERS.alive.."/99",69,175)
mStr(P.modeData.point,80,215)
gc.draw(drawableText.ko,23,225)
setFont(20)
gc.setColor(1,.5,0,.6)
gc.print(P.badge,103,297)
gc.print(P.badge,103,227)
gc.setColor(1,1,1)
setFont(25)
gc.print(powerUp[P.strength],18,360)
gc.print(powerUp[P.strength],18,290)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,330)
gc.draw(IMG.badgeIcon,16*i+12,260)
end
end,
score=function(P)return{P.modeData.event,P.modeData.point}end,

12
parts/modes/techmino99_ultimate.lua
View File

@@ -58,17 +58,17 @@ return{
end,
mesDisp=function(P)
setFont(35)
mStr(#PLAYERS.alive.."/99",69,245)
mStr(P.modeData.point,80,285)
gc.draw(drawableText.ko,23,295)
mStr(#PLAYERS.alive.."/99",69,175)
mStr(P.modeData.point,80,215)
gc.draw(drawableText.ko,23,225)
setFont(20)
gc.setColor(1,.5,0,.6)
gc.print(P.badge,103,297)
gc.print(P.badge,103,227)
gc.setColor(1,1,1)
setFont(25)
gc.print(powerUp[P.strength],18,360)
gc.print(powerUp[P.strength],18,290)
for i=1,P.strength do
gc.draw(IMG.badgeIcon,16*i+12,330)
gc.draw(IMG.badgeIcon,16*i+12,260)
end
end,
score=function(P)return{P.modeData.event,P.modeData.point}end,

4
parts/modes/tsd_easy.lua
View File

@@ -23,8 +23,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,320)
mText(drawableText.tsd,69,385)
mStr(P.modeData.event,69,250)
mText(drawableText.tsd,69,315)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."TSD "..toTime(D[2])end,

4
parts/modes/tsd_hard.lua
View File

@@ -24,8 +24,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,320)
mText(drawableText.tsd,69,385)
mStr(P.modeData.event,69,250)
mText(drawableText.tsd,69,315)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."TSD "..toTime(D[2])end,

4
parts/modes/tsd_ultimate.lua
View File

@@ -24,8 +24,8 @@ return{
end,
mesDisp=function(P)
setFont(65)
mStr(P.modeData.event,69,320)
mText(drawableText.tsd,69,385)
mStr(P.modeData.event,69,250)
mText(drawableText.tsd,69,315)
end,
score=function(P)return{P.modeData.event,P.stat.frame/60}end,
scoreDisp=function(D)return D[1].."TSD "..toTime(D[2])end,

4
parts/modes/ultra.lua
View File

@@ -32,10 +32,10 @@ return{
end,
mesDisp=function(P)
gc.setLineWidth(2)
gc.rectangle("line",55,190,32,402)
gc.rectangle("line",55,120,32,402)
local T=P.stat.frame/7200
gc.setColor(2*T,2-2*T,.2)
gc.rectangle("fill",56,591,30,(T-1)*400)
gc.rectangle("fill",56,521,30,(T-1)*400)
end,
score=function(P)return{P.stat.score}end,
scoreDisp=function(D)return tostring(D[1])end,

2
parts/modes/zen.lua
View File

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

41
parts/player/draw.lua
View File

@@ -275,7 +275,7 @@ function draw.drawTargetLine(P,r)
if r<21+(P.fieldBeneath+P.fieldUp)/30 and r>0 then
gc.setLineWidth(4)
gc.setColor(1,r>10 and 0 or rnd(),.5)
local dx,dy=150+P.fieldOff.x,70+P.fieldOff.y+P.fieldBeneath+P.fieldUp
local dx,dy=150+P.fieldOff.x,P.fieldOff.y+P.fieldBeneath+P.fieldUp
gc.line(dx,600-30*r+dy,300+dx,600-30*r+dy)
end
end
@@ -312,7 +312,7 @@ function draw.norm(P)
--Field-related things
gc.push("transform")
gc.translate(150,70)
gc.translate(150,0)
--Things shake with field
gc.push("transform")
@@ -482,20 +482,19 @@ function draw.norm(P)
--Speed dials
setFont(25)
drawDial(510,580,P.dropSpeed)
drawDial(555,635,P.keySpeed)
drawDial(510,510,P.dropSpeed)
drawDial(555,565,P.keySpeed)
gc.setColor(1,1,1)
gc.draw(drawableText.bpm,540,550)
gc.draw(drawableText.kpm,494,643)
gc.draw(drawableText.bpm,540,480)
gc.draw(drawableText.kpm,494,573)
--Score & Time
setFont(25)
gc.setColor(0,0,0,.3)
gc.print(P.score1,18,579)
gc.print(format("%.2f",P.stat.time),18,609)
gc.setColor(COLOR.lYellow)gc.print(P.score1,20,580)
gc.setColor(COLOR.sky)gc.print(format("%.2f",P.stat.time),20,610)
gc.print(P.score1,18,509)
gc.print(format("%.2f",P.stat.time),18,539)
gc.setColor(COLOR.lYellow)gc.print(P.score1,20,510)
gc.setColor(COLOR.sky)gc.print(format("%.2f",P.stat.time),20,540)
--FinesseCombo
if P.finesseCombo>2 then
@@ -503,16 +502,16 @@ function draw.norm(P)
local T=P.finesseCombo.."x"
if _>0 then
gc.setColor(1,1,1,_*.2)
gc.print(T,20,640)
gc.print(T,20,570)
gc.setColor(1,1,1,1.2-_*.1)
gc.push("transform")
gc.translate(20,670)
gc.translate(20,600)
gc.scale(1+_*.08)
gc.print(T,0,-30)
gc.pop()
else
gc.setColor(1,1,1)
gc.print(T,20,640)
gc.print(T,20,570)
end
end
@@ -521,13 +520,13 @@ function draw.norm(P)
gc.setColor(1,1,1)
if P.life<=3 then
for i=1,P.life do
gc.draw(IMG.lifeIcon,450+25*i,665,nil,.8)
gc.draw(IMG.lifeIcon,450+25*i,595,nil,.8)
end
else
gc.draw(IMG.lifeIcon,475,665,nil,.8)
gc.draw(IMG.lifeIcon,475,595,nil,.8)
setFont(20)
gc.print("x",503,665)
gc.print(P.life,517,665)
gc.print("x",503,595)
gc.print(P.life,517,595)
end
end
@@ -549,7 +548,7 @@ function draw.norm(P)
else
gc.setColor(1,1,1)
end
gc.print(missionEnum[L[P.curMission]],85,180)
gc.print(missionEnum[L[P.curMission]],85,110)
--Draw next mission
setFont(20)
@@ -557,7 +556,7 @@ function draw.norm(P)
local t=L[P.curMission+i]
if t then
t=missionEnum[t]
gc.print(t,87-28*i,187)
gc.print(t,87-28*i,117)
else
break
end
@@ -569,7 +568,7 @@ function draw.norm(P)
if GAME.frame<180 then
local count=179-GAME.frame
gc.push("transform")
gc.translate(305,290)
gc.translate(305,220)
setFont(95)
if count%60>45 then gc.scale(1+(count%60-45)^2*.01,1)end
mStr(int(count/60+1),0,0)

6
parts/player/player.lua
View File

@@ -105,7 +105,7 @@ end
function Player.createBeam(P,R,send,color)
local x1,y1,x2,y2
if P.mini then x1,y1=P.centerX,P.centerY
else x1,y1=P.x+(30*(P.curX+P.sc[2])-30+15+150)*P.size,P.y+(600-30*(P.curY+P.sc[1])+15+70)*P.size
else x1,y1=P.x+(30*(P.curX+P.sc[2])-30+15+150)*P.size,P.y+(600-30*(P.curY+P.sc[1])+15)*P.size
end
if R.small then x2,y2=R.centerX,R.centerY
else x2,y2=R.x+308*R.size,R.y+450*R.size
@@ -144,9 +144,9 @@ function Player.setPosition(P,x,y,size)
P.fieldX,P.fieldY=x,y
P.centerX,P.centerY=x+300*size,y+600*size
else
P.fieldX,P.fieldY=x+150*size,y+70*size
P.fieldX,P.fieldY=x+150*size,y
P.centerX,P.centerY=x+300*size,y+370*size
P.absFieldX,P.absFieldY=x+150*size,y+60*size
P.absFieldX,P.absFieldY=x+150*size,y-10*size
end
end
local function task_movePosition(P,x,y,size)