diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e5da0f89..b11a55d8 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -56,7 +56,8 @@ return{ page="Page:", - ai_fixed="AI is incompatible with fixed sequences", + cc_fixed="CC is incompatible with fixed sequences", + cc_swap="CC is incompatible with swap holdmode", ai_prebag="AI is incompatible with custom sequences which have non-tetromino", ai_mission="AI is incompatible with custom missions", switchSpawnSFX="Please turn on the block spawn SFX!", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index b7808a62..1dc7e737 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -46,7 +46,8 @@ return{ page="Página:", - ai_fixed="La IA no es compatible con secuencias de piezas prefijadas.", + -- cc_fixed="CC is incompatible with fixed sequences", + -- cc_swap="CC is incompatible with swap holdmode", ai_prebag="La IA no es compatible con piezas que no sean Tetrominos.", ai_mission="La IA no es compatible con misiones personalizadas.", switchSpawnSFX="Habilita los sonidos de aparición de las piezas ;)", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 2ebfd369..2399ff96 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -47,7 +47,8 @@ return{ page="Page:", - ai_fixed="L'IA est incompatible avec les séquences fixes.", + -- cc_fixed="CC is incompatible with fixed sequences", + -- cc_swap="CC is incompatible with swap holdmode", --ai_prebag="The AI is incompatible with custom sequences which have nontetromino.",'IA est incompatible avec les séquences personnalisées.", ai_mission="L'IA est incompatible avec les missions personnalisées.", switchSpawnSFX="Activez les effets sonores d'apparition des pièces pour jouer", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 93d9b287..2a3f61b6 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -47,7 +47,8 @@ return{ page="Página:", - ai_fixed="A inteligência é incompatível com sequências fixas.", + -- cc_fixed="CC is incompatible with fixed sequences", + -- cc_swap="CC is incompatible with swap holdmode", --ai_prebag="The AI is incompatible with custom sequences which have nontetromino.", inteligência é incompatível com sequências fixas.", ai_mission="A inteligência é incompatível com missões costumizadas.", switchSpawnSFX="Switch on spawn SFX to play", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 2ba02ed9..05bc8c0b 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -34,7 +34,8 @@ return{ page=":", - ai_fixed="X!!!", + cc_fixed="CC X!!!", + cc_swap="CC X!!!", ai_prebag="X!!!", ai_mission="X!!!", needRestart="!!*#R#*!!", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index ba70bf4b..eb006ece 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -56,7 +56,8 @@ return{ page="页面:", - ai_fixed="不能同时开启AI和固定序列", + cc_fixed="不能同时开启CC和固定序列", + cc_swap="不能同时开启CC和swap的暂存模式", ai_prebag="不能同时开启AI和含有非四连块的自定义序列", ai_mission="不能同时开启AI和自定义任务", switchSpawnSFX="请开启方块出生音效", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 3b8ef66f..5bf1f43e 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -21,7 +21,8 @@ return{ finesse_ap="完美极简", finesse_fc="全连击", - ai_fixed="不能同时开启电脑玩家和固定序列", + cc_fixed="不能同时开启CC和固定序列", + cc_swap="不能同时开启CC和swap的暂存模式", ai_prebag="不能同时开启电脑玩家和含有非四连块的自定义序列", ai_mission="不能同时开启电脑玩家和自定义任务", diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index c668474c..ce80e24d 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -57,7 +57,8 @@ return{ page="第页:", - ai_fixed="AI与固定序列不兼容", + cc_fixed="CC与固定序列不兼容", + cc_swap="CC与交换保持模式不兼容", ai_prebag="AI与具有非四格拼板的自定义序列不兼容", ai_mission="AI与自定义任务不兼容", switchSpawnSFX="请打开繁殖特技效果", diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index f926eb62..e016f0e0 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -55,9 +55,15 @@ function scene.keyDown(key,isRep) if isRep then return end if key=="return"or key=="return2"then if CUSTOMENV.opponent~="X"then - if CUSTOMENV.opponent:sub(1,2)=='CC'and CUSTOMENV.sequence=="fixed"then - MES.new('error',text.ai_fixed) - return + if CUSTOMENV.opponent:sub(1,2)=='CC'then + if CUSTOMENV.sequence=='fixed'then + MES.new('error',text.cc_fixed) + return + end + if CUSTOMENV.holdMode=='swap'then + MES.new('error',text.cc_swap) + return + end end if #BAG>0 then for _=1,#BAG do