SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整理代码，继续减少单双引号混用

Browse Source
This commit is contained in:
MrZ626
2021-05-10 14:53:20 +08:00
parent 5e617375e1
commit 297ccf4496
11 changed files with 262 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zframework/color.lua
View File

@@ -57,10 +57,10 @@ local COLOR={
white= {1.0, 1.0, 1.0}, white= {1.0, 1.0, 1.0},
} }
for k,v in next,{ for k,v in next,{
R="red",F="fire",O="orange",Y="yellow",L="lime",J="jade",G="green",A="aqua",C="cyan",N="navy",S="sea",B="blue",V="violet",P="purple",M="magenta",W="wine", R='red',F='fire',O='orange',Y='yellow',L='lime',J='jade',G='green',A='aqua',C='cyan',N='navy',S='sea',B='blue',V='violet',P='purple',M='magenta',W='wine',
lR="lRed",lF="lFire",lO="lOrange",lY="lYellow",lL="lLime",lJ="lJade",lG="lGreen",lA="lAqua",lC="lCyan",lN="lNavy",lS="lSea",lB="lBlue",lV="lViolet",lP="lPurple",lM="lMagenta",lW="lWine", lR='lRed',lF='lFire',lO='lOrange',lY='lYellow',lL='lLime',lJ='lJade',lG='lGreen',lA='lAqua',lC='lCyan',lN='lNavy',lS='lSea',lB='lBlue',lV='lViolet',lP='lPurple',lM='lMagenta',lW='lWine',
dR="dRed",dF="dFire",dO="dOrange",dY="dYellow",dL="dLime",dJ="dJade",dG="dGreen",dA="dAqua",dC="dCyan",dN="dNavy",dS="dSea",dB="dBlue",dV="dViolet",dP="dPurple",dM="dMagenta",dW="dWine", dR='dRed',dF='dFire',dO='dOrange',dY='dYellow',dL='dLime',dJ='dJade',dG='dGreen',dA='dAqua',dC='dCyan',dN='dNavy',dS='dSea',dB='dBlue',dV='dViolet',dP='dPurple',dM='dMagenta',dW='dWine',
D="black",dH="dGray",H="gray",lH="lGray",Z="white", D='black',dH='dGray',H='gray',lH='lGray',Z='white',
--Remain letter: EIKQTUX --Remain letter: EIKQTUX
}do }do
COLOR[k]=COLOR[v] COLOR[k]=COLOR[v]
@@ -72,19 +72,19 @@ end})
do--Random generators do--Random generators
local rnd=math.random local rnd=math.random
local list_norm={"red","fire","orange","yellow","lime","jade","green","aqua","cyan","navy","sea","blue","violet","purple","magenta","wine"} local list_norm={'red','fire','orange','yellow','lime','jade','green','aqua','cyan','navy','sea','blue','violet','purple','magenta','wine'}
local len_list_norm=#list_norm local len_list_norm=#list_norm
function COLOR.random_norm() function COLOR.random_norm()
return COLOR[list_norm[rnd(len_list_norm)]] return COLOR[list_norm[rnd(len_list_norm)]]
end end
local list_bright={"lRed","lFire","lOrange","lYellow","lLime","lJade","lGreen","lAqua","lCyan","lNavy","lSea","lBlue","lViolet","lPurple","lMagenta","lWine"} local list_bright={'lRed','lFire','lOrange','lYellow','lLime','lJade','lGreen','lAqua','lCyan','lNavy','lSea','lBlue','lViolet','lPurple','lMagenta','lWine'}
local len_list_bright=#list_bright local len_list_bright=#list_bright
function COLOR.random_bright() function COLOR.random_bright()
return COLOR[list_bright[rnd(len_list_bright)]] return COLOR[list_bright[rnd(len_list_bright)]]
end end
local list_dark={"dRed","dFire","dOrange","dYellow","dLime","dJade","dGreen","dAqua","dCyan","dNavy","dSea","dBlue","dViolet","dPurple","dMagenta","dWine"} local list_dark={'dRed','dFire','dOrange','dYellow','dLime','dJade','dGreen','dAqua','dCyan','dNavy','dSea','dBlue','dViolet','dPurple','dMagenta','dWine'}
local len_list_dark=#list_dark local len_list_dark=#list_dark
function COLOR.random_dark() function COLOR.random_dark()
return COLOR[list_dark[rnd(len_list_dark)]] return COLOR[list_dark[rnd(len_list_dark)]]

2
Zframework/loadLib.lua
View File

@@ -8,7 +8,7 @@ return function(name,libName)
end end
elseif SYSTEM=="Android"then elseif SYSTEM=="Android"then
local fs=love.filesystem local fs=love.filesystem
local platform={"arm64-v8a","armeabi-v7a"} local platform={'arm64-v8a','armeabi-v7a'}
local libFunc=package.loadlib(SAVEDIR.."/lib/"..libName.Android,libName.libFunc) local libFunc=package.loadlib(SAVEDIR.."/lib/"..libName.Android,libName.libFunc)
if libFunc then if libFunc then

14
Zframework/stringExtend.lua
View File

@@ -4,12 +4,12 @@ local find,sub,upper=string.find,string.sub,string.upper
do--function STRING.shiftChar(c) do--function STRING.shiftChar(c)
local shiftMap={ local shiftMap={
["1"]="!",["2"]="@",["3"]="#",["4"]="$",["5"]="%", ['1']='!',['2']='@',['3']='#',['4']='$',['5']='%',
["6"]="^",["7"]="&",["8"]="*",["9"]="(",["0"]=")", ['6']='^',['7']='&',['8']='*',['9']='(',['0']=')',
["`"]="~",["-"]="_",["="]="+", ['`']='~',['-']='_',['=']='+',
["["]="{",["]"]="}",["\\"]="|", ['[']='{',[']']='}',['\\']='|',
[";"]=":",["'"]="\"", [';']=':',['\'']='"',
[","]="<",["."]=">",["/"]="?", [',']='<',['.']='>',['/']='?',
} }
function STRING.shiftChar(c) function STRING.shiftChar(c)
return shiftMap[c]or upper(c) return shiftMap[c]or upper(c)
@@ -59,7 +59,7 @@ end
do--function STRING.urlEncode(str) do--function STRING.urlEncode(str)
local rshift=bit.rshift local rshift=bit.rshift
local b16={[0]="0","1","2","3","4","5","6","7","8","9","a","b","c","d","e","f"} local b16={[0]='0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}
function STRING.urlEncode(str) function STRING.urlEncode(str)
local out="" local out=""
for i=1,#str do for i=1,#str do

10
Zframework/widget.lua
View File

@@ -9,13 +9,13 @@ local setFont,mStr=setFont,mStr
local mDraw_X,mDraw_Y=ADRAW.simpX,ADRAW.simpY local mDraw_X,mDraw_Y=ADRAW.simpX,ADRAW.simpY
local clearIcon=DOGC{40,40, local clearIcon=DOGC{40,40,
{"setLW",6}, {'setLW',6},
{"line",11,11,29,29}, {'line',11,11,29,29},
{"line",11,29,29,11}, {'line',11,29,29,11},
} }
local sureIcon=DOGC{40,40, local sureIcon=DOGC{40,40,
{"setFT",35}, {'setFT',35},
{"mText","?",20,-6}, {'mText',"?",20,-6},
} }
local WIDGET={} local WIDGET={}

34
parts/gametoolfunc.lua
View File

@@ -349,21 +349,21 @@ end
do--function dumpBasicConfig() do--function dumpBasicConfig()
local gameSetting={ local gameSetting={
--Tuning --Tuning
"das","arr","dascut","sddas","sdarr", 'das','arr','dascut','sddas','sdarr',
"ihs","irs","ims","RS","swap", 'ihs','irs','ims','RS','swap',
--System --System
"skin","face", 'skin','face',
--Graphic --Graphic
"block","ghost","center","bagLine", 'block','ghost','center','bagLine',
"dropFX","moveFX","shakeFX", 'dropFX','moveFX','shakeFX',
"text","highCam","nextPos", 'text','highCam','nextPos',
--Unnecessary graphic --Unnecessary graphic
-- "grid","smooth", -- 'grid','smooth',
-- "lockFX","clearFX","splashFX","atkFX", -- 'lockFX','clearFX','splashFX','atkFX',
-- "score", -- 'score',
} }
function dumpBasicConfig() function dumpBasicConfig()
local S={} local S={}
@@ -374,11 +374,11 @@ do--function dumpBasicConfig()
end end
end end
do--function resetGameData(args) do--function resetGameData(args)
local YIELD=YIELD local yield=YIELD
local function tick_showMods() local function tick_showMods()
local time=0 local time=0
while true do while true do
YIELD() yield()
time=time+1 time=time+1
if time%20==0 then if time%20==0 then
local M=GAME.mod[time/20] local M=GAME.mod[time/20]
@@ -392,16 +392,16 @@ do--function resetGameData(args)
end end
local gameSetting={ local gameSetting={
--Tuning --Tuning
"das","arr","dascut","sddas","sdarr", 'das','arr','dascut','sddas','sdarr',
"ihs","irs","ims","RS","swap", 'ihs','irs','ims','RS','swap',
--System --System
"skin","face", 'skin','face',
--Graphic --Graphic
"block","ghost","center","smooth","grid","bagLine", 'block','ghost','center','smooth','grid','bagLine',
"lockFX","dropFX","moveFX","clearFX","splashFX","shakeFX","atkFX", 'lockFX','dropFX','moveFX','clearFX','splashFX','shakeFX','atkFX',
"text","score",'warn',"highCam","nextPos", 'text','score','warn','highCam','nextPos',
} }
local function copyGameSetting() local function copyGameSetting()
local S={} local S={}

422
parts/kickList.lua
View File

@@ -91,48 +91,48 @@ do
} }
TRS={ TRS={
{ {
[01]={"-1+0","-1+1","+0-2","-1+2","+0+1"}, [01]={'-1+0','-1+1','+0-2','-1+2','+0+1'},
[10]={"+1+0","+1-1","+0+2","+1-2","+1-2"}, [10]={'+1+0','+1-1','+0+2','+1-2','+1-2'},
[03]={"+1+0","+1+1","+0-2","+1-1","+1-2"}, [03]={'+1+0','+1+1','+0-2','+1-1','+1-2'},
[30]={"-1+0","-1-1","+0+2","-1+2","+0-1"}, [30]={'-1+0','-1-1','+0+2','-1+2','+0-1'},
[12]={"+1+0","+1-1","+0+2","+1+2"}, [12]={'+1+0','+1-1','+0+2','+1+2'},
[21]={"-1+0","-1+1","+0-2","-1-2"}, [21]={'-1+0','-1+1','+0-2','-1-2'},
[32]={"-1+0","-1-1","+0+2","-1+2"}, [32]={'-1+0','-1-1','+0+2','-1+2'},
[23]={"+1+0","+1+1","+0-2","+1-2"}, [23]={'+1+0','+1+1','+0-2','+1-2'},
[02]={"+1+0","-1+0","+0-1","+0+1"}, [02]={'+1+0','-1+0','+0-1','+0+1'},
[20]={"-1+0","+1+0","+0+1","+0-1"}, [20]={'-1+0','+1+0','+0+1','+0-1'},
[13]={"+0-1","+0+1","+0-2"}, [13]={'+0-1','+0+1','+0-2'},
[31]={"+0+1","+0-1","+0+2"}, [31]={'+0+1','+0-1','+0+2'},
},--Z },--Z
false,--S false,--S
{ {
[01]={"-1+0","-1+1","+1+0","+0-2","+1+1"}, [01]={'-1+0','-1+1','+1+0','+0-2','+1+1'},
[10]={"+1+0","+1-1","-1+0","+0+2","+1+2"}, [10]={'+1+0','+1-1','-1+0','+0+2','+1+2'},
[03]={"+1+0","+1+1","+0-2","+1-2","+1-1","+0+1"}, [03]={'+1+0','+1+1','+0-2','+1-2','+1-1','+0+1'},
[30]={"-1+0","-1-1","+0+2","-1+2","+0-1","-1+1"}, [30]={'-1+0','-1-1','+0+2','-1+2','+0-1','-1+1'},
[12]={"+1+0","+1-1","+1+1","-1+0","+0-1","+0+2","+1+2"}, [12]={'+1+0','+1-1','+1+1','-1+0','+0-1','+0+2','+1+2'},
[21]={"-1+0","-1+1","-1-1","+1+0","+0+1","+0-2","-1-2"}, [21]={'-1+0','-1+1','-1-1','+1+0','+0+1','+0-2','-1-2'},
[32]={"-1+0","-1-1","+1+0","+0+2","-1+2","-1+1"}, [32]={'-1+0','-1-1','+1+0','+0+2','-1+2','-1+1'},
[23]={"+1+0","+1-1","-1+0","+1+1","+0-2","+1-2"}, [23]={'+1+0','+1-1','-1+0','+1+1','+0-2','+1-2'},
[02]={"-1+0","+1+0","+0-1","+0+1"}, [02]={'-1+0','+1+0','+0-1','+0+1'},
[20]={"+1+0","-1+0","+0+1","+0-1"}, [20]={'+1+0','-1+0','+0+1','+0-1'},
[13]={"+0-1","+0+1","+1+0"}, [13]={'+0-1','+0+1','+1+0'},
[31]={"+0+1","+0-1","-1+0"}, [31]={'+0+1','+0-1','-1+0'},
},--J },--J
false,--L false,--L
{ {
[01]={"-1+0","-1+1","+0-2","-1-2","+0+1"}, [01]={'-1+0','-1+1','+0-2','-1-2','+0+1'},
[10]={"+1+0","+1-1","+0+2","+1+2","+0-1"}, [10]={'+1+0','+1-1','+0+2','+1+2','+0-1'},
[03]={"+1+0","+1+1","+0-2","+1-2","+0+1"}, [03]={'+1+0','+1+1','+0-2','+1-2','+0+1'},
[30]={"-1+0","-1-1","+0+2","-1+2","+0-1"}, [30]={'-1+0','-1-1','+0+2','-1+2','+0-1'},
[12]={"+1+0","+1-1","+0-1","-1-1","+0+2","+1+2"}, [12]={'+1+0','+1-1','+0-1','-1-1','+0+2','+1+2'},
[21]={"-1+0","+0-2","-1-2","+1+1"}, [21]={'-1+0','+0-2','-1-2','+1+1'},
[32]={"-1+0","-1-1","+0-1","+1-1","+0+2","-1+2"}, [32]={'-1+0','-1-1','+0-1','+1-1','+0+2','-1+2'},
[23]={"+1+0","+0-2","+1-2","-1+1"}, [23]={'+1+0','+0-2','+1-2','-1+1'},
[02]={"-1+0","+1+0","+0+1"}, [02]={'-1+0','+1+0','+0+1'},
[20]={"+1+0","-1+0","+0-1"}, [20]={'+1+0','-1+0','+0-1'},
[13]={"+0-1","+0+1","+1+0","+0-2","+0+2"}, [13]={'+0-1','+0+1','+1+0','+0-2','+0+2'},
[31]={"+0-1","+0+1","-1+0","+0-2","+0+2"}, [31]={'+0-1','+0+1','-1+0','+0-2','+0+2'},
},--T },--T
function(P,d) function(P,d)
if P.gameEnv.easyFresh then if P.gameEnv.easyFresh then
@@ -179,111 +179,111 @@ do
end end
end,--O end,--O
{ {
[01]={"+0+1","+1+0","-2+0","-2-1","+1+2"}, [01]={'+0+1','+1+0','-2+0','-2-1','+1+2'},
[10]={"+2+0","-1+0","-1-2","+2+1","+0+1"}, [10]={'+2+0','-1+0','-1-2','+2+1','+0+1'},
[03]={"+0+1","-1+0","+2+0","+2-1","-1+2"}, [03]={'+0+1','-1+0','+2+0','+2-1','-1+2'},
[30]={"-2+0","+1+0","+1-2","-2+1","+0+1"}, [30]={'-2+0','+1+0','+1-2','-2+1','+0+1'},
[12]={"-1+0","+2+0","+2-1","+0-1","-1+2"}, [12]={'-1+0','+2+0','+2-1','+0-1','-1+2'},
[21]={"-2+0","+1+0","+1-2","-2+1","+0+1"}, [21]={'-2+0','+1+0','+1-2','-2+1','+0+1'},
[32]={"+1+0","-2+0","-2-1","+0-1","+1+2"}, [32]={'+1+0','-2+0','-2-1','+0-1','+1+2'},
[23]={"+2+0","-1+0","-1-2","+2+1","+0+1"}, [23]={'+2+0','-1+0','-1-2','+2+1','+0+1'},
[02]={"-1+0","+1+0","+0-1","+0+1"}, [02]={'-1+0','+1+0','+0-1','+0+1'},
[20]={"+1+0","-1+0","+0+1","+0-1"}, [20]={'+1+0','-1+0','+0+1','+0-1'},
[13]={"+0-1","-1+0","+1+0","+0+1"}, [13]={'+0-1','-1+0','+1+0','+0+1'},
[31]={"+0-1","+1+0","-1+0","+0+1"}, [31]={'+0-1','+1+0','-1+0','+0+1'},
},--I },--I
{ {
[01]={"-1+0","+0+1","+1+1","+0-3","+0+2","+0+3","-1+2"}, [01]={'-1+0','+0+1','+1+1','+0-3','+0+2','+0+3','-1+2'},
[10]={"+1+0","+0-1","-1-1","+0-2","+0-3","+0+3","+1-2"}, [10]={'+1+0','+0-1','-1-1','+0-2','+0-3','+0+3','+1-2'},
[03]={"+1+0","+0-3","+0+1","+0+2","+0+3","+1+2"}, [03]={'+1+0','+0-3','+0+1','+0+2','+0+3','+1+2'},
[30]={"-1+0","+0+1","+0-2","+0-3","+0+3","-1-2"}, [30]={'-1+0','+0+1','+0-2','+0-3','+0+3','-1-2'},
},--Z5 },--Z5
false,--S5 false,--S5
{ {
[01]={"-1+0","-1+1","+0-2","-1-2","-1-1","+0+1"}, [01]={'-1+0','-1+1','+0-2','-1-2','-1-1','+0+1'},
[10]={"+1+0","+1-1","+0+2","+1+2","+0-1","+1+1"}, [10]={'+1+0','+1-1','+0+2','+1+2','+0-1','+1+1'},
[03]={"+1+0","+1+1","+0-2","-1+1"}, [03]={'+1+0','+1+1','+0-2','-1+1'},
[30]={"-1+0","-1-1","+0+2","-1+2"}, [30]={'-1+0','-1-1','+0+2','-1+2'},
[12]={"+1+0","+1-1","+0+2","+1+2","+1+1"}, [12]={'+1+0','+1-1','+0+2','+1+2','+1+1'},
[21]={"-1+0","-1-1","-1+1","+0-2","-1-2","-1-1"}, [21]={'-1+0','-1-1','-1+1','+0-2','-1-2','-1-1'},
[32]={"-1+0","-1-1","-1+1","+0-1","+0+2","-1+2"}, [32]={'-1+0','-1-1','-1+1','+0-1','+0+2','-1+2'},
[23]={"+1+0","+1+1","-1+0","+0-2","+1-2"}, [23]={'+1+0','+1+1','-1+0','+0-2','+1-2'},
[02]={"-1+0","+0-1","+0+1"}, [02]={'-1+0','+0-1','+0+1'},
[20]={"+1+0","+0+1","+0-1"}, [20]={'+1+0','+0+1','+0-1'},
[13]={"+1+0","+0+1","-1+0"}, [13]={'+1+0','+0+1','-1+0'},
[31]={"-1+0","+0-1","+1+0"}, [31]={'-1+0','+0-1','+1+0'},
},--P },--P
false,--Q false,--Q
{ {
[01]={"-1+0","+1+0","-1+1","+0-2","+0-3"}, [01]={'-1+0','+1+0','-1+1','+0-2','+0-3'},
[10]={"+1+0","+1-1","-1+0","+0+2","+0+3"}, [10]={'+1+0','+1-1','-1+0','+0+2','+0+3'},
[03]={"+1+0","+1-1","+0+1","+0-2","+0-3"}, [03]={'+1+0','+1-1','+0+1','+0-2','+0-3'},
[30]={"-1+1","+1+0","+0-1","+0+2","+0+3"}, [30]={'-1+1','+1+0','+0-1','+0+2','+0+3'},
[12]={"+1+0","+0-1","-1+0","+0+2"}, [12]={'+1+0','+0-1','-1+0','+0+2'},
[21]={"-1+0","+0+1","+1+0","+0-2"}, [21]={'-1+0','+0+1','+1+0','+0-2'},
[32]={"-1+0","+0+1","-1+1","+1+0","+0+2","-2+0"}, [32]={'-1+0','+0+1','-1+1','+1+0','+0+2','-2+0'},
[23]={"+1+0","+1-1","+0-1","-1+0","+0-2","+2+0"}, [23]={'+1+0','+1-1','+0-1','-1+0','+0-2','+2+0'},
[02]={"+1+0","-1+0","-1-1"}, [02]={'+1+0','-1+0','-1-1'},
[20]={"-1+0","+1+0","+1+1"}, [20]={'-1+0','+1+0','+1+1'},
[13]={"+0-1","-1+1","+0+1"}, [13]={'+0-1','-1+1','+0+1'},
[31]={"+0-1","+1-1","+0+1"}, [31]={'+0-1','+1-1','+0+1'},
},--F },--F
false,--E false,--E
{ {
[01]={"+0-1","-1-1","+1+0","+1+1","+0-3","-1+0","+0+2","-1+2"}, [01]={'+0-1','-1-1','+1+0','+1+1','+0-3','-1+0','+0+2','-1+2'},
[10]={"+1+0","+0-1","-1-1","+0-2","-1+1","+0-3","+1-2","+0+1"}, [10]={'+1+0','+0-1','-1-1','+0-2','-1+1','+0-3','+1-2','+0+1'},
[03]={"+0-1","+1-1","-1+0","-1+1","+0-3","+1+0","+0+2","+1+2"}, [03]={'+0-1','+1-1','-1+0','-1+1','+0-3','+1+0','+0+2','+1+2'},
[30]={"-1+0","+0-1","+1-1","+0-2","+1+1","+0-3","-1-2","+0+1"}, [30]={'-1+0','+0-1','+1-1','+0-2','+1+1','+0-3','-1-2','+0+1'},
[12]={"+1+0","-1+0","+0-2","+0-3","+0+1","-1+1"}, [12]={'+1+0','-1+0','+0-2','+0-3','+0+1','-1+1'},
[21]={"+1-1","-1+0","+1+0","+0-1","+0+2","+0+3"}, [21]={'+1-1','-1+0','+1+0','+0-1','+0+2','+0+3'},
[32]={"-1+0","+1+0","+0-2","+0-3","+0+1","+1+1"}, [32]={'-1+0','+1+0','+0-2','+0-3','+0+1','+1+1'},
[23]={"-1-1","+1+0","-1+0","+0-1","+0+2","+0+3"}, [23]={'-1-1','+1+0','-1+0','+0-1','+0+2','+0+3'},
[02]={"+0-1","+0+1","+0+2"}, [02]={'+0-1','+0+1','+0+2'},
[20]={"+0-1","+0+1","+0-2"}, [20]={'+0-1','+0+1','+0-2'},
[13]={"+1+0","-1+1","-2+0"}, [13]={'+1+0','-1+1','-2+0'},
[31]={"-1+0","+1+1","+2+0"}, [31]={'-1+0','+1+1','+2+0'},
},--T5 },--T5
{ {
[01]={"-1+0","-1+1","+0-2","-1-2"}, [01]={'-1+0','-1+1','+0-2','-1-2'},
[10]={"+1+0","+1-1","+0+2","+1+2"}, [10]={'+1+0','+1-1','+0+2','+1+2'},
[03]={"+1+0","+1+1","+0-2","+1-2"}, [03]={'+1+0','+1+1','+0-2','+1-2'},
[30]={"-1+0","-1-1","+0-2","-1+2"}, [30]={'-1+0','-1-1','+0-2','-1+2'},
[12]={"+1+0","+1-1","+1+1"}, [12]={'+1+0','+1-1','+1+1'},
[21]={"-1-1","-1+1","-1-1"}, [21]={'-1-1','-1+1','-1-1'},
[32]={"-1+0","-1-1","-1+1"}, [32]={'-1+0','-1-1','-1+1'},
[23]={"+1-1","+1+1","+1-1"}, [23]={'+1-1','+1+1','+1-1'},
[02]={"+0+1"}, [02]={'+0+1'},
[20]={"+0-1"}, [20]={'+0-1'},
[13]={"+0-1","+0+1","+1+0"}, [13]={'+0-1','+0+1','+1+0'},
[31]={"+0-1","+0+1","-1+0"}, [31]={'+0-1','+0+1','-1+0'},
},--U },--U
{ {
[01]={"+0+1","-1+0","+0-2","-1-2"}, [01]={'+0+1','-1+0','+0-2','-1-2'},
[10]={"+0+1","+1+0","+0-2","+1-2"}, [10]={'+0+1','+1+0','+0-2','+1-2'},
[03]={"+0-1","+0+1","+0+2"}, [03]={'+0-1','+0+1','+0+2'},
[30]={"+0-1","+0+1","+0-2"}, [30]={'+0-1','+0+1','+0-2'},
[12]={"+0-1","+0+1"}, [12]={'+0-1','+0+1'},
[21]={"+0-1","+0-2"}, [21]={'+0-1','+0-2'},
[32]={"+1+0","-1+0"}, [32]={'+1+0','-1+0'},
[23]={"-1+0","+1+0"}, [23]={'-1+0','+1+0'},
[02]={"-1+1","+1-1"}, [02]={'-1+1','+1-1'},
[20]={"+1-1","-1+1"}, [20]={'+1-1','-1+1'},
[13]={"+1+1","-1-1"}, [13]={'+1+1','-1-1'},
[31]={"-1-1","+1+1"}, [31]={'-1-1','+1+1'},
},--V },--V
{ {
[01]={"+0-1","-1+0","+1+0","+1-1","+0+2"}, [01]={'+0-1','-1+0','+1+0','+1-1','+0+2'},
[10]={"+0-1","-1-1","+0+1","+0-2","+1-2","+0+2"}, [10]={'+0-1','-1-1','+0+1','+0-2','+1-2','+0+2'},
[03]={"+1+0","+1+1","+0-1","+0-2","+0-3","+1-1","+0+1","+0+2","+0+3"}, [03]={'+1+0','+1+1','+0-1','+0-2','+0-3','+1-1','+0+1','+0+2','+0+3'},
[30]={"-1+0","-1+1","+0-1","+0-2","+0-3","-1-1","+0+1","+0+2","+0+3"}, [30]={'-1+0','-1+1','+0-1','+0-2','+0-3','-1-1','+0+1','+0+2','+0+3'},
[12]={"+1+0","+0-1","-2+0","+1+1","-1+0","+0+1","-1-1"}, [12]={'+1+0','+0-1','-2+0','+1+1','-1+0','+0+1','-1-1'},
[21]={"-1+0","+0-1","+2+0","-1+1","+1+0","+0+1","+1-1"}, [21]={'-1+0','+0-1','+2+0','-1+1','+1+0','+0+1','+1-1'},
[32]={"+0-1","+1+0","+0+1","-1+0","-1-1","+0+2"}, [32]={'+0-1','+1+0','+0+1','-1+0','-1-1','+0+2'},
[23]={"+0-1","+1-1","+0+1","+0-2","-1-2","+0+2"}, [23]={'+0-1','+1-1','+0+1','+0-2','-1-2','+0+2'},
[02]={"+0-1","-1+0"}, [02]={'+0-1','-1+0'},
[20]={"+0+1","+1+0"}, [20]={'+0+1','+1+0'},
[13]={"+0+1","-1+0"}, [13]={'+0+1','-1+0'},
[31]={"+0-1","+1+0"}, [31]={'+0-1','+1+0'},
},--W },--W
function(P,d) 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
@@ -301,89 +301,89 @@ do
P:freshBlock('fresh') P:freshBlock('fresh')
end,--X end,--X
{ {
[01]={"-1+0","-1+1","+0-3","-1+1","-1+2","+0+1"}, [01]={'-1+0','-1+1','+0-3','-1+1','-1+2','+0+1'},
[10]={"-1+0","+1-1","+0+3","+1-1","+1-2","+0+1"}, [10]={'-1+0','+1-1','+0+3','+1-1','+1-2','+0+1'},
[03]={"+0-1","+1-1","-1+0","+1+1","+0-2","+1-2","+0-3","+1-3","-1+1"}, [03]={'+0-1','+1-1','-1+0','+1+1','+0-2','+1-2','+0-3','+1-3','-1+1'},
[30]={"+0+1","-1+1","+1+0","-1-1","+0+2","-1+2","+0+3","-1+3","+1-1"}, [30]={'+0+1','-1+1','+1+0','-1-1','+0+2','-1+2','+0+3','-1+3','+1-1'},
[12]={"+1+0","+1-1","+0-1","+1-2","+0-2","+1+1","-1+0","+0+2","+1+2"}, [12]={'+1+0','+1-1','+0-1','+1-2','+0-2','+1+1','-1+0','+0+2','+1+2'},
[21]={"-1+0","-1+1","+0+1","-1+2","+0+2","-1-1","+1+0","+0-2","-1-2"}, [21]={'-1+0','-1+1','+0+1','-1+2','+0+2','-1-1','+1+0','+0-2','-1-2'},
[32]={"-1+0","-1+1","-1-1","+1+0","+0+2","-1+2","+0-2"}, [32]={'-1+0','-1+1','-1-1','+1+0','+0+2','-1+2','+0-2'},
[23]={"+1+0","+1-1","+1+1","-1+0","+0-2","+1-2","+0+2"}, [23]={'+1+0','+1-1','+1+1','-1+0','+0-2','+1-2','+0+2'},
[02]={"+0-1","+1-1","-1+0","+2-1"}, [02]={'+0-1','+1-1','-1+0','+2-1'},
[20]={"+0+1","-1+1","+1+0","-2+1"}, [20]={'+0+1','-1+1','+1+0','-2+1'},
[13]={"-1+0","-1-1","+0+1","-1-2"}, [13]={'-1+0','-1-1','+0+1','-1-2'},
[31]={"+1+0","+1+1","+0-1","+1+2"}, [31]={'+1+0','+1+1','+0-1','+1+2'},
},--J5 },--J5
false,--L5 false,--L5
{ {
[01]={"-1+0","-1+0","-1+1","+1+0","-1+2","-1-1","+0-3","+0+1"}, [01]={'-1+0','-1+0','-1+1','+1+0','-1+2','-1-1','+0-3','+0+1'},
[10]={"-1+0","+1+0","+1-1","+1+0","+1-2","+1+1","+0+3","+0+1"}, [10]={'-1+0','+1+0','+1-1','+1+0','+1-2','+1+1','+0+3','+0+1'},
[03]={"+0-1","+1+0","+1-1","-1+0","+1+1","+0-2","+1-2","+0-3","+1-3","-1+1"}, [03]={'+0-1','+1+0','+1-1','-1+0','+1+1','+0-2','+1-2','+0-3','+1-3','-1+1'},
[30]={"+0+1","-1+0","-1+1","+1+0","-1-1","+0+2","-1+2","+0+3","-1+3","+1-1"}, [30]={'+0+1','-1+0','-1+1','+1+0','-1-1','+0+2','-1+2','+0+3','-1+3','+1-1'},
[12]={"+1+0","+1-1","+0-1","+1-2","+0-2","+1+1","-1+0","+0+2","+1+2"}, [12]={'+1+0','+1-1','+0-1','+1-2','+0-2','+1+1','-1+0','+0+2','+1+2'},
[21]={"-1+0","-1+1","+0+1","-1+2","+0+2","-1-1","+1+0","+0-2","-1-2"}, [21]={'-1+0','-1+1','+0+1','-1+2','+0+2','-1-1','+1+0','+0-2','-1-2'},
[32]={"+0-1","-1+0","-1+1","-1-1","+1+0","+0+2","-1+2","+0-2"}, [32]={'+0-1','-1+0','-1+1','-1-1','+1+0','+0+2','-1+2','+0-2'},
[23]={"+0+1","+1+0","+1-1","+1+1","-1+0","+0-2","+1-2","+0+2"}, [23]={'+0+1','+1+0','+1-1','+1+1','-1+0','+0-2','+1-2','+0+2'},
[02]={"+0-1","+1-1","-1+0","+2-1","+0+1"}, [02]={'+0-1','+1-1','-1+0','+2-1','+0+1'},
[20]={"+0+1","-1+1","+1+0","-2+1","+0-1"}, [20]={'+0+1','-1+1','+1+0','-2+1','+0-1'},
[13]={"-1+0","-1-1","+0+1","-1-2"}, [13]={'-1+0','-1-1','+0+1','-1-2'},
[31]={"+1+0","+1+1","+0-1","+1+2"}, [31]={'+1+0','+1+1','+0-1','+1+2'},
},--R },--R
false,--Y false,--Y
{ {
[01]={"-1+0","-1+1","+0+1","+1+0","-1+2","-2+0","+0-2"}, [01]={'-1+0','-1+1','+0+1','+1+0','-1+2','-2+0','+0-2'},
[10]={"+1+0","-1+0","+0-1","+1-1","+1-2","+2+0","+0+2"}, [10]={'+1+0','-1+0','+0-1','+1-1','+1-2','+2+0','+0+2'},
[03]={"-1+0","+1-1","+0-2","+0-3","+1+0","+1-2","+1-3","+0+1","-1+1"}, [03]={'-1+0','+1-1','+0-2','+0-3','+1+0','+1-2','+1-3','+0+1','-1+1'},
[30]={"-1+0","+1-1","+1-2","+1+0","+0-2","+1-3","-1+2","+0+3","-1+3"}, [30]={'-1+0','+1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'},
[12]={"-1+0","+1-1","-1-1","+1-2","+1+0","+0-2","+1-3","-1+2","+0+3","-1+3"}, [12]={'-1+0','+1-1','-1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'},
[21]={"-1+0","+1-1","+1+1","+0-2","+0-3","+1+0","+1-2","+1-3","+0+1","-1+1"}, [21]={'-1+0','+1-1','+1+1','+0-2','+0-3','+1+0','+1-2','+1-3','+0+1','-1+1'},
[32]={"-1+0","+0-1","-1-2","+1-1","+1+0","+1+1","+0+2","+0+3"}, [32]={'-1+0','+0-1','-1-2','+1-1','+1+0','+1+1','+0+2','+0+3'},
[23]={"+0-2","+0-3","+1+2","+1+0","+0+1","-1+1","+0-1","+0+2"}, [23]={'+0-2','+0-3','+1+2','+1+0','+0+1','-1+1','+0-1','+0+2'},
[02]={"-1+0","+0+2","+0-1"}, [02]={'-1+0','+0+2','+0-1'},
[20]={"+1+0","+0-2","+0+1"}, [20]={'+1+0','+0-2','+0+1'},
[13]={"-1+0","-1-1","+0+1","+1+2"}, [13]={'-1+0','-1-1','+0+1','+1+2'},
[31]={"+1+0","+1+1","+0-1","-1-2"}, [31]={'+1+0','+1+1','+0-1','-1-2'},
},--N },--N
false,--H false,--H
{ {
[01]={"+1-1","+1+0","+1+1","+0+1","-1+1","-1+0","-1-1","+0-1","+0-2","-2-1","-2-2","+2+0","+2-1","+2-2","+1+2","+2+2","-1+2","-2+2"}, [01]={'+1-1','+1+0','+1+1','+0+1','-1+1','-1+0','-1-1','+0-1','+0-2','-2-1','-2-2','+2+0','+2-1','+2-2','+1+2','+2+2','-1+2','-2+2'},
[10]={"-1+0","-1-1","+0-1","+1-1","-2-2","-2-1","-2+0","-1-2","+0-2","+1-2","+2-2","-1+1","-2+1","-2+2","+1+0","+2+0","+2-1","+0+1","+1-1","+2-2"}, [10]={'-1+0','-1-1','+0-1','+1-1','-2-2','-2-1','-2+0','-1-2','+0-2','+1-2','+2-2','-1+1','-2+1','-2+2','+1+0','+2+0','+2-1','+0+1','+1-1','+2-2'},
[03]={"-1-1","-1+0","-1+1","-0+1","+1+1","+1+0","+1-1","-0-1","-0-2","+2-1","+2-2","-2+0","-2-1","-2-2","-1+2","-2+2","+1+2","+2+2"}, [03]={'-1-1','-1+0','-1+1','-0+1','+1+1','+1+0','+1-1','-0-1','-0-2','+2-1','+2-2','-2+0','-2-1','-2-2','-1+2','-2+2','+1+2','+2+2'},
[30]={"+1+0","+1-1","-0-1","-1-1","+2-2","+2-1","+2+0","+1-2","-0-2","-1-2","-2-2","+1+1","+2+1","+2+2","-1+0","-2+0","-2-1","+0+1","-1-1","-2-2"}, [30]={'+1+0','+1-1','-0-1','-1-1','+2-2','+2-1','+2+0','+1-2','-0-2','-1-2','-2-2','+1+1','+2+1','+2+2','-1+0','-2+0','-2-1','+0+1','-1-1','-2-2'},
},--I5 },--I5
{ {
[01]={"-1+0","-1-1","+1+1","-1+1"}, [01]={'-1+0','-1-1','+1+1','-1+1'},
[10]={"-1+0","+1+0","-1-1","+1+1"}, [10]={'-1+0','+1+0','-1-1','+1+1'},
[03]={"+1+0","+1-1","-1+1","+1+1"}, [03]={'+1+0','+1-1','-1+1','+1+1'},
[30]={"+1+0","-1+0","+1-1","-1+1"}, [30]={'+1+0','-1+0','+1-1','-1+1'},
},--I3 },--I3
{ {
[01]={"-1+0","+1+0"}, [01]={'-1+0','+1+0'},
[10]={"+1+0","-1+0"}, [10]={'+1+0','-1+0'},
[03]={"+0+1","+0-1"}, [03]={'+0+1','+0-1'},
[30]={"+0-1","+0+1"}, [30]={'+0-1','+0+1'},
[12]={"+0+1","+0-1"}, [12]={'+0+1','+0-1'},
[21]={"+0-1","+0+1"}, [21]={'+0-1','+0+1'},
[32]={"-1+0","+1+0"}, [32]={'-1+0','+1+0'},
[23]={"+1+0","-1+0"}, [23]={'+1+0','-1+0'},
[02]={"+0-1","+1-1","-1-1"}, [02]={'+0-1','+1-1','-1-1'},
[20]={"+0+1","-1+1","+1+1"}, [20]={'+0+1','-1+1','+1+1'},
[13]={"+0-1","-1-1","+1-1"}, [13]={'+0-1','-1-1','+1-1'},
[31]={"+0+1","+1+1","-1+1"}, [31]={'+0+1','+1+1','-1+1'},
},--C },--C
{ {
[01]={"-1+0","+0+1"}, [01]={'-1+0','+0+1'},
[10]={"+1+0","+0+1"}, [10]={'+1+0','+0+1'},
[03]={"+1+0","+0+1"}, [03]={'+1+0','+0+1'},
[30]={"-1+0","+0+1"}, [30]={'-1+0','+0+1'},
[12]={"+1+0","+0+2"}, [12]={'+1+0','+0+2'},
[21]={"+0-1","-1+0"}, [21]={'+0-1','-1+0'},
[32]={"-1+0","+0+2"}, [32]={'-1+0','+0+2'},
[23]={"+0-1","-1+0"}, [23]={'+0-1','-1+0'},
[02]={"+0-1","+0+1"}, [02]={'+0-1','+0+1'},
[20]={"+0+1","+0-1"}, [20]={'+0+1','+0-1'},
[13]={"-1+0","+1+0"}, [13]={'-1+0','+1+0'},
[31]={"+1+0","-1+0"}, [31]={'+1+0','-1+0'},
},--I2 },--I2
nil,--O1 nil,--O1
} }
@@ -405,14 +405,14 @@ local SRS
do do
SRS={ SRS={
{ {
[01]={"-1+0","-1+1","+0-2","-1-2"}, [01]={'-1+0','-1+1','+0-2','-1-2'},
[10]={"+1+0","+1-1","+0+2","+1+2"}, [10]={'+1+0','+1-1','+0+2','+1+2'},
[03]={"+1+0","+1+1","+0-2","+1-2"}, [03]={'+1+0','+1+1','+0-2','+1-2'},
[30]={"-1+0","-1-1","+0+2","-1+2"}, [30]={'-1+0','-1-1','+0+2','-1+2'},
[12]={"+1+0","+1-1","+0+2","+1+2"}, [12]={'+1+0','+1-1','+0+2','+1+2'},
[21]={"-1+0","-1+1","+0-2","-1-2"}, [21]={'-1+0','-1+1','+0-2','-1-2'},
[32]={"-1+0","-1-1","+0+2","-1+2"}, [32]={'-1+0','-1-1','+0+2','-1+2'},
[23]={"+1+0","+1+1","+0-2","+1-2"}, [23]={'+1+0','+1+1','+0-2','+1-2'},
[02]={},[20]={},[13]={},[31]={}, [02]={},[20]={},[13]={},[31]={},
},--Z },--Z
false,--S false,--S
@@ -421,14 +421,14 @@ do
false,--T false,--T
noKickSet,--O noKickSet,--O
{ {
[01]={"-2+0","+1+0","-2-1","+1+2"}, [01]={'-2+0','+1+0','-2-1','+1+2'},
[10]={"+2+0","-1+0","+2+1","-1-2"}, [10]={'+2+0','-1+0','+2+1','-1-2'},
[12]={"-1+0","+2+0","-1+2","+2-1"}, [12]={'-1+0','+2+0','-1+2','+2-1'},
[21]={"+1+0","-2+0","+1-2","-2+1"}, [21]={'+1+0','-2+0','+1-2','-2+1'},
[23]={"+2+0","-1+0","+2+1","-1-2"}, [23]={'+2+0','-1+0','+2+1','-1-2'},
[32]={"-2+0","+1+0","-2-1","+1+2"}, [32]={'-2+0','+1+0','-2-1','+1+2'},
[30]={"+1+0","-2+0","+1-2","-2+1"}, [30]={'+1+0','-2+0','+1-2','-2+1'},
[03]={"-1+0","+2+0","-1+2","+2-1"}, [03]={'-1+0','+2+0','-1+2','+2-1'},
[02]={},[20]={},[13]={},[31]={}, [02]={},[20]={},[13]={},[31]={},
}--I }--I
} }
@@ -441,7 +441,7 @@ end
local C2 local C2
do do
local L={"+0+0","-1+0","+1+0","+0-1","-1-1","+1-1","-2+0","+2+0"} local L={'+0+0','-1+0','+1+0','+0-1','-1-1','+1-1','-2+0','+2+0'}
vecStrConv(L) vecStrConv(L)
C2={ C2={
{ {
@@ -455,8 +455,8 @@ end
local C2sym local C2sym
do do
local L={"+0+0","-1+0","+1+0","+0-1","-1-1","+1-1","-2+0","+2+0"} local L={'+0+0','-1+0','+1+0','+0-1','-1-1','+1-1','-2+0','+2+0'}
local R={"+0+0","+1+0","-1+0","+0-1","+1-1","-1-1","+2+0","-2+0"} local R={'+0+0','+1+0','-1+0','+0-1','+1-1','-1-1','+2+0','-2+0'}
local Z={ local Z={
[01]=R,[10]=L,[03]=L,[30]=R, [01]=R,[10]=L,[03]=L,[30]=R,

2
parts/player/seqGenerators.lua
View File

@@ -97,7 +97,7 @@ local seqGenerators={
rem(history,1)ins(history,r) rem(history,1)ins(history,r)
-- print("Player GET: "..r) -- print("Player GET: "..r)
-- print("History: "..table.concat(history,",")) -- print("History: "..table.concat(history,","))
-- local L={"","","","","","","",} -- local L=TABLE.new("",len)
-- for _,v in next,pool do L[v]=L[v].."+"end -- for _,v in next,pool do L[v]=L[v].."+"end
-- for i=1,#L do print(i,droughtTimes[i],L[i])end -- for i=1,#L do print(i,droughtTimes[i],L[i])end
end end

8
parts/scenes/custom_sequence.lua
View File

@@ -15,15 +15,15 @@ function scene.sceneInit()
end end
local minoKey={ local minoKey={
["1"]=1,["2"]=2,["3"]=3,["4"]=4,["5"]=5,["6"]=6,["7"]=7, ['1']=1,['2']=2,['3']=3,['4']=4,['5']=5,['6']=6,['7']=7,
z=1,s=2,j=3,l=4,t=5,o=6,i=7, z=1,s=2,j=3,l=4,t=5,o=6,i=7,
p=10,q=11,f=12,e=13,u=15, p=10,q=11,f=12,e=13,u=15,
v=16,w=17,x=18,r=21,y=22,n=23,h=24, v=16,w=17,x=18,r=21,y=22,n=23,h=24,
["/"]=26,c=27,[","]=27,["'"]=27,["-"]=28,[";"]=28,["."]=29, ['/']=26,c=27,[',']=27,['\'']=27,['-']=28,[';']=28,['.']=29,
} }
local minoKey2={ local minoKey2={
["1"]=8,["2"]=9,["3"]=19,["4"]=20,["5"]=14,["7"]=25, ['1']=8,['2']=9,['3']=19,['4']=20,['5']=14,['7']=25,
z=8,s=9,t=14,j=19,l=20,i=25,["-"]=26,o=29, z=8,s=9,t=14,j=19,l=20,i=25,['-']=26,o=29,
} }
function scene.keyDown(key) function scene.keyDown(key)
if key=="left"then if key=="left"then

2
parts/scenes/manual.lua
View File

@@ -2,7 +2,7 @@ local scene={}
function scene.sceneInit() 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])) WIDGET.active.texts:setTexts(require("parts.language.manual_"..({'zh','zh','zh','en','en','en','en','en'})[SETTING.lang]))
end end
function scene.wheelMoved(_,y) function scene.wheelMoved(_,y)

4
parts/scenes/sound.lua
View File

@@ -6,8 +6,8 @@ function scene.sceneInit()
mini,b2b,b3b,pc=false,false,false,false mini,b2b,b3b,pc=false,false,false,false
end end
local blockName={"z","s","j","l","t","o","i"} local blockName={'z','s','j','l','t','o','i'}
local lineCount={"single","double","triple","techrash"} local lineCount={'single','double','triple','techrash'}
function scene.keyDown(key) function scene.keyDown(key)
if key=="1"then if key=="1"then
mini=not mini mini=not mini

12
parts/texture.lua
View File

@@ -168,16 +168,16 @@ end
--WS icons --WS icons
setFont(20) setFont(20)
TEXTURE.ws_dead=DOGC{20,20, TEXTURE.ws_dead=DOGC{20,20,
{"setCL",1,.3,.3}, {'setCL',1,.3,.3},
{"print","X",3,-4}, {'print',"X",3,-4},
} }
TEXTURE.ws_connecting=DOGC{20,20, TEXTURE.ws_connecting=DOGC{20,20,
{"setLW",3}, {'setLW',3},
{"dArc",11.5,10,6.26,1,5.28}, {'dArc',11.5,10,6.26,1,5.28},
} }
TEXTURE.ws_running=DOGC{20,20, TEXTURE.ws_running=DOGC{20,20,
{"setCL",.5,1,0}, {'setCL',.5,1,0},
{"print","R",3,-4}, {'print',"R",3,-4},
} }