From fc39239be1173ac2aeb677965f121d32752b88e2 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 8 Dec 2020 14:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=A9=E5=AE=B6ui=E5=9C=BA=E5=9C=B0=E5=9D=90?= =?UTF-8?q?=E6=A0=87=E5=8E=9F=E7=82=B9=E5=90=91=E4=B8=8B=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?70=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- document/mode.txt | 2 +- parts/gametoolfunc.lua | 23 +++++++++------- parts/modes/GM.lua | 12 ++++----- parts/modes/attacker_hard.lua | 8 +++--- parts/modes/attacker_ultimate.lua | 8 +++--- parts/modes/blind_easy.lua | 8 +++--- parts/modes/blind_hard.lua | 10 +++---- parts/modes/blind_lunatic.lua | 10 +++---- parts/modes/blind_normal.lua | 10 +++---- parts/modes/blind_ultimate.lua | 10 +++---- parts/modes/blind_wtf.lua | 14 +++++----- parts/modes/c4wtrain_lunatic.lua | 8 +++--- parts/modes/c4wtrain_normal.lua | 8 +++--- parts/modes/classic_fast.lua | 10 +++---- parts/modes/custom_clear.lua | 8 +++--- parts/modes/custom_puzzle.lua | 8 +++--- parts/modes/defender_lunatic.lua | 8 +++--- parts/modes/defender_normal.lua | 8 +++--- parts/modes/dig_10.lua | 2 +- parts/modes/dig_100.lua | 2 +- parts/modes/dig_40.lua | 2 +- parts/modes/dig_400.lua | 2 +- parts/modes/dig_hard.lua | 4 +-- parts/modes/dig_ultimate.lua | 4 +-- parts/modes/drought_lunatic.lua | 2 +- parts/modes/drought_normal.lua | 2 +- parts/modes/infinite.lua | 8 +++--- parts/modes/infinite_dig.lua | 12 ++++----- parts/modes/marathon_hard.lua | 6 ++--- parts/modes/marathon_normal.lua | 6 ++--- parts/modes/marathon_ultimate.lua | 6 ++--- parts/modes/master_advance.lua | 6 ++--- parts/modes/master_beginner.lua | 6 ++--- parts/modes/master_final.lua | 6 ++--- parts/modes/master_phantasm.lua | 8 +++--- parts/modes/pcchallenge_hard.lua | 6 ++--- parts/modes/pcchallenge_lunatic.lua | 6 ++--- parts/modes/pcchallenge_normal.lua | 6 ++--- parts/modes/pctrain_lunatic.lua | 4 +-- parts/modes/pctrain_normal.lua | 4 +-- parts/modes/sprintFix.lua | 2 +- parts/modes/sprintLock.lua | 2 +- parts/modes/sprintMPH.lua | 2 +- parts/modes/sprintPenta.lua | 2 +- parts/modes/sprint_10.lua | 2 +- parts/modes/sprint_100.lua | 2 +- parts/modes/sprint_1000.lua | 2 +- parts/modes/sprint_20.lua | 2 +- parts/modes/sprint_40.lua | 2 +- parts/modes/sprint_400.lua | 2 +- parts/modes/survivor_easy.lua | 4 +-- parts/modes/survivor_hard.lua | 4 +-- parts/modes/survivor_lunatic.lua | 4 +-- parts/modes/survivor_normal.lua | 4 +-- parts/modes/survivor_ultimate.lua | 4 +-- parts/modes/tech_finesse.lua | 8 +++--- parts/modes/tech_finesse2.lua | 8 +++--- parts/modes/tech_hard.lua | 8 +++--- parts/modes/tech_hard2.lua | 8 +++--- parts/modes/tech_lunatic.lua | 8 +++--- parts/modes/tech_lunatic2.lua | 8 +++--- parts/modes/tech_normal.lua | 8 +++--- parts/modes/tech_normal2.lua | 8 +++--- parts/modes/techmino49_easy.lua | 12 ++++----- parts/modes/techmino49_hard.lua | 12 ++++----- parts/modes/techmino49_ultimate.lua | 12 ++++----- parts/modes/techmino99_easy.lua | 12 ++++----- parts/modes/techmino99_hard.lua | 12 ++++----- parts/modes/techmino99_ultimate.lua | 12 ++++----- parts/modes/tsd_easy.lua | 4 +-- parts/modes/tsd_hard.lua | 4 +-- parts/modes/tsd_ultimate.lua | 4 +-- parts/modes/ultra.lua | 4 +-- parts/modes/zen.lua | 2 +- parts/player/draw.lua | 41 ++++++++++++++--------------- parts/player/player.lua | 6 ++--- 76 files changed, 263 insertions(+), 261 deletions(-) diff --git a/document/mode.txt b/document/mode.txt index dddaa874..41e0f936 100644 --- a/document/mode.txt +++ b/document/mode.txt @@ -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,--游戏结束时需要保存的本局关键信息 diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 26507b22..134f8ac0 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -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 diff --git a/parts/modes/GM.lua b/parts/modes/GM.lua index 3977a47e..5c9c05ca 100644 --- a/parts/modes/GM.lua +++ b/parts/modes/GM.lua @@ -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, diff --git a/parts/modes/attacker_hard.lua b/parts/modes/attacker_hard.lua index f39e9710..478b4dc1 100644 --- a/parts/modes/attacker_hard.lua +++ b/parts/modes/attacker_hard.lua @@ -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, diff --git a/parts/modes/attacker_ultimate.lua b/parts/modes/attacker_ultimate.lua index fa6d3378..41cad7f4 100644 --- a/parts/modes/attacker_ultimate.lua +++ b/parts/modes/attacker_ultimate.lua @@ -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, diff --git a/parts/modes/blind_easy.lua b/parts/modes/blind_easy.lua index 098168fc..f6101d05 100644 --- a/parts/modes/blind_easy.lua +++ b/parts/modes/blind_easy.lua @@ -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, diff --git a/parts/modes/blind_hard.lua b/parts/modes/blind_hard.lua index 30f8cb3d..20885b3e 100644 --- a/parts/modes/blind_hard.lua +++ b/parts/modes/blind_hard.lua @@ -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, diff --git a/parts/modes/blind_lunatic.lua b/parts/modes/blind_lunatic.lua index 5c22e843..0e413d0a 100644 --- a/parts/modes/blind_lunatic.lua +++ b/parts/modes/blind_lunatic.lua @@ -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, diff --git a/parts/modes/blind_normal.lua b/parts/modes/blind_normal.lua index bd49a7eb..b4da66ec 100644 --- a/parts/modes/blind_normal.lua +++ b/parts/modes/blind_normal.lua @@ -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, diff --git a/parts/modes/blind_ultimate.lua b/parts/modes/blind_ultimate.lua index 1718431b..744cfe08 100644 --- a/parts/modes/blind_ultimate.lua +++ b/parts/modes/blind_ultimate.lua @@ -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, diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua index 82066855..c9a04362 100644 --- a/parts/modes/blind_wtf.lua +++ b/parts/modes/blind_wtf.lua @@ -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, diff --git a/parts/modes/c4wtrain_lunatic.lua b/parts/modes/c4wtrain_lunatic.lua index 8ba4d491..93315fe6 100644 --- a/parts/modes/c4wtrain_lunatic.lua +++ b/parts/modes/c4wtrain_lunatic.lua @@ -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, diff --git a/parts/modes/c4wtrain_normal.lua b/parts/modes/c4wtrain_normal.lua index af6af055..3dbeb563 100644 --- a/parts/modes/c4wtrain_normal.lua +++ b/parts/modes/c4wtrain_normal.lua @@ -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, diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua index 93bc62d1..6f6da5eb 100644 --- a/parts/modes/classic_fast.lua +++ b/parts/modes/classic_fast.lua @@ -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, diff --git a/parts/modes/custom_clear.lua b/parts/modes/custom_clear.lua index 2a5c46a4..9e8c75f6 100644 --- a/parts/modes/custom_clear.lua +++ b/parts/modes/custom_clear.lua @@ -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, } \ No newline at end of file diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua index 19848e71..a5a225aa 100644 --- a/parts/modes/custom_puzzle.lua +++ b/parts/modes/custom_puzzle.lua @@ -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 diff --git a/parts/modes/defender_lunatic.lua b/parts/modes/defender_lunatic.lua index eb1c4828..d8ef7664 100644 --- a/parts/modes/defender_lunatic.lua +++ b/parts/modes/defender_lunatic.lua @@ -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, diff --git a/parts/modes/defender_normal.lua b/parts/modes/defender_normal.lua index 2c80335a..dddcc1c7 100644 --- a/parts/modes/defender_normal.lua +++ b/parts/modes/defender_normal.lua @@ -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, diff --git a/parts/modes/dig_10.lua b/parts/modes/dig_10.lua index f6108be0..2d4214fb 100644 --- a/parts/modes/dig_10.lua +++ b/parts/modes/dig_10.lua @@ -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, diff --git a/parts/modes/dig_100.lua b/parts/modes/dig_100.lua index 41b7bb7e..0768ad3f 100644 --- a/parts/modes/dig_100.lua +++ b/parts/modes/dig_100.lua @@ -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, diff --git a/parts/modes/dig_40.lua b/parts/modes/dig_40.lua index 429fcb9e..98873528 100644 --- a/parts/modes/dig_40.lua +++ b/parts/modes/dig_40.lua @@ -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, diff --git a/parts/modes/dig_400.lua b/parts/modes/dig_400.lua index 300234d3..0f134f1b 100644 --- a/parts/modes/dig_400.lua +++ b/parts/modes/dig_400.lua @@ -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, diff --git a/parts/modes/dig_hard.lua b/parts/modes/dig_hard.lua index f79b4864..84ca371f 100644 --- a/parts/modes/dig_hard.lua +++ b/parts/modes/dig_hard.lua @@ -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, diff --git a/parts/modes/dig_ultimate.lua b/parts/modes/dig_ultimate.lua index 2993bcbc..70d62714 100644 --- a/parts/modes/dig_ultimate.lua +++ b/parts/modes/dig_ultimate.lua @@ -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, diff --git a/parts/modes/drought_lunatic.lua b/parts/modes/drought_lunatic.lua index bf16d87e..03a3fb60 100644 --- a/parts/modes/drought_lunatic.lua +++ b/parts/modes/drought_lunatic.lua @@ -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, diff --git a/parts/modes/drought_normal.lua b/parts/modes/drought_normal.lua index ed6468b3..425d6200 100644 --- a/parts/modes/drought_normal.lua +++ b/parts/modes/drought_normal.lua @@ -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, diff --git a/parts/modes/infinite.lua b/parts/modes/infinite.lua index bfbbca7c..dc3879ce 100644 --- a/parts/modes/infinite.lua +++ b/parts/modes/infinite.lua @@ -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, } \ No newline at end of file diff --git a/parts/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua index 5287cbf7..8c4f7f5b 100644 --- a/parts/modes/infinite_dig.lua +++ b/parts/modes/infinite_dig.lua @@ -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, } \ No newline at end of file diff --git a/parts/modes/marathon_hard.lua b/parts/modes/marathon_hard.lua index 4574e0e2..84286098 100644 --- a/parts/modes/marathon_hard.lua +++ b/parts/modes/marathon_hard.lua @@ -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, diff --git a/parts/modes/marathon_normal.lua b/parts/modes/marathon_normal.lua index 964b85de..6b652bd2 100644 --- a/parts/modes/marathon_normal.lua +++ b/parts/modes/marathon_normal.lua @@ -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, diff --git a/parts/modes/marathon_ultimate.lua b/parts/modes/marathon_ultimate.lua index cd7fa568..4fece218 100644 --- a/parts/modes/marathon_ultimate.lua +++ b/parts/modes/marathon_ultimate.lua @@ -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, diff --git a/parts/modes/master_advance.lua b/parts/modes/master_advance.lua index 5325ba76..97902048 100644 --- a/parts/modes/master_advance.lua +++ b/parts/modes/master_advance.lua @@ -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, diff --git a/parts/modes/master_beginner.lua b/parts/modes/master_beginner.lua index 55f60be3..84ca93fa 100644 --- a/parts/modes/master_beginner.lua +++ b/parts/modes/master_beginner.lua @@ -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, diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 4c278c5a..7546476a 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -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, diff --git a/parts/modes/master_phantasm.lua b/parts/modes/master_phantasm.lua index 69740283..8b3b7d05 100644 --- a/parts/modes/master_phantasm.lua +++ b/parts/modes/master_phantasm.lua @@ -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, diff --git a/parts/modes/pcchallenge_hard.lua b/parts/modes/pcchallenge_hard.lua index 07ed5353..e1d583c8 100644 --- a/parts/modes/pcchallenge_hard.lua +++ b/parts/modes/pcchallenge_hard.lua @@ -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, diff --git a/parts/modes/pcchallenge_lunatic.lua b/parts/modes/pcchallenge_lunatic.lua index 17ee2f60..c5d685a4 100644 --- a/parts/modes/pcchallenge_lunatic.lua +++ b/parts/modes/pcchallenge_lunatic.lua @@ -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, diff --git a/parts/modes/pcchallenge_normal.lua b/parts/modes/pcchallenge_normal.lua index 5fc609b7..4fd2f239 100644 --- a/parts/modes/pcchallenge_normal.lua +++ b/parts/modes/pcchallenge_normal.lua @@ -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, diff --git a/parts/modes/pctrain_lunatic.lua b/parts/modes/pctrain_lunatic.lua index c5034bc9..00d5ceb8 100644 --- a/parts/modes/pctrain_lunatic.lua +++ b/parts/modes/pctrain_lunatic.lua @@ -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, diff --git a/parts/modes/pctrain_normal.lua b/parts/modes/pctrain_normal.lua index f941e225..022cacf5 100644 --- a/parts/modes/pctrain_normal.lua +++ b/parts/modes/pctrain_normal.lua @@ -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, diff --git a/parts/modes/sprintFix.lua b/parts/modes/sprintFix.lua index 79439717..12c96e31 100644 --- a/parts/modes/sprintFix.lua +++ b/parts/modes/sprintFix.lua @@ -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) diff --git a/parts/modes/sprintLock.lua b/parts/modes/sprintLock.lua index 34f741a7..975b396c 100644 --- a/parts/modes/sprintLock.lua +++ b/parts/modes/sprintLock.lua @@ -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) diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua index 09a55629..e3e3e38f 100644 --- a/parts/modes/sprintMPH.lua +++ b/parts/modes/sprintMPH.lua @@ -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, diff --git a/parts/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua index 35ca1838..61bf528f 100644 --- a/parts/modes/sprintPenta.lua +++ b/parts/modes/sprintPenta.lua @@ -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, diff --git a/parts/modes/sprint_10.lua b/parts/modes/sprint_10.lua index 0f0536cc..0e31c8cd 100644 --- a/parts/modes/sprint_10.lua +++ b/parts/modes/sprint_10.lua @@ -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, diff --git a/parts/modes/sprint_100.lua b/parts/modes/sprint_100.lua index 24c5051f..995d04b6 100644 --- a/parts/modes/sprint_100.lua +++ b/parts/modes/sprint_100.lua @@ -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, diff --git a/parts/modes/sprint_1000.lua b/parts/modes/sprint_1000.lua index a4fdb911..e6757e86 100644 --- a/parts/modes/sprint_1000.lua +++ b/parts/modes/sprint_1000.lua @@ -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, diff --git a/parts/modes/sprint_20.lua b/parts/modes/sprint_20.lua index 1cbe4019..536bb31b 100644 --- a/parts/modes/sprint_20.lua +++ b/parts/modes/sprint_20.lua @@ -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, diff --git a/parts/modes/sprint_40.lua b/parts/modes/sprint_40.lua index 5e1e4bfe..2b2f1620 100644 --- a/parts/modes/sprint_40.lua +++ b/parts/modes/sprint_40.lua @@ -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, diff --git a/parts/modes/sprint_400.lua b/parts/modes/sprint_400.lua index 89406b33..32a9be62 100644 --- a/parts/modes/sprint_400.lua +++ b/parts/modes/sprint_400.lua @@ -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, diff --git a/parts/modes/survivor_easy.lua b/parts/modes/survivor_easy.lua index 250fc751..e28d53f8 100644 --- a/parts/modes/survivor_easy.lua +++ b/parts/modes/survivor_easy.lua @@ -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, diff --git a/parts/modes/survivor_hard.lua b/parts/modes/survivor_hard.lua index 13906fd5..a1becbf3 100644 --- a/parts/modes/survivor_hard.lua +++ b/parts/modes/survivor_hard.lua @@ -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, diff --git a/parts/modes/survivor_lunatic.lua b/parts/modes/survivor_lunatic.lua index 5e0c80e2..a8959e2c 100644 --- a/parts/modes/survivor_lunatic.lua +++ b/parts/modes/survivor_lunatic.lua @@ -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, diff --git a/parts/modes/survivor_normal.lua b/parts/modes/survivor_normal.lua index 279def05..87cb29ac 100644 --- a/parts/modes/survivor_normal.lua +++ b/parts/modes/survivor_normal.lua @@ -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, diff --git a/parts/modes/survivor_ultimate.lua b/parts/modes/survivor_ultimate.lua index 53b79149..84fa3ae3 100644 --- a/parts/modes/survivor_ultimate.lua +++ b/parts/modes/survivor_ultimate.lua @@ -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, diff --git a/parts/modes/tech_finesse.lua b/parts/modes/tech_finesse.lua index 71da6923..a8dd9bb9 100644 --- a/parts/modes/tech_finesse.lua +++ b/parts/modes/tech_finesse.lua @@ -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, diff --git a/parts/modes/tech_finesse2.lua b/parts/modes/tech_finesse2.lua index 39e00881..040fc2bc 100644 --- a/parts/modes/tech_finesse2.lua +++ b/parts/modes/tech_finesse2.lua @@ -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, diff --git a/parts/modes/tech_hard.lua b/parts/modes/tech_hard.lua index d60c1e1d..900fada2 100644 --- a/parts/modes/tech_hard.lua +++ b/parts/modes/tech_hard.lua @@ -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, diff --git a/parts/modes/tech_hard2.lua b/parts/modes/tech_hard2.lua index 7ce16574..6ea48954 100644 --- a/parts/modes/tech_hard2.lua +++ b/parts/modes/tech_hard2.lua @@ -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, diff --git a/parts/modes/tech_lunatic.lua b/parts/modes/tech_lunatic.lua index 513fabe8..0d414eab 100644 --- a/parts/modes/tech_lunatic.lua +++ b/parts/modes/tech_lunatic.lua @@ -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, diff --git a/parts/modes/tech_lunatic2.lua b/parts/modes/tech_lunatic2.lua index f79c8986..05bbf4f1 100644 --- a/parts/modes/tech_lunatic2.lua +++ b/parts/modes/tech_lunatic2.lua @@ -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, diff --git a/parts/modes/tech_normal.lua b/parts/modes/tech_normal.lua index 7007aced..2b73d1c9 100644 --- a/parts/modes/tech_normal.lua +++ b/parts/modes/tech_normal.lua @@ -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, diff --git a/parts/modes/tech_normal2.lua b/parts/modes/tech_normal2.lua index 8b8d0553..11c0d9b0 100644 --- a/parts/modes/tech_normal2.lua +++ b/parts/modes/tech_normal2.lua @@ -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, diff --git a/parts/modes/techmino49_easy.lua b/parts/modes/techmino49_easy.lua index 077ee6fb..82396beb 100644 --- a/parts/modes/techmino49_easy.lua +++ b/parts/modes/techmino49_easy.lua @@ -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, diff --git a/parts/modes/techmino49_hard.lua b/parts/modes/techmino49_hard.lua index 7c06f574..031163fc 100644 --- a/parts/modes/techmino49_hard.lua +++ b/parts/modes/techmino49_hard.lua @@ -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, diff --git a/parts/modes/techmino49_ultimate.lua b/parts/modes/techmino49_ultimate.lua index ed04e4b6..1c1b71c4 100644 --- a/parts/modes/techmino49_ultimate.lua +++ b/parts/modes/techmino49_ultimate.lua @@ -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, diff --git a/parts/modes/techmino99_easy.lua b/parts/modes/techmino99_easy.lua index 69146aca..32a5b755 100644 --- a/parts/modes/techmino99_easy.lua +++ b/parts/modes/techmino99_easy.lua @@ -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, diff --git a/parts/modes/techmino99_hard.lua b/parts/modes/techmino99_hard.lua index 46c46185..553f8aab 100644 --- a/parts/modes/techmino99_hard.lua +++ b/parts/modes/techmino99_hard.lua @@ -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, diff --git a/parts/modes/techmino99_ultimate.lua b/parts/modes/techmino99_ultimate.lua index cb243e9a..62aae138 100644 --- a/parts/modes/techmino99_ultimate.lua +++ b/parts/modes/techmino99_ultimate.lua @@ -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, diff --git a/parts/modes/tsd_easy.lua b/parts/modes/tsd_easy.lua index ffa9eaba..a244cc95 100644 --- a/parts/modes/tsd_easy.lua +++ b/parts/modes/tsd_easy.lua @@ -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, diff --git a/parts/modes/tsd_hard.lua b/parts/modes/tsd_hard.lua index aa424173..61c97ab1 100644 --- a/parts/modes/tsd_hard.lua +++ b/parts/modes/tsd_hard.lua @@ -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, diff --git a/parts/modes/tsd_ultimate.lua b/parts/modes/tsd_ultimate.lua index b1ba4f93..24002724 100644 --- a/parts/modes/tsd_ultimate.lua +++ b/parts/modes/tsd_ultimate.lua @@ -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, diff --git a/parts/modes/ultra.lua b/parts/modes/ultra.lua index 804b161e..7e1c3296 100644 --- a/parts/modes/ultra.lua +++ b/parts/modes/ultra.lua @@ -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, diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua index a5858626..8ba21468 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -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, diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 48e395bc..57524e10 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -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) diff --git a/parts/player/player.lua b/parts/player/player.lua index d48b7f1c..cfc18ec8 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -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)