From 97e7b019dd990b21b60901ff55de11e50d72e476 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 9 Dec 2021 03:21:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?TRS=E7=9A=84N/H=E5=9D=97=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=B8=A2=E5=A2=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/RSlist.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/RSlist.lua b/parts/RSlist.lua index 3f5f5313..661adcfa 100644 --- a/parts/RSlist.lua +++ b/parts/RSlist.lua @@ -376,8 +376,8 @@ do },--R false,--Y { - [01]={'+0+0','-1+0','-1+1','+0+1','+1+0','-1+2','-2+0','+0-2'}, - [10]={'+0+0','+1+0','-1+0','+0-1','+1-1','+1-2','+2+0','+0+2'}, + [01]={'+0+0','-1+0','-1+1','+0+1','+1+0','+1+1','-1+2','-2+0','+0-2'}, + [10]={'+0+0','+1+0','-1+0','+0-1','-1-1','+1-1','+1-2','+2+0','+0+2'}, [03]={'+0+0','-1+0','+1-1','+0-2','+0-3','+1+0','+1-2','+1-3','+0+1','-1+1'}, [30]={'+0+0','-1+0','+1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'}, [12]={'+0+0','-1+0','+1-1','-1-1','+1-2','+1+0','+0-2','+1-3','-1+2','+0+3','-1+3'}, From fa64c868b9bdb9970e1a8852d69dae8f1f9b66b9 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 9 Dec 2021 15:21:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=BA=9Btip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_zh.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 21c74201..b9eed154 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -796,6 +796,7 @@ return{ "报时机器人：新的一天开始了", "本游戏还在测试中，出各种问题都是有可能的哦", "本游戏使用精简版字体，可能有些特殊字符不能正确显示", + "别催了，在做了！", "不要大力拍打或滑动哦", "不要卖弱不要卖弱不要卖弱", "不知道有多少人玩游戏的时候会关心游戏是谁做的", @@ -803,9 +804,7 @@ return{ "彩色消除即将到来！", "草（日本语）", "车万方块是一家（暴论", - "成就系统在做了！", "吃键？真的吗？建议回放看看到底按没按到，按了多久", - "触摸板打osu也很好！", "凑数tip什么时候能站起来！", "打铁.png", "打铁", @@ -854,8 +853,9 @@ return{ "你今天的人品值是(满分100):"..math.random(100), "你们考虑过Z酱的感受吗？没有！你们只考虑你自己。", "你有一个好", - "你这场地是金子堆的还是块是金子做的", + "你这块是金子做的还是垃圾行是金子做的", "你准备好了吗？", + "配乐是有考虑到模式氛围的哦", "请谨慎向没有方块经验的玩家推荐，会对本游戏的生存环境造成影响，感谢配合。", "请勿大力敲打设备！敲坏了就没有Techmino玩了", "请勿使用三只手游玩", @@ -882,7 +882,6 @@ return{ "物理hold了解一下", "希望极简率没事", "希望你们都能喜欢Z……哦不是，喜欢Techmino", - "喜欢本游戏的话可以到应用商店下载", "享受Tech的特色旋转系统！", "写不出那种很酷的音乐(哭", "要盯着bug不放", @@ -898,7 +897,7 @@ return{ "中文方块百科全书：tetris.huijiwiki.com", "众所周知俄罗斯方块是经典编程练手游戏(？", "众所周知mac不能拿来玩游戏", - "作业都没做完别玩手机", + "作业没做完别玩手机", "作者40行sub26了", "作者电脑上装了11个方块", "作者浏览器收藏夹里有6个方块", From 96dad762b23482f281f8d11338debededc32adf9 Mon Sep 17 00:00:00 2001 From: NOT_A_ROBOT <76723917+Not-A-Normal-Robot@users.noreply.github.com> Date: Thu, 9 Dec 2021 15:03:57 +0700 Subject: [PATCH 3/5] Update lang_en.lua (#544) BiRS now allows you to spin the O1 piece. --- parts/language/lang_en.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index ad515406..df1603f6 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -874,7 +874,7 @@ return{ "You can connect a keyboard to your phone or tablet (not functional on iOS though).", "You can customize the key mappings in settings!", "You can open the save directory from the Stats page.", - "You can perform a spin with 28 of the 29 minoes in this game; the exception being O1.", + "You can perform a spin with all of the minoes in this game.", "You can set the spawning orientation for each piece.", "ZS JL T O I", {C.C,"Also try 15puzzle!"}, From 6600713f4b5fdd3e935a139a4ce8effdb789e7ed Mon Sep 17 00:00:00 2001 From: user670 <22617255+user670@users.noreply.github.com> Date: Thu, 9 Dec 2021 16:04:24 +0800 Subject: [PATCH 4/5] Update lang_en.lua (#540) --- parts/language/lang_en.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index df1603f6..1736e20d 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -850,9 +850,9 @@ return{ "Soon you'll be able to play against friends and foes all over the world.", "Split clear coming soon!", "sudo rm -rf /*", - "Techmino is a combination of Technique and Tetromino.", - "Techmino has a Nspire-CX edition!", + "Techmino is a portmanteau of \"technique\" and \"tetromino\".", "Techmino is so fun!", + "Techmino on Nspire-CX: yes it exists, no it's not the same game.", "TetroDictionary is now available in English.", "Most of the music tracks in this game are made using Beepbox.", "The names that appeared in the background of the Staff page is a list of our sponsors.", From df089a2f04fc44774e8dc722cc5d9948f94e5de5 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 9 Dec 2021 17:26:02 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=96=B0=E5=A2=9E1*1?= =?UTF-8?q?=E7=A9=BA=E7=99=BD=E7=94=BB=E5=B8=83=E5=8F=98=E9=87=8FPAPER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/image.lua | 3 +-- Zframework/init.lua | 2 +- main.lua | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Zframework/image.lua b/Zframework/image.lua index 260b9c6b..7f541230 100644 --- a/Zframework/image.lua +++ b/Zframework/image.lua @@ -2,7 +2,6 @@ local IMG={} function IMG.init(list) IMG.init=nil - local null=love.graphics.newCanvas(1,1) setmetatable(IMG,{__index=function(self,name) if type(list[name])=='table'then self[name]={} @@ -13,7 +12,7 @@ function IMG.init(list) self[name]=love.graphics.newImage(list[name]) else LOG("No IMG: "..name) - self[name]=null + self[name]=PAPER end return self[name] end}) diff --git a/Zframework/init.lua b/Zframework/init.lua index 56b2d48f..a6a45a33 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -1,4 +1,4 @@ -NONE={}function NULL()end +NONE={}function NULL()end PAPER=love.graphics.newCanvas(1,1) EDITING="" LOADED=false diff --git a/main.lua b/main.lua index 809c5cd3..107802c0 100644 --- a/main.lua +++ b/main.lua @@ -116,7 +116,7 @@ MODES= require'parts.modes' setmetatable(TEXTURE,{__index=function(self,k) MES.new('warn',"No texture called: "..k) - self[k]=love.graphics.newCanvas(1,1) + self[k]=PAPER return self[k] end})