版本推进

删除”全简体中文“语言
修复关闭背景时设置背景亮度报错
2022-02-06 18:37:01 +08:00 · 2022-02-06 18:30:09 +08:00 · 2022-02-06 18:07:33 +08:00 · 2022-02-06 18:07:30 +08:00 · 2022-02-06 17:51:38 +08:00 · 2022-01-30 14:20:28 +08:00
31 changed files with 280 additions and 326 deletions
--- a/main.lua
+++ b/main.lua
@@ -366,7 +366,6 @@ LANG.init('zh',
    {
        zh=require'parts.language.lang_zh',
        zh_trad=require'parts.language.lang_zh_trad',
-        zh_full=require'parts.language.lang_zh_full',
        en=require'parts.language.lang_en',
        fr=require'parts.language.lang_fr',
        es=require'parts.language.lang_es',
@@ -550,6 +549,7 @@ do
    if type(SETTING.bg)~='string'then SETTING.bg='on'end
    if SETTING.skin[18]==10 then SETTING.skin[18]=4 end
    if SETTING.reTime>3 or SETTING.reTime<.5 then SETTING.reTime=2 end
+    if SETTING.locale=='zh_full' then SETTING.locale='zh' end
    if RANKS.infinite then RANKS.infinite=0 end
    if RANKS.infinite_dig then RANKS.infinite_dig=0 end
    if not RANKS.sprint_10l then RANKS.sprint_10l=0 end
--- a/media/image/modeicon/big.png
+++ b/media/image/modeicon/big.png
--- a/media/image/modeicon/secret_grade.png
+++ b/media/image/modeicon/secret_grade.png
--- a/media/image/modeicon/sprint_pento.png
+++ b/media/image/modeicon/sprint_pento.png
--- a/media/image/modeicon/sprint_tri.png
+++ b/media/image/modeicon/sprint_tri.png
--- a/parts/char.lua
+++ b/parts/char.lua
@@ -296,8 +296,10 @@ local L={
        p9Comb1=      0xF0250,
        p9Comb2=      0xF0251,
        frameComb=    0xF0252,
+        s1j=          0xF0253,
+        s1jBase=      0xF0254,
+        s1jComb=      0xF0255,
    }
-
 }

 for _,pack in next,L do
--- a/parts/eventsets/master_instinct.lua
+++ b/parts/eventsets/master_instinct.lua
@@ -20,7 +20,13 @@ return{
        local D=P.modeData

        local c=#P.clearedRow
-        if c==0 and D.pt%100==99 then return end
+        if c==0 and D.pt%100==99 then 
+            if D.pt<1000 then
+                hidetimer=0-inv_wait[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]
+                if c>0 then hidetimer=hidetimer-inv_fall[(P.modeData.pt/100-(P.modeData.pt%100)/100)+1]end
+            end
+            return
+        end
        local s=c<3 and c+1 or c==3 and 5 or 7
        if P.combo>7 then s=s+2
        elseif P.combo>3 then s=s+1
@@ -50,6 +56,8 @@ return{
            elseif s==7 then
                E.das=6
                BGM.play('far')
+            elseif s==8 then
+                BG.set('none')
            elseif s==10 then
                D.pt=1000
                P:win('finish')
--- a/parts/eventsets/secret_grade.lua
+++ b/parts/eventsets/secret_grade.lua
@@ -0,0 +1,56 @@
+local gc_setColor,gc_draw=love.graphics.setColor,love.graphics.draw
+local ply_applyField=PLY.draw.applyField
+local function GetOpenHole(num)
+    return -math.abs(((num-1) % 18)-9)+10
+end
+local F={}
+local ranks={"10","9","8","7","6","5","4","3","2","1","S1","S2","S3","S4","S5","S6","S7","S8","S9","GM","GM+","TM","TM+","TM+₂","TM+₃", "TM+₄","TM+₅"}
+--     lines:  0   1   2   3   4   5   6   7   8   9   10   11   12   13   14   15   16   17   18   19   20    21   22     23     24      25     26
+return
+{
+    fkey1=function(P)P.modeData.showGuide=not P.modeData.showGuide end,
+    mesDisp=function(P)
+        mText(TEXTOBJ.grade,63,190)
+        setFont(55)
+        mStr(ranks[P.modeData.rankPts],63,125)
+        
+        ply_applyField(P)
+        local mark=TEXTURE.puzzleMark
+        gc_setColor(1,1,1)
+        if P.modeData.showGuide then
+            for y=1,P.modeData.rankPts+1 do for x=1,10 do
+                local T=F[y][x]
+                if T~=0 then
+                    gc_draw(mark[T],30*x-30,600-30*y)
+                end
+            end end
+        end
+        PLY.draw.cancelField(P)
+    end,
+    task=function(P)
+        P.modeData.rankPts=1
+        P.modeData.showGuide=true
+        for i=1,50 do
+            F[i] = {}
+            local h=GetOpenHole(i)
+            for j=1,10 do
+                F[i][j]=h==j and -1 or 21
+            end
+        end
+    end,
+    hook_drop=function(P)
+        local Pf=P.field
+        local D=P.modeData
+        D.rankPts=1
+        for i=1,#P.field do
+            local h=GetOpenHole(i)
+            for j=1,10 do
+                if P.field[i][j]>0 and h==j then return end
+                if P.field[i][j]==0 and h~=j then return end
+            end
+            if i==#P.field then return end
+            if P.field[i+1][h]==0 then return end
+            D.rankPts=D.rankPts+1
+        end
+    end
+}
--- a/parts/fonts/proportional.otf
+++ b/parts/fonts/proportional.otf
--- a/parts/language/dict_en.lua
+++ b/parts/language/dict_en.lua
@@ -890,6 +890,12 @@ return{
        "term",
        "Any input device takes some time for the input to reach the game. This delay can range from a few milliseconds to a few dozen milliseconds.\nIf input delay is too long, the controls can feel uncomfortable.\nThis delay is often due to the performance of the hardware and software used, and often out of your control. Turn on performance mode (or turn off power saving mode) on your device, and turn on gaming mode on your monitor/TV (if you have one), may help reducing input delay.",
    },
+    {"Secret Grade",
+        "larger than",
+        "term",
+        "",-- "出自TGM系列的彩蛋玩法。不按照TGM的一般目标去玩，而是去拼图拼出“每行仅有一个洞的大于号”图形（不能是小于号），拼得越多获得的秘密段位越高（没特殊功能，只是好玩），最高目标是完成19行并封顶"..HDwiki,
+        HDsearch.."Secret_Grade_Techniques",
+    },
    {"Cold Clear",
        "cc coldclear ai bot",
        "term",
--- a/parts/language/dict_ja.lua
+++ b/parts/language/dict_ja.lua
@@ -77,130 +77,130 @@ return{
    {"テトリスオンラインサーバー",
        "tetrisonline servers サーバー テトリスオンライン",
        "org",
-        "ポーランドのサーバーにアクセスするには \"Tetris Online Poland\" とGoogleで検索してください.\n地球儀のアイコンからテトリスオンライン研究サーバーの情報にアクセスできます。",
+        "ポーランドのサーバーにアクセスするには \"Tetris Online Poland\" とGoogleで検索してください。\n地球儀のアイコンからテトリスオンライン研究サーバーの情報にアクセスできます。",
        "http://teatube.ltd/tos",
    },
    {"サポート1",
-        "support wechat vx alipay zfb サポート",
+        "support wechat vx alipay zfb サポート 寄付 支援",
        "org",
-        FNNS and "This feature is restricted due to platform policy restrictions. You may discuss about this feature in our Discord server." or "To donate to Techmino via WeChat Pay or Alipay, type \"support\" in console.",
+        FNNS and "この機能はプラットフォームのポリシー制限が原因で使えません。うちらのDiscordサーバーでこの機能に関して話してください。" or "WechatやAlipayでTechminoに寄付する場合、コンソール内で「support」と打ってください。",
    },
-    {"Support 2",
-        "support afdian",
+    {"サポート2",
+        "support afdian サポート 寄付 支援",
        "org",
-        FNNS and "This feature is restricted due to platform policy restrictions. You may discuss about this feature in our Discord server. The URL in this entry is a rickroll, by the way." or "To donate to Techmino via Aifadian, use the globe icon on the bottom right to open URL. Aifadian charges 6% transaction fee off your purchase.",
+        FNNS and "この機能はプラットフォームのポリシー制限が原因で使えません。うちらのDiscordサーバーでこの機能に関して話してください。ちなみに、ここにあるURLはリックくんです。" or "AifadianでTechminoに寄付する場合、 右下の地球儀のアイコンからURLを開いてください。注意としてAifadianは支払いの際に6%の手数料が取られます。",
        FNNS and"https://youtu.be/dQw4w9WgXcQ"or"https://afdian.net/@MrZ_26",
    },
-    {"Support 3",
-        "support p\97\116\114\101\111\110",
+    {"サポート3",
+        "support サポート 寄付 支援 p\97\116\114\101\111\110",
        "org",
-        FNNS and "This feature is restricted due to platform policy restrictions. You may discuss about this feature in our Discord server. The URL in this entry is a rickroll, by the way." or "To donate to Techmino via P\97\116\114\101\111\110, use the globe icon on the bottom right to open URL. P\97\116\114\101\111\110 charges 7.9% + 0.30 USD transaction fee off your purchase that is greater than 3 USD.",
+        FNNS and "この機能はプラットフォームのポリシー制限が原因で使えません。うちらのDiscordサーバーでこの機能に関して話してください。ちなみに、ここにあるURLはリックくんです。" or "P\97\116\114\101\111\110でTechminoに寄付する場合、 右下の地球儀のアイコンからURLを開いてください。注意としてP\97\116\114\101\111\110は支払いの際に7.9%の手数料、さらに3ドル以上の支払いの際に0.30米ドル分の手数料が取られます。",
        FNNS and"https://youtu.be/dQw4w9WgXcQ"or"https://www.p\97\116\114\101\111\110.com/techmino",
    },

    --Games
-    {"TTT",
-        "tetris trainer tres bien",
+    {"テトリス トレーナー トレビアン (TTT)",
+        "tetris trainer tres bien テトリス トレーナー トレビアン",
        "game",
-        "Tetris Trainer Très-Bien. A hands-on tutorial of advanced techniques in modern Tetris.\nRecommended for players that can complete a 40-line Sprint with all Tetris line clears and no hold.\nCovered topics include T-Spin, finesse, SRS, and some battle setups.\nLink in Japanese.",
+        "テトリス トレーナー トレビアン。現代テトリスの複雑な技を実践的に学ぶことができるサイトです。\n40ラインスプリントをホールド無しで全部テトリスでクリアできる人にオススメです。\nT-Spin、効率、SRS、対戦での地形戦略等の項目があります。\n日本語のサイトです。",
        "http://taninkona.web.fc2.com/ttt/",
    },
    {"TTPC",
-        "tetris perfect clear challenge",
+        "tetris perfect clear challenge テトリス パーフェクトクリア パフェ チャレンジ",
        "game",
-        "Tetris Perfect Clear Challenge. The PC opener tutorial for SRS and 7-Bag.\nRecommended for players that have completed TTT. You need to know SRS to play this.\nIncludes only the basic PC opener.\nLink translated to Simplified Chinese; originally in Japanese.",
+        "テトリスパーフェクトクリアチャレンジ。SRSと7-Bagを採用した開幕パーフェクトクリアの学習用サイトです。\nテトリストレーナートレビアンをクリアした人達にオススメです。SRSと言う回転システムを知る必要があります。\n基本的な開幕パーフェクトクリアのテンプレしかありません。\n簡体字に翻訳されており、元の文章は日本語です。",
        "http://teatube.ltd/ttpc",
    },
    {"NAZO",
        "nazo",
        "game",
-        "All sorts of SRS puzzles. Recommended for players that have completed TTT.\nHas T-Spin and all spin puzzles of all difficulties.\nLink translated to Simplified Chinese; originally in Japanese.",
+        "SRSに関して色々なパズルを備えています。テトリストレーナートレビアンをクリアした人達にオススメです。\nT-SpinやAll Spin等の問題を多様の難しさを備えています。\n簡体字に翻訳されており、元の文章は日本語です。",
        "http://teatube.ltd/nazo",
    },

-    {"Side Note 1",
-        "note nb NB DM notice",
+    {"補足1",
+        "note nb NB DM notice 補足 注意",
        "game",
-        "The following contents are some brief introductions about some official and fan-made Tetris games with high popularity. We make absolutely no guarantees that they would cover every Tetris game. Also, the author of this game has made some comments on some of these games. Notice that they are just personal opinions and cannot be used to judge the qualities of these games. To better differentiate between the facts and opinions, all the commentary contents are enclosed with square brackets and are separated from the main contents.",
+        "次からの内容は人気が高い公式とファンテトリスゲームの簡単な説明です。うちらが全てのテトリスゲームをカバーできる保障は絶対にありません。後、このゲームの作者達がいくつかのゲームに対してコメントしています。お察しの通り個人的な意見であり、これらのゲームに対しての評価等には使えません。上手く事実と意見を分ける為、意見文にはカギカッコで囲まれており、更に本文と独立して書かれています。",
    },
    {"King of Stackers",
-        "kos kingofstackers",
+        "kos kingofstackers キングオブスタッカーズ",
        "game",
-        "Browser Game | Multiplayer | Mobile Support\nKoS for short. A turn-based battle Tetris game. In this game, the players can place seven tetrominoes in his or her turn, and garbage lines can enter the field only if the player places a block that does not clear a line. This game requires careful thinking and there are multiple modes with different attack mechanics.",
+        "ブラウザーゲーム | マルチプレイ | 携帯サポートあり\n通称: KoS。ターン制の対戦型テトリスゲームです。このゲームでは、プレイヤーは自身のターンの時に7つのミノを置くことができます、更にもしプレーヤがミノを一つ置いてラインをクリアできなかった場合、フィールドの中にお邪魔が入ってきます。 このゲームではかなりの思考力が求められます、更にそれぞれ別々の火力システムを採用したゲームモードが沢山あります。",
        "https://kingofstackers.com/games.php",
    },
    {"Tetr.js",
        "tetrjs tetr.js",
        "game",
-        "Browser Game | Singleplayer | Mobile Support\nA browser-based Tetris game. It has many professional tunings and many modes, but the visuals are simple and there are barely any animations; besides that, only a few on-screen control schemes are available to mobile.\nLink to Farter's Dig Mod, which itself is a mod of another version. Also has another mod called Tetr.js Enhanced (You can find the link on Tetris Wiki).",
+        "ブラウザーゲーム | シングルプレイ | 携帯サポートあり\nブラウザーベースのテトリスゲームです。様々な高度な設定やゲームモードを要しております、しかしビジュアル面では簡素でアニメーションも殆どありません。それとは別に、モバイルで利用できる画面の操作方法はそれ程多くありません。\nリンク先は他のバージョンを改造・Mod化した「Farter's Dig Mod」です。更に別のMod版「Tetr.js Enhanced」もあります。 (Tetris Wikiにてリンクがあります)。",
        "http://farter.cn/t",
    },
    {"Tetra Legends",
-        "tl tetralegends",
+        "tl tetralegends テトラレジェンズ",
        "game",
-        "Browser Game | Singleplayer | No Mobile Support\nOr TL for short. It has many single-player modes, two hidden rhythm modes, and visualizes many hidden mechanics with rich animations. The development of this game was halted for multiple reasons in December 2020.",
+        "ブラウザーゲーム | シングルプレイ | 携帯サポートなし\n省略として「TL」。沢山のシングルプレイ用のモード、2つの隠し要素のリズムゲーム、更に豪華なアニメーションと一緒に沢山の隠れ絡繰りなどが盛り込まれています。12月の2020年、沢山の不都合によりこのゲームの開発が頓挫しました。",
        "https://tetralegends.app",
    },
    {"Ascension",
-        "asc ASC",
+        "asc ASC アスセンクション",
        "game",
-        "Browser Game | Singleplayer/Multiplayer\nOr ASC for short. It uses its own rotation system (also called ASC) and has many single-player modes. Battle modes are currently under beta testing (15/Dec/2021). The Stack mode in this game was also inspired by Ascension. ",
+        "ブラウザーゲーム | シングルプレイ/マルチプレイ\n省略として「ASC」。独自の回転システム (これの名前も「ASC」) を採用しており更には沢山のシングルプレイ用のモードを兼ね揃えています。12月15日2021年現在、バトルモードは現在の所、Beta開発中であります。Techminoにある「スタックモード」はこのゲームからアイデアを取っています。",
        "https://asc.winternebs.com",
    },
    {"Jstris",
-        "js jstris",
+        "js jstris ジェストリス",
        "game",
-        "Browser Game | Singleplayer/Multiplayer | Mobile Support\nOr JS for short. It has some single-player modes with multiple customizable parameters, Adjustable virtual keys layouts for mobile, but it doesn't have any animation. ",
+        "ブラウザーゲーム | シングルプレイ/マルチプレイ | 携帯サポートあり\n省略として「Js」。いくつかの変数をいじれるシングルプレイ用のゲームモードがいくつかあり、モバイル用のバーチャルキーも設定できますが、アニメーションはありません。",
        "https://jstris.jezevec10.com",
    },
    {"TETR.IO",
-        "io tetrio tetr.io",
+        "io tetrio tetr.io テトリオ",
        "game",
-        "Browser Game | Singleplayer/Multiplayer\nOr IO for short. It has a ranking system and custom game with many adjustable parameters. Also, it provides desktop clients for improved performances and no ads.\n[It seems that Safari cannot open this game.]",
+        "ブラウザーゲーム | シングルプレイ/マルチプレイ\n省略として「IO (イオ)」。 ランキングシステムを備えており、沢山の変数をいじれるカスタムゲームもあります。更にパフォーマンス上昇と広告を消すことができるデスクトップ用のクライアント (ソフトウェア) もあります。\n[どうやらSafariではこのゲームを開けないらしい。]",
        "https://tetr.io",
    },
    {"Nuketris",
-        "nuketris",
+        "nuketris　ヌケトリス　ヌークトリス",
        "game",
-        "*Browser Game | Singleplayer/Multiplayer\nA block stacker game with 1V1 ranked matches and basic single-player modes.",
+        "ブラウザーゲーム | シングルプレイ/マルチプレイ\n1対1のランクマッチと基本的なシングルプレイモードがあるブロック積み上げゲームです。",
        "https://nuketris.herokuapp.com",
    },
    {"Worldwide Combos",
-        "wwc worldwidecombos",
+        "wwc worldwidecombos　ワールドワイドコンボ　連",
        "game",
-        "Browser Game | Singleplayer/Multiplayer\nOr WWC for short. It has worldwide 1V1 ranked matches, recorded battles (which means that your opponent doesn't have to be a real person), many different rulesets, and bomb-handicapped garbage lines.",
+        "ブラウザーゲーム | シングルプレイ/マルチプレイ\n省略として「WWC」。このゲームは1対1のランクマッチ、過去とのバトル（つまり相手が本当の人でなくてもできる）、沢山のルールセット、そしてハンディキャップされた爆弾お邪魔ラインなどがあります。",
        "https://worldwidecombos.com",
    },
    {"Tetris Friends",
-        "tf tetrisfriends notrisfoes",
+        "tf tetrisfriends notrisfoes　テトリスフレンズ　ノートリスフォーズ",
        "game",
-        "Browser Game | Singleplayer/Multiplayer\n or TF for short, a now-defunct official Tetris game. Used to be a popular game but now nobody plays it because the website was shut down. However an unofficial private server known as \"Notris Foes\" still exists and you will need to download desktop client for full experiences.",
+        "ブラウザーゲーム | シングルプレイ/マルチプレイ\n省略として「TF」、営業停止した公式テトリスゲームです。元々このゲーム自体は有名でしたが、ウェブサイトの閉鎖と共に遊べなくなりました。しかし、非公式のプライベートサーバー、通称: \"Notris Foes\"、が未だに存在しており、これを遊ぶにはデスクトップのクライアントをダウンロードする必要があります。",
    },
    {"tetris.com",
-        "tetris online official",
+        "tetris online official　テトリス　オンライン　公式　こうしき　コウシキ",
        "game",
-        "Browser Game | Singleplayer\nThe Tetris game on tetris.com. It only has one mode — marathon, and you can control the game with your mouse.",
+        "ブラウザーゲーム | シングルプレイ\ntetris.comにあるテトリスゲーム。「マラソン」しかモードがなく、マウスでコントロールできるのが特徴。",
    },
    {"Tetris Gems",
-        "tetris online official gem",
+        "tetris online official gem　テトリス　オンライン　公式　こうしき　コウシキ　ジェム",
        "game",
-        "Browser Game | Singleplayer\nAnother Tetris game from tetris.com. It has the gravity mechanism, and each game lasts for 1 minute. There are three kinds of gem blocks with different abilities.",
+        "ブラウザーゲーム | シングルプレイ\ntetris.comにあるテトリスゲーム。重力システムがあり、それぞれのゲームは1分あります。3種類のジェムブロックがあり、それぞれ別の機能があります。",
    },
    {"Tetris Mind Bender",
-        "tetris online official gem",
+        "tetris online official gem　テトリス　オンライン　公式　こうしき　コウシキ　ジェム",
        "game",
-        "Browser Game | Singleplayer\nAnother Tetris game from tetris.com. It introduced \"Mind Bender\" minoes on the basis of marathon mode. Clearing a line with a Mind Bender mino will give you either a good or bad effect.",
+        "ブラウザーゲーム | シングルプレイ\ntetris.comにあるテトリスゲーム. \"Mind Bender\"（マインドベンダー）ミノという機能がマラソンモードを中心にあり。マインドベンダーミノでラインクリアすると良い・悪いのどちらかの効果が発揮します。",
    },

    {"Techmino",
-        "techmino",
+        "techmino　テックミノ",
        "game",
-        "Cross-Platform | Singleplayer/Multiplayer\nOr Tech for short. A block stacker game developed using LÖVE. It has many single-player modes and many customizable parameters, and online multiplayer modes are gradually being developed.",
+        "クロスプラットフォーム | シングルプレイ/マルチプレイ\n通称「テック」。LÖVEという開発ソフトでできたブロック積み上げゲーム。沢山の変数変更可能なシングルプレイモードがたくさんあり、オンライン機能も徐々に開発されています。",
    },
    {"Falling Lightblocks",
-        "fl fallinglightblocks",
+        "fl fallinglightblocks　フォーリング　ライトブロックス",
        "game",
-        "Browser Game/iOS/Android | Singleplayer/Multiplayer\n A cross-platform Tetris game that can be played in portrait and landscape modes. It has fixed DAS and line clear ARE. Has some customizable controls on mobile. Most of the game modes are designed based on NES classic Tetris, but there are some modern-ish modes. Battles are half turn-based, half real-time, and garbage cannot be buffered or canceled.",
+        "ブラウザーゲーム/iOS/アンドロイド | シングルプレイ/マルチプレイ\n A cross-platform Tetris game that can be played in portrait and landscape modes. It has fixed DAS and line clear ARE. Has some customizable controls on mobile. Most of the game modes are designed based on NES classic Tetris, but there are some modern-ish modes. Battles are half turn-based, half real-time, and garbage cannot be buffered or canceled.",
        "https://golfgl.de/lightblocks/",
    },
    {"Cambridge",
@@ -890,6 +890,12 @@ return{
        "term",
        "Any input device takes some time for the input to reach the game. This delay can range from a few milliseconds to a few dozen milliseconds.\nIf input delay is too long, the controls can feel uncomfortable.\nThis delay is often due to the performance of the hardware and software used, and often out of your control. Turn on performance mode (or turn off power saving mode) on your device, and turn on gaming mode on your monitor/TV (if you have one), may help reducing input delay.",
    },
+    {"Secret Grade",
+        "larger than",
+        "term",
+        "",
+        HDsearch.."Secret_Grade_Techniques",
+    },
    {"Cold Clear",
        "cc coldclear ai bot",
        "term",
@@ -1129,7 +1135,7 @@ return{
    {"Amemiya Taiyou",
        "amemiya taiyou",
        "name",
-        "(あめみや　たいよう)\n\nOne of the top players.\nWon champion on a game in Puyo Puyo Tetris's Swap mode.",
+        "(あめみや たいよう)\n\nOne of the top players.\nWon champion on a game in Puyo Puyo Tetris's Swap mode.",
    },
    {"Ajanba",
        "ajb",
--- a/parts/language/dict_zh.lua
+++ b/parts/language/dict_zh.lua
@@ -1,5 +1,5 @@
 local HDsearch="https://harddrop.com/wiki?search="
-local HDwiki="\t更多内容见Hard Drop Wiki。"
+local HDwiki="\n更多内容见Hard Drop Wiki。"
 return{
    {"新人须知",
        "读我 必读 萌新 xinren new noob readme",
@@ -115,7 +115,7 @@ return{
    {"注[1]",
        "备注 notice",
        "game",
-        "以下内容是为部分官方和较高人气同人方块游戏的简介。\n其中可能包含一些只代表个人观点的主观评价，写在方括号里面，请不要根据这些评论直接认定游戏的好坏。",
+        "以下内容是为部分官方和较高人气同人方块游戏的简介。\n其中可能包含一些只代表个人观点的主观评价写在方括号里仅供参考，顺便也请不要因为某个方面有欠缺就直接认为“这个游戏不好”。",
    },
    {"King of Stackers",
        "回合制 网页 手机 kos kingofstackers",
@@ -909,6 +909,12 @@ return{
        "term",
        "用任何设备玩任何游戏时，所有的操作（按键盘，点鼠标等）都会晚一点点（很短，几毫秒到几十毫秒）才到达游戏，如果过长就会很影响游戏手感，作用效果类似于你拿QQ远程控制打FPS游戏\nTOP、TE等游戏比较明显\n这个延迟一般由硬件性能，硬件状态影响，通常来说不可设置，开启性能模式（或者关闭节能模式）可能会好一点。",
    },
+    {"秘密段位",
+        "大于号 secret grade dayuhao",
+        "term",
+        "出自TGM系列的彩蛋玩法。不按照TGM的一般目标去玩，而是去拼图拼出“每行仅有一个洞的大于号”图形（不能是小于号），拼得越多获得的秘密段位越高（没特殊功能，只是好玩），最高目标是完成19行并封顶"..HDwiki,
+        HDsearch.."Secret_Grade_Techniques",
+    },
    {"Cold Clear",
        "机器人 电脑 cc coldclear ai bot jiqiren",
        "term",
@@ -929,31 +935,31 @@ return{
    {"DT炮",
        "dt cannon",
        "setup",
-        "Double-Triple Cannon。\n"..HDwiki,
+        "Double-Triple Cannon。"..HDwiki,
        HDsearch.."dt",
    },
    {"DTPC",
        "dtpc",
        "setup",
-        "DT炮一个能接PC的分支。\n"..HDwiki,
+        "DT炮一个能接PC的分支。"..HDwiki,
        HDsearch.."dt",
    },
    {"BT炮",
        "bt cannon",
        "setup",
-        "β炮（Beta炮）。\n"..HDwiki,
+        "β炮（Beta炮）。"..HDwiki,
        HDsearch.."bt_cannon",
    },
    {"BTPC",
        "btpc",
        "setup",
-        "BT炮一个能接PC的分支。\n"..HDwiki,
+        "BT炮一个能接PC的分支。"..HDwiki,
        HDsearch.."bt_cannon",
    },
    {"DDPC",
        "ddpc",
        "setup",
-        "开局TSD的一个能接Double-Double-PC的分支。\n"..HDwiki,
+        "开局TSD的一个能接Double-Double-PC的分支。"..HDwiki,
        HDsearch.."TKI_3_Perfect_Clear",
    },
    {"QT炮",
@@ -970,7 +976,7 @@ return{
    {"狼月炮",
        "wolfmoon",
        "setup",
-        "狼月炮。\n"..HDwiki,
+        "狼月炮。"..HDwiki,
        HDsearch.."wolfmoon_cannon",
    },
    {"ASC",
@@ -981,19 +987,19 @@ return{
    {"Sewer",
        "sewer",
        "setup",
-        "Sewer开局。\n"..HDwiki,
+        "Sewer开局。"..HDwiki,
        HDsearch.."sewer",
    },
    {"TKI",
        "tki",
        "setup",
-        "TKI开局\n有两种解释，一个是TSD开局，另一个是Cspin开局。\n"..HDwiki,
+        "TKI开局\n有两种解释，一个是TSD开局，另一个是Cspin开局。"..HDwiki,
        HDsearch.."tki",
    },
    {"God Spin",
        "god",
        "setup",
-        "God Spin\nwindkey发明的一个观赏性很强但实战没啥用的炫酷特殊T2+T3开局定式。\n"..HDwiki,
+        "God Spin\nwindkey发明的一个观赏性很强但实战没啥用的炫酷特殊T2+T3开局定式。"..HDwiki,
        HDsearch.."godspin",
    },
    {"信天翁",
@@ -1021,19 +1027,19 @@ return{
    {"Cspin",
        "cspin",
        "pattern",
-        "JL脚对脚立起来形成一个C形，缺口做适当的填充后可以打T3+T2。\n"..HDwiki,
+        "JL脚对脚立起来形成一个C形，缺口做适当的填充后可以打T3+T2。"..HDwiki,
        HDsearch.."c-spin",
    },
    {"STSD",
        "stsd",
        "pattern",
-        "Super T-spin Double\n一种能做两个T2的形状。\n如果垃圾行正好空在STSD正下方会暴毙。\n"..HDwiki,
+        "Super T-spin Double\n一种能做两个T2的形状。\n如果垃圾行正好空在STSD正下方会暴毙。"..HDwiki,
        HDsearch.."stsd",
    },
    {"STMB",
        "stmb",
        "pattern",
-        "STMB cave\n在高空3宽坑架SZ捐一个T2的形状。\n"..HDwiki,
+        "STMB cave\n在高空3宽坑架SZ捐一个T2的形状。"..HDwiki,
        HDsearch.."stmb_cave",
    },
    {"LST堆叠",
@@ -1045,13 +1051,13 @@ return{
    {"汉堡包",
        "hamburger hanbaobao",
        "pattern",
-        "一种边缘捐T不影响消四的堆叠法。\n"..HDwiki,
+        "一种边缘捐T不影响消四的堆叠法。"..HDwiki,
        HDsearch.."hamburger",
    },
    {"皇家十字",
        "皇十 imperial cross huangjiashizi huangshi",
        "pattern",
-        "在一个十字形洞口盖屋檐后可以做两个T2的形状。\n"..HDwiki,
+        "在一个十字形洞口盖屋檐后可以做两个T2的形状。"..HDwiki,
        HDsearch.."imperial_cross",
    },
    {"雨宫炮",
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -764,6 +764,8 @@ return{
        ['sprint_1000l']=   {"Sprint",            "1,000L",      "Clear 1,000 lines!"},
        ['sprintPenta']=    {"Sprint",            "PENTOMINO",  "40L with 18 pentominoes"},
        ['sprintMPH']=      {"Sprint",            "MPH",        "Memoryless\nPreviewless\nHoldless"},
+        ['sprint123']=      {"Sprint",            "M123",       "40L with only monominoes, dominoes, and triminoes"},
+        ['secret_grade']=   {"Secret Grade",      "",           "Build a zig-zag hole formation, following to the guide!"},
        ['dig_10l']=        {"Dig",               "10L",        "Dig 10 garbage lines"},
        ['dig_40l']=        {"Dig",               "40L",        "Dig 40 garbage lines"},
        ['dig_100l']=       {"Dig",               "100L",       "Dig 100 garbage lines"},
@@ -788,11 +790,14 @@ return{
        ['round_h']=        {"Turn-Based",        "HARD",       "Take turns to play against the AI!"},
        ['round_l']=        {"Turn-Based",        "LUNATIC",    "Take turns to play against the AI!"},
        ['round_u']=        {"Turn-Based",        "ULTIMATE",   "Take turns to play against the AI!"},
+        ['big_n']=          {"Big",               "NORMAL",     "Play in a smaller field!"},
+        ['big_h']=          {"Big",               "HARD",       "Play in a smaller field!"},
        ['master_n']=       {"Master",            "NORMAL",     "For 20G beginners"},
        ['master_h']=       {"Master",            "HARD",       "For 20G pros"},
        ['master_m']=       {"Master",            "M21",        "For 20G Masters"},
        ['master_final']=   {"Master",            "FINAL",      "20G and beyond"},
        ['master_ph']=      {"Master",            "PHANTASM",    "???"},
+        ['master_g']=       {"Master",            "GRADED",     "Get the highest grade you can!"},
        ['master_ex']=      {"GrandMaster",       "EXTRA",      "An eternity shorter than an instant"},
        ['master_instinct']={"Master",            "INSTINCT",   "What if the active piece turned invisible?"},
        ['strategy_e']=     {"Strategy",          "EASY",       "Fast 20G decision"},
@@ -807,8 +812,9 @@ return{
        ['blind_l']=        {"Invisible",         "SUDDEN+",    "For professionals"},
        ['blind_u']=        {"Invisible",         "?",          "Are you ready?"},
        ['blind_wtf']=      {"Invisible",         "WTF",        "You're not ready"},
-        ['classic_e']=      {"Classic",           "EASY",       "A very low-speed recreation from the 80s"},
-        ['classic_h']=      {"Classic",           "HARD",       "A medium speed recreation from the 80s"},
+        ['classic_e']=      {"Classic",           "EASY",       "A low-speed recreation from the 80s"},
+        ['classic_h']=      {"Classic",           "HARD",       "A medium-speed recreation from the 80s"},
+        ['classic_l']=      {"Classic",           "LUNATIC",    "A high-speed recreation from the 80s"},
        ['classic_u']=      {"Classic",           "ULTIMATE",   "A very high-speed recreation from the 80s"},
        ['survivor_e']=     {"Survival",          "EASY",       "How long can you survive?"},
        ['survivor_n']=     {"Survival",          "NORMAL",     "How long can you survive?"},
--- a/parts/language/lang_es.lua
+++ b/parts/language/lang_es.lua
@@ -667,8 +667,9 @@ return{
        ['blind_l']=        {"A Ciegas",                "Inmediato+",    "Para profesionales."},
        ['blind_u']=        {"A Ciegas",                 "?",            "¿Estás preparado?"},
        ['blind_wtf']=      {"A Ciegas",                "ELFUF",         "No, no lo estás."},
-        ['classic_e']=      {"Classic",                 "EASY",          "Modo clásico con alta velocidad."},
+        ['classic_e']=      {"Clásico",                 "EASY",          "Modo clásico con alta velocidad."},
        ['classic_h']=      {"Clásico",                 "Difícil",       "Modo clásico con alta velocidad."},
+        ['classic_l']=      {"Clásico",                 "Lunático",      "Modo clásico con alta velocidad."},
        ['classic_u']=      {"Clásico",                 "Supremo",       "Modo clásico con alta velocidad."},
        ['survivor_e']=     {"Supervivencia",           "Fácil",         "¿Cuánto tiempo podrás sobrevivir?"},
        ['survivor_n']=     {"Supervivencia",           "Normal",        "¿Cuánto tiempo podrás sobrevivir?"},
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -768,6 +768,7 @@ return{
        ['blind_wtf']=     {"Aveugle",         "WTF",         "Vous n'êtes pas prêt."},
        ['classic_e']=     {"Classic",         "EASY",        "Un mode classique rapide."},
        ['classic_h']=     {"Classic",         "DIFFICILE",   "Un mode classique rapide."},
+        ['classic_l']=     {"Classic",         "LUNATIQUE",   "Un mode classique rapide."},
        ['classic_u']=     {"Classic",         "ULTIME",      "Un mode classique rapide."},
        ['survivor_e']=    {"Survivor",        "FACILE",      "Pendant combien de temps survivrez-vous ?"},
        ['survivor_n']=    {"Survivor",        "NORMAL",      "Pendant combien de temps survivrez-vous ?"},
--- a/parts/language/lang_id.lua
+++ b/parts/language/lang_id.lua
@@ -27,11 +27,11 @@ return{
    clear={"Single","Double","Triple","Techrash","Pentacrash","Hexacrash","Heptacrash","Octacrash","Nonacrash","Decacrash","Undecacrash","Dodecacrash","Tridecacrash","Tetradecacrash","Pentadecacrash","Hexadecacrash","Heptadecacrash","Octadecacrash","Nonadecacrash","Ultracrash","Impossicrash"},
    cleared="$1 baris",
    mini="Mini",b2b="B2B ",b3b="B2B2B ",
-    PC="PC",HPC="Hampir PC",
+    PC="PC",HPC="Setengah PC",
    replaying="[Diulang]",
    tasUsing="[TAS]",

-    stage="Tahap $1 selesai!",
+    stage="Bagian $1 selesai!",
    great="Bagus!",
    awesome="Luar biasa!",
    almost="Hampir!",
@@ -40,7 +40,7 @@ return{
    speedup="Percepatkan!",
    missionFailed="Salah",

-    speedLV="Kecepatan lvl",
+    speedLV="Kecptn lvl",
    piece="Blok",line="Baris",atk="Baris Terkirim",eff="Efisiensi",
    rpm="RPM",tsd="TSD",
    grade="Nilai",techrash="Techrash",
@@ -56,7 +56,7 @@ return{
    gameover="Tamat",

    pause="Terjeda",
-    pauseCount="Jeda-jeda",
+    pauseCount="Jeda",
    finesse_ap="Semua sempurna",
    finesse_fc="Kombo penuh",

@@ -75,7 +75,7 @@ return{
    loadError_other="'$1' eror memuat: $2",
    loadError_unknown="'$1' eror memuat: alasan tidak diketahui",

-    saveError_duplicate="'$1' eror menyimpan: nama file tergAnda",
+    saveError_duplicate="'$1' eror menyimpan: nama file terganda",
    saveError_encode="'$1' eror menyimpan: gagal menyandi",
    saveError_other="'$1' eror menyimpan: $2",
    saveError_unknown="'$1' eror menyimpan: alasan tidak diketahui",
@@ -85,10 +85,10 @@ return{
    exportSuccess="Ekspor berhasil",
    importSuccess="Impor berhasil",
    dataCorrupted="Data rusak",
-    pasteWrongPlace="Menempel di tempat yang salah?",
+    pasteWrongPlace="Apakah Anda menempelkannya di tempat yang salah?",
    noFile="File tidak ada",

-    nowPlaying="Sekarang mendengarkan:",
+    nowPlaying="Musik:",

    VKTchW="Berat sentuhan",
    VKOrgW="Berat asal",
@@ -151,7 +151,7 @@ return{
        next="BLOK LANJUT\nMengubah jumlah blok lanjut yang ditampilkan.",
        hold="SIMPAN\nMengubah jumlah blok yang bisa disimpan.",
        hideNext="BLOK LANJUT Tersembunyi\nMenyembunyikan beberapa blok lanjut.",
-        infHold="SIMPAN SELAMANYA\nMemungkinkan Anda untuk menyimpan blok-blok selamanya.",
+        infHold="SIMPAN TAK TERBATAS\nMemungkinkan Anda untuk menyimpan blok-blok tidak terbatas.",
        hideBlock="Sembunyikan Blok Aktif\nMenyembunyikan blok yang Anda mengontrol.",
        hideGhost="Sembunyikan Blok Hantu\nMenyembunyikan blok yang menunjukkan tempat blok yang sedang dikontrol akan jatuh.",
        hidden="Sembunyikan Blok Terdarat\nMenyembunyikan blok yang sudah mendarat setelah waktu yang tertentu.",
@@ -180,7 +180,7 @@ return{
        "Diterima:",
        "Jumlah Tindakan Membuat Baris:",
        "Spins:",
-        "B2B/B3B/PC/Hampir PC:",
+        "B2B/B3B/PC/Setengah PC:",
        "Efisiensi Tombol:",
    },
    radar={"BLOK","SERANGAN","SRGN + BLOK","SRGN TERKIRIM","KECEPATAN","GALI"},
@@ -191,12 +191,12 @@ return{
        "Jumlah Waktu Bermain:",
        "Tombol/Putar/Simpan:",
        "Blok/Baris/Serangan:",
-        "Serangan Diterima/Ditolak/Muncul:", -- what is this
+        "Serangan Diterima/Ditolak/Muncul:",
        "Gali/Serangan Gali:",
        "Efisiensi/Efisiensi Gali:",
        "B2B/B2B2B:",
-        "PC/Hampir PC:",
-        "Efisiensi Tombol Tidak Maksimal/Nilai:",
+        "PC/Setengah PC:",
+        "Kesalahan Efisiensi Tombol/Nilai:",
    },
    aboutTexts={
        "Ini hanya penyusun blok *normal*. Sungguh, hanya itu saja.",
@@ -304,8 +304,8 @@ return{
        "huaji2369",
        "Lexitik",
        "Tourahi Anime",
-        "[All other test staff]",
-        "…And You!",
+        "[Semua staf penguji lainnya]",
+        "…Dan Anda!",
    },
    used=[[
    Alat-alat yang digunakan:
@@ -347,7 +347,7 @@ return{
        pause={
            setting="Pengaturan (S)",
            replay="Ulang (P)",
-            save="Simpan Pengulangan (O)",
+            save="Simpan (O)",
            resume="Lanjut (esc)",
            restart="Coba lagi (R)",
            quit="Berhenti (Q)",
@@ -811,6 +811,7 @@ return{
        ['blind_wtf']=      {"Tak Terlihat",      "TERAKHIR",     "Anda belum siap"},
        ['classic_e']=      {"Klasik",            "MUDAH",        "Rekreasi berkecepatan rendah dari tahun 80-an"},
        ['classic_h']=      {"Klasik",            "SULIT",        "Rekreasi berkecepatan medium dari tahun 80-an"},
+        ['classic_l']=      {"Klasik",            "GILA",         "Rekreasi berkecepatan medium-tinggi dari tahun 80-an"},
        ['classic_u']=      {"Klasik",            "TERAKHIR",     "Rekreasi berkecepatan tinggi dari tahun 80-an"},
        ['survivor_e']=     {"Bertahan",          "MUDAH",        "Berapa lama Anda bisa bertahan?"},
        ['survivor_n']=     {"Bertahan",          "NORMAL",       "Berapa lama Anda bisa bertahan?"},
@@ -860,8 +861,8 @@ return{
    },
    getTip={refuseCopy=true,
        "(RUR'U')R'FR2U'R'U'(RUR'F')",
-        "\"Techmino.app\" tidak bisa dibuka karena penciptanya tidak bisa diverifikasi.",
-        "\"Techmino.app\" akan merusak komputer Anda. Anda sebaiknya memindah itu ke tempat sampah.",
+        "\"Techmino.app\" tidak bisa dibuka karena pengembang tidak bisa diverifikasi.",
+        "\"Techmino.app\" akan merusak komputer Anda. Anda harus memindahnya ke tong sampah.",
        "\"TechminOS\"",
        "\\jezevec/\\jezevec/\\jezevec/",
        "\\osk/\\osk/\\osk/",
@@ -918,8 +919,8 @@ return{
        "OHHHHHHHHHHHHHH",
        "Main dengan satu tangan!",
        "Bermain bagus membutuhkan waktu!",
-        "dipersembahkan oleh LÖVE",
-        "dipersembahkan oleh Un..LÖVE",
+        "Dipersembahkan oleh LÖVE",
+        "Dipersembahkan oleh Un..LÖVE",
        "Server kadang tidak berfungsi",
        "Beberapa persyaratan untuk mencapai peringkat X sengaja dibuat sulit bahkan untuk pemain terbaik.",
        "Segera Anda akan dapat bermain melawan teman dan musuh di seluruh dunia.",
--- a/parts/language/lang_ja.lua
+++ b/parts/language/lang_ja.lua
@@ -811,6 +811,7 @@ return{
        ['blind_wtf']=      {"目隠し",                "WTF",           "まだ覚悟が足りないな!"},
        ['classic_e']=      {"クラシック",            "EASY",          "低速クラシック"},
        ['classic_h']=      {"クラシック",            "HARD",          "通常速度クラシック"},
+        ['classic_l']=      {"クラシック",            "LUNATIC",       "中高速度クラシック"},
        ['classic_u']=      {"クラシック",            "ULTIMATE",      "高速クラシック"},
        ['survivor_e']=     {"サバイバル",            "EASY",          "どれだけ生き残れるかな?"},
        ['survivor_n']=     {"サバイバル",            "NORMAL",        "どれだけ生き残れるかな?"},
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -766,7 +766,7 @@ return{
        ['solo_e']=             {"Batalha",          "FÁCIL",        "Derrote a inteligência!"},
        ['solo_n']=             {"Batalha",          "NORMAL",       "Derrote a inteligência!"},
        ['solo_h']=             {"Batalha",          "DIFÍCIL",      "Derrote a inteligência!"},
-        ['solo_l']=             {"Batalha",          "LUNATICO",     "Defeat the AI!"},
+        ['solo_l']=             {"Batalha",          "LUNÁTICO",     "Defeat the AI!"},
        ['solo_u']=             {"Batalha",          "ULTIMATE",     "Defeat the AI!"},
        ['techmino49_e']=       {"Tech 49",          "FÁCIL",        "Batalha de 49 jogadores.\nO último vence"},
        ['techmino49_h']=       {"Tech 49",          "DIFÍCIL",      "Batalha de 49 jogadores.\nO último vence."},
@@ -798,7 +798,8 @@ return{
        ['blind_u']=            {"Cego",              "?",           "Are you ready?"},
        ['blind_wtf']=          {"Cego",             "WTF",          "You're not ready."},
        ['classic_e']=          {"Classic",          "EASY",         "Modo clássico rápido."},
-        ['classic_h']=          {"Classic",          "DIFÍCIL",       "Modo clássico rápido."},
+        ['classic_h']=          {"Classic",          "DIFÍCIL",      "Modo clássico rápido."},
+        ['classic_l']=          {"Classic",          "LUNÁTICO",     "Modo clássico rápido."},
        ['classic_u']=          {"Classic",          "ULTIMATE",     "Modo clássico rápido."},
        ['survivor_e']=         {"Sobrevivente",     "FACIL",        "Por quanto sobrevive?"},
        ['survivor_n']=         {"Sobrevivente",     "NORMAL",       "Por quanto sobrevive?"},
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -762,8 +762,10 @@ return{
        ['sprint_100l']=    {"竞速",        "100L",     "消除100行"},
        ['sprint_400l']=    {"竞速",        "400L",     "消除400行"},
        ['sprint_1000l']=   {"竞速",        "1000L",    "消除1000行"},
+        ['secret_grade']=   {"秘密段位",    "",         "按照提示完成经典的“大于号”拼图"},
        ['sprintPenta']=    {"竞速",        "五连块",     "伤脑筋十八块"},
        ['sprintMPH']=      {"竞速",        "MPH",      "纯随机\n无预览\n无暂存"},
+        ['sprint123']=      {"竞速",        "M123",     "40L，但只有1~3连块"},
        ['dig_10l']=        {"挖掘",        "10L",      "挖掘10行"},
        ['dig_40l']=        {"挖掘",        "40L",      "挖掘40行"},
        ['dig_100l']=       {"挖掘",        "100L",     "挖掘100行"},
@@ -788,13 +790,16 @@ return{
        ['round_h']=        {"回合制",       "困难",      "下棋模式"},
        ['round_l']=        {"回合制",       "疯狂",      "下棋模式"},
        ['round_u']=        {"回合制",       "极限",      "下棋模式"},
+        ['big_n']=          {"大的",         "普通",     "模拟10*5场地的玩法(标准尺寸的一半)"},
+        ['big_h']=          {"大的",         "困难",     "模拟10*5场地的玩法(标准尺寸的一半)"},
        ['master_n']=       {"大师",        "普通",      "20G初心者练习"},
        ['master_h']=       {"大师",        "困难",      "上级者20G挑战"},
        ['master_m']=       {"大师",        "大师",      "大师20G"},
        ['master_final']=   {"大师",        "终点",      "究极20G:无法触及的终点"},
        ['master_ph']=      {"大师",        "虚幻",      "虚幻20G:？？？"},
+        ['master_g']=       {"大师",        "段位考试",    "20G段位考试"},
        ['master_ex']=      {"宗师",        "EX",       "成为方块大师"},
-        ['master_instinct']={"大师",        "本能",      "隐藏当前块"},
+        ['master_instinct']={"大师",        "本能",      "当前块在出现后一小会后会隐形"},
        ['strategy_e']=     {"策略堆叠",     "简单",      "20G堆叠中速决策练习"},
        ['strategy_h']=     {"策略堆叠",     "困难",      "20G堆叠快速决策练习"},
        ['strategy_u']=     {"策略堆叠",     "极限",      "20G堆叠极速决策练习"},
@@ -809,6 +814,7 @@ return{
        ['blind_wtf']=      {"隐形",        "不会吧",     "还没准备好"},
        ['classic_e']=      {"高速经典",     "简单",       "高速经典"},
        ['classic_h']=      {"高速经典",     "困难",       "飞速经典"},
+        ['classic_l']=      {"高速经典",    "疯狂",        "迅捷经典"},
        ['classic_u']=      {"高速经典",     "极限",       "极速经典"},
        ['survivor_e']=     {"生存",        "简单",      "你能存活多久？"},
        ['survivor_n']=     {"生存",        "普通",      "你能存活多久？"},
--- a/parts/language/lang_zh_full.lua
+++ b/parts/language/lang_zh_full.lua
@@ -1,184 +0,0 @@
-return{
-    cmb={nil,"1连击","2连击","3连击","4连击","5连击","6连击","7连击","8连击","9连击","10连击!","11连击!","12连击!","13连击!","14连击!","15连击!","16连击!","17连击!","18连击!","19连击!","巨型连击"},
-    spin="型回旋",
-    clear={"单清","双清","三清","四清","五清","六清","七清","八清","九清","十清","十一清","十二清","十三清","十四清","十五清","十六清","十七清","十八清","十九清","二十清","超二十清"},
-    cleared="",
-    mini="迷你",b2b="满贯",b3b="大满贯",
-    PC="场地全清",HPC="场地半清",
-
-    great="不错!",
-    awesome="精彩。",
-    almost="差一点!",
-    continue="继续。",
-
-    speedLV="速度等级",
-    piece="块数",line="行数",atk="攻击",eff="效率",
-    rpm="收每分",tsd="T2",
-    grade="段位",techrash="消四",
-    wave="波数",nextWave="下一波",
-    combo="连击",maxcmb="最大连击",
-    pc="全清",ko="淘汰",
-
-    finesse_ap="完美极简",
-    finesse_fc="全连击",
-
-    cc_fixed="不能同时开启CC和固定序列",
-    cc_swap="不能同时开启CC和swap的暂存模式",
-    ai_prebag="不能同时开启电脑玩家和含有非四连块的自定义序列",
-    ai_mission="不能同时开启电脑玩家和自定义任务",
-
-    modInstruction="选择你要使用的模组!\n不同的模组会用不同的方式改变游戏规则，来开发新玩法挑战自我吧!\n提醒:开启一些模组会让成绩无效  你可以用键盘开关模组，按tab重置",
-    modInfo={
-        next="预览数量:\n强制使用预览的个数",
-        hold="暂存数量:\n强制使用暂存的个数",
-        hideNext="隐藏预览:\n隐藏前几个预览",
-        infHold="无限暂存:\n可以无限制使用暂存",
-        forceB2B="强制满贯:\n满贯点数条掉到启动线以下就会结束游戏",
-    },
-    pauseStat={
-        "时间:",
-        "按键/旋转/暂存:",
-        "落块:",
-        "消行/挖掘:",
-        "攻击/挖掘攻击:",
-        "上涨/接收/抵消:",
-        "消除:",
-        "回旋:",
-        "(大)满贯/全(半)清:",
-        "非极简操作:",
-    },
-    radar={"防","守","攻","送","速","挖"},
-    radarData={"防/分","守/分","攻/分","送/分","行/分","挖/分"},
-    WidgetText={
-        mode={
-            mod="模组(F1)",
-        },
-        mod={
-            title="模组",
-        },
-        net_newRoom={
-            ospin="O旋",
-            holdMode="暂存模式",
-            nextCount="预览个数",
-            holdCount="暂存个数",
-            infHold="无限暂存",
-            phyHold="物理暂存",
-        },
-        setting_control={
-            das="首次移动延迟",arr="移动重复延迟",
-            sddas="首次软降延迟",sdarr="软降重复延迟",
-            ihs="提前暂存",
-        },
-        customGame={
-            mod="模组(F1)",
-
-            ospin="O旋",
-            holdMode="暂存模式",
-            nextCount="预览个数",
-            holdCount="暂存个数",
-            infHold="无限暂存",
-            phyHold="物理暂存",
-        },
-    },
-    modes={
-        ['sprint_10l']=     {"竞速",        "10行",      "消除10行"},
-        ['sprint_20l']=     {"竞速",        "20行",      "消除20行"},
-        ['sprint_40l']=     {"竞速",        "40行",      "消除40行"},
-        ['sprint_100l']=    {"竞速",        "100行",     "消除100行"},
-        ['sprint_400l']=    {"竞速",        "400行",     "消除400行"},
-        ['sprint_1000l']=   {"竞速",        "1000行",    "消除1000行"},
-        ['sprintPenta']=    {"竞速",        "五连块",     "伤脑筋十八块"},
-        ['sprintMPH']=      {"竞速",        "纯净",      "纯随机\n无预览\n无暂存"},
-        ['dig_10l']=        {"挖掘",        "10L",      "挖掘10行"},
-        ['dig_40l']=        {"挖掘",        "40L",      "挖掘40行"},
-        ['dig_100l']=       {"挖掘",        "100L",     "挖掘100行"},
-        ['dig_400l']=       {"挖掘",        "400L",     "挖掘400行"},
-        ['drought_n']=      {"干旱",        "100行",     "你I没了"},
-        ['drought_l']=      {"干旱+",       "100行",     "后 妈 发 牌"},
-        ['marathon_n']=     {"马拉松",       "普通",      "200行加速马拉松"},
-        ['marathon_h']=     {"马拉松",       "困难",      "200行高速马拉松"},
-        ['solo_e']=         {"单挑",        "简单",      "打败机器人"},
-        ['solo_n']=         {"单挑",        "普通",      "打败机器人"},
-        ['solo_h']=         {"单挑",        "困难",      "打败机器人"},
-        ['solo_l']=         {"单挑",        "疯狂",      "打败机器人"},
-        ['solo_u']=         {"单挑",        "极限",      "打败机器人"},
-        ['techmino49_e']=   {"49人混战",     "简单",      "49人混战，活到最后"},
-        ['techmino49_h']=   {"49人混战",     "困难",      "49人混战，活到最后"},
-        ['techmino49_u']=   {"49人混战",     "极限",      "49人混战，活到最后"},
-        ['techmino99_e']=   {"99人混战",     "简单",      "99人混战，活到最后"},
-        ['techmino99_h']=   {"99人混战",     "困难",      "99人混战，活到最后"},
-        ['techmino99_u']=   {"99人混战",     "极限",      "99人混战，活到最后"},
-        ['round_e']=        {"回合制",       "简单",      "下棋模式"},
-        ['round_n']=        {"回合制",       "普通",      "下棋模式"},
-        ['round_h']=        {"回合制",       "困难",      "下棋模式"},
-        ['round_l']=        {"回合制",       "疯狂",      "下棋模式"},
-        ['round_u']=        {"回合制",       "极限",      "下棋模式"},
-        ['master_n']=       {"大师",        "普通",      "20G初心者练习"},
-        ['master_h']=       {"大师",        "困难",      "上级者20G挑战"},
-        ['master_m']=       {"大师",        "大师",      "大师20G"},
-        ['master_final']=   {"大师",        "终点",      "究极20G:无法触及的终点"},
-        ['master_ph']=      {"大师",        "虚幻",      "虚幻20G:???"},
-        ['master_ex']=      {"宗师",        "EX",       "成为方块大师"},
-        ['master_instinct']={"大师",        "本能",      "隐藏当前块"},
-        ['strategy_e']=     {"策略堆叠",     "简单",      "20G堆叠中速决策练习"},
-        ['strategy_h']=     {"策略堆叠",     "困难",      "20G堆叠快速决策练习"},
-        ['strategy_u']=     {"策略堆叠",     "极限",      "20G堆叠极速决策练习"},
-        ['strategy_e_plus']={"策略堆叠",     "简单+",     "20G堆叠中速决策练习"},
-        ['strategy_h_plus']={"策略堆叠",     "困难+",     "20G堆叠快速决策练习"},
-        ['strategy_u_plus']={"策略堆叠",     "极限+",     "20G堆叠极速决策练习"},
-        ['blind_e']=        {"隐形",        "半隐",      "不强大脑"},
-        ['blind_n']=        {"隐形",        "全隐",      "挺强大脑"},
-        ['blind_h']=        {"隐形",        "瞬隐",      "很强大脑"},
-        ['blind_l']=        {"隐形",        "瞬隐+",     "超强大脑"},
-        ['blind_u']=        {"隐形",        "啊这",      "你准备好了吗"},
-        ['blind_wtf']=      {"隐形",        "不会吧",     "还没准备好"},
-        ['classic_e']=      {"高速经典",     "简单",       "高速经典"},
-        ['classic_h']=      {"高速经典",     "困难",       "飞速经典"},
-        ['classic_u']=      {"高速经典",     "极限",       "极速经典"},
-        ['survivor_e']=     {"生存",        "简单",      "你能存活多久?"},
-        ['survivor_n']=     {"生存",        "普通",      "你能存活多久?"},
-        ['survivor_h']=     {"生存",        "困难",      "你能存活多久?"},
-        ['survivor_l']=     {"生存",        "疯狂",      "你能存活多久?"},
-        ['survivor_u']=     {"生存",        "极限",      "你能存活多久?"},
-        ['attacker_h']=     {"进攻",        "困难",      "进攻练习"},
-        ['attacker_u']=     {"进攻",        "极限",      "进攻练习"},
-        ['defender_n']=     {"防守",        "普通",      "防守练习"},
-        ['defender_l']=     {"防守",        "疯狂",      "防守练习"},
-        ['dig_h']=          {"挖掘",        "困难",      "挖掘练习"},
-        ['dig_u']=          {"挖掘",        "极限",      "挖掘练习"},
-        ['clearRush']=      {"清版竞速",      "普通",      "所有块的回旋入门\n还没做好"},
-        ['c4wtrain_n']=     {"中四宽练习",    "普通",      "无 限 连 击"},
-        ['c4wtrain_l']=     {"中四宽练习",    "疯狂",      "无 限 连 击"},
-        ['pctrain_n']=      {"全清训练",     "普通",      "简易全清题库，熟悉全清定式的组合"},
-        ['pctrain_l']=      {"全清训练",     "疯狂",      "困难全清题库，强算力者进"},
-        ['pc_n']=           {"全清挑战",     "普通",      "100行内刷全清"},
-        ['pc_h']=           {"全清挑战",     "困难",      "100行内刷全清"},
-        ['pc_l']=           {"全清挑战",     "疯狂",      "100行内刷全清"},
-        ['pc_inf']=         {"无尽全清挑战",   "",        "你能连续做多少全清?"},
-        ['tech_n']=         {"科研",        "普通",      "禁止断满贯"},
-        ['tech_n_plus']=    {"科研",        "普通+",     "仅允许回旋与全清"},
-        ['tech_h']=         {"科研",        "困难",      "禁止断满贯"},
-        ['tech_h_plus']=    {"科研",        "困难+",     "仅允许回旋与全清"},
-        ['tech_l']=         {"科研",        "疯狂",      "禁止断满贯"},
-        ['tech_l_plus']=    {"科研",        "疯狂+",     "仅允许回旋与全清"},
-        ['tech_finesse']=   {"科研",        "极简",      "强制最简操作"},
-        ['tech_finesse_f']= {"科研",        "极简+",     "禁止普通消除，强制最简操作"},
-        ['tsd_e']=          {"T2挑战",      "简单",      "你能连续做几个T旋双清?"},
-        ['tsd_h']=          {"T2挑战",      "困难",      "你能连续做几个T旋双清?"},
-        ['tsd_u']=          {"T2挑战",      "极限",      "你能连续做几个T旋双清?"},
-        ['backfire_n']=     {"自攻自防",     "普通",      "打出100攻击"},
-        ['backfire_h']=     {"自攻自防",     "困难",      "打出100攻击"},
-        ['backfire_l']=     {"自攻自防",     "疯狂",      "打出100攻击"},
-        ['backfire_u']=     {"自攻自防",     "极限",      "打出100攻击"},
-        ['sprintAtk']=      {"竞速",        "100攻击",   "打出100攻击"},
-        ['sprintEff']=      {"竞速",        "效率",      "40行内打出更高的攻击"},
-        ['zen']=            {"禅",         "200",      "不限时200行"},
-        ['ultra']=          {"限时打分",     "挑战",      "在两分钟内尽可能拿到最多的分数"},
-        ['infinite']=       {"无尽",        "",         "沙盒"},
-        ['infinite_dig']=   {"无尽:挖掘",    "",         "挖呀挖呀挖"},
-        ['marathon_inf']=   {"马拉松",      "无尽",       "无尽马拉松"},
-
-        ['custom_clear']=   {"自定义",       "普通"},
-        ['custom_puzzle']=  {"自定义",       "拼图"},
-    },
-}
--- a/parts/modes.lua
+++ b/parts/modes.lua
@@ -1,13 +1,16 @@
 return{
    {name='sprint_10l',    x=0,         y=0,        size=40,shape=1,icon="sprint1",     unlock={'sprint_20l','sprint_40l'}},
    {name='sprint_20l',    x=-200,      y=200,      size=50,shape=1,icon="sprint1"},
-    {name='sprint_40l',    x=0,         y=-300,     size=40,shape=1,icon="sprint2",     unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH'}},
+    {name='sprint_40l',    x=0,         y=-300,     size=40,shape=1,icon="sprint2",     unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH','sprint123','secret_grade'}},
    {name='sprint_100l',   x=-200,      y=0,        size=50,shape=1,icon="sprint2",     unlock={'sprint_400l','drought_n'}},
    {name='sprint_400l',   x=-400,      y=0,        size=40,shape=1,icon="sprint3",     unlock={'sprint_1000l'}},
    {name='sprint_1000l',  x=-600,      y=0,        size=40,shape=1,icon="sprint3"},

-    {name='sprintPenta',   x=180,       y=-160,     size=40,shape=3,icon="sprint2"},
-    {name='sprintMPH',     x=220,       y=-340,     size=40,shape=3,icon="sprint2"},
+    {name='sprintPenta',   x=180,       y=-160,     size=40,shape=3,icon="sprint_pento"},
+    {name='sprintMPH',     x=220,       y=-300,     size=40,shape=3,icon="sprint2"},
+    {name='sprint123',     x=180,       y=-440,     size=40,shape=1,icon="sprint_tri"},
+    
+    {name='secret_grade',  x=-200,      y=-400,     size=40,shape=1,icon="secret_grade"},

    {name='drought_n',     x=-400,      y=200,      size=40,shape=1,icon="drought",     unlock={'drought_l'}},
    {name='drought_l',     x=-600,      y=200,      size=40,shape=1,icon="drought"},
@@ -17,7 +20,7 @@ return{
    {name='dig_100l',      x=-600,      y=-200,     size=40,shape=1,icon="dig_sprint",  unlock={'dig_400l'}},
    {name='dig_400l',      x=-800,      y=-200,     size=40,shape=1,icon="dig_sprint"},

-    {name='marathon_n',    x=0,         y=-600,     size=60,shape=1,icon="marathon",    unlock={'marathon_h','solo_e','round_e','blind_e','classic_e','survivor_e','clearRush','zen'}},
+    {name='marathon_n',    x=0,         y=-600,     size=60,shape=1,icon="marathon",    unlock={'marathon_h','solo_e','round_e','big_n','blind_e','classic_e','survivor_e','clearRush','zen'}},
    {name='marathon_h',    x=0,         y=-800,     size=50,shape=1,icon="marathon",    unlock={'master_n','strategy_e'}},

    {name='solo_e',        x=-600,      y=-1000,    size=40,shape=1,icon="solo",        unlock={'solo_n'}},
@@ -39,42 +42,48 @@ return{
    {name='round_l',       x=-1200,     y=-800,     size=40,shape=1,icon="round",       unlock={'round_u'}},
    {name='round_u',       x=-1400,     y=-800,     size=40,shape=1,icon="round"},

+    {name='big_n',         x=-400,      y=-400,     size=40,shape=1,icon="big",         unlock={'big_h'}},
+    {name='big_h',         x=-600,      y=-400,     size=40,shape=1,icon="big",},
+
    {name='master_n',      x=0,         y=-1000,    size=40,shape=1,icon="master",      unlock={'master_h','strategy_h'}},
-    {name='master_h',      x=0,         y=-1200,    size=40,shape=3,icon="master",      unlock={'master_final','master_ex','master_ph','master_m','strategy_u'}},
-    {name='master_m',      x=150,       y=-1320,    size=30,shape=3,icon="master"},
-    {name='master_final',  x=0,         y=-1600,    size=40,shape=2,icon="master"},
-    {name='master_ph',     x=-150,      y=-1500,    size=40,shape=2,icon="master"},
-    {name='master_ex',     x=150,       y=-1500,    size=40,shape=2,icon="master_ex"},
+    {name='master_h',      x=0,         y=-1200,    size=40,shape=3,icon="master",      unlock={'master_final','master_ex','master_ph','master_m','master_g','strategy_u'}},
+    {name='master_m',      x=100,       y=-1550,    size=40,shape=2,icon="master"},
+    {name='master_final',  x=-100,      y=-1550,    size=40,shape=2,icon="master"},
+    {name='master_ph',     x=-170,      y=-1450,    size=40,shape=2,icon="master"},
+    {name='master_g',      x=0,         y=-1600,    size=40,shape=3,icon="master"},
+    {name='master_ex',     x=170,       y=-1450,    size=40,shape=2,icon="master_ex"},

    {name='strategy_e',    x=-150,      y=-1030,    size=40,shape=3,icon="master"},
    {name='strategy_h',    x=-200,      y=-1160,    size=35,shape=3,icon="master"},
    {name='strategy_u',    x=-250,      y=-1290,    size=30,shape=2,icon="master"},

-    {name='blind_e',       x=150,       y=-700,     size=40,shape=1,icon="hidden",      unlock={'blind_n'}},
+    {name='blind_e',       x=150,       y=-700,     size=40,shape=1,icon="hidden",      unlock={'blind_n','master_instinct'}},
    {name='blind_n',       x=150,       y=-800,     size=40,shape=1,icon="hidden",      unlock={'blind_h'}},
    {name='blind_h',       x=150,       y=-900,     size=35,shape=1,icon="hidden",      unlock={'blind_l'}},
    {name='blind_l',       x=150,       y=-1000,    size=35,shape=3,icon="hidden2",      unlock={'blind_u'}},
    {name='blind_u',       x=150,       y=-1100,    size=30,shape=3,icon="hidden2",      unlock={'blind_wtf'}},
    {name='blind_wtf',     x=150,       y=-1200,    size=25,shape=2,icon="hidden2"},
+    {name='master_instinct',x=285,      y=-835,     size=40,shape=3,icon="hidden"},

    {name='classic_e',     x=-200,      y=-850,     size=40,shape=1,icon="classic",     unlock={'classic_h'}},
-    {name='classic_h',     x=-300,      y=-950,    size=35,shape=2,icon="classic",     unlock={'classic_u'}},
-    {name='classic_u',     x=-400,      y=-1050,    size=30,shape=2,icon="classic"},
+    {name='classic_h',     x=-300,      y=-950,     size=40,shape=3,icon="classic",     unlock={'classic_l'}},
+    {name='classic_l',     x=-400,      y=-1050,    size=35,shape=3,icon="classic",     unlock={'classic_u'}},
+    {name='classic_u',     x=-500,      y=-1150,    size=30,shape=2,icon="classic"},

-    {name='survivor_e',    x=300,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_n'}},
-    {name='survivor_n',    x=500,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_h','attacker_h','defender_n','dig_h'}},
-    {name='survivor_h',    x=700,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_l'}},
-    {name='survivor_l',    x=900,       y=-600,     size=40,shape=3,icon="survivor",    unlock={'survivor_u'}},
-    {name='survivor_u',    x=1100,      y=-600,     size=40,shape=2,icon="survivor"},
+    {name='survivor_e',    x=450,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_n'}},
+    {name='survivor_n',    x=650,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_h','attacker_h','defender_n','dig_h'}},
+    {name='survivor_h',    x=850,       y=-600,     size=40,shape=1,icon="survivor",    unlock={'survivor_l'}},
+    {name='survivor_l',    x=1050,       y=-600,     size=40,shape=3,icon="survivor",    unlock={'survivor_u'}},
+    {name='survivor_u',    x=1250,      y=-600,     size=40,shape=2,icon="survivor"},

-    {name='attacker_h',    x=300,       y=-800,     size=40,shape=1,icon="attack",      unlock={'attacker_u'}},
-    {name='attacker_u',    x=300,       y=-1000,    size=40,shape=1,icon="attack"},
+    {name='attacker_h',    x=450,       y=-800,     size=40,shape=1,icon="attack",      unlock={'attacker_u'}},
+    {name='attacker_u',    x=450,       y=-1000,    size=40,shape=1,icon="attack"},

-    {name='defender_n',    x=500,       y=-800,     size=40,shape=1,icon="defend",      unlock={'defender_l'}},
-    {name='defender_l',    x=500,       y=-1000,    size=40,shape=1,icon="defend"},
+    {name='defender_n',    x=650,       y=-800,     size=40,shape=1,icon="defend",      unlock={'defender_l'}},
+    {name='defender_l',    x=650,       y=-1000,    size=40,shape=1,icon="defend"},

-    {name='dig_h',         x=700,       y=-800,     size=40,shape=1,icon="dig",         unlock={'dig_u'}},
-    {name='dig_u',         x=700,       y=-1000,    size=40,shape=1,icon="dig"},
+    {name='dig_h',         x=850,       y=-800,     size=40,shape=1,icon="dig",         unlock={'dig_u'}},
+    {name='dig_u',         x=850,       y=-1000,    size=40,shape=1,icon="dig"},

    {name='clearRush',       x=400,       y=-400,     size=50,shape=1,icon="bigbang",   unlock={'c4wtrain_n','pctrain_n','sprintAtk'}},
    {name='c4wtrain_n',    x=700,       y=-400,     size=40,shape=1,icon="pc",          unlock={'c4wtrain_l'}},
--- a/parts/modes/big_h.lua
+++ b/parts/modes/big_h.lua
@@ -7,16 +7,16 @@ return{
        eventSet='big_h',
        bg='cubes',bgm='push',
    },
-    score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
-    scoreDisp=function(D)return D[1].." Combo   "..STRING.time(D[2])end,
+    score=function(P)return{P.stat.row,P.stat.time}end,
+    scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
    comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
    getRank=function(P)
        local L=P.stat.row
        if L>=200 then
            local T=P.stat.time
            return
-            T<=160 and 5 or
-            T<=280 and 4 or
+            T<=120 and 5 or
+            T<=180 and 4 or
            3
        else
            return
--- a/parts/modes/big_n.lua
+++ b/parts/modes/big_n.lua
@@ -7,16 +7,16 @@ return{
        eventSet='big_n',
        bg='bg2',bgm='push',
    },
-    score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,
-    scoreDisp=function(D)return D[1].." Combo   "..STRING.time(D[2])end,
+    score=function(P)return{P.stat.row,P.stat.time}end,
+    scoreDisp=function(D)return D[1].." Lines   "..STRING.time(D[2])end,
    comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
    getRank=function(P)
        local L=P.stat.row
        if L>=200 then
            local T=P.stat.time
            return
-            T<=180 and 5 or
-            T<=300 and 4 or
+            T<=120 and 5 or
+            T<=180 and 4 or
            3
        else
            return
--- a/parts/modes/master_g.lua
+++ b/parts/modes/master_g.lua
@@ -1,3 +1,11 @@
+
+local gradeList={
+    "Grade 9","Grade 8","Grade 7","Grade 6","Grade 5","Grade 4","Grade 3","Grade 2","Grade 1",
+    "S1","S2","S3","S4","S5","S6","S7","S8","S9",
+    "m1","m2","m3","m4","m5","m6","m7","m8","m9",
+    "M","MK","MV","MO","MM-","MM","MM+","GM-","GM","GM+","TM-","TM","TM+"
+}
+
 return{
    env={
        freshLimit=15,
@@ -7,14 +15,8 @@ return{
        bg='bg2',bgm='secret7th',
    },
    slowMark=true,
-    score=function(P)
-        if not tonumber(P.modeData.grade) then
-            return{P.modeData.grade,P.stat.time}
-        else
-            return{"Grade "..tostring(P.modeData.grade),P.stat.time}
-        end
-    end,
-    scoreDisp=function(D) return D[1].."   "..STRING.time(D[2])end,
+    score=function(P) return {P.modeData.gradePts,P.stat.time} end,
+    scoreDisp=function(D) return gradeList[D[1]].."   "..STRING.time(D[2])end,
    comp=function(a,b)return a[1]>b[1]or(a[1]==b[1]and a[2]<b[2])end,
    getRank=function(P)
        local G=P.modeData.gradePts
--- a/parts/modes/secret_grade.lua
+++ b/parts/modes/secret_grade.lua
@@ -0,0 +1,23 @@
+local ranks={"Grade 10","Grade 9","Grade 8","Grade 7","Grade 6","Grade 5","Grade 4","Grade 3","Grade 2","Grade 1","S1","S2","S3","S4","S5","S6","S7","S8","S9","GM","GM+","TM","TM+","TM+₂","TM+₃", "TM+₄","TM+₅"}
+-- index:         1         2          3        4         5          6         7        8         9         10     11   12   13   14   15   16   17   18   19   20   21    22   23     24     25      26     27
+return{
+    env={
+        drop=180,lock=180,
+        hang=15,
+        eventSet='secret_grade',
+        bg='bg2',bgm='race',
+    },
+    score=function(P)return{P.modeData.rankPts,P.stat.piece}end,
+    scoreDisp=function(D)return ranks[D[1]].."   "..D[2].." Pieces"end,
+    comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]<b[2]end,
+    getRank=function(P)
+        local G=P.modeData.rankPts
+        return
+        G>=23 and 5 or
+        G>=21 and 4 or
+        G>=19 and 3 or
+        G>=15 and 2 or
+        G>=11 and 1 or
+        G>=7 and 0
+    end,
+}
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -176,14 +176,13 @@ function Player:createSplashFX(h)
    end
 end
 function Player:createBeam(R,send)
-    if self.gameEnv.atkFX then
+    if self.gameEnv.atkFX and self.cur then
+        local C=self.cur
        local power=self.gameEnv.atkFX
-        local color=self.cur.color
        local x1,y1,x2,y2
        if self.miniMode then
            x1,y1=self.centerX,self.centerY
        else
-            local C=self.cur
            local sc=C.RS.centerPos[C.id][C.dir]
            x1=self.x+(30*(self.curX+sc[2])-30+15+150)*self.size
            y1=self.y+(600-30*(self.curY+sc[1])+15+self.fieldUp+self.fieldBeneath)*self.size
@@ -192,7 +191,7 @@ function Player:createBeam(R,send)
        else x2,y2=R.x+308*R.size,R.y+450*R.size
        end

-        local c=BLOCK_COLORS[color]
+        local c=BLOCK_COLORS[C.color]
        local r,g,b=c[1]*2,c[2]*2,c[3]*2
        local a=(power+2)*.0626
        if self.type~='human'and R.type~='human'then a=a*.2 end
@@ -1237,7 +1236,7 @@ function Player:hold_norm(ifpre)
        local C,H=self.cur,self.holdQueue[1]
        self.ctrlCount=0

-        if ENV.phyHold and C and not ifpre then--Physical hold
+        if ENV.phyHold and C and H and not ifpre then--Physical hold
            local x,y=self.curX,self.curY
            x=x+(#C.bk[1]-#H.bk[1])*.5
            y=y+(#C.bk-#H.bk)*.5
--- a/parts/scenes/app_mahjong.lua
+++ b/parts/scenes/app_mahjong.lua
@@ -42,7 +42,7 @@ local cardText={
    p7={COLOR.D,CHAR.mahjong.p7Base,COLOR.R,CHAR.mahjong.p7Comb},
    p8={COLOR.D,CHAR.mahjong.p8},
    p9={COLOR.D,CHAR.mahjong.p9Base,COLOR.R,CHAR.mahjong.p9Comb1,COLOR.D,CHAR.mahjong.p9Comb2},
-    s1={COLOR.G,CHAR.mahjong.s1Base,COLOR.R,CHAR.mahjong.s1Comb},
+    s1={COLOR.D,CHAR.mahjong.s1jBase,COLOR.G,CHAR.mahjong.s1jComb},
    s2={COLOR.G,CHAR.mahjong.s2},
    s3={COLOR.G,CHAR.mahjong.s3},
    s4={COLOR.G,CHAR.mahjong.s4},
--- a/parts/scenes/lang.lua
+++ b/parts/scenes/lang.lua
@@ -1,6 +1,5 @@
 local langList={
    zh="简体中文",
-    zh_full="全简体中文",
    zh_trad="繁體中文",
    en="English",
    fr="Français",
@@ -61,8 +60,8 @@ scene.widgetList={
    WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='L',sound='click',code=function()_setLang('zh_grass')end},

    WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh,      color='C',sound='click',code=function()_setLang('zh')end},
-    WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='N',sound='click',code=function()_setLang('zh_full')end},
-    WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end},
+    WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end},
+    -- WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end},

    WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,sound='back',font=60,fText=CHAR.icon.back,code=backScene},
 }
--- a/parts/scenes/setting_video.lua
+++ b/parts/scenes/setting_video.lua
@@ -98,7 +98,7 @@ scene.widgetList={
        },
    WIDGET.newSlider{name='bgAlpha',      x=1020,y=1430,w=200,
        axis={0,.8},disp=SETval('bgAlpha'),
-        code=function(v)SETTING.bgAlpha=v BG.send(v)end,
+        code=function(v)SETTING.bgAlpha=v BG.send(v,v,v)end,
        hideF=function()return SETTING.bg=='on'end
        },

--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -4,17 +4,22 @@ return[=[

 0.17.2: 0.17.2
        新增:
+                把一些模式加入到大地图上(by NOT_A_ROBOT) #640
        改动:
-                大幅下调高难机器人速度
+                大幅下调高级机器人速度
                master_g模式不再限定旋转系统
                完善当前的攻击系统,进入稳定状态
                更新说明书的攻击系统章节
                麻将小程序更像麻将
                算数小程序微调
                加回classic_l模式
+                移除"全简体中文"语言
        代码:
                完善字体并换用OTF
        修复:
+                特定情况下物理hold报错
+                特定情况下联网对战报错
+                关闭背景时设置背景亮度报错
                倒计时时不能充das #610
                几个音效的音量不太对 #572
                master_g模式的一些细节问题
--- a/version.lua
+++ b/version.lua
@@ -1,7 +1,7 @@
 return{
-    ["apkCode"]=432,
+    ["apkCode"]=433,
    ["code"]=1702,
    ["string"]="V0.17.2",
-    ["room"]="ver A-6",
+    ["room"]="ver A-7",
    ["name"]="0.17.2",
 }
Author	SHA1	Message	Date
MrZ_26	f4e0cabcf3	版本推进	2022-02-06 18:37:01 +08:00
MrZ_26	3b60590f8a	删除”全简体中文“语言	2022-02-06 18:30:09 +08:00
MrZ_26	96a695819e	修复关闭背景时设置背景亮度报错	2022-02-06 18:07:33 +08:00
MrZ_26	0a11d2cf47	暴力修复联网对战时不知道怎么触发的一个错误，能用，不懂，不理解，but it works，等重构	2022-02-06 18:07:30 +08:00
NOT_A_ROBOT	f932005ea0	Add some hidden modes + misc changes (#640 ) * Added secret_grade and sprint123 to map and added some icons * Add master_g to map * add classic_u and master_instinct and misc changes * added big modes * Fix some bugs on master_instinct * fix bugs on big mode * Simplified Grade Display	2022-02-06 17:51:38 +08:00
MrZ_26	fedce2ae2b	更新char与mj小程序里1s的显示	2022-01-30 14:20:28 +08:00
MrZ_26	85cf77f15d	更新字体文件 Co-authored-by: C₂₉H₂₅N₃O₅ <cgu52@wisc.edu>	2022-01-30 14:20:28 +08:00
MrZ_26	fa3d7ff199	暴力修复物理hold可能导致的一个错误，能用，不懂，不理解，but it works，等重构	2022-01-30 14:20:27 +08:00
Airun	1da6c0c8a9	More Translations (Before I pull off the official version) (#633 )	2022-01-30 14:18:42 +08:00
NOT_A_ROBOT	83349707d5	Add secret grade mode (#631 )	2022-01-28 20:19:45 +08:00
NOT_A_ROBOT	d4090dea6f	Update lang_id.lua (#629 )	2022-01-28 20:19:02 +08:00
MrZ_26	ea83add8fa	词典添加secret grade词条 close #628 微调中文词典部分格式	2022-01-26 15:23:54 +08:00