整理代码

This commit is contained in:
MrZ626
2021-07-23 17:45:39 +08:00
parent 670417dc6a
commit c1b55139b6
5 changed files with 103 additions and 103 deletions

View File

@@ -509,14 +509,14 @@ local ws_runningImg=DOGC{20,20,
{'print',"R",3,-4},
}
local cursorImg=DOGC{16,16,
{"fCirc",8,8,4},
{"setCL",1,1,1,.7},
{"fCirc",8,8,6},
{'fCirc',8,8,4},
{'setCL',1,1,1,.7},
{'fCirc',8,8,6},
}
local cursor_holdImg=DOGC{16,16,
{"setLW",2},
{"dCirc",8,8,7},
{"fCirc",8,8,3},
{'setLW',2},
{'dCirc',8,8,7},
{'fCirc',8,8,3},
}
function love.run()
local love=love

View File

@@ -27,58 +27,58 @@ local loadingThread=coroutine.wrap(function()
YIELD('loadModeIcon')
local modeIcons={}
modeIcons.marathon=DOGC{32,32,
{"move",3,1},
{"fRect",10,4,-2,23},
{"fPoly",10,4,24,10,10,16.5},
{"fRect",4,24,10,3},
{'move',3,1},
{'fRect',10,4,-2,23},
{'fPoly',10,4,24,10,10,16.5},
{'fRect',4,24,10,3},
}
modeIcons.infinite=DOGC{64,64,
{"setLW",4},
{"dCirc",32,32,28},
{"line",32,32,32,14},
{"line",32,32,41,41},
{"move",.5,.5},
{"fRect",30,7,4,4},
{"fRect",7,30,4,4},
{"fRect",52,30,4,4},
{"fRect",30,52,4,4},
{'setLW',4},
{'dCirc',32,32,28},
{'line',32,32,32,14},
{'line',32,32,41,41},
{'move',.5,.5},
{'fRect',30,7,4,4},
{'fRect',7,30,4,4},
{'fRect',52,30,4,4},
{'fRect',30,52,4,4},
}
modeIcons.classic=DOGC{64,64,
{"setLW",6},
{"dRect",10,24,12,12},
{"dRect",26,24,12,12},
{"dRect",42,24,12,12},
{"dRect",26,40,12,12},
{'setLW',6},
{'dRect',10,24,12,12},
{'dRect',26,24,12,12},
{'dRect',42,24,12,12},
{'dRect',26,40,12,12},
}
modeIcons.tsd=DOGC{64,64,
{"fRect",7,7,16,16},
{"fRect",7,41,16,16},
{"fRect",41,41,16,16},
{"move",.5,.5},
{"setLW",1},
{"dPoly",7,24,56,24,56,39,39,39,39,56,24,56,24,39,7,39},
{'fRect',7,7,16,16},
{'fRect',7,41,16,16},
{'fRect',41,41,16,16},
{'move',.5,.5},
{'setLW',1},
{'dPoly',7,24,56,24,56,39,39,39,39,56,24,56,24,39,7,39},
}
modeIcons.t49=DOGC{64,64,
{"setLW",2},
{"dRect",05,05,10,20},{"dRect",49,05,10,20},
{"dRect",05,39,10,20},{"dRect",49,39,10,20},
{"dRect",20,10,23,43},
{"setCL",1,1,1,.7},
{"fRect",20,10,23,43},
{'setLW',2},
{'dRect',05,05,10,20},{'dRect',49,05,10,20},
{'dRect',05,39,10,20},{'dRect',49,39,10,20},
{'dRect',20,10,23,43},
{'setCL',1,1,1,.7},
{'fRect',20,10,23,43},
}
modeIcons.t99=DOGC{64,64,
{"setLW",2},
{"dRect",02,02,6,12},{"dRect",11,02,6,12},
{"dRect",02,18,6,12},{"dRect",11,18,6,12},
{"dRect",02,34,6,12},{"dRect",11,34,6,12},
{"dRect",02,50,6,12},{"dRect",11,50,6,12},
{"dRect",47,02,6,12},{"dRect",56,02,6,12},
{"dRect",47,18,6,12},{"dRect",56,18,6,12},
{"dRect",47,34,6,12},{"dRect",56,34,6,12},
{"dRect",47,50,6,12},{"dRect",56,50,6,12},
{"dRect",20,10,23,43},
{"setCL",1,1,1,.7},
{"fRect",20,10,23,43},
{'setLW',2},
{'dRect',02,02,6,12},{'dRect',11,02,6,12},
{'dRect',02,18,6,12},{'dRect',11,18,6,12},
{'dRect',02,34,6,12},{'dRect',11,34,6,12},
{'dRect',02,50,6,12},{'dRect',11,50,6,12},
{'dRect',47,02,6,12},{'dRect',56,02,6,12},
{'dRect',47,18,6,12},{'dRect',56,18,6,12},
{'dRect',47,34,6,12},{'dRect',56,34,6,12},
{'dRect',47,50,6,12},{'dRect',56,50,6,12},
{'dRect',20,10,23,43},
{'setCL',1,1,1,.7},
{'fRect',20,10,23,43},
}
YIELD('loadMode')

View File

@@ -28,23 +28,23 @@ gc.setLineWidth(2)
TEXTURE.puzzleMark={}
for i=1,17 do
TEXTURE.puzzleMark[i]=DOGC{30,30,
{"setCL",minoColor[i][1],minoColor[i][2],minoColor[i][3],.6},
{"dRect",5,5,20,20},
{"dRect",10,10,10,10},
{'setCL',minoColor[i][1],minoColor[i][2],minoColor[i][3],.6},
{'dRect',5,5,20,20},
{'dRect',10,10,10,10},
}
end
for i=18,24 do
TEXTURE.puzzleMark[i]=DOGC{30,30,
{"setCL",minoColor[i]},
{"dRect",7,7,16,16},
{'setCL',minoColor[i]},
{'dRect',7,7,16,16},
}
end
TEXTURE.puzzleMark[-1]=DOGC{30,30,
{"setCL",1,1,1,.8},
{"draw",DOGC{30,30,
{"setLW",3},
{"line",5,5,25,25},
{"line",5,25,25,5},
{'setCL',1,1,1,.8},
{'draw',DOGC{30,30,
{'setLW',3},
{'line',5,5,25,25},
{'line',5,25,25,5},
}}
}
@@ -52,13 +52,13 @@ TEXTURE.puzzleMark[-1]=DOGC{30,30,
TEXTURE.pixelNum={}
for i=0,9 do
TEXTURE.pixelNum[i]=DOGC{5,9,
{("1011011111"):byte(i+1)==49,"fRect",1,0,3,1},--up
{("0011111011"):byte(i+1)==49,"fRect",1,4,3,1},--middle
{("1011011011"):byte(i+1)==49,"fRect",1,8,3,1},--down
{("1000111011"):byte(i+1)==49,"fRect",0,1,1,3},--up-left
{("1111100111"):byte(i+1)==49,"fRect",4,1,1,3},--up-right
{("1010001010"):byte(i+1)==49,"fRect",0,5,1,3},--down-left
{("1101111111"):byte(i+1)==49,"fRect",4,5,1,3},--down-right
{('1011011111'):byte(i+1)>48,'fRect',1,0,3,1},--up
{('0011111011'):byte(i+1)>48,'fRect',1,4,3,1},--middle
{('1011011011'):byte(i+1)>48,'fRect',1,8,3,1},--down
{('1000111011'):byte(i+1)>48,'fRect',0,1,1,3},--up-left
{('1111100111'):byte(i+1)>48,'fRect',4,1,1,3},--up-right
{('1010001010'):byte(i+1)>48,'fRect',0,5,1,3},--down-left
{('1101111111'):byte(i+1)>48,'fRect',4,5,1,3},--down-right
}
end
@@ -119,28 +119,28 @@ TEXTURE.sure=DOGC{48,64,
--Setting icon
TEXTURE.setting=DOGC{64,64,
{"setLW",8},
{"dCirc",32,32,18},
{"setLW",10},
{"line",52,32,64,32},
{"line",32,52,32,64},
{"line",12,32,0,32},
{"line",32,12,32,0},
{"line",45,45,55,55},
{"line",19,45,9,55},
{"line",19,19,9,9},
{"line",45,19,55,9},
{'setLW',8},
{'dCirc',32,32,18},
{'setLW',10},
{'line',52,32,64,32},
{'line',32,52,32,64},
{'line',12,32,0,32},
{'line',32,12,32,0},
{'line',45,45,55,55},
{'line',19,45,9,55},
{'line',19,19,9,9},
{'line',45,19,55,9},
}
--Music mark
TEXTURE.music=DOGC{64,64,
{"setLW",7},
{"line",19,9,60,7},
{"setLW",4},
{"line",20,9,20,49},
{"line",59,7,59,47},
{"fElps",11,49,11,8},
{"fElps",50,47,11,8},
{'setLW',7},
{'line',19,9,60,7},
{'setLW',4},
{'line',20,9,20,49},
{'line',59,7,59,47},
{'fElps',11,49,11,8},
{'fElps',50,47,11,8},
}
--Mute mark
@@ -152,12 +152,12 @@ TEXTURE.mute=DOGC{64,64,
--Language mark
TEXTURE.language=DOGC{64,64,
{"setLW",4},
{"dCirc",32,32,30},
{"line",2,31,62,31},
{"line",31,2,31,62},
{"dArc",10,31,40,-.8,.8},
{"dArc",53,31,40,2.3,3.9},
{'setLW',4},
{'dCirc',32,32,30},
{'line',2,31,62,31},
{'line',31,2,31,62},
{'dArc',10,31,40,-.8,.8},
{'dArc',53,31,40,2.3,3.9},
}
--Info. mark
@@ -172,7 +172,7 @@ TEXTURE.info=DOGC{50,50,
TEXTURE.question=DOGC{50,50,
{'setLW',5},
{'dCirc',25,25,22},
{'print',"?",16,-6},
{'print','?',16,-6},
}
--More mark
@@ -194,21 +194,21 @@ TEXTURE.back=DOGC{60,55,
--Quit mark
TEXTURE.quit=DOGC{50,50,
{"setCL",1,1,1},
{"draw",DOGC{50,50,
{"setLW",7},
{"line",5,5,45,45},
{"line",5,45,45,5},
{'setCL',1,1,1},
{'draw',DOGC{50,50,
{'setLW',7},
{'line',5,5,45,45},
{'line',5,45,45,5},
}}
}
--Quit mark (small)
TEXTURE.quit_small=DOGC{30,30,
{"setCL",1,1,1},
{"draw",DOGC{30,30,
{"setLW",4},
{"line",2,2,28,28},
{"line",2,28,28,2},
{'setCL',1,1,1},
{'draw',DOGC{30,30,
{'setLW',4},
{'line',2,2,28,28},
{'line',2,28,28,2},
}}
}

View File

@@ -10,8 +10,8 @@ local defaultAvatar={}
for i=1,29 do
local img=TEXTURE.miniBlock[i]
defaultAvatar[i]=DOGC{128,128,
{"clear",.1,.1,.1},
{"draw",img,63,63,.2,30,30,img:getWidth()/2,img:getHeight()/2},
{'clear',.1,.1,.1},
{'draw',img,63,63,.2,30,30,img:getWidth()/2,img:getHeight()/2},
}
end
local errorAvatar=DOGC{128,128,

View File

@@ -32,7 +32,7 @@ local holdImages={
local VKIcon={}
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
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')
--In-game virtualkey layout data