攻击力统计算法修改

parts/player/player.lua

@@ -1196,45 +1196,42 @@ do--Player.drop(P)--Place piece
 			end
 
 			--Send Lines
+			atk=int(atk*(1+P.strength*.25))--Badge Buff
 			send=atk
-			if send>0 then
+			if exblock>0 then
-				if exblock>0 then
+				exblock=int(exblock*(1+P.strength*.25))--Badge Buff
-					exblock=int(exblock*(1+P.strength*.25))--Badge Buff
+				P:showText("+"..exblock,0,53,20,"fly")
-					P:showText("+"..exblock,0,53,20,"fly")
+				off=off+P:cancel(exblock)
-					off=off+P:cancel(exblock)
+			end
-				end
+			if send>=1 then
-
+				P:showText(send,0,80,35,"zoomout")
-				send=int(send*(1+P.strength*.25))--Badge Buff
+				_=P:cancel(send)
+				send=send-_
+				off=off+_
 				if send>0 then
-					P:showText(send,0,80,35,"zoomout")
+					local T
-					_=P:cancel(send)
+					if GAME.modeEnv.royaleMode then
-					send=send-_
+						if P.atkMode==4 then
-					off=off+_
+							local M=#P.atker
-					if send>0 then
+							if M>0 then
-						local T
+								for i=1,M do
-						if GAME.modeEnv.royaleMode then
+									P:attack(P.atker[i],send,CB.color)
-							if P.atkMode==4 then
-								local M=#P.atker
-								if M>0 then
-									for i=1,M do
-										P:attack(P.atker[i],send,CB.color)
-									end
-								else
-									T=randomTarget(P)
 								end
 							else
-								T=P.atking
+								T=randomTarget(P)
-								P:freshTarget()
 							end
-						elseif #PLAYERS.alive>1 then
+						else
-							T=randomTarget(P)
+							T=P.atking
-						end
+							P:freshTarget()
-						if T then
-							P:attack(T,send,CB.color)
 						end
+					elseif #PLAYERS.alive>1 then
+						T=randomTarget(P)
+					end
+					if T then
+						P:attack(T,send,CB.color)
 					end
-					if P.sound and send>3 then SFX.play("emit",min(send,7)*.1)end
 				end
+				if P.sound and send>3 then SFX.play("emit",min(send,7)*.1)end
 			end
 
 			--SFX & Vibrate
@@ -1342,7 +1339,9 @@ do--Player.drop(P)--Place piece
 		end
 		if gbcc>0 then
 			STAT.dig=STAT.dig+gbcc
-			STAT.digatk=STAT.digatk+atk*gbcc/cc
+			if atk>0 then
+				STAT.digatk=STAT.digatk+atk*gbcc/cc
+			end
 		end
 		local n=CB.name
 		if dospin then