From 29e664ece40ecf97b068f27a2bcac5bb094e816d Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 29 Apr 2021 11:08:00 +0800
Subject: [PATCH] =?UTF-8?q?blackhole=E5=92=8Cblockrain=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BB=BB=E6=84=8F=E5=B0=BA=E5=AF=B8=E5=B1=8F?=
 =?UTF-8?q?=E5=B9=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/backgrounds/blackhole.lua |  2 +-
 parts/backgrounds/blockrain.lua | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/parts/backgrounds/blackhole.lua b/parts/backgrounds/blackhole.lua
index 5bfc4507..5233614a 100644
--- a/parts/backgrounds/blackhole.lua
+++ b/parts/backgrounds/blackhole.lua
@@ -38,7 +38,7 @@ function back.update()
 		local S=squares[i]
 		local ang=math.atan2(S.y,S.x)
 		local d=(S.x^2+S.y^2)^.5
-		d=d-2000/(d+60)
+		d=d-SCR.rad/(d+60)
 		if d>0 then
 			S.x=d*math.cos(ang)
 			S.y=d*math.sin(ang)
diff --git a/parts/backgrounds/blockrain.lua b/parts/backgrounds/blockrain.lua
index 1cb9cbb3..9d9fa06f 100644
--- a/parts/backgrounds/blockrain.lua
+++ b/parts/backgrounds/blockrain.lua
@@ -5,29 +5,33 @@ local ins,rem=table.insert,table.remove
 local back={}
 
 local t
-local cell
+local mino
 function back.init()
 	t=0
-	cell={}
+	mino={}
 end
 function back.update()
 	t=t+1
 	if t%10==0 then
-		ins(cell,{
-			bid=rnd(29),
+		local r=rnd(29)
+		ins(mino,{
+			bid=r,
+			block=TEXTURE.miniBlock[r],
+			color=minoColor[SETTING.skin[r]],
 			x=SCR.w*rnd(),
-			y=-25,
+			y=SCR.h*-.05,
+			k=SCR.rad/100,
 			a=rnd()*6.2832,
 			vy=.5+rnd()*.4,
 			vx=rnd()*.4-.2,
 			va=rnd()*.04-.02,
 		})
 	end
-	for i=#cell,1,-1 do
-		local P=cell[i]
+	for i=#mino,1,-1 do
+		local P=mino[i]
 		P.y=P.y+P.vy
 		if P.y>SCR.h+25 then
-			rem(cell,i)
+			rem(mino,i)
 		else
 			P.x=P.x+P.vx
 			P.a=P.a+P.va
@@ -39,18 +43,15 @@ function back.draw()
 	gc.clear(.15,.15,.15)
 	gc.push("transform")
 	gc.origin()
-	local texture=TEXTURE.miniBlock
-	local minoColor=minoColor
-	for i=1,#cell do
-		local C=cell[i]
-		local tex=texture[C.bid]
-		local c=minoColor[SETTING.skin[C.bid]]
+	for i=1,#mino do
+		local C=mino[i]
+		local c=C.color
 		gc.setColor(c[1],c[2],c[3],.5)
-		gc.draw(tex,C.x,C.y,C.a,10,10,tex:getWidth()/2,tex:getHeight()/2)
+		gc.draw(C.block,C.x,C.y,C.a,C.k,C.k,C.block:getWidth()/2,C.block:getHeight()/2)
 	end
 	gc.pop()
 end
 function back.discard()
-	cell=nil
+	mino=nil
 end
 return back
\ No newline at end of file