From 835430bf847e5bcf424bbe84d3f027b046412027 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 10 Jul 2021 15:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=A0=E4=B8=AAmaster?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E5=86=85=E9=83=A8=E5=90=8D=E7=A7=B0?= 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 | 6 +++--- parts/language/lang_fr.lua | 8 ++++---- parts/language/lang_pt.lua | 8 ++++---- parts/language/lang_yygq.lua | 8 ++++---- parts/language/lang_zh.lua | 8 ++++---- parts/language/lang_zh2.lua | 8 ++++---- parts/list.lua | 6 +++++- parts/modes.lua | 10 +++++----- parts/modes/{master_extra.lua => master_ex.lua} | 0 parts/modes/{master_beginner.lua => master_l.lua} | 0 parts/modes/{master_phantasm.lua => master_ph.lua} | 0 parts/modes/{master_advance.lua => master_u.lua} | 0 13 files changed, 37 insertions(+), 33 deletions(-) rename parts/modes/{master_extra.lua => master_ex.lua} (100%) rename parts/modes/{master_beginner.lua => master_l.lua} (100%) rename parts/modes/{master_phantasm.lua => master_ph.lua} (100%) rename parts/modes/{master_advance.lua => master_u.lua} (100%) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index fd4bfb50..716a4635 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -746,11 +746,11 @@ return{ ['round_h']= {"Turn-Based", "HARD", "Chess mode"}, ['round_l']= {"Turn-Based", "LUNATIC", "Chess mode"}, ['round_u']= {"Turn-Based", "ULTIMATE", "Chess mode"}, - ['master_beginner']= {"Master", "LUNATIC", "For 20G beginners."}, - ['master_advance']= {"Master", "ULTIMATE", "For 20G pros."}, + ['master_l']= {"Master", "LUNATIC", "For 20G beginners."}, + ['master_u']= {"Master", "ULTIMATE", "For 20G pros."}, ['master_final']= {"Master", "FINAL", "20G and beyond."}, - ['master_phantasm']= {"Master", "PHANTASM", "???"}, - ['master_extra']= {"GrandMaster", "EXTRA", "An eternity shorter than an instant."}, + ['master_ph']= {"Master", "PHANTASM", "???"}, + ['master_ex']= {"GrandMaster", "EXTRA", "An eternity shorter than an instant."}, ['rhythm_e']= {"Rhythm", "EASY", "200-line low-BPM rhythm marathon."}, ['rhythm_h']= {"Rhythm", "HARD", "200-line medium BPM rhythm marathon"}, ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-BPM rhythm marathon."}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 6c716b7d..5fd1c41c 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -655,10 +655,10 @@ return{ ['round_h']= {"Por Turnos", "Difícil", "Modo ajedrez."}, ['round_l']= {"Por Turnos", "Lunático", "Modo ajedrez."}, ['round_u']= {"Por Turnos", "Supremo", "Modo ajedrez."}, - ['master_beginner']= {"Master", "Lunático", "Para principiantes en 20G"}, - ['master_advance']= {"Master", "Supremo", "¡Desafío profesional de 20G!"}, + ['master_l']= {"Master", "Lunático", "Para principiantes en 20G"}, + ['master_u']= {"Master", "Supremo", "¡Desafío profesional de 20G!"}, ['master_final']= {"Master", "FINAL", "El verdadero 20G Supremo: el final es inalcanzable."}, - ['master_extra']= {"GrandMaster", "EXTRA", "Para ser un gran maestro, acepta este desafío"}, + ['master_ex']= {"GrandMaster", "EXTRA", "Para ser un gran maestro, acepta este desafío"}, ['rhythm_e']= {"Al Ritmo", "Fácil", "Maratón rítmica de 200 líneas con bajo bpm."}, ['rhythm_h']= {"Al Ritmo", "Difícil", "Maratón rítmica de 200 líneas con bpm moderado."}, ['rhythm_u']= {"Al Ritmo", "Supremo", "Maratón rítmica de 200 líneas con bpm elevado."}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 9b192097..aca51392 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -660,11 +660,11 @@ return{ ['round_h']= {"Tour à tour", "DIFFICILE", "Mode échecs"}, ['round_l']= {"Tour à tour", "LUNATIQUE", "Mode échecs"}, ['round_u']= {"Tour à tour", "ULTIME", "Mode échecs"}, - ['master_beginner']= {"Master", "LUNATIQUE", "Pour les débutants en 20G."}, - ['master_advance']= {"Master", "ULTIME", "Challenge 20G pro !"}, + ['master_l']= {"Master", "LUNATIQUE", "Pour les débutants en 20G."}, + ['master_u']= {"Master", "ULTIME", "Challenge 20G pro !"}, ['master_final']= {"Master", "FINAL", "20G : Un point final impossible à atteindre !"}, - -- ['master_phantasm']= {"Mester", "FANTASMA", "20G: ???"}, - ['master_extra']= {"GrandMaster", "EXTRA", "Tentez de devenir un Grandmaster."}, + -- ['master_ph']= {"Mester", "FANTASMA", "20G: ???"}, + ['master_ex']= {"GrandMaster", "EXTRA", "Tentez de devenir un Grandmaster."}, -- ['rhythm_e']= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, -- ['rhythm_h']= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, -- ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 218dcf79..f10c8c66 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -741,11 +741,11 @@ return{ ['round_h']= {"Baseado Turnos", "DIFÍCIL", "Modo xadrez"}, ['round_l']= {"Baseado Turnos", "LUNÁTICO", "Modo xadrez"}, ['round_u']= {"Baseado Turnos", "ULTIMATE", "Modo xadrez"}, - ['master_beginner']= {"Mestre", "LUNÁTICO", "Pra iniciantes de 20G."}, - ['master_advance']= {"Mestre", "ULTIMATE", "Desafio 20G profissional!"}, + ['master_l']= {"Mestre", "LUNÁTICO", "Pra iniciantes de 20G."}, + ['master_u']= {"Mestre", "ULTIMATE", "Desafio 20G profissional!"}, ['master_final']= {"Mestre", "FINAL", "20G: Final inalcançável!"}, - ['master_phantasm']= {"Mestre", "FANTASMA", "20G: ???"}, - ['master_extra']= {"GrandMaster", "EXTRA", "Para ser um Grand Master, aceite \nesse desafio."}, + ['master_ph']= {"Mestre", "FANTASMA", "20G: ???"}, + ['master_ex']= {"GrandMaster", "EXTRA", "Para ser um Grand Master, aceite \nesse desafio."}, -- ['rhythm_e']= {"Rhythm", "EASY", "200-line low-bpm rhythm marathon."}, -- ['rhythm_h']= {"Rhythm", "HARD", "200-line medium-bpm rhythm marathon"}, -- ['rhythm_u']= {"Rhythm", "ULTIMATE", "200-line high-bpm rhythm marathon."}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 4ab14088..4380f48a 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -229,11 +229,11 @@ return{ ['round_h']= {"回合制", "困难", "下棋"}, ['round_l']= {"回合制", "疯狂", "下棋"}, ['round_u']= {"回合制", "极限", "下棋"}, - ['master_beginner']= {"大师", "疯狂", "无脑20G"}, - ['master_advance']= {"大师", "极限", "简单20G"}, + ['master_l']= {"大师", "疯狂", "无脑20G"}, + ['master_u']= {"大师", "极限", "简单20G"}, ['master_final']= {"大师", "终点", "究极20G:真正的游戏"}, - ['master_phantasm']= {"大师", "虚幻", "虚幻20G:好玩"}, - ['master_extra']= {"宗师", "EX", "你行你上"}, + ['master_ph']= {"大师", "虚幻", "虚幻20G:好玩"}, + ['master_ex']= {"宗师", "EX", "你行你上"}, ['rhythm_e']= {"节奏", "简单", "很无聊的"}, ['rhythm_h']= {"节奏", "困难", "好玩么?"}, ['rhythm_u']= {"节奏", "极限", "真男人不玩低难度"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 56e70907..69b5cae6 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -747,11 +747,11 @@ return{ ['round_h']= {"回合制", "困难", "下棋模式"}, ['round_l']= {"回合制", "疯狂", "下棋模式"}, ['round_u']= {"回合制", "极限", "下棋模式"}, - ['master_beginner']= {"大师", "疯狂", "20G初心者练习"}, - ['master_advance']= {"大师", "极限", "上级者20G挑战"}, + ['master_l']= {"大师", "疯狂", "20G初心者练习"}, + ['master_u']= {"大师", "极限", "上级者20G挑战"}, ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, - ['master_phantasm']= {"大师", "虚幻", "虚幻20G:???"}, - ['master_extra']= {"宗师", "EX", "成为方块大师"}, + ['master_ph']= {"大师", "虚幻", "虚幻20G:???"}, + ['master_ex']= {"宗师", "EX", "成为方块大师"}, ['rhythm_e']= {"节奏", "简单", "200行低速节奏马拉松"}, ['rhythm_h']= {"节奏", "困难", "200行中速节奏马拉松"}, ['rhythm_u']= {"节奏", "极限", "200行高速节奏马拉松"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 627dae25..ba479fc4 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -164,11 +164,11 @@ return{ ['round_h']= {"回合制", "困难", "下棋模式"}, ['round_l']= {"回合制", "疯狂", "下棋模式"}, ['round_u']= {"回合制", "极限", "下棋模式"}, - ['master_beginner']= {"大师", "疯狂", "20G初心者练习"}, - ['master_advance']= {"大师", "极限", "上级者20G挑战"}, + ['master_l']= {"大师", "疯狂", "20G初心者练习"}, + ['master_u']= {"大师", "极限", "上级者20G挑战"}, ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, - ['master_phantasm']= {"大师", "虚幻", "虚幻20G:???"}, - ['master_extra']= {"宗师", "EX", "成为方块大师"}, + ['master_ph']= {"大师", "虚幻", "虚幻20G:???"}, + ['master_ex']= {"宗师", "EX", "成为方块大师"}, ['rhythm_e']= {"节奏", "简单", "200行低速节奏马拉松"}, ['rhythm_h']= {"节奏", "困难", "200行中速节奏马拉松"}, ['rhythm_u']= {"节奏", "极限", "200行高速节奏马拉松"}, diff --git a/parts/list.lua b/parts/list.lua index c91fba33..3424a741 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -349,7 +349,11 @@ oldModeNameTable={ tsd_easy="tsd_e", tsd_hard="tsd_h", tsd_ultimate="tsd_u", - GM="master_extra", + GM="master_ex", + master_beginner="master_u", + master_advance="master_l", + master_phantasm="master_ph", + master_extra="master_ex", } rankColor={ {.6,.3,.3}, diff --git a/parts/modes.lua b/parts/modes.lua index 4fea66de..da6f4598 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -18,7 +18,7 @@ return{ {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','rhythm_e','solo_e','round_e','blind_e','classic_fast','survivor_e','bigbang','zen'}}, - {name='marathon_h', x=0, y=-800, size=50,shape=1,icon="marathon",unlock={'master_beginner'}}, + {name='marathon_h', x=0, y=-800, size=50,shape=1,icon="marathon",unlock={'master_l'}}, {name='solo_e', x=-600, y=-1000,size=40,shape=1,icon="solo", unlock={'solo_n'}}, {name='solo_n', x=-800, y=-1000,size=40,shape=1,icon="solo", unlock={'solo_h'}}, @@ -39,11 +39,11 @@ 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='master_beginner',x=0, y=-1000,size=40,shape=1,icon="master", unlock={'master_advance'}}, - {name='master_advance', x=0, y=-1200,size=40,shape=3,icon="master", unlock={'master_final','master_extra','master_phantasm'}}, + {name='master_l', x=0, y=-1000,size=40,shape=1,icon="master", unlock={'master_u'}}, + {name='master_u', x=0, y=-1200,size=40,shape=3,icon="master", unlock={'master_final','master_ex','master_ph'}}, {name='master_final', x=0, y=-1600,size=40,shape=2,icon="master"}, - {name='master_phantasm',x=-150, y=-1500,size=40,shape=2,icon="master"}, - {name='master_extra', x=150, y=-1500,size=40,shape=2,icon="master_ex"}, + {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='rhythm_e', x=-350, y=-1000,size=40,shape=1,icon="rhythm", unlock={'rhythm_h'}}, {name='rhythm_h', x=-350, y=-1200,size=40,shape=3,icon="rhythm", unlock={'rhythm_u'}}, diff --git a/parts/modes/master_extra.lua b/parts/modes/master_ex.lua similarity index 100% rename from parts/modes/master_extra.lua rename to parts/modes/master_ex.lua diff --git a/parts/modes/master_beginner.lua b/parts/modes/master_l.lua similarity index 100% rename from parts/modes/master_beginner.lua rename to parts/modes/master_l.lua diff --git a/parts/modes/master_phantasm.lua b/parts/modes/master_ph.lua similarity index 100% rename from parts/modes/master_phantasm.lua rename to parts/modes/master_ph.lua diff --git a/parts/modes/master_advance.lua b/parts/modes/master_u.lua similarity index 100% rename from parts/modes/master_advance.lua rename to parts/modes/master_u.lua