diff --git a/main.lua b/main.lua index 79643a2a..6156ba32 100644 --- a/main.lua +++ b/main.lua @@ -159,7 +159,7 @@ do--Z.setCursor _=BLOCK_COLORS[SETTING.skin[R]] gc_setColor(_[1],_[2],_[3],min(abs(1-time%2),.3)) _=DSCP[R][0] - gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,16,16,_[2]+.5,#BLOCKS[R][0]-_[1]-.5) + gc_draw(TEXTURE.miniBlock[R],x,y,time%3.14159265359*4,8,8,2*_[2]+1,2*(#BLOCKS[R][0]-_[1])-1) gc_setColor(1,1,1) gc_draw(ms.isDown(1)and holdImg or normImg,x,y,nil,nil,nil,8,8) end diff --git a/parts/backgrounds/blockrain.lua b/parts/backgrounds/blockrain.lua index c26abcb4..c1a6b775 100644 --- a/parts/backgrounds/blockrain.lua +++ b/parts/backgrounds/blockrain.lua @@ -20,7 +20,7 @@ function back.update() color=BLOCK_COLORS[SETTING.skin[r]], x=SCR.w*rnd(), y=SCR.h*-.05, - k=SCR.rad/100, + k=SCR.rad/200, ang=rnd()*6.2832, vy=.5+rnd()*.4, vx=rnd()*.4-.2, diff --git a/parts/backgrounds/blockspace.lua b/parts/backgrounds/blockspace.lua index 092ff180..9011a98c 100644 --- a/parts/backgrounds/blockspace.lua +++ b/parts/backgrounds/blockspace.lua @@ -47,7 +47,7 @@ function back.draw() local M=mino[i] local c=M.color gc_setColor(c[1],c[2],c[3],.2) - gc_draw(M.block,M.d*cos(M.ang),M.d*sin(M.ang),M.rotate,(18*M.d/SCR.rad)^1.6,nil,M.block:getWidth()/2,M.block:getHeight()/2) + gc_draw(M.block,M.d*cos(M.ang),M.d*sin(M.ang),M.rotate,(12*M.d/SCR.rad)^1.6,nil,M.block:getWidth()/2,M.block:getHeight()/2) end gc_translate(-SCR.cx,-SCR.cy) end diff --git a/parts/backgrounds/lightning2.lua b/parts/backgrounds/lightning2.lua index 68aba3c9..a0716cfd 100644 --- a/parts/backgrounds/lightning2.lua +++ b/parts/backgrounds/lightning2.lua @@ -6,7 +6,6 @@ local back={} local t local colorLib=BLOCK_COLORS local blocks=BLOCKS -local scs=RSlist.TRS.centerPos function back.init() t=rnd()*2600 end @@ -21,6 +20,6 @@ function back.draw() end local _=colorLib[SETTING.skin[R]] gc.setColor(_[1],_[2],_[3],.12) - gc.draw(TEXTURE.miniBlock[R],SCR.cx,SCR.cy,t%3.1416*6,400*SCR.k,nil,scs[R][0][2]+.5,#blocks[R][0]-scs[R][0][1]-.5) + gc.draw(TEXTURE.miniBlock[R],SCR.cx,SCR.cy,t%3.1416*6,200*SCR.k,nil,2*DSCP[R][0][2]+1,2*(#blocks[R][0]-DSCP[R][0][1])-1) end return back diff --git a/parts/player/draw.lua b/parts/player/draw.lua index 375f0f49..a7b25fef 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -1021,7 +1021,7 @@ function draw.demo(P) local _=BLOCK_COLORS[skinSet[id]] gc_setColor(_[1],_[2],_[3],.3) _=blockImg[id] - gc_draw(_,15,40*N-10,nil,16,nil,0,_:getHeight()*.5) + gc_draw(_,15,40*N-10,nil,8,nil,0,_:getHeight()*.5) N=N+1 end @@ -1032,7 +1032,7 @@ function draw.demo(P) local _=BLOCK_COLORS[skinSet[id]] gc_setColor(_[1],_[2],_[3],.3) _=blockImg[id] - gc_draw(_,285,40*N-10,nil,16,nil,_:getWidth(),_:getHeight()*.5) + gc_draw(_,285,40*N-10,nil,8,nil,_:getWidth(),_:getHeight()*.5) N=N+1 end diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 061909c5..7818af64 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -207,7 +207,7 @@ function scene.draw() local r=TIME()*2 local R=int(r)%7+1 gc.setColor(1,1,1,1-abs(r%1*2-1)) - gc.draw(TEXTURE.miniBlock[R],821,140,TIME()*10%6.2832,15,15,DSCP[R][0][2]+.5,#BLOCKS[R][0]-DSCP[R][0][1]-.5) + gc.draw(TEXTURE.miniBlock[R],821,140,TIME()*10%6.2832,7,7,2*DSCP[R][0][2]+1,2*(#BLOCKS[R][0]-DSCP[R][0][1])-1) end end diff --git a/parts/texture.lua b/parts/texture.lua index a80ffd18..3cb0f3ad 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -16,10 +16,10 @@ do gc.setColor(1,1,1) for i=1,29 do local b=BLOCKS[i][0] - TEXTURE.miniBlock[i]=NSC(#b[1],#b) + TEXTURE.miniBlock[i]=NSC(#b[1]*2,#b*2) 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',2*(x-1),2*(#b-y),2,2) end end end end diff --git a/parts/users.lua b/parts/users.lua index 719cf3df..2c2f68e2 100644 --- a/parts/users.lua +++ b/parts/users.lua @@ -11,7 +11,7 @@ for i=1,29 do local img=TEXTURE.miniBlock[i] defaultAvatar[i]=GC.DO{128,128, {'clear',.1,.1,.1}, - {'draw',img,63,63,.2,30,30,img:getWidth()/2,img:getHeight()/2}, + {'draw',img,63,63,.2,15,15,img:getWidth()/2,img:getHeight()/2}, } end local errorAvatar=GC.DO{128,128,