From d39cc71240a3a442180ffca85fcb5de20ee73368 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 16 Oct 2021 02:45:42 +0800
Subject: [PATCH] =?UTF-8?q?29=E4=B8=AA=E6=96=B9=E5=9D=97=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E4=B8=8A=E5=8D=87=E4=B8=BA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua             | 10 ++--------
 parts/gameTables.lua |  8 ++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/main.lua b/main.lua
index 0145bbbf..ddc29f2e 100644
--- a/main.lua
+++ b/main.lua
@@ -74,9 +74,9 @@ for _,v in next,fs.getDirectoryItems('parts/shaders')do
     end
 end
 
+CHAR=require'parts.char'
 require'parts.gameTables'
 require'parts.gameFuncs'
-CHAR=require'parts.char'
 
 FREEROW=    require'parts.freeRow'
 DATA=       require'parts.data'
@@ -289,13 +289,7 @@ LANG.init('zh',
         --3. Add a button in parts/scenes/setting_lang.lua;
     },
     {
-        block={
-            "Z","S","J","L","T","O","I",
-            "Z5","S5","P","Q","F","E",
-            "T5","U","V","W","X",
-            "J5","L5","R","Y","N","H","I5",
-            "I3","C","I2","O1"
-        },
+        block=BLOCKNAMES
     },
     (function()
         local tipMeta={__call=function(L)return L[math.random(#L)]end}
diff --git a/parts/gameTables.lua b/parts/gameTables.lua
index ebc0c0cc..9396693c 100644
--- a/parts/gameTables.lua
+++ b/parts/gameTables.lua
@@ -179,6 +179,14 @@ do--drawableText
         noScore=T(45),highScore=T(30),modeLocked=T(45),
     }
 end
+BLOCKNAMES={
+    "Z","S","J","L","T","O","I",
+    "Z5","S5","P","Q","F","E",
+    "T5","U","V","W","X",
+    "J5","L5","R","Y","N","H","I5",
+    "I3","C","I2","O1"
+}
+BLOCKCHARS={}for i=1,#BLOCKNAMES do BLOCKCHARS[i]=CHAR.mino[BLOCKNAMES[i]]end
 do--BLOCKS
     local O,_=true,false
     BLOCKS={