0.8.12

texture.lua

@@ -3,20 +3,13 @@ local N=gc.newImage
 local int=math.floor
 local function T(s,t)return gc.newText(setFont(s),t)end
 local function C(x,y)
-	local c=gc.newCanvas(x,y)
-	gc.setCanvas(c)
-	return c
+	local _=gc.newCanvas(x,y)
+	gc.setCanvas(_)
+	return _
 end
 local c
 
 gc.setDefaultFilter("nearest","nearest")
-blockImg=N("/image/block.png")
-blockSkin,blockSkinmini={},{}
-for i=1,13 do
-	blockSkin[i]=C(30,30)
-	blockSkinmini[i]=C(6,6)
-end
-
 local VKI=N("/image/virtualkey.png")
 VKIcon={}
 for i=1,#actName do
@@ -24,12 +17,11 @@ for i=1,#actName do
 	gc.draw(VKI,(i-1)%5*-36,int((i-1)*.2)*-36)
 end
 
-gc.setColor(1,1,1)
 miniBlock={}
+gc.setColor(1,1,1)
 for i=1,7 do
 	local b=blocks[i][0]
 	miniBlock[i]=C(#b[1],#b)
-	gc.setColor(blockColor[i])
 	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)
@@ -37,29 +29,6 @@ for i=1,7 do
 	end end
 end
 
-puzzleMark={}
-gc.setLineWidth(3)
-for i=1,7 do
-	puzzleMark[i]=C(30,30)
-	local c=blockColor[i]
-	gc.setColor(c[1],c[2],c[3],.6)
-	gc.rectangle("line",5,5,20,20)
-	gc.rectangle("line",10,10,10,10)
-end
-for i=8,13 do
-	puzzleMark[i]=C(30,30)
-	gc.setColor(blockColor[i])
-	gc.rectangle("line",7,7,16,16)
-end
-c=C(30,30)
-gc.setColor(1,1,1)
-gc.line(5,5,25,25)
-gc.line(5,25,25,5)
-puzzleMark[-1]=C(30,30)
-gc.setColor(1,1,1,.9)
-gc.draw(c)
-c:release()
-
 mapCross=C(40,40)
 gc.setColor(1,1,1)
 gc.setLineWidth(4)
@@ -107,9 +76,9 @@ drawableText={
 	setting_game=T(80),setting_graphic=T(80),setting_sound=T(80),
 	keyboard=T(25),joystick=T(25),
 	ctrlSetHelp=T(30),
+	blockLayout=T(70),
 	musicRoom=T(80),
 	nowPlaying=T(50),
-	warning=T(30),
 	VKTchW=T(30),VKOrgW=T(30),VKCurW=T(30),
 	noScore=T(50),
 	highScore=T(30),