From 889470180699a5f902c6d3b20f53f831a2cbafca Mon Sep 17 00:00:00 2001
From: MrZ_26 <1046101471@qq.com>
Date: Tue, 10 Oct 2023 14:41:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E5=8F=82=E6=95=B0=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=8F=AF=E9=80=89=E5=80=BC=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=80=E4=BA=9B=E6=96=87=E6=9C=AC=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/language/lang_en.lua      |  8 ++++----
 parts/language/lang_es.lua      |  4 ++--
 parts/language/lang_fr.lua      |  6 +++---
 parts/language/lang_id.lua      |  4 ++--
 parts/language/lang_ja.lua      |  2 +-
 parts/language/lang_pt.lua      |  8 ++++----
 parts/language/lang_symbol.lua  |  4 ++--
 parts/language/lang_vi.lua      |  8 ++++----
 parts/language/lang_zh.lua      |  4 ++--
 parts/language/lang_zh_trad.lua |  4 ++--
 parts/scenes/customGame.lua     | 14 +++++++-------
 parts/scenes/net_newRoom.lua    |  2 +-
 12 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua
index a78878b8..052837b9 100644
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -500,7 +500,7 @@ C. Gamepad
             capacity="Capacity",
             create="Create",
 
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="No B2B Breaks",
             lockout="Fail on Lock Out",
@@ -508,7 +508,7 @@ C. Gamepad
             deepDrop="Deep Drop",
             bone="Bone Blocks",
 
-            eventSet="Rule Set",
+            eventSet="Ruleset",
 
             holdMode="Hold Mode",
             nextCount="Next",
@@ -700,7 +700,7 @@ C. Gamepad
             sequence="Edit Sequences (S)",
             mission="Edit Missions (M)",
 
-            eventSet="Rule Set",
+            eventSet="Ruleset",
 
             holdMode="Hold Mode",
             nextCount="Next",
@@ -718,7 +718,7 @@ C. Gamepad
 
             bufferLimit="Buffer Limit",
             heightLimit="Height Limit",
-            ospin="O-Spin",
+            ospin="TRS O-Spin",
             fineKill="100% Finesse",
             b2bKill="No B2B Breaks",
             lockout="Fail on Lock Out",
diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua
index 4cdc2211..244f980d 100644
--- a/parts/language/lang_es.lua
+++ b/parts/language/lang_es.lua
@@ -461,7 +461,7 @@ return {
             capacity="Capacidad",
             create="Crear",
 
-            ospin="O-Spin",
+            ospin="TRS O-Spin",
             fineKill="100% Finesse",
             b2bKill="No Romper B2B ",
             lockout="Derrota al ocurrir Lock Out",
@@ -678,7 +678,7 @@ return {
 
             bufferLimit="Búfer Límite",
             heightLimit="Altura Límite",
-            ospin="O-Spin",
+            ospin="TRS O-Spin",
             fineKill="100% Finesse",
             b2bKill="No Romper B2B ",
             lockout="Derrota al ocurrir Lock Out",
diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua
index 879bb1ea..537eb579 100644
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -436,7 +436,7 @@ return {
             -- capacity="Capacity",
             create="Créer",
 
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="Sans perte de B2B",
             -- lockout="Fail when lock out",
@@ -444,7 +444,7 @@ return {
             -- deepDrop="Deep Drop",
             bone="Crochets",
 
-            -- eventSet="Rule Set",
+            -- eventSet="Ruleset",
 
             -- holdMode="Hold Mode",
             nextCount="Prévisualisations de pièces",
@@ -657,7 +657,7 @@ return {
 
             -- bufferLimit="Buffer Limit",
             -- heightLimit="Height Limit",
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="Sans perte de B2B",
             -- lockout="Fail when lock out",
diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua
index bb9431e0..e15750fe 100644
--- a/parts/language/lang_id.lua
+++ b/parts/language/lang_id.lua
@@ -462,7 +462,7 @@ return {
             capacity="Kapasitas",
             create="Buat",
 
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="100% Efisiensi Tombol",
             b2bKill="Akhirkan Permainan Jika Tidak B2B",
             lockout="Akhirkan Permainan Jika Lock Out",
@@ -680,7 +680,7 @@ return {
 
             bufferLimit="Batas Serangan",
             heightLimit="Batas Tinggi",
-            ospin="O-Spin",
+            ospin="TRS O-spin",
             fineKill="Maksimum Efisiensi Tombol",
             b2bKill="Akhirkan Permainan Jika Tidak B2B",
             lockout="Akhirkan Permainan Jika Lock Out",
diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua
index 9481bfe3..c3cd4523 100644
--- a/parts/language/lang_ja.lua
+++ b/parts/language/lang_ja.lua
@@ -505,7 +505,7 @@ C. ゲームパッド
             capacity="試合人数",
             create="作成",
 
-            ospin="O-spin",
+            ospin="Oスピン",
             fineKill="最適化のみ",
             b2bKill="B2B継続",
             lockout="盤面外設置禁止",
diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua
index 9473779e..c463e2e6 100644
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -450,7 +450,7 @@ return {
             -- capacity="Capacity",
             -- create="Create",
 
-            ospin="O-Spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="Sem Quebrar B2B",
             -- lockout="Fail when lock out",
@@ -458,7 +458,7 @@ return {
             -- deepDrop="Deep Drop",
             bone="Bone Blocks",
 
-            -- eventSet="Rule Set",
+            -- eventSet="Ruleset",
 
             -- holdMode="Hold Mode",
             nextCount="Prox.",
@@ -650,7 +650,7 @@ return {
             sequence="Editar Sequência (S)",
             mission="Editar Missão (M)",
 
-            -- eventSet="Rule Set",
+            -- eventSet="Ruleset",
 
             -- holdMode="Hold Mode",
             nextCount="Prox.",
@@ -668,7 +668,7 @@ return {
 
             -- bufferLimit="Buffer Limit",
             -- heightLimit="Height Limit",
-            ospin="O-Spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="Sem Quebrar B2B",
             -- lockout="Fail when lock out",
diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua
index b3ef39f2..fa79298e 100644
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -217,7 +217,7 @@ return {
             deepDrop="\\↓↓/",
             bone="[]",
 
-            eventSet="Rule Set",
+            eventSet="Ruleset",
 
             holdMode="? [ ]",
             nextCount="→",
@@ -407,7 +407,7 @@ return {
             sequence="Edit Sequence (S)",
             mission="Edit Mission (M)",
 
-            eventSet="Rule Set",
+            eventSet="Ruleset",
 
             holdMode="? [ ]",
             nextCount="→",
diff --git a/parts/language/lang_vi.lua b/parts/language/lang_vi.lua
index dac38ac3..b6dbcdce 100644
--- a/parts/language/lang_vi.lua
+++ b/parts/language/lang_vi.lua
@@ -507,7 +507,7 @@ C. Tay cầm chơi game (Gamepad):
             capacity="Giới hạn số người",
             create="Tạo phòng",
 
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="Không phá B2B",
             lockout="Thua khi Lock Out",
@@ -515,7 +515,7 @@ C. Tay cầm chơi game (Gamepad):
             deepDrop="Thả rơi sâu",
             bone="Dùng skin []",
 
-            eventSet="Rule Set",
+            eventSet="Ruleset",
 
             holdMode="Chế độ Hold",
             nextCount="Next",
@@ -727,7 +727,7 @@ C. Tay cầm chơi game (Gamepad):
             sequence="C. đặt Trình xáo gạch (S)",
             mission="Cài đặt Nhiệm vụ (M)",
 
-            eventSet="Rule Set",
+            eventSet="Ruleset",
 
             holdMode="Chế độ Hold",
             nextCount="Next",
@@ -745,7 +745,7 @@ C. Tay cầm chơi game (Gamepad):
 
             bufferLimit="Giới hạn nhận rác",
             heightLimit="Giới hạn độ cao",
-            ospin="O-Spin",
+            ospin="TRS O-spin",
             fineKill="100% Finesse",
             b2bKill="Không phá B2B",
             lockout="Thua khi Lock Out",
diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua
index e2d1521a..64566d63 100644
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -491,7 +491,7 @@ return {
             capacity="房间容量",
             create="创建",
 
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="强制极简",
             b2bKill="强制B2B",
             lockout="锁定在外时失败",
@@ -708,7 +708,7 @@ return {
 
             bufferLimit="缓冲上限",
             heightLimit="高度上限",
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="强制极简",
             b2bKill="强制B2B",
             lockout="锁定在外时失败",
diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua
index 60e2583d..e7b50c78 100644
--- a/parts/language/lang_zh_trad.lua
+++ b/parts/language/lang_zh_trad.lua
@@ -462,7 +462,7 @@ return {
             capacity="房間容量",
             create="創建",
 
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="100% finesse",
             b2bKill="強制B2B",
             lockout="鎖定在外時失敗",
@@ -679,7 +679,7 @@ return {
 
             bufferLimit="緩衝上限",
             heightLimit="高度上限",
-            ospin="O-spin",
+            ospin="TRS O-spin",
             fineKill="強制finesse",
             b2bKill="強制B2B",
             lockout="鎖定在外時失敗",
diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua
index 547da321..043eb995 100644
--- a/parts/scenes/customGame.lua
+++ b/parts/scenes/customGame.lua
@@ -10,14 +10,14 @@ local sList={
     pushSpeed={1,2,3,5,15},
     fieldH={1,2,3,4,6,8,10,15,20,30,50,100},
     heightLimit={2,3,4,6,8,10,15,20,30,40,70,100,150,200,1e99},
-    bufferLimit={4,6,10,15,20,40,100,1e99},
+    bufferLimit={0,2,4,6,10,15,20,40,100,1e99},
 
     drop={0,.125,.25,.5,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
-    lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
-    wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
-    fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
-    hang={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
-    hurry={0,1,2,3,4,5,6,7,8,10,1e99},
+    lock={0,1,2,3,4,5,6,7,8,9,10,11,12,14,16,18,20,25,30,40,60,180,1e99},
+    wait={0,1,2,3,4,5,6,7,8,9,10,15,20,30,60},
+    fall={0,1,2,3,4,5,6,7,8,9,10,15,20,30,60},
+    hang={0,1,2,3,4,5,6,7,8,9,10,15,20,30,60},
+    hurry={0,1,2,3,4,5,6,7,8,9,10,1e99},
     eventSet=EVENTSETS,
     holdMode={'hold','swap'},
 }
@@ -222,7 +222,7 @@ scene.widgetList={
     WIDGET.newButton{name='play_puzzle',   x=1070,y=540,w=310,h=70,color='lM',font=35,code=pressKey'play2',hideF=function() return #FIELD[1]==0 end},
     WIDGET.newButton{name='back',          x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=pressKey'escape'},
 
-    -- Rule set
+    -- Ruleset
     WIDGET.newSelector{name='eventSet',    x=1050,y=760,w=340,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')},
 
     -- Special rules
diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua
index 202e8bd0..2c067345 100644
--- a/parts/scenes/net_newRoom.lua
+++ b/parts/scenes/net_newRoom.lua
@@ -102,7 +102,7 @@ scene.widgetList={
     WIDGET.newSwitch{name='deepDrop',       x=1170,y=910, lim=250,disp=ROOMval('deepDrop'), code=ROOMrev('deepDrop')},
     WIDGET.newSwitch{name='bone',           x=1170,y=970, lim=250,disp=ROOMval('bone'),     code=ROOMrev('bone')},
 
-    -- Rule set
+    -- Ruleset
     WIDGET.newSelector{name='eventSet',     x=1050,y=760,w=340,color='H',list=sList.eventSet,disp=ROOMval('eventSet'),code=ROOMval('eventSet')},
 
     -- Next & Hold