diff --git a/Zframework/aDraw.lua b/Zframework/aDraw.lua index 4dd9bfba..89754383 100644 --- a/Zframework/aDraw.lua +++ b/Zframework/aDraw.lua @@ -1,7 +1,7 @@ local printf=love.graphics.printf local draw=love.graphics.draw local aDraw={} -function aDraw.str(obj,x,y)printf(obj,x-626,y,1252,"center")end +function aDraw.str(obj,x,y)printf(obj,x-626,y,1252,'center')end function aDraw.simpX(obj,x,y)draw(obj,x-obj:getWidth()*.5,y)end function aDraw.simpY(obj,x,y)draw(obj,x,y-obj:getHeight()*.5)end function aDraw.X(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,0)end diff --git a/Zframework/bgm.lua b/Zframework/bgm.lua index 96864df1..aebab767 100644 --- a/Zframework/bgm.lua +++ b/Zframework/bgm.lua @@ -46,7 +46,7 @@ function BGM.init(list) for i=1,count do local file="media/BGM/"..list[i]..".ogg" if love.filesystem.getInfo(file)then - Sources[list[i]]=love.audio.newSource(file,"stream") + Sources[list[i]]=love.audio.newSource(file,'stream') Sources[list[i]]:setLooping(true) Sources[list[i]]:setVolume(0) else diff --git a/Zframework/doGC.lua b/Zframework/doGC.lua index 59559067..8f8fcb9f 100644 --- a/Zframework/doGC.lua +++ b/Zframework/doGC.lua @@ -19,19 +19,19 @@ local cmds={ draw="draw", dLine="line", - fRect=function(...)gc.rectangle("fill",...)end, - dRect=function(...)gc.rectangle("line",...)end, - fCirc=function(...)gc.circle("fill",...)end, - dCirc=function(...)gc.circle("line",...)end, - fPoly=function(...)gc.polygon("fill",...)end, - dPoly=function(...)gc.polygon("line",...)end, + fRect=function(...)gc.rectangle('fill',...)end, + dRect=function(...)gc.rectangle('line',...)end, + fCirc=function(...)gc.circle('fill',...)end, + dCirc=function(...)gc.circle('line',...)end, + fPoly=function(...)gc.polygon('fill',...)end, + dPoly=function(...)gc.polygon('line',...)end, - dPie=function(...)gc.arc("line",...)end, - dArc=function(...)gc.arc("line","open",...)end, - dBow=function(...)gc.arc("line","closed",...)end, - fPie=function(...)gc.arc("fill",...)end, - fArc=function(...)gc.arc("fill","open",...)end, - fBow=function(...)gc.arc("fill","closed",...)end, + dPie=function(...)gc.arc('line',...)end, + dArc=function(...)gc.arc('line','open',...)end, + dBow=function(...)gc.arc('line','closed',...)end, + fPie=function(...)gc.arc('fill',...)end, + fArc=function(...)gc.arc('fill','open',...)end, + fBow=function(...)gc.arc('fill','closed',...)end, } return function(L) gc.push() @@ -42,13 +42,13 @@ return function(L) gc.setLineWidth(1) for i=3,#L do local cmd=L[i][1] - if type(cmd)=="boolean"and cmd then + if type(cmd)=='boolean'and cmd then table.remove(L[i],1) cmd=L[i][1] end - if type(cmd)=="string"then + if type(cmd)=='string'then local func=cmds[cmd] - if type(func)=="string"then func=gc[func]end + if type(func)=='string'then func=gc[func]end if func then func(unpack(L[i],2)) else diff --git a/Zframework/dumpTable.lua b/Zframework/dumpTable.lua index 1994d1f6..d188b29f 100644 --- a/Zframework/dumpTable.lua +++ b/Zframework/dumpTable.lua @@ -14,34 +14,34 @@ return function(L,t) else s="return{\n" t=1 - if type(L)~="table"then + if type(L)~='table'then return end end local count=1 for k,v in next,L do local T=type(k) - if T=="number"then + if T=='number'then if k==count then k="" count=count+1 else k="["..k.."]=" end - elseif T=="string"then + elseif T=='string'then if find(k,"[^0-9a-zA-Z_]")then k="[\""..k.."\"]=" else k=k.."=" end - elseif T=="boolean"then k="["..k.."]=" + elseif T=='boolean'then k="["..k.."]=" else error("Error key type!") end T=type(v) - if T=="number"then v=tostring(v) - elseif T=="string"then v="\""..v.."\"" - elseif T=="table"then v=TABLE.dump(v,t+1) - elseif T=="boolean"then v=tostring(v) + if T=='number'then v=tostring(v) + elseif T=='string'then v="\""..v.."\"" + elseif T=='table'then v=TABLE.dump(v,t+1) + elseif T=='boolean'then v=tostring(v) else error("Error data type!") end s=s..tabs[t]..k..v..",\n" diff --git a/Zframework/file.lua b/Zframework/file.lua index 66ca2f30..b11106b0 100644 --- a/Zframework/file.lua +++ b/Zframework/file.lua @@ -3,7 +3,7 @@ local FILE={} function FILE.load(name) if fs.getInfo(name)then local F=fs.newFile(name) - if F:open("r")then + if F:open'r'then local s=F:read() F:close() if s:sub(1,6)=="return"then @@ -26,17 +26,17 @@ function FILE.load(name) end function FILE.save(data,name,mode) if not mode then mode=""end - if type(data)=="table"then - if mode:find("l")then + if type(data)=='table'then + if mode:find'l'then data=TABLE.dump(data) if not data then - LOG.print(name.." "..text.saveError.."dump error","error") + LOG.print(name.." "..text.saveError.."dump error",'error') return end else data=JSON.encode(data) if not data then - LOG.print(name.." "..text.saveError.."json error","error") + LOG.print(name.." "..text.saveError.."json error",'error') return end end @@ -45,16 +45,16 @@ function FILE.save(data,name,mode) end local F=fs.newFile(name) - F:open("w") + F:open'w' local success,mes=F:write(data) F:flush()F:close() if success then - if not mode:find("q")then + if not mode:find'q'then LOG.print(text.saveDone,COLOR.G) end else - LOG.print(text.saveError..(mes or"unknown error"),"error") - LOG.print(debug.traceback(),"error") + LOG.print(text.saveError..(mes or"unknown error"),'error') + LOG.print(debug.traceback(),'error') end end return FILE \ No newline at end of file diff --git a/Zframework/image.lua b/Zframework/image.lua index 4b1fcc87..bfd90b33 100644 --- a/Zframework/image.lua +++ b/Zframework/image.lua @@ -12,7 +12,7 @@ function IMG.init(list) local function load(skip) local loaded=0 for k,v in next,list do - if type(v)=="string"then + if type(v)=='string'then IMG[k]=love.graphics.newImage("media/image/"..v) else for i=1,#v do diff --git a/Zframework/init.lua b/Zframework/init.lua index dd7e6055..e10a869a 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -66,12 +66,12 @@ local devMode local infoCanvas=gc.newCanvas(108,27) local function updatePowerInfo() local state,pow=love.system.getPowerInfo() - gc.setCanvas(infoCanvas)gc_push("transform")gc.origin() + gc.setCanvas(infoCanvas)gc_push('transform')gc.origin() gc.clear(0,0,0,.25) - if state~="unknown"then + if state~='unknown'then gc.setLineWidth(4) - local charging=state=="charging" - if state=="nobattery"then + local charging=state=='charging' + if state=='nobattery'then gc_setColor(1,1,1) gc.setLineWidth(2) gc.line(74,SCR.safeX+5,100,22) @@ -82,7 +82,7 @@ local function updatePowerInfo() elseif pow<26 then gc_setColor(1,0,0) else gc_setColor(.5,0,1) end - gc_rectangle("fill",76,6,pow*.22,14) + gc_rectangle('fill',76,6,pow*.22,14) if pow<100 then setFont(15) gc_setColor(0,0,0) @@ -281,12 +281,12 @@ function love.joystickremoved(JS) end end local keyMirror={ - dpup="up", - dpdown="down", - dpleft="left", - dpright="right", - start="return", - back="escape", + dpup='up', + dpdown='down', + dpleft='left', + dpright='right', + start='return', + back='escape', } function love.gamepadpressed(_,i) mouseShow=false @@ -330,7 +330,7 @@ function love.lowmemory() if TIME()-lastGCtime>6.26 then collectgarbage() lastGCtime=TIME() - LOG.print("[auto GC] low MEM 设备内存过低","warn") + LOG.print("[auto GC] low MEM 设备内存过低",'warn') end end function love.resize(w,h) @@ -343,7 +343,7 @@ end function love.focus(f) if f then love.timer.step() - elseif SCN.cur=="game"and SETTING.autoPause then + elseif SCN.cur=='game'and SETTING.autoPause then pauseGame() end end @@ -377,7 +377,7 @@ function love.errorhandler(msg) gc.reset() if LOADED and #ERRDATA<3 then - BG.set("none") + BG.set('none') local scn=SCN and SCN.cur or"NULL" ERRDATA[#ERRDATA+1]={mes=err,scene=scn} @@ -398,7 +398,7 @@ function love.errorhandler(msg) local res,threadErr repeat res,threadErr=resume(loopThread) - until status(loopThread)=="dead" + until status(loopThread)=='dead' if not res then love.errorhandler(threadErr) return @@ -413,15 +413,15 @@ function love.errorhandler(msg) while true do love.event.pump() for E,a,b in love.event.poll()do - if E=="quit"or a=="escape"then + if E=='quit'or a=='escape'then destroyPlayers() return true - elseif E=="resize"then + elseif E=='resize'then SCR.resize(a,b) end end gc.clear(.3,.5,.9) - gc_push("transform") + gc_push('transform') gc.replaceTransform(xOy) setFont(100)gc_print(":(",100,0,0,1.2) setFont(40)gc.printf(errorMsg,100,160,SCR.w0-100) @@ -439,7 +439,7 @@ function love.errorhandler(msg) end end local WS=WS -local WSnames={"app","user","play","stream","chat"} +local WSnames={'app','user','play','stream','chat'} local WScolor={ {1,.5,.5,.7}, {1,.8,.3,.7}, @@ -479,8 +479,8 @@ function love.run() --Scene Launch while #SCN.stack>0 do SCN.pop()end - SCN.push("quit","slowFade") - SCN.init(#ERRDATA==0 and"load"or"error") + SCN.push('quit','slowFade') + SCN.init(#ERRDATA==0 and'load'or'error') return function() local _ @@ -494,7 +494,7 @@ function love.run() for N,a,b,c,d,e in POLL()do if love[N]then love[N](a,b,c,d,e) - elseif N=="quit"then + elseif N=='quit'then destroyPlayers() return a or true end @@ -522,7 +522,7 @@ function love.run() --Draw background BG.draw() - gc_push("transform") + gc_push('transform') gc.replaceTransform(xOy) --Draw scene contents @@ -539,7 +539,7 @@ function love.run() _=SCS[R][0] gc_draw(TEXTURE.miniBlock[R],mx,my,t%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5) gc_setColor(1,1,1) - gc_draw(TEXTURE[ms.isDown(1)and"cursor_hold"or"cursor"],mx,my,nil,nil,nil,8,8) + gc_draw(TEXTURE[ms.isDown(1)and'cursor_hold'or'cursor'],mx,my,nil,nil,nil,8,8) end SYSFX.draw() TEXT.draw() @@ -577,31 +577,31 @@ function love.run() ins(frameTimeList,1,dt)rem(frameTimeList,126) gc_setColor(1,1,1,.3) for i=1,#frameTimeList do - gc_rectangle("fill",150+2*i,_-20,2,-frameTimeList[i]*4000) + gc_rectangle('fill',150+2*i,_-20,2,-frameTimeList[i]*4000) end --Websocket status - gc_push("transform") + gc_push('transform') gc.translate(SCR.w,SCR.h-100) gc.scale(SCR.k) for i=1,5 do local status=WS.status(WSnames[i]) gc_setColor(WScolor[i]) - gc_rectangle("fill",0,20*i,-80,-20) - if status=="dead"then + gc_rectangle('fill',0,20*i,-80,-20) + if status=='dead'then gc_setColor(1,1,1) gc_draw(TEXTURE.ws_dead,-20,20*i-20) - elseif status=="connecting"then + elseif status=='connecting'then gc_setColor(1,1,1,.5+.3*sin(t*6.26)) gc_draw(TEXTURE.ws_connecting,-20,20*i-20) - elseif status=="running"then + elseif status=='running'then gc_setColor(1,1,1) gc_draw(TEXTURE.ws_running,-20,20*i-20) end local t1,t2,t3=WS.getTimers(WSnames[i]) - gc_setColor(1,1,1,t1)gc_rectangle("fill",-60,20*i,-20,-20) - gc_setColor(0,1,0,t2)gc_rectangle("fill",-40,20*i,-20,-20) - gc_setColor(1,0,0,t3)gc_rectangle("fill",-20,20*i,-20,-20) + gc_setColor(1,1,1,t1)gc_rectangle('fill',-60,20*i,-20,-20) + gc_setColor(0,1,0,t2)gc_rectangle('fill',-40,20*i,-20,-20) + gc_setColor(1,0,0,t3)gc_rectangle('fill',-20,20*i,-20,-20) end gc_pop() diff --git a/Zframework/json.lua b/Zframework/json.lua index 612129c5..230dc276 100644 --- a/Zframework/json.lua +++ b/Zframework/json.lua @@ -63,7 +63,7 @@ local function encode_table(val, stack) -- Treat as array -- check keys are valid and it is not sparse local n = 0 for k in pairs(val) do - if type(k) ~= "number" then + if type(k) ~= 'number' then error("invalid table: mixed or invalid key types") end n = n + 1 @@ -77,7 +77,7 @@ local function encode_table(val, stack) else -- Treat as an object for k, v in pairs(val) do - if type(k) ~= "string" then + if type(k) ~= 'string' then error("invalid table: mixed or invalid key types") end ins(res, encode(k, stack) .. ":" .. encode(v, stack)) @@ -100,11 +100,11 @@ local function encode_number(val) end local type_func_map = { - ["nil"] = encode_nil, - ["table"] = encode_table, - ["string"] = encode_string, - ["number"] = encode_number, - ["boolean"] = tostring + ['nil'] = encode_nil, + ['table'] = encode_table, + ['string'] = encode_string, + ['number'] = encode_number, + ['boolean'] = tostring } encode = function(val, stack) @@ -119,7 +119,7 @@ function json.encode(val) if a then return b elseif LOG then - LOG.print(text.jsonError..": "..(b or"uknErr"),"warn") + LOG.print(text.jsonError..": "..(b or"uknErr"),'warn') end end @@ -336,7 +336,7 @@ function parse(str, idx) end local function decode(str) - if type(str) ~= "string" then + if type(str) ~= 'string' then error("expected argument of type string, got " .. type(str)) end local res, idx = parse(str, next_char(str, 1, space_chars, true)) @@ -349,7 +349,7 @@ function json.decode(str) if a then return b elseif LOG then - LOG.print(text.jsonError..": "..(b or"uknErr"),"warn") + LOG.print(text.jsonError..": "..(b or"uknErr"),'warn') end end return json \ No newline at end of file diff --git a/Zframework/languages.lua b/Zframework/languages.lua index f7795df9..c200b4b6 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -2,9 +2,9 @@ local LANG={} function LANG.init(langList,publicText)--Attention, calling this will destory all initializing methods, create a LANG.set()! local function langFallback(T0,T) for k,v in next,T0 do - if type(v)=="table"and not v.refuseCopy then--refuseCopy: just copy pointer, not contents + if type(v)=='table'and not v.refuseCopy then--refuseCopy: just copy pointer, not contents if not T[k]then T[k]={}end - if type(T[k])=="table"then langFallback(v,T[k])end + if type(T[k])=='table'then langFallback(v,T[k])end elseif not T[k]then T[k]=v end @@ -26,7 +26,7 @@ function LANG.init(langList,publicText)--Attention, calling this will destory al end --Metatable:__call for table:getTip - if type(rawget(L,"getTip"))=="table"then + if type(rawget(L,"getTip"))=='table'then setmetatable(L.getTip,tipMeta) end diff --git a/Zframework/light/init.lua b/Zframework/light/init.lua index 0e613e91..9ba5d690 100644 --- a/Zframework/light/init.lua +++ b/Zframework/light/init.lua @@ -49,14 +49,14 @@ local function draw(L) render(L.shadowCanvas,0,0,0,1,L.size) --Ready to final render - setShader()setCanvas()gc.setBlendMode("add") + setShader()setCanvas()gc.setBlendMode('add') --Render to screes gc.setColor(r,g,b,a) render(L.renderCanvas,X,Y+L.size,0,1,-1) --Reset - gc.setBlendMode("alpha") + gc.setBlendMode('alpha') end local LIGHT={} diff --git a/Zframework/loadLib.lua b/Zframework/loadLib.lua index 471db73d..8de5acba 100644 --- a/Zframework/loadLib.lua +++ b/Zframework/loadLib.lua @@ -4,7 +4,7 @@ return function(name,libName) if r1 and r2 then return r2 else - LOG.print("Cannot load "..name..": "..(r2 or r3),"warn",COLOR.R) + LOG.print("Cannot load "..name..": "..(r2 or r3),'warn',COLOR.R) end elseif SYSTEM=="Android"then local fs=love.filesystem @@ -12,35 +12,35 @@ return function(name,libName) local libFunc=package.loadlib(SAVEDIR.."/lib/"..libName.Android,libName.libFunc) if libFunc then - LOG.print(name.." lib loaded","warn",COLOR.G) + LOG.print(name.." lib loaded",'warn',COLOR.G) else for i=1,#platform do - local soFile=fs.read("data","libAndroid/"..platform[i].."/"..libName.Android) + local soFile=fs.read('data',"libAndroid/"..platform[i].."/"..libName.Android) if soFile then local success,message=fs.write("lib/"..libName.Android,soFile) if success then libFunc,message=package.loadlib(SAVEDIR.."/lib/"..libName.Android,libName.libFunc) if libFunc then - LOG.print(name.." lib loaded","warn",COLOR.G) + LOG.print(name.." lib loaded",'warn',COLOR.G) break else - LOG.print("Cannot load "..name..": "..message,"warn",COLOR.R) + LOG.print("Cannot load "..name..": "..message,'warn',COLOR.R) end else - LOG.print("Write "..name.."-"..platform[i].." to saving failed: "..message,"warn",COLOR.R) + LOG.print("Write "..name.."-"..platform[i].." to saving failed: "..message,'warn',COLOR.R) end else - LOG.print("Read "..name.."-"..platform[i].." failed","warn",COLOR.R) + LOG.print("Read "..name.."-"..platform[i].." failed",'warn',COLOR.R) end end if not libFunc then - LOG.print("Cannot load "..name,"warn",COLOR.R) + LOG.print("Cannot load "..name,'warn',COLOR.R) return end end return libFunc() else - LOG.print("No "..name.." for "..SYSTEM,"warn",COLOR.R) + LOG.print("No "..name.." for "..SYSTEM,'warn',COLOR.R) return end return true diff --git a/Zframework/log.lua b/Zframework/log.lua index 81bd05c1..5cee9182 100644 --- a/Zframework/log.lua +++ b/Zframework/log.lua @@ -38,21 +38,21 @@ end function LOG.print(text,T,C)--text,type/time,color local time local his - if T=="warn"then + if T=='warn'then C=C or COLOR.Y his=true time=180 - elseif T=="error"then + elseif T=='error'then C=C or COLOR.R his=true time=210 - elseif T=="message"then + elseif T=='message'then C=C or COLOR.N his=true - elseif type(T)=="number"then + elseif type(T)=='number'then C=C or COLOR.Z time=T - elseif type(T)=="table"then + elseif type(T)=='table'then C=T elseif not C then C=COLOR.Z diff --git a/Zframework/profile.lua b/Zframework/profile.lua index 09fb3dce..0158b0b7 100644 --- a/Zframework/profile.lua +++ b/Zframework/profile.lua @@ -11,7 +11,7 @@ local _internal={}-- list of internal profiler functions local getInfo=debug.getinfo function profile.hooker(event,line,info) - info=info or getInfo(2,"fnS") + info=info or getInfo(2,'fnS') local f=info.func if _internal[f]then return end-- ignore the profiler itself if info.name then _labeled[f]=info.name end-- get the function name if available @@ -27,10 +27,10 @@ function profile.hooker(event,line,info) _tcalled[f]=nil end if event=="tail call"then - local prev=getInfo(3,"fnS") - profile.hooker("return",line,prev) - profile.hooker("call",line,info) - elseif event=="call"then + local prev=getInfo(3,'fnS') + profile.hooker('return',line,prev) + profile.hooker('call',line,info) + elseif event=='call'then _tcalled[f]=clock() else _ncalls[f]=_ncalls[f]+1 @@ -43,7 +43,7 @@ function profile.start() jit.off() jit.flush() end - debug.sethook(profile.hooker,"cr") + debug.sethook(profile.hooker,'cr') end --- Stops collecting data. @@ -68,7 +68,7 @@ function profile.stop() lookup[id]=f end end - collectgarbage("collect") + collectgarbage() end --- Resets all collected data. @@ -78,7 +78,7 @@ function profile.reset() _telapsed[f]=0 _tcalled[f]=nil end - collectgarbage("collect") + collectgarbage() end local function _comp(a,b) @@ -151,7 +151,7 @@ end -- store all internal profiler functions for _,v in next,profile do - _internal[v]=type(v)=="function" + _internal[v]=type(v)=='function' end return profile diff --git a/Zframework/scene.lua b/Zframework/scene.lua index 022f8886..c1b671c0 100644 --- a/Zframework/scene.lua +++ b/Zframework/scene.lua @@ -85,7 +85,7 @@ function SCN.push(tar,style) if not SCN.swapping then local m=#SCN.stack SCN.stack[m+1]=tar or SCN.cur - SCN.stack[m+2]=style or"fade" + SCN.stack[m+2]=style or'fade' end end function SCN.pop() @@ -94,46 +94,46 @@ function SCN.pop() end local swap={ - none={1,0,NULL},--swapTime, changeTime, drawFunction + none={1,0,function()end},--swapTime, changeTime, drawFunction flash={8,1,function()gc.clear(1,1,1)end}, fade={30,15,function(t) t=t>15 and 2-t/15 or t/15 gc.setColor(0,0,0,t) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) end}, fade_togame={120,20,function(t) t=t>20 and(120-t)/100 or t/20 gc.setColor(0,0,0,t) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) end}, slowFade={180,90,function(t) t=t>90 and 2-t/90 or t/90 gc.setColor(0,0,0,t) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) end}, swipeL={30,15,function(t) t=t/30 gc.setColor(.1,.1,.1,1-abs(t-.5)) t=t*t*(3-2*t)*2-1 - gc.rectangle("fill",t*SCR.w,0,SCR.w,SCR.h) + gc.rectangle('fill',t*SCR.w,0,SCR.w,SCR.h) end}, swipeR={30,15,function(t) t=t/30 gc.setColor(.1,.1,.1,1-abs(t-.5)) t=t*t*(2*t-3)*2+1 - gc.rectangle("fill",t*SCR.w,0,SCR.w,SCR.h) + gc.rectangle('fill',t*SCR.w,0,SCR.w,SCR.h) end}, swipeD={30,15,function(t) t=t/30 gc.setColor(.1,.1,.1,1-abs(t-.5)) t=t*t*(2*t-3)*2+1 - gc.rectangle("fill",0,t*SCR.h,SCR.w,SCR.h) + gc.rectangle('fill',0,t*SCR.h,SCR.w,SCR.h) end}, }--Scene swapping animations function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back if scenes[tar]then if not SCN.swapping and tar~=SCN.cur then - if not style then style="fade"end + if not style then style='fade'end SCN.swapping=true local S=SCN.stat S.tar,S.style=tar,style @@ -141,7 +141,7 @@ function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back S.time,S.mid,S.draw=s[1],s[2],s[3] end else - LOG.print("No Scene: "..tar,"warn") + LOG.print("No Scene: "..tar,'warn') end end function SCN.go(tar,style)--Normal scene swapping, can back @@ -149,7 +149,7 @@ function SCN.go(tar,style)--Normal scene swapping, can back SCN.push() SCN.swapTo(tar,style) else - LOG.print("No Scene: "..tar,"warn") + LOG.print("No Scene: "..tar,'warn') end end function SCN.back() diff --git a/Zframework/sfx.lua b/Zframework/sfx.lua index eaff85a1..986f1312 100644 --- a/Zframework/sfx.lua +++ b/Zframework/sfx.lua @@ -15,7 +15,7 @@ function SFX.init(list) for i=1,count do local N="media/SFX/"..list[i]..".ogg" if love.filesystem.getInfo(N)then - Sources[list[i]]={love.audio.newSource(N,"static")} + Sources[list[i]]={love.audio.newSource(N,'static')} else LOG.print("No SFX file: "..N,5,COLOR.O) end @@ -76,7 +76,7 @@ function SFX.init(list) end function SFX.reset() for _,L in next,Sources do - if type(L)=="table"then + if type(L)=='table'then for i=#L,1,-1 do if not L[i]:isPlaying()then rem(L,i) diff --git a/Zframework/sysFX.lua b/Zframework/sysFX.lua index 4dfe5253..8da7a9a4 100644 --- a/Zframework/sysFX.lua +++ b/Zframework/sysFX.lua @@ -75,32 +75,32 @@ function FXdraw.tap(S) local t=S.t setWidth(2) setColor(1,1,1,1-t) - gc.circle("line",S.x,S.y,t*(2-t)*30) + gc.circle('line',S.x,S.y,t*(2-t)*30) setColor(1,1,1,(1-t)*.5) - gc.circle("fill",S.x,S.y,t*30) + gc.circle('fill',S.x,S.y,t*30) setColor(1,1,1,1-t) for i=1,10 do local p=S.ptc[i] local T=t^.5 - gc.rectangle("fill",p[1]*(1-T)+p[3]*T-5,p[2]*(1-T)+p[4]*T-5,11,11) + gc.rectangle('fill',p[1]*(1-T)+p[3]*T-5,p[2]*(1-T)+p[4]*T-5,11,11) end end function FXdraw.ripple(S) local t=S.t setWidth(2) setColor(1,1,1,1-t) - gc.circle("line",S.x,S.y,t*(2-t)*S.r) + gc.circle('line',S.x,S.y,t*(2-t)*S.r) end function FXdraw.rectRipple(S) setWidth(6) setColor(1,1,1,1-S.t) local r=(10*S.t)^1.2 - gc.rectangle("line",S.x-r,S.y-r,S.w+2*r,S.h+2*r) + gc.rectangle('line',S.x-r,S.y-r,S.w+2*r,S.h+2*r) end function FXdraw.shade(S) setColor(S.r,S.g,S.b,1-S.t) - gc.rectangle("fill",S.x,S.y,S.w,S.h,2) + gc.rectangle('fill',S.x,S.y,S.w,S.h,2) end function FXdraw.cell(S) setColor(1,1,1,1-S.t) diff --git a/Zframework/tableExtend.lua b/Zframework/tableExtend.lua index 6904673f..cabf8627 100644 --- a/Zframework/tableExtend.lua +++ b/Zframework/tableExtend.lua @@ -5,7 +5,7 @@ local TABLE={} function TABLE.shift(org) local L={} for i=1,#org do - if type(org[i])~="table"then + if type(org[i])~='table'then L[i]=org[i] else L[i]=TABLE.shift(org[i]) @@ -18,7 +18,7 @@ end function TABLE.copy(org) local L={} for k,v in next,org do - if type(v)~="table"then + if type(v)~='table'then L[k]=v else L[k]=TABLE.copy(v) @@ -31,7 +31,7 @@ end function TABLE.update(new,old) for k,v in next,new do if type(v)==type(old[k])then - if type(v)=="table"then + if type(v)=='table'then TABLE.update(v,old[k]) else old[k]=v @@ -45,7 +45,7 @@ function TABLE.complete(new,old) for k,v in next,new do if old[k]==nil then old[k]=v - elseif type(v)=="table"and type(old[k])=="table"then + elseif type(v)=='table'and type(old[k])=='table'then TABLE.complete(v,old[k]) end end @@ -68,7 +68,7 @@ end --Re-index string value of a table function TABLE.reIndex(org) for k,v in next,org do - if type(v)=="string"then + if type(v)=='string'then org[k]=org[v] end end @@ -92,34 +92,34 @@ do--function TABLE.dump(L,t) else s="return{\n" t=1 - if type(L)~="table"then + if type(L)~='table'then return end end local count=1 for k,v in next,L do local T=type(k) - if T=="number"then + if T=='number'then if k==count then k="" count=count+1 else k="["..k.."]=" end - elseif T=="string"then + elseif T=='string'then if find(k,"[^0-9a-zA-Z_]")then k="[\""..k.."\"]=" else k=k.."=" end - elseif T=="boolean"then k="["..k.."]=" + elseif T=='boolean'then k="["..k.."]=" else error("Error key type!") end T=type(v) - if T=="number"then v=tostring(v) - elseif T=="string"then v="\""..v.."\"" - elseif T=="table"then v=dump(v,t+1) - elseif T=="boolean"then v=tostring(v) + if T=='number'then v=tostring(v) + elseif T=='string'then v="\""..v.."\"" + elseif T=='table'then v=dump(v,t+1) + elseif T=='boolean'then v=tostring(v) else error("Error data type!") end s=s..tabs[t]..k..v..",\n" diff --git a/Zframework/task.lua b/Zframework/task.lua index a7a7c976..a53b32a3 100644 --- a/Zframework/task.lua +++ b/Zframework/task.lua @@ -9,7 +9,7 @@ end function TASK.update() for i=#tasks,1,-1 do local T=tasks[i] - if status(T.thread)=="dead"then + if status(T.thread)=='dead'then rem(tasks,i) else assert(resume(T.thread)) @@ -19,7 +19,7 @@ end function TASK.new(code,...) local thread=coroutine.create(code) resume(thread,...) - if status(thread)~="dead"then + if status(thread)~='dead'then tasks[#tasks+1]={ thread=thread, code=code, diff --git a/Zframework/text.lua b/Zframework/text.lua index 78293707..1e7f57df 100644 --- a/Zframework/text.lua +++ b/Zframework/text.lua @@ -19,21 +19,21 @@ function textFX.fly(t) mStr(t.text,t.x+(t.c-.5)^3*300,t.y-t.font*.7) end function textFX.stretch(t) - gc_push("transform") + gc_push('transform') gc_translate(t.x,t.y) if t.c<.3 then gc_scale((.3-t.c)*1.6+1,1)end mStr(t.text,0,-t.font*.7) gc_pop() end function textFX.drive(t) - gc_push("transform") + gc_push('transform') gc_translate(t.x,t.y) if t.c<.3 then gc_shear((.3-t.c)*2,0)end mStr(t.text,0,-t.font*.7) gc_pop() end function textFX.spin(t) - gc_push("transform") + gc_push('transform') gc_translate(t.x,t.y) if t.c<.3 then gc_rotate((.3-t.c)^2*4) @@ -49,7 +49,7 @@ function textFX.flicker(t) mStr(t.text,t.x,t.y-t.font*.7) end function textFX.zoomout(t) - gc_push("transform") + gc_push('transform') local k=t.c^.5*.1+1 gc_translate(t.x,t.y) gc_scale(k,k) @@ -57,7 +57,7 @@ function textFX.zoomout(t) gc_pop() end function textFX.beat(t) - gc_push("transform") + gc_push('transform') gc_translate(t.x,t.y) if t.c<.3 then local k=1.3-t.c^2/.3 @@ -85,7 +85,7 @@ function TEXT.show(text,x,y,font,style,spd,stop) font=int(font/5)*5 or 40, --Font spd=(spd or 1)/60, --Timing speed(1=last 1 sec) stop=stop, --Stop time(sustained text) - draw=textFX[style or"appear"]or error("unavailable type:"..style), --Draw method + draw=textFX[style or'appear']or error("unavailable type:"..style), --Draw method } end function TEXT.getText(text,x,y,font,style,spd,stop)--Another version of TEXT.show(), but only return text object, need manual management @@ -97,7 +97,7 @@ function TEXT.getText(text,x,y,font,style,spd,stop)--Another version of TEXT.sho font=int(font/5)*5 or 40, spd=(spd or 1)/60, stop=stop, - draw=textFX[style or"appear"]or error("unavailable type:"..style), + draw=textFX[style or'appear']or error("unavailable type:"..style), } end function TEXT.update(list) diff --git a/Zframework/theme.lua b/Zframework/theme.lua index b3d03a20..d9d73001 100644 --- a/Zframework/theme.lua +++ b/Zframework/theme.lua @@ -12,7 +12,7 @@ function THEME.calculate(Y,M,D) return --Christmas M=="12"and math.abs(D-25)<4 and - "xmas"or + 'xmas'or --Spring festival M<"03"and math.abs((({ @@ -25,49 +25,49 @@ function THEME.calculate(Y,M,D) 42,32,50,39,28,46,35,24,43,33, 21,40, })[Y-2000]or -26)-((M-1)*31+D))<6 and - "sprfes"or + 'sprfes'or --April fool's day M=="04"and D=="01"and - "fool"or + 'fool'or --Z day (Feb./Mar./Apr./May./June. 26) D=="26"and( - M=="01"or M=="02"and"zday1"or - M=="03"or M=="04"and"zday2"or - M=="05"or M=="06"and"zday3" + M=="01"or M=="02"and'zday1'or + M=="03"or M=="04"and'zday2'or + M=="05"or M=="06"and'zday3' )or - "classic" + 'classic' end function THEME.set(theme) - if theme=="classic"then - BG.setDefault("space") + if theme=='classic'then + BG.setDefault('space') BGM.setDefault("blank") - elseif theme=="xmas"then - BG.setDefault("snow") - BGM.setDefault("xmas") + elseif theme=='xmas'then + BG.setDefault('snow') + BGM.setDefault('xmas') LOG.print("==============",COLOR.R) LOG.print("Merry Christmas!",COLOR.Z) LOG.print("==============",COLOR.R) - elseif theme=="sprfes"then - BG.setDefault("firework") + elseif theme=='sprfes'then + BG.setDefault('firework') BGM.setDefault("spring festival") LOG.print(" ★☆☆★",COLOR.R) LOG.print("新年快乐!",COLOR.Z) LOG.print(" ★☆☆★",COLOR.R) - elseif theme=="zday1"then - BG.setDefault("lanterns") + elseif theme=='zday1'then + BG.setDefault('lanterns') BGM.setDefault("empty") - elseif theme=="zday2"then - BG.setDefault("lanterns") + elseif theme=='zday2'then + BG.setDefault('lanterns') BGM.setDefault("overzero") - elseif theme=="zday3"then - BG.setDefault("lanterns") + elseif theme=='zday3'then + BG.setDefault('lanterns') BGM.setDefault("vacuum") - elseif theme=="fool"then - BG.setDefault("blockrain") + elseif theme=='fool'then + BG.setDefault('blockrain') BGM.setDefault("how feeling") else return diff --git a/Zframework/websocket.lua b/Zframework/websocket.lua index 19841483..9df2087c 100644 --- a/Zframework/websocket.lua +++ b/Zframework/websocket.lua @@ -54,7 +54,7 @@ do--Connect repeat res,err=SOCK:receive("*l") if not res then readCHN:push(err)return end - if not ctLen and res:find"length"then + if not ctLen and res:find("length")then ctLen=tonumber(res:match"%d+") end until res=="" @@ -87,7 +87,7 @@ local _send do local mask_str=char(unpack(mask_key)) function _send(op,message) - ]]..(debug:find"S"and""or"--")..[[print((">> %s[%d]:%s"):format(threadName,#message,message)) + ]]..(debug:find'S'and""or"--")..[[print((">> %s[%d]:%s"):format(threadName,#message,message)) --Message type SOCK:send(char(bor(0x80,op))) @@ -154,7 +154,7 @@ while true do--Running if s then res=s elseif p then--UNF head - ]]..(debug:find"R"and""or"--")..[[print(("<< %s[%d/%d]:%s"):format(threadName,#p,length,#p<50 and p or p:sub(1,50))) + ]]..(debug:find'R'and""or"--")..[[print(("<< %s[%d/%d]:%s"):format(threadName,#p,length,#p<50 and p or p:sub(1,50))) UFF=true sBuffer=sBuffer..p length=length-#p @@ -166,11 +166,11 @@ while true do--Running else local s,e,p=SOCK:receive(length) if s then - ]]..(debug:find"R"and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#s<50 and s or s:sub(1,50))) + ]]..(debug:find'R'and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#s<50 and s or s:sub(1,50))) sBuffer=sBuffer..s length=length-#s elseif p then - ]]..(debug:find"R"and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#p<50 and p or p:sub(1,50))) + ]]..(debug:find'R'and""or"--")..[[print(("<< %s(%d):%s"):format(threadName,length,#p<50 and p or p:sub(1,50))) sBuffer=sBuffer..p length=length-#p end @@ -181,13 +181,13 @@ while true do--Running break end end - ]]..(debug:find"R"and""or"--")..[[print(("<< %s[(%d)]:%s"):format(threadName,#res,#res<800 and res or res:sub(1,150).."\n...\n"..res:sub(-150))) + ]]..(debug:find'R'and""or"--")..[[print(("<< %s[(%d)]:%s"):format(threadName,#res,#res<800 and res or res:sub(1,150).."\n...\n"..res:sub(-150))) --React if op==8 then--8=close readCHN:push(op) SOCK:close() - if type(res)=="string"then + if type(res)=='string'then res=JSON.decode(res) readCHN:push(res and res.reason or"WS Error") else @@ -196,21 +196,21 @@ while true do--Running elseif op==0 then--0=continue lBuffer=lBuffer..res if fin then - ]]..(debug:find"M"and""or"--")..[[print("FIN=1 (c") + ]]..(debug:find'M'and""or"--")..[[print("FIN=1 (c") readCHN:push(lBuffer) lBuffer="" else - ]]..(debug:find"M"and""or"--")..[[print("FIN=0 (c") + ]]..(debug:find'M'and""or"--")..[[print("FIN=0 (c") end else readCHN:push(op) if fin then - ]]..(debug:find"M"and""or"--")..[[print("OP: "..op.."\tFIN=1") + ]]..(debug:find'M'and""or"--")..[[print("OP: "..op.."\tFIN=1") readCHN:push(res) else - ]]..(debug:find"M"and""or"--")..[[print("OP: "..op.."\tFIN=0") + ]]..(debug:find'M'and""or"--")..[[print("OP: "..op.."\tFIN=0") sBuffer=res - ]]..(debug:find"M"and""or"--")..[[print("START pack: "..res) + ]]..(debug:find'M'and""or"--")..[[print("START pack: "..res) end end end @@ -223,7 +223,7 @@ local wsList=setmetatable({},{ __index=function(l,k) local ws={ real=false, - status="dead", + status='dead', lastPongTime=timer(), sendTimer=0, alertTimer=0, @@ -244,7 +244,7 @@ function WS.connect(name,subPath,body) lastPingTime=0, lastPongTime=timer(), pingInterval=26, - status="connecting",--connecting, running, dead + status='connecting',--connecting, running, dead sendTimer=0, alertTimer=0, pongTimer=0, @@ -259,7 +259,7 @@ end function WS.status(name) local ws=wsList[name] - return ws.status or"dead" + return ws.status or'dead' end function WS.getTimers(name) @@ -286,12 +286,12 @@ local OPcode={ pong=10, } local OPname={ - [0]="continue", - [1]="text", - [2]="binary", - [8]="close", - [9]="ping", - [10]="pong", + [0]='continue', + [1]='text', + [2]='binary', + [8]='close', + [9]='ping', + [10]='pong', } function WS.send(name,message,op) local ws=wsList[name] @@ -308,7 +308,7 @@ function WS.read(name) if ws.real and ws.readCHN:getCount()>=2 then local op=ws.readCHN:pop() local message=ws.readCHN:pop() - if op==8 then ws.status="dead"end--8=close + if op==8 then ws.status='dead'end--8=close ws.lastPongTime=timer() ws.pongTimer=1 return message,OPname[op]or op @@ -320,7 +320,7 @@ function WS.close(name) if ws.real then ws.sendCHN:push(8)--close ws.sendCHN:push("") - ws.status="dead" + ws.status='dead' end end @@ -329,20 +329,20 @@ function WS.update(dt) for name,ws in next,wsList do if ws.real then ws.triggerCHN:push(0) - if ws.status=="connecting"then + if ws.status=='connecting'then local mes=ws.readCHN:pop() if mes then if mes=="success"then - ws.status="running" + ws.status='running' ws.lastPingTime=time ws.lastPongTime=time ws.pongTimer=1 else - ws.status="dead" - LOG.print(text.wsFailed..": "..(mes=="timeout"and text.netTimeout or mes),"warn") + ws.status='dead' + LOG.print(text.wsFailed..": "..(mes=="timeout"and text.netTimeout or mes),'warn') end end - elseif ws.status=="running"then + elseif ws.status=='running'then if time-ws.lastPingTime>ws.pingInterval then ws.sendCHN:push(9) ws.sendCHN:push("")--ping diff --git a/Zframework/widget.lua b/Zframework/widget.lua index 522d5f58..3b651cc6 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -16,7 +16,7 @@ local widgetMetatable={ } local text={ - type="text", + type='text', mustHaveText=true, alpha=0, } @@ -34,16 +34,16 @@ function text:draw() if self.alpha>0 then local c=self.color gc.setColor(c[1],c[2],c[3],self.alpha) - if self.align=="M"then + if self.align=='M'then mDraw_X(self.obj,self.x,self.y) - elseif self.align=="L"then + elseif self.align=='L'then gc.draw(self.obj,self.x,self.y) - elseif self.align=="R"then + elseif self.align=='R'then gc.draw(self.obj,self.x-self.obj:getWidth(),self.y) end end end -function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,align="M"][,hide] +function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,align='M'][,hide] local _={ name= D.name, x= D.x, @@ -52,7 +52,7 @@ function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,align="M"][,hide fText= D.fText, color= D.color and(COLOR[D.color]or D.color)or COLOR.Z, font= D.font or 30, - align= D.align or"M", + align= D.align or'M', hideCon=D.hide, } for k,v in next,text do _[k]=v end @@ -62,10 +62,10 @@ function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,align="M"][,hide end local image={ - type="image", + type='image', } function image:reset() - if type(self.img)=="string"then + if type(self.img)=='string'then self.img=IMG[self.img] end end @@ -90,7 +90,7 @@ function WIDGET.newImage(D)--name[,img(name)],x,y[,ang][,k][,hide] end local button={ - type="button", + type='button', mustHaveText=true, ATV=0,--Activating time(0~8) } @@ -98,7 +98,7 @@ function button:reset() self.ATV=0 end function button:setObject(obj) - if type(obj)=="string"or type(obj)=="number"then + if type(obj)=='string'or type(obj)=='number'then self.obj=gc.newText(getFont(self.font),obj) elseif obj then self.obj=obj @@ -139,16 +139,16 @@ function button:draw() local c=self.color local r,g,b=c[1],c[2],c[3] gc.setColor(.2+r*.8,.2+g*.8,.2+b*.8,.7) - gc.rectangle("fill",x-ATV,y-ATV,w+2*ATV,h+2*ATV) + gc.rectangle('fill',x-ATV,y-ATV,w+2*ATV,h+2*ATV) if ATV>0 then gc.setLineWidth(4) gc.setColor(1,1,1,ATV*.125) - gc.rectangle("line",x-ATV+2,y-ATV+2,w+2*ATV-4,h+2*ATV-4) + gc.rectangle('line',x-ATV+2,y-ATV+2,w+2*ATV-4,h+2*ATV-4) end local obj=self.obj local y0=y+h*.5-ATV*.5 gc.setColor(1,1,1,.2+ATV*.05) - if self.align=="M"then + if self.align=='M'then local x0=x+w*.5 mDraw(obj,x0-2,y0-2) mDraw(obj,x0-2,y0+2) @@ -156,7 +156,7 @@ function button:draw() mDraw(obj,x0+2,y0+2) gc.setColor(r*.5,g*.5,b*.5) mDraw(obj,x0,y0) - elseif self.align=="L"then + elseif self.align=='L'then local edge=self.edge mDraw_Y(obj,x+edge-2,y0-2) mDraw_Y(obj,x+edge-2,y0+2) @@ -164,7 +164,7 @@ function button:draw() mDraw_Y(obj,x+edge+2,y0+2) gc.setColor(r*.5,g*.5,b*.5) mDraw_Y(obj,x+edge,y0) - elseif self.align=="R"then + elseif self.align=='R'then local x0=x+w-self.edge-obj:getWidth() mDraw_Y(obj,x0-2,y0-2) mDraw_Y(obj,x0-2,y0+2) @@ -180,9 +180,9 @@ end function button:press(_,_,k) self.code(k) self:FX() - if self.sound then SFX.play("button")end + if self.sound then SFX.play('button')end end -function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align="M"][,edge=0],code[,hide] +function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align='M'][,edge=0],code[,hide] if not D.h then D.h=D.w end local _={ name= D.name, @@ -203,7 +203,7 @@ function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=tr fText= D.fText, color= D.color and(COLOR[D.color]or D.color)or COLOR.Z, font= D.font or 30, - align= D.align or"M", + align= D.align or'M', edge= D.edge or 0, sound= D.sound~=false, code= D.code, @@ -215,7 +215,7 @@ function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=tr end local key={ - type="key", + type='key', mustHaveText=true, ATV=0,--Activating time(0~4) } @@ -223,7 +223,7 @@ function key:reset() self.ATV=0 end function key:setObject(obj) - if type(obj)=="string"or type(obj)=="number"then + if type(obj)=='string'or type(obj)=='number'then self.obj=gc.newText(getFont(self.font),obj) elseif obj then self.obj=obj @@ -254,18 +254,18 @@ function key:draw() local r,g,b=c[1],c[2],c[3] gc.setColor(1,1,1,ATV*.125) - gc.rectangle("fill",x,y,w,h) + gc.rectangle('fill',x,y,w,h) gc.setColor(.2+r*.8,.2+g*.8,.2+b*.8,.7) gc.setLineWidth(4) - gc.rectangle("line",x,y,w,h) + gc.rectangle('line',x,y,w,h) gc.setColor(r,g,b,1.2) - if self.align=="M"then + if self.align=='M'then mDraw(self.obj,x+w*.5,y+h*.5) - elseif self.align=="L"then + elseif self.align=='L'then mDraw_Y(self.obj,x+self.edge,y+h*.5) - elseif self.align=="R"then + elseif self.align=='R'then mDraw_Y(self.obj,x+w-self.edge-self.obj:getWidth(),y+h*.5) end end @@ -274,9 +274,9 @@ function key:getInfo() end function key:press(_,_,k) self.code(k) - if self.sound then SFX.play("key")end + if self.sound then SFX.play('key')end end -function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align="M"][,edge=0],code[,hide] +function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align='M'][,edge=0],code[,hide] if not D.h then D.h=D.w end local _={ name= D.name, @@ -298,7 +298,7 @@ function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true] color= D.color and(COLOR[D.color]or D.color)or COLOR.Z, font= D.font or 30, sound= D.sound~=false, - align= D.align or"M", + align= D.align or'M', edge= D.edge or 0, code= D.code, hide= D.hide, @@ -309,7 +309,7 @@ function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true] end local switch={ - type="switch", + type='switch', mustHaveText=true, ATV=0,--Activating time(0~8) CHK=0,--Check alpha(0~6) @@ -341,7 +341,7 @@ function switch:draw() --Checked if ATV>0 then gc.setColor(1,1,1,ATV*.08) - gc.rectangle("fill",x,y,50,50) + gc.rectangle('fill',x,y,50,50) end if self.CHK>0 then gc.setColor(.9,1,.9,self.CHK/6) @@ -352,7 +352,7 @@ function switch:draw() --Frame gc.setLineWidth(4) gc.setColor(1,1,1,.6+ATV*.05) - gc.rectangle("line",x,y,50,50) + gc.rectangle('line',x,y,50,50) --Drawable gc.setColor(self.color) @@ -363,7 +363,7 @@ function switch:getInfo() end function switch:press() self.code() - if self.sound then SFX.play("move")end + if self.sound then SFX.play('move')end end function WIDGET.newSwitch(D)--name,x,y[,fText][,color][,font=30][,sound=true][,disp],code,hide local _={ @@ -390,7 +390,7 @@ function WIDGET.newSwitch(D)--name,x,y[,fText][,color][,font=30][,sound=true][,d end local slider={ - type="slider", + type='slider', ATV=0,--Activating time(0~8) TAT=0,--Text activating time(0~180) pos=0,--Position shown @@ -463,12 +463,12 @@ function slider:draw() local cx=x+(x2-x)*self.pos/self.unit local bx,by,bw,bh=cx-10-ATV*.5,y-16-ATV,20+ATV,32+2*ATV gc.setColor(.8,.8,.8) - gc.rectangle("fill",bx,by,bw,bh) + gc.rectangle('fill',bx,by,bw,bh) if ATV>0 then gc.setLineWidth(2) gc.setColor(1,1,1,ATV*.16) - gc.rectangle("line",bx+1,by+1,bw-2,bh-2) + gc.rectangle('line',bx+1,by+1,bw-2,bh-2) end if self.TAT>0 and self.show then setFont(25) @@ -552,7 +552,7 @@ function WIDGET.newSlider(D)--name,x,y,w[,fText][,color][,unit][,smooth][,font=3 _.smooth=_.unit<=1 end if D.show then - if type(D.show)=="function"then + if type(D.show)=='function'then _.show=D.show else _.show=sliderShowFunc[D.show] @@ -570,7 +570,7 @@ function WIDGET.newSlider(D)--name,x,y,w[,fText][,color][,unit][,smooth][,font=3 end local selector={ - type="selector", + type='selector', mustHaveText=true, ATV=8,--Activating time(0~4) select=0,--Selected item ID @@ -588,7 +588,7 @@ function selector:reset() end end self.hide=true - LOG.print("Selector "..self.name.." dead, disp= "..tostring(V),"warn") + LOG.print("Selector "..self.name.." dead, disp= "..tostring(V),'warn') end function selector:isAbove(x,y) return @@ -619,7 +619,7 @@ function selector:draw() gc.setColor(1,1,1,.6+ATV*.1) gc.setLineWidth(3) - gc.rectangle("line",x,y,w,60) + gc.rectangle('line',x,y,w,60) gc.setColor(1,1,1,.2+ATV*.1) local t=(TIME()%.5)^.5 @@ -667,7 +667,7 @@ function selector:press(x) self.code(self.list[s]) self.select=s self.selText=self.list[s] - if self.sound then SFX.play("prerotate")end + if self.sound then SFX.play('prerotate')end end end end @@ -684,7 +684,7 @@ function selector:arrowKey(isLeft) self.code(self.list[s]) self.select=s self.selText=self.list[s] - if self.sound then SFX.play("prerotate")end + if self.sound then SFX.play('prerotate')end end function WIDGET.newSelector(D)--name,x,y,w[,fText][,color][,sound=true],list,disp,code,hide local _={ @@ -717,7 +717,7 @@ function WIDGET.newSelector(D)--name,x,y,w[,fText][,color][,sound=true],list,dis end local inputBox={ - type="inputBox", + type='inputBox', keepFocus=true, ATV=0,--Activating time(0~4) value="",--Text contained @@ -754,11 +754,11 @@ function inputBox:draw() local ATV=self.ATV gc.setColor(1,1,1,ATV*.1) - gc.rectangle("fill",x,y,w,h) + gc.rectangle('fill',x,y,w,h) gc.setColor(1,1,1) gc.setLineWidth(4) - gc.rectangle("line",x,y,w,h) + gc.rectangle('line',x,y,w,h) --Drawable setFont(self.font) @@ -770,7 +770,7 @@ function inputBox:draw() gc.print("*",x-5+self.font*.5*i,y+h*.5-self.font*.7) end else - gc.printf(self.value,x+10,y,self.w,"left") + gc.printf(self.value,x+10,y,self.w) setFont(self.font-10) if WIDGET.sel==self then gc.print(EDITING,x+10,y+12-self.font*1.4) @@ -795,10 +795,10 @@ function inputBox:keypress(k) p=p-1 end t=sub(t,1,p-1) - SFX.play("lock") + SFX.play('lock') elseif k=="delete"then t="" - SFX.play("hold") + SFX.play('hold') end self.value=t end @@ -829,7 +829,7 @@ function WIDGET.newInputBox(D)--name,x,y,w[,h][,font=30][,secret][,regex],hide end local textBox={ - type="textBox", + type='textBox', scrollPos=0,--Which line display at bottom scrollPix=0,--Hidden wheel move value sure=0,--Sure-timer for clear history @@ -899,7 +899,7 @@ end function textBox:clear() self.texts={} self.scrollPos=0 - SFX.play("fall") + SFX.play('fall') end function textBox:draw() local x,y,w,h=self.x,self.y,self.w,self.h @@ -910,19 +910,19 @@ function textBox:draw() --Background gc.setColor(0,0,0,.3) - gc.rectangle("fill",x,y,w,h) + gc.rectangle('fill',x,y,w,h) --Frame gc.setLineWidth(4) gc.setColor(1,1,WIDGET.sel==self and 0 or 1) - gc.rectangle("line",x,y,w,h) + gc.rectangle('line',x,y,w,h) --Slider if #texts>cap then gc.setLineWidth(2) - gc.rectangle("line",x-25,y,20,h) + gc.rectangle('line',x-25,y,20,h) local len=max(h*cap/#texts,26) - gc.rectangle("fill",x-22,y+(h-len-6)*(scroll-cap)/(#texts-cap)+3,14,len) + gc.rectangle('fill',x-22,y+(h-len-6)*(scroll-cap)/(#texts-cap)+3,14,len) end gc.setColor(1,1,1) @@ -930,7 +930,7 @@ function textBox:draw() --Clear button if not self.fix then mStr(self.sure>0 and"?"or"X",x+w-20,y-1) - gc.rectangle("line",x+w-40,y,40,40) + gc.rectangle('line',x+w-40,y,40,40) end --Texts @@ -1004,7 +1004,7 @@ function WIDGET.set(list) for i=1,#list do list[i]:reset() end - if SCN.cur~="custom_field"then + if SCN.cur~='custom_field'then local colorList=THEME.getThemeColor() if not colorList then return end local rnd=math.random @@ -1025,7 +1025,7 @@ function WIDGET.setLang(widgetText) t=W.name or"##" W.color=COLOR.dV end - if type(t)=="string"and W.font then + if type(t)=='string'and W.font then t=gc.newText(getFont(W.font),t) end W.obj=t @@ -1054,7 +1054,7 @@ end function WIDGET.drag(x,y,dx,dy) local W=WIDGET.sel if not W then return end - if W.type=="slider"or W.type=="textBox"then + if W.type=='slider'or W.type=='textBox'then W:drag(x,y,dx,dy) elseif not W:isAbove(x,y)then WIDGET.sel=false @@ -1063,7 +1063,7 @@ end function WIDGET.release(x,y) local W=WIDGET.sel if not W then return end - if W.type=="slider"then + if W.type=='slider'then W:release(x,y) end end @@ -1073,7 +1073,7 @@ function WIDGET.keyPressed(k) elseif kb.isDown("lshift","lalt","lctrl")and(k=="left"or k=="right")then --When hold [↑], control slider with left/right local W=WIDGET.sel - if W and W.type=="slider"or W.type=="selector"then + if W and W.type=='slider'or W.type=='selector'then W:arrowKey(k=="left") end elseif k=="up"or k=="down"or k=="left"or k=="right"then @@ -1116,19 +1116,19 @@ function WIDGET.keyPressed(k) end else local W=WIDGET.sel - if W and W.type=="inputBox"then + if W and W.type=='inputBox'then W:keypress(k) end end end function WIDGET.textinput(texts) local W=WIDGET.sel - if W and W.type=="inputBox"then + if W and W.type=='inputBox'then if not W.regex or texts:match(W.regex)then WIDGET.sel.value=WIDGET.sel.value..texts - SFX.play("move") + SFX.play('move') else - SFX.play("finesseError",.3) + SFX.play('finesseError',.3) end end end @@ -1146,9 +1146,9 @@ function WIDGET.gamepadPressed(i) elseif i=="a"or i=="b"then local W=WIDGET.sel if W then - if W.type=="button"or W.type=="key"then + if W.type=='button'or W.type=='key'then WIDGET.press() - elseif W.type=="slider"then + elseif W.type=='slider'then local p=W.disp() local P=i=="left"and(p>0 and p-1)or p=40 then P:win("finish")end end, - bg="bg2",bgm="race", + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, + bg='bg2',bgm='race', }, load=function()--生成玩家 PLY.newPlayer(1)--1是玩家编号，默认用户控制1号玩家 diff --git a/main.lua b/main.lua index 58dd68ea..88121a09 100644 --- a/main.lua +++ b/main.lua @@ -35,7 +35,7 @@ love.mouse.setVisible(false) --Delete all files from too old version function CLEAR(root) for _,name in next,fs.getDirectoryItems(root or"")do - if fs.getRealDirectory(name)==SAVEDIR and fs.getInfo(name).type~="directory"then + if fs.getRealDirectory(name)==SAVEDIR and fs.getInfo(name).type~='directory'then fs.remove(name) end end @@ -46,7 +46,7 @@ for _,v in next,{"conf","record","replay","cache","lib"}do local info=fs.getInfo(v) if not info then fs.createDirectory(v) - elseif info.type~="directory"then + elseif info.type~='directory'then fs.remove(v) fs.createDirectory(v) end @@ -239,13 +239,13 @@ do local needSave local autoRestart - if type(STAT.version)~="number"then + if type(STAT.version)~='number'then STAT.version=0 needSave=true end if STAT.version<1300 then STAT.frame=math.floor(STAT.time*60) - STAT.lastPlay="sprint_10l" + STAT.lastPlay='sprint_10l' RANKS.sprintFix=nil RANKS.sprintLock=nil needSave=true @@ -292,7 +292,7 @@ do if RANKS.infinite then RANKS.infinite=6 end if RANKS.infinite_dig then RANKS.infinite_dig=6 end for k in next,RANKS do - if type(k)=="number"then + if type(k)=='number'then RANKS[k]=nil needSave=true end @@ -305,7 +305,7 @@ do end v="record/"..v if fs.getInfo(v..".dat")then - fs.write("record/"..k.."rec",fs.read(v..".dat")) + fs.write("record/"..k..".rec",fs.read(v..".dat")) fs.remove(v..".dat") end if fs.getInfo(v..".rec")then @@ -319,11 +319,11 @@ do end if needSave then - FILE.save(SETTING,"conf/settings","q") - FILE.save(RANKS,"conf/unlock","q") - FILE.save(STAT,"conf/data","q") + FILE.save(SETTING,"conf/settings",'q') + FILE.save(RANKS,"conf/unlock",'q') + FILE.save(STAT,"conf/data",'q') end if autoRestart then - love.event.quit("restart") + love.event.quit('restart') end end \ No newline at end of file diff --git a/parts/AITemplate.lua b/parts/AITemplate.lua index 106334bc..3f4fcbd8 100644 --- a/parts/AITemplate.lua +++ b/parts/AITemplate.lua @@ -1,17 +1,17 @@ local AISpeed={60,50,40,30,20,14,10,6,4,3} return function(type,speedLV,next,hold,node) - if type=="CC"then + if type=='CC'then if not hold then hold=false else hold=true end return{ - type="CC", + type='CC', next=next, hold=hold, delta=AISpeed[speedLV], node=node, } - elseif type=="9S"then + elseif type=='9S'then return{ - type="9S", + type='9S', delta=math.floor(AISpeed[speedLV]), hold=hold, } diff --git a/parts/ai.lua b/parts/ai.lua index 4ab88032..1db6fe6b 100644 --- a/parts/ai.lua +++ b/parts/ai.lua @@ -7,13 +7,13 @@ local yield=coroutine.yield -- 11~13:LL,RR,DD local blockPos={4,4,4,4,4,5,4} -------------------------------------------------Cold clear -local _CC=LOADLIB("CC",{ +local _CC=LOADLIB('CC',{ Windows="CCloader", Linux="CCloader", Android="libCCloader.so", libFunc="luaopen_CCloader", })cc=nil -if type(_CC)=="table"then +if type(_CC)=='table'then local CCblockID={6,5,4,3,2,1,0} CC={ getConf= _CC.get_default_config ,--()options,weights @@ -62,7 +62,7 @@ if type(_CC)=="table"then CC.fastWeights(wei) CC.setHold(opt,P.AIdata.hold) CC.set20G(opt,P.AIdata._20G) - CC.setBag(opt,P.AIdata.bag=="bag") + CC.setBag(opt,P.AIdata.bag=='bag') CC.setNode(opt,P.AIdata.node) P.AI_bot=CC.new(opt,wei) CC.free(opt)CC.free(wei) @@ -200,7 +200,7 @@ local function getScore(field,cb,cy) end ------------------------------------------------- return{ - ["9S"]=function(P,keys) + ['9S']=function(P,keys) while true do --Thinking yield() @@ -275,7 +275,7 @@ return{ end end end, - ["CC"]=CC and function(P,keys) + ['CC']=CC and function(P,keys) while true do --Start thinking yield() diff --git a/parts/backgrounds/aura.lua b/parts/backgrounds/aura.lua index 03e1d6d4..332bfe39 100644 --- a/parts/backgrounds/aura.lua +++ b/parts/backgrounds/aura.lua @@ -18,7 +18,7 @@ end function back.draw() shader:send("t",t) gc.setShader(shader) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.setShader() end return back \ No newline at end of file diff --git a/parts/backgrounds/badapple.lua b/parts/backgrounds/badapple.lua index aad39917..bca40176 100644 --- a/parts/backgrounds/badapple.lua +++ b/parts/backgrounds/badapple.lua @@ -7,7 +7,7 @@ local X,Y,K function back.init() if not video then video=gc.newVideo("parts/backgrounds/badapple.ogv",{false}) - video:setFilter("linear","linear") + video:setFilter('linear','linear') video:play() end back.resize() diff --git a/parts/backgrounds/bg1.lua b/parts/backgrounds/bg1.lua index 964bcc25..8d44858d 100644 --- a/parts/backgrounds/bg1.lua +++ b/parts/backgrounds/bg1.lua @@ -17,7 +17,7 @@ end function back.draw() shader:send("t",t) gc.setShader(shader) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.setShader() end return back \ No newline at end of file diff --git a/parts/backgrounds/bg2.lua b/parts/backgrounds/bg2.lua index f8dd25cd..610942c9 100644 --- a/parts/backgrounds/bg2.lua +++ b/parts/backgrounds/bg2.lua @@ -17,7 +17,7 @@ end function back.draw() shader:send("t",t) gc.setShader(shader) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.setShader() end return back \ No newline at end of file diff --git a/parts/backgrounds/blackhole.lua b/parts/backgrounds/blackhole.lua index 4166017f..4204cba7 100644 --- a/parts/backgrounds/blackhole.lua +++ b/parts/backgrounds/blackhole.lua @@ -38,7 +38,7 @@ function back.update() end function back.draw() gc.clear(.1,.1,.1) - gc.push("transform") + gc.push('transform') gc.origin() gc.translate(SCR.w/2,SCR.h/2) @@ -52,11 +52,11 @@ function back.draw() --Blackhole gc.scale(SCR.rad/1600) gc.setColor(0,0,0) - gc.circle("fill",0,0,157) + gc.circle('fill',0,0,157) gc.setLineWidth(6) for i=0,15 do gc.setColor(0,0,0,1-i*.0666) - gc.circle("line",0,0,160+6*i) + gc.circle('line',0,0,160+6*i) end gc.scale(1600/SCR.rad) gc.pop() diff --git a/parts/backgrounds/blockfall.lua b/parts/backgrounds/blockfall.lua index adf9c6c2..94cb91d0 100644 --- a/parts/backgrounds/blockfall.lua +++ b/parts/backgrounds/blockfall.lua @@ -33,7 +33,7 @@ function back.update() end function back.draw() gc.clear(.15,.15,.15) - gc.push("transform") + gc.push('transform') gc.origin() gc.setColor(1,1,1,.4) for i=1,#mino do diff --git a/parts/backgrounds/blockrain.lua b/parts/backgrounds/blockrain.lua index 0835dd57..383e5770 100644 --- a/parts/backgrounds/blockrain.lua +++ b/parts/backgrounds/blockrain.lua @@ -41,7 +41,7 @@ function back.update() end function back.draw() gc.clear(.15,.15,.15) - gc.push("transform") + gc.push('transform') gc.origin() for i=1,#mino do local C=mino[i] diff --git a/parts/backgrounds/blockspace.lua b/parts/backgrounds/blockspace.lua index 3e2f1df1..1892652c 100644 --- a/parts/backgrounds/blockspace.lua +++ b/parts/backgrounds/blockspace.lua @@ -39,7 +39,7 @@ function back.update() end function back.draw() gc.clear(.15,.15,.15) - gc.push("transform") + gc.push('transform') gc.origin() gc.translate(SCR.w/2,SCR.h/2) for i=1,#mino do diff --git a/parts/backgrounds/cubes.lua b/parts/backgrounds/cubes.lua index a2e08ffd..f8810f79 100644 --- a/parts/backgrounds/cubes.lua +++ b/parts/backgrounds/cubes.lua @@ -62,16 +62,16 @@ function back.update(dt) end function back.draw() gc.clear(.1,.1,.1) - gc.push("transform") + gc.push('transform') gc.origin() gc.setLineWidth(6) for i=1,#squares do local S=squares[i] local c=S.color gc.setColor(c[1],c[2],c[3],.6) - rectangle("line",S.x,S.y,S.size,S.size) + rectangle('line',S.x,S.y,S.size,S.size) gc.setColor(c) - rectangle("fill",S.x,S.y,S.size,S.size) + rectangle('fill',S.x,S.y,S.size,S.size) end gc.pop() end diff --git a/parts/backgrounds/fan.lua b/parts/backgrounds/fan.lua index 2b152104..e7a9db02 100644 --- a/parts/backgrounds/fan.lua +++ b/parts/backgrounds/fan.lua @@ -39,25 +39,25 @@ function back.update() end end function back.draw() - gc.push("transform") + gc.push('transform') gc.translate(SCR.w/2,SCR.h/2+20*sin(t*.02)) gc.scale(SCR.k) gc.clear(.1,.1,.1) gc.setLineWidth(320) gc.setColor(.3,.2,.3) - gc.arc("line","open",0,420,500,-.8*3.1416,-.2*3.1416) + gc.arc('line','open',0,420,500,-.8*3.1416,-.2*3.1416) gc.setLineWidth(4) gc.setColor(.7,.5,.65) - gc.arc("line","open",0,420,660,-.799*3.1416,-.201*3.1416) - gc.arc("line","open",0,420,340,-.808*3.1416,-.192*3.1416) + gc.arc('line','open',0,420,660,-.799*3.1416,-.201*3.1416) + gc.arc('line','open',0,420,340,-.808*3.1416,-.192*3.1416) gc.line(-281,224,-530,30.5) gc.line(281,224,530,30.5) gc.setLineWidth(6) gc.setColor(.55,.5,.6) for i=1,8 do - polygon("line",fan[i]) + polygon('line',fan[i]) end gc.setLineWidth(2) @@ -65,7 +65,7 @@ function back.draw() gc.origin() for i=1,#petal do local P=petal[i] - ellipse("fill",P.x,P.y,P.rx,P.ry) + ellipse('fill',P.x,P.y,P.rx,P.ry) end gc.pop() end diff --git a/parts/backgrounds/firework.lua b/parts/backgrounds/firework.lua index 56eac242..9507e91f 100644 --- a/parts/backgrounds/firework.lua +++ b/parts/backgrounds/firework.lua @@ -33,7 +33,7 @@ function back.update(dt) if time>1 then local x,y,color=F.x,F.y,F.color if F.big then - SFX.play("fall",.5) + SFX.play('fall',.5) for _=1,rnd(62,126)do ins(particle,{ x=x,y=y, @@ -44,7 +44,7 @@ function back.update(dt) }) end else - SFX.play("clear_1",.4) + SFX.play('clear_1',.4) for _=1,rnd(16,26)do ins(particle,{ x=x,y=y, @@ -76,12 +76,12 @@ function back.update(dt) end function back.draw() gc.clear(.1,.1,.1) - gc.push("transform") + gc.push('transform') gc.origin() for i=1,#firework do local F=firework[i] gc.setColor(F.color) - circle("fill",F.x,F.y,F.big and 8 or 4) + circle('fill',F.x,F.y,F.big and 8 or 4) end gc.setLineWidth(3) for i=1,#particle do diff --git a/parts/backgrounds/lanterns.lua b/parts/backgrounds/lanterns.lua index 713c0537..978f3228 100644 --- a/parts/backgrounds/lanterns.lua +++ b/parts/backgrounds/lanterns.lua @@ -38,7 +38,7 @@ function back.update(dt) end function back.draw() gc.clear(.1,.1,.1) - gc.push("transform") + gc.push('transform') gc.origin() gc.setColor(1,1,1) local img=IMG.lanterns diff --git a/parts/backgrounds/matrix.lua b/parts/backgrounds/matrix.lua index bea87924..d15231e1 100644 --- a/parts/backgrounds/matrix.lua +++ b/parts/backgrounds/matrix.lua @@ -14,14 +14,14 @@ function back.update(dt) end function back.draw() gc.clear(.15,.15,.15) - gc.push("transform") + gc.push('transform') local k=SCR.k gc.scale(k) local Y=ceil(SCR.h/80/k) for x=1,ceil(SCR.w/80/k)do for y=1,Y do gc.setColor(1,1,1,sin(x+matrixT[x][y]*t)*.1+.1) - gc.rectangle("fill",80*x,80*y,-80,-80) + gc.rectangle('fill',80*x,80*y,-80,-80) end end gc.pop() diff --git a/parts/backgrounds/rainbow.lua b/parts/backgrounds/rainbow.lua index 35aae709..15e3e7ab 100644 --- a/parts/backgrounds/rainbow.lua +++ b/parts/backgrounds/rainbow.lua @@ -18,7 +18,7 @@ end function back.draw() shader:send("t",t) gc.setShader(shader) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.setShader() end return back \ No newline at end of file diff --git a/parts/backgrounds/rainbow2.lua b/parts/backgrounds/rainbow2.lua index aae07370..c354c059 100644 --- a/parts/backgrounds/rainbow2.lua +++ b/parts/backgrounds/rainbow2.lua @@ -18,7 +18,7 @@ end function back.draw() shader:send("t",t) gc.setShader(shader) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.setShader() end return back \ No newline at end of file diff --git a/parts/backgrounds/snow.lua b/parts/backgrounds/snow.lua index 952da220..619b03cc 100644 --- a/parts/backgrounds/snow.lua +++ b/parts/backgrounds/snow.lua @@ -39,12 +39,12 @@ function back.update() end function back.draw() gc.clear(.2,.2,.2) - gc.push("transform") + gc.push('transform') gc.setColor(.7,.7,.7) gc.origin() for i=1,#snow do local P=snow[i] - ellipse("fill",P.x,P.y,P.rx,P.ry) + ellipse('fill',P.x,P.y,P.rx,P.ry) end gc.pop() end diff --git a/parts/backgrounds/space.lua b/parts/backgrounds/space.lua index fa7662b9..eaad92e0 100644 --- a/parts/backgrounds/space.lua +++ b/parts/backgrounds/space.lua @@ -36,7 +36,7 @@ function back.draw() gc.translate(-10,-10) gc.setColor(.8,.8,.8) for i=1,1260,5 do - rectangle("fill",stars[i+1],stars[i+2],stars[i],stars[i]) + rectangle('fill',stars[i+1],stars[i+2],stars[i],stars[i]) end gc.translate(10,10) end diff --git a/parts/backgrounds/tunnel.lua b/parts/backgrounds/tunnel.lua index c9f9e55a..70c73f58 100644 --- a/parts/backgrounds/tunnel.lua +++ b/parts/backgrounds/tunnel.lua @@ -34,7 +34,7 @@ function back.draw() for i=1,#ring do local r=ring[i]^2/12 gc.setLineWidth(30-15/(r+.5)) - gc.rectangle("line",W*.5-W*r/2,H*.5-H*r/2,W*r,H*r) + gc.rectangle('line',W*.5-W*r/2,H*.5-H*r/2,W*r,H*r) end end function back.discard() diff --git a/parts/backgrounds/welcome.lua b/parts/backgrounds/welcome.lua index 7a5659de..42d6d73a 100644 --- a/parts/backgrounds/welcome.lua +++ b/parts/backgrounds/welcome.lua @@ -18,7 +18,7 @@ function back.draw() else gc.clear(.1,.1,.1) end - gc.push("transform") + gc.push('transform') gc.translate(SCR.w/2,SCR.h/2+20*sin(t*.02)) gc.scale(SCR.k) gc.scale(1.1626,1.26) diff --git a/parts/backgrounds/wing.lua b/parts/backgrounds/wing.lua index a78501dc..3b0095c8 100644 --- a/parts/backgrounds/wing.lua +++ b/parts/backgrounds/wing.lua @@ -17,12 +17,12 @@ local W,H function back.init() bar=gc.newCanvas(41,1) gc.setCanvas(bar) - gc.push("transform") + gc.push('transform') gc.origin() for x=0,20 do gc.setColor(1,1,1,x/11) - gc.rectangle("fill",x,0,1,1) - gc.rectangle("fill",41-x,0,1,1) + gc.rectangle('fill',x,0,1,1) + gc.rectangle('fill',41-x,0,1,1) end gc.pop() gc.setCanvas() diff --git a/parts/data.lua b/parts/data.lua index eac761eb..51920733 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -98,7 +98,7 @@ function DATA.copyBoard(page)--Copy the [page] board end str=str..S end - return data.encode("string","base64",data.compress("string","zlib",str)) + return data.encode('string','base64',data.compress('string','zlib',str)) end function DATA.copyBoards() local out={} @@ -114,10 +114,10 @@ function DATA.pasteBoard(str,page)--Paste [str] data to [page] board local _,__ --Decode - str=str:sub(str:find"%S",str:find".%s-$") - _,str=pcall(data.decode,"string","base64",str) + str=str:sub(str:find("%S"),str:find(".%s-$")) + _,str=pcall(data.decode,'string','base64',str) if not _ then return end - _,str=pcall(data.decompress,"string","zlib",str) + _,str=pcall(data.decompress,'string','zlib',str) if not _ then return end local fX,fY=1,1--*ptr for Field(r*10+(c-1)) @@ -381,7 +381,7 @@ do--function DATA.saveRecording() JSON.encode(getModList()).."\n".. DATA.dumpRecording(GAME.rep) - love.filesystem.write(fileName,fileHead.."\n"..data.compress("string","zlib",fileBody)) + love.filesystem.write(fileName,fileHead.."\n"..data.compress('string','zlib',fileBody)) ins(REPLAY,fileName) FILE.save(REPLAY,"conf/replay") return true diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index f0a0e100..e1127e16 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -66,7 +66,7 @@ end function royaleLevelup() GAME.stage=GAME.stage+1 local spd - TEXT.show(text.royale_remain:gsub("$1",#PLY_ALIVE),640,200,40,"beat",.3) + TEXT.show(text.royale_remain:gsub("$1",#PLY_ALIVE),640,200,40,'beat',.3) if GAME.stage==2 then spd=30 elseif GAME.stage==3 then @@ -74,7 +74,7 @@ function royaleLevelup() for _,P in next,PLY_ALIVE do P.gameEnv.garbageSpeed=.6 end - if PLAYERS[1].alive then BGM.play("cruelty")end + if PLAYERS[1].alive then BGM.play('cruelty')end elseif GAME.stage==4 then spd=10 for _,P in next,PLY_ALIVE do @@ -87,7 +87,7 @@ function royaleLevelup() end elseif GAME.stage==6 then spd=3 - if PLAYERS[1].alive then BGM.play("final")end + if PLAYERS[1].alive then BGM.play('final')end end for _,P in next,PLY_ALIVE do P.gameEnv.drop=spd @@ -113,12 +113,12 @@ function generateLine(hole) end function freshDate(mode) if not mode then mode=""end - local date=os.date("%Y/%m/%d") + local date=os.date"%Y/%m/%d" if STAT.date~=date then STAT.date=date STAT.todayTime=0 - if not mode:find("q")then - LOG.print(text.newDay,"message") + if not mode:find'q'then + LOG.print(text.newDay,'message') end return true end @@ -132,10 +132,10 @@ function legalGameTime()--Check if today's playtime is legal if STAT.todayTime<14400 then return true elseif STAT.todayTime<21600 then - LOG.print(text.playedLong,"warning") + LOG.print(text.playedLong,'warn') return true else - LOG.print(text.playedTooMuch,"warning") + LOG.print(text.playedTooMuch,'warn') return false end end @@ -144,8 +144,8 @@ end function mergeStat(stat,delta)--Merge delta stat. to global stat. for k,v in next,delta do - if type(v)=="table"then - if type(stat[k])=="table"then + if type(v)=='table'then + if type(stat[k])=='table'then mergeStat(stat[k],v) end else @@ -172,7 +172,7 @@ function destroyPlayers()--Destroy all player objects, restore freerows and free FREEROW.discard(rem(P.field)) FREEROW.discard(rem(P.visTime)) end - if P.AI_mode=="CC"then + if P.AI_mode=='CC'then CC.free(P.bot_opt) CC.free(P.bot_wei) CC.destroy(P.AI_bot) @@ -198,7 +198,7 @@ function pauseGame() if not(GAME.result or GAME.replaying)then GAME.pauseCount=GAME.pauseCount+1 end - SCN.swapTo("pause","none") + SCN.swapTo('pause','none') end end function applyCustomGame()--Apply CUSTOMENV, BAG, MISSION @@ -226,11 +226,11 @@ function loadGame(M,ifQuickPlay,ifNet)--Load a mode and go to game scene GAME.init=true GAME.net=ifNet if ifNet then - SCN.go("net_game","swipeD") + SCN.go('net_game','swipeD') else drawableText.modeName:set(text.modes[M][1].." "..text.modes[M][2]) - SCN.go("game",ifQuickPlay and"swipeD"or"fade_togame") - SFX.play("enter") + SCN.go('game',ifQuickPlay and'swipeD'or'fade_togame') + SFX.play('enter') end end end @@ -242,7 +242,7 @@ function initPlayerPosition(sudden)--Set initial position for every player end end - local method=sudden and"setPosition"or"movePosition" + local method=sudden and'setPosition'or'movePosition' L[1][method](L[1],340,75,1) if #L<=5 then if L[2]then L[2][method](L[2],965,390,.5)end @@ -314,7 +314,7 @@ do--function resetGameData(args) if time%20==0 then local M=GAME.mod[time/20] if M then - TEXT.show(M.id,700+(time-20)%120*4,36,45,"spin",.5) + TEXT.show(M.id,700+(time-20)%120*4,36,45,'spin',.5) else return end @@ -332,12 +332,12 @@ do--function resetGameData(args) --Graphic "block","ghost","center","smooth","grid","bagLine", "lockFX","dropFX","moveFX","clearFX","splashFX","shakeFX","atkFX", - "text","score","warn","highCam","nextPos", + "text","score",'warn',"highCam","nextPos", } local function copyGameSetting() local S={} for _,key in next,gameSetting do - if type(SETTING[key])=="table"then + if type(SETTING[key])=='table'then S[key]=TABLE.shift(SETTING[key]) else S[key]=SETTING[key] @@ -355,12 +355,12 @@ do--function resetGameData(args) GAME.result=false GAME.warnLVL0=0 GAME.warnLVL=0 - if args:find("r")then + if args:find'r'then GAME.frameStart=0 GAME.recording=false GAME.replaying=1 else - GAME.frameStart=args:find("n")and 0 or 150-SETTING.reTime*15 + GAME.frameStart=args:find'n'and 0 or 150-SETTING.reTime*15 GAME.seed=seed or math.random(1046101471,2662622626) GAME.pauseTime=0 GAME.pauseCount=0 @@ -375,7 +375,7 @@ do--function resetGameData(args) destroyPlayers() GAME.curMode.load() - initPlayerPosition(args:find("q")) + initPlayerPosition(args:find'q') VK.restore() if GAME.modeEnv.task then for i=1,#PLAYERS do @@ -384,7 +384,7 @@ do--function resetGameData(args) end BG.set(GAME.modeEnv.bg) local bgm=GAME.modeEnv.bgm - BGM.play(type(bgm)=="string"and bgm or type(bgm)=="table"and bgm[math.random(#bgm)]) + BGM.play(type(bgm)=='string'and bgm or type(bgm)=='table'and bgm[math.random(#bgm)]) TEXT.clear() if GAME.modeEnv.royaleMode then @@ -404,7 +404,7 @@ do--function resetGameData(args) if GAME.setting.allowMod then TASK.new(tick_showMods) end - SFX.play("ready") + SFX.play('ready') collectgarbage() end end @@ -482,14 +482,14 @@ do--function drawSelfProfile() local textObject,scaleK,width,offY function drawSelfProfile() local selfAvatar=USERS.getAvatar(USER.uid) - gc.push("transform") + gc.push('transform') gc.translate(1280,0) --Draw avatar gc.setLineWidth(2) - gc.setColor(.3,.3,.3,.8)gc.rectangle("fill",-300,0,300,80) - gc.setColor(1,1,1)gc.rectangle("line",-300,0,300,80) - gc.rectangle("line",-73,7,66,66,2) + gc.setColor(.3,.3,.3,.8)gc.rectangle('fill',-300,0,300,80) + gc.setColor(1,1,1)gc.rectangle('line',-300,0,300,80) + gc.rectangle('line',-73,7,66,66,2) gc.draw(selfAvatar,-72,8,nil,.5) --Draw username @@ -505,18 +505,18 @@ do--function drawSelfProfile() --Draw lv. & xp. gc.draw(TEXTURE.lvIcon[USER.lv],-295,50) gc.line(-270,55,-80,55,-80,70,-270,70) - gc.rectangle("fill",-210,55,150*USER.xp/USER.lv/USER.lv,15) + gc.rectangle('fill',-210,55,150*USER.xp/USER.lv/USER.lv,15) gc.pop() end end function drawWarning() if SETTING.warn and GAME.warnLVL>0 then - gc.push("transform") + gc.push('transform') gc.origin() SHADER.warning:send("level",GAME.warnLVL) gc.setShader(SHADER.warning) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.setShader() gc.pop() end diff --git a/parts/globalTables.lua b/parts/globalTables.lua index db161621..b8b67020 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -4,94 +4,94 @@ local function disableKey(P,key) end MODOPT={--Mod options {no=0,id="NX",name="next", - key="q",x=80,y=230,color="O", + key="q",x=80,y=230,color='O', list={0,1,2,3,4,5,6}, func=function(P,O)P.gameEnv.nextCount=O end, }, {no=1,id="HL",name="hold", - key="w",x=200,y=230,color="O", + key="w",x=200,y=230,color='O', list={0,1,2,3,4,5,6}, func=function(P,O)P.gameEnv.holdCount=O end, unranked=true, }, {no=2,id="FL",name="hideNext", - key="e",x=320,y=230,color="A", + key="e",x=320,y=230,color='A', list={1,2,3,4,5}, func=function(P,O)P.gameEnv.nextStartPos=O +1 end, }, {no=3,id="IH",name="infHold", - key="r",x=440,y=230,color="A", + key="r",x=440,y=230,color='A', func=function(P)P.gameEnv.infHold=true end, unranked=true, }, {no=4,id="HB",name="hideBlock", - key="y",x=680,y=230,color="V", + key="y",x=680,y=230,color='V', func=function(P)P.gameEnv.block=false end, }, {no=5,id="HG",name="hideGhost", - key="u",x=800,y=230,color="V", + key="u",x=800,y=230,color='V', func=function(P)P.gameEnv.ghost=false end, }, {no=6,id="HD",name="hidden", - key="i",x=920,y=230,color="P", - list={"easy","slow","medium","fast","none"}, + key="i",x=920,y=230,color='P', + list={'easy','slow','medium','fast','none'}, func=function(P,O)P.gameEnv.visible=O end, unranked=true, }, {no=7,id="HB",name="hideBoard", - key="o",x=1040,y=230,color="P", - list={"down","up","all"}, + key="o",x=1040,y=230,color='P', + list={'down','up','all'}, func=function(P,O)P.gameEnv.hideBoard=O end, }, {no=8,id="FB",name="flipBoard", - key="p",x=1160,y=230,color="J", - list={"U-D","L-R","180"}, + key="p",x=1160,y=230,color='J', + list={'U-D','L-R','180'}, func=function(P,O)P.gameEnv.flipBoard=O end, }, {no=9,id="DT",name="dropDelay", - key="a",x=140,y=350,color="R", + key="a",x=140,y=350,color='R', list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, func=function(P,O)P.gameEnv.drop=O end, unranked=true, }, {no=10,id="LT",name="lockDelay", - key="s",x=260,y=350,color="R", + key="s",x=260,y=350,color='R', list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99}, func=function(P,O)P.gameEnv.lock=O end, unranked=true, }, {no=11,id="ST",name="waitDelay", - key="d",x=380,y=350,color="R", + key="d",x=380,y=350,color='R', list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, func=function(P,O)P.gameEnv.wait=O end, unranked=true, }, {no=12,id="CT",name="fallDelay", - key="f",x=500,y=350,color="R", + key="f",x=500,y=350,color='R', list={0,1,2,3,4,5,6,7,8,10,15,20,30,60}, func=function(P,O)P.gameEnv.fall=O end, unranked=true, }, {no=13,id="LF",name="life", - key="j",x=860,y=350,color="Y", + key="j",x=860,y=350,color='Y', list={0,1,2,3,5,10,15,26,42,87,500}, func=function(P,O)P.gameEnv.life=O end, unranked=true, }, {no=14,id="FB",name="forceB2B", - key="k",x=980,y=350,color="Y", + key="k",x=980,y=350,color='Y', func=function(P)P.gameEnv.b2bKill=true end, unranked=true, }, {no=15,id="PF",name="forceFinesse", - key="l",x=1100,y=350,color="Y", + key="l",x=1100,y=350,color='Y', func=function(P)P.gameEnv.fineKill=true end, unranked=true, }, {no=16,id="TL",name="tele", - key="z",x=200,y=470,color="lH", + key="z",x=200,y=470,color='lH', func=function(P) P.gameEnv.das,P.gameEnv.arr=0,0 P.gameEnv.sddas,P.gameEnv.sdarr=0,0 @@ -99,7 +99,7 @@ MODOPT={--Mod options unranked=true, }, {no=17,id="FX",name="noRotation", - key="x",x=320,y=470,color="lH", + key="x",x=320,y=470,color='lH', func=function(P) disableKey(P,3) disableKey(P,4) @@ -108,7 +108,7 @@ MODOPT={--Mod options unranked=true, }, {no=18,id="GL",name="noMove", - key="c",x=440,y=470,color="lH", + key="c",x=440,y=470,color='lH', func=function(P) disableKey(P,1)disableKey(P,2) disableKey(P,11)disableKey(P,12) @@ -118,21 +118,21 @@ MODOPT={--Mod options unranked=true, }, {no=19,id="CS",name="customSeq", - key="b",x=680,y=470,color="B", - list={"bag","his4","c2","rnd","mess","reverb"}, + key="b",x=680,y=470,color='B', + list={'bag','his4','c2','rnd','mess','reverb'}, func=function(P,O)P.gameEnv.sequence=O end, unranked=true, }, {no=20,id="PS",name="pushSpeed", - key="n",x=800,y=470,color="B", + key="n",x=800,y=470,color='B', list={.5,1,2,3,5,15,1e99}, func=function(P,O)P.gameEnv.pushSpeed=O end, unranked=true, }, {no=21,id="BN",name="boneBlock", - key="m",x=920,y=470,color="B", - list={"on","off"}, - func=function(P,O)P.gameEnv.bone=O=="on"end, + key="m",x=920,y=470,color='B', + list={'on','off'}, + func=function(P,O)P.gameEnv.bone=O=='on'end, }, } for i=1,#MODOPT do @@ -212,7 +212,7 @@ customEnv0={ bone=false, --Rule - sequence="bag", + sequence='bag', fieldH=20, ospin=true, @@ -220,7 +220,7 @@ customEnv0={ b2bKill=false, easyFresh=true, deepDrop=false, - visible="show", + visible='show', freshLimit=1e99, @@ -230,8 +230,8 @@ customEnv0={ missionKill=false, --Else - bg="blockfall", - bgm="infinite", + bg='blockfall', + bgm='infinite', } CUSTOMENV=FILE.load("conf/customEnv")--gameEnv for cutsom game if not CUSTOMENV or CUSTOMENV.version~=VERSION.code then CUSTOMENV=TABLE.copy(customEnv0)end @@ -240,7 +240,7 @@ SETTING={--Settings das=10,arr=2,dascut=0, sddas=0,sdarr=2, ihs=true,irs=true,ims=true, - RS="TRS", + RS='TRS', swap=true, --System @@ -292,7 +292,7 @@ SETTING={--Settings stereo=.7, vib=0, voc=0, - cv="miya", + cv='miya', --Virtualkey VKSFX=.2,--SFX volume @@ -321,7 +321,7 @@ else send=0,recv=0,pend=0,off=0, clear={},spin={}, pc=0,hpc=0,b2b=0,b3b=0,score=0, - lastPlay="sprint_10l",--Last played mode ID + lastPlay='sprint_10l',--Last played mode ID date=false, todayTime=0, }for i=1,29 do STAT.clear[i]={0,0,0,0,0,0}STAT.spin[i]={0,0,0,0,0,0,0}end diff --git a/parts/kickList.lua b/parts/kickList.lua index 14ceb988..e36c48a6 100644 --- a/parts/kickList.lua +++ b/parts/kickList.lua @@ -6,7 +6,7 @@ local noKickSet,noKickSet_180,pushZero do noKickSet_180={[01]=Zero,[10]=Zero,[03]=Zero,[30]=Zero,[12]=Zero,[21]=Zero,[32]=Zero,[23]=Zero,[02]=Zero,[20]=Zero,[13]=Zero,[31]=Zero} function pushZero(t) for _,L in next,t do - if type(L)=="table"then + if type(L)=='table'then for _,v in next,L do if not v[1]or v[1][1]~=0 or v[1][2]~=0 then table.insert(v,1,map[0][0]) @@ -26,9 +26,9 @@ end --Make all vec point to the same vec local function collectSet(set) - if type(set)~="table"then return end + if type(set)~='table'then return end for _,list in next,set do - if type(list[1])=="string"then + if type(list[1])=='string'then vecStrConv(list) end end @@ -136,12 +136,12 @@ do },--T function(P,d) if P.gameEnv.easyFresh then - P:freshBlock("fresh") + P:freshBlock('fresh') end if P.gameEnv.ospin then local x,y=P.curX,P.curY if y==P.ghoY and((P:solid(x-1,y)or P:solid(x-1,y+1)))and(P:solid(x+2,y)or P:solid(x+2,y+1))then - if P.sound then SFX.play("rotatekick",nil,P:getCenterX()*.15)end + if P.sound then SFX.play('rotatekick',nil,P:getCenterX()*.15)end P.spinSeq=P.spinSeq%100*10+d if P.spinSeq<100 then return end for i=1,#OspinList do @@ -164,18 +164,18 @@ do P.cur.dir,P.cur.sc=dir,SCS[id][dir] P.spinLast=2 P.stat.rotate=P.stat.rotate+1 - P:freshBlock("move") + P:freshBlock('move') P.spinSeq=0 return end end end else - if P.sound then SFX.play("rotate",nil,P:getCenterX()*.15)end + if P.sound then SFX.play('rotate',nil,P:getCenterX()*.15)end P.spinSeq=0 end else - if P.sound then SFX.play("rotate",nil,P:getCenterX()*.15)end + if P.sound then SFX.play('rotate',nil,P:getCenterX()*.15)end end end,--O { @@ -286,19 +286,19 @@ do [31]={"+0-1","+1+0"}, },--W function(P,d) - if P.type=="human"then SFX.play("rotate",nil,P:getCenterX()*.15)end + if P.type=='human'then SFX.play('rotate',nil,P:getCenterX()*.15)end local kickData=XspinList[d] for test=1,#kickData do local x,y=P.curX+kickData[test][1],P.curY+kickData[test][2] if not P:ifoverlap(P.cur.bk,x,y)then P.curX,P.curY=x,y P.spinLast=1 - P:freshBlock("move") + P:freshBlock('move') P.stat.rotate=P.stat.rotate+1 return end end - P:freshBlock("fresh") + P:freshBlock('fresh') end,--X { [01]={"-1+0","-1+1","+0-3","-1+1","-1+2","+0+1"}, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e56da1a8..7c6342b8 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -665,97 +665,97 @@ return{ }, }, modes={ - ["sprint_10l"]= {"Sprint", "10L", "Clear 10 lines!"}, - ["sprint_20l"]= {"Sprint", "20L", "Clear 20 lines!"}, - ["sprint_40l"]= {"Sprint", "40L", "Clear 40 lines!"}, - ["sprint_100l"]= {"Sprint", "100L", "Clear 100 lines!"}, - ["sprint_400l"]= {"Sprint", "400L", "Clear 400 lines!"}, - ["sprint_1000l"]= {"Sprint", "1000L", "Clear 1000 lines!"}, - ["sprintPenta"]= {"Sprint", "PENTOMINO", "40L with 18 pentominoes."}, - ["sprintMPH"]= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"}, - ["dig_10l"]= {"Dig", "10L", "Dig 10 garbage lines."}, - ["dig_40l"]= {"Dig", "40L", "Dig 40 garbage lines."}, - ["dig_100l"]= {"Dig", "100L", "Dig 100 garbage lines."}, - ["dig_400l"]= {"Dig", "400L", "Dig 400 garbage lines."}, - ["dig_1000l"]= {"Dig", "1000L", "Dig 1000 garbage lines."}, - ["drought_n"]= {"Drought", "100L", "There are no I-pieces."}, - ["drought_l"]= {"Drought", "100L", "W T F"}, - ["marathon_n"]= {"Marathon", "NORMAL", "200-line marathon with accelerating speed."}, - ["marathon_h"]= {"Marathon", "HARD", "200-line high-speed marathon."}, - ["solo_e"]= {"Battle", "EASY", "Defeat the AI!"}, - ["solo_n"]= {"Battle", "NORMAL", "Defeat the AI!"}, - ["solo_h"]= {"Battle", "HARD", "Defeat the AI!"}, - ["solo_l"]= {"Battle", "LUNATIC", "Defeat the AI!"}, - ["solo_u"]= {"Battle", "ULTIMATE", "Defeat the AI!"}, - ["techmino49_e"]= {"Tech 49", "EASY", "49-player battle.\nThe last one standing wins."}, - ["techmino49_h"]= {"Tech 49", "HARD", "49-player battle.\nThe last one standing wins."}, - ["techmino49_u"]= {"Tech 49", "ULTIMATE", "49-player battle.\nThe last one standing wins."}, - ["techmino99_e"]= {"Tech 99", "EASY", "99-player battle.\nThe last one standing wins."}, - ["techmino99_h"]= {"Tech 99", "HARD", "99-player battle.\nThe last one standing wins."}, - ["techmino99_u"]= {"Tech 99", "ULTIMATE", "99-player battle.\nThe last one standing wins."}, - ["round_e"]= {"Turn-Based", "EASY", "Chess mode"}, - ["round_n"]= {"Turn-Based", "NORMAL", "Chess mode"}, - ["round_h"]= {"Turn-Based", "HARD", "Chess mode"}, - ["round_l"]= {"Turn-Based", "LUNATIC", "Chess mode"}, - ["round_u"]= {"Turn-Based", "ULTIMATE", "Chess mode"}, - ["master_beginner"]= {"Master", "LUNATIC", "For 20G beginners."}, - ["master_advance"]= {"Master", "ULTIMATE", "For 20G pros."}, - ["master_final"]= {"Master", "FINAL", "20G and beyond."}, - ["master_phantasm"]= {"Master", "PHANTASM", "???"}, - ["master_extra"]= {"GrandMaster", "EXTRA", "An eternity shorter than an instant."}, - ["rhythm_e"]= {"Rhythm", "EASY", "200-line low-BPM rhythm marathon."}, - ["rhythm_h"]= {"Rhythm", "HARD", "200-line medium BPM rhythm marathon"}, - ["rhythm_u"]= {"Rhythm", "ULTIMATE", "200-line high-BPM rhythm marathon."}, - ["blind_e"]= {"Blind", "HALF", "For novices."}, - ["blind_n"]= {"Blind", "ALL", "For intermediates."}, - ["blind_h"]= {"Blind", "SUDDEN", "For the experienced."}, - ["blind_l"]= {"Blind", "SUDDEN+", "For professionals."}, - ["blind_u"]= {"Blind", "?", "Are you ready?"}, - ["blind_wtf"]= {"Blind", "WTF", "You're not ready."}, - ["classic_fast"]= {"Classic", "CTWC", "High-speed classic mode."}, - ["survivor_e"]= {"Survivor", "EASY", "How long can you survive?"}, - ["survivor_n"]= {"Survivor", "NORMAL", "How long can you survive?"}, - ["survivor_h"]= {"Survivor", "HARD", "How long can you survive?"}, - ["survivor_l"]= {"Survivor", "LUNATIC", "How long can you survive?"}, - ["survivor_u"]= {"Survivor", "ULTIMATE", "How long can you survive?"}, - ["attacker_h"]= {"Attacker", "HARD", "Practice Offense!"}, - ["attacker_u"]= {"Attacker", "ULTIMATE", "Practice Offense!"}, - ["defender_n"]= {"Defender", "NORMAL", "Practice Defense!"}, - ["defender_l"]= {"Defender", "LUNATIC", "Practice Defense!"}, - ["dig_h"]= {"Driller", "HARD", "Digging practice!"}, - ["dig_u"]= {"Driller", "ULTIMATE", "Digging practice!"}, - ["bigbang"]= {"Big Bang", "EASY", "All-spin tutorial!\n[Under construction]"}, - ["c4wtrain_n"]= {"C4W Training", "NORMAL", "Infinite combos."}, - ["c4wtrain_l"]= {"C4W Training", "LUNATIC", "Infinite combos."}, - ["pctrain_n"]= {"PC Training", "NORMAL", "Perfect Clear Practice."}, - ["pctrain_l"]= {"PC Training", "LUNATIC", "Harder Perfect Clear Practice."}, - ["pc_n"]= {"PC Challenge", "NORMAL", "Get PCs within 100 lines!"}, - ["pc_h"]= {"PC Challenge", "HARD", "Get PCs within 100 lines!"}, - ["pc_l"]= {"PC Challenge", "LUNATIC", "Get PCs within 100 lines!"}, - ["tech_n"]= {"Tech", "NORMAL", "Try to keep the\nBack-to-Back chain!"}, - ["tech_n_plus"]= {"Tech", "NORMAL+", "Spins & PCs only."}, - ["tech_h"]= {"Tech", "HARD", "Try to keep the\nBack-to-Back chain!"}, - ["tech_h_plus"]= {"Tech", "HARD+", "Spins & PCs only."}, - ["tech_l"]= {"Tech", "LUNATIC", "Try to keep the\nBack-to-Back chain!"}, - ["tech_l_plus"]= {"Tech", "LUNATIC+", "Spins & PCs only."}, - ["tech_finesse"]= {"Tech", "FINESSE", "No finesse faults!"}, - ["tech_finesse_f"]= {"Tech", "FINESSE+", "No normal clears and finesse faults!"}, - ["tsd_e"]= {"TSD Challenge", "EASY", "T-Spin Doubles only!"}, - ["tsd_h"]= {"TSD Challenge", "HARD", "T-Spin Doubles only!"}, - ["tsd_u"]= {"TSD Challenge", "ULTIMATE", "T-Spin Doubles only!"}, - ["backfire_n"]= {"Backfire", "NORMAL", "Hold back the backfiring garbage lines."}, - ["backfire_h"]= {"Backfire", "HARD", "Hold back the backfiring garbage lines."}, - ["backfire_l"]= {"Backfire", "LUNATIC", "Hold back the backfiring garbage lines."}, - ["backfire_u"]= {"Backfire", "ULTIMATE", "Hold back the backfiring garbage lines."}, - ["zen"]= {"Zen", "200", "A 200-line run without a time limit."}, - ["ultra"]= {"Ultra", "EXTRA", "A 2-minute score attack."}, - ["infinite"]= {"Infinite", "", "It's just a sandbox."}, - ["infinite_dig"]= {"Infinite: Dig", "", "Dig-diggi-dug."}, - ["sprintFix"]= {"Sprint", "NO LEFT/RIGHT"}, - ["sprintLock"]= {"Sprint", "NO ROTATIONS"}, - ["marathon_bfmax"]= {"Marathon", "ULTIMATE"}, - ["custom_clear"]= {"Custom", "NORMAL"}, - ["custom_puzzle"]= {"Custom", "PUZZLE"}, + ['sprint_10l']= {"Sprint", "10L", "Clear 10 lines!"}, + ['sprint_20l']= {"Sprint", "20L", "Clear 20 lines!"}, + ['sprint_40l']= {"Sprint", "40L", "Clear 40 lines!"}, + ['sprint_100l']= {"Sprint", "100L", "Clear 100 lines!"}, + ['sprint_400l']= {"Sprint", "400L", "Clear 400 lines!"}, + ['sprint_1000l']= {"Sprint", "1000L", "Clear 1000 lines!"}, + ['sprintPenta']= {"Sprint", "PENTOMINO", "40L with 18 pentominoes."}, + ['sprintMPH']= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"}, + ['dig_10l']= {"Dig", "10L", "Dig 10 garbage lines."}, + ['dig_40l']= {"Dig", "40L", "Dig 40 garbage lines."}, + ['dig_100l']= {"Dig", "100L", "Dig 100 garbage lines."}, + ['dig_400l']= {"Dig", "400L", "Dig 400 garbage lines."}, + ['dig_1000l']= {"Dig", "1000L", "Dig 1000 garbage lines."}, + ['drought_n']= {"Drought", "100L", "There are no I-pieces."}, + ['drought_l']= {"Drought", "100L", "W T F"}, + ['marathon_n']= {"Marathon", "NORMAL", "200-line marathon with accelerating speed."}, + ['marathon_h']= {"Marathon", "HARD", "200-line high-speed marathon."}, + ['solo_e']= {"Battle", "EASY", "Defeat the AI!"}, + ['solo_n']= {"Battle", "NORMAL", "Defeat the AI!"}, + ['solo_h']= {"Battle", "HARD", "Defeat the AI!"}, + ['solo_l']= {"Battle", "LUNATIC", "Defeat the AI!"}, + ['solo_u']= {"Battle", "ULTIMATE", "Defeat the AI!"}, + ['techmino49_e']= {"Tech 49", "EASY", "49-player battle.\nThe last one standing wins."}, + ['techmino49_h']= {"Tech 49", "HARD", "49-player battle.\nThe last one standing wins."}, + ['techmino49_u']= {"Tech 49", "ULTIMATE", "49-player battle.\nThe last one standing wins."}, + ['techmino99_e']= {"Tech 99", "EASY", "99-player battle.\nThe last one standing wins."}, + ['techmino99_h']= {"Tech 99", "HARD", "99-player battle.\nThe last one standing wins."}, + ['techmino99_u']= {"Tech 99", "ULTIMATE", "99-player battle.\nThe last one standing wins."}, + ['round_e']= {"Turn-Based", "EASY", "Chess mode"}, + ['round_n']= {"Turn-Based", "NORMAL", "Chess mode"}, + ['round_h']= {"Turn-Based", "HARD", "Chess mode"}, + ['round_l']= {"Turn-Based", "LUNATIC", "Chess mode"}, + ['round_u']= {"Turn-Based", "ULTIMATE", "Chess mode"}, + ['master_beginner']= {"Master", "LUNATIC", "For 20G beginners."}, + ['master_advance']= {"Master", "ULTIMATE", "For 20G pros."}, + ['master_final']= {"Master", "FINAL", "20G and beyond."}, + ['master_phantasm']= {"Master", "PHANTASM", "???"}, + ['master_extra']= {"GrandMaster", "EXTRA", "An eternity shorter than an instant."}, + ['rhythm_e']= {"Rhythm", "EASY", "200-line low-BPM rhythm marathon."}, + ['rhythm_h']= {"Rhythm", "HARD", "200-line medium BPM rhythm marathon"}, + ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-BPM rhythm marathon."}, + ['blind_e']= {"Blind", "HALF", "For novices."}, + ['blind_n']= {"Blind", "ALL", "For intermediates."}, + ['blind_h']= {"Blind", "SUDDEN", "For the experienced."}, + ['blind_l']= {"Blind", "SUDDEN+", "For professionals."}, + ['blind_u']= {"Blind", "?", "Are you ready?"}, + ['blind_wtf']= {"Blind", "WTF", "You're not ready."}, + ['classic_fast']= {"Classic", "CTWC", "High-speed classic mode."}, + ['survivor_e']= {"Survivor", "EASY", "How long can you survive?"}, + ['survivor_n']= {"Survivor", "NORMAL", "How long can you survive?"}, + ['survivor_h']= {"Survivor", "HARD", "How long can you survive?"}, + ['survivor_l']= {"Survivor", "LUNATIC", "How long can you survive?"}, + ['survivor_u']= {"Survivor", "ULTIMATE", "How long can you survive?"}, + ['attacker_h']= {"Attacker", "HARD", "Practice Offense!"}, + ['attacker_u']= {"Attacker", "ULTIMATE", "Practice Offense!"}, + ['defender_n']= {"Defender", "NORMAL", "Practice Defense!"}, + ['defender_l']= {"Defender", "LUNATIC", "Practice Defense!"}, + ['dig_h']= {"Driller", "HARD", "Digging practice!"}, + ['dig_u']= {"Driller", "ULTIMATE", "Digging practice!"}, + ['bigbang']= {"Big Bang", "EASY", "All-spin tutorial!\n[Under construction]"}, + ['c4wtrain_n']= {"C4W Training", "NORMAL", "Infinite combos."}, + ['c4wtrain_l']= {"C4W Training", "LUNATIC", "Infinite combos."}, + ['pctrain_n']= {"PC Training", "NORMAL", "Perfect Clear Practice."}, + ['pctrain_l']= {"PC Training", "LUNATIC", "Harder Perfect Clear Practice."}, + ['pc_n']= {"PC Challenge", "NORMAL", "Get PCs within 100 lines!"}, + ['pc_h']= {"PC Challenge", "HARD", "Get PCs within 100 lines!"}, + ['pc_l']= {"PC Challenge", "LUNATIC", "Get PCs within 100 lines!"}, + ['tech_n']= {"Tech", "NORMAL", "Try to keep the\nBack-to-Back chain!"}, + ['tech_n_plus']= {"Tech", "NORMAL+", "Spins & PCs only."}, + ['tech_h']= {"Tech", "HARD", "Try to keep the\nBack-to-Back chain!"}, + ['tech_h_plus']= {"Tech", "HARD+", "Spins & PCs only."}, + ['tech_l']= {"Tech", "LUNATIC", "Try to keep the\nBack-to-Back chain!"}, + ['tech_l_plus']= {"Tech", "LUNATIC+", "Spins & PCs only."}, + ['tech_finesse']= {"Tech", "FINESSE", "No finesse faults!"}, + ['tech_finesse_f']= {"Tech", "FINESSE+", "No normal clears and finesse faults!"}, + ['tsd_e']= {"TSD Challenge", "EASY", "T-Spin Doubles only!"}, + ['tsd_h']= {"TSD Challenge", "HARD", "T-Spin Doubles only!"}, + ['tsd_u']= {"TSD Challenge", "ULTIMATE", "T-Spin Doubles only!"}, + ['backfire_n']= {"Backfire", "NORMAL", "Hold back the backfiring garbage lines."}, + ['backfire_h']= {"Backfire", "HARD", "Hold back the backfiring garbage lines."}, + ['backfire_l']= {"Backfire", "LUNATIC", "Hold back the backfiring garbage lines."}, + ['backfire_u']= {"Backfire", "ULTIMATE", "Hold back the backfiring garbage lines."}, + ['zen']= {'Zen', "200", "A 200-line run without a time limit."}, + ['ultra']= {'Ultra', "EXTRA", "A 2-minute score attack."}, + ['infinite']= {'infinite', "", "It's just a sandbox."}, + ['infinite_dig']= {"Infinite: Dig", "", "Dig-diggi-dug."}, + ['sprintFix']= {"Sprint", "NO LEFT/RIGHT"}, + ['sprintLock']= {"Sprint", "NO ROTATIONS"}, + ['marathon_bfmax']= {"Marathon", "ULTIMATE"}, + ['custom_clear']= {"Custom", "NORMAL"}, + ['custom_puzzle']= {"Custom", "PUZZLE"}, }, getTip={refuseCopy=true, 'Free-to-play block stacking game with a Battle Royale mode!', diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 0e9a8a49..d1e6d89c 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -577,96 +577,96 @@ return{ }, }, modes={ - ["sprint_10l"]= {"Sprint", "10L", "Nettoyez 10 lignes !"}, - ["sprint_20l"]= {"Sprint", "20L", "Nettoyez 20 lignes !"}, - ["sprint_40l"]= {"Sprint", "40L", "Nettoyez 40 lignes !"}, - ["sprint_100l"]= {"Sprint", "100L", "Nettoyez 100 lignes !"}, - ["sprint_400l"]= {"Sprint", "400L", "Nettoyez 400 lignes !"}, - ["sprint_1000l"]= {"Sprint", "1000L", "Nettoyez 1000 lignes !"}, - ["sprintPenta"]= {"Sprint", "Pentomino", "40 lignes avec 18 pentominos."}, - ["sprintMPH"]= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"}, - ["dig_10l"]= {"Dig", "10L", "Creusez 10 lines"}, - ["dig_40l"]= {"Dig", "40L", "Creusez 40 lines"}, - ["dig_100l"]= {"Dig", "100L", "Creusez 100 lines"}, - ["dig_400l"]= {"Dig", "400L", "Creusez 400 lines"}, - ["dig_1000l"]= {"Dig", "1000L", "Creusez 1000 lines"}, - ["drought_n"]= {"Drought", "100L", "Pas de pièce I !"}, - ["drought_l"]= {"Drought", "100L", "WTF ??!!"}, - ["marathon_n"]= {"Marathon", "NORMAL", "Marathon de 200 lignes."}, - ["marathon_h"]= {"Marathon", "DIFFICILE", "Marathon de 200 lignes à très haute vitesse"}, - ["solo_e"]= {"Battle", "FACILE", "Battez l'IA !"}, - ["solo_n"]= {"Battle", "NORMAL", "Battez l'IA !"}, - ["solo_h"]= {"Battle", "DIFFICILE", "Battez l'IA !"}, - ["solo_l"]= {"Battle", "LUNATIQUE", "Battez l'IA !"}, - ["solo_u"]= {"Battle", "ULTIME", "Battez l'IA !"}, - ["techmino49_e"]= {"Tech 49", "FACILE", "Bataille de 49 joueurs.\nLe dernier en vie gagne."}, - ["techmino49_h"]= {"Tech 49", "DIFFICILE", "Bataille de 49 joueurs.\nLe dernier en vie gagne."}, - ["techmino49_u"]= {"Tech 49", "ULTIME", "Bataille de 49 joueurs.\nLe dernier en vie gagne."}, - ["techmino99_e"]= {"Tech 99", "FACILE", "Bataille de 99 joueurs.\nLe dernier en vie gagne."}, - ["techmino99_h"]= {"Tech 99", "DIFFICILE", "Bataille de 99 joueurs.\nLe dernier en vie gagne."}, - ["techmino99_u"]= {"Tech 99", "ULTIMe", "Bataille de 99 joueurs.\nLe dernier en vie gagne."}, - ["round_e"]= {"Tour à tour", "FACILE", "Mode échecs"}, - ["round_n"]= {"Tour à tour", "NORMAL", "Mode échecs"}, - ["round_h"]= {"Tour à tour", "DIFFICILE", "Mode échecs"}, - ["round_l"]= {"Tour à tour", "LUNATIQUE", "Mode échecs"}, - ["round_u"]= {"Tour à tour", "ULTIME", "Mode échecs"}, - ["master_beginner"]= {"Master", "LUNATIQUE", "Pour les débutants en 20G."}, - ["master_advance"]= {"Master", "ULTIME", "Challenge 20G pro !"}, - ["master_final"]= {"Master", "FINAL", "20G : Un point final impossible à atteindre !"}, - -- ["master_phantasm"]= {"Mester", "FANTASMA", "20G: ???"}, - ["master_extra"]= {"GrandMaster", "EXTRA", "Tentez de devenir un Grandmaster."}, - -- ["rhythm_e"]= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, - -- ["rhythm_h"]= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, - -- ["rhythm_u"]= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, - ["blind_e"]= {"Aveugle", "MOITIE", "Pour les novices."}, - ["blind_n"]= {"Aveugle", "TOUT", "Pour les joueurs intermédiaires."}, - ["blind_h"]= {"Aveugle", "SOUDAIN", "Pour les bons jooeurs."}, - ["blind_l"]= {"Aveugle", "SOUDAIN+", "Pour les pros."}, - ["blind_u"]= {"Aveugle", "?", "Êtes-vous prêt ?"}, - ["blind_wtf"]= {"Aveugle", "WTF", "Vous n'êtes pas prêt."}, - ["classic_fast"]= {"Classic", "CTWC", "Un mode classique rapide."}, - ["survivor_e"]= {"Survivor", "FACILE", "Pendant combien de temps survivrez-vous ?"}, - ["survivor_n"]= {"Survivor", "NORMAL", "Pendant combien de temps survivrez-vous ?"}, - ["survivor_h"]= {"Survivor", "DIFFICILE", "Pendant combien de temps survivrez-vous ?"}, - ["survivor_l"]= {"Survivor", "LUNATIQUE", "Pendant combien de temps survivrez-vous ?"}, - ["survivor_u"]= {"Survivor", "ULTIME", "Pendant combien de temps survivrez-vous ?"}, - ["attacker_h"]= {"Attaquant", "DIFFICILE", "Soyez offensifs !"}, - ["attacker_u"]= {"Attaquant", "ULTIME", "Soyez offensifs !"}, - ["defender_n"]= {"Défendant", "NORMAL", "Soyez défensifs !"}, - ["defender_l"]= {"Défendant", "LUNATIQUE", "Soyez défensifs !"}, - ["dig_h"]= {"Perceuse", "DIFFICILE", "Essayez de creuser !"}, - ["dig_u"]= {"Perceuse", "ULTIME", "Essayez de creuser !"}, - ["bigbang"]= {"Big Bang", "FACILE", "Tutoriel All-Spin\nEn construction..."}, - ["c4wtrain_n"]= {"Mode essai C4W", "NORMAL", "Combos infinis."}, - ["c4wtrain_l"]= {"Mode essai C4W", "LUNATIQUE", "Combos infinis."}, - ["pctrain_n"]= {"Mode essai PC", "NORMAL", "Mode Perfect Clear simple"}, - ["pctrain_l"]= {"Mode essai PC", "LUNATIQUE", "Mode Perfect Clear dur"}, - ["pc_n"]= {"PC Challenge", "NORMAL", "Obtenez un PC dans les prochaines 100 lignes !"}, - ["pc_h"]= {"PC Challenge", "DIFFICILE", "Obtenez un PC dans les prochaines 100 lignes !"}, - ["pc_l"]= {"PC Challenge", "LUNATIQUE", "Obtenez un PC dans les prochaines 100 lignes !"}, - ["tech_n"]= {"Tech", "NORMAL", "Gardez le B2B !"}, - ["tech_n_plus"]= {"Tech", "NORMAL+", "Spin & PC uniquement"}, - ["tech_h"]= {"Tech", "DIFFICILE", "Gardez le B2B !"}, - ["tech_h_plus"]= {"Tech", "HARD+", "Spin & PC uniquement"}, - ["tech_l"]= {"Tech", "LUNATIQUE", "Gardez le B2B !"}, - ["tech_l_plus"]= {"Tech", "LUNATIQUE+", "Spin & PC uniquement"}, - ["tech_finesse"]= {"Tech", "FINESSE", "Pas d'erreurs de finesse !"}, - ["tech_finesse_f"]= {"Tech", "FINESSE+", "Pas de nettoyages normaux, Pas d'erreurs de finesse !"}, - ["tsd_e"]= {"TSD Challenge", "FACILE", "T-spin doubles uniquement !"}, - ["tsd_h"]= {"TSD Challenge", "DIFFICILE", "T-spin doubles uniquement !"}, - ["tsd_u"]= {"TSD Challenge", "ULTIME", "T-spin doubles uniquement !"}, - -- ["backfire_n"]= {"Backfire", "NORMAL", "Self-send garbages"}, - -- ["backfire_h"]= {"Backfire", "HARD", "Self-send garbages"}, - -- ["backfire_l"]= {"Backfire", "LUNATIC", "Self-send garbages"}, - -- ["backfire_u"]= {"Backfire", "ULTIMATE", "Self-send garbages"}, - ["zen"]= {"Zen", "200", "200 lignes sans limites de temps."}, - ["ultra"]= {"Ultra", "EXTRA", "2 minutes pour avoir le meilleur score."}, - ["infinite"]= {"Infini", "", "Mode tranquile."}, - ["infinite_dig"]= {"Infini : Dig", "", "Creuser, creuser, creuser."}, - ["sprintFix"]= {"Sprint", "Sans gauche/droite"}, - ["sprintLock"]= {"Sprint", "Sans rotation"}, - ["marathon_bfmax"]= {"Marathon", "ULTIME"}, - ["custom_clear"]= {"Perso.", "NORMAL"}, - ["custom_puzzle"]= {"Perso.", "PUZZLE"}, + ['sprint_10l']= {"Sprint", "10L", "Nettoyez 10 lignes !"}, + ['sprint_20l']= {"Sprint", "20L", "Nettoyez 20 lignes !"}, + ['sprint_40l']= {"Sprint", "40L", "Nettoyez 40 lignes !"}, + ['sprint_100l']= {"Sprint", "100L", "Nettoyez 100 lignes !"}, + ['sprint_400l']= {"Sprint", "400L", "Nettoyez 400 lignes !"}, + ['sprint_1000l']= {"Sprint", "1000L", "Nettoyez 1000 lignes !"}, + ['sprintPenta']= {"Sprint", "Pentomino", "40 lignes avec 18 pentominos."}, + ['sprintMPH']= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"}, + ['dig_10l']= {"Dig", "10L", "Creusez 10 lines"}, + ['dig_40l']= {"Dig", "40L", "Creusez 40 lines"}, + ['dig_100l']= {"Dig", "100L", "Creusez 100 lines"}, + ['dig_400l']= {"Dig", "400L", "Creusez 400 lines"}, + ['dig_1000l']= {"Dig", "1000L", "Creusez 1000 lines"}, + ['drought_n']= {"Drought", "100L", "Pas de pièce I !"}, + ['drought_l']= {"Drought", "100L", "WTF ??!!"}, + ['marathon_n']= {"Marathon", "NORMAL", "Marathon de 200 lignes."}, + ['marathon_h']= {"Marathon", "DIFFICILE", "Marathon de 200 lignes à très haute vitesse"}, + ['solo_e']= {"Battle", "FACILE", "Battez l'IA !"}, + ['solo_n']= {"Battle", "NORMAL", "Battez l'IA !"}, + ['solo_h']= {"Battle", "DIFFICILE", "Battez l'IA !"}, + ['solo_l']= {"Battle", "LUNATIQUE", "Battez l'IA !"}, + ['solo_u']= {"Battle", "ULTIME", "Battez l'IA !"}, + ['techmino49_e']= {"Tech 49", "FACILE", "Bataille de 49 joueurs.\nLe dernier en vie gagne."}, + ['techmino49_h']= {"Tech 49", "DIFFICILE", "Bataille de 49 joueurs.\nLe dernier en vie gagne."}, + ['techmino49_u']= {"Tech 49", "ULTIME", "Bataille de 49 joueurs.\nLe dernier en vie gagne."}, + ['techmino99_e']= {"Tech 99", "FACILE", "Bataille de 99 joueurs.\nLe dernier en vie gagne."}, + ['techmino99_h']= {"Tech 99", "DIFFICILE", "Bataille de 99 joueurs.\nLe dernier en vie gagne."}, + ['techmino99_u']= {"Tech 99", "ULTIMe", "Bataille de 99 joueurs.\nLe dernier en vie gagne."}, + ['round_e']= {"Tour à tour", "FACILE", "Mode échecs"}, + ['round_n']= {"Tour à tour", "NORMAL", "Mode échecs"}, + ['round_h']= {"Tour à tour", "DIFFICILE", "Mode échecs"}, + ['round_l']= {"Tour à tour", "LUNATIQUE", "Mode échecs"}, + ['round_u']= {"Tour à tour", "ULTIME", "Mode échecs"}, + ['master_beginner']= {"Master", "LUNATIQUE", "Pour les débutants en 20G."}, + ['master_advance']= {"Master", "ULTIME", "Challenge 20G pro !"}, + ['master_final']= {"Master", "FINAL", "20G : Un point final impossible à atteindre !"}, + -- ['master_phantasm']= {"Mester", "FANTASMA", "20G: ???"}, + ['master_extra']= {"GrandMaster", "EXTRA", "Tentez de devenir un Grandmaster."}, + -- ['rhythm_e']= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, + -- ['rhythm_h']= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, + -- ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, + ['blind_e']= {"Aveugle", "MOITIE", "Pour les novices."}, + ['blind_n']= {"Aveugle", "TOUT", "Pour les joueurs intermédiaires."}, + ['blind_h']= {"Aveugle", "SOUDAIN", "Pour les bons jooeurs."}, + ['blind_l']= {"Aveugle", "SOUDAIN+", "Pour les pros."}, + ['blind_u']= {"Aveugle", "?", "Êtes-vous prêt ?"}, + ['blind_wtf']= {"Aveugle", "WTF", "Vous n'êtes pas prêt."}, + ['classic_fast']= {"Classic", "CTWC", "Un mode classique rapide."}, + ['survivor_e']= {"Survivor", "FACILE", "Pendant combien de temps survivrez-vous ?"}, + ['survivor_n']= {"Survivor", "NORMAL", "Pendant combien de temps survivrez-vous ?"}, + ['survivor_h']= {"Survivor", "DIFFICILE", "Pendant combien de temps survivrez-vous ?"}, + ['survivor_l']= {"Survivor", "LUNATIQUE", "Pendant combien de temps survivrez-vous ?"}, + ['survivor_u']= {"Survivor", "ULTIME", "Pendant combien de temps survivrez-vous ?"}, + ['attacker_h']= {"Attaquant", "DIFFICILE", "Soyez offensifs !"}, + ['attacker_u']= {"Attaquant", "ULTIME", "Soyez offensifs !"}, + ['defender_n']= {"Défendant", "NORMAL", "Soyez défensifs !"}, + ['defender_l']= {"Défendant", "LUNATIQUE", "Soyez défensifs !"}, + ['dig_h']= {"Perceuse", "DIFFICILE", "Essayez de creuser !"}, + ['dig_u']= {"Perceuse", "ULTIME", "Essayez de creuser !"}, + ['bigbang']= {"Big Bang", "FACILE", "Tutoriel All-Spin\nEn construction..."}, + ['c4wtrain_n']= {"Mode essai C4W", "NORMAL", "Combos infinis."}, + ['c4wtrain_l']= {"Mode essai C4W", "LUNATIQUE", "Combos infinis."}, + ['pctrain_n']= {"Mode essai PC", "NORMAL", "Mode Perfect Clear simple"}, + ['pctrain_l']= {"Mode essai PC", "LUNATIQUE", "Mode Perfect Clear dur"}, + ['pc_n']= {"PC Challenge", "NORMAL", "Obtenez un PC dans les prochaines 100 lignes !"}, + ['pc_h']= {"PC Challenge", "DIFFICILE", "Obtenez un PC dans les prochaines 100 lignes !"}, + ['pc_l']= {"PC Challenge", "LUNATIQUE", "Obtenez un PC dans les prochaines 100 lignes !"}, + ['tech_n']= {"Tech", "NORMAL", "Gardez le B2B !"}, + ['tech_n_plus']= {"Tech", "NORMAL+", "Spin & PC uniquement"}, + ['tech_h']= {"Tech", "DIFFICILE", "Gardez le B2B !"}, + ['tech_h_plus']= {"Tech", "HARD+", "Spin & PC uniquement"}, + ['tech_l']= {"Tech", "LUNATIQUE", "Gardez le B2B !"}, + ['tech_l_plus']= {"Tech", "LUNATIQUE+", "Spin & PC uniquement"}, + ['tech_finesse']= {"Tech", "FINESSE", "Pas d'erreurs de finesse !"}, + ['tech_finesse_f']= {"Tech", "FINESSE+", "Pas de nettoyages normaux, Pas d'erreurs de finesse !"}, + ['tsd_e']= {"TSD Challenge", "FACILE", "T-spin doubles uniquement !"}, + ['tsd_h']= {"TSD Challenge", "DIFFICILE", "T-spin doubles uniquement !"}, + ['tsd_u']= {"TSD Challenge", "ULTIME", "T-spin doubles uniquement !"}, + -- ['backfire_n']= {"Backfire", "NORMAL", "Self-send garbages"}, + -- ['backfire_h']= {"Backfire", "HARD", "Self-send garbages"}, + -- ['backfire_l']= {"Backfire", "LUNATIC", "Self-send garbages"}, + -- ['backfire_u']= {"Backfire", "ULTIMATE", "Self-send garbages"}, + ['zen']= {'Zen', "200", "200 lignes sans limites de temps."}, + ['ultra']= {'Ultra', "EXTRA", "2 minutes pour avoir le meilleur score."}, + ['infinite']= {"Infini", "", "Mode tranquile."}, + ['infinite_dig']= {"Infini : Dig", "", "Creuser, creuser, creuser."}, + ['sprintFix']= {"Sprint", "Sans gauche/droite"}, + ['sprintLock']= {"Sprint", "Sans rotation"}, + ['marathon_bfmax']= {"Marathon", "ULTIME"}, + ['custom_clear']= {"Perso.", "NORMAL"}, + ['custom_puzzle']= {"Perso.", "PUZZLE"}, }, } \ No newline at end of file diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 079fe977..bb8a866d 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -662,97 +662,97 @@ return{ }, }, modes={ - ["sprint_10l"]= {"Sprint", "10L", "Limpe 10 linhas!"}, - ["sprint_20l"]= {"Sprint", "20L", "Limpe 20 linhas!"}, - ["sprint_40l"]= {"Sprint", "40L", "Limpe 40 linhas!"}, - ["sprint_100l"]= {"Sprint", "100L", "Limpe 100 linhas!"}, - ["sprint_400l"]= {"Sprint", "400L", "Limpe 400 linhas!"}, - ["sprint_1000l"]= {"Sprint", "1000L", "Limpe 1000 linhas!"}, - ["sprintPenta"]= {"Sprint", "PENTOMINO", "Limpe 40 linhas com 18 pentominoes."}, - ["sprintMPH"]= {"Sprint", "MPH", "SemMem.\nSemPrévia\nSemSegurar"}, - ["dig_10l"]= {"Cave", "10L", "Cave 10 linhas de lixo."}, - ["dig_40l"]= {"Cave", "40L", "Cave 40 linhas de lixo."}, - ["dig_100l"]= {"Cave", "100L", "Cave 100 linhas de lixo."}, - ["dig_400l"]= {"Cave", "400L", "Cave 400 linhas de lixo."}, - ["dig_1000l"]= {"Cave", "1000L", "Cave 1000 linhas de lixo."}, - ["drought_n"]= {"Drought", "100L", "Sem peça I !"}, - ["drought_l"]= {"Drought", "100L", "WTF"}, - ["marathon_n"]= {"Maratona", "NORMAL", "200-line Maratona com velocidade aumentando."}, - ["marathon_h"]= {"Maratona", "DIFÍCIL", "200-line Maratona com velocidade alta."}, - ["solo_e"]= {"Batalha", "FÁCIL", "Derrote a inteligência!"}, - ["solo_n"]= {"Batalha", "NORMAL", "Derrote a inteligência!"}, - ["solo_h"]= {"Batalha", "DIFÍCIL", "Derrote a inteligência!"}, - ["solo_l"]= {"Batalha", "LUNATICO", "Defeat the AI!"}, - ["solo_u"]= {"Batalha", "ULTIMATE", "Defeat the AI!"}, - ["techmino49_e"]= {"Tech 49", "FÁCIL", "Batalha de 49 jogadores.\nO último vence"}, - ["techmino49_h"]= {"Tech 49", "DIFÍCIL", "Batalha de 49 jogadores.\nO último vence."}, - ["techmino49_u"]= {"Tech 49", "ULTIMATE", "Batalha de 49 jogadores.\nO último vence."}, - ["techmino99_e"]= {"Tech 99", "FÁCIL", "Batalha de 99 jogadores.\nO último vence."}, - ["techmino99_h"]= {"Tech 99", "DIFÍCIL", "Batalha de 99 jogadores.\nO último vence."}, - ["techmino99_u"]= {"Tech 99", "ULTIMATE", "Batalha de 99 jogadores.\nO último vence."}, - ["round_e"]= {"Baseado Turnos", "FÁCIL", "Modo xadrez"}, - ["round_n"]= {"Baseado Turnos", "NORMAL", "Modo xadrez"}, - ["round_h"]= {"Baseado Turnos", "DIFÍCIL", "Modo xadrez"}, - ["round_l"]= {"Baseado Turnos", "LUNÁTICO", "Modo xadrez"}, - ["round_u"]= {"Baseado Turnos", "ULTIMATE", "Modo xadrez"}, - ["master_beginner"]= {"Mestre", "LUNÁTICO", "Pra iniciantes de 20G."}, - ["master_advance"]= {"Mestre", "ULTIMATE", "Desafio 20G profissional!"}, - ["master_final"]= {"Mestre", "FINAL", "20G: Final inalcançável!"}, - ["master_phantasm"]= {"Mestre", "FANTASMA", "20G: ???"}, - ["master_extra"]= {"GrandMaster", "EXTRA", "Para ser um Grand Master, aceite \nesse desafio."}, - -- ["rhythm_e"]= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, - -- ["rhythm_h"]= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, - -- ["rhythm_u"]= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, - ["blind_e"]= {"Cego", "METADE", "Para novatos."}, - ["blind_n"]= {"Cego", "TUDO", "Para intermediários."}, - ["blind_h"]= {"Cego", "DE REPENTE", "Para experientes."}, - ["blind_l"]= {"Cego", "DE REPENTE+", "For professionals."}, - ["blind_u"]= {"Cego", "?", "Are you ready?"}, - ["blind_wtf"]= {"Cego", "WTF", "You're not ready."}, - ["classic_fast"]= {"Clássico", "CTWC", "Modo clássico rápido. "}, - ["survivor_e"]= {"Sobrevivente", "FACIL", "Por quanto sobrevive?"}, - ["survivor_n"]= {"Sobrevivente", "NORMAL", "Por quanto sobrevive?"}, - ["survivor_h"]= {"Sobrevivente", "DIFÍCIL", "Por quanto sobrevive?"}, - ["survivor_l"]= {"Sobrevivente", "LUNÁTICO", "Por quanto sobrevive?"}, - ["survivor_u"]= {"Sobrevivente", "ULTIMATE", "Por quanto sobrevive?"}, - ["attacker_h"]= {"Atacante", "DIFÍCIL", "Prática de ofensiva!"}, - ["attacker_u"]= {"Atacante", "ULTIMATE", "Prática de ofensiva!"}, - ["defender_n"]= {"Defensor", "NORMAL", "Prática de defensiva!"}, - ["defender_l"]= {"Defensor", "LUNÁTICO", "Prática de defensiva!"}, - ["dig_h"]= {"Cavador", "DIFÍCIL", "Prática de cavar!"}, - ["dig_u"]= {"Cavador", "ULTIMATE", "Prática de cavar!"}, - ["bigbang"]= {"Big Bang", "FÁCIL", "Tutorial de todos giros!\n[Em construção]"}, - ["c4wtrain_n"]= {"Treinamento C4W", "NORMAL", "Combos infinitos."}, - ["c4wtrain_l"]= {"Treinamento C4W", "LUNÁTICO", "Combos infinitos."}, - ["pctrain_n"]= {"Treinamento PC", "NORMAL", "Modo simples de limpeza perfeita."}, - ["pctrain_l"]= {"Treinamento PC", "LUNÁTICO", "Modo duro de limpeza perfeita."}, - ["pc_n"]= {"Desafio PC", "NORMAL", "Obtenha PCs em 100 linhas!"}, - ["pc_h"]= {"Desafio PC", "DIFÍCIL", "Obtenha PCs em 100 linhas!"}, - ["pc_l"]= {"Desafio PC", "LUNÁTICO", "Obteha PCs em 100 linhas!"}, - ["tech_n"]= {"Tech", "NORMAL", "Não quebre o B2B!"}, - ["tech_n_plus"]= {"Tech", "NORMAL+", "Apenas spins e PC"}, - ["tech_h"]= {"Tech", "HARD", "Keep the B2B chain!"}, - ["tech_h_plus"]= {"Tech", "HARD+", "Apenas spins e PC"}, - ["tech_l"]= {"Tech", "LUNÁTICO", "Não quebre o B2B!"}, - ["tech_l_plus"]= {"Tech", "LUNÁTICO+", "Apenas spins e PC"}, - ["tech_finesse"]= {"Tech", "FINESSE", "Não erre a destreza!"}, - ["tech_finesse_f"]= {"Tech", "FINESSE+", "Sem limpas normais, não erre a destreza!"}, - ["tsd_e"]= {"Desafio TSD", "FÁCIL", "Apenas T-spin-doubles!"}, - ["tsd_h"]= {"Desafio TSD", "DIFÍCIL", "Apenas T-spin-doubles!"}, - ["tsd_u"]= {"Desafio TSD", "ULTIMATE", "Apenas T-spin-doubles!"}, - -- ["backfire_n"]= {"Backfire", "NORMAL", "Self-send garbages"}, - -- ["backfire_h"]= {"Backfire", "HARD", "Self-send garbages"}, - -- ["backfire_l"]= {"Backfire", "LUNATIC", "Self-send garbages"}, - -- ["backfire_u"]= {"Backfire", "ULTIMATE", "Self-send garbages"}, - ["zen"]= {"Zen", "200", "200 linhas sem um limite de tempo."}, - ["ultra"]= {"Ultra", "EXTRA", "Pegue a maior pontuação em 2 minutos."}, - ["infinite"]= {"Infinito", "", "Modo Sandbox."}, - ["infinite_dig"]= {"Infinito:Cave", "", "Cava, Cava, Cava."}, - ["sprintFix"]= {"Sprint", "SEM ESQUERDA/DIREITA"}, - ["sprintLock"]= {"Sprint", "SEM ROTAÇÃO"}, - ["marathon_bfmax"]= {"Maratona", "ULTIMATE"}, - ["custom_clear"]= {"Custom", "NORMAL"}, - ["custom_puzzle"]= {"Custom", "PUZZLE"}, + ['sprint_10l']= {"Sprint", "10L", "Limpe 10 linhas!"}, + ['sprint_20l']= {"Sprint", "20L", "Limpe 20 linhas!"}, + ['sprint_40l']= {"Sprint", "40L", "Limpe 40 linhas!"}, + ['sprint_100l']= {"Sprint", "100L", "Limpe 100 linhas!"}, + ['sprint_400l']= {"Sprint", "400L", "Limpe 400 linhas!"}, + ['sprint_1000l']= {"Sprint", "1000L", "Limpe 1000 linhas!"}, + ['sprintPenta']= {"Sprint", "PENTOMINO", "Limpe 40 linhas com 18 pentominoes."}, + ['sprintMPH']= {"Sprint", "MPH", "SemMem.\nSemPrévia\nSemSegurar"}, + ['dig_10l']= {"Cave", "10L", "Cave 10 linhas de lixo."}, + ['dig_40l']= {"Cave", "40L", "Cave 40 linhas de lixo."}, + ['dig_100l']= {"Cave", "100L", "Cave 100 linhas de lixo."}, + ['dig_400l']= {"Cave", "400L", "Cave 400 linhas de lixo."}, + ['dig_1000l']= {"Cave", "1000L", "Cave 1000 linhas de lixo."}, + ['drought_n']= {"Drought", "100L", "Sem peça I !"}, + ['drought_l']= {"Drought", "100L", "WTF"}, + ['marathon_n']= {"Maratona", "NORMAL", "200-line Maratona com velocidade aumentando."}, + ['marathon_h']= {"Maratona", "DIFÍCIL", "200-line Maratona com velocidade alta."}, + ['solo_e']= {"Batalha", "FÁCIL", "Derrote a inteligência!"}, + ['solo_n']= {"Batalha", "NORMAL", "Derrote a inteligência!"}, + ['solo_h']= {"Batalha", "DIFÍCIL", "Derrote a inteligência!"}, + ['solo_l']= {"Batalha", "LUNATICO", "Defeat the AI!"}, + ['solo_u']= {"Batalha", "ULTIMATE", "Defeat the AI!"}, + ['techmino49_e']= {"Tech 49", "FÁCIL", "Batalha de 49 jogadores.\nO último vence"}, + ['techmino49_h']= {"Tech 49", "DIFÍCIL", "Batalha de 49 jogadores.\nO último vence."}, + ['techmino49_u']= {"Tech 49", "ULTIMATE", "Batalha de 49 jogadores.\nO último vence."}, + ['techmino99_e']= {"Tech 99", "FÁCIL", "Batalha de 99 jogadores.\nO último vence."}, + ['techmino99_h']= {"Tech 99", "DIFÍCIL", "Batalha de 99 jogadores.\nO último vence."}, + ['techmino99_u']= {"Tech 99", "ULTIMATE", "Batalha de 99 jogadores.\nO último vence."}, + ['round_e']= {"Baseado Turnos", "FÁCIL", "Modo xadrez"}, + ['round_n']= {"Baseado Turnos", "NORMAL", "Modo xadrez"}, + ['round_h']= {"Baseado Turnos", "DIFÍCIL", "Modo xadrez"}, + ['round_l']= {"Baseado Turnos", "LUNÁTICO", "Modo xadrez"}, + ['round_u']= {"Baseado Turnos", "ULTIMATE", "Modo xadrez"}, + ['master_beginner']= {"Mestre", "LUNÁTICO", "Pra iniciantes de 20G."}, + ['master_advance']= {"Mestre", "ULTIMATE", "Desafio 20G profissional!"}, + ['master_final']= {"Mestre", "FINAL", "20G: Final inalcançável!"}, + ['master_phantasm']= {"Mestre", "FANTASMA", "20G: ???"}, + ['master_extra']= {"GrandMaster", "EXTRA", "Para ser um Grand Master, aceite \nesse desafio."}, + -- ['rhythm_e']= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, + -- ['rhythm_h']= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, + -- ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, + ['blind_e']= {"Cego", "METADE", "Para novatos."}, + ['blind_n']= {"Cego", "TUDO", "Para intermediários."}, + ['blind_h']= {"Cego", "DE REPENTE", "Para experientes."}, + ['blind_l']= {"Cego", "DE REPENTE+", "For professionals."}, + ['blind_u']= {"Cego", "?", "Are you ready?"}, + ['blind_wtf']= {"Cego", "WTF", "You're not ready."}, + ['classic_fast']= {"Clássico", "CTWC", "Modo clássico rápido. "}, + ['survivor_e']= {"Sobrevivente", "FACIL", "Por quanto sobrevive?"}, + ['survivor_n']= {"Sobrevivente", "NORMAL", "Por quanto sobrevive?"}, + ['survivor_h']= {"Sobrevivente", "DIFÍCIL", "Por quanto sobrevive?"}, + ['survivor_l']= {"Sobrevivente", "LUNÁTICO", "Por quanto sobrevive?"}, + ['survivor_u']= {"Sobrevivente", "ULTIMATE", "Por quanto sobrevive?"}, + ['attacker_h']= {"Atacante", "DIFÍCIL", "Prática de ofensiva!"}, + ['attacker_u']= {"Atacante", "ULTIMATE", "Prática de ofensiva!"}, + ['defender_n']= {"Defensor", "NORMAL", "Prática de defensiva!"}, + ['defender_l']= {"Defensor", "LUNÁTICO", "Prática de defensiva!"}, + ['dig_h']= {"Cavador", "DIFÍCIL", "Prática de cavar!"}, + ['dig_u']= {"Cavador", "ULTIMATE", "Prática de cavar!"}, + ['bigbang']= {"Big Bang", "FÁCIL", "Tutorial de todos giros!\n[Em construção]"}, + ['c4wtrain_n']= {"Treinamento C4W", "NORMAL", "Combos infinitos."}, + ['c4wtrain_l']= {"Treinamento C4W", "LUNÁTICO", "Combos infinitos."}, + ['pctrain_n']= {"Treinamento PC", "NORMAL", "Modo simples de limpeza perfeita."}, + ['pctrain_l']= {"Treinamento PC", "LUNÁTICO", "Modo duro de limpeza perfeita."}, + ['pc_n']= {"Desafio PC", "NORMAL", "Obtenha PCs em 100 linhas!"}, + ['pc_h']= {"Desafio PC", "DIFÍCIL", "Obtenha PCs em 100 linhas!"}, + ['pc_l']= {"Desafio PC", "LUNÁTICO", "Obteha PCs em 100 linhas!"}, + ['tech_n']= {"Tech", "NORMAL", "Não quebre o B2B!"}, + ['tech_n_plus']= {"Tech", "NORMAL+", "Apenas spins e PC"}, + ['tech_h']= {"Tech", "HARD", "Keep the B2B chain!"}, + ['tech_h_plus']= {"Tech", "HARD+", "Apenas spins e PC"}, + ['tech_l']= {"Tech", "LUNÁTICO", "Não quebre o B2B!"}, + ['tech_l_plus']= {"Tech", "LUNÁTICO+", "Apenas spins e PC"}, + ['tech_finesse']= {"Tech", "FINESSE", "Não erre a destreza!"}, + ['tech_finesse_f']= {"Tech", "FINESSE+", "Sem limpas normais, não erre a destreza!"}, + ['tsd_e']= {"Desafio TSD", "FÁCIL", "Apenas T-spin-doubles!"}, + ['tsd_h']= {"Desafio TSD", "DIFÍCIL", "Apenas T-spin-doubles!"}, + ['tsd_u']= {"Desafio TSD", "ULTIMATE", "Apenas T-spin-doubles!"}, + -- ['backfire_n']= {"Backfire", "NORMAL", "Self-send garbages"}, + -- ['backfire_h']= {"Backfire", "HARD", "Self-send garbages"}, + -- ['backfire_l']= {"Backfire", "LUNATIC", "Self-send garbages"}, + -- ['backfire_u']= {"Backfire", "ULTIMATE", "Self-send garbages"}, + ['zen']= {'Zen', "200", "200 linhas sem um limite de tempo."}, + ['ultra']= {'Ultra', "EXTRA", "Pegue a maior pontuação em 2 minutos."}, + ['infinite']= {"Infinito", "", "Modo Sandbox."}, + ['infinite_dig']= {"Infinito:Cave", "", "Cava, Cava, Cava."}, + ['sprintFix']= {"Sprint", "SEM ESQUERDA/DIREITA"}, + ['sprintLock']= {"Sprint", "SEM ROTAÇÃO"}, + ['marathon_bfmax']= {"Maratona", "ULTIMATE"}, + ['custom_clear']= {"Custom", "NORMAL"}, + ['custom_puzzle']= {"Custom", "PUZZLE"}, }, getTip={refuseCopy=true, 'Jogo de blocos gratis com um modo Battle Royale!', diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index c2b67689..af84b7c9 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -576,95 +576,95 @@ return{ }, }, modes={ - ["sprint_10l"]= {"Sprint", "10L", "¡Limpia 10 líneas!"}, - ["sprint_20l"]= {"Sprint", "20L", "¡Limpia 20 líneas!"}, - ["sprint_40l"]= {"Sprint", "40L", "¡Limpia 40 líneas!"}, - ["sprint_100l"]= {"Sprint", "100L", "¡Limpia 100 líneas!"}, - ["sprint_400l"]= {"Sprint", "400L", "¡Limpia 400 líneas!"}, - ["sprint_1000l"]= {"Sprint", "1000L", "¡Limpia 1000 líneas!"}, - ["sprintPenta"]= {"Sprint", "Pentominos", "¡Limpia 40 líneas con los 18 pentominos distintos!"}, - ["sprintMPH"]= {"Sprint", "MPH", "Memoryless (sin memoria)\nPreviewless (sin pzas. siguientes)\nHoldless (sin reserva)."}, - ["dig_10l"]= {"Queso", "10L", "Limpia 10 líneas de queso."}, - ["dig_40l"]= {"Queso", "40L", "Limpia 40 líneas de queso."}, - ["dig_100l"]= {"Queso", "100L", "Limpia 100 líneas de queso."}, - ["dig_400l"]= {"Queso", "400L", "Limpia 400 líneas de queso."}, - ["dig_1000l"]= {"Queso", "1000L", "Limpia 1000 líneas de queso."}, - ["drought_n"]= {"Sequía", "100L", "¡Sin piezas I!"}, - ["drought_l"]= {"Sequía", "100L", "Guat de foc..."}, - ["marathon_n"]= {"Maratón", "Normal", "Maratón de 200 líneas con velocidad en aumento."}, - ["marathon_h"]= {"Maratón", "Difícil", "Maratón de 200 líneas a velocidad máxima."}, - ["solo_e"]= {"VS.", "Fácil", "¡Derrota a la CPU!"}, - ["solo_n"]= {"VS.", "Normal", "¡Derrota a la CPU!"}, - ["solo_h"]= {"VS.", "Difícil", "¡Derrota a la CPU!"}, - ["solo_l"]= {"VS.", "Lunático", "¡Derrota a la CPU!"}, - ["solo_u"]= {"VS.", "Supremo", "¡Derrota a la CPU!"}, - ["techmino49_e"]= {"Tech 49", "Fácil", "Batalla de 49 jugadores. ¡El último en pie gana!"}, - ["techmino49_h"]= {"Tech 49", "Difícil", "Batalla de 49 jugadores. ¡El último en pie gana!"}, - ["techmino49_u"]= {"Tech 49", "Supremo", "Batalla de 49 jugadores. ¡El último en pie gana!"}, - ["techmino99_e"]= {"Tech 99", "Fácil", "Batalla de 99 jugadores. ¡El último en pie gana!"}, - ["techmino99_h"]= {"Tech 99", "Difícil", "Batalla de 99 jugadores. ¡El último en pie gana!"}, - ["techmino99_u"]= {"Tech 99", "Supremo", "Batalla de 99 jugadores. ¡El último en pie gana!"}, - ["round_e"]= {"Por Turnos", "Fácil", "Modo ajedrez."}, - ["round_n"]= {"Por Turnos", "Normal", "Modo ajedrez."}, - ["round_h"]= {"Por Turnos", "Difícil", "Modo ajedrez."}, - ["round_l"]= {"Por Turnos", "Lunático", "Modo ajedrez."}, - ["round_u"]= {"Por Turnos", "Supremo", "Modo ajedrez."}, - ["master_beginner"]= {"Master", "Lunático", "Para principiantes en 20G"}, - ["master_advance"]= {"Master", "Supremo", "¡Desafío profesional de 20G!"}, - ["master_final"]= {"Master", "FINAL", "El verdadero 20G Supremo: el final es inalcanzable."}, - ["master_extra"]= {"GrandMaster", "EXTRA", "Para ser un gran maestro, acepta este desafío"}, - ["rhythm_e"]= {"Al Ritmo", "Fácil", "Maratón rítmica de 200 líneas con bajo bpm."}, - ["rhythm_h"]= {"Al Ritmo", "Difícil", "Maratón rítmica de 200 líneas con bpm moderado."}, - ["rhythm_u"]= {"Al Ritmo", "Supremo", "Maratón rítmica de 200 líneas con bpm elevado."}, - ["blind_e"]= {"A Ciegas", "Parcial", "Para novatos."}, - ["blind_n"]= {"A Ciegas", "Total", "Para jugadores intermedios."}, - ["blind_h"]= {"A Ciegas", "Inmediato", "Para jugadores experimentados"}, - ["blind_l"]= {"A Ciegas", "Inmediato+", "Para profesionales."}, - ["blind_u"]= {"A Ciegas", "?", "¿Estás preparado?"}, - ["blind_wtf"]= {"A Ciegas", "Guat de Foc", "No, no lo estás."}, - ["classic_fast"]= {"Clásico", "CTWC", "Modo clásico con alta velocidad."}, - ["survivor_e"]= {"Supervivencia", "Fácil", "¿Cuánto tiempo podrás sobrevivir?"}, - ["survivor_n"]= {"Supervivencia", "Normal", "¿Cuánto tiempo podrás sobrevivir?"}, - ["survivor_h"]= {"Supervivencia", "Difícil", "¿Cuánto tiempo podrás sobrevivir?"}, - ["survivor_l"]= {"Supervivencia", "Lunático", "¿Cuánto tiempo podrás sobrevivir?"}, - ["survivor_u"]= {"Supervivencia", "Supremo", "¿Cuánto tiempo podrás sobrevivir?"}, - ["attacker_h"]= {"Atacante", "Difícil", "¡Practica la ofensiva!"}, - ["attacker_u"]= {"Atacante", "Supremo", "¡Practica la ofensiva!"}, - ["defender_n"]= {"Defensor", "Normal", "¡Practica la defensa!"}, - ["defender_l"]= {"Defensor", "Lunático", "¡Practica la defensa!"}, - ["dig_h"]= {"Downstack", "Difícil", "¡Practica el downstackeo!"}, - ["dig_u"]= {"Downstack", "Supremo", "¡Practica el downstackeo!"}, - ["bigbang"]= {"Big Bang", "Fácil", "¡Tutorial de All-spins!\n[No finalizado]"}, - ["c4wtrain_n"]= {"Entrenar C4W", "Normal", "Combos infinitos."}, - ["c4wtrain_l"]= {"Entrenar C4W", "Lunático", "Combos infinitos."}, - ["pctrain_n"]= {"Entrenar PC", "Normal", "Modo sencillo para practicar Perfect Clears."}, - ["pctrain_l"]= {"Entrenar PC", "Lunático", "Modo duro para practicar Perfect Clears."}, - ["pc_n"]= {"Desafío de PCs", "Normal", "¡Consigue los PCs que puedas en 100 líneas!"}, - ["pc_h"]= {"Desafío de PCs", "Difícil", "¡Consigue los PCs que puedas en 100 líneas!"}, - ["pc_l"]= {"Desafío de PCs", "Lunático", "¡Consigue los PCs que puedas en 100 líneas!"}, - ["tech_n"]= {"Tech", "Normal", "¡Mantén el B2B!"}, - ["tech_n_plus"]= {"Tech", "Normal+", "¡Sólo se permiten Spins y PCs!"}, - ["tech_h"]= {"Tech", "Difícil", "¡Mantén el B2B!"}, - ["tech_h_plus"]= {"Tech", "Difícil+", "¡Sólo se permiten Spins y PCs!"}, - ["tech_l"]= {"Tech", "Lunático", "¡Mantén el B2B!"}, - ["tech_l_plus"]= {"Tech", "Lunático+", "¡Sólo se permiten Spins y PCs!"}, - ["tech_finesse"]= {"Tech", "Finesse", "¡No cometas errores de Finesse!"}, - ["tech_finesse_f"]= {"Tech", "Finesse+", "Sin errores de finesse, ¡pero tampoco clears normales!"}, - ["tsd_e"]= {"Desafío de TSD", "Fácil", "¡Sólo se permiten T-Spin Dobles!"}, - ["tsd_h"]= {"Desafío de TSD", "Difícil", "¡Sólo se permiten T-Spin Dobles!"}, - ["tsd_u"]= {"Desafío de TSD", "Supremo", "¡Sólo se permiten T-Spin Dobles!"}, - ["backfire_n"]= {"Retorno", "Normal", "Lidia con tus propias líneas basura."}, - ["backfire_h"]= {"Retorno", "Difícil", "Lidia con tus propias líneas basura."}, - ["backfire_l"]= {"Retorno", "Lunático", "Lidia con tus propias líneas basura."}, - ["backfire_u"]= {"Retorno", "Supremo", "Lidia con tus propias líneas basura."}, - ["zen"]= {"Zen", "200L", "200 líneas sin límite de tiempo."}, - ["ultra"]= {"Ultra", "Extra", "¡Consigue el mayor puntaje posible en 2 minutos!"}, - ["infinite"]= {"Infinito", "", "Modo Sandbox."}, - ["infinite_dig"]= {"Infinito: Queso", "", "Limpia, limpia, más limpia que tú."}, - ["sprintFix"]= {"Sprint", "Sin mover a Izq./Der."}, - ["sprintLock"]= {"Sprint", "Sin rotar"}, - ["marathon_bfmax"]= {"Maratón", "Supremo"}, - ["custom_clear"]= {"Personalizado", "Normal"}, - ["custom_puzzle"]= {"Personalizado", "Puzzle"}, + ['sprint_10l']= {"Sprint", "10L", "¡Limpia 10 líneas!"}, + ['sprint_20l']= {"Sprint", "20L", "¡Limpia 20 líneas!"}, + ['sprint_40l']= {"Sprint", "40L", "¡Limpia 40 líneas!"}, + ['sprint_100l']= {"Sprint", "100L", "¡Limpia 100 líneas!"}, + ['sprint_400l']= {"Sprint", "400L", "¡Limpia 400 líneas!"}, + ['sprint_1000l']= {"Sprint", "1000L", "¡Limpia 1000 líneas!"}, + ['sprintPenta']= {"Sprint", "Pentominos", "¡Limpia 40 líneas con los 18 pentominos distintos!"}, + ['sprintMPH']= {"Sprint", "MPH", "Memoryless (sin memoria)\nPreviewless (sin pzas. siguientes)\nHoldless (sin reserva)."}, + ['dig_10l']= {"Queso", "10L", "Limpia 10 líneas de queso."}, + ['dig_40l']= {"Queso", "40L", "Limpia 40 líneas de queso."}, + ['dig_100l']= {"Queso", "100L", "Limpia 100 líneas de queso."}, + ['dig_400l']= {"Queso", "400L", "Limpia 400 líneas de queso."}, + ['dig_1000l']= {"Queso", "1000L", "Limpia 1000 líneas de queso."}, + ['drought_n']= {"Sequía", "100L", "¡Sin piezas I!"}, + ['drought_l']= {"Sequía", "100L", "Guat de foc..."}, + ['marathon_n']= {"Maratón", "Normal", "Maratón de 200 líneas con velocidad en aumento."}, + ['marathon_h']= {"Maratón", "Difícil", "Maratón de 200 líneas a velocidad máxima."}, + ['solo_e']= {"VS.", "Fácil", "¡Derrota a la CPU!"}, + ['solo_n']= {"VS.", "Normal", "¡Derrota a la CPU!"}, + ['solo_h']= {"VS.", "Difícil", "¡Derrota a la CPU!"}, + ['solo_l']= {"VS.", "Lunático", "¡Derrota a la CPU!"}, + ['solo_u']= {"VS.", "Supremo", "¡Derrota a la CPU!"}, + ['techmino49_e']= {"Tech 49", "Fácil", "Batalla de 49 jugadores. ¡El último en pie gana!"}, + ['techmino49_h']= {"Tech 49", "Difícil", "Batalla de 49 jugadores. ¡El último en pie gana!"}, + ['techmino49_u']= {"Tech 49", "Supremo", "Batalla de 49 jugadores. ¡El último en pie gana!"}, + ['techmino99_e']= {"Tech 99", "Fácil", "Batalla de 99 jugadores. ¡El último en pie gana!"}, + ['techmino99_h']= {"Tech 99", "Difícil", "Batalla de 99 jugadores. ¡El último en pie gana!"}, + ['techmino99_u']= {"Tech 99", "Supremo", "Batalla de 99 jugadores. ¡El último en pie gana!"}, + ['round_e']= {"Por Turnos", "Fácil", "Modo ajedrez."}, + ['round_n']= {"Por Turnos", "Normal", "Modo ajedrez."}, + ['round_h']= {"Por Turnos", "Difícil", "Modo ajedrez."}, + ['round_l']= {"Por Turnos", "Lunático", "Modo ajedrez."}, + ['round_u']= {"Por Turnos", "Supremo", "Modo ajedrez."}, + ['master_beginner']= {"Master", "Lunático", "Para principiantes en 20G"}, + ['master_advance']= {"Master", "Supremo", "¡Desafío profesional de 20G!"}, + ['master_final']= {"Master", "FINAL", "El verdadero 20G Supremo: el final es inalcanzable."}, + ['master_extra']= {"GrandMaster", "EXTRA", "Para ser un gran maestro, acepta este desafío"}, + ['rhythm_e']= {"Al Ritmo", "Fácil", "Maratón rítmica de 200 líneas con bajo bpm."}, + ['rhythm_h']= {"Al Ritmo", "Difícil", "Maratón rítmica de 200 líneas con bpm moderado."}, + ['rhythm_u']= {"Al Ritmo", "Supremo", "Maratón rítmica de 200 líneas con bpm elevado."}, + ['blind_e']= {"A Ciegas", "Parcial", "Para novatos."}, + ['blind_n']= {"A Ciegas", "Total", "Para jugadores intermedios."}, + ['blind_h']= {"A Ciegas", "Inmediato", "Para jugadores experimentados"}, + ['blind_l']= {"A Ciegas", "Inmediato+", "Para profesionales."}, + ['blind_u']= {"A Ciegas", "?", "¿Estás preparado?"}, + ['blind_wtf']= {"A Ciegas", "Guat de Foc", "No, no lo estás."}, + ['classic_fast']= {"Clásico", "CTWC", "Modo clásico con alta velocidad."}, + ['survivor_e']= {"Supervivencia", "Fácil", "¿Cuánto tiempo podrás sobrevivir?"}, + ['survivor_n']= {"Supervivencia", "Normal", "¿Cuánto tiempo podrás sobrevivir?"}, + ['survivor_h']= {"Supervivencia", "Difícil", "¿Cuánto tiempo podrás sobrevivir?"}, + ['survivor_l']= {"Supervivencia", "Lunático", "¿Cuánto tiempo podrás sobrevivir?"}, + ['survivor_u']= {"Supervivencia", "Supremo", "¿Cuánto tiempo podrás sobrevivir?"}, + ['attacker_h']= {"Atacante", "Difícil", "¡Practica la ofensiva!"}, + ['attacker_u']= {"Atacante", "Supremo", "¡Practica la ofensiva!"}, + ['defender_n']= {"Defensor", "Normal", "¡Practica la defensa!"}, + ['defender_l']= {"Defensor", "Lunático", "¡Practica la defensa!"}, + ['dig_h']= {"Downstack", "Difícil", "¡Practica el downstackeo!"}, + ['dig_u']= {"Downstack", "Supremo", "¡Practica el downstackeo!"}, + ['bigbang']= {"Big Bang", "Fácil", "¡Tutorial de All-spins!\n[No finalizado]"}, + ['c4wtrain_n']= {"Entrenar C4W", "Normal", "Combos infinitos."}, + ['c4wtrain_l']= {"Entrenar C4W", "Lunático", "Combos infinitos."}, + ['pctrain_n']= {"Entrenar PC", "Normal", "Modo sencillo para practicar Perfect Clears."}, + ['pctrain_l']= {"Entrenar PC", "Lunático", "Modo duro para practicar Perfect Clears."}, + ['pc_n']= {"Desafío de PCs", "Normal", "¡Consigue los PCs que puedas en 100 líneas!"}, + ['pc_h']= {"Desafío de PCs", "Difícil", "¡Consigue los PCs que puedas en 100 líneas!"}, + ['pc_l']= {"Desafío de PCs", "Lunático", "¡Consigue los PCs que puedas en 100 líneas!"}, + ['tech_n']= {"Tech", "Normal", "¡Mantén el B2B!"}, + ['tech_n_plus']= {"Tech", "Normal+", "¡Sólo se permiten Spins y PCs!"}, + ['tech_h']= {"Tech", "Difícil", "¡Mantén el B2B!"}, + ['tech_h_plus']= {"Tech", "Difícil+", "¡Sólo se permiten Spins y PCs!"}, + ['tech_l']= {"Tech", "Lunático", "¡Mantén el B2B!"}, + ['tech_l_plus']= {"Tech", "Lunático+", "¡Sólo se permiten Spins y PCs!"}, + ['tech_finesse']= {"Tech", "Finesse", "¡No cometas errores de Finesse!"}, + ['tech_finesse_f']= {"Tech", "Finesse+", "Sin errores de finesse, ¡pero tampoco clears normales!"}, + ['tsd_e']= {"Desafío de TSD", "Fácil", "¡Sólo se permiten T-Spin Dobles!"}, + ['tsd_h']= {"Desafío de TSD", "Difícil", "¡Sólo se permiten T-Spin Dobles!"}, + ['tsd_u']= {"Desafío de TSD", "Supremo", "¡Sólo se permiten T-Spin Dobles!"}, + ['backfire_n']= {"Retorno", "Normal", "Lidia con tus propias líneas basura."}, + ['backfire_h']= {"Retorno", "Difícil", "Lidia con tus propias líneas basura."}, + ['backfire_l']= {"Retorno", "Lunático", "Lidia con tus propias líneas basura."}, + ['backfire_u']= {"Retorno", "Supremo", "Lidia con tus propias líneas basura."}, + ['zen']= {'Zen', "200L", "200 líneas sin límite de tiempo."}, + ['ultra']= {'Ultra', "Extra", "¡Consigue el mayor puntaje posible en 2 minutos!"}, + ['infinite']= {"Infinito", "", "Modo Sandbox."}, + ['infinite_dig']= {"Infinito: Queso", "", "Limpia, limpia, más limpia que tú."}, + ['sprintFix']= {"Sprint", "Sin mover a Izq./Der."}, + ['sprintLock']= {"Sprint", "Sin rotar"}, + ['marathon_bfmax']= {"Maratón", "Supremo"}, + ['custom_clear']= {"Personalizado", "Normal"}, + ['custom_puzzle']= {"Personalizado", "Puzzle"}, }, } \ No newline at end of file diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 90877bdd..43576b87 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -187,97 +187,97 @@ return{ }, }, modes={ - ["sprint_10l"]= {"竞速", "10L", "消10行"}, - ["sprint_20l"]= {"竞速", "20L", "消20行"}, - ["sprint_40l"]= {"竞速", "40L", "消40行"}, - ["sprint_100l"]= {"竞速", "100L", "消100行"}, - ["sprint_400l"]= {"竞速", "400L", "消400行"}, - ["sprint_1000l"]= {"竞速", "1000L", "消1000行"}, - ["sprintPenta"]= {"竞速", "五连块", "离谱"}, - ["sprintMPH"]= {"竞速", "纯净", "听说你反应很快?"}, - ["dig_10l"]= {"挖掘", "10L", "挖10行"}, - ["dig_40l"]= {"挖掘", "40L", "挖40行"}, - ["dig_100l"]= {"挖掘", "100L", "挖100行"}, - ["dig_400l"]= {"挖掘", "400L", "挖400行"}, - ["dig_1000l"]= {"挖掘", "1000L", "挖1000行"}, - ["drought_n"]= {"干旱", "100L", "放轻松,简单得很"}, - ["drought_l"]= {"干旱", "100L", "有趣的要来了"}, - ["marathon_n"]= {"马拉松", "普通", "休闲模式"}, - ["marathon_h"]= {"马拉松", "困难", "休闲模式"}, - ["solo_e"]= {"单挑", "简单", "鲨AI"}, - ["solo_n"]= {"单挑", "普通", "鲨AI"}, - ["solo_h"]= {"单挑", "困难", "鲨AI"}, - ["solo_l"]= {"单挑", "疯狂", "鲨AI"}, - ["solo_u"]= {"单挑", "极限", "鲨AI"}, - ["techmino49_e"]= {"49人混战", "简单", "这我岂不是乱鲨"}, - ["techmino49_h"]= {"49人混战", "困难", "这我岂不是乱鲨"}, - ["techmino49_u"]= {"49人混战", "极限", "你吃鸡率多少?"}, - ["techmino99_e"]= {"99人混战", "简单", "这我岂不是乱鲨"}, - ["techmino99_h"]= {"99人混战", "困难", "这我岂不是乱鲨"}, - ["techmino99_u"]= {"99人混战", "极限", "你吃鸡率多少?"}, - ["round_e"]= {"回合制", "简单", "下棋"}, - ["round_n"]= {"回合制", "普通", "下棋"}, - ["round_h"]= {"回合制", "困难", "下棋"}, - ["round_l"]= {"回合制", "疯狂", "下棋"}, - ["round_u"]= {"回合制", "极限", "下棋"}, - ["master_beginner"]= {"大师", "疯狂", "无脑20G"}, - ["master_advance"]= {"大师", "极限", "简单20G"}, - ["master_final"]= {"大师", "终点", "究极20G:真正的游戏"}, - ["master_phantasm"]= {"大师", "虚幻", "虚幻20G:好玩"}, - ["master_extra"]= {"宗师", "EX", "你行你上"}, - ["rhythm_e"]= {"节奏", "简单", "很无聊的"}, - ["rhythm_h"]= {"节奏", "困难", "好玩么?"}, - ["rhythm_u"]= {"节奏", "极限", "真男人不玩低难度"}, - ["blind_e"]= {"隐形", "半隐", "谁都能玩"}, - ["blind_n"]= {"隐形", "全隐", "稍加练习即可"}, - ["blind_h"]= {"隐形", "瞬隐", "和上一个一样"}, - ["blind_l"]= {"隐形", "瞬隐+", "这个确实挺难的"}, - ["blind_u"]= {"隐形", "啊这", "你准备好了吗"}, - ["blind_wtf"]= {"隐形", "不会吧", "还没准备好"}, - ["classic_fast"]= {"高速经典", "CTWC", "就这?简单"}, - ["survivor_e"]= {"生存", "简单", "这都玩不下去?不会吧"}, - ["survivor_n"]= {"生存", "普通", "呵,这都玩不过?"}, - ["survivor_h"]= {"生存", "困难", "所以呢?"}, - ["survivor_l"]= {"生存", "疯狂", "然后呢?"}, - ["survivor_u"]= {"生存", "极限", "舒服了"}, - ["attacker_h"]= {"进攻", "困难", "进攻练习"}, - ["attacker_u"]= {"进攻", "极限", "进攻练习"}, - ["defender_n"]= {"防守", "普通", "防守练习"}, - ["defender_l"]= {"防守", "疯狂", "防守练习"}, - ["dig_h"]= {"挖掘", "困难", "挖掘练习"}, - ["dig_u"]= {"挖掘", "极限", "挖掘练习"}, - ["bigbang"]= {"大爆炸", "简单", "All-spin 入门教程\n未制作完成,落块即通"}, - ["c4wtrain_n"]= {"C4W练习", "普通", "无 限 连 击"}, - ["c4wtrain_l"]= {"C4W练习", "疯狂", "无 限 连 击"}, - ["pctrain_n"]= {"全清训练", "普通", "随便打打"}, - ["pctrain_l"]= {"全清训练", "疯狂", "建议不打"}, - ["pc_n"]= {"全清挑战", "普通", "100行内刷PC"}, - ["pc_h"]= {"全清挑战", "困难", "100行内刷PC"}, - ["pc_l"]= {"全清挑战", "疯狂", "100行内刷PC"}, - ["tech_n"]= {"科研", "普通", "禁止断B2B"}, - ["tech_n_plus"]= {"科研", "普通+", "仅允许spin与PC"}, - ["tech_h"]= {"科研", "困难", "禁止断B2B"}, - ["tech_h_plus"]= {"科研", "困难+", "仅允许spin与PC"}, - ["tech_l"]= {"科研", "疯狂", "禁止断B2B"}, - ["tech_l_plus"]= {"科研", "疯狂+", "仅允许spin与PC"}, - ["tech_finesse"]= {"科研", "极简", "强制最简操作"}, - ["tech_finesse_f"]= {"科研", "极简+", "禁止普通消除,强制最简操作"}, - ["tsd_e"]= {"TSD挑战", "简单", "刷T2"}, - ["tsd_h"]= {"TSD挑战", "困难", "刷T2"}, - ["tsd_u"]= {"TSD挑战", "极限", "刷T2"}, - ["backfire_n"]= {"自攻自受", "普通", "200攻击很少的,冲冲冲"}, - ["backfire_h"]= {"自攻自受", "困难", "你在害怕什么"}, - ["backfire_l"]= {"自攻自受", "疯狂", "别怂啊,打攻击呀"}, - ["backfire_u"]= {"自攻自受", "极限", "能把自己玩死,不会吧"}, - ["zen"]= {"禅", "200", "不限时200行"}, - ["ultra"]= {"限时打分", "挑战", "2分钟刷分"}, - ["infinite"]= {"无尽", "", "真的有人会玩这个?"}, - ["infinite_dig"]= {"无尽:挖掘", "", "闲得慌的话来挖"}, - ["sprintFix"]= {"竞速", "无移动"}, - ["sprintLock"]= {"竞速", "无旋转"}, - ["marathon_bfmax"]= {"马拉松", "极限"}, - ["custom_clear"]= {"自定义", "普通"}, - ["custom_puzzle"]= {"自定义", "拼图"}, + ['sprint_10l']= {"竞速", "10L", "消10行"}, + ['sprint_20l']= {"竞速", "20L", "消20行"}, + ['sprint_40l']= {"竞速", "40L", "消40行"}, + ['sprint_100l']= {"竞速", "100L", "消100行"}, + ['sprint_400l']= {"竞速", "400L", "消400行"}, + ['sprint_1000l']= {"竞速", "1000L", "消1000行"}, + ['sprintPenta']= {"竞速", "五连块", "离谱"}, + ['sprintMPH']= {"竞速", "纯净", "听说你反应很快?"}, + ['dig_10l']= {"挖掘", "10L", "挖10行"}, + ['dig_40l']= {"挖掘", "40L", "挖40行"}, + ['dig_100l']= {"挖掘", "100L", "挖100行"}, + ['dig_400l']= {"挖掘", "400L", "挖400行"}, + ['dig_1000l']= {"挖掘", "1000L", "挖1000行"}, + ['drought_n']= {"干旱", "100L", "放轻松,简单得很"}, + ['drought_l']= {"干旱", "100L", "有趣的要来了"}, + ['marathon_n']= {"马拉松", "普通", "休闲模式"}, + ['marathon_h']= {"马拉松", "困难", "休闲模式"}, + ['solo_e']= {"单挑", "简单", "鲨AI"}, + ['solo_n']= {"单挑", "普通", "鲨AI"}, + ['solo_h']= {"单挑", "困难", "鲨AI"}, + ['solo_l']= {"单挑", "疯狂", "鲨AI"}, + ['solo_u']= {"单挑", "极限", "鲨AI"}, + ['techmino49_e']= {"49人混战", "简单", "这我岂不是乱鲨"}, + ['techmino49_h']= {"49人混战", "困难", "这我岂不是乱鲨"}, + ['techmino49_u']= {"49人混战", "极限", "你吃鸡率多少?"}, + ['techmino99_e']= {"99人混战", "简单", "这我岂不是乱鲨"}, + ['techmino99_h']= {"99人混战", "困难", "这我岂不是乱鲨"}, + ['techmino99_u']= {"99人混战", "极限", "你吃鸡率多少?"}, + ['round_e']= {"回合制", "简单", "下棋"}, + ['round_n']= {"回合制", "普通", "下棋"}, + ['round_h']= {"回合制", "困难", "下棋"}, + ['round_l']= {"回合制", "疯狂", "下棋"}, + ['round_u']= {"回合制", "极限", "下棋"}, + ['master_beginner']= {"大师", "疯狂", "无脑20G"}, + ['master_advance']= {"大师", "极限", "简单20G"}, + ['master_final']= {"大师", "终点", "究极20G:真正的游戏"}, + ['master_phantasm']= {"大师", "虚幻", "虚幻20G:好玩"}, + ['master_extra']= {"宗师", "EX", "你行你上"}, + ['rhythm_e']= {"节奏", "简单", "很无聊的"}, + ['rhythm_h']= {"节奏", "困难", "好玩么?"}, + ['rhythm_u']= {"节奏", "极限", "真男人不玩低难度"}, + ['blind_e']= {"隐形", "半隐", "谁都能玩"}, + ['blind_n']= {"隐形", "全隐", "稍加练习即可"}, + ['blind_h']= {"隐形", "瞬隐", "和上一个一样"}, + ['blind_l']= {"隐形", "瞬隐+", "这个确实挺难的"}, + ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, + ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, + ['classic_fast']= {"高速经典", "CTWC", "就这?简单"}, + ['survivor_e']= {"生存", "简单", "这都玩不下去?不会吧"}, + ['survivor_n']= {"生存", "普通", "呵,这都玩不过?"}, + ['survivor_h']= {"生存", "困难", "所以呢?"}, + ['survivor_l']= {"生存", "疯狂", "然后呢?"}, + ['survivor_u']= {"生存", "极限", "舒服了"}, + ['attacker_h']= {"进攻", "困难", "进攻练习"}, + ['attacker_u']= {"进攻", "极限", "进攻练习"}, + ['defender_n']= {"防守", "普通", "防守练习"}, + ['defender_l']= {"防守", "疯狂", "防守练习"}, + ['dig_h']= {"挖掘", "困难", "挖掘练习"}, + ['dig_u']= {"挖掘", "极限", "挖掘练习"}, + ['bigbang']= {"大爆炸", "简单", "All-spin 入门教程\n未制作完成,落块即通"}, + ['c4wtrain_n']= {"C4W练习", "普通", "无 限 连 击"}, + ['c4wtrain_l']= {"C4W练习", "疯狂", "无 限 连 击"}, + ['pctrain_n']= {"全清训练", "普通", "随便打打"}, + ['pctrain_l']= {"全清训练", "疯狂", "建议不打"}, + ['pc_n']= {"全清挑战", "普通", "100行内刷PC"}, + ['pc_h']= {"全清挑战", "困难", "100行内刷PC"}, + ['pc_l']= {"全清挑战", "疯狂", "100行内刷PC"}, + ['tech_n']= {"科研", "普通", "禁止断B2B"}, + ['tech_n_plus']= {"科研", "普通+", "仅允许spin与PC"}, + ['tech_h']= {"科研", "困难", "禁止断B2B"}, + ['tech_h_plus']= {"科研", "困难+", "仅允许spin与PC"}, + ['tech_l']= {"科研", "疯狂", "禁止断B2B"}, + ['tech_l_plus']= {"科研", "疯狂+", "仅允许spin与PC"}, + ['tech_finesse']= {"科研", "极简", "强制最简操作"}, + ['tech_finesse_f']= {"科研", "极简+", "禁止普通消除,强制最简操作"}, + ['tsd_e']= {"TSD挑战", "简单", "刷T2"}, + ['tsd_h']= {"TSD挑战", "困难", "刷T2"}, + ['tsd_u']= {"TSD挑战", "极限", "刷T2"}, + ['backfire_n']= {"自攻自受", "普通", "200攻击很少的,冲冲冲"}, + ['backfire_h']= {"自攻自受", "困难", "你在害怕什么"}, + ['backfire_l']= {"自攻自受", "疯狂", "别怂啊,打攻击呀"}, + ['backfire_u']= {"自攻自受", "极限", "能把自己玩死,不会吧"}, + ['zen']= {"禅", "200", "不限时200行"}, + ['ultra']= {"限时打分", "挑战", "2分钟刷分"}, + ['infinite']= {"无尽", "", "真的有人会玩这个?"}, + ['infinite_dig']= {"无尽:挖掘", "", "闲得慌的话来挖"}, + ['sprintFix']= {"竞速", "无移动"}, + ['sprintLock']= {"竞速", "无旋转"}, + ['marathon_bfmax']= {"马拉松", "极限"}, + ['custom_clear']= {"自定义", "普通"}, + ['custom_puzzle']= {"自定义", "拼图"}, }, getTip={refuseCopy=true, "100apm?你倒是不用开局定式连续打几把", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index df9f388d..fe25d42d 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -666,97 +666,97 @@ return{ }, }, modes={ - ["sprint_10l"]= {"竞速", "10L", "消除10行"}, - ["sprint_20l"]= {"竞速", "20L", "消除20行"}, - ["sprint_40l"]= {"竞速", "40L", "消除40行"}, - ["sprint_100l"]= {"竞速", "100L", "消除100行"}, - ["sprint_400l"]= {"竞速", "400L", "消除400行"}, - ["sprint_1000l"]= {"竞速", "1000L", "消除1000行"}, - ["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"}, - ["sprintMPH"]= {"竞速", "MPH", "纯随机\n无预览\n无暂存"}, - ["dig_10l"]= {"挖掘", "10L", "挖掘10行"}, - ["dig_40l"]= {"挖掘", "40L", "挖掘40行"}, - ["dig_100l"]= {"挖掘", "100L", "挖掘100行"}, - ["dig_400l"]= {"挖掘", "400L", "挖掘400行"}, - ["dig_1000l"]= {"挖掘", "1000L", "挖掘1000行"}, - ["drought_n"]= {"干旱", "100L", "你I没了"}, - ["drought_l"]= {"干旱", "100L", "后 妈 发 牌"}, - ["marathon_n"]= {"马拉松", "普通", "200行加速马拉松"}, - ["marathon_h"]= {"马拉松", "困难", "200行高速马拉松"}, - ["solo_e"]= {"单挑", "简单", "打败AI"}, - ["solo_n"]= {"单挑", "普通", "打败AI"}, - ["solo_h"]= {"单挑", "困难", "打败AI"}, - ["solo_l"]= {"单挑", "疯狂", "打败AI"}, - ["solo_u"]= {"单挑", "极限", "打败AI"}, - ["techmino49_e"]= {"49人混战", "简单", "49人混战,活到最后"}, - ["techmino49_h"]= {"49人混战", "困难", "49人混战,活到最后"}, - ["techmino49_u"]= {"49人混战", "极限", "49人混战,活到最后"}, - ["techmino99_e"]= {"99人混战", "简单", "99人混战,活到最后"}, - ["techmino99_h"]= {"99人混战", "困难", "99人混战,活到最后"}, - ["techmino99_u"]= {"99人混战", "极限", "99人混战,活到最后"}, - ["round_e"]= {"回合制", "简单", "下棋模式"}, - ["round_n"]= {"回合制", "普通", "下棋模式"}, - ["round_h"]= {"回合制", "困难", "下棋模式"}, - ["round_l"]= {"回合制", "疯狂", "下棋模式"}, - ["round_u"]= {"回合制", "极限", "下棋模式"}, - ["master_beginner"]= {"大师", "疯狂", "20G初心者练习"}, - ["master_advance"]= {"大师", "极限", "上级者20G挑战"}, - ["master_final"]= {"大师", "终点", "究极20G:无法触及的终点"}, - ["master_phantasm"]= {"大师", "虚幻", "虚幻20G:???"}, - ["master_extra"]= {"宗师", "EX", "成为方块大师"}, - ["rhythm_e"]= {"节奏", "简单", "200行低速节奏马拉松"}, - ["rhythm_h"]= {"节奏", "困难", "200行中速节奏马拉松"}, - ["rhythm_u"]= {"节奏", "极限", "200行高速节奏马拉松"}, - ["blind_e"]= {"隐形", "半隐", "不强大脑"}, - ["blind_n"]= {"隐形", "全隐", "挺强大脑"}, - ["blind_h"]= {"隐形", "瞬隐", "很强大脑"}, - ["blind_l"]= {"隐形", "瞬隐+", "最强大脑"}, - ["blind_u"]= {"隐形", "啊这", "你准备好了吗"}, - ["blind_wtf"]= {"隐形", "不会吧", "还没准备好"}, - ["classic_fast"]= {"高速经典", "CTWC", "高速经典"}, - ["survivor_e"]= {"生存", "简单", "你能存活多久?"}, - ["survivor_n"]= {"生存", "普通", "你能存活多久?"}, - ["survivor_h"]= {"生存", "困难", "你能存活多久?"}, - ["survivor_l"]= {"生存", "疯狂", "你能存活多久?"}, - ["survivor_u"]= {"生存", "极限", "你能存活多久?"}, - ["attacker_h"]= {"进攻", "困难", "进攻练习"}, - ["attacker_u"]= {"进攻", "极限", "进攻练习"}, - ["defender_n"]= {"防守", "普通", "防守练习"}, - ["defender_l"]= {"防守", "疯狂", "防守练习"}, - ["dig_h"]= {"挖掘", "困难", "挖掘练习"}, - ["dig_u"]= {"挖掘", "极限", "挖掘练习"}, - ["bigbang"]= {"大爆炸", "简单", "All-spin 入门教程\n未制作完成,落块即通"}, - ["c4wtrain_n"]= {"C4W练习", "普通", "无 限 连 击"}, - ["c4wtrain_l"]= {"C4W练习", "疯狂", "无 限 连 击"}, - ["pctrain_n"]= {"全清训练", "普通", "简易PC题库,熟悉全清定式的组合"}, - ["pctrain_l"]= {"全清训练", "疯狂", "困难PC题库,强算力者进"}, - ["pc_n"]= {"全清挑战", "普通", "100行内刷PC"}, - ["pc_h"]= {"全清挑战", "困难", "100行内刷PC"}, - ["pc_l"]= {"全清挑战", "疯狂", "100行内刷PC"}, - ["tech_n"]= {"科研", "普通", "禁止断B2B"}, - ["tech_n_plus"]= {"科研", "普通+", "仅允许spin与PC"}, - ["tech_h"]= {"科研", "困难", "禁止断B2B"}, - ["tech_h_plus"]= {"科研", "困难+", "仅允许spin与PC"}, - ["tech_l"]= {"科研", "疯狂", "禁止断B2B"}, - ["tech_l_plus"]= {"科研", "疯狂+", "仅允许spin与PC"}, - ["tech_finesse"]= {"科研", "极简", "强制最简操作"}, - ["tech_finesse_f"]= {"科研", "极简+", "禁止普通消除,强制最简操作"}, - ["tsd_e"]= {"TSD挑战", "简单", "你能连续做几个TSD?"}, - ["tsd_h"]= {"TSD挑战", "困难", "你能连续做几个TSD?"}, - ["tsd_u"]= {"TSD挑战", "极限", "你能连续做几个TSD?"}, - ["backfire_n"]= {"Backfire", "普通", "打出100攻击"}, - ["backfire_h"]= {"Backfire", "困难", "打出100攻击"}, - ["backfire_l"]= {"Backfire", "疯狂", "打出100攻击"}, - ["backfire_u"]= {"Backfire", "极限", "打出100攻击"}, - ["zen"]= {"禅", "200", "不限时200行"}, - ["ultra"]= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, - ["infinite"]= {"无尽", "", "沙盒"}, - ["infinite_dig"]= {"无尽:挖掘", "", "挖呀挖呀挖"}, - ["sprintFix"]= {"竞速", "无移动"}, - ["sprintLock"]= {"竞速", "无旋转"}, - ["marathon_bfmax"]= {"马拉松", "极限"}, - ["custom_clear"]= {"自定义", "普通"}, - ["custom_puzzle"]= {"自定义", "拼图"}, + ['sprint_10l']= {"竞速", "10L", "消除10行"}, + ['sprint_20l']= {"竞速", "20L", "消除20行"}, + ['sprint_40l']= {"竞速", "40L", "消除40行"}, + ['sprint_100l']= {"竞速", "100L", "消除100行"}, + ['sprint_400l']= {"竞速", "400L", "消除400行"}, + ['sprint_1000l']= {"竞速", "1000L", "消除1000行"}, + ['sprintPenta']= {"竞速", "五连块", "伤脑筋十八块"}, + ['sprintMPH']= {"竞速", "MPH", "纯随机\n无预览\n无暂存"}, + ['dig_10l']= {"挖掘", "10L", "挖掘10行"}, + ['dig_40l']= {"挖掘", "40L", "挖掘40行"}, + ['dig_100l']= {"挖掘", "100L", "挖掘100行"}, + ['dig_400l']= {"挖掘", "400L", "挖掘400行"}, + ['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"}, + ['drought_n']= {"干旱", "100L", "你I没了"}, + ['drought_l']= {"干旱", "100L", "后 妈 发 牌"}, + ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, + ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, + ['solo_e']= {"单挑", "简单", "打败AI"}, + ['solo_n']= {"单挑", "普通", "打败AI"}, + ['solo_h']= {"单挑", "困难", "打败AI"}, + ['solo_l']= {"单挑", "疯狂", "打败AI"}, + ['solo_u']= {"单挑", "极限", "打败AI"}, + ['techmino49_e']= {"49人混战", "简单", "49人混战,活到最后"}, + ['techmino49_h']= {"49人混战", "困难", "49人混战,活到最后"}, + ['techmino49_u']= {"49人混战", "极限", "49人混战,活到最后"}, + ['techmino99_e']= {"99人混战", "简单", "99人混战,活到最后"}, + ['techmino99_h']= {"99人混战", "困难", "99人混战,活到最后"}, + ['techmino99_u']= {"99人混战", "极限", "99人混战,活到最后"}, + ['round_e']= {"回合制", "简单", "下棋模式"}, + ['round_n']= {"回合制", "普通", "下棋模式"}, + ['round_h']= {"回合制", "困难", "下棋模式"}, + ['round_l']= {"回合制", "疯狂", "下棋模式"}, + ['round_u']= {"回合制", "极限", "下棋模式"}, + ['master_beginner']= {"大师", "疯狂", "20G初心者练习"}, + ['master_advance']= {"大师", "极限", "上级者20G挑战"}, + ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, + ['master_phantasm']= {"大师", "虚幻", "虚幻20G:???"}, + ['master_extra']= {"宗师", "EX", "成为方块大师"}, + ['rhythm_e']= {"节奏", "简单", "200行低速节奏马拉松"}, + ['rhythm_h']= {"节奏", "困难", "200行中速节奏马拉松"}, + ['rhythm_u']= {"节奏", "极限", "200行高速节奏马拉松"}, + ['blind_e']= {"隐形", "半隐", "不强大脑"}, + ['blind_n']= {"隐形", "全隐", "挺强大脑"}, + ['blind_h']= {"隐形", "瞬隐", "很强大脑"}, + ['blind_l']= {"隐形", "瞬隐+", "最强大脑"}, + ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, + ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, + ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, + ['survivor_e']= {"生存", "简单", "你能存活多久?"}, + ['survivor_n']= {"生存", "普通", "你能存活多久?"}, + ['survivor_h']= {"生存", "困难", "你能存活多久?"}, + ['survivor_l']= {"生存", "疯狂", "你能存活多久?"}, + ['survivor_u']= {"生存", "极限", "你能存活多久?"}, + ['attacker_h']= {"进攻", "困难", "进攻练习"}, + ['attacker_u']= {"进攻", "极限", "进攻练习"}, + ['defender_n']= {"防守", "普通", "防守练习"}, + ['defender_l']= {"防守", "疯狂", "防守练习"}, + ['dig_h']= {"挖掘", "困难", "挖掘练习"}, + ['dig_u']= {"挖掘", "极限", "挖掘练习"}, + ['bigbang']= {"大爆炸", "简单", "All-spin 入门教程\n未制作完成,落块即通"}, + ['c4wtrain_n']= {"C4W练习", "普通", "无 限 连 击"}, + ['c4wtrain_l']= {"C4W练习", "疯狂", "无 限 连 击"}, + ['pctrain_n']= {"全清训练", "普通", "简易PC题库,熟悉全清定式的组合"}, + ['pctrain_l']= {"全清训练", "疯狂", "困难PC题库,强算力者进"}, + ['pc_n']= {"全清挑战", "普通", "100行内刷PC"}, + ['pc_h']= {"全清挑战", "困难", "100行内刷PC"}, + ['pc_l']= {"全清挑战", "疯狂", "100行内刷PC"}, + ['tech_n']= {"科研", "普通", "禁止断B2B"}, + ['tech_n_plus']= {"科研", "普通+", "仅允许spin与PC"}, + ['tech_h']= {"科研", "困难", "禁止断B2B"}, + ['tech_h_plus']= {"科研", "困难+", "仅允许spin与PC"}, + ['tech_l']= {"科研", "疯狂", "禁止断B2B"}, + ['tech_l_plus']= {"科研", "疯狂+", "仅允许spin与PC"}, + ['tech_finesse']= {"科研", "极简", "强制最简操作"}, + ['tech_finesse_f']= {"科研", "极简+", "禁止普通消除,强制最简操作"}, + ['tsd_e']= {"TSD挑战", "简单", "你能连续做几个TSD?"}, + ['tsd_h']= {"TSD挑战", "困难", "你能连续做几个TSD?"}, + ['tsd_u']= {"TSD挑战", "极限", "你能连续做几个TSD?"}, + ['backfire_n']= {"Backfire", "普通", "打出100攻击"}, + ['backfire_h']= {"Backfire", "困难", "打出100攻击"}, + ['backfire_l']= {"Backfire", "疯狂", "打出100攻击"}, + ['backfire_u']= {"Backfire", "极限", "打出100攻击"}, + ['zen']= {"禅", "200", "不限时200行"}, + ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, + ['infinite']= {"无尽", "", "沙盒"}, + ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, + ['sprintFix']= {"竞速", "无移动"}, + ['sprintLock']= {"竞速", "无旋转"}, + ['marathon_bfmax']= {"马拉松", "极限"}, + ['custom_clear']= {"自定义", "普通"}, + ['custom_puzzle']= {"自定义", "拼图"}, }, getTip={refuseCopy=true, "...,合群了就会消失,不合群世界毁灭(指game over", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index aad9a990..8a25a91d 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -139,96 +139,96 @@ return{ }, }, modes={ - ["sprint_10l"]= {"竞速", "10行", "消除10行"}, - ["sprint_20l"]= {"竞速", "20行", "消除20行"}, - ["sprint_40l"]= {"竞速", "40行", "消除40行"}, - ["sprint_100l"]= {"竞速", "100行", "消除100行"}, - ["sprint_400l"]= {"竞速", "400行", "消除400行"}, - ["sprint_1000l"]= {"竞速", "1000行", "消除1000行"}, - ["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"}, - ["sprintMPH"]= {"竞速", "纯净", "纯随机\n无预览\n无暂存"}, - ["dig_10l"]= {"挖掘", "10L", "挖掘10行"}, - ["dig_40l"]= {"挖掘", "40L", "挖掘40行"}, - ["dig_100l"]= {"挖掘", "100L", "挖掘100行"}, - ["dig_400l"]= {"挖掘", "400L", "挖掘400行"}, - ["dig_1000l"]= {"挖掘", "1000L", "挖掘1000行"}, - ["drought_n"]= {"干旱", "100行", "你I没了"}, - ["drought_l"]= {"干旱", "100行", "后 妈 发 牌"}, - ["marathon_n"]= {"马拉松", "普通", "200行加速马拉松"}, - ["marathon_h"]= {"马拉松", "困难", "200行高速马拉松"}, - ["solo_e"]= {"单挑", "简单", "打败机器人"}, - ["solo_n"]= {"单挑", "普通", "打败机器人"}, - ["solo_h"]= {"单挑", "困难", "打败机器人"}, - ["solo_l"]= {"单挑", "疯狂", "打败机器人"}, - ["solo_u"]= {"单挑", "极限", "打败机器人"}, - ["techmino49_e"]= {"49人混战", "简单", "49人混战,活到最后"}, - ["techmino49_h"]= {"49人混战", "困难", "49人混战,活到最后"}, - ["techmino49_u"]= {"49人混战", "极限", "49人混战,活到最后"}, - ["techmino99_e"]= {"99人混战", "简单", "99人混战,活到最后"}, - ["techmino99_h"]= {"99人混战", "困难", "99人混战,活到最后"}, - ["techmino99_u"]= {"99人混战", "极限", "99人混战,活到最后"}, - ["round_e"]= {"回合制", "简单", "下棋模式"}, - ["round_n"]= {"回合制", "普通", "下棋模式"}, - ["round_h"]= {"回合制", "困难", "下棋模式"}, - ["round_l"]= {"回合制", "疯狂", "下棋模式"}, - ["round_u"]= {"回合制", "极限", "下棋模式"}, - ["master_beginner"]= {"大师", "疯狂", "20G初心者练习"}, - ["master_advance"]= {"大师", "极限", "上级者20G挑战"}, - ["master_final"]= {"大师", "终点", "究极20G:无法触及的终点"}, - ["master_phantasm"]= {"大师", "虚幻", "虚幻20G:???"}, - ["master_extra"]= {"宗师", "EX", "成为方块大师"}, - ["rhythm_e"]= {"节奏", "简单", "200行低速节奏马拉松"}, - ["rhythm_h"]= {"节奏", "困难", "200行中速节奏马拉松"}, - ["rhythm_u"]= {"节奏", "极限", "200行高速节奏马拉松"}, - ["blind_e"]= {"隐形", "半隐", "不强大脑"}, - ["blind_n"]= {"隐形", "全隐", "挺强大脑"}, - ["blind_h"]= {"隐形", "瞬隐", "很强大脑"}, - ["blind_l"]= {"隐形", "瞬隐+", "超强大脑"}, - ["blind_u"]= {"隐形", "啊这", "你准备好了吗"}, - ["blind_wtf"]= {"隐形", "不会吧", "还没准备好"}, - ["classic_fast"]= {"高速经典", "CTWC", "高速经典"}, - ["survivor_e"]= {"生存", "简单", "你能存活多久?"}, - ["survivor_n"]= {"生存", "普通", "你能存活多久?"}, - ["survivor_h"]= {"生存", "困难", "你能存活多久?"}, - ["survivor_l"]= {"生存", "疯狂", "你能存活多久?"}, - ["survivor_u"]= {"生存", "极限", "你能存活多久?"}, - ["attacker_h"]= {"进攻", "困难", "进攻练习"}, - ["attacker_u"]= {"进攻", "极限", "进攻练习"}, - ["defender_n"]= {"防守", "普通", "防守练习"}, - ["defender_l"]= {"防守", "疯狂", "防守练习"}, - ["dig_h"]= {"挖掘", "困难", "挖掘练习"}, - ["dig_u"]= {"挖掘", "极限", "挖掘练习"}, - ["bigbang"]= {"大爆炸", "简单", "All-spin 入门教程\n未制作完成,落块即通"}, - ["c4wtrain_n"]= {"中四宽练习", "普通", "无 限 连 击"}, - ["c4wtrain_l"]= {"中四宽练习", "疯狂", "无 限 连 击"}, - ["pctrain_n"]= {"全清训练", "普通", "简易全清题库,熟悉全清定式的组合"}, - ["pctrain_l"]= {"全清训练", "疯狂", "困难PC题库,强算力者进"}, - ["pc_n"]= {"全清挑战", "普通", "100行内刷全清"}, - ["pc_h"]= {"全清挑战", "困难", "100行内刷全清"}, - ["pc_l"]= {"全清挑战", "疯狂", "100行内刷全清"}, - ["tech_n"]= {"科研", "普通", "禁止断B2B"}, - ["tech_n_plus"]= {"科研", "普通+", "仅允许回旋与全清"}, - ["tech_h"]= {"科研", "困难", "禁止断B2B"}, - ["tech_h_plus"]= {"科研", "困难+", "仅允许回旋与全清"}, - ["tech_l"]= {"科研", "疯狂", "禁止断B2B"}, - ["tech_l_plus"]= {"科研", "疯狂+", "仅允许spin与PC"}, - ["tech_finesse"]= {"科研", "极简", "强制最简操作"}, - ["tech_finesse_f"]= {"科研", "极简+", "禁止普通消除,强制最简操作"}, - ["tsd_e"]= {"T2挑战", "简单", "你能连续做几个T旋双清?"}, - ["tsd_h"]= {"T2挑战", "困难", "你能连续做几个T旋双清?"}, - ["tsd_u"]= {"T2挑战", "极限", "你能连续做几个T旋双清?"}, - ["backfire_n"]= {"自攻自防", "普通", "打出100攻击"}, - ["backfire_h"]= {"自攻自防", "困难", "打出100攻击"}, - ["backfire_l"]= {"自攻自防", "疯狂", "打出100攻击"}, - ["backfire_u"]= {"自攻自防", "极限", "打出100攻击"}, - ["zen"]= {"禅", "200", "不限时200行"}, - ["ultra"]= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, - ["infinite"]= {"无尽", "", "沙盒"}, - ["infinite_dig"]= {"无尽:挖掘", "", "挖呀挖呀挖"}, - ["sprintFix"]= {"竞速", "无移动"}, - ["sprintLock"]= {"竞速", "无旋转"}, - ["marathon_bfmax"]= {"马拉松", "极限"}, - ["custom_clear"]= {"自定义", "普通"}, - ["custom_puzzle"]= {"自定义", "拼图"}, + ['sprint_10l']= {"竞速", "10行", "消除10行"}, + ['sprint_20l']= {"竞速", "20行", "消除20行"}, + ['sprint_40l']= {"竞速", "40行", "消除40行"}, + ['sprint_100l']= {"竞速", "100行", "消除100行"}, + ['sprint_400l']= {"竞速", "400行", "消除400行"}, + ['sprint_1000l']= {"竞速", "1000行", "消除1000行"}, + ['sprintPenta']= {"竞速", "五连块", "伤脑筋十八块"}, + ['sprintMPH']= {"竞速", "纯净", "纯随机\n无预览\n无暂存"}, + ['dig_10l']= {"挖掘", "10L", "挖掘10行"}, + ['dig_40l']= {"挖掘", "40L", "挖掘40行"}, + ['dig_100l']= {"挖掘", "100L", "挖掘100行"}, + ['dig_400l']= {"挖掘", "400L", "挖掘400行"}, + ['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"}, + ['drought_n']= {"干旱", "100行", "你I没了"}, + ['drought_l']= {"干旱", "100行", "后 妈 发 牌"}, + ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, + ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, + ['solo_e']= {"单挑", "简单", "打败机器人"}, + ['solo_n']= {"单挑", "普通", "打败机器人"}, + ['solo_h']= {"单挑", "困难", "打败机器人"}, + ['solo_l']= {"单挑", "疯狂", "打败机器人"}, + ['solo_u']= {"单挑", "极限", "打败机器人"}, + ['techmino49_e']= {"49人混战", "简单", "49人混战,活到最后"}, + ['techmino49_h']= {"49人混战", "困难", "49人混战,活到最后"}, + ['techmino49_u']= {"49人混战", "极限", "49人混战,活到最后"}, + ['techmino99_e']= {"99人混战", "简单", "99人混战,活到最后"}, + ['techmino99_h']= {"99人混战", "困难", "99人混战,活到最后"}, + ['techmino99_u']= {"99人混战", "极限", "99人混战,活到最后"}, + ['round_e']= {"回合制", "简单", "下棋模式"}, + ['round_n']= {"回合制", "普通", "下棋模式"}, + ['round_h']= {"回合制", "困难", "下棋模式"}, + ['round_l']= {"回合制", "疯狂", "下棋模式"}, + ['round_u']= {"回合制", "极限", "下棋模式"}, + ['master_beginner']= {"大师", "疯狂", "20G初心者练习"}, + ['master_advance']= {"大师", "极限", "上级者20G挑战"}, + ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, + ['master_phantasm']= {"大师", "虚幻", "虚幻20G:???"}, + ['master_extra']= {"宗师", "EX", "成为方块大师"}, + ['rhythm_e']= {"节奏", "简单", "200行低速节奏马拉松"}, + ['rhythm_h']= {"节奏", "困难", "200行中速节奏马拉松"}, + ['rhythm_u']= {"节奏", "极限", "200行高速节奏马拉松"}, + ['blind_e']= {"隐形", "半隐", "不强大脑"}, + ['blind_n']= {"隐形", "全隐", "挺强大脑"}, + ['blind_h']= {"隐形", "瞬隐", "很强大脑"}, + ['blind_l']= {"隐形", "瞬隐+", "超强大脑"}, + ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, + ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, + ['classic_fast']= {"高速经典", "CTWC", "高速经典"}, + ['survivor_e']= {"生存", "简单", "你能存活多久?"}, + ['survivor_n']= {"生存", "普通", "你能存活多久?"}, + ['survivor_h']= {"生存", "困难", "你能存活多久?"}, + ['survivor_l']= {"生存", "疯狂", "你能存活多久?"}, + ['survivor_u']= {"生存", "极限", "你能存活多久?"}, + ['attacker_h']= {"进攻", "困难", "进攻练习"}, + ['attacker_u']= {"进攻", "极限", "进攻练习"}, + ['defender_n']= {"防守", "普通", "防守练习"}, + ['defender_l']= {"防守", "疯狂", "防守练习"}, + ['dig_h']= {"挖掘", "困难", "挖掘练习"}, + ['dig_u']= {"挖掘", "极限", "挖掘练习"}, + ['bigbang']= {"大爆炸", "简单", "All-spin 入门教程\n未制作完成,落块即通"}, + ['c4wtrain_n']= {"中四宽练习", "普通", "无 限 连 击"}, + ['c4wtrain_l']= {"中四宽练习", "疯狂", "无 限 连 击"}, + ['pctrain_n']= {"全清训练", "普通", "简易全清题库,熟悉全清定式的组合"}, + ['pctrain_l']= {"全清训练", "疯狂", "困难PC题库,强算力者进"}, + ['pc_n']= {"全清挑战", "普通", "100行内刷全清"}, + ['pc_h']= {"全清挑战", "困难", "100行内刷全清"}, + ['pc_l']= {"全清挑战", "疯狂", "100行内刷全清"}, + ['tech_n']= {"科研", "普通", "禁止断B2B"}, + ['tech_n_plus']= {"科研", "普通+", "仅允许回旋与全清"}, + ['tech_h']= {"科研", "困难", "禁止断B2B"}, + ['tech_h_plus']= {"科研", "困难+", "仅允许回旋与全清"}, + ['tech_l']= {"科研", "疯狂", "禁止断B2B"}, + ['tech_l_plus']= {"科研", "疯狂+", "仅允许spin与PC"}, + ['tech_finesse']= {"科研", "极简", "强制最简操作"}, + ['tech_finesse_f']= {"科研", "极简+", "禁止普通消除,强制最简操作"}, + ['tsd_e']= {"T2挑战", "简单", "你能连续做几个T旋双清?"}, + ['tsd_h']= {"T2挑战", "困难", "你能连续做几个T旋双清?"}, + ['tsd_u']= {"T2挑战", "极限", "你能连续做几个T旋双清?"}, + ['backfire_n']= {"自攻自防", "普通", "打出100攻击"}, + ['backfire_h']= {"自攻自防", "困难", "打出100攻击"}, + ['backfire_l']= {"自攻自防", "疯狂", "打出100攻击"}, + ['backfire_u']= {"自攻自防", "极限", "打出100攻击"}, + ['zen']= {"禅", "200", "不限时200行"}, + ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, + ['infinite']= {"无尽", "", "沙盒"}, + ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, + ['sprintFix']= {"竞速", "无移动"}, + ['sprintLock']= {"竞速", "无旋转"}, + ['marathon_bfmax']= {"马拉松", "极限"}, + ['custom_clear']= {"自定义", "普通"}, + ['custom_puzzle']= {"自定义", "拼图"}, }, } \ No newline at end of file diff --git a/parts/modes.lua b/parts/modes.lua index c2e262c0..6e4d4640 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -1,119 +1,119 @@ return{ - {name="sprint_10l", x=0, y=0, size=40,shape=1,icon="sprint1", unlock={"sprint_20l","sprint_40l"}}, - {name="sprint_20l", x=-200, y=0, size=50,shape=1,icon="sprint1"}, - {name="sprint_40l", x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={"dig_10l","sprint_100l","marathon_n","sprintPenta","sprintMPH"}}, - {name="sprint_100l", x=-200, y=-200, size=50,shape=1,icon="sprint2", unlock={"sprint_400l","drought_n"}}, - {name="sprint_400l", x=-400, y=-200, size=40,shape=1,icon="sprint3", unlock={"sprint_1000l"}}, - {name="sprint_1000l", x=-600, y=-200, size=40,shape=1,icon="sprint3"}, + {name='sprint_10l', x=0, y=0, size=40,shape=1,icon="sprint1", unlock={'sprint_20l','sprint_40l'}}, + {name='sprint_20l', x=-200, y=0, size=50,shape=1,icon="sprint1"}, + {name='sprint_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH'}}, + {name='sprint_100l', x=-200, y=-200, size=50,shape=1,icon="sprint2", unlock={'sprint_400l','drought_n'}}, + {name='sprint_400l', x=-400, y=-200, size=40,shape=1,icon="sprint3", unlock={'sprint_1000l'}}, + {name='sprint_1000l', x=-600, y=-200, size=40,shape=1,icon="sprint3"}, - {name="sprintPenta", x=210, y=-370, size=40,shape=3,icon="tech"}, - {name="sprintMPH", x=210, y=-230, size=40,shape=3,icon="tech"}, + {name='sprintPenta', x=210, y=-370, size=40,shape=3,icon="tech"}, + {name='sprintMPH', x=210, y=-230, size=40,shape=3,icon="tech"}, - {name="drought_n", x=-400, y=0, size=40,shape=1,icon="drought", unlock={"drought_l"}}, - {name="drought_l", x=-600, y=0, size=40,shape=1,icon="mess"}, + {name='drought_n', x=-400, y=0, size=40,shape=1,icon="drought", unlock={'drought_l'}}, + {name='drought_l', x=-600, y=0, size=40,shape=1,icon="mess"}, - {name="dig_10l", x=-200, y=-400, size=40,shape=1,icon="dig_sprint", unlock={"dig_40l"}}, - {name="dig_40l", x=-400, y=-400, size=40,shape=1,icon="dig_sprint", unlock={"dig_100l"}}, - {name="dig_100l", x=-600, y=-400, size=40,shape=1,icon="dig_sprint", unlock={"dig_400l"}}, - {name="dig_400l", x=-800, y=-200, size=40,shape=1,icon="dig_sprint"}, + {name='dig_10l', x=-200, y=-400, size=40,shape=1,icon="dig_sprint", unlock={'dig_40l'}}, + {name='dig_40l', x=-400, y=-400, size=40,shape=1,icon="dig_sprint", unlock={'dig_100l'}}, + {name='dig_100l', x=-600, y=-400, size=40,shape=1,icon="dig_sprint", unlock={'dig_400l'}}, + {name='dig_400l', x=-800, y=-200, size=40,shape=1,icon="dig_sprint"}, - {name="marathon_n", x=0, y=-600, size=60,shape=1,icon="marathon",unlock={"marathon_h","rhythm_e","solo_e","round_e","blind_e","classic_fast","survivor_e","bigbang","zen"}}, - {name="marathon_h", x=0, y=-800, size=50,shape=1,icon="marathon",unlock={"master_beginner"}}, + {name='marathon_n', x=0, y=-600, size=60,shape=1,icon="marathon",unlock={'marathon_h','rhythm_e','solo_e','round_e','blind_e','classic_fast','survivor_e','bigbang','zen'}}, + {name='marathon_h', x=0, y=-800, size=50,shape=1,icon="marathon",unlock={'master_beginner'}}, - {name="solo_e", x=-600, y=-1000,size=40,shape=1,icon="solo", unlock={"solo_n"}}, - {name="solo_n", x=-800, y=-1000,size=40,shape=1,icon="solo", unlock={"solo_h"}}, - {name="solo_h", x=-1000,y=-1000,size=40,shape=1,icon="solo", unlock={"solo_l","techmino49_e"}}, - {name="solo_l", x=-1200,y=-1000,size=40,shape=1,icon="solo", unlock={"solo_u"}}, - {name="solo_u", x=-1400,y=-1000,size=40,shape=1,icon="solo"}, + {name='solo_e', x=-600, y=-1000,size=40,shape=1,icon="solo", unlock={'solo_n'}}, + {name='solo_n', x=-800, y=-1000,size=40,shape=1,icon="solo", unlock={'solo_h'}}, + {name='solo_h', x=-1000,y=-1000,size=40,shape=1,icon="solo", unlock={'solo_l','techmino49_e'}}, + {name='solo_l', x=-1200,y=-1000,size=40,shape=1,icon="solo", unlock={'solo_u'}}, + {name='solo_u', x=-1400,y=-1000,size=40,shape=1,icon="solo"}, - {name="techmino49_e", x=-1100,y=-1200,size=40,shape=1,icon="t49", unlock={"techmino49_h","techmino99_e"}}, - {name="techmino49_h", x=-1100,y=-1400,size=40,shape=1,icon="t49", unlock={"techmino49_u"}}, - {name="techmino49_u", x=-1100,y=-1600,size=40,shape=1,icon="t49"}, - {name="techmino99_e", x=-1300,y=-1400,size=40,shape=1,icon="t99", unlock={"techmino99_h"}}, - {name="techmino99_h", x=-1300,y=-1600,size=40,shape=1,icon="t99", unlock={"techmino99_u"}}, - {name="techmino99_u", x=-1300,y=-1800,size=40,shape=1,icon="t99"}, + {name='techmino49_e', x=-1100,y=-1200,size=40,shape=1,icon="t49", unlock={'techmino49_h','techmino99_e'}}, + {name='techmino49_h', x=-1100,y=-1400,size=40,shape=1,icon="t49", unlock={'techmino49_u'}}, + {name='techmino49_u', x=-1100,y=-1600,size=40,shape=1,icon="t49"}, + {name='techmino99_e', x=-1300,y=-1400,size=40,shape=1,icon="t99", unlock={'techmino99_h'}}, + {name='techmino99_h', x=-1300,y=-1600,size=40,shape=1,icon="t99", unlock={'techmino99_u'}}, + {name='techmino99_u', x=-1300,y=-1800,size=40,shape=1,icon="t99"}, - {name="round_e", x=-600, y=-800, size=40,shape=1,icon="round", unlock={"round_n"}}, - {name="round_n", x=-800, y=-800, size=40,shape=1,icon="round", unlock={"round_h"}}, - {name="round_h", x=-1000,y=-800, size=40,shape=1,icon="round", unlock={"round_l"}}, - {name="round_l", x=-1200,y=-800, size=40,shape=1,icon="round", unlock={"round_u"}}, - {name="round_u", x=-1400,y=-800, size=40,shape=1,icon="round"}, + {name='round_e', x=-600, y=-800, size=40,shape=1,icon="round", unlock={'round_n'}}, + {name='round_n', x=-800, y=-800, size=40,shape=1,icon="round", unlock={'round_h'}}, + {name='round_h', x=-1000,y=-800, size=40,shape=1,icon="round", unlock={'round_l'}}, + {name='round_l', x=-1200,y=-800, size=40,shape=1,icon="round", unlock={'round_u'}}, + {name='round_u', x=-1400,y=-800, size=40,shape=1,icon="round"}, - {name="master_beginner",x=0, y=-1000,size=40,shape=1,icon="master", unlock={"master_advance"}}, - {name="master_advance", x=0, y=-1200,size=40,shape=3,icon="master", unlock={"master_final","master_extra","master_phantasm"}}, - {name="master_final", x=0, y=-1600,size=40,shape=2,icon="master"}, - {name="master_phantasm",x=-150, y=-1500,size=40,shape=2,icon="master"}, - {name="master_extra", x=150, y=-1500,size=40,shape=2,icon="master_ex"}, + {name='master_beginner',x=0, y=-1000,size=40,shape=1,icon="master", unlock={'master_advance'}}, + {name='master_advance', x=0, y=-1200,size=40,shape=3,icon="master", unlock={'master_final','master_extra','master_phantasm'}}, + {name='master_final', x=0, y=-1600,size=40,shape=2,icon="master"}, + {name='master_phantasm',x=-150, y=-1500,size=40,shape=2,icon="master"}, + {name='master_extra', x=150, y=-1500,size=40,shape=2,icon="master_ex"}, - {name="rhythm_e", x=-350, y=-1000,size=40,shape=1,icon="rhythm", unlock={"rhythm_h"}}, - {name="rhythm_h", x=-350, y=-1200,size=40,shape=3,icon="rhythm", unlock={"rhythm_u"}}, - {name="rhythm_u", x=-350, y=-1400,size=40,shape=2,icon="rhythm"}, + {name='rhythm_e', x=-350, y=-1000,size=40,shape=1,icon="rhythm", unlock={'rhythm_h'}}, + {name='rhythm_h', x=-350, y=-1200,size=40,shape=3,icon="rhythm", unlock={'rhythm_u'}}, + {name='rhythm_u', x=-350, y=-1400,size=40,shape=2,icon="rhythm"}, - {name="blind_e", x=150, y=-700, size=40,shape=1,icon="hidden", unlock={"blind_n"}}, - {name="blind_n", x=150, y=-800, size=40,shape=1,icon="hidden", unlock={"blind_h"}}, - {name="blind_h", x=150, y=-900, size=35,shape=1,icon="hidden", unlock={"blind_l"}}, - {name="blind_l", x=150, y=-1000,size=35,shape=3,icon="hidden", unlock={"blind_u"}}, - {name="blind_u", x=150, y=-1100,size=35,shape=3,icon="hidden", unlock={"blind_wtf"}}, - {name="blind_wtf", x=150, y=-1200,size=35,shape=2,icon="hidden"}, + {name='blind_e', x=150, y=-700, size=40,shape=1,icon="hidden", unlock={'blind_n'}}, + {name='blind_n', x=150, y=-800, size=40,shape=1,icon="hidden", unlock={'blind_h'}}, + {name='blind_h', x=150, y=-900, size=35,shape=1,icon="hidden", unlock={'blind_l'}}, + {name='blind_l', x=150, y=-1000,size=35,shape=3,icon="hidden", unlock={'blind_u'}}, + {name='blind_u', x=150, y=-1100,size=35,shape=3,icon="hidden", unlock={'blind_wtf'}}, + {name='blind_wtf', x=150, y=-1200,size=35,shape=2,icon="hidden"}, - {name="classic_fast", x=-150, y=-950, size=40,shape=2,icon="classic"}, + {name='classic_fast', x=-150, y=-950, size=40,shape=2,icon="classic"}, - {name="survivor_e", x=300, y=-600, size=40,shape=1,icon="survivor",unlock={"survivor_n"}}, - {name="survivor_n", x=500, y=-600, size=40,shape=1,icon="survivor",unlock={"survivor_h","attacker_h","defender_n","dig_h"}}, - {name="survivor_h", x=700, y=-600, size=40,shape=1,icon="survivor",unlock={"survivor_l"}}, - {name="survivor_l", x=900, y=-600, size=40,shape=3,icon="survivor",unlock={"survivor_u"}}, - {name="survivor_u", x=1100, y=-600, size=40,shape=2,icon="survivor"}, + {name='survivor_e', x=300, y=-600, size=40,shape=1,icon="survivor",unlock={'survivor_n'}}, + {name='survivor_n', x=500, y=-600, size=40,shape=1,icon="survivor",unlock={'survivor_h','attacker_h','defender_n','dig_h'}}, + {name='survivor_h', x=700, y=-600, size=40,shape=1,icon="survivor",unlock={'survivor_l'}}, + {name='survivor_l', x=900, y=-600, size=40,shape=3,icon="survivor",unlock={'survivor_u'}}, + {name='survivor_u', x=1100, y=-600, size=40,shape=2,icon="survivor"}, - {name="attacker_h", x=300, y=-800, size=40,shape=1,icon="attack", unlock={"attacker_u"}}, - {name="attacker_u", x=300, y=-1000,size=40,shape=1,icon="attack"}, + {name='attacker_h', x=300, y=-800, size=40,shape=1,icon="attack", unlock={'attacker_u'}}, + {name='attacker_u', x=300, y=-1000,size=40,shape=1,icon="attack"}, - {name="defender_n", x=500, y=-800, size=40,shape=1,icon="defend", unlock={"defender_l"}}, - {name="defender_l", x=500, y=-1000,size=40,shape=1,icon="defend"}, + {name='defender_n', x=500, y=-800, size=40,shape=1,icon="defend", unlock={'defender_l'}}, + {name='defender_l', x=500, y=-1000,size=40,shape=1,icon="defend"}, - {name="dig_h", x=700, y=-800, size=40,shape=1,icon="dig", unlock={"dig_u"}}, - {name="dig_u", x=700, y=-1000,size=40,shape=1,icon="dig"}, + {name='dig_h', x=700, y=-800, size=40,shape=1,icon="dig", unlock={'dig_u'}}, + {name='dig_u', x=700, y=-1000,size=40,shape=1,icon="dig"}, - {name="bigbang", x=400, y=-400, size=50,shape=1,icon="bigbang", unlock={"c4wtrain_n","pctrain_n","tech_n"}}, - {name="c4wtrain_n", x=700, y=-400, size=40,shape=1,icon="pc",unlock={"c4wtrain_l"}}, - {name="c4wtrain_l", x=900, y=-400, size=40,shape=1,icon="pc"}, + {name='bigbang', x=400, y=-400, size=50,shape=1,icon="bigbang", unlock={'c4wtrain_n','pctrain_n','tech_n'}}, + {name='c4wtrain_n', x=700, y=-400, size=40,shape=1,icon="pc",unlock={'c4wtrain_l'}}, + {name='c4wtrain_l', x=900, y=-400, size=40,shape=1,icon="pc"}, - {name="pctrain_n", x=700, y=-220, size=40,shape=1,icon="pc", unlock={"pctrain_l","pc_n"}}, - {name="pctrain_l", x=900, y=-220, size=40,shape=1,icon="pc"}, + {name='pctrain_n', x=700, y=-220, size=40,shape=1,icon="pc", unlock={'pctrain_l','pc_n'}}, + {name='pctrain_l', x=900, y=-220, size=40,shape=1,icon="pc"}, - {name="pc_n", x=800, y=-100, size=40,shape=1,icon="pc", unlock={"pc_h"}}, - {name="pc_h", x=1000, y=-100, size=40,shape=3,icon="pc", unlock={"pc_l"}}, - {name="pc_l", x=1200, y=-100, size=40,shape=2,icon="pc"}, + {name='pc_n', x=800, y=-100, size=40,shape=1,icon="pc", unlock={'pc_h'}}, + {name='pc_h', x=1000, y=-100, size=40,shape=3,icon="pc", unlock={'pc_l'}}, + {name='pc_l', x=1200, y=-100, size=40,shape=2,icon="pc"}, - {name="tech_n", x=400, y=-150, size=40,shape=1,icon="tech", unlock={"tech_n_plus","tech_h","tech_finesse"}}, - {name="tech_n_plus", x=600, y=160, size=40,shape=3,icon="tech", unlock={"tsd_e","backfire_n"}}, - {name="tech_h", x=400, y=40, size=40,shape=1,icon="tech", unlock={"tech_h_plus","tech_l"}}, - {name="tech_h_plus", x=200, y=70, size=35,shape=3,icon="tech"}, - {name="tech_l", x=400, y=200, size=40,shape=1,icon="tech", unlock={"tech_l_plus"}}, - {name="tech_l_plus", x=200, y=230, size=35,shape=3,icon="tech"}, + {name='tech_n', x=400, y=-150, size=40,shape=1,icon="tech", unlock={'tech_n_plus','tech_h','tech_finesse'}}, + {name='tech_n_plus', x=600, y=160, size=40,shape=3,icon="tech", unlock={'tsd_e','backfire_n'}}, + {name='tech_h', x=400, y=40, size=40,shape=1,icon="tech", unlock={'tech_h_plus','tech_l'}}, + {name='tech_h_plus', x=200, y=70, size=35,shape=3,icon="tech"}, + {name='tech_l', x=400, y=200, size=40,shape=1,icon="tech", unlock={'tech_l_plus'}}, + {name='tech_l_plus', x=200, y=230, size=35,shape=3,icon="tech"}, - {name="tech_finesse", x=800, y=50, size=40,shape=1,icon="tech", unlock={"tech_finesse_f"}}, - {name="tech_finesse_f", x=1000, y=50, size=40,shape=1,icon="tech"}, + {name='tech_finesse', x=800, y=50, size=40,shape=1,icon="tech", unlock={'tech_finesse_f'}}, + {name='tech_finesse_f', x=1000, y=50, size=40,shape=1,icon="tech"}, - {name="tsd_e", x=800, y=200, size=40,shape=1,icon="tsd", unlock={"tsd_h"}}, - {name="tsd_h", x=1000, y=200, size=40,shape=1,icon="tsd", unlock={"tsd_u"}}, - {name="tsd_u", x=1200, y=200, size=40,shape=1,icon="tsd"}, + {name='tsd_e', x=800, y=200, size=40,shape=1,icon="tsd", unlock={'tsd_h'}}, + {name='tsd_h', x=1000, y=200, size=40,shape=1,icon="tsd", unlock={'tsd_u'}}, + {name='tsd_u', x=1200, y=200, size=40,shape=1,icon="tsd"}, - {name="backfire_n", x=800, y=350, size=40,shape=1,icon="backfire",unlock={"backfire_h"}}, - {name="backfire_h", x=950, y=350, size=40,shape=1,icon="backfire",unlock={"backfire_l"}}, - {name="backfire_l", x=1100, y=350, size=40,shape=3,icon="backfire",unlock={"backfire_u"}}, - {name="backfire_u", x=1250, y=350, size=35,shape=2,icon="backfire"}, + {name='backfire_n', x=800, y=350, size=40,shape=1,icon="backfire",unlock={'backfire_h'}}, + {name='backfire_h', x=950, y=350, size=40,shape=1,icon="backfire",unlock={'backfire_l'}}, + {name='backfire_l', x=1100, y=350, size=40,shape=3,icon="backfire",unlock={'backfire_u'}}, + {name='backfire_u', x=1250, y=350, size=35,shape=2,icon="backfire"}, - {name="zen", x=-800, y=-600, size=40,shape=1,icon="zen", unlock={"ultra","infinite","infinite_dig"}}, - {name="ultra", x=-1000,y=-400, size=40,shape=1,icon="ultra"}, - {name="infinite", x=-800, y=-400, size=40,shape=1,icon="infinite"}, - {name="infinite_dig", x=-1000,y=-600, size=40,shape=1,icon="dig"}, + {name='zen', x=-800, y=-600, size=40,shape=1,icon="zen", unlock={'ultra','infinite','infinite_dig'}}, + {name='ultra', x=-1000,y=-400, size=40,shape=1,icon="ultra"}, + {name='infinite', x=-800, y=-400, size=40,shape=1,icon='infinite'}, + {name='infinite_dig', x=-1000,y=-600, size=40,shape=1,icon="dig"}, - {name="sprintFix"}, - {name="sprintLock"}, - {name="marathon_bfmax"}, + {name='sprintFix'}, + {name='sprintLock'}, + {name='marathon_bfmax'}, - {name="custom_puzzle"}, - {name="custom_clear"}, + {name='custom_puzzle'}, + {name='custom_clear'}, {name="netBattle"}, } \ No newline at end of file diff --git a/parts/modes/attacker_h.lua b/parts/modes/attacker_h.lua index 9f07f1df..79fcf28b 100644 --- a/parts/modes/attacker_h.lua +++ b/parts/modes/attacker_h.lua @@ -26,16 +26,16 @@ return{ D.wave=D.wave+1 if D.wave%10==0 then if D.wave==20 then - P:showTextF(text.great,0,-140,100,"appear",.6) + P:showTextF(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=3 elseif D.wave==50 then - P:showTextF(text.maxspeed,0,-140,100,"appear",.6) + P:showTextF(text.maxspeed,0,-140,100,'appear',.6) end end end end end, - bg="rainbow2",bgm="shining terminal", + bg='rainbow2',bgm='shining terminal', }, pauseLimit=true, load=function() diff --git a/parts/modes/attacker_u.lua b/parts/modes/attacker_u.lua index 8c3cf994..37c0498f 100644 --- a/parts/modes/attacker_u.lua +++ b/parts/modes/attacker_u.lua @@ -30,19 +30,19 @@ return{ D.wave=D.wave+1 if D.wave%10==0 then if D.wave==10 then - P:showTextF(text.great,0,-140,100,"appear",.6) + P:showTextF(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=4 elseif D.wave==20 then - P:showTextF(text.awesome,0,-140,100,"appear",.6) + P:showTextF(text.awesome,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=5 elseif D.wave==30 then - P:showTextF(text.maxspeed,0,-140,100,"appear",.6) + P:showTextF(text.maxspeed,0,-140,100,'appear',.6) end end end end end, - bg="rainbow2",bgm="shining terminal", + bg='rainbow2',bgm='shining terminal', }, pauseLimit=true, load=function() diff --git a/parts/modes/backfire_h.lua b/parts/modes/backfire_h.lua index d9aa4dbe..1f6e059e 100644 --- a/parts/modes/backfire_h.lua +++ b/parts/modes/backfire_h.lua @@ -8,10 +8,10 @@ return{ P:receive(nil,P.lastPiece.atk,60,generateLine(P:RND(10))) end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end, - bg="tunnel",bgm="echo", + bg='tunnel',bgm='echo', }, pauseLimit=true, load=function() diff --git a/parts/modes/backfire_l.lua b/parts/modes/backfire_l.lua index a605b960..4529c113 100644 --- a/parts/modes/backfire_l.lua +++ b/parts/modes/backfire_l.lua @@ -8,10 +8,10 @@ return{ P:receive(nil,P.lastPiece.atk,30,generateLine(P:RND(10))) end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end, - bg="blackhole",bgm="echo", + bg='blackhole',bgm='echo', }, pauseLimit=true, load=function() diff --git a/parts/modes/backfire_n.lua b/parts/modes/backfire_n.lua index 55b78c09..d588b12d 100644 --- a/parts/modes/backfire_n.lua +++ b/parts/modes/backfire_n.lua @@ -7,10 +7,10 @@ return{ P:receive(nil,P.lastPiece.atk,120,generateLine(P:RND(10))) end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end, - bg="tunnel",bgm="echo", + bg='tunnel',bgm='echo', }, pauseLimit=true, load=function() diff --git a/parts/modes/backfire_u.lua b/parts/modes/backfire_u.lua index afe93fa5..9158bcaa 100644 --- a/parts/modes/backfire_u.lua +++ b/parts/modes/backfire_u.lua @@ -8,10 +8,10 @@ return{ P:receive(nil,P.lastPiece.atk,0,generateLine(P:RND(10))) end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end, - bg="blackhole",bgm="echo", + bg='blackhole',bgm='echo', }, pauseLimit=true, load=function() diff --git a/parts/modes/bigbang.lua b/parts/modes/bigbang.lua index b46a76f8..251cdb45 100644 --- a/parts/modes/bigbang.lua +++ b/parts/modes/bigbang.lua @@ -4,7 +4,7 @@ return{ drop=1e99,lock=1e99, holdCount=0, dropPiece=function(P)P:lose()end, - bg="bg1",bgm="new era", + bg='bg1',bgm='new era', }, pauseLimit=true, load=function() diff --git a/parts/modes/blind_e.lua b/parts/modes/blind_e.lua index 52e79271..bb9fbd70 100644 --- a/parts/modes/blind_e.lua +++ b/parts/modes/blind_e.lua @@ -3,10 +3,10 @@ return{ color=COLOR.cyan, env={ drop=30,lock=45, - visible="easy", - dropPiece=function(P)if P.stat.row>=200 then P:win("finish")end end, + visible='easy', + dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, freshLimit=10, - bg="glow",bgm="push", + bg='glow',bgm='push', }, pauseLimit=true, load=function() diff --git a/parts/modes/blind_h.lua b/parts/modes/blind_h.lua index a1558f49..70827013 100644 --- a/parts/modes/blind_h.lua +++ b/parts/modes/blind_h.lua @@ -6,11 +6,11 @@ return{ drop=15,lock=45, fall=10, dropFX=0,lockFX=0, - visible="none", + visible='none', score=false, - dropPiece=function(P)if P.stat.row>=200 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, freshLimit=15, - bg="rgb",bgm="push", + bg='rgb',bgm='push', }, pauseLimit=true, load=function() diff --git a/parts/modes/blind_l.lua b/parts/modes/blind_l.lua index 1d7ada78..ebef32f0 100644 --- a/parts/modes/blind_l.lua +++ b/parts/modes/blind_l.lua @@ -7,11 +7,11 @@ return{ fall=5, ghost=0, dropFX=0,lockFX=0, - visible="none", + visible='none', score=false, - dropPiece=function(P)if P.stat.row>=200 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, freshLimit=15, - bg="rgb",bgm="push", + bg='rgb',bgm='push', }, pauseLimit=true, load=function() diff --git a/parts/modes/blind_n.lua b/parts/modes/blind_n.lua index bd4e0224..fa5e21f8 100644 --- a/parts/modes/blind_n.lua +++ b/parts/modes/blind_n.lua @@ -5,9 +5,9 @@ return{ env={ drop=15,lock=45, freshLimit=10, - visible="fast", - dropPiece=function(P)if P.stat.row>=200 then P:win("finish")end end, - bg="glow",bgm="push", + visible='fast', + dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, + bg='glow',bgm='push', }, pauseLimit=true, load=function() diff --git a/parts/modes/blind_u.lua b/parts/modes/blind_u.lua index 28e2e19c..e1d131b0 100644 --- a/parts/modes/blind_u.lua +++ b/parts/modes/blind_u.lua @@ -6,11 +6,11 @@ return{ drop=30,lock=60, block=false,center=0,ghost=0, dropFX=0,lockFX=0, - visible="none", + visible='none', score=false, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, freshLimit=15, - bg="rgb",bgm="far", + bg='rgb',bgm='far', }, pauseLimit=true, load=function() diff --git a/parts/modes/blind_wtf.lua b/parts/modes/blind_wtf.lua index babde546..70f0baa5 100644 --- a/parts/modes/blind_wtf.lua +++ b/parts/modes/blind_wtf.lua @@ -7,10 +7,10 @@ return{ nextCount=1, block=false,center=0,ghost=0, dropFX=0,lockFX=0, - visible="none", - dropPiece=function(P)if P.stat.row>=40 then P:win("finish")end end, + visible='none', + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, freshLimit=15, - bg="none",bgm="far", + bg='none',bgm='far', }, pauseLimit=true, load=function() @@ -23,19 +23,19 @@ return{ if not GAME.result then if GAME.replaying then gc.setColor(.3,.3,.3,.7) - gc.push("transform") + gc.push('transform') gc.origin() - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.pop() else gc.clear(.26,.26,.26) --Frame gc.setColor(.5,.5,.5) - gc.push("transform") + gc.push('transform') 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 + 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 gc.pop() end end diff --git a/parts/modes/c4wtrain_l.lua b/parts/modes/c4wtrain_l.lua index 048da75d..086b3867 100644 --- a/parts/modes/c4wtrain_l.lua +++ b/parts/modes/c4wtrain_l.lua @@ -13,7 +13,7 @@ local function check_c4w(P) P.modeData.maxCombo=P.combo end if P.stat.row>=100 then - P:win("finish") + P:win('finish') end end end @@ -25,7 +25,7 @@ return{ task=function(P)P.modeData.maxCombo=0 end, dropPiece=check_c4w, freshLimit=15,ospin=false, - bg="rgb",bgm="oxygen", + bg='rgb',bgm='oxygen', }, pauseLimit=true, load=function() diff --git a/parts/modes/c4wtrain_n.lua b/parts/modes/c4wtrain_n.lua index 58de8d4d..de54f51c 100644 --- a/parts/modes/c4wtrain_n.lua +++ b/parts/modes/c4wtrain_n.lua @@ -11,7 +11,7 @@ local function check_c4w(P) P.modeData.maxCombo=P.combo end if P.stat.row>=100 then - P:win("finish") + P:win('finish') end end end @@ -23,7 +23,7 @@ return{ task=function(P)P.modeData.maxCombo=0 end, dropPiece=check_c4w, freshLimit=15,ospin=false, - bg="rgb",bgm="oxygen", + bg='rgb',bgm='oxygen', }, pauseLimit=true, load=function() diff --git a/parts/modes/classic_fast.lua b/parts/modes/classic_fast.lua index e1d7200a..5a8890ed 100644 --- a/parts/modes/classic_fast.lua +++ b/parts/modes/classic_fast.lua @@ -10,8 +10,8 @@ return{ center=0,ghost=0, drop=3,lock=3,wait=10,fall=25, nextCount=1,holdCount=false, - sequence="rnd", - RS="Classic", + sequence='rnd', + RS='Classic', freshLimit=0, face={0,0,2,2,2,0,0}, task=function(P)P.modeData.target=10 end, @@ -21,16 +21,16 @@ return{ D.target=D.target+10 if D.target==110 then P.gameEnv.drop,P.gameEnv.lock=2,2 - SFX.play("blip_1") + SFX.play('blip_1') elseif D.target==200 then P.gameEnv.drop,P.gameEnv.lock=1,1 - SFX.play("blip_1") + SFX.play('blip_1') else - SFX.play("reach") + SFX.play('reach') end end end, - bg="rgb",bgm="magicblock", + bg='rgb',bgm='magicblock', }, slowMark=true, load=function() @@ -44,7 +44,7 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + 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 4dbbb590..d5adaabf 100644 --- a/parts/modes/custom_clear.lua +++ b/parts/modes/custom_clear.lua @@ -38,9 +38,9 @@ local function checkClear(P) end setField(P,D.finished+1) SYSFX.newShade(1.4,P.absFieldX,P.absFieldY,300*P.size,610*P.size,.6,.8,.6) - SFX.play("blip_1") + SFX.play('blip_1') else - P:win("finish") + P:win('finish') end end end @@ -63,12 +63,12 @@ return{ PLY.newPlayer(1) local AItype=ENV.opponent:sub(1,2) local AIlevel=tonumber(ENV.opponent:sub(-1)) - if AItype=="9S"then + if AItype=='9S'then ENV.target=nil - PLY.newAIPlayer(2,AIBUILDER("9S",2*AIlevel)) - elseif AItype=="CC"then + PLY.newAIPlayer(2,AIBUILDER('9S',2*AIlevel)) + elseif AItype=='CC'then ENV.target=nil - PLY.newAIPlayer(2,AIBUILDER("CC",2*AIlevel-1,math.floor(AIlevel*.5+1),true,20000+5000*AIlevel)) + PLY.newAIPlayer(2,AIBUILDER('CC',2*AIlevel-1,math.floor(AIlevel*.5+1),true,20000+5000*AIlevel)) end for _,P in next,PLY_ALIVE do diff --git a/parts/modes/custom_puzzle.lua b/parts/modes/custom_puzzle.lua index 3e63ed33..722fddbd 100644 --- a/parts/modes/custom_puzzle.lua +++ b/parts/modes/custom_puzzle.lua @@ -23,11 +23,11 @@ local function puzzleCheck(P) P.field[_],P.visTime[_]=nil end SYSFX.newShade(1.4,P.absFieldX,P.absFieldY,300*P.size,610*P.size,.3,1,.3) - SFX.play("reach") + SFX.play('reach') D.showMark=0 else D.showMark=1 - P:win("finish") + P:win('finish') end end @@ -43,17 +43,17 @@ return{ local ENV=GAME.modeEnv local AItype=ENV.opponent:sub(1,2) local AIlevel=tonumber(ENV.opponent:sub(-1)) - if AItype=="9S"then - PLY.newAIPlayer(2,AIBUILDER("9S",2*AIlevel)) - elseif AItype=="CC"then - PLY.newAIPlayer(2,AIBUILDER("CC",2*AIlevel-1,math.floor(AIlevel*.5+1),true,20000+5000*AIlevel)) + if AItype=='9S'then + PLY.newAIPlayer(2,AIBUILDER('9S',2*AIlevel)) + elseif AItype=='CC'then + PLY.newAIPlayer(2,AIBUILDER('CC',2*AIlevel-1,math.floor(AIlevel*.5+1),true,20000+5000*AIlevel)) end end, mesDisp=function(P) setFont(55) mStr(P.stat.row,69,225) mText(drawableText.line,69,290) - gc.push("transform") + gc.push('transform') PLY.draw.applyFieldOffset(P) if P.modeData.showMark==0 then local mark=TEXTURE.puzzleMark diff --git a/parts/modes/defender_l.lua b/parts/modes/defender_l.lua index 57b91ce1..b6527861 100644 --- a/parts/modes/defender_l.lua +++ b/parts/modes/defender_l.lua @@ -24,15 +24,15 @@ return{ if D.wave<=75 then D.rpm=math.floor(144e3/t)*.1 if D.wave==25 then - P:showTextF(text.great,0,-140,100,"appear",.6) + P:showTextF(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=3 P.dropDelay,P.gameEnv.drop=4,4 elseif D.wave==50 then - P:showTextF(text.awesome,0,-140,100,"appear",.6) + P:showTextF(text.awesome,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=4 P.dropDelay,P.gameEnv.drop=3,3 elseif D.wave==75 then - P:showTextF(text.maxspeed,0,-140,100,"appear",.6) + P:showTextF(text.maxspeed,0,-140,100,'appear',.6) P.dropDelay,P.gameEnv.drop=2,2 end end @@ -40,7 +40,7 @@ return{ end end end, - bg="rainbow2",bgm="storm", + bg='rainbow2',bgm='storm', }, pauseLimit=true, load=function() diff --git a/parts/modes/defender_n.lua b/parts/modes/defender_n.lua index 96cf60ef..76204d6b 100644 --- a/parts/modes/defender_n.lua +++ b/parts/modes/defender_n.lua @@ -24,23 +24,23 @@ return{ if D.wave<=90 then D.rpm=math.floor(108e3/t)*.1 if D.wave==25 then - P:showTextF(text.great,0,-140,100,"appear",.6) + P:showTextF(text.great,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=2 P.dropDelay,P.gameEnv.drop=20,20 elseif D.wave==50 then - P:showTextF(text.awesome,0,-140,100,"appear",.6) + P:showTextF(text.awesome,0,-140,100,'appear',.6) P.gameEnv.pushSpeed=3 P.dropDelay,P.gameEnv.drop=10,10 elseif D.wave==90 then P.dropDelay,P.gameEnv.drop=5,5 - P:showTextF(text.maxspeed,0,-140,100,"appear",.6) + P:showTextF(text.maxspeed,0,-140,100,'appear',.6) end end end end end end, - bg="rainbow2",bgm="storm", + bg='rainbow2',bgm='storm', }, pauseLimit=true, load=function() diff --git a/parts/modes/dig_100l.lua b/parts/modes/dig_100l.lua index 4163cbc0..a12979a3 100644 --- a/parts/modes/dig_100l.lua +++ b/parts/modes/dig_100l.lua @@ -3,7 +3,7 @@ local function check_rise(P) P:garbageRise(21,1,P:getHolePos()) end if P.stat.dig==100 then - P:win("finish") + P:win('finish') end end @@ -12,7 +12,7 @@ return{ env={ pushSpeed=6, dropPiece=check_rise, - bg="bg2",bgm="way", + bg='bg2',bgm='way', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/dig_10l.lua b/parts/modes/dig_10l.lua index 40489503..813715ec 100644 --- a/parts/modes/dig_10l.lua +++ b/parts/modes/dig_10l.lua @@ -1,6 +1,6 @@ local function check_rise(P) if P.stat.dig==10 then - P:win("finish") + P:win('finish') end end @@ -9,7 +9,7 @@ return{ env={ pushSpeed=6, dropPiece=check_rise, - bg="bg1",bgm="way", + bg='bg1',bgm='way', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/dig_400l.lua b/parts/modes/dig_400l.lua index 057d6ee3..1e15f49c 100644 --- a/parts/modes/dig_400l.lua +++ b/parts/modes/dig_400l.lua @@ -3,7 +3,7 @@ local function check_rise(P) P:garbageRise(21,1,P:getHolePos()) end if P.stat.dig==400 then - P:win("finish") + P:win('finish') end end @@ -12,7 +12,7 @@ return{ env={ pushSpeed=6, dropPiece=check_rise, - bg="bg2",bgm="way", + bg='bg2',bgm='way', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/dig_40l.lua b/parts/modes/dig_40l.lua index 5ab5ffa6..40afde95 100644 --- a/parts/modes/dig_40l.lua +++ b/parts/modes/dig_40l.lua @@ -3,7 +3,7 @@ local function check_rise(P) P:garbageRise(21,1,P:getHolePos()) end if P.stat.dig==40 then - P:win("finish") + P:win('finish') end end @@ -12,7 +12,7 @@ return{ env={ pushSpeed=6, dropPiece=check_rise, - bg="bg1",bgm="way", + bg='bg1',bgm='way', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/dig_h.lua b/parts/modes/dig_h.lua index 009a0558..0ec4deaa 100644 --- a/parts/modes/dig_h.lua +++ b/parts/modes/dig_h.lua @@ -19,7 +19,7 @@ return{ end end end, - bg="bg2",bgm="down", + bg='bg2',bgm='down', }, pauseLimit=true, load=function() diff --git a/parts/modes/dig_u.lua b/parts/modes/dig_u.lua index 312847ce..fe09c305 100644 --- a/parts/modes/dig_u.lua +++ b/parts/modes/dig_u.lua @@ -18,7 +18,7 @@ return{ end end end, - bg="bg2",bgm="down", + bg='bg2',bgm='down', }, pauseLimit=true, load=function() diff --git a/parts/modes/drought_l.lua b/parts/modes/drought_l.lua index 001e5a42..4973a383 100644 --- a/parts/modes/drought_l.lua +++ b/parts/modes/drought_l.lua @@ -75,11 +75,11 @@ return{ end end end, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, nextCount=1,holdCount=0, ospin=false, freshLimit=15, - bg="blockfall",bgm="reason", + bg='blockfall',bgm='reason', }, pauseLimit=true, load=function() diff --git a/parts/modes/drought_n.lua b/parts/modes/drought_n.lua index de2963c8..76f7ff59 100644 --- a/parts/modes/drought_n.lua +++ b/parts/modes/drought_n.lua @@ -3,13 +3,13 @@ return{ color=COLOR.green, env={ drop=20,lock=60, - sequence="bag", + sequence='bag', seqData={1,1,2,2,3,3,4,4,5,5,6,6}, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, nextCount=3, ospin=false, freshLimit=15, - bg="blockfall",bgm="reason", + bg='blockfall',bgm='reason', }, pauseLimit=true, load=function() diff --git a/parts/modes/infinite.lua b/parts/modes/infinite.lua index 8444076d..66211df2 100644 --- a/parts/modes/infinite.lua +++ b/parts/modes/infinite.lua @@ -3,7 +3,7 @@ return{ env={ drop=1e99,lock=1e99, infHold=true, - bg="blockfall",bgm="infinite", + bg='blockfall',bgm='infinite', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua index 896f46d7..28126133 100644 --- a/parts/modes/infinite_dig.lua +++ b/parts/modes/infinite_dig.lua @@ -3,9 +3,9 @@ local function check_rise(P) if #P.clearedRow==0 then if L>0 then if L<3 then - P:showTextF(text.almost,0,-120,80,"beat",.8) + P:showTextF(text.almost,0,-120,80,'beat',.8) elseif L<5 then - P:showTextF(text.great,0,-120,80,"fly",.8) + P:showTextF(text.great,0,-120,80,'fly',.8) end end for _=1,8-L do @@ -13,8 +13,8 @@ local function check_rise(P) end else if L==0 then - P:showTextF(text.awesome,0,-120,80,"beat",.6) - SFX.play("clear") + P:showTextF(text.awesome,0,-120,80,'beat',.6) + SFX.play('clear') BG.send(26) for _=1,8 do P:garbageRise(13,1,generateLine(P:RND(10))) @@ -32,7 +32,7 @@ return{ infHold=true, dropPiece=check_rise, pushSpeed=1.2, - bg="wing",bgm="dream", + bg='wing',bgm='dream', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/marathon_bfmax.lua b/parts/modes/marathon_bfmax.lua index 657a18c3..a875ffd0 100644 --- a/parts/modes/marathon_bfmax.lua +++ b/parts/modes/marathon_bfmax.lua @@ -9,26 +9,26 @@ return{ task=function(P)P.modeData.target=10 end, dropPiece=function(P) if P.combo>1 or P.b2b>0 or P.lastPiece.row>1 then - if P.combo>1 then P:showText("2x",0,-220,40,"flicker",.3)end - if P.b2b>0 then P:showText("spin",0,-160,40,"flicker",.3)end - if P.lastPiece.row>1 then P:showText("1+",0,-100,40,"flicker",.3)end + if P.combo>1 then P:showText("2x",0,-220,40,'flicker',.3)end + if P.b2b>0 then P:showText("spin",0,-160,40,'flicker',.3)end + if P.lastPiece.row>1 then P:showText("1+",0,-100,40,'flicker',.3)end P:lose() return end local T=P.modeData.target if P.stat.row>=T then if T==200 then - P:win("finish") + P:win('finish') else T=T+10 P.gameEnv.drop=dropSpeed[T/10] P.modeData.target=T - SFX.play("reach") + SFX.play('reach') end end end, mindas=7,minarr=1,minsdarr=1, - bg="bg2",bgm="sugar fairy", + bg='bg2',bgm='sugar fairy', }, pauseLimit=true, slowMark=true, @@ -39,7 +39,7 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, getRank=function(P) local L=P.stat.row diff --git a/parts/modes/marathon_h.lua b/parts/modes/marathon_h.lua index 41b1105c..e6259df9 100644 --- a/parts/modes/marathon_h.lua +++ b/parts/modes/marathon_h.lua @@ -12,17 +12,17 @@ return{ if P.modeData.target==50 then P.gameEnv.drop=.25 P.modeData.target=100 - SFX.play("reach") + SFX.play('reach') elseif P.modeData.target==100 then P:set20G(true) P.modeData.target=200 - SFX.play("reach") + SFX.play('reach') else - P:win("finish") + P:win('finish') end end end, - bg="cubes",bgm="push", + bg='cubes',bgm='push', }, pauseLimit=true, slowMark=true, @@ -33,7 +33,7 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/marathon_n.lua b/parts/modes/marathon_n.lua index 87ca816d..282226e8 100644 --- a/parts/modes/marathon_n.lua +++ b/parts/modes/marathon_n.lua @@ -10,16 +10,16 @@ return{ dropPiece=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==200 then - P:win("finish") + P:win('finish') else P.gameEnv.drop=dropSpeed[P.modeData.target/10] P.modeData.target=P.modeData.target+10 - SFX.play("reach") + SFX.play('reach') end end end, mindas=7,minarr=1,minsdarr=1, - bg="bg2",bgm="push", + bg='bg2',bgm='push', }, pauseLimit=true, slowMark=true, @@ -30,7 +30,7 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/master_advance.lua b/parts/modes/master_advance.lua index 932cc960..9e8957b5 100644 --- a/parts/modes/master_advance.lua +++ b/parts/modes/master_advance.lua @@ -14,11 +14,11 @@ local function score(P) D.pt=D.pt+s if D.pt%100==99 then - SFX.play("blip_1") + SFX.play('blip_1') elseif D.pt>=D.target then--Level up! s=D.target/100 local E=P.gameEnv - BG.set(s==1 and"rainbow"or s==2 and"rainbow2"or s==3 and"lightning"or s==4 and"lightning2"or"lightning") + BG.set(s==1 and'rainbow'or s==2 and'rainbow2'or s==3 and'lightning'or s==4 and'lightning2'or'lightning') E.lock=death_lock[s] E.wait=death_wait[s] E.fall=death_fall[s] @@ -29,12 +29,12 @@ local function score(P) if s==5 then D.pt=500 - P:win("finish") + P:win('finish') else D.target=D.target+100 - P:showTextF(text.stage:gsub("$1",s),0,-120,80,"fly") + P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') end - SFX.play("reach") + SFX.play('reach') end end @@ -53,7 +53,7 @@ return{ P.modeData.target=100 end, freshLimit=15, - bg="bg2",bgm="secret7th", + bg='bg2',bgm='secret7th', }, slowMark=true, load=function() @@ -63,7 +63,7 @@ return{ setFont(45) mStr(P.modeData.pt,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_beginner.lua b/parts/modes/master_beginner.lua index 5086399b..259b387b 100644 --- a/parts/modes/master_beginner.lua +++ b/parts/modes/master_beginner.lua @@ -14,11 +14,11 @@ local function score(P) D.pt=D.pt+s if D.pt%100==99 then - SFX.play("blip_1") + SFX.play('blip_1') elseif D.pt>=D.target then--Level up! s=D.target/100 local E=P.gameEnv - BG.set(s==1 and"bg1"or s==2 and"bg2"or s==3 and"rainbow"or "rainbow2") + BG.set(s==1 and'bg1'or s==2 and'bg2'or s==3 and'rainbow'or 'rainbow2') E.lock=rush_lock[s] E.wait=rush_wait[s] E.fall=rush_fall[s] @@ -31,12 +31,12 @@ local function score(P) if s==5 then D.pt=500 - P:win("finish") + P:win('finish') else D.target=D.target+100 - P:showTextF(text.stage:gsub("$1",s),0,-120,80,"fly") + P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') end - SFX.play("reach") + SFX.play('reach') end end @@ -55,7 +55,7 @@ return{ P.modeData.target=100 end, freshLimit=15, - bg="bg1",bgm="secret8th", + bg='bg1',bgm='secret8th', }, slowMark=true, load=function() @@ -65,7 +65,7 @@ return{ setFont(45) mStr(P.modeData.pt,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_extra.lua b/parts/modes/master_extra.lua index 884d3967..0165b35f 100644 --- a/parts/modes/master_extra.lua +++ b/parts/modes/master_extra.lua @@ -19,7 +19,7 @@ return{ drop=0,lock=15, wait=15,fall=6, nextCount=3, - visible="fast", + visible='fast', freshLimit=15, dropPiece=score, task=function(P) @@ -30,12 +30,12 @@ return{ if P.stat.frame>=3600 then P.modeData.rankScore=math.min(P.modeData.rankScore+16,140) P.modeData.rankName=sectionName[math.floor(P.modeData.rankScore*.1)+1] - P:win("finish") + P:win('finish') return end end end, - bg="blockspace",bgm="far", + bg='blockspace',bgm='far', }, slowMark=true, load=function() diff --git a/parts/modes/master_final.lua b/parts/modes/master_final.lua index 0c7f8ca2..48e4c71d 100644 --- a/parts/modes/master_final.lua +++ b/parts/modes/master_final.lua @@ -11,19 +11,19 @@ local function score(P) D.pt=D.pt+s if D.pt%100==99 then - SFX.play("blip_1") + SFX.play('blip_1') elseif D.pt>=D.target then--Level up! s=D.target/100 local E=P.gameEnv if s<4 then - P:showTextF(text.stage:gsub("$1",s),0,-120,80,"fly") + P:showTextF(text.stage:gsub("$1",s),0,-120,80,'fly') --First 300 if s~=1 then E.lock=E.lock-1 end if s~=2 then E.wait=E.wait-1 end if s~=3 then E.fall=E.fall-1 end D.target=D.target+100 elseif s<10 then - P:showTextF(text.stage:gsub("$1",s),0,-120,60,"fly",1.26) + P:showTextF(text.stage:gsub("$1",s),0,-120,60,'fly',1.26) if s==4 or s==7 then E.das=E.das-1 end s=s%3 if s==0 then E.lock=E.lock-1 @@ -33,9 +33,9 @@ local function score(P) D.target=D.target+100 else D.pt=1000 - P:win("finish") + P:win('finish') end - SFX.play("reach") + SFX.play('reach') end end @@ -53,7 +53,7 @@ return{ end, freshLimit=15, easyFresh=false,bone=true, - bg="lightning",bgm="distortion", + bg='lightning',bgm='distortion', }, slowMark=true, load=function() @@ -63,7 +63,7 @@ return{ setFont(45) mStr(P.modeData.pt,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, score=function(P)return{P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, diff --git a/parts/modes/master_phantasm.lua b/parts/modes/master_phantasm.lua index cc45ca01..d427a4f3 100644 --- a/parts/modes/master_phantasm.lua +++ b/parts/modes/master_phantasm.lua @@ -8,7 +8,7 @@ return{ drop=0,lock=15, wait=10,fall=10, nextCount=2, - sequence="his4", + sequence='his4', task=function(P)P.modeData.target=12 end, dropPiece=function(P) local p=P.modeData.pt+P.lastPiece.row @@ -29,7 +29,7 @@ return{ P:setNext(4) P.modeData.target=26 - SFX.play("reach") + SFX.play('reach') elseif T==26 then--Stage 3: dig to bottom if not P.holdQueue[1]then P.life=P.life+1 end--1 up if ban hold P.waiting=45 @@ -71,7 +71,7 @@ return{ P:setNext(5) P.modeData.target=42 - SFX.play("reach") + SFX.play('reach') elseif T==42 then--Stage 4: survive in high speed if P.garbageBeneath==0 then P.waiting=30 @@ -93,7 +93,7 @@ return{ ENV.easyFresh=false P.modeData.target=126 - SFX.play("reach") + SFX.play('reach') elseif T==126 then--Stage 6: speed up P.life=P.life+1 @@ -111,7 +111,7 @@ return{ P:setInvisible(180) P.modeData.target=226 - SFX.play("reach") + SFX.play('reach') elseif T==226 then--Stage 8: final invisible P.life=P.life+1 @@ -119,7 +119,7 @@ return{ P:setInvisible(90) P.modeData.target=259 - SFX.play("reach") + SFX.play('reach') elseif T==259 then--Stage 9: ending P.life=P.life+1 for i=1,7 do ENV.skin[i]=math.random(16)end @@ -132,7 +132,7 @@ return{ P.modeData.target=260 p=260 - SFX.play("blip_2") + SFX.play('blip_2') else p=260 end @@ -142,7 +142,7 @@ return{ mission={4,4,4,64}, missionKill=true, freshLimit=12, - bg="none",bgm="super7th", + bg='none',bgm='super7th', }, slowMark=true, load=function() @@ -152,15 +152,15 @@ return{ setFont(45) mStr(P.modeData.pt,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) end, - score=function(P)return{P.result=="WIN"and 260 or P.modeData.pt,P.stat.time}end, + score=function(P)return{P.result=='win'and 260 or P.modeData.pt,P.stat.time}end, scoreDisp=function(D)return D[1].."P "..STRING.time(D[2])end, comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=226 and 4 or p>=162 and 3 or p>=62 and 2 or diff --git a/parts/modes/pc_h.lua b/parts/modes/pc_h.lua index 7cb1bf07..1e1d6d04 100644 --- a/parts/modes/pc_h.lua +++ b/parts/modes/pc_h.lua @@ -3,10 +3,10 @@ return{ env={ drop=60,lock=120, fall=10, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, freshLimit=15, ospin=false, - bg="rgb",bgm="truth", + bg='rgb',bgm='truth', }, pauseLimit=true, load=function() diff --git a/parts/modes/pc_l.lua b/parts/modes/pc_l.lua index 253bf7d6..ba5770ee 100644 --- a/parts/modes/pc_l.lua +++ b/parts/modes/pc_l.lua @@ -3,10 +3,10 @@ return{ env={ drop=20,lock=60, fall=20, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, freshLimit=15, ospin=false, - bg="rgb",bgm="truth", + bg='rgb',bgm='truth', }, pauseLimit=true, load=function() diff --git a/parts/modes/pc_n.lua b/parts/modes/pc_n.lua index 8a05c486..7c65ea7a 100644 --- a/parts/modes/pc_n.lua +++ b/parts/modes/pc_n.lua @@ -3,8 +3,8 @@ return{ env={ infHold=true, drop=150,lock=1e99, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, - bg="rgb",bgm="truth", + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, + bg='rgb',bgm='truth', }, pauseLimit=true, load=function() diff --git a/parts/modes/pctrain_l.lua b/parts/modes/pctrain_l.lua index d8bc978a..aab1def3 100644 --- a/parts/modes/pctrain_l.lua +++ b/parts/modes/pctrain_l.lua @@ -37,7 +37,7 @@ local function check(P) P.gameEnv.lock=pc_lock[s]or 25 P.gameEnv.fall=pc_fall[s]or 4 if s==10 then - P:showTextF(text.maxspeed,0,-140,100,"appear",.6) + P:showTextF(text.maxspeed,0,-140,100,'appear',.6) end end end @@ -50,12 +50,12 @@ return{ holdCount=0, drop=60,lock=60, fall=20, - sequence="none", + sequence='none', freshLimit=15, dropPiece=check, RS="SRS", ospin=false, - bg="rgb",bgm="oxygen", + bg='rgb',bgm='oxygen', }, pauseLimit=true, load=function() diff --git a/parts/modes/pctrain_n.lua b/parts/modes/pctrain_n.lua index cb328459..c72a63c3 100644 --- a/parts/modes/pctrain_n.lua +++ b/parts/modes/pctrain_n.lua @@ -42,11 +42,11 @@ return{ holdCount=0, drop=120,lock=180, fall=20, - sequence="none", + sequence='none', dropPiece=check, RS="SRS", ospin=false, - bg="rgb",bgm="oxygen", + bg='rgb',bgm='oxygen', }, pauseLimit=true, load=function() diff --git a/parts/modes/rhythm_e.lua b/parts/modes/rhythm_e.lua index 67290ecf..cbcb4af9 100644 --- a/parts/modes/rhythm_e.lua +++ b/parts/modes/rhythm_e.lua @@ -12,7 +12,7 @@ return{ dropPiece=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==200 then - P:win("finish") + P:win('finish') else P.modeData.bpm=40+2*P.modeData.target/10 P.modeData.beatFrame=math.floor(3600/P.modeData.bpm) @@ -20,7 +20,7 @@ return{ P.gameEnv.wait=math.max(P.gameEnv.wait-2,0) P.gameEnv.drop=dropSpeed[P.modeData.target/10] P.modeData.target=P.modeData.target+10 - SFX.play("reach") + SFX.play('reach') end end end, @@ -34,14 +34,14 @@ return{ P.modeData.counter=P.modeData.counter-1 if P.modeData.counter==0 then P.modeData.counter=P.modeData.beatFrame - SFX.play("click",.3) + SFX.play('click',.3) P:switchKey(6,true) P:pressKey(6) P:switchKey(6,false) end end end, - bg="bg2",bgm="push", + bg='bg2',bgm='push', }, pauseLimit=true, slowMark=true, @@ -52,18 +52,18 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) setFont(30) mStr(P.modeData.bpm,69,178) gc.setLineWidth(4) - gc.circle("line",69,200,30) + gc.circle('line',69,200,30) local beat=P.modeData.counter/P.modeData.beatFrame gc.setColor(1,1,1,1-beat) gc.setLineWidth(3) - gc.circle("line",69,200,30+45*beat) + gc.circle('line',69,200,30+45*beat) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/rhythm_h.lua b/parts/modes/rhythm_h.lua index e91a429a..acac2b4b 100644 --- a/parts/modes/rhythm_h.lua +++ b/parts/modes/rhythm_h.lua @@ -12,7 +12,7 @@ return{ dropPiece=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==200 then - P:win("finish") + P:win('finish') else P.modeData.bpm=60+3*P.modeData.target/10 P.modeData.beatFrame=math.floor(3600/P.modeData.bpm) @@ -20,7 +20,7 @@ return{ P.gameEnv.wait=math.max(P.gameEnv.wait-1,0) P.gameEnv.drop=dropSpeed[P.modeData.target/10] P.modeData.target=P.modeData.target+10 - SFX.play("reach") + SFX.play('reach') end end end, @@ -34,14 +34,14 @@ return{ P.modeData.counter=P.modeData.counter-1 if P.modeData.counter==0 then P.modeData.counter=P.modeData.beatFrame - SFX.play("click",.3) + SFX.play('click',.3) P:switchKey(6,true) P:pressKey(6) P:switchKey(6,false) end end end, - bg="bg2",bgm="secret8th", + bg='bg2',bgm='secret8th', }, pauseLimit=true, slowMark=true, @@ -52,18 +52,18 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) setFont(30) mStr(P.modeData.bpm,69,178) gc.setLineWidth(4) - gc.circle("line",69,200,30) + gc.circle('line',69,200,30) local beat=P.modeData.counter/P.modeData.beatFrame gc.setColor(1,1,1,1-beat) gc.setLineWidth(3) - gc.circle("line",69,200,30+45*beat) + gc.circle('line',69,200,30+45*beat) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/rhythm_u.lua b/parts/modes/rhythm_u.lua index 3e6f1ba0..5d1e6aa0 100644 --- a/parts/modes/rhythm_u.lua +++ b/parts/modes/rhythm_u.lua @@ -12,7 +12,7 @@ return{ dropPiece=function(P) if P.stat.row>=P.modeData.target then if P.modeData.target==200 then - P:win("finish") + P:win('finish') else P.modeData.bpm=120+2*P.modeData.target/10 P.modeData.beatFrame=math.floor(3600/P.modeData.bpm) @@ -26,7 +26,7 @@ return{ P:set20G(true) end P.modeData.target=P.modeData.target+10 - SFX.play("reach") + SFX.play('reach') end end end, @@ -40,14 +40,14 @@ return{ P.modeData.counter=P.modeData.counter-1 if P.modeData.counter==0 then P.modeData.counter=P.modeData.beatFrame - SFX.play("click",.3) + SFX.play('click',.3) P:switchKey(6,true) P:pressKey(6) P:switchKey(6,false) end end end, - bg="bg2",bgm="secret7th", + bg='bg2',bgm='secret7th', }, pauseLimit=true, slowMark=true, @@ -58,18 +58,18 @@ return{ setFont(45) mStr(P.stat.row,69,320) mStr(P.modeData.target,69,370) - gc.rectangle("fill",25,375,90,4) + gc.rectangle('fill',25,375,90,4) setFont(30) mStr(P.modeData.bpm,69,178) gc.setLineWidth(4) - gc.circle("line",69,200,30) + gc.circle('line',69,200,30) local beat=P.modeData.counter/P.modeData.beatFrame gc.setColor(1,1,1,1-beat) gc.setLineWidth(3) - gc.circle("line",69,200,30+45*beat) + gc.circle('line',69,200,30+45*beat) end, score=function(P)return{math.min(P.stat.row,200),P.stat.time}end, scoreDisp=function(D)return D[1].." Lines "..STRING.time(D[2])end, diff --git a/parts/modes/round_e.lua b/parts/modes/round_e.lua index de0be71e..1dcb44f3 100644 --- a/parts/modes/round_e.lua +++ b/parts/modes/round_e.lua @@ -18,17 +18,17 @@ return{ dropPiece=update_round, pushSpeed=15, garbageSpeed=1e99, - bg="rainbow",bgm="push", + bg='rainbow',bgm='push', }, load=function() PLY.newPlayer(1) - PLY.newAIPlayer(2,AIBUILDER("CC",7,1,true,10000)) + PLY.newAIPlayer(2,AIBUILDER('CC',7,1,true,10000)) end, score=function(P)return{P.stat.piece,P.stat.time}end, scoreDisp=function(D)return D[1].." Pieces "..STRING.time(D[2])end, comp=function(a,b)return a[1]=40 then P:win("finish")end end, bg="aura",bgm="waterfall", + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, + bg='aura',bgm='waterfall', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprintLock.lua b/parts/modes/sprintLock.lua index 731cf639..b41e6046 100644 --- a/parts/modes/sprintLock.lua +++ b/parts/modes/sprintLock.lua @@ -3,8 +3,8 @@ return{ env={ drop=60,lock=180, keyCancel={3,4,5}, - dropPiece=function(P)if P.stat.row>=40 then P:win("finish")end end, - bg="aura",bgm="waterfall", + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, + bg='aura',bgm='waterfall', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua index 728e00b9..1ac9b8e3 100644 --- a/parts/modes/sprintMPH.lua +++ b/parts/modes/sprintMPH.lua @@ -3,9 +3,9 @@ return{ env={ drop=60,lock=60, nextCount=0,holdCount=0, - sequence="rnd", - dropPiece=function(P)if P.stat.row>=40 then P:win("finish")end end, - bg="aura",bgm="waterfall", + sequence='rnd', + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, + bg='aura',bgm='waterfall', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua index 77458e0e..5468b8e9 100644 --- a/parts/modes/sprintPenta.lua +++ b/parts/modes/sprintPenta.lua @@ -2,9 +2,9 @@ return{ color=COLOR.green, env={ drop=60,lock=60, - sequence="bag",seqData={8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, - dropPiece=function(P)if P.stat.row>=40 then P:win("finish")end end, - bg="aura",bgm="waterfall", + sequence='bag',seqData={8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, + bg='aura',bgm='waterfall', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprint_1000l.lua b/parts/modes/sprint_1000l.lua index 2d5dbce3..7a2a59a5 100644 --- a/parts/modes/sprint_1000l.lua +++ b/parts/modes/sprint_1000l.lua @@ -2,7 +2,8 @@ return{ color=COLOR.lH, env={ drop=60,lock=60, - dropPiece=function(P)if P.stat.row>=1000 then P:win("finish")end end, bg="rainbow",bgm="push", + dropPiece=function(P)if P.stat.row>=1000 then P:win('finish')end end, + bg='rainbow',bgm='push', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprint_100l.lua b/parts/modes/sprint_100l.lua index 0ba8dcfd..eb5e8682 100644 --- a/parts/modes/sprint_100l.lua +++ b/parts/modes/sprint_100l.lua @@ -2,7 +2,8 @@ return{ color=COLOR.red, env={ drop=60,lock=60, - dropPiece=function(P)if P.stat.row>=100 then P:win("finish")end end, bg="bg2",bgm="race", + dropPiece=function(P)if P.stat.row>=100 then P:win('finish')end end, + bg='bg2',bgm='race', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprint_10l.lua b/parts/modes/sprint_10l.lua index cfc1844e..65f35d7c 100644 --- a/parts/modes/sprint_10l.lua +++ b/parts/modes/sprint_10l.lua @@ -2,8 +2,8 @@ return{ color=COLOR.cyan, env={ drop=60,lock=60, - dropPiece=function(P)if P.stat.row>=10 then P:win("finish")end end, - bg="bg2",bgm="race", + dropPiece=function(P)if P.stat.row>=10 then P:win('finish')end end, + bg='bg2',bgm='race', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprint_20l.lua b/parts/modes/sprint_20l.lua index 1f9e99fa..fe94a023 100644 --- a/parts/modes/sprint_20l.lua +++ b/parts/modes/sprint_20l.lua @@ -2,8 +2,8 @@ return{ color=COLOR.lBlue, env={ drop=60,lock=60, - dropPiece=function(P)if P.stat.row>=20 then P:win("finish")end end, - bg="bg2",bgm="race", + dropPiece=function(P)if P.stat.row>=20 then P:win('finish')end end, + bg='bg2',bgm='race', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprint_400l.lua b/parts/modes/sprint_400l.lua index 57cbf54e..d67bb17b 100644 --- a/parts/modes/sprint_400l.lua +++ b/parts/modes/sprint_400l.lua @@ -2,7 +2,8 @@ return{ color=COLOR.dRed, env={ drop=60,lock=60, - dropPiece=function(P)if P.stat.row>=400 then P:win("finish")end end, bg="rainbow",bgm="push", + dropPiece=function(P)if P.stat.row>=400 then P:win('finish')end end, + bg='rainbow',bgm='push', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/sprint_40l.lua b/parts/modes/sprint_40l.lua index e90424f0..b9c4f646 100644 --- a/parts/modes/sprint_40l.lua +++ b/parts/modes/sprint_40l.lua @@ -2,8 +2,8 @@ return{ color=COLOR.green, env={ drop=60,lock=60, - dropPiece=function(P)if P.stat.row>=40 then P:win("finish")end end, - bg="bg2",bgm="race", + dropPiece=function(P)if P.stat.row>=40 then P:win('finish')end end, + bg='bg2',bgm='race', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/survivor_e.lua b/parts/modes/survivor_e.lua index e6da71b4..8535a898 100644 --- a/parts/modes/survivor_e.lua +++ b/parts/modes/survivor_e.lua @@ -13,14 +13,14 @@ return{ P.atkBuffer[#P.atkBuffer+1]={line=generateLine(P:RND(10)),amount=1,countdown=30,cd0=30,time=0,sent=false,lv=1} P.atkBuffer.sum=P.atkBuffer.sum+1 P.stat.recv=P.stat.recv+1 - if D.wave==45 then P:showTextF(text.maxspeed,0,-140,100,"appear",.6)end + if D.wave==45 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end end end end, - bg="glow",bgm="new era", + bg='glow',bgm='new era', }, pauseLimit=true, load=function() diff --git a/parts/modes/survivor_h.lua b/parts/modes/survivor_h.lua index 35e4c122..a643c8cf 100644 --- a/parts/modes/survivor_h.lua +++ b/parts/modes/survivor_h.lua @@ -19,14 +19,14 @@ return{ local R=(D.wave%3<2 and 1 or 3) B.sum=B.sum+R P.stat.recv=P.stat.recv+R - if D.wave==60 then P:showTextF(text.maxspeed,0,-140,100,"appear",.6)end + if D.wave==60 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end end end end, - bg="glow",bgm="secret7th", + bg='glow',bgm='secret7th', }, pauseLimit=true, load=function() diff --git a/parts/modes/survivor_l.lua b/parts/modes/survivor_l.lua index 4b1ca08f..d701f866 100644 --- a/parts/modes/survivor_l.lua +++ b/parts/modes/survivor_l.lua @@ -14,14 +14,14 @@ return{ P.atkBuffer[#P.atkBuffer+1]={line=generateLine(P:RND(10)),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3} P.atkBuffer.sum=P.atkBuffer.sum+4 P.stat.recv=P.stat.recv+4 - if D.wave==60 then P:showTextF(text.maxspeed,0,-140,100,"appear",.6)end + if D.wave==60 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end end end end, - bg="glow",bgm="storm", + bg='glow',bgm='storm', }, pauseLimit=true, load=function() diff --git a/parts/modes/survivor_n.lua b/parts/modes/survivor_n.lua index 14a56a30..779de64c 100644 --- a/parts/modes/survivor_n.lua +++ b/parts/modes/survivor_n.lua @@ -18,14 +18,14 @@ return{ d%4==3 and{line=generateLine(P:RND(10)),amount=4,countdown=90,cd0=90,time=0,sent=false,lv=3} P.atkBuffer.sum=P.atkBuffer.sum+d%4+1 P.stat.recv=P.stat.recv+d%4+1 - if D.wave==45 then P:showTextF(text.maxspeed,0,-140,100,"appear",.6)end + if D.wave==45 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=d end end end end, - bg="glow",bgm="secret8th", + bg='glow',bgm='secret8th', }, pauseLimit=true, load=function() diff --git a/parts/modes/survivor_u.lua b/parts/modes/survivor_u.lua index 05541df9..1efb7b97 100644 --- a/parts/modes/survivor_u.lua +++ b/parts/modes/survivor_u.lua @@ -20,14 +20,14 @@ return{ P.atkBuffer[p+3]={line=generateLine(P:RND(10)),amount=6,countdown=1.5*t,cd0=1.5*t,time=0,sent=false,lv=5} P.atkBuffer.sum=P.atkBuffer.sum+20 P.stat.recv=P.stat.recv+20 - if D.wave==31 then P:showTextF(text.maxspeed,0,-140,100,"appear",.6)end + if D.wave==31 then P:showTextF(text.maxspeed,0,-140,100,'appear',.6)end D.timer=0 D.wave=D.wave+1 end end end end, - bg="welcome",bgm="storm", + bg='welcome',bgm='storm', }, pauseLimit=true, load=function() diff --git a/parts/modes/tech_finesse.lua b/parts/modes/tech_finesse.lua index 681942a7..f0885af8 100644 --- a/parts/modes/tech_finesse.lua +++ b/parts/modes/tech_finesse.lua @@ -4,9 +4,9 @@ return{ arr=0, drop=1e99,lock=60, freshLimit=15, - dropPiece=function(P)if P.stat.atk>=100 then P:win("finish")end end, + dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, fineKill=true, - bg="flink",bgm="infinite", + bg='flink',bgm='infinite', }, slowMark=true, load=function() diff --git a/parts/modes/tech_finesse_f.lua b/parts/modes/tech_finesse_f.lua index 0221c295..46313dc5 100644 --- a/parts/modes/tech_finesse_f.lua +++ b/parts/modes/tech_finesse_f.lua @@ -7,7 +7,7 @@ local function tech_check_hard(P) end end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end @@ -19,7 +19,7 @@ return{ freshLimit=15, fineKill=true, dropPiece=tech_check_hard, - bg="flink",bgm="infinite", + bg='flink',bgm='infinite', }, slowMark=true, load=function() diff --git a/parts/modes/tech_h.lua b/parts/modes/tech_h.lua index 6c00a729..919f53a0 100644 --- a/parts/modes/tech_h.lua +++ b/parts/modes/tech_h.lua @@ -4,8 +4,8 @@ return{ drop=20,lock=60, freshLimit=15, b2bKill=true, - dropPiece=function(P)if P.stat.atk>=100 then P:win("finish")end end, - bg="matrix",bgm="down", + dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, + bg='matrix',bgm='down', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/tech_h_plus.lua b/parts/modes/tech_h_plus.lua index 9f69ebd5..6a15fdd0 100644 --- a/parts/modes/tech_h_plus.lua +++ b/parts/modes/tech_h_plus.lua @@ -7,7 +7,7 @@ local function tech_check_hard(P) end end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end @@ -17,7 +17,7 @@ return{ drop=30,lock=60, freshLimit=15, dropPiece=tech_check_hard, - bg="matrix",bgm="down", + bg='matrix',bgm='down', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/tech_l.lua b/parts/modes/tech_l.lua index e2c6c37b..9ebeb62c 100644 --- a/parts/modes/tech_l.lua +++ b/parts/modes/tech_l.lua @@ -4,8 +4,8 @@ return{ drop=0,lock=60, freshLimit=15, b2bKill=true, - dropPiece=function(P)if P.stat.atk>=100 then P:win("finish")end end, - bg="matrix",bgm="warped", + dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, + bg='matrix',bgm='warped', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/tech_l_plus.lua b/parts/modes/tech_l_plus.lua index 72326b53..08d730e3 100644 --- a/parts/modes/tech_l_plus.lua +++ b/parts/modes/tech_l_plus.lua @@ -7,7 +7,7 @@ local function tech_check_hard(P) end end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end @@ -17,7 +17,7 @@ return{ drop=0,lock=60, freshLimit=15, dropPiece=tech_check_hard, - bg="matrix",bgm="warped", + bg='matrix',bgm='warped', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/tech_n.lua b/parts/modes/tech_n.lua index cc442a4a..73a8c033 100644 --- a/parts/modes/tech_n.lua +++ b/parts/modes/tech_n.lua @@ -4,8 +4,8 @@ return{ infHold=true, drop=1e99,lock=1e99, b2bKill=true, - dropPiece=function(P)if P.stat.atk>=100 then P:win("finish")end end, - bg="matrix",bgm="new era", + dropPiece=function(P)if P.stat.atk>=100 then P:win('finish')end end, + bg='matrix',bgm='new era', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/tech_n_plus.lua b/parts/modes/tech_n_plus.lua index 4fbd497d..d72d01fd 100644 --- a/parts/modes/tech_n_plus.lua +++ b/parts/modes/tech_n_plus.lua @@ -7,7 +7,7 @@ local function tech_check_hard(P) end end if P.stat.atk>=100 then - P:win("finish") + P:win('finish') end end @@ -17,7 +17,7 @@ return{ infHold=true, drop=1e99,lock=1e99, dropPiece=tech_check_hard, - bg="matrix",bgm="new era", + bg='matrix',bgm='new era', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/techmino49_e.lua b/parts/modes/techmino49_e.lua index 291cd1ba..b71df99d 100644 --- a/parts/modes/techmino49_e.lua +++ b/parts/modes/techmino49_e.lua @@ -25,7 +25,7 @@ return{ garbageSpeed=.3, pushSpeed=2, freshLimit=15, - bg="rainbow",bgm="sugar fairy", + bg='rainbow',bgm='sugar fairy', }, load=function() ROYALEDATA.powerUp={2,5,10,20} @@ -40,17 +40,17 @@ return{ local n=2 for _=1,4 do for _=1,6 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,6)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,6)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(2,4),2,true,20000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(2,4),2,true,20000),true) end n=n+1 end end for _=9,12 do for _=1,6 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,5)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,5)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,5),2,true,20000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(3,5),2,true,20000),true) end n=n+1 end end diff --git a/parts/modes/techmino49_h.lua b/parts/modes/techmino49_h.lua index 15b79b49..bfff4560 100644 --- a/parts/modes/techmino49_h.lua +++ b/parts/modes/techmino49_h.lua @@ -25,7 +25,7 @@ return{ garbageSpeed=.3, pushSpeed=2, freshLimit=15, - bg="rainbow",bgm="rockblock", + bg='rainbow',bgm='rockblock', }, load=function() ROYALEDATA.powerUp={2,5,10,20} @@ -40,17 +40,17 @@ return{ local n=2 for _=1,4 do for _=1,6 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,8)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,8)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,6),3,true,30000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(3,6),3,true,30000),true) end n=n+1 end end for _=9,12 do for _=1,6 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,7)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,7)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,6),3,true,30000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(4,6),3,true,30000),true) end n=n+1 end end diff --git a/parts/modes/techmino49_u.lua b/parts/modes/techmino49_u.lua index 1c0cdd9e..51463f8a 100644 --- a/parts/modes/techmino49_u.lua +++ b/parts/modes/techmino49_u.lua @@ -25,7 +25,7 @@ return{ garbageSpeed=.3, pushSpeed=2, freshLimit=15, - bg="rainbow",bgm="magicblock", + bg='rainbow',bgm='magicblock', }, load=function() ROYALEDATA.powerUp={2,5,10,20} @@ -40,17 +40,17 @@ return{ local n=2 for _=1,4 do for _=1,6 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,10)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(8,10)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,7),3,true,40000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(4,7),3,true,40000),true) end n=n+1 end end for _=9,12 do for _=1,6 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,9)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(8,9)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(5,8),3,true,40000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(5,8),3,true,40000),true) end n=n+1 end end diff --git a/parts/modes/techmino99_e.lua b/parts/modes/techmino99_e.lua index 984bed37..55091c89 100644 --- a/parts/modes/techmino99_e.lua +++ b/parts/modes/techmino99_e.lua @@ -25,7 +25,7 @@ return{ garbageSpeed=.3, pushSpeed=2, freshLimit=15, - bg="rainbow",bgm="sugar fairy", + bg='rainbow',bgm='sugar fairy', }, load=function() ROYALEDATA.powerUp={2,6,14,30} @@ -40,17 +40,17 @@ return{ local n=2 for _=1,7 do for _=1,7 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,6)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,6)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(2,4),2,true,20000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(2,4),2,true,20000),true) end n=n+1 end end for _=15,21 do for _=1,7 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,5)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,5)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,5),2,true,20000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(3,5),2,true,20000),true) end n=n+1 end end diff --git a/parts/modes/techmino99_h.lua b/parts/modes/techmino99_h.lua index 7edf5f6b..68aa7d8c 100644 --- a/parts/modes/techmino99_h.lua +++ b/parts/modes/techmino99_h.lua @@ -25,7 +25,7 @@ return{ garbageSpeed=.3, pushSpeed=2, freshLimit=15, - bg="rainbow",bgm="rockblock", + bg='rainbow',bgm='rockblock', }, load=function() ROYALEDATA.powerUp={2,6,14,30} @@ -40,17 +40,17 @@ return{ local n=2 for _=1,7 do for _=1,7 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,8)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,8)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(3,6),3,true,30000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(3,6),3,true,30000),true) end n=n+1 end end for _=15,21 do for _=1,7 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(4,7)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(4,7)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,6),3,true,30000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(4,6),3,true,30000),true) end n=n+1 end end diff --git a/parts/modes/techmino99_u.lua b/parts/modes/techmino99_u.lua index 2e7a2f95..a0894058 100644 --- a/parts/modes/techmino99_u.lua +++ b/parts/modes/techmino99_u.lua @@ -25,7 +25,7 @@ return{ garbageSpeed=.3, pushSpeed=2, freshLimit=15, - bg="rainbow",bgm="magicblock", + bg='rainbow',bgm='magicblock', }, load=function() ROYALEDATA.powerUp={2,6,14,30} @@ -40,17 +40,17 @@ return{ local n=2 for _=1,7 do for _=1,7 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,10)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(8,10)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(4,7),3,true,40000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(4,7),3,true,40000),true) end n=n+1 end end for _=15,21 do for _=1,7 do if L[n]then - PLY.newAIPlayer(n,AIBUILDER("9S",rnd(8,9)),true) + PLY.newAIPlayer(n,AIBUILDER('9S',rnd(8,9)),true) else - PLY.newAIPlayer(n,AIBUILDER("CC",rnd(5,8),3,true,40000),true) + PLY.newAIPlayer(n,AIBUILDER('CC',rnd(5,8),3,true,40000),true) end n=n+1 end end diff --git a/parts/modes/tsd_e.lua b/parts/modes/tsd_e.lua index e2584f36..fd024fb2 100644 --- a/parts/modes/tsd_e.lua +++ b/parts/modes/tsd_e.lua @@ -16,7 +16,7 @@ return{ infHold=true, dropPiece=check_tsd, ospin=false, - bg="matrix",bgm="vapor", + bg='matrix',bgm='vapor', }, load=function() PLY.newPlayer(1) diff --git a/parts/modes/tsd_h.lua b/parts/modes/tsd_h.lua index 4131b279..1d67970d 100644 --- a/parts/modes/tsd_h.lua +++ b/parts/modes/tsd_h.lua @@ -16,7 +16,7 @@ return{ freshLimit=15, dropPiece=check_tsd, ospin=false, - bg="matrix",bgm="vapor", + bg='matrix',bgm='vapor', }, pauseLimit=true, load=function() diff --git a/parts/modes/tsd_u.lua b/parts/modes/tsd_u.lua index c40556d4..debeba4b 100644 --- a/parts/modes/tsd_u.lua +++ b/parts/modes/tsd_u.lua @@ -16,7 +16,7 @@ return{ freshLimit=15, dropPiece=check_tsd, ospin=false, - bg="matrix",bgm="vapor", + bg='matrix',bgm='vapor', }, pauseLimit=true, load=function() diff --git a/parts/modes/ultra.lua b/parts/modes/ultra.lua index 9fd488e1..843054ba 100644 --- a/parts/modes/ultra.lua +++ b/parts/modes/ultra.lua @@ -14,16 +14,16 @@ return{ if P.stat.time>=warnTime[P.modeData.stage]then if P.modeData.stage<9 then P.modeData.stage=P.modeData.stage+1 - SFX.play("ready",.7+P.modeData.stage*.03) + SFX.play('ready',.7+P.modeData.stage*.03) else - SFX.play("start") - P:win("finish") + SFX.play('start') + P:win('finish') return end end end end, - bg="fan",bgm="warped", + bg='fan',bgm='warped', }, slowMark=true, pauseLimit=true, @@ -32,10 +32,10 @@ return{ end, mesDisp=function(P) gc.setLineWidth(2) - gc.rectangle("line",55,120,32,402) + gc.rectangle('line',55,120,32,402) local T=P.stat.time/120 gc.setColor(2*T,2-2*T,.2) - gc.rectangle("fill",56,521,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 f1f53026..9f619718 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -3,8 +3,8 @@ return{ env={ drop=120,lock=120, infHold=true, - dropPiece=function(P)if P.stat.row>=200 then P:win("finish")end end, - bg="bg2",bgm="venus", + dropPiece=function(P)if P.stat.row>=200 then P:win('finish')end end, + bg='bg2',bgm='venus', }, load=function() PLY.newPlayer(1) diff --git a/parts/net.lua b/parts/net.lua index 4df33464..58bfbce1 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -58,7 +58,7 @@ local function _parse(res) )or "[NO Message]" ), - "warn") + 'warn') end end end @@ -67,44 +67,44 @@ end local function wsCloseMessage(message) local mes=JSON.decode(message) if mes then - LOG.print(("%s [%s] %s"):format(text.wsClose,mes.type or"unknown type",mes.reason or""),"warn") + LOG.print(("%s [%s] %s"):format(text.wsClose,mes.type or"unknown type",mes.reason or""),'warn') else - LOG.print(text.wsClose.."","warn") + LOG.print(text.wsClose.."",'warn') end end --Connect function NET.wsconn_app() - WS.connect("app","/app") + WS.connect('app','/app') end function NET.wsconn_user_pswd(email,password) - if NET.lock("wsc_user",5)then - WS.connect("user","/user",JSON.encode{ + if NET.lock('wsc_user',5)then + WS.connect('user','/user',JSON.encode{ email=email, password=password, }) end end function NET.wsconn_user_token(uid,authToken) - if NET.lock("wsc_user",5)then - WS.connect("user","/user",JSON.encode{ + if NET.lock('wsc_user',5)then + WS.connect('user','/user',JSON.encode{ uid=uid, authToken=authToken, }) end end function NET.wsconn_play() - if NET.lock("wsc_play",5)then - WS.connect("play","/play",JSON.encode{ + if NET.lock('wsc_play',5)then + WS.connect('play','/play',JSON.encode{ uid=USER.uid, accessToken=NET.accessToken, }) end end function NET.wsconn_stream() - if NET.lock("wsc_stream",5)then + if NET.lock('wsc_stream',5)then NET.serverGaming=true - WS.connect("stream","/stream",JSON.encode{ + WS.connect('stream','/stream',JSON.encode{ uid=USER.uid, accessToken=NET.accessToken, rid=NET.rsid, @@ -114,18 +114,18 @@ function NET.wsconn_stream() end --Disconnect -function NET.wsclose_app()WS.close("app")end -function NET.wsclose_user()WS.close("user")end -function NET.wsclose_play()WS.close("play")end +function NET.wsclose_app()WS.close('app')end +function NET.wsclose_user()WS.close('user')end +function NET.wsclose_play()WS.close('play')end function NET.wsclose_stream() NET.serverGaming=false - WS.close("stream") + WS.close('stream') end --Account & User function NET.register(username,email,password) - if NET.lock("register")then - WS.send("app",JSON.encode{ + if NET.lock('register')then + WS.send('app',JSON.encode{ action=2, data={ username=username, @@ -136,16 +136,16 @@ function NET.register(username,email,password) end end function NET.pong(wsName,message) - WS.send(wsName,type(message)=="string"and message or"","pong") + WS.send(wsName,type(message)=='string'and message or"",'pong') end function NET.getAccessToken() - if NET.lock("access_and_login",10)then - WS.send("user",JSON.encode{action=0}) + if NET.lock('access_and_login',10)then + WS.send('user',JSON.encode{action=0}) end end function NET.getUserInfo(uid) local hash=(not SETTING.dataSaving or nil)and USERS.getHash(uid) - WS.send("user",JSON.encode{ + WS.send('user',JSON.encode{ action=1, data={ uid=uid, @@ -156,8 +156,8 @@ end --Room function NET.fetchRoom() - if NET.lock("fetchRoom",3)then - WS.send("play",JSON.encode{ + if NET.lock('fetchRoom',3)then + WS.send('play',JSON.encode{ action=0, data={ type=nil, @@ -168,8 +168,8 @@ function NET.fetchRoom() end end function NET.createRoom(roomType,name) - if NET.lock("enterRoom",1.26)then - WS.send("play",JSON.encode{ + if NET.lock('enterRoom',1.26)then + WS.send('play',JSON.encode{ action=1, data={ type=roomType, @@ -181,10 +181,10 @@ function NET.createRoom(roomType,name) end end function NET.enterRoom(roomID,password) - if NET.lock("enterRoom",1.26)then - SFX.play("reach",.6) + if NET.lock('enterRoom',1.26)then + SFX.play('reach',.6) NET.rid=roomID - WS.send("play",JSON.encode{ + WS.send('play',JSON.encode{ action=2, data={ rid=roomID, @@ -197,56 +197,56 @@ end --Play function NET.checkPlayDisconn() - return WS.status("play")~="running" + return WS.status('play')~='running' end function NET.signal_quit() - if NET.lock("quit",3)then - WS.send("play",'{"action":3}') + if NET.lock('quit',3)then + WS.send('play','{"action":3}') end end function NET.sendMessage(mes) - WS.send("play",'{"action":4,"data":{"message":'..mes..'}}') + WS.send('play','{"action":4,"data":{"message":'..mes..'}}') end function NET.changeConfig() - WS.send("play",'{"action":5,"data":'..JSON.encode({config=dumpBasicConfig()})..'}') + WS.send('play','{"action":5,"data":'..JSON.encode({config=dumpBasicConfig()})..'}') end function NET.signal_ready(ready) - if NET.lock("ready",3)and not NET.serverGaming then - WS.send("play",'{"action":6,"data":{"ready":'..tostring(ready)..'}}') + if NET.lock('ready',3)and not NET.serverGaming then + WS.send('play','{"action":6,"data":{"ready":'..tostring(ready)..'}}') end end function NET.signal_die() - WS.send("stream",'{"action":4,"data":{"score":0,"survivalTime":0}}') + WS.send('stream','{"action":4,"data":{"score":0,"survivalTime":0}}') end function NET.uploadRecStream(stream) - WS.send("stream",'{"action":5,"data":{"stream":"'..data.encode("string","base64",stream)..'"}}') + WS.send('stream','{"action":5,"data":{"stream":"'..data.encode('string','base64',stream)..'"}}') end --Chat function NET.sendChatMes(mes) - WS.send("chat","T"..data.encode("string","base64",mes)) + WS.send('chat',"T"..data.encode('string','base64',mes)) end function NET.quitChat() - WS.send("chat","Q") + WS.send('chat','q') end --WS tick funcs function NET.updateWS_app() while true do YIELD() - if WS.status("app")=="running"then - local message,op=WS.read("app") + if WS.status('app')=='running'then + local message,op=WS.read('app') if message then - if op=="ping"then - NET.pong("app",message) - elseif op=="pong"then - elseif op=="close"then + if op=='ping'then + NET.pong('app',message) + elseif op=='pong'then + elseif op=='close'then wsCloseMessage(message) return else local res=_parse(message) if res then - if res.type=="Connect"then + if res.type=='Connect'then NET.connected=true if VERSION.code>=res.lowest then NET.allow_online=true @@ -263,18 +263,18 @@ function NET.updateWS_app() elseif res.action==1 then--Get notice --? elseif res.action==2 then--Register - if res.type=="Self"or res.type=="Server"then + if res.type=='Self'or res.type=='Server'then LOG.print(res.data.message,300,COLOR.N) - if SCN.cur=="register"then + if SCN.cur=='register'then SCN.back() end else LOG.print(res.reason or"Registration failed",300,COLOR.N) end - NET.unlock("register") + NET.unlock('register') end else - WS.alert("app") + WS.alert('app') end end end @@ -284,30 +284,30 @@ end function NET.updateWS_user() while true do YIELD() - if WS.status("user")=="running"then - local message,op=WS.read("user") + if WS.status('user')=='running'then + local message,op=WS.read('user') if message then - if op=="ping"then - NET.pong("user",message) - elseif op=="pong"then - elseif op=="close"then + if op=='ping'then + NET.pong('user',message) + elseif op=='pong'then + elseif op=='close'then wsCloseMessage(message) return else local res=_parse(message) if res then - if res.type=="Connect"then + if res.type=='Connect'then if res.uid then USER.uid=res.uid USER.authToken=res.authToken - FILE.save(USER,"conf/user","q") - if SCN.cur=="login"then SCN.back()end + FILE.save(USER,"conf/user",'q') + if SCN.cur=='login'then SCN.back()end end LOG.print(text.loginSuccessed) --Get self infos NET.getUserInfo(USER.uid) - NET.unlock("wsc_user") + NET.unlock('wsc_user') elseif res.action==0 then--Get accessToken NET.accessToken=res.accessToken LOG.print(text.accessSuccessed) @@ -316,7 +316,7 @@ function NET.updateWS_user() USERS.updateUserData(res.data) end else - WS.alert("user") + WS.alert('user') end end end @@ -326,30 +326,30 @@ end function NET.updateWS_play() while true do YIELD() - if WS.status("play")=="running"then - local message,op=WS.read("play") + if WS.status('play')=='running'then + local message,op=WS.read('play') if message then - if op=="ping"then - NET.pong("play",message) - elseif op=="pong"then - elseif op=="close"then + if op=='ping'then + NET.pong('play',message) + elseif op=='pong'then + elseif op=='close'then wsCloseMessage(message) return else local res=_parse(message) if res then local d=res.data - if res.type=="Connect"then - SCN.go("net_menu") - NET.unlock("wsc_play") - NET.unlock("access_and_login") + if res.type=='Connect'then + SCN.go('net_menu') + NET.unlock('wsc_play') + NET.unlock('access_and_login') elseif res.action==0 then--Fetch rooms NET.roomList=res.roomList - NET.unlock("fetchRoom") + NET.unlock('fetchRoom') elseif res.action==1 then--Create room (not used) --? elseif res.action==2 then--Player join - if res.type=="Self"then + if res.type=='Self'then --Create room TABLE.cut(PLY_NET) if d.players then @@ -363,7 +363,7 @@ function NET.updateWS_play() }) end end - loadGame("netBattle",true,true) + loadGame('netBattle',true,true) else --Load other players ins(PLY_NET,{ @@ -379,7 +379,7 @@ function NET.updateWS_play() if not d.uid then NET.wsclose_stream() SCN.back() - NET.unlock("quit") + NET.unlock('quit') else for i=1,#PLY_NET do if PLY_NET[i].sid==d.sid then @@ -418,16 +418,16 @@ function NET.updateWS_play() if p.ready~=d.ready then p.ready=d.ready if not d.ready then NET.allReady=false end - SFX.play("spin_0",.6) + SFX.play('spin_0',.6) if i==1 then - NET.unlock("ready") + NET.unlock('ready') elseif not PLY_NET[1].ready then for j=2,#PLY_NET do if not PLY_NET[j].ready then goto BREAK_notAllReady end end - SFX.play("blip_2",.5) + SFX.play('blip_2',.5) ::BREAK_notAllReady:: end end @@ -435,7 +435,7 @@ function NET.updateWS_play() end end elseif res.action==7 then--All Ready - SFX.play("reach",.6) + SFX.play('reach',.6) NET.allReady=true elseif res.action==8 then--Set NET.rsid=d.rid @@ -446,7 +446,7 @@ function NET.updateWS_play() if SCN.socketRead then SCN.socketRead("Finish",d)end end else - WS.alert("play") + WS.alert('play') end end end @@ -456,21 +456,21 @@ end function NET.updateWS_stream() while true do YIELD() - if WS.status("stream")=="running"then - local message,op=WS.read("stream") + if WS.status('stream')=='running'then + local message,op=WS.read('stream') if message then - if op=="ping"then - NET.pong("stream",message) - elseif op=="pong"then - elseif op=="close"then + if op=='ping'then + NET.pong('stream',message) + elseif op=='pong'then + elseif op=='close'then wsCloseMessage(message) return else local res=_parse(message) if res then local d=res.data - if res.type=="Connect"then - NET.unlock("wsc_stream") + if res.type=='Connect'then + NET.unlock('wsc_stream') elseif res.action==0 then--Game start SCN.socketRead("Go",d) elseif res.action==1 then--Game finished @@ -490,7 +490,7 @@ function NET.updateWS_stream() SCN.socketRead("Stream",d) end else - WS.alert("stream") + WS.alert('stream') end end end @@ -500,13 +500,13 @@ end function NET.updateWS_chat() while true do YIELD() - if WS.status("chat")=="running"then - local message,op=WS.read("chat") + if WS.status('chat')=='running'then + local message,op=WS.read('chat') if message then - if op=="ping"then - NET.pong("chat",message) - elseif op=="pong"then - elseif op=="close"then + if op=='ping'then + NET.pong('chat',message) + elseif op=='pong'then + elseif op=='close'then wsCloseMessage(message) return else @@ -514,7 +514,7 @@ function NET.updateWS_chat() if res then --TODO else - WS.alert("chat") + WS.alert('chat') end end end diff --git a/parts/player/draw.lua b/parts/player/draw.lua index bea985b6..c22f7f6c 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -20,7 +20,7 @@ local frameColorList={ COLOR.lO, } --local function drawCell(y,x,id)gc_draw(SKIN.curText[id],30*x-30,-30*y)end -local function stencilBoard()gc_rectangle("fill",0,-10,300,610)end +local function stencilBoard()gc_rectangle('fill',0,-10,300,610)end local function drawGrid(P) local d=P.fieldBeneath+P.fieldUp gc_setLineWidth(1) @@ -28,7 +28,7 @@ local function drawGrid(P) for x=1,9 do gc_line(30*x,-10,30*x,600) end - gc_push("transform") + gc_push('transform') gc_translate(0,d-30*int(d/30)) for y=0,19 do gc_line(0,30*y,300,30*y) @@ -60,7 +60,7 @@ local function drawRow(h,V,L,showInvis) gc_draw(texture[L[i]],30*i-30,-30*h)-- drawCell(j,i,L[i]) elseif showInvis then gc_setColor(1,1,1,.3+.08*sin(.5*(h-i)+t)) - gc_rectangle("fill",30*i-30,-30*h,30,30) + gc_rectangle('fill',30*i-30,-30*h,30,30) end end end @@ -89,7 +89,7 @@ local function drawField(P) local alpha=P.falling/ENV.fall local h=1 if ENV.upEdge then - gc_push("transform") + gc_push('transform') gc_setShader(SHADER.lighter) gc_translate(0,-4) -- @@ -98,7 +98,7 @@ local function drawField(P) h=h+1 gc_translate(0,-stepY) gc_setColor(1,1,1,alpha) - gc_rectangle("fill",0,30-30*j,300,stepY) + gc_rectangle('fill',0,30-30*j,300,stepY) end drawRow(j,V[j],F[j]) end @@ -108,14 +108,14 @@ local function drawField(P) h=1 end - gc_push("transform") + gc_push('transform') -- for j=start,min(start+21,#F)do while j==P.clearingRow[h]do h=h+1 gc_translate(0,-stepY) gc_setColor(1,1,1,alpha) - gc_rectangle("fill",0,30-30*j,300,stepY) + gc_rectangle('fill',0,30-30*j,300,stepY) end drawRow(j,V[j],F[j],GAME.replaying) end @@ -129,10 +129,10 @@ local function drawFXs(P) local S=P.lockFX[i] if S[3]<.5 then gc_setColor(1,1,1,2*S[3]) - gc_rectangle("fill",S[1],S[2],60*S[3],30) + gc_rectangle('fill',S[1],S[2],60*S[3],30) else gc_setColor(1,1,1,2-2*S[3]) - gc_rectangle("fill",S[1]+30,S[2],60*S[3]-60,30) + gc_rectangle('fill',S[1]+30,S[2],60*S[3]-60,30) end end @@ -141,7 +141,7 @@ local function drawFXs(P) local S=P.dropFX[i] gc_setColor(1,1,1,.6-S[5]*.6) local w=30*S[3]*(1-S[5]*.5) - gc_rectangle("fill",30*S[1]-30+15*S[3]-w*.5,-30*S[2],w,30*S[4]) + gc_rectangle('fill',30*S[1]-30+15*S[3]-w*.5,-30*S[2],w,30*S[4]) end --MoveFX @@ -159,7 +159,7 @@ local function drawFXs(P) local x=t<.3 and 1-(3.3333*t-1)^2 or 1 local y=t<.2 and 5*t or 1-1.25*(t-.2) gc_setColor(1,1,1,y) - gc_rectangle("fill",150-x*150,15-S[1]*30-y*15,300*x,y*30) + gc_rectangle('fill',150-x*150,15-S[1]*30-y*15,300*x,y*30) end end local function drawGhost(P,clr) @@ -213,9 +213,9 @@ end local function drawBoarders(P) gc_setLineWidth(2) gc_setColor(frameColorList[P.frameColor]) - gc_rectangle("line",-1,-11,302,612)--Bis Boarder - gc_rectangle("line",301,-3,15,604)--AtkBuffer boarder - gc_rectangle("line",-16,-3,15,604)--B2b bar boarder + gc_rectangle('line',-1,-11,302,612)--Bis Boarder + gc_rectangle('line',301,-3,15,604)--AtkBuffer boarder + gc_rectangle('line',-16,-3,15,604)--B2b bar boarder end local attackColor={ {COLOR.dH,COLOR.Z}, @@ -238,20 +238,20 @@ local function drawBuffer(P) if A.countdown>0 then --Timing gc_setColor(attackColor[A.lv][1]) - gc_rectangle("fill",303,599-h,11,-bar) + gc_rectangle('fill',303,599-h,11,-bar) gc_setColor(attackColor[A.lv][2]) - gc_rectangle("fill",303,599-h-bar,11,bar*(1-A.countdown/A.cd0)) + gc_rectangle('fill',303,599-h-bar,11,bar*(1-A.countdown/A.cd0)) else --Warning local a=math.sin((TIME()-i)*30)*.5+.5 local c1,c2=attackColor[A.lv][1],attackColor[A.lv][2] gc_setColor(c1[1]*a+c2[1]*(1-a),c1[2]*a+c2[2]*(1-a),c1[3]*a+c2[3]*(1-a)) - gc_rectangle("fill",303,599-h,11,-bar) + gc_rectangle('fill',303,599-h,11,-bar) end else gc_setColor(attackColor[A.lv][1]) bar=bar*(20-A.time)*.05 - gc_rectangle("fill",303,599-h,11,-bar) + gc_rectangle('fill',303,599-h,11,-bar) --Disappear end h=h+bar @@ -260,12 +260,12 @@ end local function drawB2Bbar(P) local a,b=P.b2b,P.b2b1 if a>b then a,b=b,a end gc_setColor(.8,1,.2) - gc_rectangle("fill",-14,599,11,-b*.6) + gc_rectangle('fill',-14,599,11,-b*.6) gc_setColor(P.b2b<40 and COLOR.Z or P.b2b<=800 and COLOR.lR or COLOR.lB) - gc_rectangle("fill",-14,599,11,-a*.6) + gc_rectangle('fill',-14,599,11,-a*.6) if TIME()%.5<.3 then gc_setColor(1,1,1) - gc_rectangle("fill",-15,b<40 and 568.5 or 118.5,13,3) + gc_rectangle('fill',-15,b<40 and 568.5 or 118.5,13,3) end --LockDelay indicator @@ -275,11 +275,11 @@ local function drawB2Bbar(P) gc_setColor(1,.26,.26) end if P.lockDelay>=0 then - gc_rectangle("fill",0,602,300*P.lockDelay/P.gameEnv.lock,6)--Lock delay indicator + gc_rectangle('fill',0,602,300*P.lockDelay/P.gameEnv.lock,6)--Lock delay indicator end local x=3 for _=1,min(P.freshTime,15)do - gc_rectangle("fill",x,615,14,5) + gc_rectangle('fill',x,615,14,5) x=x+20 end end @@ -289,10 +289,10 @@ local function drawHold(P) local N=ENV.holdCount*72 local texture=SKIN.curText - gc_push("transform") + gc_push('transform') gc_translate(-140,36) - gc_setColor(0,0,0,.4)gc_rectangle("fill",0,0,124,N+8) - gc_setColor(1,1,1)gc_rectangle("line",0,0,124,N+8) + gc_setColor(0,0,0,.4)gc_rectangle('fill',0,0,124,N+8) + gc_setColor(1,1,1)gc_rectangle('line',0,0,124,N+8) if P.holdTime==0 then gc_setColor(.6,.4,.4)end mText(drawableText.hold,62,-51) @@ -302,7 +302,7 @@ local function drawHold(P) else N=P.holdTime+1 end - gc_push("transform") + gc_push('transform') gc_translate(62,40) for n=1,#P.holdQueue do if n==N then gc_setColor(.6,.4,.4)end @@ -322,9 +322,9 @@ local function drawHold(P) end local RCPB={5,33,195,33,100,5,100,60} local hideBoardStencil={ - up=function()gc_rectangle("fill",0,0,300,300)end, - down=function()gc_rectangle("fill",0,300,300,300)end, - all=function()gc_rectangle("fill",0,0,300,600)end, + up=function()gc_rectangle('fill',0,0,300,300)end, + down=function()gc_rectangle('fill',0,300,300,300)end, + all=function()gc_rectangle('fill',0,0,300,600)end, } local function drawDial(x,y,speed) gc_setColor(1,1,1) @@ -332,13 +332,13 @@ local function drawDial(x,y,speed) mStr(int(speed),x,y-18) gc_setLineWidth(2) - gc_circle("line",x,y,30,6) + gc_circle('line',x,y,30,6) gc_draw(IMG.dialNeedle,x,y,2.094+(speed<=175 and .02094*speed or 4.712-52.36/(speed-125)),nil,nil,5,4) gc_setLineWidth(4) gc_setColor(1,1,1,.4) - gc_circle("line",x,y,30,6) + gc_circle('line',x,y,30,6) end local function drawFinesseCombo_norm(P) if P.finesseCombo>2 then @@ -359,7 +359,7 @@ local function drawFinesseCombo_norm(P) gc_setColor(1,1,1,1.2-_*.1) end if _>0 then - gc_push("transform") + gc_push('transform') gc_translate(20,600) gc_scale(1+_*.08) gc_print(str,0,-30) @@ -428,7 +428,7 @@ local function drawStartCounter(P) gc_setColor(1,1,1) if P.frameRun<180 then local count=179-P.frameRun - gc_push("transform") + gc_push('transform') gc_translate(305,220) setFont(95) if count%60>45 then gc_scale(1+(count%60-45)^2*.01,1)end @@ -441,14 +441,14 @@ local draw={} function draw.drawNext_norm(P) local ENV=P.gameEnv local texture=SKIN.curText - gc_push("transform") + gc_push('transform') gc_translate(316,36) local N=ENV.nextCount*72 - gc_setColor(0,0,0,.4)gc_rectangle("fill",0,0,124,N+8) - gc_setColor(1,1,1)gc_rectangle("line",0,0,124,N+8) + gc_setColor(0,0,0,.4)gc_rectangle('fill',0,0,124,N+8) + gc_setColor(1,1,1)gc_rectangle('line',0,0,124,N+8) mText(drawableText.next,62,-51) N=1 - gc_push("transform") + gc_push('transform') gc_translate(62,40) while N<=ENV.nextCount and P.nextQueue[N]do local bk,clr=P.nextQueue[N].bk,P.nextQueue[N].color @@ -479,14 +479,14 @@ end function draw.drawNext_hidden(P) local ENV=P.gameEnv local texture=SKIN.curText - gc_push("transform") + gc_push('transform') gc_translate(316,36) local N=ENV.nextCount*72 - gc_setColor(.5,0,0,.4)gc_rectangle("fill",0,0,124,N+8) - gc_setColor(1,1,1)gc_rectangle("line",0,0,124,N+8) + gc_setColor(.5,0,0,.4)gc_rectangle('fill',0,0,124,N+8) + gc_setColor(1,1,1)gc_rectangle('line',0,0,124,N+8) mText(drawableText.next,62,-51) N=min(ENV.nextStartPos,P.pieceCount+1) - gc_push("transform") + gc_push('transform') gc_translate(62,40) while N<=ENV.nextCount and P.nextQueue[N]do local bk,clr=P.nextQueue[N].bk,P.nextQueue[N].color @@ -527,7 +527,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) - gc_push("transform") + gc_push('transform') draw.applyFieldOffset(P) gc_line(0,600-30*r,300,600-30*r) gc_pop() @@ -538,21 +538,21 @@ function draw.norm(P) local ENV=P.gameEnv local FBN,FUP=P.fieldBeneath,P.fieldUp local t=TIME() - gc_push("transform") + gc_push('transform') gc_translate(P.x,P.y)gc_scale(P.size) --Field-related things - gc_push("transform") + gc_push('transform') draw.applyFieldOffset(P) --Fill field gc_setColor(0,0,0,.6) - gc_rectangle("fill",0,-10,300,610) + gc_rectangle('fill',0,-10,300,610) --Stenciled in-field things - gc_stencil(stencilBoard,"replace",1) - gc_setStencilTest("equal",1) - gc_push("transform") + gc_stencil(stencilBoard,'replace',1) + gc_setStencilTest('equal',1) + gc_push('transform') boardTransform(ENV.flipBoard) --Draw grid @@ -564,7 +564,7 @@ function draw.norm(P) local fieldTop=-ENV.fieldH*30 --Draw dangerous area gc_setColor(1,0,0,.3) - gc_rectangle("fill",0,fieldTop,300,-FUP-FBN-fieldTop-620) + gc_rectangle('fill',0,fieldTop,300,-FUP-FBN-fieldTop-620) --Draw field drawField(P) @@ -631,18 +631,18 @@ function draw.norm(P) if GAME.modeEnv.royaleMode then if P.atkMode then gc_setColor(1,.8,0,P.swappingAtkMode*.02) - gc_rectangle("fill",RCPB[2*P.atkMode-1],RCPB[2*P.atkMode],90,35,8,4) + gc_rectangle('fill',RCPB[2*P.atkMode-1],RCPB[2*P.atkMode],90,35,8,4) end gc_setColor(1,1,1,P.swappingAtkMode*.025) setFont(35) for i=1,4 do - gc_rectangle("line",RCPB[2*i-1],RCPB[2*i],90,35,8,4) + gc_rectangle('line',RCPB[2*i-1],RCPB[2*i],90,35,8,4) gc_printf(text.atkModeName[i],RCPB[2*i-1]-4,RCPB[2*i]+4,200,"center",nil,.5) end end if ENV.hideBoard then - gc_stencil(hideBoardStencil[ENV.hideBoard],"replace",1) - gc_setStencilTest("equal",1) + gc_stencil(hideBoardStencil[ENV.hideBoard],'replace',1) + gc_setStencilTest('equal',1) gc_setLineWidth(20) for i=0,24 do gc_setColor(COLOR.rainbow_gray(t*.626+i*.1)) @@ -692,11 +692,11 @@ function draw.norm_remote(P) local ENV=P.gameEnv local FBN,FUP=P.fieldBeneath,P.fieldUp local t=TIME() - gc_push("transform") + gc_push('transform') gc_translate(P.x,P.y)gc_scale(P.size) --Field-related things - gc_push("transform") + gc_push('transform') draw.applyFieldOffset(P) --Draw username @@ -706,12 +706,12 @@ function draw.norm_remote(P) --Fill field gc_setColor(0,0,0,.6) - gc_rectangle("fill",0,-10,300,610) + gc_rectangle('fill',0,-10,300,610) --Stenciled in-field things - gc_stencil(stencilBoard,"replace",1) - gc_setStencilTest("equal",1) - gc_push("transform") + gc_stencil(stencilBoard,'replace',1) + gc_setStencilTest('equal',1) + gc_push('transform') boardTransform(ENV.flipBoard) --Draw grid @@ -723,7 +723,7 @@ function draw.norm_remote(P) local fieldTop=-ENV.fieldH*30 --Draw dangerous area gc_setColor(1,0,0,.3) - gc_rectangle("fill",0,fieldTop,300,-FUP-FBN-fieldTop-620) + gc_rectangle('fill',0,fieldTop,300,-FUP-FBN-fieldTop-620) --Draw field drawField(P) @@ -781,18 +781,18 @@ function draw.norm_remote(P) if GAME.modeEnv.royaleMode then if P.atkMode then gc_setColor(1,.8,0,P.swappingAtkMode*.02) - gc_rectangle("fill",RCPB[2*P.atkMode-1],RCPB[2*P.atkMode],90,35,8,4) + gc_rectangle('fill',RCPB[2*P.atkMode-1],RCPB[2*P.atkMode],90,35,8,4) end gc_setColor(1,1,1,P.swappingAtkMode*.025) setFont(35) for i=1,4 do - gc_rectangle("line",RCPB[2*i-1],RCPB[2*i],90,35,8,4) + gc_rectangle('line',RCPB[2*i-1],RCPB[2*i],90,35,8,4) gc_printf(text.atkModeName[i],RCPB[2*i-1]-4,RCPB[2*i]+4,200,"center",nil,.5) end end if ENV.hideBoard then - gc_stencil(hideBoardStencil[ENV.hideBoard],"replace",1) - gc_setStencilTest("equal",1) + gc_stencil(hideBoardStencil[ENV.hideBoard],'replace',1) + gc_setStencilTest('equal',1) gc_setLineWidth(20) for i=0,24 do gc_setColor(COLOR.rainbow_gray(t*.626+i*.1)) @@ -836,7 +836,7 @@ function draw.small(P) P.frameWait=10 gc_setCanvas(P.canvas) gc_clear(0,0,0,.4) - gc_push("transform") + gc_push('transform') gc_origin() gc_setColor(1,1,1,P.result and max(20-P.endCounter,0)*.05 or 1) @@ -853,7 +853,7 @@ function draw.small(P) if P.alive then gc_setLineWidth(2) gc_setColor(frameColorList[P.frameColor]) - gc_rectangle("line",0,0,60,120) + gc_rectangle('line',0,0,60,120) end --Draw badge @@ -867,7 +867,7 @@ function draw.small(P) --Draw result if P.result then gc_setColor(1,1,1,min(P.endCounter,60)*.01) - setFont(20)mStr(P.result,32,47) + setFont(20)mStr(drawableText[P.result],32,47) setFont(15)mStr(P.modeData.place,30,82) end gc_pop() @@ -880,7 +880,7 @@ function draw.small(P) if P.killMark then gc_setLineWidth(3) gc_setColor(1,0,0,min(P.endCounter,25)*.04) - gc_circle("line",P.centerX,P.centerY,(840-20*min(P.endCounter,30))*P.size) + gc_circle('line',P.centerX,P.centerY,(840-20*min(P.endCounter,30))*P.size) end setFont(30) end @@ -890,20 +890,20 @@ function draw.demo(P) local curColor=P.cur.color --Camera - gc_push("transform") + gc_push('transform') gc_translate(P.x,P.y) gc_scale(P.size) - gc_push("transform") + gc_push('transform') draw.applyFieldOffset(P,true) --Frame gc_setColor(0,0,0,.6) - gc_rectangle("fill",0,0,300,600) + gc_rectangle('fill',0,0,300,600) gc_setLineWidth(2) gc_setColor(1,1,1) - gc_rectangle("line",-1,-1,302,602) + gc_rectangle('line',-1,-1,302,602) - gc_push("transform") + gc_push('transform') gc_translate(0,600) drawField(P) drawFXs(P) diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 36779ce5..62e6e5e4 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -36,7 +36,7 @@ return{ holdCount=1,infHold=false,phyHold=false, ospin=true,deepDrop=false, RS="TRS", - sequence="bag", + sequence='bag', seqData={1,2,3,4,5,6,7}, face=NULL,skin=NULL, mission=NULL, @@ -46,7 +46,7 @@ return{ pushSpeed=3, block=true, noTele=false, - visible="show", + visible='show', freshLimit=1e99,easyFresh=true, fkey1=false, @@ -57,6 +57,6 @@ return{ dropPiece=NULL, mindas=0,minarr=0,minsdarr=0, - bg="none",bgm="race", + bg='none',bgm='race', allowMod=true, } \ No newline at end of file diff --git a/parts/player/getSeqGen.lua b/parts/player/getSeqGen.lua index 70e104a3..06b9e237 100644 --- a/parts/player/getSeqGen.lua +++ b/parts/player/getSeqGen.lua @@ -141,17 +141,17 @@ local seqGens={ } return function(P)--Return a piece-generating funtion for player P local s=P.gameEnv.sequence - if type(s)=="function"then + if type(s)=='function'then return s - elseif type(s)=="string"and seqGens[s]then + elseif type(s)=='string'and seqGens[s]then return seqGens[s] else LOG.print( - type(s)=="string"and + type(s)=='string'and "No sequence mode called "..s or "Wrong sequence generator", - "warn") - P.gameEnv.sequence="bag" + 'warn') + P.gameEnv.sequence='bag' return seqGens.bag end end \ No newline at end of file diff --git a/parts/player/init.lua b/parts/player/init.lua index 46a86a14..789b7271 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -136,7 +136,7 @@ local function newEmptyPlayer(id,mini) P.atker,P.atking,P.lastRecv={} --Network-related - P.username="_" + P.username='_' P.uid=-1 P.sid=-1 @@ -179,7 +179,7 @@ local function newEmptyPlayer(id,mini) P.ctrlCount=0--Key press time, for finesse check P.pieceCount=0--Count pieces from next, for drawing bagline - P.type="none" + P.type='none' P.sound=false -- P.newNext=false--Warped coroutine to get new next, loaded in applyGameEnv() @@ -201,7 +201,7 @@ local function newEmptyPlayer(id,mini) P.bonus={}--Text objects P.endCounter=0--Used after gameover - P.result=false--String:"WIN"/"K.O." + P.result=false--String: 'finish'|'win'|'lose' return P end @@ -223,7 +223,7 @@ local function loadGameEnv(P)--Load gameEnv -- else -- print("default-"..k..":"..tostring(v)) end - if type(v)~="table"then--Default setting + if type(v)~='table'then--Default setting ENV[k]=v else ENV[k]=TABLE.copy(v) @@ -254,7 +254,7 @@ local function loadRemoteEnv(P,confStr)--Load gameEnv elseif SETTING[k]~=nil then v=SETTING[k] --Global setting end - if type(v)~="table"then--Default setting + if type(v)~='table'then--Default setting ENV[k]=v else ENV[k]=TABLE.copy(v) @@ -286,19 +286,19 @@ local function applyGameEnv(P)--Finish gameEnv processing end P:setInvisible( - ENV.visible=="show"and -1 or - ENV.visible=="easy"and 300 or - ENV.visible=="slow"and 100 or - ENV.visible=="medium"and 60 or - ENV.visible=="fast"and 20 or - ENV.visible=="none"and 0 + ENV.visible=='show'and -1 or + ENV.visible=='easy'and 300 or + ENV.visible=='slow'and 100 or + ENV.visible=='medium'and 60 or + ENV.visible=='fast'and 20 or + ENV.visible=='none'and 0 ) P:set20G(P._20G) P:setHold(ENV.holdCount) P:setNext(ENV.nextCount,ENV.nextStartPos>1) P:setRS(ENV.RS) - if type(ENV.mission)=="table"then + if type(ENV.mission)=='table'then P.curMission=1 end @@ -306,7 +306,7 @@ local function applyGameEnv(P)--Finish gameEnv processing ENV.arr=max(ENV.arr,ENV.minarr) ENV.sdarr=max(ENV.sdarr,ENV.minsdarr) - if ENV.sequence~="bag"and ENV.sequence~="loop"then + if ENV.sequence~='bag'and ENV.sequence~='loop'then ENV.bagLine=false else ENV.bagLen=#ENV.seqData @@ -351,7 +351,7 @@ local DemoEnv={ } function PLY.newDemoPlayer(id) local P=newEmptyPlayer(id) - P.type="computer" + P.type='computer' P.sound=true P.demo=true @@ -362,19 +362,19 @@ function PLY.newDemoPlayer(id) loadGameEnv(P) applyGameEnv(P) P:loadAI{ - type="CC", + type='CC', next=5, hold=true, delay=30, delta=6, - bag="bag", + bag='bag', node=100000, } P:popNext() end function PLY.newRemotePlayer(id,mini,data) local P=newEmptyPlayer(id,mini) - P.type="remote" + P.type='remote' P.update=PLY.update.remote_alive P.draw=PLY.draw.norm_remote @@ -393,7 +393,7 @@ end function PLY.newAIPlayer(id,AIdata,mini) local P=newEmptyPlayer(id,mini) - P.type="computer" + P.type='computer' loadGameEnv(P) local ENV=P.gameEnv @@ -404,7 +404,7 @@ function PLY.newAIPlayer(id,AIdata,mini) end function PLY.newPlayer(id,mini) local P=newEmptyPlayer(id,mini) - P.type="human" + P.type='human' P.sound=true P.uid=USER.uid diff --git a/parts/player/player.lua b/parts/player/player.lua index b6aa0702..0a557361 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -47,21 +47,21 @@ function Player:createMoveFX(dir) local CB=self.cur.bk local x=self.curX-1 local y=self.gameEnv.smooth and self.curY+self.dropDelay/self.gameEnv.drop-2 or self.curY-1 - if dir=="left"then + if dir=='left'then for i=1,#CB do for j=#CB[1],1,-1 do if self.cur.bk[i][j]then ins(self.moveFX,{C,x+j,y+i,0,T}) break end end end - elseif dir=="right"then + elseif dir=='right'then for i=1,#CB do for j=1,#CB[1]do if self.cur.bk[i][j]then ins(self.moveFX,{C,x+j,y+i,0,T}) break end end end - elseif dir=="down"then + elseif dir=='down'then for j=1,#CB[1]do for i=#CB,1,-1 do if self.cur.bk[i][j]then ins(self.moveFX,{C,x+j,y+i,0,T}) @@ -109,7 +109,7 @@ function Player:createBeam(R,send,power,color) local c=minoColor[color] local r,g,b=c[1]*2,c[2]*2,c[3]*2 - local a=GAME.modeEnv.royaleMode and not(self.type=="human"or R.type=="human")and .2 or 1 + local a=GAME.modeEnv.royaleMode and not(self.type=='human'or R.type=='human')and .2 or 1 SYSFX.newAttack(1-power*.1,x1,y1,x2,y2,int(send^.7*(4+power)),r,g,b,a*(power+2)*.0626) end ---------------------------------------------------- @@ -122,7 +122,7 @@ end function Player:newTask(code,...) local thread=coroutine.create(code) resume(thread,self,...) - if status(thread)~="dead"then + if status(thread)~='dead'then self.tasks[#self.tasks+1]={ thread=thread, code=code, @@ -171,14 +171,14 @@ function Player:switchKey(id,on) if not on then self:releaseKey(id) end - if self.type=="human"then + if self.type=='human'then VK.switchKey(id,on) end end function Player:set20G(if20g) self._20G=if20g self:switchKey(7,not if20g) - if if20g and self.AI_mode=="CC"then CC.switch20G(self)end + if if20g and self.AI_mode=='CC'then CC.switch20G(self)end end function Player:setHold(count)--Set hold count (false/true as 0/1) if not count then @@ -239,7 +239,7 @@ function Player:garbageRelease()--Check garbage buffer and try to release them break end end - if flag and self.AI_mode=="CC"and self.AI_bot then CC.updateField(self)end + if flag and self.AI_mode=='CC'and self.AI_bot then CC.updateField(self)end end function Player:garbageRise(color,amount,line)--Release n-lines garbage to field local _ @@ -260,7 +260,7 @@ function Player:garbageRise(color,amount,line)--Release n-lines garbage to field for i=1,#self.clearingRow do self.clearingRow[i]=self.clearingRow[i]+amount end - self:freshBlock("push") + self:freshBlock('push') for i=1,#self.lockFX do _=self.lockFX[i] _[2]=_[2]-30*amount--Shift 30px per line cleared @@ -293,7 +293,7 @@ function Player:pushLineList(L,mir)--Push some lines to field self.fieldBeneath=self.fieldBeneath+30*l self.curY=self.curY+l self.ghoY=self.ghoY+l - self:freshBlock("push") + self:freshBlock('push') end function Player:pushNextList(L,mir)--Push some nexts to nextQueue for i=1,#L do @@ -325,7 +325,7 @@ end function Player:attack(R,send,time,line,fromStream) local atkFX=self.gameEnv.atkFX if GAME.net then - if self.type=="human"then--Local player attack others + if self.type=='human'then--Local player attack others ins(GAME.rep,self.frameRun) ins(GAME.rep, R.sid+ @@ -338,7 +338,7 @@ function Player:attack(R,send,time,line,fromStream) self:createBeam(R,send,atkFX,self.cur.color) end end - if fromStream and R.type=="human"then--Local player receiving lines + if fromStream and R.type=='human'then--Local player receiving lines ins(GAME.rep,R.frameRun) ins(GAME.rep, self.sid+ @@ -378,7 +378,7 @@ function Player:receive(A,send,time,line) B.sum=B.sum+send self.stat.recv=self.stat.recv+send if self.sound then - SFX.play(send<4 and"blip_1"or"blip_2",min(send+1,5)*.1) + SFX.play(send<4 and'blip_1'or'blip_2',min(send+1,5)*.1) end end end @@ -412,7 +412,7 @@ function Player:changeAtkMode(m) end end function Player:changeAtk(R) - -- if self.type~="human"then R=PLAYERS[1]end--1vALL mode? + -- if self.type~='human'then R=PLAYERS[1]end--1vALL mode? if self.atking then local K=self.atking.atker for i=1,#K do @@ -432,7 +432,7 @@ end function Player:freshBlock(mode)--string mode: push/move/fresh/newBlock local ENV=self.gameEnv --Fresh ghost - if(mode=="move"or mode=="newBlock"or mode=="push")and self.cur then + if(mode=='move'or mode=='newBlock'or mode=='push')and self.cur then local CB=self.cur.bk self.ghoY=min(#self.field+1,self.curY) if self._20G or ENV.sdarr==0 and self.keyPressing[7]and self.downing>ENV.sddas then @@ -466,11 +466,11 @@ function Player:freshBlock(mode)--string mode: push/move/fresh/newBlock end --Fresh delays - if mode=="move"or mode=="newBlock"or mode=="fresh"then + if mode=='move'or mode=='newBlock'or mode=='fresh'then local d0,l0=ENV.drop,ENV.lock if ENV.easyFresh then if self.lockDelay0 then - if mode~="newBlock"then + if mode~='newBlock'then self.freshTime=self.freshTime-1 end self.lockDelay=l0 @@ -518,12 +518,12 @@ function Player:lock() end end end - if has_dest and not dest and self.AI_mode=="CC"and self.AI_bot then + if has_dest and not dest and self.AI_mode=='CC'and self.AI_bot then CC.updateField(self) end end -local spawnSFX_name={}for i=1,7 do spawnSFX_name[i]="spawn_"..i end +local spawnSFX_name={}for i=1,7 do spawnSFX_name[i]='spawn_'..i end function Player:resetBlock()--Reset Block's position and execute I*S local B=self.cur.bk self.curX=int(6-#B[1]*.5) @@ -570,12 +570,12 @@ end function Player:spin(d,ifpre) local kickData=self.RS[self.cur.id] - if type(kickData)=="table"then + if type(kickData)=='table'then local idir=(self.cur.dir+d)%4 kickData=kickData[self.cur.dir*10+idir] if not kickData then - self:freshBlock("move") - SFX.play(ifpre and"prerotate"or"rotate",nil,self:getCenterX()*.15) + self:freshBlock('move') + SFX.play(ifpre and'prerotate'or'rotate',nil,self:getCenterX()*.15) return end local icb=BLOCKS[self.cur.id][idir] @@ -594,7 +594,7 @@ function Player:spin(d,ifpre) local t=self.freshTime if not ifpre then - self:freshBlock("move") + self:freshBlock('move') end if kickData[test][2]>0 and self.freshTime==t and self.curY~=self.imgY then self.freshTime=self.freshTime-1 @@ -603,9 +603,9 @@ function Player:spin(d,ifpre) if self.sound then local sfx if ifpre then - sfx="prerotate" + sfx='prerotate' elseif self:ifoverlap(icb,ix,iy+1)and self:ifoverlap(icb,ix-1,iy)and self:ifoverlap(icb,ix+1,iy)then - sfx="rotatekick" + sfx='rotatekick' if self.gameEnv.shakeFX then if d==1 or d==3 then self.fieldOff.va=self.fieldOff.va+(2-d)*self.gameEnv.shakeFX*6e-3 @@ -614,7 +614,7 @@ function Player:spin(d,ifpre) end end else - sfx="rotate" + sfx='rotate' end SFX.play(sfx,nil,self:getCenterX()*.15) end @@ -625,8 +625,8 @@ function Player:spin(d,ifpre) elseif kickData then kickData(self,d) else - self:freshBlock("move") - SFX.play(ifpre and"prerotate"or"rotate",nil,self:getCenterX()*.15) + self:freshBlock('move') + SFX.play(ifpre and'prerotate'or'rotate',nil,self:getCenterX()*.15) end end local phyHoldKickX={ @@ -669,7 +669,7 @@ function Player:hold(ifpre) end end -- All test failed, interrupt with sound - SFX.play("finesseError") + SFX.play('finesseError') do return end -- ::BREAK_success:: @@ -696,7 +696,7 @@ function Player:hold(ifpre) self:resetBlock() end - self:freshBlock("move") + self:freshBlock('move') self.dropDelay=ENV.drop self.lockDelay=ENV.lock if self:ifoverlap(self.cur.bk,self.curX,self.curY)then @@ -711,10 +711,10 @@ function Player:hold(ifpre) end if self.sound then - SFX.play(ifpre and"prehold"or"hold") + SFX.play(ifpre and'prehold'or'hold') end - if self.AI_mode=="CC"then + if self.AI_mode=='CC'then local next=self.nextQueue[self.AIdata.nextCount] if next then CC.addNext(self.AI_bot,next.id) @@ -761,7 +761,7 @@ function Player:popNext(ifhold)--Pop nextQueue to hand self.newNext() if self.cur then self.pieceCount=self.pieceCount+1 - if self.AI_mode=="CC"then + if self.AI_mode=='CC'then local next=self.nextQueue[self.AIdata.next] if next then CC.addNext(self.AI_bot,next.id) @@ -787,7 +787,7 @@ function Player:popNext(ifhold)--Pop nextQueue to hand self:lock() self:lose() end - self:freshBlock("newBlock") + self:freshBlock('newBlock') end --IHdS @@ -838,11 +838,11 @@ do--Player.drop(self)--Place piece local reAtk={0,0,1,1,1,2,2,3,3} local reDef={0,1,1,2,3,3,4,4,5} - local spinVoice={"zspin","sspin","jspin","lspin","tspin","ospin","ispin","zspin","sspin","pspin","qspin","fspin","espin","tspin","uspin","vspin","wspin","xspin","jspin","lspin","rspin","yspin","hspin","nspin","ispin"} - local clearVoice={"single","double","triple","techrash","pentcrash","hexcrash"} - local spinSFX={[0]="spin_0","spin_1","spin_2"} - local clearSFX={"clear_1","clear_2","clear_3"} - local renSFX={}for i=1,11 do renSFX[i]="ren_"..i end + local spinVoice={'zspin','sspin','jspin','lspin','tspin','ospin','ispin','zspin','sspin','pspin','qspin','fspin','espin','tspin','uspin','vspin','wspin','xspin','jspin','lspin','rspin','yspin','hspin','nspin','ispin'} + local clearVoice={'single','double','triple','techrash','pentcrash','hexcrash'} + local spinSFX={[0]='spin_0','spin_1','spin_2'} + local clearSFX={'clear_1','clear_2','clear_3'} + local renSFX={}for i=1,11 do renSFX[i]='ren_'..i end local finesseList={ { {1,2,1,0,1,2,2,1}, @@ -933,9 +933,9 @@ do--Player.drop(self)--Place piece },--O1 } for k,v in next,finesseList do - if type(v)=="table"then + if type(v)=='table'then for d,l in next,v do - if type(l)=="number"then + if type(l)=='number'then v[d]=v[l] end end @@ -1128,15 +1128,15 @@ do--Player.drop(self)--Place piece end if self.sound then if ENV.fineKill then - SFX.play("finesseError_long",.6) + SFX.play('finesseError_long',.6) elseif ENV.fine then - SFX.play("finesseError",.8) + SFX.play('finesseError',.8) else - SFX.play("lock",nil,self:getCenterX()*.15) + SFX.play('lock',nil,self:getCenterX()*.15) end end elseif self.sound then - SFX.play("lock",nil,self:getCenterX()*.15) + SFX.play('lock',nil,self:getCenterX()*.15) end if finePts<=1 then @@ -1156,35 +1156,35 @@ do--Player.drop(self)--Place piece if dospin then cscore=(spinSCR[C.name]or spinSCR[8])[cc] if self.b2b>800 then - self:showText(text.b3b..text.block[C.name]..text.spin.." "..text.clear[cc],0,-30,35,"stretch") + self:showText(text.b3b..text.block[C.name]..text.spin.." "..text.clear[cc],0,-30,35,'stretch') atk=b2bATK[cc]+cc*.5 exblock=exblock+1 cscore=cscore*2 Stat.b3b=Stat.b3b+1 if self.sound then - VOC.play("b3b",CHN) + VOC.play('b3b',CHN) end elseif self.b2b>=50 then - self:showText(text.b2b..text.block[C.name]..text.spin.." "..text.clear[cc],0,-30,35,"spin") + self:showText(text.b2b..text.block[C.name]..text.spin.." "..text.clear[cc],0,-30,35,'spin') atk=b2bATK[cc] cscore=cscore*1.2 Stat.b2b=Stat.b2b+1 if self.sound then - VOC.play("b2b",CHN) + VOC.play('b2b',CHN) end else - self:showText(text.block[C.name]..text.spin.." "..text.clear[cc],0,-30,45,"spin") + self:showText(text.block[C.name]..text.spin.." "..text.clear[cc],0,-30,45,'spin') atk=2*cc end sendTime=20+atk*20 if mini then - self:showText(text.mini,0,-80,35,"appear") + self:showText(text.mini,0,-80,35,'appear') atk=atk*.25 sendTime=sendTime+60 cscore=cscore*.5 self.b2b=self.b2b+b2bPoint[cc]*.5 if self.sound then - VOC.play("mini",CHN) + VOC.play('mini',CHN) end else self.b2b=self.b2b+b2bPoint[cc] @@ -1192,32 +1192,32 @@ do--Player.drop(self)--Place piece piece.mini=mini piece.special=true if self.sound then - SFX.play(spinSFX[cc]or"spin_3") + SFX.play(spinSFX[cc]or'spin_3') VOC.play(spinVoice[C.name],CHN) end elseif cc>=4 then cscore=cc==4 and 1000 or cc==5 and 1500 or 2000 if self.b2b>800 then - self:showText(text.b3b..text.clear[cc],0,-30,50,"fly") + self:showText(text.b3b..text.clear[cc],0,-30,50,'fly') atk=4*cc-10 sendTime=100 exblock=exblock+1 cscore=cscore*1.8 Stat.b3b=Stat.b3b+1 if self.sound then - VOC.play("b3b",CHN) + VOC.play('b3b',CHN) end elseif self.b2b>=50 then - self:showText(text.b2b..text.clear[cc],0,-30,50,"drive") + self:showText(text.b2b..text.clear[cc],0,-30,50,'drive') sendTime=80 atk=3*cc-7 cscore=cscore*1.3 Stat.b2b=Stat.b2b+1 if self.sound then - VOC.play("b2b",CHN) + VOC.play('b2b',CHN) end else - self:showText(text.clear[cc],0,-30,70,"stretch") + self:showText(text.clear[cc],0,-30,70,'stretch') sendTime=60 atk=2*cc-4 end @@ -1236,7 +1236,7 @@ do--Player.drop(self)--Place piece if self.b2b<50 and ENV.b2bKill then finish=true end - self:showText(text.clear[cc],0,-30,35,"appear",(8-cc)*.3) + self:showText(text.clear[cc],0,-30,35,'appear',(8-cc)*.3) atk=cc-.5 sendTime=20+int(atk*20) cscore=cscore+clearSCR[cc] @@ -1249,14 +1249,14 @@ do--Player.drop(self)--Place piece if cmb>=3 then atk=atk+1 end - self:showText(text.cmb[min(cmb,21)],0,25,15+min(cmb,15)*5,cmb<10 and"appear"or"flicker") + self:showText(text.cmb[min(cmb,21)],0,25,15+min(cmb,15)*5,cmb<10 and'appear'or'flicker') cscore=cscore+min(50*cmb,500)*(2*cc-1) end --PC/HPC if clear then if #self.field==0 then - self:showText(text.PC,0,-80,50,"flicker") + self:showText(text.PC,0,-80,50,'flicker') atk=max(atk,min(8+Stat.pc*2,16)) exblock=exblock+2 sendTime=sendTime+120 @@ -1268,13 +1268,13 @@ do--Player.drop(self)--Place piece end Stat.pc=Stat.pc+1 if self.sound then - SFX.play("clear") - VOC.play("perfect_clear",CHN) + SFX.play('clear') + VOC.play('perfect_clear',CHN) end piece.pc=true piece.special=true elseif cc>=#C.bk and(cc>1 or #self.field==self.garbageBeneath)then - self:showText(text.HPC,0,-80,50,"fly") + self:showText(text.HPC,0,-80,50,'fly') atk=atk+4 exblock=exblock+2 sendTime=sendTime+60 @@ -1282,8 +1282,8 @@ do--Player.drop(self)--Place piece cscore=cscore+626 Stat.hpc=Stat.hpc+1 if self.sound then - SFX.play("clear") - VOC.play("half_clear",CHN) + SFX.play('clear') + VOC.play('half_clear',CHN) end piece.hpc=true piece.special=true @@ -1306,11 +1306,11 @@ do--Player.drop(self)--Place piece send=atk if exblock>0 then exblock=int(exblock*(1+self.strength*.25))--Badge Buff - self:showText("+"..exblock,0,53,20,"fly") + self:showText("+"..exblock,0,53,20,'fly') off=off+self:cancel(exblock) end if send>=1 then - self:showText(send,0,80,35,"zoomout") + self:showText(send,0,80,35,'zoomout') _=self:cancel(send) send=send-_ off=off+_ @@ -1337,14 +1337,14 @@ do--Player.drop(self)--Place piece self:attack(T,send,sendTime,generateLine(self:RND(10))) end end - if self.sound and send>3 then SFX.play("emit",min(send,7)*.1)end + if self.sound and send>3 then SFX.play('emit',min(send,7)*.1)end end --SFX & Vibrate if self.sound then - SFX.play(clearSFX[cc]or"clear_4") + SFX.play(clearSFX[cc]or'clear_4') SFX.play(renSFX[min(cmb,11)]) - if cmb>14 then SFX.play("ren_mega",(cmb-10)*.1)end + if cmb>14 then SFX.play('ren_mega',(cmb-10)*.1)end VIB(cc+1) end else--No lines clear @@ -1352,10 +1352,10 @@ do--Player.drop(self)--Place piece --Spin bonus if dospin then - self:showText(text.block[C.name]..text.spin,0,-30,45,"appear") + self:showText(text.block[C.name]..text.spin,0,-30,45,'appear') self.b2b=self.b2b+20 if self.sound then - SFX.play("spin_0") + SFX.play('spin_0') VOC.play(spinVoice[C.name],CHN) end cscore=30 @@ -1388,7 +1388,7 @@ do--Player.drop(self)--Place piece (self.curX+C.sc[2]-5.5)*30, (10-self.curY-C.sc[1])*30+self.fieldBeneath+self.fieldUp, 40-600/(cscore+20), - "score", + 'score', 2 ) end @@ -1421,14 +1421,14 @@ do--Player.drop(self)--Place piece end if success then self.curMission=self.curMission+1 - SFX.play("reach") + SFX.play('reach') if self.curMission>#ENV.mission then self.curMission=false - if not finish then finish="finish"end + if not finish then finish='finish'end end elseif ENV.missionKill then - self:showText(text.missionFailed,0,140,40,"flicker",.5) - SFX.play("finesseError_long",.6) + self:showText(text.missionFailed,0,140,40,'flicker',.5) + SFX.play('finesseError_long',.6) finish=true end end @@ -1474,7 +1474,7 @@ do--Player.drop(self)--Place piece end function Player:loadAI(data)--Load AI params if not CC then - data.type="9S" + data.type='9S' data.delta=int(data.delta*.3) end self.AI_mode=data.type @@ -1492,13 +1492,13 @@ function Player:loadAI(data)--Load AI params bag=data.bag, node=data.node, } - if self.AI_mode=="CC"then - self:setRS("SRS") + if self.AI_mode=='CC'then + self:setRS('SRS') local opt,wei=CC.getConf() CC.fastWeights(wei) CC.setHold(opt,self.AIdata.hold) CC.set20G(opt,self.AIdata._20G) - CC.setBag(opt,self.AIdata.bag=="bag") + CC.setBag(opt,self.AIdata.bag=='bag') CC.setNode(opt,self.AIdata.node) self.AI_bot=CC.new(opt,wei) CC.free(opt)CC.free(wei) @@ -1509,7 +1509,7 @@ function Player:loadAI(data)--Load AI params self:setHold(1) end else - self:setRS("TRS") + self:setRS('TRS') end self.AI_thread=coroutine.wrap(AIFUNC[data.type]) self.AI_thread(self,self.AI_keys) @@ -1539,7 +1539,7 @@ local function tick_throwBadge(ifAI,sender,time) SYSFX.newBadge(x1,y1,x2,y2) if not ifAI and time%8==0 then - SFX.play("collect") + SFX.play('collect') end end if time<=0 then return end @@ -1596,7 +1596,7 @@ local function tick_autoPause() while true do yield() time=time+1 - if SCN.cur~="game"or PLAYERS[1].frameRun<180 then + if SCN.cur~='game'or PLAYERS[1].frameRun<180 then return elseif time==120 then pauseGame() @@ -1639,7 +1639,7 @@ local function gameOver()--Save record end end if needSave then - FILE.save(RANKS,"conf/unlock","q") + FILE.save(RANKS,"conf/unlock",'q') end end local D=M.score(P) @@ -1653,12 +1653,12 @@ local function gameOver()--Save record end if p<10 then if p==0 then - P:showTextF(text.newRecord,0,-100,100,"beat",.5) + P:showTextF(text.newRecord,0,-100,100,'beat',.5) end D.date=os.date("%Y/%m/%d %H:%M") ins(L,p+1,D) if L[11]then L[11]=nil end - FILE.save(L,"record/"..M.name..".rec","lq") + FILE.save(L,"record/"..M.name..".rec",'lq') end end end @@ -1688,7 +1688,7 @@ function Player:die()--Called both when win/lose! ins(GAME.rep,0) else if self.lastRecv and self.lastRecv.id==1 then - SFX.play("collect") + SFX.play('collect') end end end @@ -1696,25 +1696,25 @@ end function Player:win(result) if self.result then return end self:die() - self.result="WIN" + self.result='win' if GAME.modeEnv.royaleMode then self.modeData.place=1 self:changeAtk() end - if self.type=="human"then - GAME.result=result or"win" - SFX.play("win") - VOC.play("win") + if self.type=='human'then + GAME.result=result or'win' + SFX.play('win') + VOC.play('win') if GAME.modeEnv.royaleMode then - BGM.play("8-bit happiness") + BGM.play('8-bit happiness') end end - if GAME.curMode.id=="custom_puzzle"then - self:showTextF(text.win,0,0,90,"beat",.4) + if GAME.curMode.id=='custom_puzzle'then + self:showTextF(text.win,0,0,90,'beat',.4) else - self:showTextF(text.win,0,0,90,"beat",.5,.2) + self:showTextF(text.win,0,0,90,'beat',.5,.2) end - if self.type=="human"then + if self.type=='human'then gameOver() TASK.new(tick_autoPause) end @@ -1722,7 +1722,7 @@ function Player:win(result) end function Player:lose(force) if self.result then return end - if self.type=="remote"and not force then self.waiting=1e99 return end + if self.type=='remote'and not force then self.waiting=1e99 return end if self.life>0 and not force then self.waiting=62 local h=#self.field @@ -1733,7 +1733,7 @@ function Player:lose(force) end self.garbageBeneath=0 - if self.AI_mode=="CC"then + if self.AI_mode=='CC'then CC.destroy(self.AI_bot) TABLE.cut(self.holdQueue) self:loadAI(self.AIdata) @@ -1757,8 +1757,8 @@ function Player:lose(force) SYSFX.newShade(1.4,self.fieldX,self.fieldY,300*self.size,610*self.size) SYSFX.newRectRipple(2,self.fieldX,self.fieldY,300*self.size,610*self.size) SYSFX.newRipple(2,self.x+(475+25*(self.life<3 and self.life or 0)+12)*self.size,self.y+(665+12)*self.size,20) - SFX.play("clear_3") - SFX.play("emit") + SFX.play('clear_3') + SFX.play('emit') return end @@ -1769,7 +1769,7 @@ function Player:lose(force) break end end - self.result="K.O." + self.result='lose' if GAME.modeEnv.royaleMode then self:changeAtk() self.modeData.place=#PLY_ALIVE+1 @@ -1792,7 +1792,7 @@ function Player:lose(force) end self.lastRecv=A if self.id==1 or A.id==1 then - TASK.new(tick_throwBadge,not A.type=="human",self,max(3,self.badge)*4) + TASK.new(tick_throwBadge,not A.type=='human',self,max(3,self.badge)*4) end end else @@ -1804,16 +1804,16 @@ function Player:lose(force) if #PLY_ALIVE==ROYALEDATA.stage[GAME.stage]then royaleLevelup() end - self:showTextF(self.modeData.place,0,120,60,"appear",.26,.9) + self:showTextF(self.modeData.place,0,120,60,'appear',.26,.9) end - self.gameEnv.keepVisible=self.gameEnv.visible~="show" - self:showTextF(text.gameover,0,0,60,"appear",.26,.9) - if self.type=="human"then - GAME.result="gameover" - SFX.play("fail") - VOC.play("lose") + self.gameEnv.keepVisible=self.gameEnv.visible~='show' + self:showTextF(text.gameover,0,0,60,'appear',.26,.9) + if self.type=='human'then + GAME.result='gameover' + SFX.play('fail') + VOC.play('lose') if GAME.modeEnv.royaleMode then - BGM.play("end") + BGM.play('end') end gameOver() self:newTask(#PLAYERS>1 and tick_lose or tick_finish) @@ -1845,11 +1845,11 @@ function Player:act_moveLeft(auto) elseif self.control and self.waiting==-1 then if self.cur and not self:ifoverlap(self.cur.bk,self.curX-1,self.curY)then if self.gameEnv.moveFX and self.gameEnv.block then - self:createMoveFX("left") + self:createMoveFX('left') end self.curX=self.curX-1 - self:freshBlock("move") - if self.sound and self.curY==self.ghoY then SFX.play("move")end + self:freshBlock('move') + if self.sound and self.curY==self.ghoY then SFX.play('move')end if not auto then self.moving=0 end self.spinLast=false else @@ -1872,11 +1872,11 @@ function Player:act_moveRight(auto) elseif self.control and self.waiting==-1 then if self.cur and not self:ifoverlap(self.cur.bk,self.curX+1,self.curY)then if self.gameEnv.moveFX and self.gameEnv.block then - self:createMoveFX("right") + self:createMoveFX('right') end self.curX=self.curX+1 - self:freshBlock("move") - if self.sound and self.curY==self.ghoY then SFX.play("move")end + self:freshBlock('move') + if self.sound and self.curY==self.ghoY then SFX.play('move')end if not auto then self.moving=0 end self.spinLast=false else @@ -1922,7 +1922,7 @@ function Player:act_hardDrop() self.curY=self.ghoY self.spinLast=false if self.sound then - SFX.play("drop",nil,self:getCenterX()*.15) + SFX.play('drop',nil,self:getCenterX()*.15) VIB(1) end end @@ -1946,7 +1946,7 @@ function Player:act_softDrop() if self.control and self.waiting==-1 and self.cur then if self.curY>self.ghoY then self.curY=self.curY-1 - self:freshBlock("fresh") + self:freshBlock('fresh') self.spinLast=false elseif ENV.deepDrop then local CB=self.cur.bk @@ -1959,8 +1959,8 @@ function Player:act_softDrop() self:createDropFX(self.curX,self.curY-1,#CB[1],self.curY-y-#CB+1) end self.curY=y - self:freshBlock("move") - SFX.play("swipe") + self:freshBlock('move') + SFX.play('swipe') end end end @@ -1983,10 +1983,10 @@ function Player:act_insLeft(auto) local x0=self.curX while not self:ifoverlap(self.cur.bk,self.curX-1,self.curY)do if self.gameEnv.moveFX and self.gameEnv.block then - self:createMoveFX("left") + self:createMoveFX('left') end self.curX=self.curX-1 - self:freshBlock("move") + self:freshBlock('move') end if self.curX~=x0 then self.spinLast=false @@ -2005,10 +2005,10 @@ function Player:act_insRight(auto) local x0=self.curX while not self:ifoverlap(self.cur.bk,self.curX+1,self.curY)do if self.gameEnv.moveFX and self.gameEnv.block then - self:createMoveFX("right") + self:createMoveFX('right') end self.curX=self.curX+1 - self:freshBlock("move") + self:freshBlock('move') end if self.curX~=x0 then self.spinLast=false @@ -2035,16 +2035,16 @@ function Player:act_insDown() self.curY=self.ghoY self.lockDelay=ENV.lock self.spinLast=false - self:freshBlock("fresh") + self:freshBlock('fresh') end end function Player:act_down1() if self.cur and self.curY>self.ghoY then if self.gameEnv.moveFX and self.gameEnv.block then - self:createMoveFX("down") + self:createMoveFX('down') end self.curY=self.curY-1 - self:freshBlock("fresh") + self:freshBlock('fresh') self.spinLast=false end end @@ -2056,7 +2056,7 @@ function Player:act_down4() self:createDropFX(self.curX,self.curY-1,#CB[1],self.curY-y-#CB+1) end self.curY=y - self:freshBlock("fresh") + self:freshBlock('fresh') self.spinLast=false end end @@ -2068,7 +2068,7 @@ function Player:act_down10() self:createDropFX(self.curX,self.curY-1,#CB[1],self.curY-y-#CB+1) end self.curY=y - self:freshBlock("fresh") + self:freshBlock('fresh') self.spinLast=false end end diff --git a/parts/player/update.lua b/parts/player/update.lua index acf19da4..c004358b 100644 --- a/parts/player/update.lua +++ b/parts/player/update.lua @@ -104,7 +104,7 @@ local function updateTasks(P) for i=#L,1,-1 do local tr=L[i].thread assert(resume(tr)) - if status(tr)=="dead"then + if status(tr)=='dead'then rem(L,i) end end @@ -119,12 +119,12 @@ function update.alive(P,dt) P.frameRun=P.frameRun+1 if P.frameRun<=180 then if P.frameRun==180 then - if P.id==1 then SFX.play("start")end + if P.id==1 then SFX.play('start')end P.control=true P.timing=true P:popNext() elseif P.frameRun==60 or P.frameRun==120 then - if P.id==1 then SFX.play("ready")end + if P.id==1 then SFX.play('ready')end end if P.movDir~=0 then if P.moving3 then + if P.AI_mode~='CC'or C[1]>3 then P.AI_delay=P.AI_delay0*2 else P.AI_delay=P.AI_delay0*.5 @@ -283,7 +283,7 @@ function update.alive(P,dt) goto stop else local L=#P.clearingRow - if P.sound and ENV.fall>0 and #P.field+L>P.clearingRow[L]then SFX.play("fall")end + if P.sound and ENV.fall>0 and #P.field+L>P.clearingRow[L]then SFX.play('fall')end P.clearingRow={} end end @@ -307,7 +307,7 @@ function update.alive(P,dt) if D==1 then if ENV.moveFX and ENV.block then - P:createMoveFX("down") + P:createMoveFX('down') end P.curY=P.curY-1 else @@ -315,19 +315,19 @@ function update.alive(P,dt) if D>P.curY-P.ghoY then D=P.curY-P.ghoY end if ENV.moveFX and ENV.block then for _=1,D do - P:createMoveFX("down") + P:createMoveFX('down') P.curY=P.curY-1 end else P.curY=P.curY-D end end - P:freshBlock("fresh") + P:freshBlock('fresh') P.spinLast=false if P.ghoY~=P.curY then P.dropDelay=ENV.drop - elseif P.AI_mode=="CC"and P.AI_bot then + elseif P.AI_mode=='CC'and P.AI_bot then CC.updateField(P) if not P.AIdata._20G and ENV.drop=0 then goto stop end P:drop() - if P.AI_mode=="CC"and P.AI_bot then + if P.AI_mode=='CC'and P.AI_bot then CC.updateField(P) end end @@ -378,7 +378,7 @@ function update.dead(P,dt) P.falling=P.falling-1 if P.falling<0 then local L=#P.clearingRow - if P.sound and P.gameEnv.fall>0 and #P.field+L>P.clearingRow[L]then SFX.play("fall")end + if P.sound and P.gameEnv.fall>0 and #P.field+L>P.clearingRow[L]then SFX.play('fall')end P.clearingRow={} end end diff --git a/parts/scenes/about.lua b/parts/scenes/about.lua index 6ec7cbd3..c7402dd0 100644 --- a/parts/scenes/about.lua +++ b/parts/scenes/about.lua @@ -13,7 +13,7 @@ function scene.draw() setFont(20) gc.setColor(1,1,1) for i=1,#text.help do - gc.printf(text.help[i],150,35*i+40,1000,"center") + gc.printf(text.help[i],150,35*i+40,1000,'center') end --Lib used @@ -24,8 +24,8 @@ function scene.draw() --Sponsor code gc.draw(TEXTURE.title,280,610,.1,.4+.03*sin(t*2.6),nil,580,118) gc.setLineWidth(3) - gc.rectangle("line",18,18,263,263) - gc.rectangle("line",1012,18,250,250) + gc.rectangle('line',18,18,263,263) + gc.rectangle('line',1012,18,250,250) --Group code setFont(20) diff --git a/parts/scenes/account.lua b/parts/scenes/account.lua index 941c7263..0bfb976f 100644 --- a/parts/scenes/account.lua +++ b/parts/scenes/account.lua @@ -7,7 +7,7 @@ function scene.sceneInit() end scene.widgetList={ - WIDGET.newText{name="title",x=80,y=50,font=70,align="L"}, + WIDGET.newText{name="title",x=80,y=50,font=70,align='L'}, WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/app_15p.lua b/parts/scenes/app_15p.lua index 92d20267..db209364 100644 --- a/parts/scenes/app_15p.lua +++ b/parts/scenes/app_15p.lua @@ -13,8 +13,8 @@ local color,blind local slide,pathVis,revKB function scene.sceneInit() - BG.set("rainbow2") - BGM.play("push") + BG.set('rainbow2') + BGM.play('push') board={{1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}} cx,cy=4,4 startTime=0 @@ -127,10 +127,10 @@ local function tapBoard(x,y,key) elseif time<60 then LOG.print("多加练习",COLOR.lB) else LOG.print("第一次玩?加油",COLOR.lB) end - SFX.play("win") + SFX.play('win') return end - SFX.play("move") + SFX.play('move') end end end @@ -274,7 +274,7 @@ function scene.draw() if state==2 then --Draw no-setting area gc.setColor(1,0,0,.3) - gc.rectangle("fill",15,295,285,340) + gc.rectangle('fill',15,295,285,340) gc.setColor(.9,.9,0)--win elseif state==1 then @@ -283,7 +283,7 @@ function scene.draw() gc.setColor(.2,.8,.2)--ready end gc.setLineWidth(10) - gc.rectangle("line",313,33,654,654,18) + gc.rectangle('line',313,33,654,654,18) gc.setLineWidth(4) local mono=blind and state==1 @@ -295,9 +295,9 @@ function scene.draw() local C=mono and 3 or color gc.setColor(backColor[C][N]) - gc.rectangle("fill",j*160+163,i*160-117,154,154,8) + gc.rectangle('fill',j*160+163,i*160-117,154,154,8) gc.setColor(frontColor[C][N]) - gc.rectangle("line",j*160+163,i*160-117,154,154,8) + gc.rectangle('line',j*160+163,i*160-117,154,154,8) if not mono then gc.setColor(.1,.1,.1) mStr(N,j*160+240,i*160-96) @@ -310,12 +310,12 @@ function scene.draw() end gc.setColor(0,0,0,.3) gc.setLineWidth(10) - gc.rectangle("line",cx*160+173,cy*160-107,134,134,50) + gc.rectangle('line',cx*160+173,cy*160-107,134,134,50) end local function Gaming()return state==1 end scene.widgetList={ - WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color="lG", font=40,code=pressKey"space"}, + WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG', font=40,code=pressKey"space"}, WIDGET.newSlider{name="color", x=110,y=250,w=170,unit=4,show=false,font=30,disp=function()return color end, code=function(v)if state~=1 then color=v end end,hide=Gaming}, WIDGET.newSwitch{name="blind", x=240,y=330,w=60, font=40,disp=function()return blind end, code=pressKey"w", hide=Gaming}, WIDGET.newSwitch{name="slide", x=240,y=420,w=60, font=40,disp=function()return slide end, code=pressKey"e", hide=Gaming}, diff --git a/parts/scenes/app_2048.lua b/parts/scenes/app_2048.lua index 8109a0f0..122ac7a2 100644 --- a/parts/scenes/app_2048.lua +++ b/parts/scenes/app_2048.lua @@ -82,7 +82,7 @@ local function newTile() --Fresh score score=score+2^nextTile - TEXT.show("+"..2^nextTile,1130+rnd(-60,60),575+rnd(-30,30),30,"score",1.5) + TEXT.show("+"..2^nextTile,1130+rnd(-60,60),575+rnd(-30,30),30,'score',1.5) --Generate next number nextCD=nextCD-1 @@ -114,12 +114,12 @@ local function newTile() --Die. state=2 - SFX.play(maxTile>=10 and"win"or"fail") + SFX.play(maxTile>=10 and'win'or'fail') end local function freshMaxTile() maxTile=maxTile+1 if maxTile==12 then skipper.cd=0 end - SFX.play("reach") + SFX.play('reach') ins(progress,("%s - %.3fs"):format(tileName[maxTile],TIME()-startTime)) end local function squash(L) @@ -216,16 +216,16 @@ local function skip() skipper.cd=1024 skipper.used=true newTile() - SFX.play("hold") + SFX.play('hold') else - SFX.play("finesseError") + SFX.play('finesseError') end end end function scene.sceneInit() - BG.set("cubes") - BGM.play("truth") + BG.set('cubes') + BGM.play('truth') board={} blind=false @@ -305,14 +305,14 @@ function scene.keyDown(key,auto) if skipper.cd and skipper.cd>0 then skipper.cd=skipper.cd-1 if skipper.cd==0 then - SFX.play("spin_0") + SFX.play('spin_0') end end newTile() - TEXT.show(arrows[key],640,360,80,"beat",3) + TEXT.show(arrows[key],640,360,80,'beat',3) move=move+1 if not auto then - SFX.play("move") + SFX.play('move') end end end @@ -365,15 +365,15 @@ function scene.draw() setColor(COLOR[ repeater.focus==i and( TIME()%.5>.25 and - "R"or - "Y" + 'R'or + 'Y' )or( repeater.seq[i]==repeater.last[i]and - "H"or - "Z" + 'H'or + 'Z' ) ]) - rectangle("line",990,305+60*i,220,50) + rectangle('line',990,305+60*i,220,50) gc.print(repeater.seq[i],1000,313+60*i) end @@ -386,7 +386,7 @@ function scene.draw() if state==2 then --Draw no-setting area setColor(1,0,0,.3) - rectangle("fill",15,265,285,140) + rectangle('fill',15,265,285,140) setColor(.9,.9,0)--win elseif state==1 then @@ -395,7 +395,7 @@ function scene.draw() setColor(.2,.8,.2)--ready end gc.setLineWidth(10) - rectangle("line",310,30,660,660) + rectangle('line',310,30,660,660) --Board for i=1,16 do @@ -405,7 +405,7 @@ function scene.draw() if i~=prevPos or prevSpawnTime==1 then if not blind or i==prevPos then setColor(tileColor[N]or COLOR.D) - rectangle("fill",x*160+163,y*160-117,154,154,15) + rectangle('fill',x*160+163,y*160-117,154,154,15) if N>=0 then setColor(N<3 and COLOR.D or COLOR.Z) local fontSize=tileFont[N] @@ -414,12 +414,12 @@ function scene.draw() end else setColor(COLOR.H) - rectangle("fill",x*160+163,y*160-117,154,154,15) + rectangle('fill',x*160+163,y*160-117,154,154,15) end else local c=tileColor[N] setColor(c[1],c[2],c[3],prevSpawnTime) - rectangle("fill",x*160+163,y*160-117,154,154,15) + rectangle('fill',x*160+163,y*160-117,154,154,15) c=N<3 and 0 or 1 setColor(c,c,c,prevSpawnTime) local fontSize=tileFont[N] @@ -433,7 +433,7 @@ function scene.draw() setColor(1,1,1) if nextCD<=12 then for i=1,nextCD do - rectangle("fill",140+i*16-nextCD*8,170,12,12) + rectangle('fill',140+i*16-nextCD*8,170,12,12) end end @@ -456,7 +456,7 @@ function scene.draw() --Skip mark if skipper.used then setColor(1,1,.5) - gc.circle("fill",280,675,10) + gc.circle('fill',280,675,10) end --New tile position @@ -464,7 +464,7 @@ function scene.draw() gc.setLineWidth(8) setColor(.2,.8,0,prevSpawnTime) local d=25-prevSpawnTime*25 - rectangle("line",x*160+163-d,y*160-117-d,154+2*d,154+2*d,15) + rectangle('line',x*160+163-d,y*160-117-d,154+2*d,154+2*d,15) --Touch control boarder line if tapControl then @@ -474,24 +474,24 @@ function scene.draw() gc.line(970,30,700,300) gc.line(310,690,580,420) gc.line(970,690,700,420) - rectangle("line",580,300,120,120,10) + rectangle('line',580,300,120,120,10) end end scene.widgetList={ - WIDGET.newButton{name="reset", x=155,y=100,w=180,h=100,color="lG",font=40,code=pressKey"r"}, + WIDGET.newButton{name="reset", x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, WIDGET.newSwitch{name="blind", x=240,y=300,w=60,font=40,disp=function()return blind end,code=pressKey"q",hide=function()return state==1 end}, WIDGET.newSwitch{name="tapControl", x=240,y=370,w=60,font=40,disp=function()return tapControl end,code=pressKey"w",hide=function()return state==1 end}, - WIDGET.newKey{name="up", x=155,y=460,w=100,fText="↑",font=50,color="Y",code=pressKey"up",hide=function()return tapControl end}, - WIDGET.newKey{name="down", x=155,y=660,w=100,fText="↓",font=50,color="Y",code=pressKey"down",hide=function()return tapControl end}, - WIDGET.newKey{name="left", x=55,y=560,w=100,fText="←",font=50,color="Y",code=pressKey"left",hide=function()return tapControl end}, - WIDGET.newKey{name="right", x=255,y=560,w=100,fText="→",font=50,color="Y",code=pressKey"right",hide=function()return tapControl end}, - WIDGET.newKey{name="skip", x=155,y=400,w=100,font=20, color="Y",code=pressKey"space",hide=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, - WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="", color="H",code=pressKey"1",hide=function()return state==2 end}, - WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="", color="H",code=pressKey"2",hide=function()return state==2 end}, - WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!", color="G",code=pressKey"c1",hide=function()return state==2 or #repeater.seq[1]==0 end}, - WIDGET.newKey{name="replay2", x=1245,y=450,w=50,fText="!", color="G",code=pressKey"c2",hide=function()return state==2 or #repeater.seq[2]==0 end}, + WIDGET.newKey{name="up", x=155,y=460,w=100,fText="↑",font=50,color='Y',code=pressKey"up",hide=function()return tapControl end}, + WIDGET.newKey{name="down", x=155,y=660,w=100,fText="↓",font=50,color='Y',code=pressKey"down",hide=function()return tapControl end}, + WIDGET.newKey{name="left", x=55,y=560,w=100,fText="←",font=50,color='Y',code=pressKey"left",hide=function()return tapControl end}, + WIDGET.newKey{name="right", x=255,y=560,w=100,fText="→",font=50,color='Y',code=pressKey"right",hide=function()return tapControl end}, + WIDGET.newKey{name="skip", x=155,y=400,w=100,font=20, color='Y',code=pressKey"space",hide=function()return state~=1 or not skipper.cd or skipper.cd>0 end}, + WIDGET.newKey{name="record1", x=1100,y=390,w=220,h=50,fText="", color='H',code=pressKey"1",hide=function()return state==2 end}, + WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="", color='H',code=pressKey"2",hide=function()return state==2 end}, + WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!", color='G',code=pressKey"c1",hide=function()return state==2 or #repeater.seq[1]==0 end}, + WIDGET.newKey{name="replay2", x=1245,y=450,w=50,fText="!", color='G',code=pressKey"c2",hide=function()return state==2 or #repeater.seq[2]==0 end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/app_AtoZ.lua b/parts/scenes/app_AtoZ.lua index c5388d7b..fa9584f6 100644 --- a/parts/scenes/app_AtoZ.lua +++ b/parts/scenes/app_AtoZ.lua @@ -31,8 +31,8 @@ local state,progress local frameKeyCount,mistake function scene.sceneInit() - BG.set("bg2") - BGM.play("way") + BG.set('bg2') + BGM.play('way') levelName="A_Z" targetString=levels.A_Z progress=1 @@ -53,19 +53,19 @@ function scene.keyDown(key) if key:upper():byte()==targetString:byte(progress)then progress=progress+1 frameKeyCount=frameKeyCount+1 - TEXT.show(key:upper(),rnd(320,960),rnd(100,240),90,"score",2.6) - SFX.play("move") + TEXT.show(key:upper(),rnd(320,960),rnd(100,240),90,'score',2.6) + SFX.play('move') if progress==2 then state=1 startTime=TIME() elseif progress>#targetString then time=TIME()-startTime state=2 - SFX.play("reach") + SFX.play('reach') end elseif progress>1 then mistake=mistake+1 - SFX.play("finesseError") + SFX.play('finesseError') end end elseif key=="space"then @@ -116,8 +116,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newSelector{name="level", x=640,y=640,w=200,list={"A_Z","Z_A","Tech1","Tech2","KeyTest1","KeyTest2","Hello","Roll1","Roll2","Roll3","ZZZ","ZXZX","ZMZM","Stair","Stair2","Stair3","BPW"},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hide=function()return state>0 end}, - WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color="lG",font=40,code=pressKey"space"}, + WIDGET.newSelector{name="level", x=640,y=640,w=200,list={'A_Z','Z_A','Tech1','Tech2','KeyTest1','KeyTest2','Hello','Roll1','Roll2','Roll3','ZZZ','ZXZX','ZMZM','Stair','Stair2','Stair3','BPW'},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hide=function()return state>0 end}, + WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space"}, WIDGET.newButton{name="keyboard", x=160,y=210,w=180,h=100,code=function()love.keyboard.setTextInput(true,0,select(2,SCR.xOy:transformPoint(0,500)),1,1)end,hide=not MOBILE}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/app_UTTT.lua b/parts/scenes/app_UTTT.lua index 0a4255a9..cb4ea532 100644 --- a/parts/scenes/app_UTTT.lua +++ b/parts/scenes/app_UTTT.lua @@ -57,7 +57,7 @@ local function full(L) end local function place(X,x) board[X][x]=round - SFX.play("move") + SFX.play('move') lastX,lastx=X,x curX,curx=nil placeTime=TIME() @@ -65,7 +65,7 @@ local function place(X,x) score[X]=round if checkBoard(score,round)then gameover=round - SFX.play("win") + SFX.play('win') return else if full(score)then @@ -73,10 +73,10 @@ local function place(X,x) return end end - SFX.play("reach") + SFX.play('reach') else if full(board[X])then - SFX.play("emit") + SFX.play('emit') score[X]=true if full(score)then gameover=true @@ -96,32 +96,32 @@ local scene={} function scene.sceneInit() restart() - BGM.play("truth") - BG.set("rainbow") + BGM.play('truth') + BG.set('rainbow') end function scene.draw() - gc.push("transform") + gc.push('transform') --origin pos:0,140; scale:4 gc.translate(280,0) gc.scale(8) --Draw board gc.setColor(0,0,0,.4) - gc.rectangle("fill",0,0,90,90) + gc.rectangle('fill',0,0,90,90) --Draw target area gc.setColor(1,1,1,math.sin((TIME()-placeTime)*5)/5+.2) if target then - gc.rectangle("fill",(target-1)%3*30,int((target-1)/3)*30,30,30) + gc.rectangle('fill',(target-1)%3*30,int((target-1)/3)*30,30,30) elseif not gameover then - gc.rectangle("fill",0,0,90,90) + gc.rectangle('fill',0,0,90,90) end --Draw cursor if curX then gc.setColor(1,1,1,.3) - gc.rectangle("fill",(curX-1)%3*30+(curx-1)%3*10-.5,int((curX-1)/3)*30+int((curx-1)/3)*10-.5,11,11) + gc.rectangle('fill',(curX-1)%3*30+(curx-1)%3*10-.5,int((curX-1)/3)*30+int((curx-1)/3)*10-.5,11,11) end gc.setLineWidth(.8) @@ -134,7 +134,7 @@ function scene.draw() else gc.setColor(0,0,0) end - gc.rectangle("fill",(X-1)%3*30,int((X-1)/3)*30,30,30) + gc.rectangle('fill',(X-1)%3*30,int((X-1)/3)*30,30,30) end for x=1,9 do local c=board[X][x] @@ -143,7 +143,7 @@ function scene.draw() local _y=int((X-1)/3)*30+int((x-1)/3)*10 if c==0 then gc.setColor(1,.2,.2) - gc.rectangle("line",_x+2.25,_y+2.25,5.5,5.5) + gc.rectangle('line',_x+2.25,_y+2.25,5.5,5.5) else gc.setColor(.3,.3,1) gc.line(_x+2,_y+2,_x+8,_y+8) @@ -165,7 +165,7 @@ function scene.draw() if lastX then gc.setColor(.5,1,.4,.8) local r=.5+.5*math.sin(TIME()*6.26) - gc.rectangle("line",(lastX-1)%3*30+(lastx-1)%3*10-r,int((lastX-1)/3)*30+int((lastx-1)/3)*10-r,10+2*r,10+2*r) + gc.rectangle('line',(lastX-1)%3*30+(lastx-1)%3*10-r,int((lastX-1)/3)*30+int((lastx-1)/3)*10-r,10+2*r,10+2*r) end gc.pop() @@ -185,15 +185,15 @@ function scene.draw() else --Draw current round mark gc.setColor(.8,.8,.8,.8) - gc.rectangle("fill",80,80,160,160) + gc.rectangle('fill',80,80,160,160) gc.setColor(1,1,1) gc.setLineWidth(6) - gc.rectangle("line",80,80,160,160) + gc.rectangle('line',80,80,160,160) gc.setLineWidth(10) if round==0 then gc.setColor(1,0,0) - gc.rectangle("line",160-40,160-40,80,80) + gc.rectangle('line',160-40,160-40,80,80) else gc.setColor(0,0,1) gc.line(160-45,160-45,160+45,160+45) @@ -235,7 +235,7 @@ function scene.mouseDown(x,y) end scene.widgetList={ - WIDGET.newButton{name="reset",x=1140,y=540,w=170,h=80,font=40,color="lG",code=restart}, + WIDGET.newButton{name="reset",x=1140,y=540,w=170,h=80,font=40,color='lG',code=restart}, WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/app_calc.lua b/parts/scenes/app_calc.lua index 64183a66..0601b793 100644 --- a/parts/scenes/app_calc.lua +++ b/parts/scenes/app_calc.lua @@ -8,7 +8,7 @@ local val--result value local sym--symbol function scene.sceneInit() - BG.set("none") + BG.set('none') reg=false val="0" sym=false @@ -32,7 +32,7 @@ function scene.keyDown(k) elseif k:sub(1,2)=="kp"then scene.keyDown(k:sub(3)) elseif k=="."then - if not(val:find(".",nil,true)or val:find"e")then + if not(val:find(".",nil,true)or val:find("e"))then if sym and not reg then reg=val val="0." @@ -40,7 +40,7 @@ function scene.keyDown(k) val=val.."." end elseif k=="e"then - if not val:find"e"then + if not val:find("e")then val=val.."e" end elseif k=="backspace"then @@ -83,10 +83,10 @@ end function scene.draw() gc.setColor(1,1,1) gc.setLineWidth(4) - gc.rectangle("line",100,80,650,150) + gc.rectangle('line',100,80,650,150) setFont(45) - if reg then gc.printf(reg,0,100,720,"right")end - if val then gc.printf(val,0,150,720,"right")end + if reg then gc.printf(reg,0,100,720,'right')end + if val then gc.printf(val,0,150,720,'right')end if sym then setFont(50)gc.print(sym,126,150)end end @@ -101,14 +101,14 @@ scene.widgetList={ WIDGET.newKey{name="_8",x=250,y=500,w=90,fText="8",font=50,code=pressKey"8"}, WIDGET.newKey{name="_9",x=350,y=500,w=90,fText="9",font=50,code=pressKey"9"}, WIDGET.newKey{name="_0",x=150,y=600,w=90,fText="0",font=50,code=pressKey"0"}, - WIDGET.newKey{name=".",x=250,y=600,w=90,fText=".",color="lM",font=50,code=pressKey"."}, - WIDGET.newKey{name="e",x=350,y=600,w=90,fText="e",color="lM",font=50,code=pressKey"e"}, - WIDGET.newKey{name="+",x=450,y=300,w=90,fText="+",color="lB",font=50,code=pressKey"+"}, - WIDGET.newKey{name="-",x=450,y=400,w=90,fText="-",color="lB",font=50,code=pressKey"-"}, - WIDGET.newKey{name="*",x=450,y=500,w=90,fText="*",color="lB",font=50,code=pressKey"*"}, - WIDGET.newKey{name="/",x=450,y=600,w=90,fText="/",color="lB",font=50,code=pressKey"/"}, - WIDGET.newKey{name="<",x=550,y=300,w=90,fText="<",color="lR",font=50,code=pressKey"backspace"}, - WIDGET.newKey{name="=",x=550,y=400,w=90,fText="=",color="lY",font=50,code=pressKey"return"}, + WIDGET.newKey{name=".",x=250,y=600,w=90,fText=".",color='lM',font=50,code=pressKey"."}, + WIDGET.newKey{name="e",x=350,y=600,w=90,fText="e",color='lM',font=50,code=pressKey"e"}, + WIDGET.newKey{name="+",x=450,y=300,w=90,fText="+",color='lB',font=50,code=pressKey"+"}, + WIDGET.newKey{name="-",x=450,y=400,w=90,fText="-",color='lB',font=50,code=pressKey"-"}, + WIDGET.newKey{name="*",x=450,y=500,w=90,fText="*",color='lB',font=50,code=pressKey"*"}, + WIDGET.newKey{name="/",x=450,y=600,w=90,fText="/",color='lB',font=50,code=pressKey"/"}, + WIDGET.newKey{name="<",x=550,y=300,w=90,fText="<",color='lR',font=50,code=pressKey"backspace"}, + WIDGET.newKey{name="=",x=550,y=400,w=90,fText="=",color='lY',font=50,code=pressKey"return"}, WIDGET.newKey{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/app_cannon.lua b/parts/scenes/app_cannon.lua index 8cd8de65..81d9e990 100644 --- a/parts/scenes/app_cannon.lua +++ b/parts/scenes/app_cannon.lua @@ -13,8 +13,8 @@ function scene.sceneInit() score,combo=0,0 x,y=160,500 ex,ey=626,260 - BG.set("matrix") - BGM.play("hang out") + BG.set('matrix') + BGM.play('hang out') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -57,14 +57,14 @@ function scene.update() score=math.min(score+4+combo*2,626) combo=combo+1 ex,ey=rnd(626,1100),rnd(26,700) - SFX.play("reach") + SFX.play('reach') e=true end if x>1280 or y>720 then if score>0 then score=score-int(score/10) end - SFX.play("finesseError") + SFX.play('finesseError') combo=0 e=true end @@ -76,29 +76,29 @@ function scene.update() end local scoreColor={ - "Z",--0 - "A",--20 - "N",--40 - "B",--60 - "P",--80 - "W",--100 - "R","F","O","Y","lA",--200 - "lN","lB","lP","lW","lR",--300 - "lF","lO","lY","dA","dN",--400 - "dB","dP","dW","dR","dF",--500 - "dY","lH","H","dH",--before 600, black after + 'Z',--0 + 'A',--20 + 'N',--40 + 'B',--60 + 'P',--80 + 'W',--100 + 'R','F','O','Y','lA',--200 + 'lN','lB','lP','lW','lR',--300 + 'lF','lO','lY','dA','dN',--400 + 'dB','dP','dW','dR','dF',--500 + 'dY','lH','H','dH',--before 600, black after } function scene.draw() --Spawn area gc.setColor(1,1,1,.2) - gc.rectangle("fill",85,0,190,720) + gc.rectangle('fill',85,0,190,720) --Power & Angle gc.setColor(1,1,1) if state~=2 then gc.setLineWidth(2) - gc.rectangle("fill",x-80,y+20,pow*1.6,16) - gc.rectangle("line",x-80,y+20,160,15) + gc.rectangle('fill',x-80,y+20,pow*1.6,16) + gc.rectangle('line',x-80,y+20,160,15) if state==1 then gc.setLineWidth(5) gc.line(x,y,x+(20+2*pow)*cos(ang),y-(20+2*pow)*sin(ang)) @@ -111,11 +111,11 @@ function scene.draw() gc.setColor(1,1,.6) gc.print("x"..combo,300,80) end - gc.setColor(COLOR[scoreColor[int(score/20)+1]or"D"]) + gc.setColor(COLOR[scoreColor[int(score/20)+1]or'D']) gc.print(score,300,30) --Cannon ball - gc.circle("fill",x,y,15) + gc.circle('fill',x,y,15) --Arrow if y<-15 then @@ -124,7 +124,7 @@ function scene.draw() --Target gc.setColor(1,1,.4) - gc.circle("fill",ex,ey,15) + gc.circle('fill',ex,ey,15) end scene.widgetList={ diff --git a/parts/scenes/app_console.lua b/parts/scenes/app_console.lua index 29f43554..67657685 100644 --- a/parts/scenes/app_console.lua +++ b/parts/scenes/app_console.lua @@ -278,7 +278,7 @@ function commands.print(name) if name~=""then local info=love.filesystem.getInfo(name) if info then - if info.type=="file"then + if info.type=='file'then log{COLOR.lC,"/* "..name.." */"} for l in love.filesystem.lines(name)do log(l) @@ -307,9 +307,9 @@ end do--function commands.tree() local function tree(path,name,depth) local info=love.filesystem.getInfo(path..name) - if info.type=="file"then + if info.type=='file'then log(("\t\t"):rep(depth)..name) - elseif info.type=="directory"then + elseif info.type=='directory'then log(("\t\t"):rep(depth)..name..">") local L=love.filesystem.getDirectoryItems(path..name) for _,subName in next,L do @@ -320,7 +320,7 @@ do--function commands.tree() end end function commands.tree() - local L=love.filesystem.getDirectoryItems("") + local L=love.filesystem.getDirectoryItems"" for _,name in next,L do if love.filesystem.getRealDirectory(name)==SAVEDIR then tree("",name,0) @@ -360,9 +360,9 @@ do--function commands.del(name) local path=dir.."/"..name local info=love.filesystem.getInfo(path) if info then - if info.type=="file"then + if info.type=='file'then delFile(path) - elseif info.type=="directory"then + elseif info.type=='directory'then recursiveDelDir(path) else log("Unkown item type: %s (%s)"):format(name,info.type) @@ -379,13 +379,13 @@ do--function commands.del(name) if name~=""then local info=love.filesystem.getInfo(name) if info then - if info.type=="file"then + if info.type=='file'then if recursive then log{C.R,name.." is not a directory."} else delFile(name) end - elseif info.type=="directory"then + elseif info.type=='directory'then (recursive and recursiveDelDir or delDir)(name) else log("Unkown item type: %s (%s)"):format(name,info.type) @@ -440,7 +440,7 @@ function commands.rmwtm(pw) if pw==the_secret then _G["\100\114\97\119\70\87\77"]=NULL log{C.lC,"\87\97\116\101\114\109\97\114\107\32\82\101\109\111\118\101\100"} - SFX.play("clear") + SFX.play('clear') else log{C.aqua,"Usage: rmwtm [password]"} end @@ -448,13 +448,13 @@ end function commands.unlockall(bool) if bool=="sure"then for name,M in next,MODES do - if type(name)=="string"and not RANKS[name]and M.x then + if type(name)=='string'and not RANKS[name]and M.x then RANKS[name]=M.score and 0 or 6 end end FILE.save(RANKS,"conf/unlock") log{C.lC,"\85\78\76\79\67\75\65\76\76"} - SFX.play("clear_2") + SFX.play('clear_2') else log"Are you sure to unlock all modes?" log"Type: unlockall sure" @@ -515,7 +515,7 @@ function commands.theme(name) end end function commands.demo() - SCN.go("test","none") + SCN.go('test','none') end do--commands.applet(name) local appList={"15p","grid","pong","atoz","uttt","cube","2048","ten","tap","dtw","cannon","dropper","calc","reflect","polyforge"} @@ -565,15 +565,15 @@ local combKey={} function combKey.x() love.system.setClipboardText(inputBox.value) inputBox.value="" - SFX.play("reach") + SFX.play('reach') end function combKey.c() love.system.setClipboardText(inputBox.value) - SFX.play("reach") + SFX.play('reach') end function combKey.v() inputBox.value=inputBox.value..love.system.getClipboardText() - SFX.play("reach") + SFX.play('reach') end @@ -635,7 +635,7 @@ local scene={} function scene.sceneInit() TASK.new(function()YIELD()WIDGET.sel=inputBox end) - BG.set("none") + BG.set('none') end function scene.keyDown(k) diff --git a/parts/scenes/app_cubefield.lua b/parts/scenes/app_cubefield.lua index 3b29d8e3..813d07f1 100644 --- a/parts/scenes/app_cubefield.lua +++ b/parts/scenes/app_cubefield.lua @@ -42,9 +42,9 @@ local function hurt(i) speed=speed*.5 moveDir=0 score=int(score) - SFX.play("clear_4") + SFX.play('clear_4') else - SFX.play("clear_2") + SFX.play('clear_2') end end @@ -61,9 +61,9 @@ function scene.sceneInit() score=0 sunH,color,rot=0,{.878,.752,0},0 - gc.setLineJoin("bevel") - BGM.play("push") - BG.set("none") + gc.setLineJoin('bevel') + BGM.play('push') + BG.set('none') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -175,7 +175,7 @@ function scene.update(dt) if score>1000*level then if speed<3 then speed=speed+.2 end level=level+1 - SFX.play("blip_1") + SFX.play('blip_1') end sunH=sunH+.01 elseif menu==1 then @@ -200,33 +200,33 @@ function scene.draw() --Health bar if life1>0 then gc.setColor(1,0,0) - gc.rectangle("fill",640-life1*.64,710,life1*1.28,10) + gc.rectangle('fill',640-life1*.64,710,life1*1.28,10) end --Draw player if play and inv%8<4 then gc.setColor(1,1,1) - gc.rectangle("fill",620,670,40,40) + gc.rectangle('fill',620,670,40,40) end --Set screen rotation - gc.push("transform") + gc.push('transform') gc.translate(640,690) gc.rotate(rot) --Draw sun gc.setColor(.7,.5,.3) - gc.circle("fill",0,-380-sunH,60) + gc.circle('fill',0,-380-sunH,60) --Draw sun-board gc.setColor(.15,.15,.15) - gc.rectangle("fill",-60,-440,120,120) + gc.rectangle('fill',-60,-440,120,120) --Draw direction if play then gc.setLineWidth(3) gc.setColor(1,1,1,.1) - gc.polygon("fill",-15,30,0,-440,15,30) + gc.polygon('fill',-15,30,0,-440,15,30) end --Draw Horizon/Direction @@ -243,10 +243,10 @@ function scene.draw() local y=5/(10-Y)*150-50 if Y>1 then gc.setColor(color) - gc.rectangle("fill",x,y-485,size,size) + gc.rectangle('fill',x,y-485,size,size) gc.setLineWidth(size*.05) gc.setColor(1,1,1) - gc.rectangle("line",x,y-485,size,size) + gc.rectangle('line',x,y-485,size,size) end if play and y>420 and y<480 and x<8 and x+size>-8 and inv==0 then @@ -276,10 +276,10 @@ function scene.draw() end else gc.setColor(1,1,1) - gc.rectangle("fill",-20,-20+ct,40,40) + gc.rectangle('fill',-20,-20+ct,40,40) gc.setColor(1,1,1,(1-ct/60)*.1) - gc.polygon("fill",-15,30,0,-440,15,30) + gc.polygon('fill',-15,30,0,-440,15,30) gc.setColor(1,1,1,ct/60) diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index 85b42276..070d48cf 100644 --- a/parts/scenes/app_dropper.lua +++ b/parts/scenes/app_dropper.lua @@ -31,9 +31,9 @@ end function scene.sceneInit() restart() - state="menu" - BGM.play("hang out") - BG.set("space") + state='menu' + BGM.play('hang out') + BG.set('space') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -42,7 +42,7 @@ end function scene.keyDown(key) if key=="space"or key=="return"then - if state=="move"then + if state=='move'then if floor>0 then if move.x0 and move.x+move.l>=1280 then - SFX.play("lock") + SFX.play('lock') speed=-speed end - elseif state=="drop"then + elseif state=='drop'then move.y=move.y+18 if move.y>=660 then if move.x>base.x+base.l or move.x+move.l0 and move.x==base.x then - SFX.play("ren_mega") + SFX.play('ren_mega') end - state="shorten" + state='shorten' end end - elseif state=="shorten"then + elseif state=='shorten'then if move.x>base.x+base.l or move.x+move.lbase.x+base.l then move.l=move.l-5 else - state="climb" + state='climb' end - elseif state=="climb"then + elseif state=='climb'then if base.y<720 then move.y=move.y+3 base.y=base.y+3 @@ -135,22 +135,22 @@ function scene.update() speed=-10 end move.y=rnd(max(260-floor*4,60),max(420-floor*5,100)) - state="move" + state='move' end - elseif state=="die"then + elseif state=='die'then move.y=move.y+18 if move.y>1000 then highScore=max(score,highScore) highFloor=max(floor,floor) - state="dead" + state='dead' end - elseif state=="scroll"then + elseif state=='scroll'then camY=camY-floor/4 if camY<1000 then camY=camY-1 end if camY<500 then camY=camY-1 end if camY<0 then restart() - state="move" + state='move' end end end @@ -175,15 +175,15 @@ function scene.draw() --Background local lv,height=int(camY/700),camY%700 gc.setColor(backColor[lv+1]or COLOR.D) - gc.rectangle("fill",0,720,1280,height-700) + gc.rectangle('fill',0,720,1280,height-700) gc.setColor(backColor[lv+2]or COLOR.D) - gc.rectangle("fill",0,height+20,1280,-height-20) + gc.rectangle('fill',0,height+20,1280,-height-20) if height-680>0 then gc.setColor(backColor[lv+3]or COLOR.D) - gc.rectangle("fill",0,height-680,1280,680-height) + gc.rectangle('fill',0,height-680,1280,680-height) end - if state=="menu"or state=="dead"then + if state=='menu'or state=='dead'then setFont(100) gc.setColor(COLOR.rainbow_light(TIME()*2.6)) mStr("DROPPER",640,120) @@ -201,7 +201,7 @@ function scene.draw() gc.print("Original CX-CAS version by MrZ",740,235) gc.print("Ported / Rewritten / Balanced by MrZ",740,260) end - if state~="menu"then + if state~='menu'then --High floor gc.setColor(1,1,1) gc.setLineWidth(2) @@ -209,8 +209,8 @@ function scene.draw() gc.line(0,y,1280,y) gc.setLineWidth(6) - gc.rectangle("line",move.x-3,move.y-3,move.l+6,36) - gc.rectangle("line",base.x-3,base.y-3,base.l+6,36) + gc.rectangle('line',move.x-3,move.y-3,move.l+6,36) + gc.rectangle('line',base.x-3,base.y-3,base.l+6,36) setFont(45) gc.print(floor+1,move.x+move.l+15,move.y-18) @@ -227,8 +227,8 @@ function scene.draw() gc.setColor(0,0,0) gc.print(score,64,43) - gc.setColor(color1)gc.rectangle("fill",move.x,move.y,move.l,30) - gc.setColor(color2)gc.rectangle("fill",base.x,base.y,base.l,30) + gc.setColor(color1)gc.rectangle('fill',move.x,move.y,move.l,30) + gc.setColor(color2)gc.rectangle('fill',base.x,base.y,base.l,30) end end diff --git a/parts/scenes/app_dtw.lua b/parts/scenes/app_dtw.lua index 87aa1ec6..1fcfd8d8 100644 --- a/parts/scenes/app_dtw.lua +++ b/parts/scenes/app_dtw.lua @@ -106,8 +106,8 @@ function scene.sceneInit() mode=1 arcade=true reset() - BG.set("gray") - BGM.play("way") + BG.set('gray') + BGM.play('way') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -123,7 +123,7 @@ local function touch(n) if n==a or n==b then if a>0 and b>0 then pos[1]=n==a and b or a - SFX.play("move") + SFX.play('move') else rem(pos,1) newTile() @@ -138,19 +138,19 @@ local function touch(n) end time=TIME()-startTime state=2 - SFX.play("win") + SFX.play('win') else - SFX.play("reach",.5) + SFX.play('reach',.5) end end height=height+120 - SFX.play("move") + SFX.play('move') end else time=TIME()-startTime state=2 diePos=n - SFX.play("clear_2") + SFX.play('clear_2') end end function scene.keyDown(key) @@ -194,7 +194,7 @@ function scene.update() rollSpeed=rollSpeed+.00355 if height<-120 then state=2 - SFX.play("clear_2") + SFX.play('clear_2') end else height=height*.6 @@ -233,16 +233,16 @@ function scene.draw() end --Draw tiles - gc.rectangle("fill",300,0,680,720) + gc.rectangle('fill',300,0,680,720) gc.setColor(tileColor[mode]) - gc.push("transform") + gc.push('transform') gc.translate(0,720-height+8) for i=1,#pos do if pos[i]<10 then - gc.rectangle("fill",130+170*pos[i]+8,-i*120,170-16,120-16) + gc.rectangle('fill',130+170*pos[i]+8,-i*120,170-16,120-16) else - gc.rectangle("fill",130+170*(pos[i]%10)+8,-i*120,170-16,120-16) - gc.rectangle("fill",130+170*int(pos[i]/10)+8,-i*120,170-16,120-16) + gc.rectangle('fill',130+170*(pos[i]%10)+8,-i*120,170-16,120-16) + gc.rectangle('fill',130+170*int(pos[i]/10)+8,-i*120,170-16,120-16) end end gc.pop() @@ -262,12 +262,12 @@ function scene.draw() --Draw red tile if diePos then gc.setColor(1,.2,.2) - gc.rectangle("fill",130+170*diePos+8,600-height+8,170-16,120-16) + gc.rectangle('fill',130+170*diePos+8,600-height+8,170-16,120-16) end --Draw score setFont(100) - gc.push("transform") + gc.push('transform') gc.translate(640,26) gc.scale(1.6) gc.setColor(.5,.5,.5,.6) @@ -276,7 +276,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=155,y=100,w=180,h=100,color="lG",font=40,code=pressKey"r"}, + WIDGET.newButton{name="reset", x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, WIDGET.newButton{name="mode", x=155,y=220,w=180,h=100,font=40,code=pressKey"q",hide=function()return state~=0 end}, WIDGET.newSwitch{name="arcade", x=230,y=330,font=40,disp=function()return arcade end,code=pressKey"w",hide=function()return state~=0 end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, diff --git a/parts/scenes/app_polyforge.lua b/parts/scenes/app_polyforge.lua index 7d0bd3ea..85f13f5a 100644 --- a/parts/scenes/app_polyforge.lua +++ b/parts/scenes/app_polyforge.lua @@ -36,8 +36,8 @@ function scene.sceneInit() hit[c],hit[c+1]=rnd(2),rnd(2) dist[c],dist[c+1]=226,126 end - BG.set("light") - BGM.play("dream") + BG.set('light') + BGM.play('dream') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -57,19 +57,19 @@ function scene.keyDown(k) if hit[c]==0 then hit[c]=1 count=count+1 - SFX.play(side<26 and"ren_"..rnd(5)or"ren_"..rnd(6,11)) + SFX.play(side<26 and'ren_'..rnd(5)or'ren_'..rnd(6,11)) if count>=12 then - SFX.play("ren_mega",(count-11)/15) + SFX.play('ren_mega',(count-11)/15) end if count==side then state=1 - SFX.play("spin_0") + SFX.play('spin_0') else - SFX.play("lock") + SFX.play('lock') end else hit[c]=2 - SFX.play("emit") + SFX.play('emit') needReset=true state=1 end @@ -130,7 +130,7 @@ function scene.draw() gc.setColor(0,0,0,1-timer/50) setFont(80) mStr(side,640,300) - gc.polygon("fill", + gc.polygon('fill', 640+cos(pos-.03)*300,360+sin(pos-.03)*300, 640+cos(pos)*285,360+sin(pos)*285, 640+cos(pos+.03)*300,360+sin(pos+.03)*300 @@ -163,7 +163,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color="D",font=40,code=pressKey"escape"}, + WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color='D',font=40,code=pressKey"escape"}, } return scene \ No newline at end of file diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index db8c9b83..6fc9c74c 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -15,8 +15,8 @@ local ry=0--Rotation Y local p1,p2--Player data function scene.sceneInit() - BG.set("none") - BGM.play("way") + BG.set('none') + BGM.play('way') state=0 bx,by=640,360 @@ -53,7 +53,7 @@ function scene.keyDown(key) vx,vy=0,0 ry=0 p1.score,p2.score=0,0 - SFX.play("hold") + SFX.play('hold') elseif key=="w"or key=="s"then p1.y0=false elseif key=="up"or key=="down"then @@ -119,7 +119,7 @@ function scene.update() vx=-vx-(vx>0 and .05 or -.5) vy=vy+d*.08+P.vy*.5 ry=P.vy - SFX.play("collect") + SFX.play('collect') else state=2 end @@ -127,14 +127,14 @@ function scene.update() if by<30 or by>690 then by=by<30 and 30 or 690 vy,ry=-vy,-ry - SFX.play("collect") + SFX.play('collect') end elseif state==2 then--Game over if bx<-120 or bx>1400 or by<-40 or by>760 then P=bx>640 and p1 or p2 P.score=P.score+1 - TEXT.show("+1",bx>1400 and 470 or 810,226,50,"score") - SFX.play("reach") + TEXT.show("+1",bx>1400 and 470 or 810,226,50,'score') + SFX.play('reach') state=0 bx,by=640,360 @@ -159,15 +159,15 @@ function scene.draw() --Draw ball & speed line gc.setColor(1,1,1-abs(ry)*.16) - gc.circle("fill",bx,by,10) + gc.circle('fill',bx,by,10) gc.setColor(1,1,1,.1) gc.line(bx+vx*22,by+vy*22,bx+vx*30,by+vy*30) --Draw pads gc.setColor(1,.8,.8) - gc.rectangle("fill",130,p1.y-50,20,100) + gc.rectangle('fill',130,p1.y-50,20,100) gc.setColor(.8,.8,1) - gc.rectangle("fill",1130,p2.y-50,20,100) + gc.rectangle('fill',1130,p2.y-50,20,100) end scene.widgetList={ diff --git a/parts/scenes/app_reflect.lua b/parts/scenes/app_reflect.lua index 7856cfe3..a053fbb9 100644 --- a/parts/scenes/app_reflect.lua +++ b/parts/scenes/app_reflect.lua @@ -16,7 +16,7 @@ end function scene.sceneInit() reset() - BG.set("none") + BG.set('none') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -36,7 +36,7 @@ function scene.keyDown(key) --BEAUTIFUL LOGIC BELOW: --early = error, [UP-key]==[target is up] = correct sfx, else = wrong sfx - SFX.play(ct>6 and"finesseError"or key%2==1==up and"reach"or"fail") + SFX.play(ct>6 and'finesseError'or key%2==1==up and'reach'or'fail') --(early && P2-key || not early && [P1-key]==[target is up]) = P1 win, else P2 win if ct>6 and key>2 or ct<=6 and key%4<2==up then @@ -103,8 +103,8 @@ function scene.draw() --Score setFont(80) - gc.printf(s1,50,300,200,"left") - gc.printf(s2,1030,300,200,"right") + gc.printf(s1,50,300,200) + gc.printf(s2,1030,300,200,'right') if state==0 then setFont(40) @@ -117,17 +117,17 @@ function scene.draw() end elseif state==1 then gc.setColor(.2,.7,.4,math.min((60-ct)/10,ct/10)*.8) - gc.arc("fill",640,360,260,-1.5708,-1.5708+(ct/60)*6.2832) + gc.arc('fill',640,360,260,-1.5708,-1.5708+(ct/60)*6.2832) elseif state==2 and ct<5 then gc.setColor(1,ct>2 and 1 or 0,0) - gc.rectangle("fill",640-100,(up and 180 or 540)-100,200,200,10) + gc.rectangle('fill',640-100,(up and 180 or 540)-100,200,200,10) elseif state==3 then local x=(60-ct)*62 gc.setColor(.4,1,.4,ct/100) if winner==1 then - gc.rectangle("fill",0,0,x,720) + gc.rectangle('fill',0,0,x,720) else - gc.rectangle("fill",1280,0,-x,720) + gc.rectangle('fill',1280,0,-x,720) end end end diff --git a/parts/scenes/app_schulteG.lua b/parts/scenes/app_schulteG.lua index a95fdf8d..db80f873 100644 --- a/parts/scenes/app_schulteG.lua +++ b/parts/scenes/app_schulteG.lua @@ -15,8 +15,8 @@ local state,progress local tapFX,mistake function scene.sceneInit() - BG.set("space") - BGM.play("way") + BG.set('space') + BGM.play('way') board={} rank=3 blind=false @@ -54,11 +54,11 @@ local function tapBoard(x,y) if board[x]==progress+1 then progress=progress+1 if progress0 @@ -151,9 +151,9 @@ function scene.draw() local N=board[rank*(i-1)+j] if not(state==1 and disappear and N<=progress)then gc.setColor(.4,.5,.6) - gc.rectangle("fill",320+(j-1)*width,(i-1)*width+40,width,width) + gc.rectangle('fill',320+(j-1)*width,(i-1)*width+40,width,width) gc.setColor(1,1,1) - gc.rectangle("line",320+(j-1)*width,(i-1)*width+40,width,width) + gc.rectangle('line',320+(j-1)*width,(i-1)*width+40,width,width) if not mono then local x,y=320+(j-.5)*width,40+(i-.5)*width-f*.67 gc.setColor(.1,.1,.1) @@ -168,7 +168,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color="lG",font=40,code=pressKey"space",hide=function()return state==0 end}, + WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space",hide=function()return state==0 end}, WIDGET.newSlider{name="rank", x=130,y=250,w=150,unit=3,show=false,font=40,disp=function()return rank-3 end,code=function(v)rank=v+3 end,hide=function()return state>0 end}, WIDGET.newSwitch{name="blind", x=240,y=330,w=60, font=40,disp=function()return blind end, code=pressKey"q",hide=function()return state==1 end}, WIDGET.newSwitch{name="disappear", x=240,y=420,w=60, font=40,disp=function()return disappear end,code=pressKey"w",hide=function()return state==1 end}, diff --git a/parts/scenes/app_tap.lua b/parts/scenes/app_tap.lua index 6c5a3b0c..bf428a8d 100644 --- a/parts/scenes/app_tap.lua +++ b/parts/scenes/app_tap.lua @@ -12,8 +12,8 @@ function scene.sceneInit() lastKey=nil speed=0 keyTime={}for i=1,40 do keyTime[i]=-1e99 end - BG.set("gray") - BGM.play("push") + BG.set('gray') + BGM.play('push') love.keyboard.setKeyRepeat(false) end function scene.sceneBack() @@ -29,7 +29,7 @@ function scene.keyDown(key) else ins(keyTime,1,TIME()) keyTime[41]=nil - SFX.play("click",.3) + SFX.play('click',.3) end end end @@ -66,13 +66,13 @@ function scene.draw() else gc.setColor(max(speed/maxSpeed*10-9,0),1-max(speed/maxSpeed*8-7,0),1-max(speed/maxSpeed*4-3,0)) end - gc.rectangle("fill",960,360,30,-320*max(speed/maxSpeed*4-3,0)) + gc.rectangle('fill',960,360,30,-320*max(speed/maxSpeed*4-3,0)) gc.setColor(1,1,1) - gc.rectangle("line",960,360,30,-320) + gc.rectangle('line',960,360,30,-320) end scene.widgetList={ - WIDGET.newKey{name="tap",x=640,y=540,w=626,h=260,fText="TAP",color="Z",font=100,code=pressKey"button"}, + WIDGET.newKey{name="tap",x=640,y=540,w=626,h=260,fText="TAP",color='Z',font=100,code=pressKey"button"}, WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/app_ten.lua b/parts/scenes/app_ten.lua index ba5ac0d7..584a3f9d 100644 --- a/parts/scenes/app_ten.lua +++ b/parts/scenes/app_ten.lua @@ -54,8 +54,8 @@ local function reset() failPos=false end function scene.sceneInit() - BG.set("rainbow2") - BGM.play("truth") + BG.set('rainbow2') + BGM.play('truth') preview={} board={{},{},{},{},{}} cx,cy=3,3 @@ -91,9 +91,9 @@ local function merge() board[cy][cx]=chosen+1 local getScore=3^(chosen-1)*math.min(int(.5+count/2),4) score=score+getScore - TEXT.show(getScore,cx*128+256,cy*128-40,40,"score") + TEXT.show(getScore,cx*128+256,cy*128-40,40,'score') SYSFX.newRectRipple(2,320+cx*128-128,40+cy*128-128,128,128) - SFX.play("lock") + SFX.play('lock') if chosen==maxTile then maxTile=chosen+1 if maxTile>=6 then @@ -104,7 +104,7 @@ local function merge() maxTile<=8 and 3 or maxTile<=11 and 4 or 5 - SFX.play("reach") + SFX.play('reach') end if chosen>=5 then SFX.play( @@ -204,10 +204,10 @@ function scene.update() for i=1,4 do for j=1,5 do if board[i][j]==board[i+1][j]then return end end end for i=1,5 do for j=1,4 do if board[i][j]==board[i][j+1]then return end end end state=2 - SFX.play("fail") + SFX.play('fail') else fallingTimer=fast and 4 or 5 - SFX.play("move") + SFX.play('move') end end elseif fast and( @@ -236,10 +236,10 @@ function scene.draw() --Previews if nexts then gc.setColor(0,0,0,.2) - rectangle("fill",20,450,280,75) + rectangle('fill',20,450,280,75) gc.setLineWidth(6) setColor(1,1,1) - rectangle("line",20,450,280,75) + rectangle('line',20,450,280,75) for i=1,5 do setFont(85-10*i) gc.setColor(tileColor[preview[i]]) @@ -250,15 +250,15 @@ function scene.draw() if state==2 then --Draw no-setting area setColor(1,0,0,.3) - rectangle("fill",15,200,285,210) + rectangle('fill',15,200,285,210) end gc.setLineWidth(10) setColor(COLOR[ - state==0 and"G"or - state==1 and(fast and"R"or"W")or - state==2 and"Y" + state==0 and'G'or + state==1 and(fast and'R'or'W')or + state==2 and'Y' ]) - rectangle("line",315,35,650,650) + rectangle('line',315,35,650,650) gc.setLineWidth(4) setFont(70) @@ -269,7 +269,7 @@ function scene.draw() if N>0 then if hide and N>maxNew then setColor(COLOR.dH) - rectangle("fill",320+j*128-128,40+i*128-128,128,128) + rectangle('fill',320+j*128-128,40+i*128-128,128,128) setColor(1,1,1,.3) mStr("?",j*128+256,i*128-75) else @@ -280,7 +280,7 @@ function scene.draw() else setColor(0,0,0,1-math.abs(TIME()%.5-.25)*6-.25) end - rectangle("fill",320+j*128-128,40+i*128-128,128,128) + rectangle('fill',320+j*128-128,40+i*128-128,128,128) setColor(1,1,1,.9) mStr(N,j*128+256,i*128-75) end @@ -290,7 +290,7 @@ function scene.draw() if state<2 and cx then setColor(1,1,1,.6) gc.setLineWidth(10) - rectangle("line",325+cx*128-128,45+cy*128-128,118,118) + rectangle('line',325+cx*128-128,45+cy*128-128,118,118) end setFont(50) setColor(1,1,1) @@ -298,7 +298,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color="lG",font=40,code=pressKey"r"}, + WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"}, WIDGET.newSwitch{name="next", x=240,y=235,font=40,disp=function()return nexts end,code=pressKey"q",hide=function()return state==1 end}, WIDGET.newSwitch{name="blind", x=240,y=305,font=40,disp=function()return blind end,code=pressKey"w",hide=function()return state==1 end}, WIDGET.newSwitch{name="fast", x=240,y=375,font=30,disp=function()return fast end,code=pressKey"e",hide=function()return state==1 end}, diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 1c8887fd..df7de483 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -37,45 +37,45 @@ end function scene.keyDown(key) if key=="return"or key=="return2"then if CUSTOMENV.opponent~="X"then - if CUSTOMENV.opponent:sub(1,2)=="CC"and CUSTOMENV.sequence=="fixed"then - LOG.print(text.ai_fixed,"warn") + if CUSTOMENV.opponent:sub(1,2)=='CC'and CUSTOMENV.sequence=="fixed"then + LOG.print(text.ai_fixed,'warn') return elseif #BAG>0 then - LOG.print(text.ai_prebag,"warn") + LOG.print(text.ai_prebag,'warn') return elseif #MISSION>0 then - LOG.print(text.ai_mission,"warn") + LOG.print(text.ai_mission,'warn') return end end if key=="return2"or kb.isDown("lalt","lctrl","lshift")then if initField then - FILE.save(CUSTOMENV,"conf/customEnv","q") - loadGame("custom_puzzle",true) + FILE.save(CUSTOMENV,"conf/customEnv",'q') + loadGame('custom_puzzle',true) end else - FILE.save(CUSTOMENV,"conf/customEnv","q") - loadGame("custom_clear",true) + FILE.save(CUSTOMENV,"conf/customEnv",'q') + loadGame('custom_clear',true) end elseif key=="f"then - SCN.go("custom_field","swipeD") + SCN.go('custom_field','swipeD') elseif key=="s"then - SCN.go("custom_sequence","swipeD") + SCN.go('custom_sequence','swipeD') elseif key=="m"then - SCN.go("custom_mission","swipeD") + SCN.go('custom_mission','swipeD') elseif key=="delete"then if sure>20 then TABLE.update(customEnv0,CUSTOMENV) for _,W in next,scene.widgetList do W:reset()end sure=0 - SFX.play("finesseError",.7) + SFX.play('finesseError',.7) else sure=50 end elseif key=="a"then - SCN.go("custom_advance","swipeD") + SCN.go('custom_advance','swipeD') elseif key=="f1"then - SCN.go("mod","swipeD") + SCN.go('mod','swipeD') elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then local str="Techmino Quest:"..DATA.copyQuestArgs().."!" if #BAG>0 then str=str..DATA.copySequence()end @@ -95,14 +95,14 @@ function scene.keyDown(key) repeat table.remove(FIELD)until #FIELD==0 FIELD[1]=DATA.newBoard() for i=4,#args do - if args[i]:find"%S"and not DATA.pasteBoard(args[i],i-3)and i<#args then goto THROW_fail end + if args[i]:find("%S")and not DATA.pasteBoard(args[i],i-3)and i<#args then goto THROW_fail end end freshMiniFieldVisible() LOG.print(text.importSuccess,COLOR.G) do return end ::THROW_fail::LOG.print(text.dataCorrupted,COLOR.R) elseif key=="escape"then - FILE.save(CUSTOMENV,"conf/customEnv","q") + FILE.save(CUSTOMENV,"conf/customEnv",'q') SCN.back() else WIDGET.keyPressed(key) @@ -116,12 +116,12 @@ end function scene.draw() --Field content if initField then - gc.push("transform") + gc.push('transform') gc.translate(95,290) gc.scale(.5) gc.setColor(1,1,1) gc.setLineWidth(3) - gc.rectangle("line",-2,-2,304,604) + gc.rectangle('line',-2,-2,304,604) local F=FIELD[1] local cross=TEXTURE.puzzleMark[-1] local texture=SKIN.curText @@ -169,34 +169,34 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=520, y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=530, y=50,font=35,align="L",color="H"}, - WIDGET.newText{name="defSeq", x=330, y=550,align="L",color="H",hide=function()return BAG[1]end}, - WIDGET.newText{name="noMsn", x=610, y=550,align="L",color="H",hide=function()return MISSION[1]end}, + WIDGET.newText{name="title", x=520, y=5,font=70,align='R'}, + WIDGET.newText{name="subTitle", x=530, y=50,font=35,align='L',color='H'}, + WIDGET.newText{name="defSeq", x=330, y=550,align='L',color='H',hide=function()return BAG[1]end}, + WIDGET.newText{name="noMsn", x=610, y=550,align='L',color='H',hide=function()return MISSION[1]end}, --Basic - WIDGET.newSelector{name="drop", x=170, y=150,w=220,color="O",list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")}, - WIDGET.newSelector{name="lock", x=170, y=230,w=220,color="R",list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("lock"),code=CUSsto("lock")}, - WIDGET.newSelector{name="wait", x=410, y=150,w=220,color="G",list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("wait"),code=CUSsto("wait")}, - WIDGET.newSelector{name="fall", x=410, y=230,w=220,color="Y",list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("fall"),code=CUSsto("fall")}, + WIDGET.newSelector{name="drop", x=170, y=150,w=220,color='O',list={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("drop"),code=CUSsto("drop")}, + WIDGET.newSelector{name="lock", x=170, y=230,w=220,color='R',list={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},disp=CUSval("lock"),code=CUSsto("lock")}, + WIDGET.newSelector{name="wait", x=410, y=150,w=220,color='G',list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("wait"),code=CUSsto("wait")}, + WIDGET.newSelector{name="fall", x=410, y=230,w=220,color='Y',list={0,1,2,3,4,5,6,7,8,10,15,20,30,60},disp=CUSval("fall"),code=CUSsto("fall")}, --Else - WIDGET.newSelector{name="bg", x=1070, y=150,w=250,color="Y",list=BG.getList(),disp=CUSval("bg"),code=function(i)CUSTOMENV.bg=i BG.set(i)end}, - WIDGET.newSelector{name="bgm", x=1070, y=230,w=250,color="Y",list=BGM.getList(),disp=CUSval("bgm"),code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, + WIDGET.newSelector{name="bg", x=1070, y=150,w=250,color='Y',list=BG.getList(),disp=CUSval"bg",code=function(i)CUSTOMENV.bg=i BG.set(i)end}, + WIDGET.newSelector{name="bgm", x=1070, y=230,w=250,color='Y',list=BGM.getList(),disp=CUSval"bgm",code=function(i)CUSTOMENV.bgm=i BGM.play(i)end}, --Copy/Paste/Start - WIDGET.newButton{name="copy", x=1070, y=310,w=310,h=70,color="lR",font=25,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=1070, y=390,w=310,h=70,color="lB",font=25,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=1070, y=470,w=310,h=70,color="lY",font=35,code=pressKey"return"}, - WIDGET.newButton{name="puzzle", x=1070, y=550,w=310,h=70,color="lM",font=35,code=pressKey"return2",hide=function()return not initField end}, + WIDGET.newButton{name="copy", x=1070, y=310,w=310,h=70,color='lR',font=25,code=pressKey"cC"}, + WIDGET.newButton{name="paste", x=1070, y=390,w=310,h=70,color='lB',font=25,code=pressKey"cV"}, + WIDGET.newButton{name="clear", x=1070, y=470,w=310,h=70,color='lY',font=35,code=pressKey"return"}, + WIDGET.newButton{name="puzzle", x=1070, y=550,w=310,h=70,color='lM',font=35,code=pressKey"return2",hide=function()return not initField end}, --More - WIDGET.newKey{name="reset", x=730, y=150,w=220,h=90,color="R",font=30,code=pressKey"delete"}, - WIDGET.newKey{name="advance", x=730, y=270,w=220,h=90,color="F",font=35,code=pressKey"a"}, - WIDGET.newKey{name="mod", x=730, y=390,w=220,h=90,color="Z",font=35,code=pressKey"f1"}, - WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color="A",font=25,code=pressKey"f"}, - WIDGET.newKey{name="sequence", x=450, y=640,w=240,h=80,color="W",font=25,code=pressKey"s"}, - WIDGET.newKey{name="mission", x=730, y=640,w=240,h=80,color="N",font=25,code=pressKey"m"}, + WIDGET.newKey{name="reset", x=730, y=150,w=220,h=90,color='R',font=30,code=pressKey"delete"}, + WIDGET.newKey{name="advance", x=730, y=270,w=220,h=90,color='F',font=35,code=pressKey"a"}, + WIDGET.newKey{name="mod", x=730, y=390,w=220,h=90,color='Z',font=35,code=pressKey"f1"}, + WIDGET.newKey{name="field", x=170, y=640,w=240,h=80,color='A',font=25,code=pressKey"f"}, + WIDGET.newKey{name="sequence", x=450, y=640,w=240,h=80,color='W',font=25,code=pressKey"s"}, + WIDGET.newKey{name="mission", x=730, y=640,w=240,h=80,color='N',font=25,code=pressKey"m"}, WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=40,code=pressKey"escape"}, } diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index 6fb4c318..18dee000 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -10,8 +10,8 @@ local sList={ local scene={} scene.widgetList={ - WIDGET.newText{name="title", x=520,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="H"}, + WIDGET.newText{name="title", x=520,y=5,font=70,align='R'}, + WIDGET.newText{name="subTitle", x=530,y=50,font=35,align='L',color='H'}, --Control WIDGET.newSlider{name="nextCount", x=200, y=150, w=200,unit=6, disp=CUSval("nextCount"),code=CUSsto("nextCount")}, @@ -20,12 +20,12 @@ scene.widgetList={ WIDGET.newSwitch{name="phyHold", x=350, y=430, disp=CUSval("phyHold"), code=CUSrev("phyHold"),hide=function()return CUSTOMENV.holdCount==0 end}, --Rule - WIDGET.newSelector{name="fieldH", x=270, y=520, w=260,color="N",list=sList.fieldH, disp=CUSval("fieldH"),code=CUSsto("fieldH")}, - WIDGET.newSelector{name="visible", x=840, y=60, w=260,color="lB",list=sList.visible, disp=CUSval("visible"),code=CUSsto("visible")}, - WIDGET.newSelector{name="freshLimit",x=840, y=160, w=260,color="V",list=sList.freshLimit, disp=CUSval("freshLimit"),code=CUSsto("freshLimit")}, - WIDGET.newSelector{name="opponent", x=1120, y=60, w=260,color="R",list=sList.opponent, disp=CUSval("opponent"),code=CUSsto("opponent")}, - WIDGET.newSelector{name="life", x=1120, y=160, w=260,color="R",list=sList.life, disp=CUSval("life"),code=CUSsto("life")}, - WIDGET.newSelector{name="pushSpeed",x=1120, y=260, w=260,color="R",list=sList.pushSpeed, disp=CUSval("pushSpeed"),code=CUSsto("pushSpeed")}, + WIDGET.newSelector{name="fieldH", x=270, y=520, w=260,color='N',list=sList.fieldH, disp=CUSval("fieldH"),code=CUSsto("fieldH")}, + WIDGET.newSelector{name="visible", x=840, y=60, w=260,color='lB',list=sList.visible, disp=CUSval("visible"),code=CUSsto("visible")}, + WIDGET.newSelector{name="freshLimit",x=840, y=160, w=260,color='V',list=sList.freshLimit, disp=CUSval("freshLimit"),code=CUSsto("freshLimit")}, + WIDGET.newSelector{name="opponent", x=1120, y=60, w=260,color='R',list=sList.opponent, disp=CUSval("opponent"),code=CUSsto("opponent")}, + WIDGET.newSelector{name="life", x=1120, y=160, w=260,color='R',list=sList.life, disp=CUSval("life"),code=CUSsto("life")}, + WIDGET.newSelector{name="pushSpeed",x=1120, y=260, w=260,color='R',list=sList.pushSpeed, disp=CUSval("pushSpeed"),code=CUSsto("pushSpeed")}, WIDGET.newSwitch{name="ospin", x=870, y=350, font=30,disp=CUSval("ospin"), code=CUSrev("ospin")}, WIDGET.newSwitch{name="fineKill", x=870, y=440, font=20,disp=CUSval("fineKill"),code=CUSrev("fineKill")}, diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index eac5a660..16211f54 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -172,7 +172,7 @@ function scene.keyDown(key) if sure>20 then for y=1,20 do for x=1,10 do FIELD[page][y][x]=0 end end sure=0 - SFX.play("finesseError",.7) + SFX.play('finesseError',.7) else sure=50 end @@ -181,7 +181,7 @@ function scene.keyDown(key) elseif key=="k"then ins(FIELD[page],1,{21,21,21,21,21,21,21,21,21,21}) FIELD[page][21]=nil - SFX.play("blip") + SFX.play('blip') elseif key=="l"then local F=FIELD[page] for i=20,1,-1 do @@ -197,13 +197,13 @@ function scene.keyDown(key) repeat F[#F+1]={0,0,0,0,0,0,0,0,0,0} until#F==20 - SFX.play("clear_3",.8) - SFX.play("fall",.8) + SFX.play('clear_3',.8) + SFX.play('fall',.8) end elseif key=="n"then ins(FIELD,page+1,DATA.newBoard(FIELD[page])) page=page+1 - SFX.play("blip_1",.8) + SFX.play('blip_1',.8) SYSFX.newShade(3,200,60,300,600,.5,1,.5) elseif key=="m"then rem(FIELD,page) @@ -212,16 +212,16 @@ function scene.keyDown(key) ins(FIELD,DATA.newBoard()) end SYSFX.newShade(3,200,60,300,600,1,.5,.5) - SFX.play("clear_4",.8) - SFX.play("fall",.8) + SFX.play('clear_4',.8) + SFX.play('fall',.8) elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then sys.setClipboardText("Techmino Field:"..DATA.copyBoard(page)) LOG.print(text.exportSuccess,COLOR.G) elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() - local p=str:find":"--ptr* + local p=str:find(":")--ptr* if p then - if not str:sub(1,p-1):find"Field"then + if not str:sub(1,p-1):find("Field")then LOG.print(text.pasteWrongPlace) end str=str:sub(p+1) @@ -269,7 +269,7 @@ function scene.draw() --Draw field gc.setColor(1,1,1) gc.setLineWidth(3) - gc.rectangle("line",-2,-2,304,604) + gc.rectangle('line',-2,-2,304,604) gc.setLineWidth(2) local cross=TEXTURE.puzzleMark[-1] local F=FIELD[page] @@ -288,7 +288,7 @@ function scene.draw() local x,y=30*penX,600-30*penY if curPen==1 or curPen==2 then gc.setLineWidth(5) - gc.rectangle("line",x-30,y,30,30,4) + gc.rectangle('line',x-30,y,30,30,4) elseif curPen==3 then gc.setLineWidth(3) gc.line(x-15,y,x-30,y+15) @@ -296,9 +296,9 @@ function scene.draw() gc.line(x,y+15,x-15,y+30) end gc.setLineWidth(2) - gc.rectangle("line",x-30,y,30,30,3) + gc.rectangle('line',x-30,y,30,30,3) gc.setColor(1,1,1,.2) - gc.rectangle("fill",x-30,y,30,30,3) + gc.rectangle('fill',x-30,y,30,30,3) end --Draw smart pen path @@ -312,7 +312,7 @@ function scene.draw() gc.setColor(.9,.9,.9,.7+.2*math.sin(TIME()*12.6)) end for i=1,#penPath do - gc.rectangle("line",30*penPath[i][1]-30+2,600-30*penPath[i][2]+2,30-4,30-4,3) + gc.rectangle('line',30*penPath[i][1]-30+2,600-30*penPath[i][2]+2,30-4,30-4,3) end elseif pens[curPen]==-1 then gc.setColor(1,1,0,.7+.3*math.sin(TIME()*12.6)) @@ -328,7 +328,7 @@ function scene.draw() local c=minoColor[pens[curPen]] gc.setColor(c[1],c[2],c[3],.7+.2*math.sin(TIME()*12.6)) for i=1,#penPath do - gc.rectangle("line",30*penPath[i][1]-30+2,600-30*penPath[i][2]+2,30-4,30-4,3) + gc.rectangle('line',30*penPath[i][1]-30+2,600-30*penPath[i][2]+2,30-4,30-4,3) end end else @@ -345,13 +345,13 @@ function scene.draw() gc.setColor(1,1,1) mStr(page,100,530) mStr(#FIELD,100,600) - gc.rectangle("fill",50,600,100,6) + gc.rectangle('fill',50,600,100,6) --Draw mouse & pen color gc.translate(560,475) --Mouse gc.setLineWidth(2) - gc.rectangle("line",0,0,80,110,5) + gc.rectangle('line',0,0,80,110,5) gc.line(0,40,80,40) gc.line(33,0,33,25,47,25,47,0) gc.line(40,25,40,40) @@ -359,7 +359,7 @@ function scene.draw() --Left button if pens[1]>0 then gc.setColor(minoColor[pens[1]]) - gc.rectangle("fill",5,5,23,30) + gc.rectangle('fill',5,5,23,30) elseif pens[1]==-1 then gc.setColor(1,1,1) gc.line(5,5,28,35) @@ -368,7 +368,7 @@ function scene.draw() if penMode==0 then gc.setLineWidth(13) gc.setColor(COLOR.rainbow(TIME()*12.6)) - gc.rectangle("fill",5,5,23,30) + gc.rectangle('fill',5,5,23,30) else gc.setLineWidth(3) gc.setColor(1,0,0) @@ -380,7 +380,7 @@ function scene.draw() --Right button if pens[2]>0 then gc.setColor(minoColor[pens[2]]) - gc.rectangle("fill",52,5,23,30) + gc.rectangle('fill',52,5,23,30) elseif pens[2]==-1 then gc.setColor(1,1,1) gc.setLineWidth(3) @@ -390,7 +390,7 @@ function scene.draw() if penMode==0 then gc.setLineWidth(13) gc.setColor(COLOR.rainbow(TIME()*12.6)) - gc.rectangle("fill",52,5,23,30) + gc.rectangle('fill',52,5,23,30) else gc.setLineWidth(3) gc.setColor(1,0,0) @@ -402,7 +402,7 @@ function scene.draw() --Middle button if pens[3]>0 then gc.setColor(minoColor[pens[3]]) - gc.rectangle("fill",35,2,10,21) + gc.rectangle('fill',35,2,10,21) elseif pens[3]==-1 then gc.setColor(1,1,1) gc.setLineWidth(2) @@ -412,7 +412,7 @@ function scene.draw() if penMode==0 then gc.setLineWidth(13) gc.setColor(COLOR.rainbow(TIME()*12.6)) - gc.rectangle("fill",35,2,10,21) + gc.rectangle('fill',35,2,10,21) else gc.setLineWidth(3) gc.setColor(1,0,0) @@ -439,51 +439,51 @@ end local function setPen(i)return function(k)pens[k]=i end end scene.widgetList={ - WIDGET.newText{name="title", x=1020,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align="L",color="H"}, + WIDGET.newText{name="title", x=1020,y=5,font=70,align='R'}, + WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align='L',color='H'}, - WIDGET.newButton{name="b1", x=580, y=130,w=75,fText="",color="R",code=setPen(1)},--B1 - WIDGET.newButton{name="b2", x=660, y=130,w=75,fText="",color="F",code=setPen(2)},--B2 - WIDGET.newButton{name="b3", x=740, y=130,w=75,fText="",color="O",code=setPen(3)},--B3 - WIDGET.newButton{name="b4", x=820, y=130,w=75,fText="",color="Y",code=setPen(4)},--B4 - WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color="L",code=setPen(5)},--B5 - WIDGET.newButton{name="b6", x=980, y=130,w=75,fText="",color="J",code=setPen(6)},--B6 - WIDGET.newButton{name="b7", x=1060, y=130,w=75,fText="",color="G",code=setPen(7)},--B7 - WIDGET.newButton{name="b8", x=1140, y=130,w=75,fText="",color="A",code=setPen(8)},--B8 + WIDGET.newButton{name="b1", x=580, y=130,w=75,fText="",color='R',code=setPen(1)},--B1 + WIDGET.newButton{name="b2", x=660, y=130,w=75,fText="",color='F',code=setPen(2)},--B2 + WIDGET.newButton{name="b3", x=740, y=130,w=75,fText="",color='O',code=setPen(3)},--B3 + WIDGET.newButton{name="b4", x=820, y=130,w=75,fText="",color='Y',code=setPen(4)},--B4 + WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color='L',code=setPen(5)},--B5 + WIDGET.newButton{name="b6", x=980, y=130,w=75,fText="",color='J',code=setPen(6)},--B6 + WIDGET.newButton{name="b7", x=1060, y=130,w=75,fText="",color='G',code=setPen(7)},--B7 + WIDGET.newButton{name="b8", x=1140, y=130,w=75,fText="",color='A',code=setPen(8)},--B8 - WIDGET.newButton{name="b9", x=580, y=210,w=75,fText="",color="C",code=setPen(9)},--B9 - WIDGET.newButton{name="b10", x=660, y=210,w=75,fText="",color="N",code=setPen(10)},--B10 - WIDGET.newButton{name="b11", x=740, y=210,w=75,fText="",color="S",code=setPen(11)},--B11 - WIDGET.newButton{name="b12", x=820, y=210,w=75,fText="",color="B",code=setPen(12)},--B12 - WIDGET.newButton{name="b13", x=900, y=210,w=75,fText="",color="V",code=setPen(13)},--B13 - WIDGET.newButton{name="b14", x=980, y=210,w=75,fText="",color="P",code=setPen(14)},--B14 - WIDGET.newButton{name="b15", x=1060, y=210,w=75,fText="",color="M",code=setPen(15)},--B15 - WIDGET.newButton{name="b16", x=1140, y=210,w=75,fText="",color="W",code=setPen(16)},--B16 + WIDGET.newButton{name="b9", x=580, y=210,w=75,fText="",color='C',code=setPen(9)},--B9 + WIDGET.newButton{name="b10", x=660, y=210,w=75,fText="",color='N',code=setPen(10)},--B10 + WIDGET.newButton{name="b11", x=740, y=210,w=75,fText="",color='S',code=setPen(11)},--B11 + WIDGET.newButton{name="b12", x=820, y=210,w=75,fText="",color='B',code=setPen(12)},--B12 + WIDGET.newButton{name="b13", x=900, y=210,w=75,fText="",color='V',code=setPen(13)},--B13 + WIDGET.newButton{name="b14", x=980, y=210,w=75,fText="",color='P',code=setPen(14)},--B14 + WIDGET.newButton{name="b15", x=1060, y=210,w=75,fText="",color='M',code=setPen(15)},--B15 + WIDGET.newButton{name="b16", x=1140, y=210,w=75,fText="",color='W',code=setPen(16)},--B16 - WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color="dH", code=setPen(17)},--BONE - WIDGET.newButton{name="b18", x=660, y=290,w=75,fText="N", color="D", code=setPen(18)},--HIDE - WIDGET.newButton{name="b19", x=740, y=290,w=75,fText="B", color="lY", code=setPen(19)},--BOMB - WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color="H", code=setPen(20)},--GB1 - WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color="lH", code=setPen(21)},--GB2 - WIDGET.newButton{name="b22", x=980, y=290,w=75,fText="_", color="dV", code=setPen(22)},--GB3 - WIDGET.newButton{name="b23", x=1060, y=290,w=75,fText="_", color="dR", code=setPen(23)},--GB4 - WIDGET.newButton{name="b24", x=1140, y=290,w=75,fText="_", color="dG", code=setPen(24)},--GB5 + WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color='dH', code=setPen(17)},--BONE + WIDGET.newButton{name="b18", x=660, y=290,w=75,fText="N", color='D', code=setPen(18)},--HIDE + WIDGET.newButton{name="b19", x=740, y=290,w=75,fText="B", color='lY', code=setPen(19)},--BOMB + WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color='H', code=setPen(20)},--GB1 + WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color='lH', code=setPen(21)},--GB2 + WIDGET.newButton{name="b22", x=980, y=290,w=75,fText="_", color='dV', code=setPen(22)},--GB3 + WIDGET.newButton{name="b23", x=1060, y=290,w=75,fText="_", color='dR', code=setPen(23)},--GB4 + WIDGET.newButton{name="b24", x=1140, y=290,w=75,fText="_", color='dG', code=setPen(24)},--GB5 - WIDGET.newButton{name="any", x=600, y=400,w=120,color="lH", font=40,code=setPen(0)}, - WIDGET.newButton{name="space", x=730, y=400,w=120,color="H", font=65,code=setPen(-1)}, - WIDGET.newButton{name="smart", x=860, y=400,w=120,color="lG", font=30,code=setPen(-2)}, - WIDGET.newButton{name="push", x=990, y=400,w=120,h=120,color="lY",font=20,code=pressKey"k"}, - WIDGET.newButton{name="del", x=1120, y=400,w=120,h=120,color="lY",font=20,code=pressKey"l"}, + WIDGET.newButton{name="any", x=600, y=400,w=120,color='lH', font=40,code=setPen(0)}, + WIDGET.newButton{name="space", x=730, y=400,w=120,color='H', font=65,code=setPen(-1)}, + WIDGET.newButton{name="smart", x=860, y=400,w=120,color='lG', font=30,code=setPen(-2)}, + WIDGET.newButton{name="push", x=990, y=400,w=120,h=120,color='lY',font=20,code=pressKey"k"}, + WIDGET.newButton{name="del", x=1120, y=400,w=120,h=120,color='lY',font=20,code=pressKey"l"}, - WIDGET.newButton{name="copy", x=730, y=530,w=120,color="lR", font=35,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=860, y=530,w=120,color="lB", font=35,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=990, y=530,w=120,color="Z", font=40,code=pressKey"delete"}, + WIDGET.newButton{name="copy", x=730, y=530,w=120,color='lR', font=35,code=pressKey"cC"}, + WIDGET.newButton{name="paste", x=860, y=530,w=120,color='lB', font=35,code=pressKey"cV"}, + WIDGET.newButton{name="clear", x=990, y=530,w=120,color='Z', font=40,code=pressKey"delete"}, WIDGET.newSwitch{name="demo", x=755, y=640,disp=function()return demo end,code=function()demo=not demo end}, - WIDGET.newButton{name="newPg", x=100, y=110,w=160,h=110,color="N",font=20,code=pressKey"n"}, - WIDGET.newButton{name="delPg", x=100, y=230,w=160,h=110,color="lR",font=20,code=pressKey"m"}, - WIDGET.newButton{name="prevPg", x=100, y=350,w=160,h=110,color="lG",font=20,code=pressKey"pageup",hide=function()return page==1 end}, - WIDGET.newButton{name="nextPg", x=100, y=470,w=160,h=110,color="lG",font=20,code=pressKey"pagedown",hide=function()return page==#FIELD end}, + WIDGET.newButton{name="newPg", x=100, y=110,w=160,h=110,color='N',font=20,code=pressKey"n"}, + WIDGET.newButton{name="delPg", x=100, y=230,w=160,h=110,color='lR',font=20,code=pressKey"m"}, + WIDGET.newButton{name="prevPg", x=100, y=350,w=160,h=110,color='lG',font=20,code=pressKey"pageup",hide=function()return page==1 end}, + WIDGET.newButton{name="nextPg", x=100, y=470,w=160,h=110,color='lG',font=20,code=pressKey"pagedown",hide=function()return page==#FIELD end}, WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 83747cd3..c8c21f0a 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -66,7 +66,7 @@ function scene.keyDown(key) end cur=0 sure=0 - SFX.play("finesseError",.7) + SFX.play('finesseError',.7) else sure=50 end @@ -77,9 +77,9 @@ function scene.keyDown(key) end elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() - local p=str:find":"--ptr* + local p=str:find(":")--ptr* if p then - if not str:sub(1,p-1):find"Target"then + if not str:sub(1,p-1):find("Target")then LOG.print(text.pasteWrongPlace) end str=str:sub(p+1) @@ -92,7 +92,7 @@ function scene.keyDown(key) end elseif key=="escape"then SCN.back() - elseif type(key)=="number"then + elseif type(key)=='number'then local p=cur+1 while MISSION[p]==key do p=p+1 end ins(MISSION,p,key) @@ -108,7 +108,7 @@ function scene.keyDown(key) if missionEnum[input]then cur=cur+1 ins(MISSION,cur,missionEnum[input]) - SFX.play("lock") + SFX.play('lock') input="" elseif #input>1 or not legalInput[input]then input="" @@ -124,7 +124,7 @@ function scene.draw() --Draw frame gc.setLineWidth(4) gc.setColor(1,1,1) - gc.rectangle("line",60,110,1160,170) + gc.rectangle('line',60,110,1160,170) --Draw inputing target setFont(30) @@ -189,8 +189,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=520,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="H"}, + WIDGET.newText{name="title", x=520,y=5,font=70,align='R'}, + WIDGET.newText{name="subTitle", x=530,y=50,font=35,align='L',color='H'}, WIDGET.newKey{name="_1", x=800,y=540,w=90,font=50,code=pressKey(01)}, WIDGET.newKey{name="_2", x=900,y=540,w=90,font=50,code=pressKey(02)}, @@ -229,13 +229,13 @@ scene.widgetList={ WIDGET.newKey{name="O4", x=600,y=640,w=90,font=50,code=pressKey(64)}, WIDGET.newKey{name="I4", x=700,y=640,w=90,font=50,code=pressKey(74)}, - WIDGET.newKey{name="left", x=800, y=440,w=90, color="lG",font=55,code=pressKey"left"}, - WIDGET.newKey{name="right", x=900, y=440,w=90, color="lG",font=55,code=pressKey"right"}, - WIDGET.newKey{name="ten", x=1000, y=440,w=90, color="lG",font=40,code=pressKey"ten"}, - WIDGET.newKey{name="backsp", x=1000, y=540,w=90, color="lY",font=50,code=pressKey"backspace"}, - WIDGET.newKey{name="reset", x=1000, y=640,w=90, color="lY",font=50,code=pressKey"delete"}, - WIDGET.newButton{name="copy", x=1140, y=440,w=170,h=80, color="lR",font=40,code=pressKey"cC",hide=function()return #MISSION==0 end}, - WIDGET.newButton{name="paste", x=1140, y=540,w=170,h=80, color="lB",font=40,code=pressKey"cV"}, + WIDGET.newKey{name="left", x=800, y=440,w=90, color='lG',font=55,code=pressKey"left"}, + WIDGET.newKey{name="right", x=900, y=440,w=90, color='lG',font=55,code=pressKey"right"}, + WIDGET.newKey{name="ten", x=1000, y=440,w=90, color='lG',font=40,code=pressKey"ten"}, + WIDGET.newKey{name="backsp", x=1000, y=540,w=90, color='lY',font=50,code=pressKey"backspace"}, + WIDGET.newKey{name="reset", x=1000, y=640,w=90, color='lY',font=50,code=pressKey"delete"}, + WIDGET.newButton{name="copy", x=1140, y=440,w=170,h=80, color='lR',font=40,code=pressKey"cC",hide=function()return #MISSION==0 end}, + WIDGET.newButton{name="paste", x=1140, y=540,w=170,h=80, color='lB',font=40,code=pressKey"cV"}, WIDGET.newSwitch{name="mission",x=1150, y=350,disp=CUSval("missionKill"),code=CUSrev("missionKill")}, WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene}, diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 39a09824..c16dfd60 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -71,7 +71,7 @@ function scene.keyDown(key) end cur=0 sure=0 - SFX.play("finesseError",.7) + SFX.play('finesseError',.7) else sure=50 end @@ -92,9 +92,9 @@ function scene.keyDown(key) end elseif key=="v"and kb.isDown("lctrl","rctrl")or key=="cV"then local str=sys.getClipboardText() - local p=str:find":"--ptr* + local p=str:find(":")--ptr* if p then - if not str:sub(1,p-1):find"SEQ"then + if not str:sub(1,p-1):find("SEQ")then LOG.print(text.pasteWrongPlace) end str=str:sub(p+1) @@ -107,7 +107,7 @@ function scene.keyDown(key) end elseif key=="escape"then SCN.back() - elseif type(key)=="number"then + elseif type(key)=='number'then cur=cur+1 ins(BAG,cur,key) elseif #key==1 then @@ -117,7 +117,7 @@ function scene.keyDown(key) while BAG[p]==key do p=p+1 end ins(BAG,p,key) cur=p - SFX.play("lock") + SFX.play('lock') end end end @@ -130,7 +130,7 @@ function scene.draw() --Draw frame gc.setColor(1,1,1) gc.setLineWidth(4) - gc.rectangle("line",100,110,1080,260) + gc.rectangle('line',100,110,1080,260) --Draw sequence local miniBlock=TEXTURE.miniBlock @@ -190,11 +190,11 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title",x=520,y=5,font=70,align="R"}, - WIDGET.newText{name="subTitle",x=530,y=50,font=35,align="L",color="H"}, + WIDGET.newText{name="title",x=520,y=5,font=70,align='R'}, + WIDGET.newText{name="subTitle",x=530,y=50,font=35,align='L',color='H'}, - WIDGET.newSelector{name="sequence",x=1080,y=60,w=200,color="Y", - list={"bag","his4","c2","rnd","mess","reverb","loop","fixed"}, + WIDGET.newSelector{name="sequence",x=1080,y=60,w=200,color='Y', + list={'bag','his4','c2','rnd','mess','reverb','loop','fixed'}, disp=CUSval("sequence"), code=CUSsto("sequence") }, @@ -206,40 +206,40 @@ scene.widgetList={ WIDGET.newKey{name="T", x=440,y=460,w=80,font=50,code=pressKey(5)}, WIDGET.newKey{name="O", x=520,y=460,w=80,font=50,code=pressKey(6)}, WIDGET.newKey{name="I", x=600,y=460,w=80,font=50,code=pressKey(7)}, - WIDGET.newKey{name="left", x=680,y=460,w=80,color="lG",font=55,code=pressKey"left"}, - WIDGET.newKey{name="right", x=760,y=460,w=80,color="lG",font=55,code=pressKey"right"}, - WIDGET.newKey{name="ten", x=840,y=460,w=80,color="lG",font=40,code=pressKey"ten"}, - WIDGET.newKey{name="backsp",x=920,y=460,w=80,color="lY",font=50,code=pressKey"backspace"}, - WIDGET.newKey{name="reset", x=1000,y=460,w=80,color="lY",font=25,code=pressKey"delete"}, + WIDGET.newKey{name="left", x=680,y=460,w=80,color='lG',font=55,code=pressKey"left"}, + WIDGET.newKey{name="right", x=760,y=460,w=80,color='lG',font=55,code=pressKey"right"}, + WIDGET.newKey{name="ten", x=840,y=460,w=80,color='lG',font=40,code=pressKey"ten"}, + WIDGET.newKey{name="backsp",x=920,y=460,w=80,color='lY',font=50,code=pressKey"backspace"}, + WIDGET.newKey{name="reset", x=1000,y=460,w=80,color='lY',font=25,code=pressKey"delete"}, - WIDGET.newKey{name="Z5", x=120,y=540,w=80,color="lH",font=50,code=pressKey(8)}, - WIDGET.newKey{name="S5", x=200,y=540,w=80,color="lH",font=50,code=pressKey(9)}, - WIDGET.newKey{name="P", x=280,y=540,w=80,color="lH",font=50,code=pressKey(10)}, - WIDGET.newKey{name="Q", x=360,y=540,w=80,color="lH",font=50,code=pressKey(11)}, - WIDGET.newKey{name="F", x=440,y=540,w=80,color="lH",font=50,code=pressKey(12)}, - WIDGET.newKey{name="E", x=520,y=540,w=80,color="lH",font=50,code=pressKey(13)}, - WIDGET.newKey{name="T5", x=600,y=540,w=80,color="lH",font=50,code=pressKey(14)}, - WIDGET.newKey{name="U", x=680,y=540,w=80,color="lH",font=50,code=pressKey(15)}, - WIDGET.newKey{name="V", x=760,y=540,w=80,color="lH",font=50,code=pressKey(16)}, - WIDGET.newKey{name="I3", x=840,y=540,w=80,color="H",font=50,code=pressKey(26)}, - WIDGET.newKey{name="C", x=920,y=540,w=80,color="H",font=50,code=pressKey(27)}, - WIDGET.newKey{name="rnd", x=1000,y=540,w=80,color="R",font=25,code=pressKey"="}, + WIDGET.newKey{name="Z5", x=120,y=540,w=80,color='lH',font=50,code=pressKey(8)}, + WIDGET.newKey{name="S5", x=200,y=540,w=80,color='lH',font=50,code=pressKey(9)}, + WIDGET.newKey{name="P", x=280,y=540,w=80,color='lH',font=50,code=pressKey(10)}, + WIDGET.newKey{name="Q", x=360,y=540,w=80,color='lH',font=50,code=pressKey(11)}, + WIDGET.newKey{name="F", x=440,y=540,w=80,color='lH',font=50,code=pressKey(12)}, + WIDGET.newKey{name="E", x=520,y=540,w=80,color='lH',font=50,code=pressKey(13)}, + WIDGET.newKey{name="T5", x=600,y=540,w=80,color='lH',font=50,code=pressKey(14)}, + WIDGET.newKey{name="U", x=680,y=540,w=80,color='lH',font=50,code=pressKey(15)}, + WIDGET.newKey{name="V", x=760,y=540,w=80,color='lH',font=50,code=pressKey(16)}, + WIDGET.newKey{name="I3", x=840,y=540,w=80,color='H',font=50,code=pressKey(26)}, + WIDGET.newKey{name="C", x=920,y=540,w=80,color='H',font=50,code=pressKey(27)}, + WIDGET.newKey{name="rnd", x=1000,y=540,w=80,color='R',font=25,code=pressKey"="}, - WIDGET.newKey{name="W", x=120,y=620,w=80,color="lH",font=50,code=pressKey(17)}, - WIDGET.newKey{name="X", x=200,y=620,w=80,color="lH",font=50,code=pressKey(18)}, - WIDGET.newKey{name="J5", x=280,y=620,w=80,color="lH",font=50,code=pressKey(19)}, - WIDGET.newKey{name="L5", x=360,y=620,w=80,color="lH",font=50,code=pressKey(20)}, - WIDGET.newKey{name="R", x=440,y=620,w=80,color="lH",font=50,code=pressKey(21)}, - WIDGET.newKey{name="Y", x=520,y=620,w=80,color="lH",font=50,code=pressKey(22)}, - WIDGET.newKey{name="N", x=600,y=620,w=80,color="lH",font=50,code=pressKey(23)}, - WIDGET.newKey{name="H", x=680,y=620,w=80,color="lH",font=50,code=pressKey(24)}, - WIDGET.newKey{name="I5", x=760,y=620,w=80,color="lH",font=50,code=pressKey(25)}, - WIDGET.newKey{name="I2", x=840,y=620,w=80,color="dH",font=50,code=pressKey(28)}, - WIDGET.newKey{name="O1", x=920,y=620,w=80,color="dH",font=50,code=pressKey(29)}, + WIDGET.newKey{name="W", x=120,y=620,w=80,color='lH',font=50,code=pressKey(17)}, + WIDGET.newKey{name="X", x=200,y=620,w=80,color='lH',font=50,code=pressKey(18)}, + WIDGET.newKey{name="J5", x=280,y=620,w=80,color='lH',font=50,code=pressKey(19)}, + WIDGET.newKey{name="L5", x=360,y=620,w=80,color='lH',font=50,code=pressKey(20)}, + WIDGET.newKey{name="R", x=440,y=620,w=80,color='lH',font=50,code=pressKey(21)}, + WIDGET.newKey{name="Y", x=520,y=620,w=80,color='lH',font=50,code=pressKey(22)}, + WIDGET.newKey{name="N", x=600,y=620,w=80,color='lH',font=50,code=pressKey(23)}, + WIDGET.newKey{name="H", x=680,y=620,w=80,color='lH',font=50,code=pressKey(24)}, + WIDGET.newKey{name="I5", x=760,y=620,w=80,color='lH',font=50,code=pressKey(25)}, + WIDGET.newKey{name="I2", x=840,y=620,w=80,color='dH',font=50,code=pressKey(28)}, + WIDGET.newKey{name="O1", x=920,y=620,w=80,color='dH',font=50,code=pressKey(29)}, - WIDGET.newButton{name="copy",x=1140,y=460,w=170,h=80,color="lR",font=40,code=pressKey"cC",hide=function()return #BAG==0 end}, - WIDGET.newButton{name="paste",x=1140,y=550,w=170,h=80,color="lB",font=40,code=pressKey"cV"}, + WIDGET.newButton{name="copy",x=1140,y=460,w=170,h=80,color='lR',font=40,code=pressKey"cC",hide=function()return #BAG==0 end}, + WIDGET.newButton{name="paste",x=1140,y=550,w=170,h=80,color='lB',font=40,code=pressKey"cV"}, WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/depause.lua b/parts/scenes/depause.lua index f8ef896b..1a54a4ad 100644 --- a/parts/scenes/depause.lua +++ b/parts/scenes/depause.lua @@ -13,8 +13,8 @@ scene.touchDown=NULL function scene.update(dt) timer=timer-dt*.8 if timer<0 then - SFX.play("click") - SCN.swapTo("game","none") + SFX.play('click') + SCN.swapTo('game','none') end end @@ -26,14 +26,14 @@ function scene.draw() --Gray screen cover gc.setColor(.15,.15,.15,timer*1.26) - gc.push("transform") + gc.push('transform') gc.origin() - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.pop() --Pie counter gc.setColor(1,1,1,4*(1-timer)) - gc.arc("fill","pie",640,360,160,-1.5708,timer*6.2832-1.5708) + gc.arc('fill','pie',640,360,160,-1.5708,timer*6.2832-1.5708) end return scene \ No newline at end of file diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 161f66ab..34c4abc6 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -50,7 +50,7 @@ local function search() end end if #result>0 then - SFX.play("reach") + SFX.play('reach') end url=getList()[selected][5] lastSearch=input @@ -69,7 +69,7 @@ function scene.sceneInit() lastSearch=false TASK.new(function()YIELD()WIDGET.sel=inputBox end) - BG.set("rainbow") + BG.set('rainbow') end function scene.wheelMoved(_,y) @@ -100,7 +100,7 @@ function scene.keyDown(key) if #inputBox.value>0 then clearResult() inputBox:clear() - SFX.play("hold") + SFX.play('hold') end elseif key=="backspace"then WIDGET.keyPressed("backspace") @@ -151,7 +151,7 @@ function scene.draw() setFont(30) gc.setColor(1,1,1,.4+.2*sin(TIME()*4)) - gc.rectangle("fill",20,143+35*(selected-scrollPos),280,35) + gc.rectangle('fill',20,143+35*(selected-scrollPos),280,35) setFont(30) for i=1,min(#list,15)do @@ -169,8 +169,8 @@ function scene.draw() gc.setLineWidth(4) gc.setColor(1,1,1) - gc.rectangle("line",300,180,958,526) - gc.rectangle("line",20,180,280,526) + gc.rectangle('line',300,180,958,526) + gc.rectangle('line',20,180,280,526) if waiting>0 then local r=TIME()*2 @@ -181,7 +181,7 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=20, y=5,font=70,align="L"}, + WIDGET.newText{name="title", x=20, y=5,font=70,align='L'}, inputBox, WIDGET.newKey{name="link", x=1150, y=655,w=200,h=80,font=35,code=pressKey"link",hide=function()return not url end}, WIDGET.newKey{name="up", x=1130, y=460,w=60,h=90,font=35,code=pressKey"up",hide=not MOBILE}, diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index edd91e1f..f67cc3a6 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -19,7 +19,7 @@ end scene.mouseDown=NULL local function restart() - resetGameData(PLAYERS[1].frameRun<240 and"q") + resetGameData(PLAYERS[1].frameRun<240 and'q') noKey=GAME.replaying noTouch=noKey end @@ -162,10 +162,10 @@ local function drawAtkPointer(x,y) t=sin(t*20) gc.setColor(.2,.7+t*.2,1,.6+t*.4) - gc.circle("fill",x,y,25,6) + gc.circle('fill',x,y,25,6) gc.setColor(0,.6,1,.8-a) - gc.circle("line",x,y,30*(1+a),6) + gc.circle('line',x,y,30*(1+a),6) end function scene.draw() drawFWM() diff --git a/parts/scenes/history.lua b/parts/scenes/history.lua index cde4e164..70b0d5f9 100644 --- a/parts/scenes/history.lua +++ b/parts/scenes/history.lua @@ -1,7 +1,7 @@ local scene={} function scene.sceneInit() - BG.set("cubes") + BG.set('cubes') WIDGET.active.texts:setTexts(require"parts.updateLog") if newVersionLaunch then newVersionLaunch=false diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua index 35fdb086..5ada13e2 100644 --- a/parts/scenes/intro.lua +++ b/parts/scenes/intro.lua @@ -13,11 +13,11 @@ function scene.sceneInit() animeType={}for i=1,8 do animeType[i]=rnd(5)end--Random animation type end -function scene.mouseDown(_,_,k) +function scene.mouseDown() if newVersionLaunch then SCN.push(SETTING.simpMode and"main_simple"or"main") - SCN.swapTo("history","fade") - LOG.print(text.newVersion,"warn",COLOR.lB) + SCN.swapTo('history','fade') + LOG.print(text.newVersion,'warn',COLOR.lB) else SCN.go(SETTING.simpMode and"main_simple"or"main") end @@ -27,8 +27,8 @@ function scene.touchDown() end function scene.keyDown(key) if key=="escape"then - VOC.play("bye") - SCN.swapTo("quit","slowFade") + VOC.play('bye') + SCN.swapTo('quit','slowFade') else scene.mouseDown() end @@ -53,19 +53,19 @@ function scene.draw() gc.setLineWidth(4) end local L=title - gc.push("transform") + gc.push('transform') gc.translate(126,226) for i=1,8 do local t=t1-i*15 if t>0 then - gc.push("transform") + gc.push('transform') gc.setColor(1,1,1,min(t*.025,1)) titleTransform[animeType[i]](t,i) local dt=(t1+62-5*i)%300 if dt<20 then gc.translate(0,math.abs(10-dt)-10) end - gc.polygon("line",L[i]) + gc.polygon('line',L[i]) gc.pop() end end diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 43b3f347..65583bec 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -33,7 +33,7 @@ local function upFloor() progress=progress+1 if light[3*progress+3]then light[3*progress+3]=false - SFX.play("click",.3) + SFX.play('click',.3) end end local loadingThread=coroutine.wrap(function() @@ -149,7 +149,7 @@ local loadingThread=coroutine.wrap(function() upFloor() if not MODES[STAT.lastPlay]then - STAT.lastPlay="sprint_10l" + STAT.lastPlay='sprint_10l' end upFloor() @@ -157,7 +157,7 @@ local loadingThread=coroutine.wrap(function() if newVersionLaunch then--Delete old ranks & Unlock modes which should be locked for name,rank in next,RANKS do local M=MODES[name] - if type(rank)~="number"then + if type(rank)~='number'then RANKS[name]=nil elseif M and M.unlock and rank>0 then for _,unlockName in next,M.unlock do @@ -170,10 +170,10 @@ local loadingThread=coroutine.wrap(function() RANKS[name]=nil end end - FILE.save(RANKS,"conf/unlock","q") + FILE.save(RANKS,"conf/unlock",'q') end - DAILYLAUNCH=freshDate("q") + DAILYLAUNCH=freshDate'q' if DAILYLAUNCH then logoColor1=COLOR.S logoColor2=COLOR.lS @@ -195,8 +195,8 @@ local loadingThread=coroutine.wrap(function() upFloor() end if progress==25 then - SFX.play("welcome_sfx") - VOC.play("welcome_voc") + SFX.play('welcome_sfx') + VOC.play('welcome_voc') THEME.fresh() LOADED=true return @@ -265,7 +265,7 @@ function scene.update(dt) skip=skip-1 end if openTime>=3.26 and not SCN.swapping then - SCN.swapTo("intro") + SCN.swapTo('intro') love.keyboard.setKeyRepeat(true) end end @@ -274,13 +274,13 @@ end local function doorStencil() local dx=300*(1-math.min(openTime/1.26-1,0)^2) - gc.rectangle("fill",640-dx,0,2*dx,720) + gc.rectangle('fill',640-dx,0,2*dx,720) end function scene.draw() --Wall gc.clear(.5,.5,.5) - gc.push("transform") + gc.push('transform') if openTime>2.26 then gc.translate(640,360) gc.scale(1+(openTime-2.26)^1.8) @@ -291,11 +291,11 @@ function scene.draw() if progress==25 then --Outside background gc.setColor(.15,.15,.15) - gc.rectangle("fill",340,0,600,720) + gc.rectangle('fill',340,0,600,720) - gc.stencil(doorStencil,"replace",1) - gc.setStencilTest("equal",1) - gc.push("transform") + gc.stencil(doorStencil,'replace',1) + gc.setStencilTest('equal',1) + gc.push('transform') --Cool camera gc.translate(640,360) @@ -323,17 +323,17 @@ function scene.draw() if openTime>.3 and openTime<1.6 then local w=(1.6-openTime)/1.3 gc.setColor(1,1,1,w^2) - gc.rectangle("fill",340,360*w^2,600,720*(1-w^2)) + gc.rectangle('fill',340,360*w^2,600,720*(1-w^2)) end gc.setStencilTest() end --Floor info frame gc.setColor(.1,.1,.1) - gc.rectangle("fill",1020,25,180,100) + gc.rectangle('fill',1020,25,180,100) gc.setColor(.7,.7,.7) gc.setLineWidth(4) - gc.rectangle("line",1020,25,180,100) + gc.rectangle('line',1020,25,180,100) --Floor info if progress>=0 then @@ -357,10 +357,10 @@ function scene.draw() setFont(25) for i=0,26 do local x,y=light[3*i+1],light[3*i+2] - gc.setColor(COLOR[i==progress and"H"or light[3*i+3]and"dO"or"dH"]) - gc.circle("fill",x,y,23) + gc.setColor(COLOR[i==progress and'H'or light[3*i+3]and'dO'or'dH']) + gc.circle('fill',x,y,23) gc.setColor(.16,.16,.16) - gc.circle("line",x,y,23) + gc.circle('line',x,y,23) gc.setColor(1,1,1) mStr(i+1,x,y-18) end @@ -369,8 +369,8 @@ function scene.draw() for i=1,0,-1 do gc.setColor(.3,.3,.3) local dx=300*(1-math.min(math.max(openTime-i*.1,0)/1.26-1,0)^2) - gc.rectangle("fill",340,0,300-dx,720) - gc.rectangle("fill",940,0,dx-300,720) + gc.rectangle('fill',340,0,300-dx,720) + gc.rectangle('fill',940,0,dx-300,720) gc.setColor(.16,.16,.16) gc.setLineWidth(4) @@ -380,14 +380,14 @@ function scene.draw() --Doorframe gc.setColor(0,0,0) - gc.rectangle("line",340,0,600,720) + gc.rectangle('line',340,0,600,720) --Black screen if blackTime>0 or openTime>3 then - gc.push("transform") + gc.push('transform') gc.origin() gc.setColor(0,0,0,blackTime+(openTime-3)*4) - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.pop() end gc.pop() diff --git a/parts/scenes/login.lua b/parts/scenes/login.lua index 8fe8c03e..f712ca38 100644 --- a/parts/scenes/login.lua +++ b/parts/scenes/login.lua @@ -12,8 +12,8 @@ end local scene={} scene.widgetList={ - WIDGET.newText{name="title", x=80, y=50,font=70,align="L"}, - WIDGET.newButton{name="register", x=1140, y=100,w=170,h=80,color="lY",code=function()SCN.swapTo("register","swipeR")end}, + WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, + WIDGET.newButton{name="register", x=1140, y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('register','swipeR')end}, WIDGET.newInputBox{name="email", x=380, y=200,w=500,h=60}, WIDGET.newInputBox{name="password", x=380, y=300,w=626,h=60,secret=true,regex="[ -~]"}, WIDGET.newKey{name="login", x=1140, y=540,w=170,h=80,font=40,code=login}, diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 340816ac..bf0e48c2 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -13,11 +13,11 @@ local widgetX0={ } local consoleEntryThread=coroutine.wrap(function() while true do - SFX.play("ren_"..math.random(5,6))YIELD() - SFX.play("ren_"..math.random(7,8))YIELD() - SFX.play("ren_"..math.random(9,10))YIELD() - SFX.play("ren_9")SFX.play("ren_11")SFX.play("ren_mega") - SCN.go("app_console") + SFX.play('ren_'..math.random(5,6))YIELD() + SFX.play('ren_'..math.random(7,8))YIELD() + SFX.play('ren_'..math.random(9,10))YIELD() + SFX.play('ren_9')SFX.play('ren_11')SFX.play('ren_mega') + SCN.go('app_console') YIELD() end end) @@ -54,7 +54,7 @@ end function scene.keyDown(key) if key=="1"then if testButton(1)then - SCN.go("mode") + SCN.go('mode') end elseif key=="q"then if testButton(2)then @@ -64,52 +64,52 @@ function scene.keyDown(key) if testButton(3)then if NET.connected then if NET.allow_online then - if WS.status("user")=="running"then + if WS.status('user')=='running'then NET.getAccessToken() else - SCN.go("login") + SCN.go('login') end else - TEXT.show(text.needUpdate,640,450,60,"flicker") - SFX.play("finesseError") + TEXT.show(text.needUpdate,640,450,60,'flicker') + SFX.play('finesseError') end else - TEXT.show(text.noInternet,640,450,60,"flicker") + TEXT.show(text.noInternet,640,450,60,'flicker') NET.wsconn_app() - SFX.play("finesseError") + SFX.play('finesseError') end end elseif key=="z"then if testButton(4)then - SCN.go("customGame") + SCN.go('customGame') end elseif key=="-"then if testButton(5)then - SCN.go("setting_game") + SCN.go('setting_game') end elseif key=="p"then if testButton(6)then - SCN.go("stat") + SCN.go('stat') end elseif key=="l"then if testButton(7)then - SCN.go("dict") + SCN.go('dict') end elseif key==","then if testButton(8)then - SCN.go("manual") + SCN.go('manual') end elseif key=="2"then if testButton(9)then - SCN.go("music") + SCN.go('music') end elseif key=="0"then if testButton(10)then - SCN.go("lang") + SCN.go('lang') end elseif key=="x"then if testButton(11)then - SCN.go("about") + SCN.go('about') end elseif key=="escape"then if testButton(12)then @@ -134,7 +134,7 @@ function scene.update(dt) end local function tipStencil() - gc.rectangle("fill",0,0,tipLength,42) + gc.rectangle('fill',0,0,tipLength,42) end function scene.draw() --Version @@ -147,12 +147,12 @@ function scene.draw() mDraw(TEXTURE.title_color,640,60,nil,.43) --Tip - gc.push("transform") + gc.push('transform') gc.translate(260,650) gc.setLineWidth(2) - gc.rectangle("line",0,0,tipLength,42) - gc.stencil(tipStencil,"replace",1) - gc.setStencilTest("equal",1) + gc.rectangle('line',0,0,tipLength,42) + gc.stencil(tipStencil,'replace',1) + gc.setStencilTest('equal',1) gc.draw(tip,0+scrollX,0) gc.setColor(1,1,1,.2) gc.setStencilTest() @@ -174,20 +174,20 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="offline",x=-1200,y=210,w=800,h=100, color="lR",font=45,align="R",edge=30,code=pressKey"1"}, - WIDGET.newButton{name="qplay", x=-1200,y=330,w=800,h=100, color="lM",font=40,align="R",edge=30,code=pressKey"q"}, - WIDGET.newButton{name="online", x=-1200,y=450,w=800,h=100, color="lV",font=45,align="R",edge=30,code=pressKey"a"}, - WIDGET.newButton{name="custom", x=-1200,y=570,w=800,h=100, color="lS",font=45,align="R",edge=30,code=pressKey"z"}, + WIDGET.newButton{name="offline",x=-1200,y=210,w=800,h=100, color='lR',font=45,align='R',edge=30,code=pressKey"1"}, + WIDGET.newButton{name="qplay", x=-1200,y=330,w=800,h=100, color='lM',font=40,align='R',edge=30,code=pressKey"q"}, + WIDGET.newButton{name="online", x=-1200,y=450,w=800,h=100, color='lV',font=45,align='R',edge=30,code=pressKey"a"}, + WIDGET.newButton{name="custom", x=-1200,y=570,w=800,h=100, color='lS',font=45,align='R',edge=30,code=pressKey"z"}, - WIDGET.newButton{name="setting",x=2480,y=210,w=800,h=100, color="lO",font=40,align="L",edge=30,code=pressKey"-"}, - WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color="lL",font=40,align="L",edge=30,code=pressKey"p"}, - WIDGET.newButton{name="dict", x=2480,y=450,w=800,h=100, color="lG",font=40,align="L",edge=30,code=pressKey"l"}, - WIDGET.newButton{name="manual", x=2480,y=570,w=800,h=100, color="lC",font=40,align="L",edge=30,code=pressKey","}, + WIDGET.newButton{name="setting",x=2480,y=210,w=800,h=100, color='lO',font=40,align='L',edge=30,code=pressKey"-"}, + WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color='lL',font=40,align='L',edge=30,code=pressKey"p"}, + WIDGET.newButton{name="dict", x=2480,y=450,w=800,h=100, color='lG',font=40,align='L',edge=30,code=pressKey"l"}, + WIDGET.newButton{name="manual", x=2480,y=570,w=800,h=100, color='lC',font=40,align='L',edge=30,code=pressKey","}, - WIDGET.newButton{name="music", x=130,y=80,w=200,h=90, color="lO",font=35,code=pressKey"2"}, - WIDGET.newButton{name="lang", x=300,y=80,w=90,h=90, color="lN",font=40,code=pressKey"0",fText=TEXTURE.earth}, - WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color="lB",font=35,align="R",edge=30,code=pressKey"x"}, - WIDGET.newButton{name="back", x=1390,y=670,w=600,h=70, color="lR",font=40,align="L",edge=30,code=backScene}, + WIDGET.newButton{name="music", x=130,y=80,w=200,h=90, color='lO',font=35,code=pressKey"2"}, + WIDGET.newButton{name="lang", x=300,y=80,w=90,h=90, color='lN',font=40,code=pressKey"0",fText=TEXTURE.earth}, + WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',font=35,align='R',edge=30,code=pressKey"x"}, + WIDGET.newButton{name="back", x=1390,y=670,w=600,h=70, color='lR',font=40,align='L',edge=30,code=backScene}, } return scene \ No newline at end of file diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index 5e9100f2..84eb8412 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -16,14 +16,14 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="system", x=750,y=280,color="Z",font=30,align="L",fText=SYSTEM}, - WIDGET.newText{name="version", x=950,y=280,color="Z",font=30,align="L",fText=VERSION.string}, - WIDGET.newButton{name="sprint", x=260,y=480,w=260,font=50,code=function()loadGame("sprint_40l",true)end}, - WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame("marathon_n",true)end}, + WIDGET.newText{name="system", x=750,y=280,color='Z',font=30,align='L',fText=SYSTEM}, + WIDGET.newText{name="version", x=950,y=280,color='Z',font=30,align='L',fText=VERSION.string}, + WIDGET.newButton{name="sprint", x=260,y=480,w=260,font=50,code=function()loadGame('sprint_40l',true)end}, + WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end}, WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText="...",font=50,code=goScene"setting_game"}, WIDGET.newButton{name="lang", x=1000,y=560,w=120,fText="言/A",font=40,code=goScene"lang"}, WIDGET.newButton{name="help", x=1160,y=400,w=120,fText="?",font=80,code=goScene"help"}, - WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText="X",font=70,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}, + WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText="X",font=70,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, } return scene \ No newline at end of file diff --git a/parts/scenes/manual.lua b/parts/scenes/manual.lua index e067c17f..5084faaa 100644 --- a/parts/scenes/manual.lua +++ b/parts/scenes/manual.lua @@ -1,7 +1,7 @@ local scene={} function scene.sceneInit() - BG.set("cubes") + BG.set('cubes') WIDGET.active.texts:setTexts(require("parts.language.manual_"..({"zh","zh","zh","en","en","en","en","en"})[SETTING.lang])) end diff --git a/parts/scenes/mod.lua b/parts/scenes/mod.lua index 7fe9b630..2502534e 100644 --- a/parts/scenes/mod.lua +++ b/parts/scenes/mod.lua @@ -31,11 +31,11 @@ local function toggleMod(M,back) remMod(M) end if M.unranked then - SFX.play("move",.6) - SFX.play("lock") + SFX.play('move',.6) + SFX.play('lock') else - SFX.play("move") - SFX.play("lock",.6) + SFX.play('move') + SFX.play('lock',.6) end end @@ -45,7 +45,7 @@ local selected--Mod selected function scene.sceneInit() selected=false - BG.set("tunnel") + BG.set('tunnel') end function scene.mouseMove(x,y) @@ -78,7 +78,7 @@ function scene.keyDown(key) while GAME.mod[1]do rem(GAME.mod).sel=0 end - SFX.play("hold") + SFX.play('hold') end elseif #key==1 then for _,M in next,MODOPT do @@ -110,7 +110,7 @@ function scene.draw() setFont(40) gc.setLineWidth(5) for _,M in next,MODOPT do - gc.push("transform") + gc.push('transform') gc.translate(M.x,M.y) local t=M.time*.01--t range:0~0.1 gc.scale(1+3*t) @@ -123,10 +123,10 @@ function scene.draw() end local color=M.color gc.setColor(color[1],color[2],color[3],5*t) - gc.circle("fill",0,0,rad,side) + gc.circle('fill',0,0,rad,side) gc.setColor(color) - gc.circle("line",0,0,rad,side) + gc.circle('line',0,0,rad,side) gc.setColor(1,1,1) mStr(M.id,0,-28) if M.sel>0 and M.list then @@ -138,7 +138,7 @@ function scene.draw() if M.list then gc.setColor(1,1,1,t*6) - gc.arc("line","open",0,0,rad+6,0,(M.sel/#M.list)*6.2832) + gc.arc('line','open',0,0,rad+6,0,(M.sel/#M.list)*6.2832) end gc.pop() end @@ -154,8 +154,8 @@ function scene.draw() end scene.widgetList={ - WIDGET.newText{name="title", x=80,y=50,font=70,align="L"}, - WIDGET.newText{name="unranked", x=1200,y=60,color="Y",font=50,align="R",hide=function()return scoreValid()end}, + WIDGET.newText{name="title", x=80,y=50,font=70,align='L'}, + WIDGET.newText{name="unranked", x=1200,y=60,color='Y',font=50,align='R',hide=function()return scoreValid()end}, WIDGET.newButton{name="reset", x=1140,y=540,w=170,h=80,font=25,code=pressKey"tab"}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index 23325b93..fe6065dd 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -79,7 +79,7 @@ function scene.mouseClick(x,y) mapCam.moving=true _=MODES[SEL] mapCam.sel=SEL - SFX.play("click") + SFX.play('click') else mapCam.sel=false end @@ -120,7 +120,7 @@ function scene.keyDown(key) loadGame(mapCam.sel) end elseif key=="f1"then - SCN.go("mod") + SCN.go('mod') elseif key=="escape"then if mapCam.sel then mapCam.sel=false @@ -166,7 +166,7 @@ function scene.update() end if SEL and mapCam.sel~=SEL then mapCam.sel=SEL - SFX.play("click") + SFX.play('click') end end end @@ -206,7 +206,7 @@ local function drawModeShape(M,S,drawType) end function scene.draw() local _ - gc.push("transform") + gc.push('transform') gc.translate(640,360) gc.rotate((mapCam.zoomK^.6-1)) gc.scale(mapCam.zoomK^.7) @@ -237,9 +237,9 @@ function scene.draw() --Draw shapes on map gc.setColor(baseRankColor[rank]) - drawModeShape(M,S,"fill") + drawModeShape(M,S,'fill') gc.setColor(1,1,sel==name and 0 or 1) - drawModeShape(M,S,"line") + drawModeShape(M,S,'line') --Icon local icon=M.icon @@ -265,19 +265,19 @@ function scene.draw() if sel then local M=MODES[sel] gc.setColor(.5,.5,.5,.8) - gc.rectangle("fill",920,0,360,720)--Info board + gc.rectangle('fill',920,0,360,720)--Info board gc.setColor(M.color) setFont(40)mStr(text.modes[sel][1],1100,5) setFont(30)mStr(text.modes[sel][2],1100,50) gc.setColor(1,1,1) - setFont(25)gc.printf(text.modes[sel][3],920,110,360,"center") + setFont(25)gc.printf(text.modes[sel][3],920,110,360,'center') if M.slowMark then gc.draw(IMG.ctrlSpeedLimit,1230,50,nil,.4) end if M.score then mText(drawableText.highScore,1100,240) gc.setColor(.3,.3,.3,.7) - gc.rectangle("fill",940,290,320,280)--Highscore board + gc.rectangle('fill',940,290,320,280)--Highscore board local L=M.records gc.setColor(1,1,1) if L[1]then diff --git a/parts/scenes/music.lua b/parts/scenes/music.lua index 6885b91a..cda869db 100644 --- a/parts/scenes/music.lua +++ b/parts/scenes/music.lua @@ -35,22 +35,22 @@ function scene.keyDown(key) if key=="down"then if S1 then selected=S-1 - SFX.play("move",.7) + SFX.play('move',.7) end elseif key=="return"or key=="space"then if BGM.nowPlay~=bgmList[S]then BGM.play(bgmList[S]) - if SETTING.bgm>0 then SFX.play("click")end + if SETTING.bgm>0 then SFX.play('click')end else BGM.stop() end elseif key=="tab"then - SCN.swapTo("sound","none") + SCN.swapTo('sound','none') elseif key=="escape"then SCN.back() end @@ -88,14 +88,14 @@ function scene.draw() gc.setLineWidth(4) gc.line(500,600,900,600) gc.setColor(1,1,1) - gc.circle("fill",500+400*BGM.playing:tell()/BGM.playing:getDuration(),600,6) + gc.circle('fill',500+400*BGM.playing:tell()/BGM.playing:getDuration(),600,6) end end scene.widgetList={ - WIDGET.newText{name="title", x=30, y=30,font=80,align="L"}, - WIDGET.newText{name="arrow", x=270, y=360,font=45,align="L"}, - WIDGET.newText{name="now", x=700, y=500,font=50,align="R",hide=function()return not BGM.nowPlay end}, + WIDGET.newText{name="title", x=30, y=30,font=80,align='L'}, + WIDGET.newText{name="arrow", x=270, y=360,font=45,align='L'}, + WIDGET.newText{name="now", x=700, y=500,font=50,align='R',hide=function()return not BGM.nowPlay end}, WIDGET.newSlider{name="bgm", x=760, y=80,w=400, font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, WIDGET.newButton{name="up", x=200, y=250,w=120, font=55,code=pressKey"up",hide=function()return selected==1 end}, WIDGET.newButton{name="play", x=200, y=390,w=120, font=35,code=pressKey"space"}, diff --git a/parts/scenes/net_chat.lua b/parts/scenes/net_chat.lua index d889acb7..15db4b3b 100644 --- a/parts/scenes/net_chat.lua +++ b/parts/scenes/net_chat.lua @@ -26,7 +26,7 @@ function scene.sceneInit() end textBox:scroll(1) TASK.new(function()YIELD()WIDGET.sel=WIDGET.active.input end) - BG.set("none") + BG.set('none') end function scene.sceneBack() NET.quitChat() @@ -65,7 +65,7 @@ function scene.socketRead(mes) } remain=tonumber(args[3]) elseif cmd=="T"then - local _,text=pcall(data.decode,"string","base64",args[3]) + local _,text=pcall(data.decode,'string','base64',args[3]) if not _ then text=args[3]end textBox:push{ COLOR.Z,args[1], @@ -81,7 +81,7 @@ end function scene.draw() setFont(25) gc.setColor(1,1,1) - gc.printf(text.chatRemain,800,10,400,"right") + gc.printf(text.chatRemain,800,10,400,'right') gc.print(remain or"?",1205,10) end diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index 31137cc0..039b51c6 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -93,8 +93,8 @@ function scene.keyDown(key) elseif key=="space"then NET.signal_ready(not PLY_NET[1].ready) elseif key=="s"then - if not(PLY_NET[1].ready or NET.getlock("ready"))then - SCN.go("setting_game") + if not(PLY_NET[1].ready or NET.getlock('ready'))then + SCN.go('setting_game') end end end @@ -140,7 +140,7 @@ function scene.socketRead(cmd,d) COLOR.dY,"#"..d.uid.." ", COLOR.Y,text.joinRoom, } - SFX.play("click") + SFX.play('click') elseif cmd=="Leave"then textBox:push{ COLOR.lR,d.username, @@ -161,7 +161,7 @@ function scene.socketRead(cmd,d) end lastUpstreamTime=0 upstreamProgress=1 - resetGameData("n",d.seed) + resetGameData('n',d.seed) else LOG.print("Redundant [Go]",30,COLOR.G) end @@ -177,7 +177,7 @@ function scene.socketRead(cmd,d) if not winnerUID then return end for _,p in next,PLY_NET do if p.uid==winnerUID then - TEXT.show(text.champion:gsub("$1",p.username),640,260,80,"zoomout",.26) + TEXT.show(text.champion:gsub("$1",p.username),640,260,80,'zoomout',.26) break end end @@ -185,7 +185,7 @@ function scene.socketRead(cmd,d) if d.uid~=USER.uid and playing then for _,P in next,PLAYERS do if P.uid==d.uid then - local res,stream=pcall(love.data.decode,"string","base64",d.stream) + local res,stream=pcall(love.data.decode,'string','base64',d.stream) if res then DATA.pumpRecording(stream,P.stream) else @@ -246,9 +246,9 @@ function scene.draw() local p=PLY_NET[i] --Rectangle - gc.setColor(COLOR[p.ready and"G"or"white"]) + gc.setColor(COLOR[p.ready and'G'or'Z']) gc.setLineWidth(2) - gc.rectangle("line",40,65+50*i,1000,46) + gc.rectangle('line',40,65+50*i,1000,46) --UID setFont(40) @@ -282,24 +282,24 @@ function scene.draw() end scene.widgetList={ textBox, - WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s",hide=function()return playing or PLY_NET[1].ready or NET.getlock("ready")end}, - WIDGET.newKey{name="ready",x=900,y=560,w=400,h=100,color="lB",font=40,code=pressKey"space", + WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s",hide=function()return playing or PLY_NET[1].ready or NET.getlock('ready')end}, + WIDGET.newKey{name="ready",x=900,y=560,w=400,h=100,color='lB',font=40,code=pressKey"space", hide=function() return playing or NET.serverGaming or not textBox.hide or PLY_NET[1].ready or - NET.getlock("ready") + NET.getlock('ready') end}, - WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color="H",font=40,code=pressKey"space", + WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color='H',font=40,code=pressKey"space", hide=function() return playing or NET.serverGaming or not textBox.hide or not PLY_NET[1].ready or - NET.getlock("ready") + NET.getlock('ready') end}, WIDGET.newKey{name="hideChat",fText="...",x=380,y=35,w=60,font=35,code=pressKey"\\"}, WIDGET.newKey{name="quit",fText="X",x=900,y=35,w=60,font=40,code=pressKey"escape"}, diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index 5b5a4cf7..c6aea1f1 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -18,8 +18,8 @@ scene.widgetList={ WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene"setting_game"}, WIDGET.newButton{name="ffa", x=640, y=200,w=350,h=120,font=40,code=function()NET.enterRoom("ffa")end}, WIDGET.newButton{name="rooms", x=640, y=360,w=350,h=120,font=40,code=goScene"net_rooms"}, - WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,color="D",font=40,code=NULL}, - WIDGET.newButton{name="logout", x=880, y=40,w=180,h=60,color="dR", + WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,color='D',font=40,code=NULL}, + WIDGET.newButton{name="logout", x=880, y=40,w=180,h=60,color='dR', code=function() if TIME()-lastLogoutTime<1 then if USER.uid then @@ -28,7 +28,7 @@ scene.widgetList={ USER.uid=false USER.username=false USER.authToken=false - FILE.save(USER,"conf/user","q") + FILE.save(USER,"conf/user",'q') SCN.back() end else diff --git a/parts/scenes/net_rooms.lua b/parts/scenes/net_rooms.lua index 6a299fc7..87ba410b 100644 --- a/parts/scenes/net_rooms.lua +++ b/parts/scenes/net_rooms.lua @@ -31,21 +31,21 @@ function scene.keyDown(k) fetchRoom() end elseif k=="s"then - SCN.go("setting_game") + SCN.go('setting_game') elseif k=="m"or k=="n"then if TIME()-lastCreateRoomTime>6.26 then NET.createRoom( k=="m"and"classic"or tonumber(USER.uid)<100 and( - kb.isDown("q")and"r49"or - kb.isDown("w")and"r99"or - kb.isDown("e")and"unlimited" + kb.isDown"q"and"r49"or + kb.isDown"w"and"r99"or + kb.isDown"e"and"unlimited" )or"solo", (USERS.getUsername(USER.uid)or"???").."'s room" ) lastCreateRoomTime=TIME() else - LOG.print(text.createRoomTooFast,"warn") + LOG.print(text.createRoomTooFast,'warn') end elseif k=="escape"then SCN.back() @@ -61,7 +61,7 @@ function scene.keyDown(k) scrollPos=max(selected-10,min(scrollPos,selected-1)) end elseif k=="return"then - if NET.getlock("fetchRoom")or not NET.roomList[selected]then return end + if NET.getlock('fetchRoom')or not NET.roomList[selected]then return end if NET.roomList[selected].private then LOG.print("Can't enter private room now") return @@ -89,7 +89,7 @@ function scene.mouseClick(x,y) if NET.roomList[s]then if selected~=s then selected=s - SFX.play("click",.4) + SFX.play('click',.4) else scene.keyDown("return") end @@ -100,7 +100,7 @@ end scene.touchClick=scene.mouseClick function scene.update(dt) - if not NET.getlock("fetchRoom")then + if not NET.getlock('fetchRoom')then fetchTimer=fetchTimer-dt if fetchTimer<=0 then fetchRoom() @@ -112,30 +112,30 @@ function scene.update(dt) end local function roomListStencil() - gc.rectangle("fill",50,110,1180,400) + gc.rectangle('fill',50,110,1180,400) end function scene.draw() --Fetching timer gc.setColor(1,1,1,.12) - gc.arc("fill","pie",300,620,60,-1.5708,-1.5708-1.2566*fetchTimer) + gc.arc('fill','pie',300,620,60,-1.5708,-1.5708-1.2566*fetchTimer) --Room list gc.setColor(1,1,1) gc.setLineWidth(2) - gc.rectangle("line",50,110,1060,400) + gc.rectangle('line',50,110,1060,400) local roomCount=#NET.roomList if roomCount>0 then setFont(35) - gc.push("transform") - gc.stencil(roomListStencil,"replace",1) - gc.setStencilTest("equal",1) + gc.push('transform') + gc.stencil(roomListStencil,'replace',1) + gc.setStencilTest('equal',1) gc.translate(0,scrollPos%1*-40) local pos=int(scrollPos) for i=1,math.min(11,roomCount-pos)do local R=NET.roomList[pos+i] if pos+i==selected then gc.setColor(1,1,1,.3) - gc.rectangle("fill",50,70+40*i,1060,40) + gc.rectangle('fill',50,70+40*i,1060,40) end if R.start then gc.setColor(0,1,0) @@ -146,7 +146,7 @@ function scene.draw() gc.setColor(1,1,.7) gc.print(R.name,250,66+40*i) gc.setColor(1,1,1) - gc.printf(R.type,430,66+40*i,500,"right") + gc.printf(R.type,430,66+40*i,500,'right') gc.print(R.count.."/"..R.capacity,980,66+40*i) if R.private then gc.draw(IMG.lock,59,75+40*i) @@ -156,7 +156,7 @@ function scene.draw() gc.pop() if roomCount>10 then local len=400*10/roomCount - gc.rectangle("fill",1218,110+(400-len)*scrollPos/(roomCount-10),12,len) + gc.rectangle('fill',1218,110+(400-len)*scrollPos/(roomCount-10),12,len) end end @@ -166,12 +166,12 @@ end scene.widgetList={ WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s"}, - WIDGET.newText{name="refreshing",x=580,y=255,font=45,hide=function()return not NET.getlock("fetchRoom")end}, - WIDGET.newText{name="noRoom", x=580,y=260,font=40,hide=function()return #NET.roomList>0 or NET.getlock("fetchRoom")end}, + WIDGET.newText{name="refreshing",x=580,y=255,font=45,hide=function()return not NET.getlock('fetchRoom')end}, + WIDGET.newText{name="noRoom", x=580,y=260,font=40,hide=function()return #NET.roomList>0 or NET.getlock('fetchRoom')end}, WIDGET.newKey{name="refresh", x=300,y=620,w=140,h=140,font=35,code=fetchRoom,hide=function()return fetchTimer>3.26 end}, WIDGET.newKey{name="new", x=500,y=620,w=140,h=140,font=20,code=pressKey"n"}, WIDGET.newKey{name="new2", x=700,y=620,w=140,h=140,font=20,code=pressKey"m"}, - WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hide=function()return #NET.roomList==0 or NET.getlock("enterRoom") end}, + WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hide=function()return #NET.roomList==0 or NET.getlock('enterRoom') end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 416325e6..ac1620dd 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -29,7 +29,7 @@ local trophyColor--Current trophy color function scene.sceneInit(org) if org:find("setting")then - TEXT.show(text.needRestart,640,440,50,"fly",.6) + TEXT.show(text.needRestart,640,440,50,'fly',.6) end local P=PLAYERS[1] local S=P.stat @@ -38,7 +38,7 @@ function scene.sceneInit(org) local frameLostRate=(S.frame/S.time/60-1)*100 form={ - {COLOR.Z,STRING.time(S.time),COLOR[frameLostRate>10 and"R"or frameLostRate>3 and"Y"or"H"],(" (%.2f%%)"):format(frameLostRate)}, + {COLOR.Z,STRING.time(S.time),COLOR[frameLostRate>10 and'R'or frameLostRate>3 and'Y'or'H'],(" (%.2f%%)"):format(frameLostRate)}, ("%d/%d/%d"):format(S.key,S.rotate,S.hold), ("%d %.2fPPS"):format(S.piece,S.piece/S.time), ("%d(%d) %.2fLPM"):format(S.row,S.dig,S.row/S.time*60), @@ -90,7 +90,7 @@ function scene.sceneInit(org) val[2*i-1],val[2*i]=val[i]*standard[2*i-1],val[i]*standard[2*i] end - if P.result=="WIN"and P.stat.piece>4 then + if P.result=='win'and P.stat.piece>4 then local acc=P.stat.finesseRate*.2/P.stat.piece rank= acc==1. and"Z"or @@ -130,17 +130,17 @@ function scene.keyDown(key) if key=="q"then SCN.back() elseif key=="escape"then - SCN.swapTo(GAME.result and"game"or"depause","none") + SCN.swapTo(GAME.result and"game"or"depause",'none') elseif key=="s"then GAME.prevBG=BG.cur - SCN.go("setting_sound") + SCN.go('setting_sound') elseif key=="r"then resetGameData() - SCN.swapTo("game","none") + SCN.swapTo('game','none') elseif key=="p"then if(GAME.result or GAME.replaying)and #PLAYERS==1 then - resetGameData("r") - SCN.swapTo("game","none") + resetGameData('r') + SCN.swapTo('game','none') end elseif key=="o"then if(GAME.result or GAME.replaying)and #PLAYERS==1 and not GAME.saved then @@ -174,9 +174,9 @@ function scene.draw() local _=T if GAME.result then _=_*.7 end gc.setColor(.15,.15,.15,_) - gc.push("transform") + gc.push('transform') gc.origin() - gc.rectangle("fill",0,0,SCR.w,SCR.h) + gc.rectangle('fill',0,0,SCR.w,SCR.h) gc.pop() --Pause Info @@ -201,7 +201,7 @@ function scene.draw() --Finesse rank & trophy if rank then gc.setColor(1,1,1,T*.2) - gc.rectangle("fill",35,305,465,405) + gc.rectangle('fill',35,305,465,405) setFont(60) local c=fnsRankColor[rank] @@ -210,24 +210,24 @@ function scene.draw() if trophy then setFont(40) gc.setColor(trophyColor[1],trophyColor[2],trophyColor[3],T*2-1) - gc.printf(trophy,100-120*(1-T^.5),650,300,"right") + gc.printf(trophy,100-120*(1-T^.5),650,300,'right') end gc.setColor(1,1,1,T) - gc.rectangle("line",35,305,465,405) + gc.rectangle('line',35,305,465,405) gc.line(35,620,500,620) else gc.setColor(1,1,1,T*.2) - gc.rectangle("fill",35,305,465,350) + gc.rectangle('fill',35,305,465,350) gc.setColor(1,1,1,T) - gc.rectangle("line",35,305,465,350) + gc.rectangle('line',35,305,465,350) end _=form setFont(25) for i=1,10 do gc.print(text.pauseStat[i],40,270+35*i) - gc.printf(_[i],195,270+35*i,300,"right") + gc.printf(_[i],195,270+35*i,300,'right') end end @@ -235,14 +235,14 @@ function scene.draw() if #GAME.mod>0 then if scoreValid()then gc.setColor(.7,.7,.7,T) - gc.rectangle("line",775,560,490,140) + gc.rectangle('line',775,560,490,140) gc.setColor(.7,.7,.7,T*.26) - gc.rectangle("fill",775,560,490,140) + gc.rectangle('fill',775,560,490,140) else gc.setColor(1,0,0,T) - gc.rectangle("line",775,560,490,140) + gc.rectangle('line',775,560,490,140) gc.setColor(1,0,0,T*.26) - gc.rectangle("fill",775,560,490,140) + gc.rectangle('fill',775,560,490,140) end setFont(35) for _,M in next,MODOPT do @@ -269,19 +269,19 @@ function scene.draw() if T>.5 and PLAYERS[1].frameRun>180 then T=T*2-1 gc.setLineWidth(2) - gc.push("transform") + gc.push('transform') gc.translate(1026,370) --Polygon - gc.push("transform") + gc.push('transform') gc.scale((3-2*T)*T) - gc.setColor(1,1,1,T*(.5+.3*sin(TIME()*6.26)))gc.polygon("line",standard) + gc.setColor(1,1,1,T*(.5+.3*sin(TIME()*6.26)))gc.polygon('line',standard) gc.setColor(chartColor[1],chartColor[2],chartColor[3],T*.626) for i=1,9,2 do - gc.polygon("fill",0,0,val[i],val[i+1],val[i+2],val[i+3]) + gc.polygon('fill',0,0,val[i],val[i+1],val[i+2],val[i+3]) end - gc.polygon("fill",0,0,val[11],val[12],val[1],val[2]) - gc.setColor(1,1,1,T)gc.polygon("line",val) + gc.polygon('fill',0,0,val[11],val[12],val[1],val[2]) + gc.setColor(1,1,1,T)gc.polygon('line',val) gc.pop() --Axes @@ -311,11 +311,11 @@ function scene.draw() end scene.widgetList={ - WIDGET.newButton{name="setting", x=1120,y=70,w=240,h=90, color="lB",font=35,code=pressKey"s"}, - WIDGET.newButton{name="replay", x=535,y=250,w=200,h=100,color="lY",font=30,code=pressKey"p",hide=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}, - WIDGET.newButton{name="save", x=745,y=250,w=200,h=100,color="G",font=30,code=pressKey"o",hide=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved end}, - WIDGET.newButton{name="resume", x=640,y=367,w=240,h=100,color="lG",font=30,code=pressKey"escape"}, - WIDGET.newButton{name="restart", x=640,y=483,w=240,h=100,color="lR",font=35,code=pressKey"r"}, + WIDGET.newButton{name="setting", x=1120,y=70,w=240,h=90, color='lB',font=35,code=pressKey"s"}, + WIDGET.newButton{name="replay", x=535,y=250,w=200,h=100,color='lY',font=30,code=pressKey"p",hide=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 end}, + WIDGET.newButton{name="save", x=745,y=250,w=200,h=100,color='G',font=30,code=pressKey"o",hide=function()return not(GAME.result or GAME.replaying)or #PLAYERS>1 or GAME.saved end}, + WIDGET.newButton{name="resume", x=640,y=367,w=240,h=100,color='lG',font=30,code=pressKey"escape"}, + WIDGET.newButton{name="restart", x=640,y=483,w=240,h=100,color='lR',font=35,code=pressKey"r"}, WIDGET.newButton{name="quit", x=640,y=600,w=240,h=100,font=35,code=backScene}, } diff --git a/parts/scenes/register.lua b/parts/scenes/register.lua index bd998b92..8044e63d 100644 --- a/parts/scenes/register.lua +++ b/parts/scenes/register.lua @@ -18,8 +18,8 @@ local function register() end scene.widgetList={ - WIDGET.newText{name="title", x=80, y=50,font=70,align="L"}, - WIDGET.newButton{name="login", x=1140, y=100,w=170,h=80,color="lY",code=function()SCN.swapTo("login","swipeL")end}, + WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, + WIDGET.newButton{name="login", x=1140, y=100,w=170,h=80,color='lY',code=function()SCN.swapTo('login','swipeL')end}, WIDGET.newInputBox{name="username", x=380, y=200,w=500,h=60,regex="[0-9A-Za-z_]"}, WIDGET.newInputBox{name="email", x=380, y=300,w=626,h=60}, WIDGET.newInputBox{name="password", x=380, y=400,w=626,h=60,secret=true,regex="[ -~]"}, diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 0d9e2372..18c5d96e 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -3,9 +3,9 @@ local scene={} local function dumpCB(T) love.system.setClipboardText( love.data.encode( - "string","base64", + 'string','base64', love.data.compress( - "string","zlib", + 'string','zlib', TABLE.dump(T) ) ) @@ -17,9 +17,9 @@ local function parseCB() local s=love.system.getClipboardText() --Decode - _,s=pcall(love.data.decode,"string","base64",s) + _,s=pcall(love.data.decode,'string','base64',s) if not _ then LOG.print(text.dataCorrupted,COLOR.R)return end - _,s=pcall(love.data.decompress,"string","zlib",s) + _,s=pcall(love.data.decompress,'string','zlib',s) if not _ then LOG.print(text.dataCorrupted,COLOR.R)return end s=loadstring(s) @@ -29,53 +29,53 @@ local function parseCB() end end scene.widgetList={ - WIDGET.newButton{name="exportUnlock", x=190,y=150,w=280,h=100,color="lG",font=25,code=function()dumpCB(RANKS)end}, - WIDGET.newButton{name="exportData", x=490,y=150,w=280,h=100,color="lG",font=25,code=function()dumpCB(STAT)end}, - WIDGET.newButton{name="exportSetting", x=790,y=150,w=280,h=100,color="lG",font=25,code=function()dumpCB(SETTING)end}, - WIDGET.newButton{name="exportVK", x=1090,y=150,w=280,h=100,color="lG",font=25,code=function()dumpCB(VK_org)end}, + WIDGET.newButton{name="exportUnlock", x=190,y=150,w=280,h=100,color='lG',font=25,code=function()dumpCB(RANKS)end}, + WIDGET.newButton{name="exportData", x=490,y=150,w=280,h=100,color='lG',font=25,code=function()dumpCB(STAT)end}, + WIDGET.newButton{name="exportSetting", x=790,y=150,w=280,h=100,color='lG',font=25,code=function()dumpCB(SETTING)end}, + WIDGET.newButton{name="exportVK", x=1090,y=150,w=280,h=100,color='lG',font=25,code=function()dumpCB(VK_org)end}, - WIDGET.newButton{name="importUnlock", x=190,y=300,w=280,h=100,color="lB",font=25, + WIDGET.newButton{name="importUnlock", x=190,y=300,w=280,h=100,color='lB',font=25, code=function() local D=parseCB() if D then TABLE.update(D,RANKS) FILE.save(RANKS,"conf/unlock") - LOG.print(text.importSuccess,"message") + LOG.print(text.importSuccess,'message') else - LOG.print(text.dataCorrupted,"warn") + LOG.print(text.dataCorrupted,'warn') end end}, - WIDGET.newButton{name="importData", x=490,y=300,w=280,h=100,color="lB",font=25, + WIDGET.newButton{name="importData", x=490,y=300,w=280,h=100,color='lB',font=25, code=function() local D=parseCB() if D and D.version==STAT.version then TABLE.update(D,STAT) FILE.save(STAT,"conf/data") - LOG.print(text.importSuccess,"message") + LOG.print(text.importSuccess,'message') else - LOG.print(text.dataCorrupted,"warn") + LOG.print(text.dataCorrupted,'warn') end end}, - WIDGET.newButton{name="importSetting", x=790,y=300,w=280,h=100,color="lB",font=25, + WIDGET.newButton{name="importSetting", x=790,y=300,w=280,h=100,color='lB',font=25, code=function() local D=parseCB() if D then TABLE.update(D,SETTING) FILE.save(SETTING,"conf/settings") - LOG.print(text.importSuccess,"message") + LOG.print(text.importSuccess,'message') else - LOG.print(text.dataCorrupted,"warn") + LOG.print(text.dataCorrupted,'warn') end end}, - WIDGET.newButton{name="importVK", x=1090,y=300,w=280,h=100,color="lB",font=25, + WIDGET.newButton{name="importVK", x=1090,y=300,w=280,h=100,color='lB',font=25, code=function() local D=parseCB() if D then TABLE.update(D,VK_org) FILE.save(VK_org,"conf/virtualkey") - LOG.print(text.importSuccess,"message") + LOG.print(text.importSuccess,'message') else - LOG.print(text.dataCorrupted,"warn") + LOG.print(text.dataCorrupted,'warn') end end}, WIDGET.newButton{name="back", x=640,y=620,w=200,h=80,font=40,code=backScene}, diff --git a/parts/scenes/setting_control.lua b/parts/scenes/setting_control.lua index 2c4427d6..4ce9ae6c 100644 --- a/parts/scenes/setting_control.lua +++ b/parts/scenes/setting_control.lua @@ -8,7 +8,7 @@ local pos,dir,wait function scene.sceneInit() das,arr=SETTING.das,SETTING.arr pos,dir,wait=0,1,30 - BG.set("bg1") + BG.set('bg1') end function scene.update() @@ -78,8 +78,8 @@ local function sliderShow(S) return S.."F "..math.floor(S*16.67).."ms" end scene.widgetList={ - WIDGET.newText{name="title", x=80, y=50,font=70,align="L"}, - WIDGET.newText{name="preview", x=520, y=540,font=40,align="R"}, + WIDGET.newText{name="title", x=80, y=50,font=70,align='L'}, + WIDGET.newText{name="preview", x=520, y=540,font=40,align='R'}, WIDGET.newSlider{name="das", x=250, y=190,w=600,unit=20,disp=SETval("das"), show=sliderShow,code=SETsto("das")}, WIDGET.newSlider{name="arr", x=250, y=260,w=525,unit=15,disp=SETval("arr"), show=sliderShow,code=SETsto("arr")}, @@ -89,7 +89,7 @@ scene.widgetList={ WIDGET.newSwitch{name="ihs", x=1100, y=260, disp=SETval("ihs"), code=SETrev("ihs")}, WIDGET.newSwitch{name="irs", x=1100, y=330, disp=SETval("irs"), code=SETrev("irs")}, WIDGET.newSwitch{name="ims", x=1100, y=400, disp=SETval("ims"), code=SETrev("ims")}, - WIDGET.newButton{name="reset", x=160, y=580,w=200,h=100,color="lR",font=40, + WIDGET.newButton{name="reset", x=160, y=580,w=200,h=100,color='lR',font=40, code=function() local _=SETTING _.das,_.arr,_.dascut=10,2,0 diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index becbf569..f988d449 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -21,19 +21,19 @@ end scene.widgetList={ WIDGET.newText{name="title", x=640,y=15,font=80}, - WIDGET.newButton{name="graphic", x=200, y=80, w=240,h=80, color="lC",font=35,code=swapScene"setting_video","swipeR"}, - WIDGET.newButton{name="sound", x=1080, y=80, w=240,h=80, color="lC",font=35,code=swapScene"setting_sound","swipeL"}, + WIDGET.newButton{name="graphic", x=200, y=80, w=240,h=80, color='lC',font=35,code=swapScene"setting_video","swipeR"}, + WIDGET.newButton{name="sound", x=1080, y=80, w=240,h=80, color='lC',font=35,code=swapScene"setting_sound","swipeL"}, - WIDGET.newButton{name="ctrl", x=290, y=220, w=320,h=80, color="lY",font=35,code=goScene"setting_control"}, - WIDGET.newButton{name="key", x=640, y=220, w=320,h=80, color="lG",font=35,code=goScene"setting_key"}, - WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80, color="lB",font=35,code=goScene"setting_touch"}, + WIDGET.newButton{name="ctrl", x=290, y=220, w=320,h=80, color='lY',font=35,code=goScene"setting_control"}, + WIDGET.newButton{name="key", x=640, y=220, w=320,h=80, color='lG',font=35,code=goScene"setting_key"}, + WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80, color='lB',font=35,code=goScene"setting_touch"}, WIDGET.newSlider{name="reTime", x=350, y=340, w=300,unit=10,disp=SETval("reTime"),code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, - WIDGET.newSelector{name="RS", x=500, y=420, w=300,color="S",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=SETval("RS"),code=SETsto("RS")}, + WIDGET.newSelector{name="RS", x=500, y=420, w=300,color='S',list={'TRS','SRS','C2','C2sym','Classic','None'},disp=SETval("RS"),code=SETsto("RS")}, WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene"setting_skin"}, WIDGET.newSwitch{name="dataSaving", x=750, y=550, font=20,disp=SETval("dataSaving"), code=function()SETTING.dataSaving=not SETTING.dataSaving if not SETTING.dataSaving then USERS.forceFreshAvatar()end end}, WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=SETval("autoPause"), code=SETrev("autoPause")}, WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=SETval("swap"), code=SETrev("swap")}, - WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6)end end}, + WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play('finesseError',.6)end end}, WIDGET.newSwitch{name="appLock", x=1060, y=490, font=20,disp=SETval("appLock"), code=SETrev("appLock")}, WIDGET.newSwitch{name="simpMode", x=1060, y=550, font=25,disp=SETval("simpMode"), code=function() diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index 64af5716..f708a1ff 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -20,7 +20,7 @@ end function scene.sceneInit() selected=false freshKeyList() - BG.set("none") + BG.set('none') end function scene.sceneBack() FILE.save(keyMap,"conf/key") @@ -36,7 +36,7 @@ function scene.keyDown(key) end freshKeyList() selected=false - SFX.play("finesseError",.5) + SFX.play('finesseError',.5) else SCN.back() end @@ -45,7 +45,7 @@ function scene.keyDown(key) keyMap.keyboard[key]=selected freshKeyList() selected=false - SFX.play("reach",.5) + SFX.play('reach',.5) end else WIDGET.keyPressed(key) @@ -61,7 +61,7 @@ function scene.gamepadDown(key) end freshKeyList() selected=false - SFX.play("finesseError",.5) + SFX.play('finesseError',.5) else SCN.back() end @@ -69,7 +69,7 @@ function scene.gamepadDown(key) keyMap.joystick[key]=selected freshKeyList() selected=false - SFX.play("reach",.5) + SFX.play('reach',.5) else WIDGET.gamepadPressed(key) end @@ -94,7 +94,7 @@ function scene.draw() end if selected then - gc.setColor(COLOR[TIME()%.26<.13 and"R"or"Y"]) + gc.setColor(COLOR[TIME()%.26<.13 and'R'or'Y']) local x,y=selected>10 and 910 or 270, selected>10 and 60*(selected-10)-50 or selected>0 and 60*selected-50 or 630 setFont(40)gc.print("=",x,y) setFont(10)gc.print("esc?",x,y+40) @@ -104,10 +104,10 @@ end local function setSel(i) if selected==i then selected=false - SFX.play("rotate",.5) + SFX.play('rotate',.5) else selected=i - SFX.play("lock",.5) + SFX.play('lock',.5) end end scene.widgetList={ diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index 8134cce4..20d09e7e 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -23,7 +23,7 @@ function scene.draw() gc.setColor(1,1,1) local texture=SKIN.curText for n=1,7 do - gc.push("transform") + gc.push('transform') gc.translate(-10+140*n,340) gc.rotate(minoRot[n]+sin(t*3-n*.5)*.08) local color=SETTING.skin[n] @@ -35,7 +35,7 @@ function scene.draw() gc.draw(texture[color],x+30*j,y-30*i) end end end - gc.circle("fill",0,0,sin(t*10)+5) + gc.circle('fill',0,0,sin(t*10)+5) gc.pop() end for i=1,5 do @@ -53,11 +53,11 @@ end local function nextDir(i) SETTING.face[i]=(SETTING.face[i]+1)%4 minoRot0[i]=minoRot0[i]+1.5707963 - SFX.play("rotate") + SFX.play('rotate') end scene.widgetList={ - WIDGET.newText{name="title", x=80,y=50,font=70,align="L"}, + WIDGET.newText{name="title", x=80,y=50,font=70,align='L'}, WIDGET.newButton{name="prev", x=700,y=100,w=140,h=100,fText="←",font=50,code=function()SKIN.prevSet()end}, WIDGET.newButton{name="next", x=860,y=100,w=140,h=100,fText="→",font=50,code=function()SKIN.nextSet()end}, @@ -85,12 +85,12 @@ scene.widgetList={ --WIDGET.newButton{name="spin6",x=825,y=540,w=90,h=65,code=function()nextDir(6)end},--Cannot rotate O WIDGET.newButton{name="spin7", x=970,y=540,w=90,h=65,code=function()nextDir(7)end}, - WIDGET.newButton{name="skinR", x=200,y=640,w=220,h=80,color="lV",font=35, + WIDGET.newButton{name="skinR", x=200,y=640,w=220,h=80,color='lV',font=35, code=function() SETTING.skin={1,7,11,3,14,4,9,1,7,2,6,10,2,13,5,9,15,10,11,3,10,2,16,8,4,10,13,2,8} - SFX.play("rotate") + SFX.play('rotate') end}, - WIDGET.newButton{name="faceR", x=480,y=640,w=220,h=80,color="lR",font=35, + WIDGET.newButton{name="faceR", x=480,y=640,w=220,h=80,color='lR',font=35, code=function() for i=1,29 do SETTING.face[i]=0 @@ -98,7 +98,7 @@ scene.widgetList={ for i=1,7 do minoRot0[i]=(int(minoRot0[i]/6.2831853)+(minoRot0[i]%6.2831853>4 and 1 or 0))*6.2831853 end - SFX.play("hold") + SFX.play('hold') end}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 9c3a7fe1..1a55089d 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -57,17 +57,17 @@ end scene.widgetList={ WIDGET.newText{name="title", x=640,y=15,font=80}, - WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_game","swipeR"}, - WIDGET.newButton{name="graphic",x=1080, y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_video","swipeL"}, + WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene"setting_game","swipeR"}, + WIDGET.newButton{name="graphic",x=1080, y=80,w=240,h=80,color='lC',font=35,code=swapScene"setting_video","swipeL"}, - WIDGET.newSlider{name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play("blip_1")end,disp=SETval("sfx"),code=SETsto("sfx")}, + WIDGET.newSlider{name="sfx", x=180, y=200,w=400, font=35,change=function()SFX.play('blip_1')end,disp=SETval("sfx"),code=SETsto("sfx")}, WIDGET.newSlider{name="spawn", x=180, y=300,w=400, font=30,change=function()SFX.fplay("spawn_"..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, - WIDGET.newSlider{name="warn", x=180, y=400,w=400, font=30,change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, + WIDGET.newSlider{name='warn', x=180, y=400,w=400, font=30,change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, WIDGET.newSlider{name="bgm", x=180, y=500,w=400, font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, - WIDGET.newSlider{name="stereo", x=180, y=600,w=400, font=35,change=function()SFX.play("move",1,-1)SFX.play("lock",1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hide=function()return SETTING.sx==0 end}, + WIDGET.newSlider{name="stereo", x=180, y=600,w=400, font=35,change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hide=function()return SETTING.sx==0 end}, WIDGET.newSlider{name="vib", x=750, y=200,w=400,unit=5, font=25,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, - WIDGET.newSlider{name="voc", x=750, y=300,w=400, font=35,change=function()VOC.play("test")end,disp=SETval("voc"),code=SETsto("voc")}, - WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={"miya","naki"},disp=function()return cv end,code=function(i)cv=i end}, + WIDGET.newSlider{name="voc", x=750, y=300,w=400, font=35,change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, + WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={'miya','naki'},disp=function()return cv end,code=function(i)cv=i end}, WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hide=function()return SETTING.cv==cv end}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80, font=40,code=backScene}, } diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index a3648b26..fe000b03 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -10,7 +10,7 @@ local snapUnit=1 local selected--Button selected function scene.sceneInit() - BG.set("rainbow") + BG.set('rainbow') defaultSetSelect=1 selected=false end @@ -62,8 +62,8 @@ end function scene.draw() gc.setColor(1,1,1) - gc.setLineWidth(7)gc.rectangle("line",340,15,600,690) - gc.setLineWidth(3)gc.rectangle("line",490,85,300,600) + gc.setLineWidth(7)gc.rectangle('line',340,15,600,690) + gc.setLineWidth(3)gc.rectangle('line',490,85,300,600) VK.preview(selected) if snapUnit>=10 then gc.setLineWidth(3) @@ -170,10 +170,10 @@ scene.widgetList={ defaultSetSelect=defaultSetSelect%5+1 selected=false end}, - WIDGET.newSelector{name="snap", x=760,y=90,w=200,h=80,color="Y",list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, + WIDGET.newSelector{name="snap", x=760,y=90,w=200,h=80,color='Y',list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, WIDGET.newButton{name="option", x=520,y=190,w=200,h=80,font=40, code=function() - SCN.go("setting_touchSwitch") + SCN.go('setting_touchSwitch') end}, WIDGET.newButton{name="back", x=760,y=190,w=200,h=80,font=35,code=backScene}, WIDGET.newSlider{name="size", x=450,y=270,w=460,unit=19,font=40,show="vkSize", diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index 30f7169f..0fd32718 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -1,7 +1,7 @@ local scene={} function scene.sceneInit() - BG.set("matrix") + BG.set('matrix') end local function VKAdisp(n)return function()return VK_org[n].ava end end @@ -32,12 +32,12 @@ scene.widgetList={ WIDGET.newButton{name="pro", x=1120, y=100, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}, WIDGET.newSwitch{name="hide", x=1170, y=200, font=40,disp=SETval("VKSwitch"),code=SETrev("VKSwitch")}, WIDGET.newSwitch{name="track", x=1170, y=300, font=35,disp=SETval("VKTrack"),code=SETrev("VKTrack")}, - WIDGET.newSlider{name="sfx", x=800, y=380, w=180, font=35,change=function()SFX.play("virtualKey",SETTING.VKSFX)end,disp=SETval("VKSFX"),code=SETsto("VKSFX")}, + WIDGET.newSlider{name="sfx", x=800, y=380, w=180, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval("VKSFX"),code=SETsto("VKSFX")}, WIDGET.newSlider{name="vib", x=800, y=460, w=180,unit=2,font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB")}, WIDGET.newSwitch{name="icon", x=850, y=300, font=40,disp=SETval("VKIcon"),code=SETrev("VKIcon")}, WIDGET.newButton{name="tkset", x=1120, y=420, w=240,h=80, code=function() - SCN.go("setting_trackSetting") + SCN.go('setting_trackSetting') end, hide=function() return not SETTING.VKTrack diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index ae111c89..9e23abb4 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -10,8 +10,8 @@ end scene.widgetList={ WIDGET.newText{name="title", x=640,y=15,font=80}, - WIDGET.newButton{name="sound", x=200,y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_sound","swipeR"}, - WIDGET.newButton{name="game", x=1080,y=80,w=240,h=80,color="lC",font=35,code=swapScene"setting_game","swipeL"}, + WIDGET.newButton{name="sound", x=200,y=80,w=240,h=80,color='lC',font=35,code=swapScene"setting_sound","swipeR"}, + WIDGET.newButton{name="game", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene"setting_game","swipeL"}, WIDGET.newSwitch{name="block", x=290,y=165,disp=SETval("block"),code=SETrev("block")}, WIDGET.newSwitch{name="smooth", x=290,y=215,disp=SETval("smooth"),code=SETrev("smooth")}, @@ -39,7 +39,7 @@ scene.widgetList={ WIDGET.newSwitch{name="text", x=1140,y=160,font=35,disp=SETval("text"), code=SETrev("text")}, WIDGET.newSwitch{name="score", x=1140,y=210,font=35,disp=SETval("score"), code=SETrev("score")}, - WIDGET.newSwitch{name="warn", x=1140,y=260,font=35,disp=SETval("warn"), code=SETrev("warn")}, + WIDGET.newSwitch{name='warn', x=1140,y=260,font=35,disp=SETval('warn'), code=SETrev('warn')}, WIDGET.newSwitch{name="highCam", x=1140,y=310,font=35,disp=SETval("highCam"), code=SETrev("highCam")}, WIDGET.newSwitch{name="nextPos", x=1140,y=360,font=35,disp=SETval("nextPos"), code=SETrev("nextPos")}, WIDGET.newSwitch{name="fullscreen", x=1140,y=410,disp=SETval("fullscreen"), code=switchFullscreen}, @@ -47,7 +47,7 @@ scene.widgetList={ WIDGET.newSwitch{name="clickFX", x=1140,y=510,font=35,disp=SETval("clickFX"), code=SETrev("clickFX")}, WIDGET.newSwitch{name="bg", x=1140,y=560,font=35,disp=SETval("bg"), code=function() - BG.set("none") + BG.set('none') SETTING.bg=not SETTING.bg BG.set() end}, diff --git a/parts/scenes/sound.lua b/parts/scenes/sound.lua index 54346f63..9a0c3c4e 100644 --- a/parts/scenes/sound.lua +++ b/parts/scenes/sound.lua @@ -19,48 +19,48 @@ function scene.keyDown(key) if b3b then b2b=false end elseif key=="4"then pc=not pc - elseif type(key)=="number"then + elseif type(key)=='number'then local CHN=VOC.getFreeChannel() - if mini then VOC.play("mini",CHN)end - if b2b then VOC.play("b2b",CHN) - elseif b3b then VOC.play("b3b",CHN) + if mini then VOC.play('mini',CHN)end + if b2b then VOC.play('b2b',CHN) + elseif b3b then VOC.play('b3b',CHN) end if key>=10 then VOC.play(blockName[math.floor(key/10)].."spin",CHN) end if lineCount[key%10]then VOC.play(lineCount[key%10],CHN)end - if pc then VOC.play("perfect_clear",CHN)end + if pc then VOC.play('perfect_clear',CHN)end elseif key=="tab"then - SCN.swapTo("music","none") + SCN.swapTo('music','none') elseif key=="escape"then SCN.back() end end scene.widgetList={ - WIDGET.newText{name="title", x=30, y=15,font=70,align="L"}, - WIDGET.newSlider{name="sfx", x=510, y=60,w=330,font=35,change=function()SFX.play("blip_1")end,disp=SETval("sfx"),sound=false,code=SETsto("sfx")}, - WIDGET.newSlider{name="voc", x=510, y=120,w=330,font=35,change=function()VOC.play("test")end,disp=SETval("voc"),sound=false,code=SETsto("voc")}, + WIDGET.newText{name="title", x=30, y=15,font=70,align='L'}, + WIDGET.newSlider{name="sfx", x=510, y=60,w=330,font=35,change=function()SFX.play('blip_1')end,disp=SETval("sfx"),sound=false,code=SETsto("sfx")}, + WIDGET.newSlider{name="voc", x=510, y=120,w=330,font=35,change=function()VOC.play('test')end,disp=SETval("voc"),sound=false,code=SETsto("voc")}, - WIDGET.newKey{name="move", x=110, y=140,w=160,h=50,font=20,sound=false,code=function()SFX.play("move")end}, - WIDGET.newKey{name="lock", x=110, y=205,w=160,h=50,font=20,sound=false,code=function()SFX.play("lock")end}, - WIDGET.newKey{name="drop", x=110, y=270,w=160,h=50,font=20,sound=false,code=function()SFX.play("drop")end}, - WIDGET.newKey{name="fall", x=110, y=335,w=160,h=50,font=20,sound=false,code=function()SFX.play("fall")end}, - WIDGET.newKey{name="rotate", x=110, y=400,w=160,h=50,font=20,sound=false,code=function()SFX.play("rotate")end}, - WIDGET.newKey{name="rotatekick",x=110, y=465,w=160,h=50,font=20,sound=false,code=function()SFX.play("rotatekick")end}, - WIDGET.newKey{name="hold", x=110, y=530,w=160,h=50,font=20,sound=false,code=function()SFX.play("hold")end}, - WIDGET.newKey{name="prerotate",x=110, y=595,w=160,h=50,font=20,sound=false,code=function()SFX.play("prerotate")end}, - WIDGET.newKey{name="prehold", x=110, y=660,w=160,h=50,font=20,sound=false,code=function()SFX.play("prehold")end}, + WIDGET.newKey{name="move", x=110, y=140,w=160,h=50,font=20,sound=false,code=function()SFX.play('move')end}, + WIDGET.newKey{name="lock", x=110, y=205,w=160,h=50,font=20,sound=false,code=function()SFX.play('lock')end}, + WIDGET.newKey{name="drop", x=110, y=270,w=160,h=50,font=20,sound=false,code=function()SFX.play('drop')end}, + WIDGET.newKey{name="fall", x=110, y=335,w=160,h=50,font=20,sound=false,code=function()SFX.play('fall')end}, + WIDGET.newKey{name="rotate", x=110, y=400,w=160,h=50,font=20,sound=false,code=function()SFX.play('rotate')end}, + WIDGET.newKey{name="rotatekick",x=110, y=465,w=160,h=50,font=20,sound=false,code=function()SFX.play('rotatekick')end}, + WIDGET.newKey{name="hold", x=110, y=530,w=160,h=50,font=20,sound=false,code=function()SFX.play('hold')end}, + WIDGET.newKey{name="prerotate",x=110, y=595,w=160,h=50,font=20,sound=false,code=function()SFX.play('prerotate')end}, + WIDGET.newKey{name="prehold", x=110, y=660,w=160,h=50,font=20,sound=false,code=function()SFX.play('prehold')end}, - WIDGET.newKey{name="clear1", x=280, y=140,w=160,h=50,font=20,sound=false,code=function()SFX.play("clear_1")end}, - WIDGET.newKey{name="clear2", x=280, y=205,w=160,h=50,font=20,sound=false,code=function()SFX.play("clear_2")end}, - WIDGET.newKey{name="clear3", x=280, y=270,w=160,h=50,font=20,sound=false,code=function()SFX.play("clear_3")end}, - WIDGET.newKey{name="clear4", x=280, y=335,w=160,h=50,font=20,sound=false,code=function()SFX.play("clear_4")end}, - WIDGET.newKey{name="spin0", x=280, y=400,w=160,h=50,font=20,sound=false,code=function()SFX.play("spin_0")end}, - WIDGET.newKey{name="spin1", x=280, y=465,w=160,h=50,font=20,sound=false,code=function()SFX.play("spin_1")end}, - WIDGET.newKey{name="spin2", x=280, y=530,w=160,h=50,font=20,sound=false,code=function()SFX.play("spin_2")end}, - WIDGET.newKey{name="spin3", x=280, y=595,w=160,h=50,font=20,sound=false,code=function()SFX.play("spin_3")end}, - WIDGET.newKey{name="_pc", x=280, y=660,w=160,h=50,font=20,sound=false,code=function()SFX.play("clear")end}, + WIDGET.newKey{name="clear1", x=280, y=140,w=160,h=50,font=20,sound=false,code=function()SFX.play('clear_1')end}, + WIDGET.newKey{name="clear2", x=280, y=205,w=160,h=50,font=20,sound=false,code=function()SFX.play('clear_2')end}, + WIDGET.newKey{name="clear3", x=280, y=270,w=160,h=50,font=20,sound=false,code=function()SFX.play('clear_3')end}, + WIDGET.newKey{name="clear4", x=280, y=335,w=160,h=50,font=20,sound=false,code=function()SFX.play('clear_4')end}, + WIDGET.newKey{name="spin0", x=280, y=400,w=160,h=50,font=20,sound=false,code=function()SFX.play('spin_0')end}, + WIDGET.newKey{name="spin1", x=280, y=465,w=160,h=50,font=20,sound=false,code=function()SFX.play('spin_1')end}, + WIDGET.newKey{name="spin2", x=280, y=530,w=160,h=50,font=20,sound=false,code=function()SFX.play('spin_2')end}, + WIDGET.newKey{name="spin3", x=280, y=595,w=160,h=50,font=20,sound=false,code=function()SFX.play('spin_3')end}, + WIDGET.newKey{name="_pc", x=280, y=660,w=160,h=50,font=20,sound=false,code=function()SFX.play('clear')end}, WIDGET.newKey{name="_1", x=970, y=75,w=140,h=50,font=20,sound=false,code=pressKey(1)}, WIDGET.newKey{name="_2", x=1130, y=75,w=140,h=50,font=20,sound=false,code=pressKey(2)}, diff --git a/parts/scenes/staff.lua b/parts/scenes/staff.lua index 725fbda1..cede35f8 100644 --- a/parts/scenes/staff.lua +++ b/parts/scenes/staff.lua @@ -22,9 +22,9 @@ function scene.mouseDown(x,y) local T=40*math.min(time,45) if x>230 and x<1050 then if math.abs(y-800+T)<70 then - loadGame("sprintLock",true) + loadGame('sprintLock',true) elseif math.abs(y-2160+T)<70 then - loadGame("sprintFix",true) + loadGame('sprintFix',true) end end end @@ -36,11 +36,11 @@ end function scene.keyDown(k) if k=="escape"then SCN.back() - elseif kb.isDown("s")then + elseif kb.isDown"s"then if k=="l"then - loadGame("sprintLock",true) + loadGame('sprintLock',true) elseif k=="f"then - loadGame("sprintFix",true) + loadGame('sprintFix',true) end end end @@ -77,11 +77,11 @@ function scene.update(dt) end function scene.draw() - gc.push("transform") + gc.push('transform') gc.origin() for i=1,#names do local N=names[i] - if type(N.color)=="table"then + if type(N.color)=='table'then gc.setColor(N.color) else gc.setColor(N.color(TIME()+N.w)) diff --git a/parts/skin.lua b/parts/skin.lua index 122ac319..d274e370 100644 --- a/parts/skin.lua +++ b/parts/skin.lua @@ -23,7 +23,7 @@ function SKIN.init(list) for i=1,count do gc.push() gc.origin() - gc.setDefaultFilter("nearest","nearest") + gc.setDefaultFilter('nearest','nearest') gc.setColor(1,1,1) SKIN.lib[i],SKIN.libMini[i]={},{} local N="media/image/skin/"..list[i]..".png" @@ -32,9 +32,9 @@ function SKIN.init(list) I=gc.newImage(N) else I=gc.newImage("media/image/skin/"..list[1]..".png") - LOG.print("No skin file: "..list[i],"warn") + LOG.print("No skin file: "..list[i],'warn') end - gc.setDefaultFilter("linear","linear") + gc.setDefaultFilter('linear','linear') for y=0,2 do for x=1,8 do SKIN.lib[i][8*y+x]=C(30,30) @@ -58,14 +58,14 @@ function SKIN.init(list) SETTING.skinSet=_ SKIN.change(_) _=list[_] - TEXT.show(_,1100,100,int(300/#_)+5,"fly") + TEXT.show(_,1100,100,int(300/#_)+5,'fly') end function SKIN.nextSet()--Next skin_set local _=SETTING.skinSet%count+1 SETTING.skinSet=_ SKIN.change(_) _=list[_] - TEXT.show(_,1100,100,int(300/#_)+5,"fly") + TEXT.show(_,1100,100,int(300/#_)+5,'fly') end function SKIN.change(i)--Change to skin_set[i] SKIN.curText=SKIN.lib[i] diff --git a/parts/texture.lua b/parts/texture.lua index e896797e..f34de195 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -9,7 +9,7 @@ end local TEXTURE={} -gc.setDefaultFilter("nearest","nearest") +gc.setDefaultFilter('nearest','nearest') @@ -21,7 +21,7 @@ for i=1,29 do TEXTURE.miniBlock[i]=NSC(#b[1],#b) for y=1,#b do for x=1,#b[1]do if b[y][x]then - gc.rectangle("fill",x-1,#b-y,1,1) + gc.rectangle('fill',x-1,#b-y,1,1) end end end end @@ -119,7 +119,7 @@ TEXTURE.earth=DOGC{64,64, {"dArc",53,31,40,2.3,3.9}, } -gc.setDefaultFilter("linear","linear") +gc.setDefaultFilter('linear','linear') --Title image @@ -131,11 +131,11 @@ for i=1,8 do gc.setLineWidth(16) gc.setColor(1,1,1) - gc.polygon("line",title[i]) + gc.polygon('line',title[i]) gc.setColor(0,0,0) for j=1,#titleTriangles[i]do - gc.polygon("fill",titleTriangles[i][j]) + gc.polygon('fill',titleTriangles[i][j]) end gc.translate(-12*i,i==1 and -8 or -14) @@ -147,18 +147,18 @@ for i=1,8 do gc.setLineWidth(16) gc.setColor(1,1,1) - gc.polygon("line",title[i]) + gc.polygon('line',title[i]) gc.setLineWidth(4) gc.setColor(0,0,0) for j=1,#titleTriangles[i]do - gc.polygon("fill",titleTriangles[i][j]) + gc.polygon('fill',titleTriangles[i][j]) end gc.setColor(titleColor[i]) gc.translate(-4,-4) for j=1,#titleTriangles[i]do - gc.polygon("fill",titleTriangles[i][j]) + gc.polygon('fill',titleTriangles[i][j]) end gc.translate(4,4) diff --git a/parts/users.lua b/parts/users.lua index 010a2203..bfc23475 100644 --- a/parts/users.lua +++ b/parts/users.lua @@ -37,7 +37,7 @@ local db=setmetatable({},{__index=function(self,uid) local d=fs.getInfo(file)and JSON.decode(fs.read(file))or TABLE.copy(emptyUser) rawset(self,uid,d) db_img[uid]= - type(d.hash)=="string"and #d.hash>0 and fs.getInfo("cache/"..d.hash)and + type(d.hash)=='string'and #d.hash>0 and fs.getInfo("cache/"..d.hash)and loadAvatar("cache/"..d.hash)or defaultAvatar[(uid-26)%29+1] return d @@ -55,9 +55,9 @@ function USERS.updateUserData(data) hash=data.hash or db[uid].hash, }) if data.avatar then - fs.write("cache/"..data.hash,love.data.decode("string","base64",data.avatar:sub(data.avatar:find","+1))) + fs.write("cache/"..data.hash,love.data.decode('string','base64',data.avatar:sub(data.avatar:find(",")+1))) db_img[uid]=loadAvatar("cache/"..data.hash) - db[uid].hash=type(data.hash)=="string"and #data.hash>0 and data.hash + db[uid].hash=type(data.hash)=='string'and #data.hash>0 and data.hash end end diff --git a/parts/virtualKey.lua b/parts/virtualKey.lua index 53be454e..641d18ba 100644 --- a/parts/virtualKey.lua +++ b/parts/virtualKey.lua @@ -4,10 +4,10 @@ local SETTING=SETTING --Virtualkey icons local VKIcon={} -gc.setDefaultFilter("nearest","nearest") +gc.setDefaultFilter('nearest','nearest') local VKI=gc.newImage("media/image/virtualkey.png") for i=1,20 do VKIcon[i]=DOGC{36,36,{"draw",VKI,(i-1)%5*-36,math.floor((i-1)*.2)*-36}}end -gc.setDefaultFilter("linear","linear") +gc.setDefaultFilter('linear','linear') --In-game virtualkey layout data local keys={}for i=1,#VK_org do keys[i]={}end @@ -57,7 +57,7 @@ function VK.touch(id,x,y) end end end - SFX.play("virtualKey",SETTING.VKSFX) + SFX.play('virtualKey',SETTING.VKSFX) VIB(SETTING.VKVIB) end @@ -115,7 +115,7 @@ function VK.draw() --Button outline gc_setColor(1,1,1,a) gc_setLineWidth(B.r*.07) - gc_circle("line",B.x,B.y,B.r,10) + gc_circle('line',B.x,B.y,B.r,10) --Icon local _=keys[i].pressTime @@ -126,13 +126,13 @@ function VK.draw() --Ripple if _>0 then gc_setColor(1,1,1,a*_*.08) - gc_circle("line",B.x,B.y,B.r*(1.4-_*.04),10) + gc_circle('line',B.x,B.y,B.r*(1.4-_*.04),10) end --Glow when press if B.isDown then gc_setColor(1,1,1,a*.4) - gc_circle("fill",B.x,B.y,B.r*.94,10) + gc_circle('fill',B.x,B.y,B.r*.94,10) end end end @@ -142,12 +142,12 @@ function VK.draw() local B=keys[i] gc_setColor(1,1,1,a) gc_setLineWidth(B.r*.07) - gc_circle("line",B.x,B.y,B.r,10) + gc_circle('line',B.x,B.y,B.r,10) local _=keys[i].pressTime if _>0 then gc_setColor(1,1,1,a*_*.08) - gc_circle("fill",B.x,B.y,B.r*.94,10) - gc_circle("line",B.x,B.y,B.r*(1.4-_*.04),10) + gc_circle('fill',B.x,B.y,B.r*.94,10) + gc_circle('line',B.x,B.y,B.r*(1.4-_*.04),10) end end end @@ -161,10 +161,10 @@ function VK.preview(selected) if B.ava then gc_setColor(1,1,1,SETTING.VKAlpha) gc_setLineWidth(B.r*.07) - gc_circle("line",B.x,B.y,B.r,10) + gc_circle('line',B.x,B.y,B.r,10) if selected==i and TIME()%.26<.13 then gc_setColor(1,1,1,SETTING.VKAlpha*.62) - gc_circle("fill",B.x,B.y,B.r,10) + gc_circle('fill',B.x,B.y,B.r,10) end if SETTING.VKIcon then local c=B.color