0.12.X: 圣诞快乐

Zframework/screen.lua

@@ -34,7 +34,9 @@ end
 function SCR.print()
 	LOG.print("Screen Info:")
 	for k,v in next,SCR do
-		LOG.print(k..": "..v)
+		if type(v)=="number"then
+			LOG.print(k..": "..v)
+		end
 	end
 end
 return SCR

conf.lua

@@ -1,5 +1,5 @@
-VERSION_CODE=1225
-VERSION_NAME="Alpha V0.12.25"
+VERSION_CODE=1226
+VERSION_NAME="Alpha V0.12.X"
 love.setDeprecationOutput(false)
 function love.conf(t)
 	t.identity="Techmino"--Saving folder

main.lua

@@ -206,6 +206,8 @@ BGM.init{
 
 	"sugar fairy","rockblock","magicblock",--classic, 49/99
 	"cruelty","final","8-bit happiness","end","how feeling",--49/99
+
+	"mXmas",--Festival: Xmas
 }
 VOC.init{
 	"zspin","sspin","lspin","jspin","tspin","ospin","ispin",

parts/kickList.lua

@@ -352,10 +352,18 @@ do
 			[31]={{ 0, 1},{ 1, 1},{-1, 1}},
 		},--C
 		{
-			[01]={},[10]={},[03]={},[30]={},
-			[12]={},[21]={},[32]={},[23]={},
-			[02]={{ 0,-1}},[20]={{ 0, 1}},
-			[13]={{-1, 0}},[31]={{ 1, 0}},
+			[01]={{-1, 0},{ 0, 1}},
+			[10]={{ 1, 0},{ 0, 1}},
+			[03]={{ 1, 0},{ 0, 1}},
+			[30]={{-1, 0},{ 0, 1}},
+			[12]={{ 1, 0},{ 0, 2}},
+			[21]={{ 0,-1},{-1, 0}},
+			[32]={{-1, 0},{ 0, 2}},
+			[23]={{ 0,-1},{-1, 0}},
+			[02]={{ 0,-1},{ 0, 1}},
+			[20]={{ 0, 1},{ 0,-1}},
+			[13]={{-1, 0},{ 1, 0}},
+			[31]={{ 1, 0},{-1, 0}},
 		},--I2
 		{
 			[01]={},[10]={},[03]={},[30]={},

parts/modes/custom_clear.lua

@@ -61,7 +61,7 @@ return{
 		PLY.newPlayer(1)
 		local L=GAME.modeEnv.opponent
 		if L~=0 then
-			GAME.modeEnv.target=false
+			GAME.modeEnv.target=nil
 			if L<6 then
 				PLY.newAIPlayer(2,AIBUILDER("9S",2*L))
 			else

parts/modes/custom_puzzle.lua

@@ -42,7 +42,7 @@ return{
 		PLY.newPlayer(1)
 		local L=GAME.modeEnv.opponent
 		if L~=0 then
-			GAME.modeEnv.target=false
+			GAME.modeEnv.target=nil
 			if L<6 then
 				PLY.newAIPlayer(2,AIBUILDER("9S",2*L))
 			else

parts/player/player.lua

@@ -28,8 +28,8 @@ function Player.createLockFX(P)
 	for i=1,P.r do
 		local y=P.curY+i-1
 		local L=P.clearedRow
-		for i=1,#L do
-			if L[i]==y then goto continue end
+		for j=1,#L do
+			if L[j]==y then goto continue end
 		end
 		y=-30*y
 		for j=1,P.c do
@@ -840,7 +840,7 @@ do--Player.drop(P)--Place piece
 		},--I2
 		{
 			{1,2,2,1,0,1,2,3,2,1},
-			2,3,4
+			1,1,1
 		},--O1
 	}
 	for k,v in next,finesseList do
@@ -1912,14 +1912,15 @@ function Player.act_insRight(P,auto)
 end
 function Player.act_insDown(P)
 	if P.cur and P.curY>P.ghoY then
-		if P.gameEnv.dropFX and P.gameEnv.block and P.curY-P.ghoY-P.r>-1 then
+		local ENV=P.gameEnv
+		if ENV.dropFX and ENV.block and P.curY-P.ghoY-P.r>-1 then
 			P:createDropFX(P.curX,P.curY-1,P.c,P.curY-P.ghoY-P.r+1)
 		end
-		if P.gameEnv.shakeFX then
-			P.fieldOff.vy=P.gameEnv.shakeFX*.5
+		if ENV.shakeFX then
+			P.fieldOff.vy=ENV.shakeFX*.5
 		end
 		P.curY=P.ghoY
-		P.lockDelay=P.gameEnv.lock
+		P.lockDelay=ENV.lock
 		P.spinLast=false
 		P:freshBlock("fresh")
 	end

parts/player/update.lua

@@ -277,7 +277,8 @@ local function update_alive(P,dt)
 				end
 				P.curY=P.curY-1
 			else
-				D=max(1/D,P.curY-P.ghoY)--Fall dist, max to dist between cur/gho
+				D=1/D--Fall dist
+				if D>P.curY-P.ghoY then D=P.curY-P.ghoY end
 				if ENV.moveFX and ENV.block then
 					for _=1,D do
 						P:createMoveFX("down")

parts/scenes/customGame.lua

@@ -28,7 +28,7 @@ function scene.sceneInit()
 	end
 end
 function scene.sceneBack()
-	BGM.play("blank")
+	BGM.play(FESTIVAL=="Xmas"and"mXmas"or"blank")
 end
 
 function scene.keyDown(key)

parts/scenes/intro.lua

@@ -10,7 +10,7 @@ local t1,t2,r
 
 function scene.sceneInit()
 	BG.set()
-	BGM.play("blank")
+	BGM.play(FESTIVAL=="Xmas"and"mXmas"or"blank")
 	t1,t2=0,0--Timer
 	r={}--Random animation type
 	for i=1,8 do r[i]=rnd(5)end

parts/updateLog.lua

@@ -45,6 +45,17 @@ local S=[=[
 				任意尺寸屏幕的UI; 3D背景
 				热更新; 工程编译到字节码; 超60帧; 跳帧开关
 
+0.12.X: 圣诞快乐 Merry Christmas
+		新增:
+				新增BGM:mXmas
+		改动:
+				调整magicblock的音质
+				升级i2的踢墙表
+		修复:
+				o1旋转后锁定报错
+				自定义模式开ai报错
+				非20G高重力块穿模
+
 0.12.25: N连块 N-mino
 		新增:
 				加入1~3连块