diff --git a/assets/skin/mino_interior.lua b/assets/skin/mino_interior.lua index 84e6b64d..45861411 100644 --- a/assets/skin/mino_interior.lua +++ b/assets/skin/mino_interior.lua @@ -1,18 +1,30 @@ --[[ - Base on mino_simp: + Base on mino_template: + Remove HeightLines + Remove DelayIndicator + Simple open ceiling Simple grid Low precision timer + Static starting counter ]] local gc=love.graphics local gc_setColor=gc.setColor local gc_draw,gc_rectangle=gc.draw,gc.rectangle local gc_printf=gc.printf +local gc_setLineWidth=gc.setLineWidth +local gc_line=gc.line local COLOR=COLOR ---@type Techmino.skin.mino local S={} -S.base='mino_simp' +S.base='mino_template' + +function S.drawFieldBorder() + gc_setLineWidth(2) + gc_setColor(1,1,1) + gc_line(-201,-401,-201,401,201,401,201,-401) +end local gridMark=GC.load{40,40, {'setCL',1,1,1,.26}, @@ -30,10 +42,21 @@ function S.drawFieldBackground(fieldW) end end end +S.drawHeightLines=NULL +S.drawDasIndicator=NULL +S.drawDelayIndicator=NULL +S.drawLockDelayIndicator=NULL + function S.drawTime(time) gc_setColor(COLOR.dL) FONT.set(30,'number') gc_printf(("%.1f"):format(time/1000),-210-260,380,260,'right') end +function S.drawStartingCounter(readyDelay) + FONT.set(100) + gc_setColor(COLOR.L) + GC.mStr(math.floor((readyDelay-S.getTime())/1000)+1,0,-70) +end + return S diff --git a/assets/skin/mino_simp.lua b/assets/skin/mino_simp.lua deleted file mode 100644 index 6121a719..00000000 --- a/assets/skin/mino_simp.lua +++ /dev/null @@ -1,41 +0,0 @@ ---[[ - Base on mino_template: - Remove HeightLines - Remove DelayIndicator - Static starting counter -]] -local gc=love.graphics -local gc_setColor,gc_setLineWidth=gc.setColor,gc.setLineWidth -local gc_line=gc.line - -local COLOR=COLOR - ----@type Techmino.skin.mino -local S={} -S.base='mino_template' - -function S.drawFieldBorder() - gc_setLineWidth(2) - gc_setColor(1,1,1) - gc_line(-201,-401,-201,401,201,401,201,-401) -end - -function S.drawHeightLines(fieldW,maxSpawnH,spawnH,lockoutH,deathH,voidH) -end - -function S.drawDasIndicator(dir,charge,dasMax,arrMax) -end - -function S.drawDelayIndicator(color,value) -end - -function S.drawLockDelayIndicator(freshCondition,freshChance) -end - -function S.drawStartingCounter(readyDelay) - FONT.set(100) - gc_setColor(COLOR.L) - GC.mStr(math.floor((readyDelay-S.getTime())/1000)+1,0,-70) -end - -return S diff --git a/main.lua b/main.lua index 89fb67c7..663c9070 100644 --- a/main.lua +++ b/main.lua @@ -341,7 +341,6 @@ end for _,v in next,{ 'mino_template', -- Shouldn't be used 'mino_plastic', - 'mino_simp', 'mino_interior', 'puyo_template', -- Shouldn't be used