更多全局变量改为全大写

2021-10-18 15:05:35 +08:00
parent b7832c133a
commit 033a770759
65 changed files with 206 additions and 214 deletions
--- a/parts/eventsets/attacker_h.lua
+++ b/parts/eventsets/attacker_h.lua
@@ -3,8 +3,8 @@ return{
        setFont(55)
        mStr(P.modeData.wave,63,200)
        mStr("22",63,320)
-        mText(drawableText.wave,63,260)
-        mText(drawableText.nextWave,63,380)
+        mText(TEXTOBJ.wave,63,260)
+        mText(TEXTOBJ.nextWave,63,380)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/attacker_u.lua
+++ b/parts/eventsets/attacker_u.lua
@@ -3,8 +3,8 @@ return{
        setFont(55)
        mStr(P.modeData.wave,63,200)
        mStr(20+4*math.min(math.floor(P.modeData.wave/10),2),63,320)
-        mText(drawableText.wave,63,260)
-        mText(drawableText.nextWave,63,380)
+        mText(TEXTOBJ.wave,63,260)
+        mText(TEXTOBJ.nextWave,63,380)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/blindMesDisp.lua
+++ b/parts/eventsets/blindMesDisp.lua
@@ -2,7 +2,7 @@ local gc=love.graphics

 return{
    mesDisp=function(P)
-        mText(drawableText.techrash,63,420)
+        mText(TEXTOBJ.techrash,63,420)
        setFont(75)
        mStr(P.stat.clears[4],63,340)
        PLY.draw.applyField(P)
--- a/parts/eventsets/c4wBase.lua
+++ b/parts/eventsets/c4wBase.lua
@@ -5,8 +5,8 @@ return{
        setFont(45)
        mStr(P.combo,63,310)
        mStr(P.modeData.maxCombo,63,400)
-        mText(drawableText.combo,63,358)
-        mText(drawableText.maxcmb,63,450)
+        mText(TEXTOBJ.combo,63,358)
+        mText(TEXTOBJ.maxcmb,63,450)
    end,
    task=function(P)
        local F=P.field
--- a/parts/eventsets/checkAttack_100.lua
+++ b/parts/eventsets/checkAttack_100.lua
@@ -3,8 +3,8 @@ return{
        setFont(45)
        mStr(("%.1f"):format(P.stat.atk),63,190)
        mStr(("%.2f"):format(P.stat.atk/P.stat.row),63,310)
-        mText(drawableText.atk,63,243)
-        mText(drawableText.eff,63,363)
+        mText(TEXTOBJ.atk,63,243)
+        mText(TEXTOBJ.eff,63,363)
    end,
    dropPiece=function(P)
        if P.stat.atk>=100 then
--- a/parts/eventsets/classic_e.lua
+++ b/parts/eventsets/classic_e.lua
@@ -16,7 +16,7 @@ return{
        setFont(75)
        local r=P.modeData.target/10
        mStr(r<10 and 9 or r<30 and r or("%02x"):format(r*10-300),63,210)
-        mText(drawableText.speedLV,63,290)
+        mText(TEXTOBJ.speedLV,63,290)
        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
    end,
    task=function(P)
--- a/parts/eventsets/classic_h.lua
+++ b/parts/eventsets/classic_h.lua
@@ -16,7 +16,7 @@ return{
        setFont(75)
        local r=P.modeData.target/10
        mStr(r<11 and 18 or r<22 and r+8 or("%02x"):format(r*10-220),63,210)
-        mText(drawableText.speedLV,63,290)
+        mText(TEXTOBJ.speedLV,63,290)
        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
    end,
    task=function(P)
--- a/parts/eventsets/classic_u.lua
+++ b/parts/eventsets/classic_u.lua
@@ -16,7 +16,7 @@ return{
        setFont(75)
        local r=P.modeData.target/10
        mStr(r==1 and 29 or("%02x"):format(r*10-20),63,210)
-        mText(drawableText.speedLV,63,290)
+        mText(TEXTOBJ.speedLV,63,290)
        PLY.draw.drawProgress(P.stat.row,P.modeData.target)
    end,
    task=function(P)
--- a/parts/eventsets/defender_l.lua
+++ b/parts/eventsets/defender_l.lua
@@ -5,8 +5,8 @@ return{
        setFont(55)
        mStr(P.modeData.wave,63,200)
        mStr(P.modeData.rpm,63,320)
-        mText(drawableText.wave,63,260)
-        mText(drawableText.rpm,63,380)
+        mText(TEXTOBJ.wave,63,260)
+        mText(TEXTOBJ.rpm,63,380)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/defender_n.lua
+++ b/parts/eventsets/defender_n.lua
@@ -5,8 +5,8 @@ return{
        setFont(55)
        mStr(P.modeData.wave,63,200)
        mStr(P.modeData.rpm,63,320)
-        mText(drawableText.wave,63,260)
-        mText(drawableText.rpm,63,380)
+        mText(TEXTOBJ.wave,63,260)
+        mText(TEXTOBJ.rpm,63,380)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/dig_h.lua
+++ b/parts/eventsets/dig_h.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/dig_u.lua
+++ b/parts/eventsets/dig_u.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/master_ex.lua
+++ b/parts/eventsets/master_ex.lua
@@ -19,9 +19,9 @@ return{
            gc.rectangle('fill',0,475-h,125,h,4)
            gc.setColor(COLOR.Z)
        end
-        mText(drawableText.line,63,310)
-        mText(drawableText.techrash,63,420)
-        mText(drawableText.grade,63,180)
+        mText(TEXTOBJ.line,63,310)
+        mText(TEXTOBJ.techrash,63,420)
+        mText(TEXTOBJ.grade,63,180)
        setFont(20)
        mStr(("%.1f"):format(P.modeData.rankPoint/10),63,208)
        setFont(55)
--- a/parts/eventsets/pc_inf.lua
+++ b/parts/eventsets/pc_inf.lua
@@ -3,7 +3,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.stat.pc,63,340)
-        mText(drawableText.pc,63,410)
+        mText(TEXTOBJ.pc,63,410)
    end,
    dropPiece=function(P)
        if P.lastPiece.pc and P.stat.row%4==0 then
--- a/parts/eventsets/pctrain_l.lua
+++ b/parts/eventsets/pctrain_l.lua
@@ -44,7 +44,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.stat.pc,63,340)
-        mText(drawableText.pc,63,410)
+        mText(TEXTOBJ.pc,63,410)
    end,
    dropPiece=check,
    task=check,
--- a/parts/eventsets/pctrain_n.lua
+++ b/parts/eventsets/pctrain_n.lua
@@ -35,7 +35,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.stat.pc,63,340)
-        mText(drawableText.pc,63,410)
+        mText(TEXTOBJ.pc,63,410)
    end,
    dropPiece=check,
    task=check,
--- a/parts/eventsets/survivor_e.lua
+++ b/parts/eventsets/survivor_e.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/survivor_h.lua
+++ b/parts/eventsets/survivor_h.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/survivor_l.lua
+++ b/parts/eventsets/survivor_l.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/survivor_n.lua
+++ b/parts/eventsets/survivor_n.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/survivor_u.lua
+++ b/parts/eventsets/survivor_u.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.wave,63,310)
-        mText(drawableText.wave,63,375)
+        mText(TEXTOBJ.wave,63,375)
    end,
    task=function(P)
        while true do
--- a/parts/eventsets/techrash_n.lua
+++ b/parts/eventsets/techrash_n.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.stat.clear[7][4],63,250)
-        mText(drawableText.techrash,63,315)
+        mText(TEXTOBJ.techrash,63,315)
    end,
    dropPiece=function(P)
        if P.lastPiece.row>0 and P.lastPiece.row<4 then
--- a/parts/eventsets/techrash_u.lua
+++ b/parts/eventsets/techrash_u.lua
@@ -4,7 +4,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.techrash,63,250)
-        mText(drawableText.techrash,63,315)
+        mText(TEXTOBJ.techrash,63,315)
        PLY.draw.applyField(P)
        local L=P.modeData.history
        for i=1,#L do
--- a/parts/eventsets/tsd_e.lua
+++ b/parts/eventsets/tsd_e.lua
@@ -2,7 +2,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.tsd,63,250)
-        mText(drawableText.tsd,63,315)
+        mText(TEXTOBJ.tsd,63,315)
    end,
    dropPiece=function(P)
        local C=P.lastPiece
--- a/parts/eventsets/tsd_h.lua
+++ b/parts/eventsets/tsd_h.lua
@@ -4,7 +4,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.tsd,63,250)
-        mText(drawableText.tsd,63,315)
+        mText(TEXTOBJ.tsd,63,315)
        local L=P.modeData.history
        if L[1]and L[1]==L[2]and L[1]==L[3]then
            PLY.draw.applyField(P)
--- a/parts/eventsets/tsd_u.lua
+++ b/parts/eventsets/tsd_u.lua
@@ -4,7 +4,7 @@ return{
    mesDisp=function(P)
        setFont(60)
        mStr(P.modeData.tsd,63,250)
-        mText(drawableText.tsd,63,315)
+        mText(TEXTOBJ.tsd,63,315)
        PLY.draw.applyField(P)
        local L=P.modeData.history
        for i=1,#L do