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},
}
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",
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",
D="black",dH="dGray",H="gray",lH="lGray",Z="white",
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',
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',
--Remain letter: EIKQTUX
}do
COLOR[k]=COLOR[v]
@@ -72,19 +72,19 @@ end})
do--Random generators
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
function COLOR.random_norm()
return COLOR[list_norm[rnd(len_list_norm)]]
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
function COLOR.random_bright()
return COLOR[list_bright[rnd(len_list_bright)]]
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
function COLOR.random_dark()
return COLOR[list_dark[rnd(len_list_dark)]]

2
Zframework/loadLib.lua
View File

@@ -8,7 +8,7 @@ return function(name,libName)
end
elseif SYSTEM=="Android"then
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)
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)
local shiftMap={
["1"]="!",["2"]="@",["3"]="#",["4"]="$",["5"]="%",
["6"]="^",["7"]="&",["8"]="*",["9"]="(",["0"]=")",
["`"]="~",["-"]="_",["="]="+",
["["]="{",["]"]="}",["\\"]="|",
[";"]=":",["'"]="\"",
[","]="<",["."]=">",["/"]="?",
['1']='!',['2']='@',['3']='#',['4']='$',['5']='%',
['6']='^',['7']='&',['8']='*',['9']='(',['0']=')',
['`']='~',['-']='_',['=']='+',
['[']='{',[']']='}',['\\']='|',
[';']=':',['\'']='"',
[',']='<',['.']='>',['/']='?',
}
function STRING.shiftChar(c)
return shiftMap[c]or upper(c)
@@ -59,7 +59,7 @@ end
do--function STRING.urlEncode(str)
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)
local out=""
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 clearIcon=DOGC{40,40,
{"setLW",6},
{"line",11,11,29,29},
{"line",11,29,29,11},
{'setLW',6},
{'line',11,11,29,29},
{'line',11,29,29,11},
}
local sureIcon=DOGC{40,40,
{"setFT",35},
{"mText","?",20,-6},
{'setFT',35},
{'mText',"?",20,-6},
}
local WIDGET={}

34
parts/gametoolfunc.lua
View File

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

422
parts/kickList.lua
View File

@@ -91,48 +91,48 @@ do
}
TRS={
{
[01]={"-1+0","-1+1","+0-2","-1+2","+0+1"},
[10]={"+1+0","+1-1","+0+2","+1-2","+1-2"},
[03]={"+1+0","+1+1","+0-2","+1-1","+1-2"},
[30]={"-1+0","-1-1","+0+2","-1+2","+0-1"},
[12]={"+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"},
[23]={"+1+0","+1+1","+0-2","+1-2"},
[02]={"+1+0","-1+0","+0-1","+0+1"},
[20]={"-1+0","+1+0","+0+1","+0-1"},
[13]={"+0-1","+0+1","+0-2"},
[31]={"+0+1","+0-1","+0+2"},
[01]={'-1+0','-1+1','+0-2','-1+2','+0+1'},
[10]={'+1+0','+1-1','+0+2','+1-2','+1-2'},
[03]={'+1+0','+1+1','+0-2','+1-1','+1-2'},
[30]={'-1+0','-1-1','+0+2','-1+2','+0-1'},
[12]={'+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'},
[23]={'+1+0','+1+1','+0-2','+1-2'},
[02]={'+1+0','-1+0','+0-1','+0+1'},
[20]={'-1+0','+1+0','+0+1','+0-1'},
[13]={'+0-1','+0+1','+0-2'},
[31]={'+0+1','+0-1','+0+2'},
},--Z
false,--S
{
[01]={"-1+0","-1+1","+1+0","+0-2","+1+1"},
[10]={"+1+0","+1-1","-1+0","+0+2","+1+2"},
[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"},
[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"},
[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"},
[02]={"-1+0","+1+0","+0-1","+0+1"},
[20]={"+1+0","-1+0","+0+1","+0-1"},
[13]={"+0-1","+0+1","+1+0"},
[31]={"+0+1","+0-1","-1+0"},
[01]={'-1+0','-1+1','+1+0','+0-2','+1+1'},
[10]={'+1+0','+1-1','-1+0','+0+2','+1+2'},
[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'},
[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'},
[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'},
[02]={'-1+0','+1+0','+0-1','+0+1'},
[20]={'+1+0','-1+0','+0+1','+0-1'},
[13]={'+0-1','+0+1','+1+0'},
[31]={'+0+1','+0-1','-1+0'},
},--J
false,--L
{
[01]={"-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"},
[30]={"-1+0","-1-1","+0+2","-1+2","+0-1"},
[12]={"+1+0","+1-1","+0-1","-1-1","+0+2","+1+2"},
[21]={"-1+0","+0-2","-1-2","+1+1"},
[32]={"-1+0","-1-1","+0-1","+1-1","+0+2","-1+2"},
[23]={"+1+0","+0-2","+1-2","-1+1"},
[02]={"-1+0","+1+0","+0+1"},
[20]={"+1+0","-1+0","+0-1"},
[13]={"+0-1","+0+1","+1+0","+0-2","+0+2"},
[31]={"+0-1","+0+1","-1+0","+0-2","+0+2"},
[01]={'-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'},
[30]={'-1+0','-1-1','+0+2','-1+2','+0-1'},
[12]={'+1+0','+1-1','+0-1','-1-1','+0+2','+1+2'},
[21]={'-1+0','+0-2','-1-2','+1+1'},
[32]={'-1+0','-1-1','+0-1','+1-1','+0+2','-1+2'},
[23]={'+1+0','+0-2','+1-2','-1+1'},
[02]={'-1+0','+1+0','+0+1'},
[20]={'+1+0','-1+0','+0-1'},
[13]={'+0-1','+0+1','+1+0','+0-2','+0+2'},
[31]={'+0-1','+0+1','-1+0','+0-2','+0+2'},
},--T
function(P,d)
if P.gameEnv.easyFresh then
@@ -179,111 +179,111 @@ do
end
end,--O
{
[01]={"+0+1","+1+0","-2+0","-2-1","+1+2"},
[10]={"+2+0","-1+0","-1-2","+2+1","+0+1"},
[03]={"+0+1","-1+0","+2+0","+2-1","-1+2"},
[30]={"-2+0","+1+0","+1-2","-2+1","+0+1"},
[12]={"-1+0","+2+0","+2-1","+0-1","-1+2"},
[21]={"-2+0","+1+0","+1-2","-2+1","+0+1"},
[32]={"+1+0","-2+0","-2-1","+0-1","+1+2"},
[23]={"+2+0","-1+0","-1-2","+2+1","+0+1"},
[02]={"-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"},
[31]={"+0-1","+1+0","-1+0","+0+1"},
[01]={'+0+1','+1+0','-2+0','-2-1','+1+2'},
[10]={'+2+0','-1+0','-1-2','+2+1','+0+1'},
[03]={'+0+1','-1+0','+2+0','+2-1','-1+2'},
[30]={'-2+0','+1+0','+1-2','-2+1','+0+1'},
[12]={'-1+0','+2+0','+2-1','+0-1','-1+2'},
[21]={'-2+0','+1+0','+1-2','-2+1','+0+1'},
[32]={'+1+0','-2+0','-2-1','+0-1','+1+2'},
[23]={'+2+0','-1+0','-1-2','+2+1','+0+1'},
[02]={'-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'},
[31]={'+0-1','+1+0','-1+0','+0+1'},
},--I
{
[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"},
[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"},
[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'},
[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'},
},--Z5
false,--S5
{
[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"},
[03]={"+1+0","+1+1","+0-2","-1+1"},
[30]={"-1+0","-1-1","+0+2","-1+2"},
[12]={"+1+0","+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"},
[23]={"+1+0","+1+1","-1+0","+0-2","+1-2"},
[02]={"-1+0","+0-1","+0+1"},
[20]={"+1+0","+0+1","+0-1"},
[13]={"+1+0","+0+1","-1+0"},
[31]={"-1+0","+0-1","+1+0"},
[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'},
[03]={'+1+0','+1+1','+0-2','-1+1'},
[30]={'-1+0','-1-1','+0+2','-1+2'},
[12]={'+1+0','+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'},
[23]={'+1+0','+1+1','-1+0','+0-2','+1-2'},
[02]={'-1+0','+0-1','+0+1'},
[20]={'+1+0','+0+1','+0-1'},
[13]={'+1+0','+0+1','-1+0'},
[31]={'-1+0','+0-1','+1+0'},
},--P
false,--Q
{
[01]={"-1+0","+1+0","-1+1","+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"},
[30]={"-1+1","+1+0","+0-1","+0+2","+0+3"},
[12]={"+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"},
[23]={"+1+0","+1-1","+0-1","-1+0","+0-2","+2+0"},
[02]={"+1+0","-1+0","-1-1"},
[20]={"-1+0","+1+0","+1+1"},
[13]={"+0-1","-1+1","+0+1"},
[31]={"+0-1","+1-1","+0+1"},
[01]={'-1+0','+1+0','-1+1','+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'},
[30]={'-1+1','+1+0','+0-1','+0+2','+0+3'},
[12]={'+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'},
[23]={'+1+0','+1-1','+0-1','-1+0','+0-2','+2+0'},
[02]={'+1+0','-1+0','-1-1'},
[20]={'-1+0','+1+0','+1+1'},
[13]={'+0-1','-1+1','+0+1'},
[31]={'+0-1','+1-1','+0+1'},
},--F
false,--E
{
[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"},
[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"},
[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"},
[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"},
[02]={"+0-1","+0+1","+0+2"},
[20]={"+0-1","+0+1","+0-2"},
[13]={"+1+0","-1+1","-2+0"},
[31]={"-1+0","+1+1","+2+0"},
[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'},
[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'},
[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'},
[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'},
[02]={'+0-1','+0+1','+0+2'},
[20]={'+0-1','+0+1','+0-2'},
[13]={'+1+0','-1+1','-2+0'},
[31]={'-1+0','+1+1','+2+0'},
},--T5
{
[01]={"-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"},
[30]={"-1+0","-1-1","+0-2","-1+2"},
[12]={"+1+0","+1-1","+1+1"},
[21]={"-1-1","-1+1","-1-1"},
[32]={"-1+0","-1-1","-1+1"},
[23]={"+1-1","+1+1","+1-1"},
[02]={"+0+1"},
[20]={"+0-1"},
[13]={"+0-1","+0+1","+1+0"},
[31]={"+0-1","+0+1","-1+0"},
[01]={'-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'},
[30]={'-1+0','-1-1','+0-2','-1+2'},
[12]={'+1+0','+1-1','+1+1'},
[21]={'-1-1','-1+1','-1-1'},
[32]={'-1+0','-1-1','-1+1'},
[23]={'+1-1','+1+1','+1-1'},
[02]={'+0+1'},
[20]={'+0-1'},
[13]={'+0-1','+0+1','+1+0'},
[31]={'+0-1','+0+1','-1+0'},
},--U
{
[01]={"+0+1","-1+0","+0-2","-1-2"},
[10]={"+0+1","+1+0","+0-2","+1-2"},
[03]={"+0-1","+0+1","+0+2"},
[30]={"+0-1","+0+1","+0-2"},
[12]={"+0-1","+0+1"},
[21]={"+0-1","+0-2"},
[32]={"+1+0","-1+0"},
[23]={"-1+0","+1+0"},
[02]={"-1+1","+1-1"},
[20]={"+1-1","-1+1"},
[13]={"+1+1","-1-1"},
[31]={"-1-1","+1+1"},
[01]={'+0+1','-1+0','+0-2','-1-2'},
[10]={'+0+1','+1+0','+0-2','+1-2'},
[03]={'+0-1','+0+1','+0+2'},
[30]={'+0-1','+0+1','+0-2'},
[12]={'+0-1','+0+1'},
[21]={'+0-1','+0-2'},
[32]={'+1+0','-1+0'},
[23]={'-1+0','+1+0'},
[02]={'-1+1','+1-1'},
[20]={'+1-1','-1+1'},
[13]={'+1+1','-1-1'},
[31]={'-1-1','+1+1'},
},--V
{
[01]={"+0-1","-1+0","+1+0","+1-1","+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"},
[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"},
[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"},
[23]={"+0-1","+1-1","+0+1","+0-2","-1-2","+0+2"},
[02]={"+0-1","-1+0"},
[20]={"+0+1","+1+0"},
[13]={"+0+1","-1+0"},
[31]={"+0-1","+1+0"},
[01]={'+0-1','-1+0','+1+0','+1-1','+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'},
[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'},
[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'},
[23]={'+0-1','+1-1','+0+1','+0-2','-1-2','+0+2'},
[02]={'+0-1','-1+0'},
[20]={'+0+1','+1+0'},
[13]={'+0+1','-1+0'},
[31]={'+0-1','+1+0'},
},--W
function(P,d)
if P.type=='human'then SFX.play('rotate',nil,P:getCenterX()*.15)end
@@ -301,89 +301,89 @@ do
P:freshBlock('fresh')
end,--X
{
[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"},
[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"},
[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"},
[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"},
[02]={"+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"},
[31]={"+1+0","+1+1","+0-1","+1+2"},
[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'},
[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'},
[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'},
[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'},
[02]={'+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'},
[31]={'+1+0','+1+1','+0-1','+1+2'},
},--J5
false,--L5
{
[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"},
[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"},
[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"},
[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"},
[02]={"+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"},
[31]={"+1+0","+1+1","+0-1","+1+2"},
[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'},
[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'},
[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'},
[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'},
[02]={'+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'},
[31]={'+1+0','+1+1','+0-1','+1+2'},
},--R
false,--Y
{
[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"},
[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"},
[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"},
[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"},
[02]={"-1+0","+0+2","+0-1"},
[20]={"+1+0","+0-2","+0+1"},
[13]={"-1+0","-1-1","+0+1","+1+2"},
[31]={"+1+0","+1+1","+0-1","-1-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'},
[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'},
[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'},
[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'},
[02]={'-1+0','+0+2','+0-1'},
[20]={'+1+0','+0-2','+0+1'},
[13]={'-1+0','-1-1','+0+1','+1+2'},
[31]={'+1+0','+1+1','+0-1','-1-2'},
},--N
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"},
[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"},
[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"},
[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'},
[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'},
},--I5
{
[01]={"-1+0","-1-1","+1+1","-1+1"},
[10]={"-1+0","+1+0","-1-1","+1+1"},
[03]={"+1+0","+1-1","-1+1","+1+1"},
[30]={"+1+0","-1+0","+1-1","-1+1"},
[01]={'-1+0','-1-1','+1+1','-1+1'},
[10]={'-1+0','+1+0','-1-1','+1+1'},
[03]={'+1+0','+1-1','-1+1','+1+1'},
[30]={'+1+0','-1+0','+1-1','-1+1'},
},--I3
{
[01]={"-1+0","+1+0"},
[10]={"+1+0","-1+0"},
[03]={"+0+1","+0-1"},
[30]={"+0-1","+0+1"},
[12]={"+0+1","+0-1"},
[21]={"+0-1","+0+1"},
[32]={"-1+0","+1+0"},
[23]={"+1+0","-1+0"},
[02]={"+0-1","+1-1","-1-1"},
[20]={"+0+1","-1+1","+1+1"},
[13]={"+0-1","-1-1","+1-1"},
[31]={"+0+1","+1+1","-1+1"},
[01]={'-1+0','+1+0'},
[10]={'+1+0','-1+0'},
[03]={'+0+1','+0-1'},
[30]={'+0-1','+0+1'},
[12]={'+0+1','+0-1'},
[21]={'+0-1','+0+1'},
[32]={'-1+0','+1+0'},
[23]={'+1+0','-1+0'},
[02]={'+0-1','+1-1','-1-1'},
[20]={'+0+1','-1+1','+1+1'},
[13]={'+0-1','-1-1','+1-1'},
[31]={'+0+1','+1+1','-1+1'},
},--C
{
[01]={"-1+0","+0+1"},
[10]={"+1+0","+0+1"},
[03]={"+1+0","+0+1"},
[30]={"-1+0","+0+1"},
[12]={"+1+0","+0+2"},
[21]={"+0-1","-1+0"},
[32]={"-1+0","+0+2"},
[23]={"+0-1","-1+0"},
[02]={"+0-1","+0+1"},
[20]={"+0+1","+0-1"},
[13]={"-1+0","+1+0"},
[31]={"+1+0","-1+0"},
[01]={'-1+0','+0+1'},
[10]={'+1+0','+0+1'},
[03]={'+1+0','+0+1'},
[30]={'-1+0','+0+1'},
[12]={'+1+0','+0+2'},
[21]={'+0-1','-1+0'},
[32]={'-1+0','+0+2'},
[23]={'+0-1','-1+0'},
[02]={'+0-1','+0+1'},
[20]={'+0+1','+0-1'},
[13]={'-1+0','+1+0'},
[31]={'+1+0','-1+0'},
},--I2
nil,--O1
}
@@ -405,14 +405,14 @@ local SRS
do
SRS={
{
[01]={"-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"},
[30]={"-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"},
[32]={"-1+0","-1-1","+0+2","-1+2"},
[23]={"+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'},
[03]={'+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'},
[21]={'-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'},
[02]={},[20]={},[13]={},[31]={},
},--Z
false,--S
@@ -421,14 +421,14 @@ do
false,--T
noKickSet,--O
{
[01]={"-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"},
[21]={"+1+0","-2+0","+1-2","-2+1"},
[23]={"+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"},
[03]={"-1+0","+2+0","-1+2","+2-1"},
[01]={'-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'},
[21]={'+1+0','-2+0','+1-2','-2+1'},
[23]={'+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'},
[03]={'-1+0','+2+0','-1+2','+2-1'},
[02]={},[20]={},[13]={},[31]={},
}--I
}
@@ -441,7 +441,7 @@ end
local C2
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)
C2={
{
@@ -455,8 +455,8 @@ end
local C2sym
do
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 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 Z={
[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)
-- print("Player GET: "..r)
-- print("History: "..table.concat(history,","))
-- local L={"","","","","","","",}
-- local L=TABLE.new("",len)
-- for _,v in next,pool do L[v]=L[v].."+"end
-- for i=1,#L do print(i,droughtTimes[i],L[i])end
end

8
parts/scenes/custom_sequence.lua
View File

@@ -15,15 +15,15 @@ function scene.sceneInit()
end
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,
p=10,q=11,f=12,e=13,u=15,
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={
["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,
['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,
}
function scene.keyDown(key)
if key=="left"then

2
parts/scenes/manual.lua
View File

@@ -2,7 +2,7 @@ local scene={}
function scene.sceneInit()
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
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
end
local blockName={"z","s","j","l","t","o","i"}
local lineCount={"single","double","triple","techrash"}
local blockName={'z','s','j','l','t','o','i'}
local lineCount={'single','double','triple','techrash'}
function scene.keyDown(key)
if key=="1"then
mini=not mini

12
parts/texture.lua
View File

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