diff --git a/main.lua b/main.lua index 86d44ade..53ad5bbf 100644 --- a/main.lua +++ b/main.lua @@ -117,7 +117,7 @@ do--Z.setCursor Z.setCursor(function(time,x,y) if not SETTING.sysCursor then local R=int((time+1)/2)%7+1 - _=minoColor[SETTING.skin[R]] + _=BLOCK_COLORS[SETTING.skin[R]] gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3)) _=DSCP[R][0] gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5) @@ -190,8 +190,8 @@ TABLE.cover (FILE.load('conf/user')or{},USER) TABLE.cover (FILE.load('conf/unlock')or{},RANKS) TABLE.update(FILE.load('conf/settings')or{},SETTING) TABLE.update(FILE.load('conf/data')or{},STAT) -TABLE.cover (FILE.load('conf/key')or{},keyMap) -TABLE.cover (FILE.load('conf/virtualkey')or{},VK_org) +TABLE.cover (FILE.load('conf/key')or{},KEY_MAP) +TABLE.cover (FILE.load('conf/virtualkey')or{},VK_ORG) --Initialize fields, sequence, missions, gameEnv for cutsom game local fieldData=FILE.load('conf/customBoards','string') @@ -327,7 +327,7 @@ LANG.init('zh', --3. Add a button in parts/scenes/setting_lang.lua; }, { - block=BLOCKNAMES + block=BLOCK_NAMES }, (function() local tipMeta={__call=function(L)return L[math.random(#L)]end} @@ -445,7 +445,7 @@ do if not RANKS.sprint_10l then RANKS.sprint_10l=0 end if RANKS.master_l then RANKS.master_n,RANKS.master_l=RANKS.master_l needSave=true end if RANKS.master_u then RANKS.master_h,RANKS.master_u=RANKS.master_u needSave=true end - for _,v in next,VK_org do v.color=nil end + for _,v in next,VK_ORG do v.color=nil end for name,rank in next,RANKS do if type(name)=='number'or type(rank)~='number'then RANKS[name]=nil @@ -471,7 +471,7 @@ do needSave=true end - for k,v in next,oldModeNameTable do + for k,v in next,MODE_UPDATE_MAP do if RANKS[k]then RANKS[v]=RANKS[k] RANKS[k]=nil @@ -511,7 +511,7 @@ for _,fileName in next,fs.getDirectoryItems('replay')do local date,mode,version,player,seed,setting,mod local fileData=fs.read('replay/'..fileName) date, fileData=STRING.readLine(fileData)date=date:gsub("[a-zA-Z]","") - mode, fileData=STRING.readLine(fileData)mode=oldModeNameTable[mode]or mode + mode, fileData=STRING.readLine(fileData)mode=MODE_UPDATE_MAP[mode]or mode version,fileData=STRING.readLine(fileData) player, fileData=STRING.readLine(fileData)if player=="Local Player"then player="Stacker"end local success diff --git a/parts/backgrounds/blockrain.lua b/parts/backgrounds/blockrain.lua index fab7c387..c26abcb4 100644 --- a/parts/backgrounds/blockrain.lua +++ b/parts/backgrounds/blockrain.lua @@ -17,7 +17,7 @@ function back.update() ins(mino,{ bid=r, block=TEXTURE.miniBlock[r], - color=minoColor[SETTING.skin[r]], + color=BLOCK_COLORS[SETTING.skin[r]], x=SCR.w*rnd(), y=SCR.h*-.05, k=SCR.rad/100, diff --git a/parts/backgrounds/blockspace.lua b/parts/backgrounds/blockspace.lua index 18ffa9d7..092ff180 100644 --- a/parts/backgrounds/blockspace.lua +++ b/parts/backgrounds/blockspace.lua @@ -20,7 +20,7 @@ function back.update() local r=rnd(29) ins(mino,{ block=TEXTURE.miniBlock[r], - color=minoColor[SETTING.skin[r]], + color=BLOCK_COLORS[SETTING.skin[r]], ang=6.2832*rnd(), rotate=6.2832*rnd(), vr=.05-rnd()*.1, diff --git a/parts/backgrounds/fan.lua b/parts/backgrounds/fan.lua index 4bc9a430..f581c3e1 100644 --- a/parts/backgrounds/fan.lua +++ b/parts/backgrounds/fan.lua @@ -15,7 +15,7 @@ local t local fan,petal function back.init() t=0 - fan=title_fan + fan=SVG_TITLE_FAN petal={} end function back.update() diff --git a/parts/backgrounds/lightning2.lua b/parts/backgrounds/lightning2.lua index 2a7970c3..68aba3c9 100644 --- a/parts/backgrounds/lightning2.lua +++ b/parts/backgrounds/lightning2.lua @@ -4,7 +4,7 @@ local int,rnd=math.floor,math.random local back={} local t -local colorLib=minoColor +local colorLib=BLOCK_COLORS local blocks=BLOCKS local scs=RSlist.TRS.centerPos function back.init() diff --git a/parts/data.lua b/parts/data.lua index d1425b56..33c25864 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -186,7 +186,7 @@ function DATA.pasteMission(str) end else if b>=34 and b<=114 then - if missionEnum[reg]then + if ENUM_MISSION[reg]then ins(MISSION,reg) reg=b-33 else @@ -390,7 +390,7 @@ function DATA.parseReplayData(fileName,fileData,ifFull) if not metaData then goto BREAK_cannotParse end --Convert ancient replays - metaData.mode=oldModeNameTable[metaData.mode]or metaData.mode + metaData.mode=MODE_UPDATE_MAP[metaData.mode]or metaData.mode if not MODES[metaData.mode]then goto BREAK_cannotParse end --Create replay object diff --git a/parts/eventsets/attacker_h.lua b/parts/eventsets/attacker_h.lua index b9937dba..498e431c 100644 --- 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 diff --git a/parts/eventsets/attacker_u.lua b/parts/eventsets/attacker_u.lua index db93debb..53738baa 100644 --- 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 diff --git a/parts/eventsets/blindMesDisp.lua b/parts/eventsets/blindMesDisp.lua index 9a017750..2dae2007 100644 --- 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) diff --git a/parts/eventsets/c4wBase.lua b/parts/eventsets/c4wBase.lua index 05389c99..d2761ead 100644 --- 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 diff --git a/parts/eventsets/checkAttack_100.lua b/parts/eventsets/checkAttack_100.lua index 3ab7ee67..32749cc3 100644 --- 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 diff --git a/parts/eventsets/classic_e.lua b/parts/eventsets/classic_e.lua index 772accc6..303df960 100644 --- 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) diff --git a/parts/eventsets/classic_h.lua b/parts/eventsets/classic_h.lua index 0813b42f..72982232 100644 --- 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) diff --git a/parts/eventsets/classic_u.lua b/parts/eventsets/classic_u.lua index 9af635a2..815c4fda 100644 --- 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) diff --git a/parts/eventsets/defender_l.lua b/parts/eventsets/defender_l.lua index 2b8ebfe9..c773b9a2 100644 --- 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 diff --git a/parts/eventsets/defender_n.lua b/parts/eventsets/defender_n.lua index 0b8c3c5c..150a4d53 100644 --- 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 diff --git a/parts/eventsets/dig_h.lua b/parts/eventsets/dig_h.lua index 0e9dcc25..e040b141 100644 --- 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 diff --git a/parts/eventsets/dig_u.lua b/parts/eventsets/dig_u.lua index 40ac5f19..35bb49db 100644 --- 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 diff --git a/parts/eventsets/master_ex.lua b/parts/eventsets/master_ex.lua index acc6bc0a..e12d7f80 100644 --- 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) diff --git a/parts/eventsets/pc_inf.lua b/parts/eventsets/pc_inf.lua index 14ce3a0f..3ffb1883 100644 --- 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 diff --git a/parts/eventsets/pctrain_l.lua b/parts/eventsets/pctrain_l.lua index 6e3f9da2..e6fa9d30 100644 --- 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, diff --git a/parts/eventsets/pctrain_n.lua b/parts/eventsets/pctrain_n.lua index bc906f3b..8d5dfaa8 100644 --- 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, diff --git a/parts/eventsets/survivor_e.lua b/parts/eventsets/survivor_e.lua index 7cc357c2..0abdad61 100644 --- 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 diff --git a/parts/eventsets/survivor_h.lua b/parts/eventsets/survivor_h.lua index 2e86d1f0..fce75fef 100644 --- 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 diff --git a/parts/eventsets/survivor_l.lua b/parts/eventsets/survivor_l.lua index 9b505787..d07ecf4a 100644 --- 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 diff --git a/parts/eventsets/survivor_n.lua b/parts/eventsets/survivor_n.lua index 37926cdb..80ac120f 100644 --- 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 diff --git a/parts/eventsets/survivor_u.lua b/parts/eventsets/survivor_u.lua index 63285fb5..c7980acb 100644 --- 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 diff --git a/parts/eventsets/techrash_n.lua b/parts/eventsets/techrash_n.lua index 140a73e1..d1906e63 100644 --- 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 diff --git a/parts/eventsets/techrash_u.lua b/parts/eventsets/techrash_u.lua index eb8eba7b..84b231bf 100644 --- 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 diff --git a/parts/eventsets/tsd_e.lua b/parts/eventsets/tsd_e.lua index af37d391..252ec0e6 100644 --- 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 diff --git a/parts/eventsets/tsd_h.lua b/parts/eventsets/tsd_h.lua index ee55462d..4d7594f2 100644 --- 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) diff --git a/parts/eventsets/tsd_u.lua b/parts/eventsets/tsd_u.lua index 1fd016fd..cb59e140 100644 --- 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 diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua index c7af099c..9d6024e6 100644 --- a/parts/gameFuncs.lua +++ b/parts/gameFuncs.lua @@ -25,7 +25,7 @@ end function applyLanguage() text=LANG.get(SETTING.locale) WIDGET.setLang(text.WidgetText) - for k,v in next,drawableText do + for k,v in next,TEXTOBJ do if text[k]then v:set(text[k]) end @@ -340,7 +340,7 @@ function loadGame(mode,ifQuickPlay,ifNet)--Load a mode and go to game scene SCN.go('net_game','swipeD') else local modeText=text.modes[mode]or{"["..MODES[mode].name.."]",""} - drawableText.modeName:set(modeText[1].." "..modeText[2]) + TEXTOBJ.modeName:set(modeText[1].." "..modeText[2]) SCN.go('game',ifQuickPlay and'swipeD'or'fade_togame') SFX.play('enter') end diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 29c492ff..f26ea25b 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -1,6 +1,29 @@ --Static data tables -do--title - title={ +SFXPACKS={'chiptune'} +VOCPACKS={'miya','mono','xiaoya','miku'} +BLOCK_NAMES={ + 'Z','S','J','L','T','O','I', + 'Z5','S5','P','Q','F','E', + 'T5','U','V','W','X', + 'J5','L5','R','Y','N','H','I5', + 'I3','C','I2','O1' +} +BLOCK_CHARS={}for i=1,#BLOCK_NAMES do BLOCK_CHARS[i]=CHAR.mino[BLOCK_NAMES[i]]end +BLOCK_COLORS={ + COLOR.R,COLOR.F,COLOR.O,COLOR.Y,COLOR.L,COLOR.J,COLOR.G,COLOR.A, + COLOR.C,COLOR.N,COLOR.S,COLOR.B,COLOR.V,COLOR.P,COLOR.M,COLOR.W, + COLOR.dH,COLOR.D,COLOR.lY,COLOR.H,COLOR.lH,COLOR.dV,COLOR.dR,COLOR.dG, +} +RANK_CHARS={'B','A','S','U','X'}for i=1,#RANK_CHARS do RANK_CHARS[i]=CHAR.icon['rank'..RANK_CHARS[i]]end +RANK_COLORS={ + {.5,.7,.9}, + {.5,1,.6}, + {.95,.95,.5}, + {1,.5,.4}, + {.95,.5,.95}, +} +do--SVG_TITLE + SVG_TITLE={ { 53, 60, 1035, 0, @@ -115,20 +138,20 @@ do--title 5878, 463, }, } - for _,C in next,title do + for _,C in next,SVG_TITLE do for i=1,#C do C[i]=C[i]*.1626 end end end -do--title_fan - title_fan={} +do--SVG_TITLE_FAN + SVG_TITLE_FAN={} local sin,cos=math.sin,math.cos for i=1,8 do local L={} - title_fan[i]=L - for j=1,#title[i]do - L[j]=title[i][j] + SVG_TITLE_FAN[i]=L + for j=1,#SVG_TITLE[i]do + L[j]=SVG_TITLE[i][j] end for j=1,#L,2 do local x,y=L[j],L[j+1]--00 then - gc.setColor(minoColor[pens[1]]) + gc.setColor(BLOCK_COLORS[pens[1]]) gc.rectangle('fill',5,5,23,30,3) elseif pens[1]==-1 then gc.setColor(COLOR.Z) @@ -396,7 +396,7 @@ function scene.draw() --Right button if pens[2]>0 then - gc.setColor(minoColor[pens[2]]) + gc.setColor(BLOCK_COLORS[pens[2]]) gc.rectangle('fill',52,5,23,30,3) elseif pens[2]==-1 then gc.setColor(COLOR.Z) @@ -418,7 +418,7 @@ function scene.draw() --Middle button if pens[3]>0 then - gc.setColor(minoColor[pens[3]]) + gc.setColor(BLOCK_COLORS[pens[3]]) gc.rectangle('fill',35,2,10,21,3) elseif pens[3]==-1 then gc.setColor(COLOR.Z) diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 4671b0c1..97687f66 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -19,7 +19,7 @@ function scene.sceneBack() FILE.save(DATA.copyMission(),'conf/customMissions') end -local missionEnum=missionEnum +local ENUM_MISSION=ENUM_MISSION local legalInput={Z=true,S=true,J=true,L=true,T=true,O=true,I=true,A=true,_=true,P=true} function scene.keyDown(key) if key=="left"then @@ -106,9 +106,9 @@ function scene.keyDown(key) end input=input..key - if missionEnum[input]then + if ENUM_MISSION[input]then cur=cur+1 - ins(MISSION,cur,missionEnum[input]) + ins(MISSION,cur,ENUM_MISSION[input]) SFX.play('lock') input="" elseif #input>1 or not legalInput[input]then @@ -135,7 +135,7 @@ function scene.draw() gc.print(input,1200,275) --Draw targets - local libColor=minoColor + local libColor=BLOCK_COLORS local set=SETTING.skin local L=MISSION local x,y=100,136--Next block pos @@ -171,7 +171,7 @@ function scene.draw() else gc.setColor(COLOR.H) end - gc.print(missionEnum[L[i]],x,y-25) + gc.print(ENUM_MISSION[L[i]],x,y-25) x=x+56 end end diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index f6892962..697c823f 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -125,7 +125,7 @@ function scene.update(dt) end end -local blockCharWidth={}for i=1,#BLOCKCHARS do blockCharWidth[i]=gc.newText(FONT.get(60),BLOCKCHARS[i]):getWidth()end +local blockCharWidth={}for i=1,#BLOCK_CHARS do blockCharWidth[i]=gc.newText(FONT.get(60),BLOCK_CHARS[i]):getWidth()end function scene.draw() --Draw frame gc_setColor(COLOR.Z) @@ -133,7 +133,7 @@ function scene.draw() gc.rectangle('line',100,110,1080,260,5) --Draw sequence - local minoColor=minoColor + local BLOCK_COLORS=BLOCK_COLORS local skinSetting=SETTING.skin local BAG=BAG local x,y=120,136--Next block pos @@ -160,8 +160,8 @@ function scene.draw() end if i<=j then setFont(60) - gc_setColor(minoColor[skinSetting[BAG[i]]]) - gc_print(BLOCKCHARS[BAG[i]],x,y-40) + gc_setColor(BLOCK_COLORS[skinSetting[BAG[i]]]) + gc_print(BLOCK_CHARS[BAG[i]],x,y-40) x=x+blockCharWidth[BAG[i]] end end diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index 28ef93f0..e6bc58da 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -26,7 +26,7 @@ local function _updateMenuButtons() if GAME.replaying or pos=='right'then WIDGET.active.restart.x=1125 WIDGET.active.pause.x=1195 - modeTextPos=1100-drawableText.modeName:getWidth() + modeTextPos=1100-TEXTOBJ.modeName:getWidth() elseif pos=='middle'then WIDGET.active.restart.x=360 WIDGET.active.pause.x=860 @@ -34,7 +34,7 @@ local function _updateMenuButtons() elseif pos=='left'then WIDGET.active.restart.x=120 WIDGET.active.pause.x=190 - modeTextPos=1200-drawableText.modeName:getWidth() + modeTextPos=1200-TEXTOBJ.modeName:getWidth() end end local function _updateRepButtons() @@ -116,7 +116,7 @@ local function _restart() _updateRepButtons() end local function _checkGameKeyDown(key) - local k=keyMap.keyboard[key] + local k=KEY_MAP.keyboard[key] if k then if k>0 then if noKey then return end @@ -247,7 +247,7 @@ function scene.keyDown(key,isRep) end function scene.keyUp(key) if noKey then return end - local k=keyMap.keyboard[key] + local k=KEY_MAP.keyboard[key] if k then if k>0 then PLAYERS[1]:releaseKey(k) @@ -257,7 +257,7 @@ function scene.keyUp(key) end function scene.gamepadDown(key) if noKey then return end - local k=keyMap.joystick[key] + local k=KEY_MAP.joystick[key] if k then if k>0 then PLAYERS[1]:pressKey(k) @@ -271,7 +271,7 @@ function scene.gamepadDown(key) end function scene.gamepadUp(key) if noKey then return end - local k=keyMap.joystick[key] + local k=KEY_MAP.joystick[key] if k then if k>0 then PLAYERS[1]:releaseKey(k) @@ -357,7 +357,7 @@ function scene.draw() --Mode info gc_setColor(1,1,1,.82) - gc_draw(drawableText.modeName,modeTextPos,10) + gc_draw(TEXTOBJ.modeName,modeTextPos,10) local M=GAME.curMode if M then if M.score and M.records[1]then diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 2422fb51..80abfcfc 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -161,7 +161,7 @@ function scene.draw() else gc.setLineWidth(4) end - local L=title + local L=SVG_TITLE gc.push('transform') gc.translate(126,100) for i=1,8 do diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index d131cdc4..4033358c 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -209,7 +209,6 @@ local baseRankColor={ {.85,.5,.4,.3}, {.85,.3,.8,.3}, } -local rankColor=rankColor local function _drawModeShape(M,S,drawType) if M.shape==1 then--Rectangle gc_rectangle(drawType,M.x-S,M.y-S,2*S,2*S) @@ -269,11 +268,11 @@ function scene.draw() --Rank if unlocked==1 then - name=RANKCHARS[rank] + name=RANK_CHARS[rank] if name then gc_setColor(0,0,0,.8) mStr(name,M.x+M.size*.7,M.y-50-M.size*.7) - gc_setColor(rankColor[rank]) + gc_setColor(RANK_COLORS[rank]) mStr(name,M.x+M.size*.7+4,M.y-50-M.size*.7-4) end end @@ -295,13 +294,13 @@ function scene.draw() gc_draw(IMG.ctrlSpeedLimit,1230,50,nil,.4) end if M.score then - mText(drawableText.highScore,1100,240) + mText(TEXTOBJ.highScore,1100,240) gc_setColor(.3,.3,.3,.7) gc_rectangle('fill',940,290,320,280,5)--Highscore board local L=M.records gc_setColor(1,1,1) if visibleModes[sel]==2 then - mText(drawableText.modeLocked,1100,370) + mText(TEXTOBJ.modeLocked,1100,370) elseif L[1]then for i=1,#L do local t=M.scoreDisp(L[i]) @@ -315,7 +314,7 @@ function scene.draw() end end else - mText(drawableText.noScore,1100,370) + mText(TEXTOBJ.noScore,1100,370) end end end diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index a9c52a2c..cc3fa7df 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -151,7 +151,7 @@ function scene.keyDown(key,isRep) inputBox:keypress(key) elseif playing then if noKey or isRep then return end - local k=keyMap.keyboard[key] + local k=KEY_MAP.keyboard[key] if k and k>0 then PLAYERS[1]:pressKey(k) VK.press(k) @@ -170,7 +170,7 @@ function scene.keyDown(key,isRep) end function scene.keyUp(key) if not playing or noKey then return end - local k=keyMap.keyboard[key] + local k=KEY_MAP.keyboard[key] if k and k>0 then PLAYERS[1]:releaseKey(k) VK.release(k) @@ -181,7 +181,7 @@ function scene.gamepadDown(key) scene.keyDown("escape") else if not playing then return end - local k=keyMap.joystick[key] + local k=KEY_MAP.joystick[key] if k and k>0 then PLAYERS[1]:pressKey(k) VK.press(k) @@ -190,7 +190,7 @@ function scene.gamepadDown(key) end function scene.gamepadUp(key) if not playing then return end - local k=keyMap.joystick[key] + local k=KEY_MAP.joystick[key] if k and k>0 then PLAYERS[1]:releaseKey(k) VK.release(k) diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 4e43af44..f53dbcb7 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -20,7 +20,7 @@ local sList={ lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, - eventSet=eventSetList, + eventSet=EVENTSETS, } local scene={} diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index b23e7519..b23bfbae 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -208,21 +208,21 @@ function scene.draw() gc.setColor(.97,.97,.97,timer1) --Result Text - mDraw(GAME.result and drawableText[GAME.result]or drawableText.pause,640,70-10*(5-timer1*5)^1.5) + mDraw(GAME.result and TEXTOBJ[GAME.result]or TEXTOBJ.pause,640,70-10*(5-timer1*5)^1.5) --Mode Info (outside) - gc.draw(drawableText.modeName,745-drawableText.modeName:getWidth(),143) + gc.draw(TEXTOBJ.modeName,745-TEXTOBJ.modeName:getWidth(),143) --Level rank - if RANKCHARS[GAME.rank]then + if RANK_CHARS[GAME.rank]then gc.push('transform') gc.translate(1050,5) setFont(80) gc.setColor(0,0,0,timer1*.7) - gc.print(RANKCHARS[GAME.rank],-5,-4,nil,1.5) - local L=rankColor[GAME.rank] + gc.print(RANK_CHARS[GAME.rank],-5,-4,nil,1.5) + local L=RANK_COLORS[GAME.rank] gc.setColor(L[1],L[2],L[3],timer1) - gc.print(RANKCHARS[GAME.rank],0,0,nil,1.5) + gc.print(RANK_CHARS[GAME.rank],0,0,nil,1.5) gc.pop() end diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 6f32ec71..5b3eb858 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -23,7 +23,7 @@ scene.widgetList={ WIDGET.newButton{name="unlock", x=190,y=170,w=280,h=100,color='lY',code=function()_dumpCB(RANKS)end}, WIDGET.newButton{name="data", x=490,y=170,w=280,h=100,color='lY',code=function()_dumpCB(STAT)end}, WIDGET.newButton{name="setting", x=790,y=170,w=280,h=100,color='lY',code=function()_dumpCB(SETTING)end}, - WIDGET.newButton{name="vk", x=1090,y=170,w=280,h=100,color='lY',code=function()_dumpCB(VK_org)end}, + WIDGET.newButton{name="vk", x=1090,y=170,w=280,h=100,color='lY',code=function()_dumpCB(VK_ORG)end}, WIDGET.newText{name="import", x=55,y=265,color='lR',align='L',font=50}, WIDGET.newButton{name="unlock", x=190,y=390,w=280,h=100,color='lR', @@ -31,7 +31,7 @@ scene.widgetList={ local D=_parseCB() if D then TABLE.cover(D,RANKS) - for k,v in next,oldModeNameTable do + for k,v in next,MODE_UPDATE_MAP do if RANKS[k]then RANKS[v]=RANKS[k] RANKS[k]=nil @@ -70,8 +70,8 @@ scene.widgetList={ code=function() local D=_parseCB() if D then - TABLE.update(D,VK_org) - FILE.save(VK_org,'conf/virtualkey') + TABLE.update(D,VK_ORG) + FILE.save(VK_ORG,'conf/virtualkey') MES.new('check',text.importSuccess) else MES.new('error',text.dataCorrupted) diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index a7effb3b..93aabe43 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -9,10 +9,10 @@ local keyList local function _freshKeyList() keyList={}for i=0,20 do keyList[i]={}end - for k,v in next,keyMap.keyboard do + for k,v in next,KEY_MAP.keyboard do ins(keyList[v],{COLOR.lB,k}) end - for k,v in next,keyMap.joystick do + for k,v in next,KEY_MAP.joystick do ins(keyList[v],{COLOR.lR,k}) end end @@ -23,7 +23,7 @@ function scene.sceneInit() BG.set('none') end function scene.sceneBack() - FILE.save(keyMap,'conf/key') + FILE.save(KEY_MAP,'conf/key') end local forbbidenKeys={ @@ -40,9 +40,9 @@ function scene.keyDown(key,isRep) end elseif key=="backspace"then if selected then - for k,v in next,keyMap.keyboard do + for k,v in next,KEY_MAP.keyboard do if v==selected then - keyMap.keyboard[k]=nil + KEY_MAP.keyboard[k]=nil end end _freshKeyList() @@ -51,7 +51,7 @@ function scene.keyDown(key,isRep) end elseif selected then if not forbbidenKeys[key]then - keyMap.keyboard[key]=selected + KEY_MAP.keyboard[key]=selected _freshKeyList() selected=false SFX.play('reach',.5) @@ -63,9 +63,9 @@ end function scene.gamepadDown(key) if key=="back"then if selected then - for k,v in next,keyMap.joystick do + for k,v in next,KEY_MAP.joystick do if v==selected then - keyMap.joystick[k]=nil + KEY_MAP.joystick[k]=nil end end _freshKeyList() @@ -75,7 +75,7 @@ function scene.gamepadDown(key) SCN.back() end elseif selected then - keyMap.joystick[key]=selected + KEY_MAP.joystick[key]=selected _freshKeyList() selected=false SFX.play('reach',.5) diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 70674408..bf652590 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -91,9 +91,9 @@ scene.widgetList={ WIDGET.newSwitch{name="autoMute", x=1150,y=180,lim=380,disp=SETval('autoMute'),code=SETrev('autoMute')}, WIDGET.newSwitch{name="fine", x=1150,y=250,lim=380,disp=SETval('fine'),code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, - WIDGET.newSelector{name="sfxPack",x=1100,y=330,w=200,color='lV',list={'chiptune'},disp=function()return sfxPack end,code=function(i)sfxPack=i end}, + WIDGET.newSelector{name="sfxPack",x=1100,y=330,w=200,color='lV',list=SFXPACKS,disp=function()return sfxPack end,code=function(i)sfxPack=i end}, WIDGET.newButton{name="apply", x=1100,y=400,w=180,h=60,code=function()SETTING.sfxPack=sfxPack SFX.load('media/effect/'..sfxPack..'/')end,hideF=function()return SETTING.sfxPack==sfxPack end}, - WIDGET.newSelector{name="vocPack",x=1100,y=470,w=200,color='lV',list={'miya','mono','xiaoya','miku'},disp=function()return vocPack end,code=function(i)vocPack=i end}, + WIDGET.newSelector{name="vocPack",x=1100,y=470,w=200,color='lV',list=VOCPACKS,disp=function()return vocPack end,code=function(i)vocPack=i end}, WIDGET.newButton{name="apply", x=1100,y=540,w=180,h=60,code=function()SETTING.vocPack=vocPack VOC.load('media/vocal/'..vocPack..'/')end,hideF=function()return SETTING.vocPack==vocPack end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 16347e6c..7fd19aa3 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -1,6 +1,6 @@ local gc,ms=love.graphics,love.mouse local int,sin=math.floor,math.sin -local VK_org=VK_org +local VK_ORG=VK_ORG local scene={} @@ -9,23 +9,23 @@ local snapUnit=1 local selected--Button selected local function _save1() - FILE.save(VK_org,'conf/vkSave1') + FILE.save(VK_ORG,'conf/vkSave1') end local function _load1() local D=FILE.load('conf/vkSave1') if D then - TABLE.update(D,VK_org) + TABLE.update(D,VK_ORG) else MES.new('error',text.noFile) end end local function _save2() - FILE.save(VK_org,'conf/vkSave2') + FILE.save(VK_ORG,'conf/vkSave2') end local function _load2() local D=FILE.load('conf/vkSave2') if D then - TABLE.update(D,VK_org) + TABLE.update(D,VK_ORG) else MES.new('error',text.noFile) end @@ -37,13 +37,13 @@ function scene.sceneInit() selected=false end function scene.sceneBack() - FILE.save(VK_org,'conf/virtualkey') + FILE.save(VK_ORG,'conf/virtualkey') end local function _onVK_org(x,y) local dist,nearest=1e10 - for K=1,#VK_org do - local B=VK_org[K] + for K=1,#VK_ORG do + local B=VK_ORG[K] if B.ava then local d1=(x-B.x)^2+(y-B.y)^2 if d1