v0.11.1:小Z更新

2020-10-01 22:04:24 +08:00
parent 0e2698792b
commit 71fec8b497
179 changed files with 1894 additions and 915 deletions
--- a/modes/PCbase.lua
+++ b/modes/PCbase.lua
@@ -0,0 +1,68 @@
+return{
+	{
+		{
+			{4,4,4,3,3,3,7,0,0,0},
+			{4,1,6,6,2,3,7,0,0,0},
+			{1,1,6,6,2,2,7,0,0,0},
+			{1,7,7,7,7,2,7,0,0,0},
+		},
+		{
+			{4,4,4,3,3,3,0,0,0,7},
+			{4,1,6,6,2,3,0,0,0,7},
+			{1,1,6,6,2,2,0,0,0,7},
+			{1,7,7,7,7,2,0,0,0,7},
+		},
+		{
+			{2,7,7,7,7,1,7,0,0,0},
+			{2,2,6,6,1,1,7,0,0,0},
+			{3,2,6,6,1,4,7,0,0,0},
+			{3,3,3,4,4,4,7,0,0,0},
+		},
+		{
+			{2,7,7,7,7,1,0,0,0,7},
+			{2,2,6,6,1,1,0,0,0,7},
+			{3,2,6,6,1,4,0,0,0,7},
+			{3,3,3,4,4,4,0,0,0,7},
+		},
+	},--3*4 shape
+	{
+		{
+			{1,1,0,0,0,0,0,3,3,3},
+			{5,1,1,0,0,0,0,6,6,3},
+			{5,5,2,2,0,0,0,6,6,4},
+			{5,2,2,0,0,0,0,4,4,4},
+		},
+		{
+			{1,1,0,0,0,0,0,4,4,4},
+			{5,1,1,0,0,0,0,4,6,6},
+			{5,5,2,2,0,0,0,3,6,6},
+			{5,2,2,0,0,0,0,3,3,3},
+		},
+		{
+			{3,3,3,1,1,0,0,0,0,0},
+			{6,6,3,5,1,1,0,0,0,0},
+			{6,6,4,5,5,2,2,0,0,0},
+			{4,4,4,5,2,2,0,0,0,0},
+		},
+		{
+			{4,4,4,1,1,0,0,0,0,0},
+			{4,6,6,5,1,1,0,0,0,0},
+			{3,6,6,5,5,2,2,0,0,0},
+			{3,3,3,5,2,2,0,0,0,0},
+		},
+	},--7 piece opener(right>)(without i)
+	{
+		{
+			{4,4,4,3,3,3,0,0,0,0},
+			{4,1,6,6,2,3,0,0,0,0},
+			{1,1,6,6,2,2,0,0,0,0},
+			{1,7,7,7,7,2,0,0,0,0},
+		},
+		{
+			{2,7,7,7,7,1,0,0,0,0},
+			{2,2,6,6,1,1,0,0,0,0},
+			{3,2,6,6,1,4,0,0,0,0},
+			{3,3,3,4,4,4,0,0,0,0},
+		},
+	},--6 piece opener
+}
--- a/modes/PClist.lua
+++ b/modes/PClist.lua
@@ -0,0 +1,77 @@
+return{
+	{
+		{1,3,3},{1,3,4},{1,5,3},{3,1,3},{3,1,4},{3,2,4},{3,3,2},{3,3,5},{3,3,6},{3,3,7},
+		{3,4,1},{3,4,5},{3,4,6},{3,5,3},{3,5,4},{3,5,5},{3,6,3},{3,6,4},{3,7,3},{3,7,4},
+		{5,3,4},{5,3,5},{5,5,1},{5,5,3},{5,7,3},{6,3,3},{6,3,4},{6,6,7},{6,7,6},{7,3,3},
+		{7,3,4},{7,5,3},{7,6,6},{7,7,7},
+	},--3*4 shape
+	{
+		{5,3,4,4},{5,3,7,7},{5,7,4,4},{4,2,4,4},{3,5,4,4},{3,4,5,4},{3,3,7,4},{7,5,4,4},{1,5,1,1},{1,5,5,5},
+		{1,5,7,4},{1,2,4,5},{1,4,5,5},{1,4,5,2},{1,4,2,5},{1,4,4,4},{5,1,4,5},{5,5,4,1},{5,5,4,2},{5,5,4,4},
+		{5,4,5,4},{5,4,4,5},{5,4,4,3},{5,7,4,6},{5,7,4,3},{2,5,4,4},{6,4,4,4},{6,7,4,6},{4,1,2,5},{4,1,4,4},
+		{4,5,4,5},{4,5,7,7},{4,6,4,4},{4,4,6,4},{4,4,3,5},{4,4,3,6},{4,3,4,5},{4,3,4,6},{4,7,3,4},{4,7,7,5},
+		{3,1,4,4},{3,1,4,3},{3,1,3,4},{3,5,5,4},{3,5,4,5},{3,5,7,7},{3,2,5,2},{3,2,4,4},{3,6,4,4},{3,6,3,3},
+		{3,4,1,3},{3,4,4,5},{3,4,4,6},{3,4,3,7},{3,3,6,3},{3,7,5,7},{3,7,4,3},{3,7,3,4},{7,5,4,6},{7,5,4,3},
+		{7,5,3,4},{7,5,7,1},{7,6,4,6},{7,4,1,5},{7,4,5,6},{7,4,3,4},{7,4,7,5},{7,3,1,5},{7,3,5,7},{7,3,4,4},
+		{7,3,3,4},{7,3,7,5},{7,7,4,5},{7,7,7,4},{1,1,5,2},{1,1,7,4},{1,5,1,2},{1,5,1,3},{1,5,5,2},{1,5,2,1},
+		{1,5,2,3},{1,5,6,3},{1,5,6,7},{1,5,4,1},{1,5,4,5},{1,5,4,2},{1,5,4,3},{1,5,4,7},{1,5,3,1},{1,5,3,4},
+		{1,5,7,2},{1,5,7,6},{1,5,7,7},{1,2,5,1},{1,2,5,4},{1,2,7,4},{1,4,1,5},{1,4,5,1},{1,4,5,4},{1,4,6,5},
+		{1,4,4,3},{1,4,3,3},{1,3,1,2},{1,3,5,2},{1,3,4,4},{1,3,4,3},{1,3,3,4},{1,7,1,4},{1,7,5,6},{1,7,5,4},
+		{1,7,5,3},{1,7,5,7},{1,7,2,3},{1,7,6,4},{1,7,4,1},{1,7,4,5},{1,7,4,7},{1,7,3,1},{1,7,7,4},{5,1,5,5},
+		{5,1,5,2},{5,1,5,4},{5,1,2,3},{5,1,6,3},{5,1,4,1},{5,1,4,2},{5,1,4,7},{5,1,7,2},{5,1,7,4},{5,5,1,5},
+		{5,5,1,2},{5,5,1,4},{5,5,5,1},{5,5,5,2},{5,5,5,4},{5,5,5,7},{5,5,2,1},{5,5,2,5},{5,5,6,7},{5,5,4,5},
+		{5,5,4,3},{5,5,3,1},{5,5,3,4},{5,5,7,5},{5,5,7,6},{5,2,1,3},{5,2,5,4},{5,2,4,5},{5,2,3,1},{5,2,3,6},
+		{5,2,7,1},{5,6,1,3},{5,6,5,7},{5,6,6,1},{5,4,1,5},{5,4,1,7},{5,4,5,1},{5,4,5,5},{5,4,5,2},{5,4,5,3},
+		{5,4,2,5},{5,4,4,1},{5,4,4,4},{5,4,3,1},{5,4,3,5},{5,4,3,4},{5,4,7,1},{5,3,5,4},{5,3,5,3},{5,3,2,2},
+		{5,3,6,6},{5,3,4,1},{5,3,4,5},{5,3,4,3},{5,3,3,1},{5,3,3,4},{5,3,3,3},{5,7,1,2},{5,7,1,4},{5,7,1,3},
+		{5,7,5,5},{5,7,5,7},{5,7,2,1},{5,7,6,4},{5,7,6,7},{5,7,4,1},{5,7,4,2},{5,7,4,7},{5,7,3,1},{5,7,3,2},
+		{5,7,3,6},{5,7,3,4},{5,7,3,7},{5,7,7,1},{5,7,7,6},{5,7,7,4},{5,7,7,3},{2,1,5,1},{2,1,4,5},{2,1,7,4},
+		{2,5,1,1},{2,5,4,5},{2,5,3,6},{2,4,1,5},{2,4,4,4},{2,4,4,3},{2,3,5,6},{2,7,1,4},{2,7,5,5},{2,7,4,1},
+		{2,7,3,7},{2,7,7,3},{6,5,6,1},{6,5,3,1},{6,6,5,1},{6,6,4,5},{6,6,7,4},{6,4,6,5},{6,4,7,5},{6,3,4,3},
+		{6,3,3,4},{6,7,6,4},{6,7,4,1},{6,7,4,5},{6,7,4,7},{6,7,7,4},{4,1,1,5},{4,1,5,1},{4,1,5,5},{4,1,5,2},
+		{4,1,5,7},{4,1,6,5},{4,1,4,3},{4,1,3,4},{4,1,3,3},{4,1,7,5},{4,5,5,4},{4,5,4,1},{4,5,4,4},{4,5,4,3},
+		{4,5,3,1},{4,5,3,5},{4,2,1,5},{4,2,4,3},{4,2,3,4},{4,6,6,5},{4,6,4,3},{4,6,3,4},{4,4,1,4},{4,4,1,3},
+		{4,4,5,1},{4,4,5,4},{4,4,5,3},{4,4,2,4},{4,4,4,1},{4,4,4,5},{4,4,4,6},{4,4,7,4},{4,4,7,3},{4,3,6,4},
+		{4,3,4,7},{4,3,3,5},{4,3,7,4},{4,7,1,5},{4,7,5,6},{4,7,5,7},{4,7,2,1},{4,7,2,5},{4,7,6,5},{4,7,4,4},
+		{4,7,4,3},{3,1,1,2},{3,1,5,1},{3,1,5,2},{3,1,2,1},{3,1,6,5},{3,1,6,7},{3,1,7,6},{3,5,1,2},{3,5,5,1},
+		{3,5,5,6},{3,5,5,3},{3,5,2,1},{3,5,2,2},{3,5,6,5},{3,5,6,6},{3,5,4,1},{3,5,4,3},{3,5,3,1},{3,5,3,5},
+		{3,5,3,4},{3,5,3,3},{3,2,1,5},{3,2,5,1},{3,2,2,5},{3,6,1,5},{3,6,1,7},{3,6,5,5},{3,6,5,6},{3,6,6,5},
+		{3,6,4,3},{3,6,3,4},{3,4,5,3},{3,4,2,4},{3,4,6,4},{3,4,6,3},{3,4,3,1},{3,4,3,5},{3,4,3,2},{3,4,3,6},
+		{3,4,7,3},{3,3,1,4},{3,3,5,1},{3,3,5,4},{3,3,5,3},{3,3,6,4},{3,3,4,1},{3,3,4,5},{3,3,4,2},{3,3,4,6},
+		{3,3,4,7},{3,3,3,1},{3,3,3,5},{3,3,3,6},{3,7,1,5},{3,7,5,1},{3,7,5,2},{3,7,2,5},{3,7,6,5},{3,7,7,5},
+		{7,1,1,4},{7,1,5,6},{7,1,5,4},{7,1,5,3},{7,1,5,7},{7,1,2,3},{7,1,6,4},{7,1,4,1},{7,1,4,5},{7,1,4,7},
+		{7,1,3,1},{7,1,7,4},{7,5,1,2},{7,5,1,6},{7,5,1,4},{7,5,1,3},{7,5,1,7},{7,5,5,5},{7,5,5,7},{7,5,2,1},
+		{7,5,6,4},{7,5,6,7},{7,5,4,1},{7,5,4,2},{7,5,4,7},{7,5,3,1},{7,5,3,2},{7,5,3,6},{7,5,3,7},{7,5,7,6},
+		{7,5,7,4},{7,5,7,3},{7,2,1,4},{7,2,1,3},{7,2,5,5},{7,2,4,1},{7,2,3,7},{7,2,7,3},{7,6,1,4},{7,6,5,4},
+		{7,6,6,4},{7,6,4,1},{7,6,4,5},{7,6,4,7},{7,6,7,4},{7,4,5,1},{7,4,5,2},{7,4,5,7},{7,4,2,1},{7,4,2,5},
+		{7,4,6,5},{7,4,4,4},{7,4,4,3},{7,3,5,1},{7,3,5,2},{7,3,5,6},{7,3,5,4},{7,3,2,5},{7,3,2,7},{7,3,6,1},
+		{7,3,6,5},{7,3,4,3},{7,3,7,2},{7,3,7,6},{7,7,1,4},{7,7,5,1},{7,7,5,6},{7,7,5,4},{7,7,5,3},{7,7,2,3},
+		{7,7,6,4},{7,7,6,3},{7,7,4,7},{7,7,3,6},
+	},--7 piece opener (right>)
+	{
+		{1,1,3,4},{1,1,4,3},{1,2,5,3},{1,2,5,4},{1,3,4,7},{1,3,5,5},{1,3,7,3},{1,3,7,4},{1,4,1,4},{1,4,4,6},
+		{1,5,2,3},{1,5,3,2},{1,5,3,5},{1,5,4,7},{1,5,5,2},{1,5,5,4},{1,5,5,5},{1,5,7,3},{1,5,7,4},{1,6,3,3},
+		{1,6,5,3},{1,7,3,3},{1,7,3,4},{1,7,5,3},{1,7,5,4},{3,1,3,7},{3,1,4,7},{3,1,5,5},{3,1,6,3},{3,1,7,3},
+		{3,1,7,4},{3,2,2,3},{3,2,3,2},{3,2,3,6},{3,2,4,5},{3,2,4,7},{3,2,5,5},{3,2,6,3},{3,2,6,4},{3,2,7,4},
+		{3,3,1,5},{3,3,2,6},{3,3,2,7},{3,3,3,3},{3,3,3,4},{3,3,4,3},{3,3,4,4},{3,3,5,3},{3,3,5,4},{3,3,6,1},
+		{3,3,6,6},{3,3,6,7},{3,3,7,2},{3,3,7,5},{3,3,7,6},{3,3,7,7},{3,4,1,2},{3,4,1,5},{3,4,1,7},{3,4,2,1},
+		{3,4,2,5},{3,4,2,7},{3,4,3,3},{3,4,3,4},{3,4,4,3},{3,4,4,4},{3,4,5,3},{3,4,5,4},{3,4,5,7},{3,4,6,1},
+		{3,4,6,2},{3,4,6,7},{3,4,7,1},{3,4,7,2},{3,4,7,5},{3,4,7,6},{3,5,1,2},{3,5,2,3},{3,5,2,5},{3,5,3,2},
+		{3,5,3,3},{3,5,3,4},{3,5,4,3},{3,5,4,6},{3,5,4,7},{3,5,5,5},{3,5,5,7},{3,5,6,4},{3,5,7,3},{3,5,7,4},
+		{3,5,7,5},{3,6,1,3},{3,6,2,3},{3,6,2,4},{3,6,3,1},{3,6,3,5},{3,6,3,6},{3,6,3,7},{3,6,4,2},{3,6,4,7},
+		{3,6,5,4},{3,6,6,3},{3,6,6,4},{3,6,7,3},{3,6,7,4},{3,7,1,3},{3,7,1,4},{3,7,2,4},{3,7,3,2},{3,7,3,5},
+		{3,7,3,6},{3,7,3,7},{3,7,4,1},{3,7,4,2},{3,7,4,5},{3,7,4,6},{3,7,5,3},{3,7,5,4},{3,7,5,5},{3,7,6,3},
+		{3,7,6,4},{3,7,7,3},{3,7,7,4},{5,1,2,3},{5,1,3,2},{5,1,3,4},{5,1,4,1},{5,1,4,7},{5,1,5,4},{5,1,5,5},
+		{5,1,7,4},{5,3,1,2},{5,3,1,4},{5,3,2,5},{5,3,3,3},{5,3,3,4},{5,3,3,6},{5,3,4,3},{5,3,5,2},{5,3,5,4},
+		{5,3,5,5},{5,3,5,7},{5,3,7,4},{5,3,7,5},{5,5,1,2},{5,5,1,4},{5,5,3,2},{5,5,3,3},{5,5,3,4},{5,5,3,5},
+		{5,5,3,7},{5,5,5,1},{5,5,5,5},{5,5,6,3},{5,5,6,7},{5,5,7,1},{5,5,7,3},{5,5,7,6},{5,6,3,5},{5,6,3,6},
+		{5,6,3,7},{5,6,5,3},{5,6,6,3},{5,6,7,3},{5,7,1,4},{5,7,3,4},{5,7,3,5},{5,7,5,1},{5,7,5,3},{5,7,5,6},
+		{5,7,6,3},{5,7,7,3},{6,1,3,3},{6,3,3,5},{6,3,3,6},{6,3,3,7},{6,3,4,7},{6,3,6,3},{6,3,6,4},{6,3,7,3},
+		{6,3,7,4},{6,5,3,5},{6,5,3,6},{6,5,3,7},{6,5,6,3},{6,5,7,3},{6,6,3,3},{6,6,3,4},{6,6,5,3},{6,6,6,6},
+		{6,6,7,7},{6,7,3,3},{6,7,3,4},{6,7,5,3},{6,7,6,7},{6,7,7,6},{7,1,3,3},{7,1,3,4},{7,1,5,3},{7,1,5,4},
+		{7,3,1,3},{7,3,1,4},{7,3,2,4},{7,3,3,2},{7,3,3,5},{7,3,3,6},{7,3,3,7},{7,3,4,1},{7,3,4,2},{7,3,4,5},
+		{7,3,4,6},{7,3,5,3},{7,3,5,4},{7,3,5,5},{7,3,6,3},{7,3,6,4},{7,3,7,3},{7,3,7,4},{7,5,1,4},{7,5,3,4},
+		{7,5,3,5},{7,5,5,1},{7,5,5,3},{7,5,5,6},{7,5,6,3},{7,5,7,3},{7,6,3,3},{7,6,3,4},{7,6,5,3},{7,6,6,7},
+		{7,6,7,6},{7,7,3,3},{7,7,3,4},{7,7,5,3},{7,7,6,6},{7,7,7,7},
+	},--6 piece opener
+}
--- a/modes/blind_hard.lua
+++ b/modes/blind_hard.lua
@@ -7,6 +7,7 @@ return{
 		fall=10,
 		dropFX=0,lockFX=0,
 		visible="none",
+		score=false,
 		dropPiece=PLY.check_lineReach,
 		freshLimit=15,
 		target=200,
--- a/modes/blind_lunatic.lua
+++ b/modes/blind_lunatic.lua
@@ -8,6 +8,7 @@ return{
 		ghost=0,
 		dropFX=0,lockFX=0,
 		visible="none",
+		score=false,
 		dropPiece=PLY.check_lineReach,
 		freshLimit=15,
 		target=200,
--- a/modes/blind_ultimate.lua
+++ b/modes/blind_ultimate.lua
@@ -7,6 +7,7 @@ return{
 		block=false,center=0,ghost=0,
 		dropFX=0,lockFX=0,
 		visible="none",
+		score=false,
 		dropPiece=PLY.check_lineReach,
 		freshLimit=15,
 		target=200,
--- a/modes/pctrain_lunatic.lua
+++ b/modes/pctrain_lunatic.lua
@@ -3,8 +3,8 @@ local ins=table.insert
 local pc_drop={50,45,40,35,30,26,22,18,15,12}
 local pc_lock={55,50,45,40,36,32,30}
 local pc_fall={18,16,14,12,10,9,8,7,6}
-local PCbase=require("parts/PCbase")
-local PClist=require("parts/PClist")
+local PCbase=require("modes/PCbase")
+local PClist=require("modes/PClist")
 local PCtype={[0]=1,2,1,3,2,3}

 local function task_PC(P)
--- a/modes/pctrain_normal.lua
+++ b/modes/pctrain_normal.lua
@@ -1,5 +1,5 @@
-local PCbase=require("parts/PCbase")
-local PClist=require("parts/PClist")
+local PCbase=require("modes/PCbase")
+local PClist=require("modes/PClist")
 local PCtype={
 [0]=1,1,1,1,2,
 	1,1,1,1,3,
--- a/modes/tsd_easy.lua
+++ b/modes/tsd_easy.lua
@@ -1,12 +1,10 @@
 local function check_tsd(P)
 	if #P.clearedRow>0 then
-		if P.lastClear.id~=5 or P.lastClear.row~=2 then
-			P:lose()
-		else
+		local C=P.lastClear
+		if C.id==5 and C.row==2 and C.spin then
 			P.modeData.event=P.modeData.event+1
-			if P.modeData.event==20 then
-				P:win("finish")
-			end
+		else
+			P:lose()
 		end
 	end
 end
--- a/modes/tsd_hard.lua
+++ b/modes/tsd_hard.lua
@@ -1,9 +1,10 @@
 local function check_tsd(P)
 	if #P.clearedRow>0 then
-		if P.lastClear.id~=5 or P.lastClear.row~=2 then
-			P:lose()
-		else
+		local C=P.lastClear
+		if C.id==5 and C.row==2 and C.spin then
 			P.modeData.event=P.modeData.event+1
+		else
+			P:lose()
 		end
 	end
 end
--- a/modes/tsd_ultimate.lua
+++ b/modes/tsd_ultimate.lua
@@ -1,10 +1,10 @@
 local function check_tsd(P)
 	if #P.clearedRow>0 then
 		local C=P.lastClear
-		if P.lastClear.id~=5 or P.lastClear.row~=2 then
-			P:lose()
-		else
+		if C.id==5 and C.row==2 and C.spin then
 			P.modeData.event=P.modeData.event+1
+		else
+			P:lose()
 		end
 	end
 end