SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

马拉松-极限入口隐藏，顺带修改翻译文件/模式列表中模式的顺序

Browse Source
This commit is contained in:
MrZ626
2020-12-13 15:32:30 +08:00
parent 4d7da801a7
commit ca8cf27371
11 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main.lua
View File

@@ -333,6 +333,7 @@ do
if S.version<1205 then
SETTING.VKCurW=SETTING.VKCurW*.1
SETTING.VKTchW=SETTING.VKTchW*.1
fs.remove("marathon_ultimate.dat")
end
newVersionLaunch=true

20
parts/language/lang_en.lua
View File

@@ -613,19 +613,20 @@ return{
["sprint_10"]= {"Sprint", "10L", "Clear 10 lines!"},
["sprint_20"]= {"Sprint", "20L", "Clear 20 lines!"},
["sprint_40"]= {"Sprint", "40L", "Clear 40 lines!"},
["sprint_100"]= {"Sprint", "100L", "Clear 100 lines!"},
["sprint_400"]= {"Sprint", "400L", "Clear 400 lines!"},
["sprint_1000"]= {"Sprint", "1000L", "Clear 1000 lines!"},
["sprintPenta"]= {"Sprint", "PENTOMINO", "Clear 40 lines with 18 pentominoes."},
["sprintMPH"]= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"},
["dig_10"]= {"Dig", "10L", "Dig 10 garbage lines."},
["dig_40"]= {"Dig", "40L", "Dig 40 garbage lines."},
["dig_100"]= {"Dig", "100L", "Dig 100 garbage lines."},
["dig_400"]= {"Dig", "400L", "Dig 400 garbage lines."},
["dig_1000"]= {"Dig", "1000L", "Dig 1000 garbage lines."},
["sprint_100"]= {"Sprint", "100L", "Clear 100 lines!"},
["sprint_400"]= {"Sprint", "400L", "Clear 400 lines!"},
["sprint_1000"]= {"Sprint", "1000L", "Clear 1000 lines!"},
["drought_normal"]= {"Drought", "100L", "No I piece!"},
["drought_lunatic"]= {"Drought", "100L", "WTF"},
["marathon_normal"]= {"Marathon", "NORMAL", "200-line marathon with accelerating speed."},
["marathon_hard"]= {"Marathon", "HARD", "200-line high-speed marathon."},
["marathon_ultimate"]= {"Marathon", "ULTIMATE", "Try completing this with\nonly singles. Combos don't count!"},
["solo_1"]= {"Battle", "EASY", "Defeat the AI!"},
["solo_2"]= {"Battle", "NORMAL", "Defeat the AI!"},
["solo_3"]= {"Battle", "HARD", "Defeat the AI!"},
@@ -688,12 +689,11 @@ return{
["ultra"]= {"Ultra", "EXTRA", "Get the highest score within 2 min."},
["infinite"]= {"Infinite", "", "Sandbox mode."},
["infinite_dig"]= {"Infinite: Dig", "", "Dig, dig, dig."},
["custom_clear"]= {"Custom", "NORMAL", "Draw something then clear it!!"},
["custom_puzzle"]= {"Custom", "PUZZLE", "Draw something then stack it!!"},
["sprintFix"]= {"Sprint", "NO LEFT/RIGHT","It's possible."},
["sprintLock"]= {"Sprint", "NO ROTATIONS", "It's impossible."},
["sprintPenta"]= {"Sprint", "PENTOMINO", "Clear 40 lines with 18 pentominoes."},
["sprintMPH"]= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"},
["sprintFix"]= {"Sprint", "NO LEFT/RIGHT"},
["sprintLock"]= {"Sprint", "NO ROTATIONS"},
["marathon_bfmax"]= {"Marathon", "ULTIMATE"},
["custom_clear"]= {"Custom", "NORMAL"},
["custom_puzzle"]= {"Custom", "PUZZLE"},
},
getTip={refuseCopy=true,
'Free to play block game with Battle Royale mode!',

20
parts/language/lang_fr.lua
View File

@@ -616,19 +616,20 @@ return{
["sprint_10"]= {"Sprint", "10L", "Nettoyez 10 lignes !"},
["sprint_20"]= {"Sprint", "20L", "Nettoyez 20 lignes !"},
["sprint_40"]= {"Sprint", "40L", "Nettoyez 40 lignes !"},
["sprint_100"]= {"Sprint", "100L", "Nettoyez 100 lignes !"},
["sprint_400"]= {"Sprint", "400L", "Nettoyez 400 lignes !"},
["sprint_1000"]= {"Sprint", "1000L", "Nettoyez 1000 lignes !"},
["sprintPenta"]= {"Sprint", "Pentomino", "40 lignes avec 18 pentominos."},
["sprintMPH"]= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"},
["dig_10"]= {"Dig", "10L", "Creusez 10 lines"},
["dig_40"]= {"Dig", "40L", "Creusez 40 lines"},
["dig_100"]= {"Dig", "100L", "Creusez 100 lines"},
["dig_400"]= {"Dig", "400L", "Creusez 400 lines"},
["dig_1000"]= {"Dig", "1000L", "Creusez 1000 lines"},
["sprint_100"]= {"Sprint", "100L", "Nettoyez 100 lignes !"},
["sprint_400"]= {"Sprint", "400L", "Nettoyez 400 lignes !"},
["sprint_1000"]= {"Sprint", "1000L", "Nettoyez 1000 lignes !"},
["drought_normal"]= {"Drought", "100L", "Pas de pièce I !"},
["drought_lunatic"]= {"Drought", "100L", "WTF ??!!"},
["marathon_normal"]= {"Marathon", "NORMAL", "Marathon de 200 lignes."},
["marathon_hard"]= {"Marathon", "DIFFICILE", "Marathon de 200 lignes à très haute vitesse"},
["marathon_ultimate"]= {"Marathon", "ULTIME", "Simples sans combos uniquement."},
["solo_1"]= {"Battle", "FACILE", "Battez l'IA !"},
["solo_2"]= {"Battle", "NORMAL", "Battez l'IA !"},
["solo_3"]= {"Battle", "DIFFICILE", "Battez l'IA !"},
@@ -690,11 +691,10 @@ return{
["ultra"]= {"Ultra", "EXTRA", "2 minutes pour avoir le meilleur score."},
["infinite"]= {"Infini", "", "Mode tranquile."},
["infinite_dig"]= {"Infini : Dig", "", "Creuser, creuser, creuser."},
["custom_clear"]= {"Perso.", "NORMAL", "Dessinez quelque chose et nettoyez-le !!"},
["custom_puzzle"]= {"Perso.", "PUZZLE", "Dessinez quelque chose et empilez-le !!"},
["sprintFix"]= {"Sprint", "Sans gauche/droite","C'est possible."},
["sprintLock"]= {"Sprint", "Sans rotation", "C'est impossible."},
["sprintPenta"]= {"Sprint", "Pentomino", "40 lignes avec 18 pentominos."},
["sprintMPH"]= {"Sprint", "MPH", "Memoryless\nPreviewless\nHoldless"},
["sprintFix"]= {"Sprint", "Sans gauche/droite"},
["sprintLock"]= {"Sprint", "Sans rotation"},
["marathon_bfmax"]= {"Marathon", "ULTIME"},
["custom_clear"]= {"Perso.", "NORMAL"},
["custom_puzzle"]= {"Perso.", "PUZZLE"},
},
}

20
parts/language/lang_sp.lua
View File

@@ -616,19 +616,20 @@ return{
["sprint_10"]= {"Sprint", "10L", "¡Limpia 10 líneas!"},
["sprint_20"]= {"Sprint", "20L", "¡Limpia 20 líneas!"},
["sprint_40"]= {"Sprint", "40L", "¡Limpia 40 líneas!"},
["sprint_100"]= {"Sprint", "100L", "¡Limpia 100 líneas!"},
["sprint_400"]= {"Sprint", "400L", "¡Limpia 400 líneas!"},
["sprint_1000"]= {"Sprint", "1000L", "¡Limpia 1000 líneas!"},
["sprintPenta"]= {"Sprint", "Pentominos", "¡Limpia 40 líneas con los 18 pentominos distintos!"},
["sprintMPH"]= {"Sprint", "MPH", "Memoryless (sin memoria)\nPreviewless (sin pzas. siguientes)\nHoldless (sin reserva)."},
["dig_10"]= {"Queso", "10L", "Limpia 10 líneas de queso."},
["dig_40"]= {"Queso", "40L", "Limpia 40 líneas de queso."},
["dig_100"]= {"Queso", "100L", "Limpia 100 líneas de queso."},
["dig_400"]= {"Queso", "400L", "Limpia 400 líneas de queso."},
["dig_1000"]= {"Queso", "1000L", "Limpia 1000 líneas de queso."},
["sprint_100"]= {"Sprint", "100L", "¡Limpia 100 líneas!"},
["sprint_400"]= {"Sprint", "400L", "¡Limpia 400 líneas!"},
["sprint_1000"]= {"Sprint", "1000L", "¡Limpia 1000 líneas!"},
["drought_normal"]= {"Sequía", "100L", "¡Sin piezas I!"},
["drought_lunatic"]= {"Sequía", "100L", "Guat de foc..."},
["marathon_normal"]= {"Maratón", "Normal", "Maratón de 200 líneas con velocidad en aumento."},
["marathon_hard"]= {"Maratón", "Difícil", "Maratón de 200 líneas a velocidad máxima."},
["marathon_ultimate"]= {"Maratón", "Supremo", "¡Sólo puedes limpiar singles, y sin combo!"},
["solo_1"]= {"VS.", "Fácil", "¡Derrota a la CPU!"},
["solo_2"]= {"VS.", "Normal", "¡Derrota a la CPU!"},
["solo_3"]= {"VS.", "Difícil", "¡Derrota a la CPU!"},
@@ -690,11 +691,10 @@ return{
["ultra"]= {"Ultra", "Extra", "¡Consigue el mayor puntaje posible en 2 minutos!"},
["infinite"]= {"Infinito", "", "Modo Sandbox."},
["infinite_dig"]= {"Infinito: Queso", "", "Limpia, limpia, más limpia que tú."},
["custom_clear"]= {"Personalizado", "Normal", "¡Dibuja algo en la Matriz y luego límpialo!"},
["custom_puzzle"]= {"Personalizado", "Puzzle", "¡Dibuja algo en la Matriz y luego recréalo con las piezas!"},
["sprintFix"]= {"Sprint", "Sin mover a Izq./Der.", "Poder se puede 8)"},
["sprintLock"]= {"Sprint", "Sin rotar", "Es imposible."},
["sprintPenta"]= {"Sprint", "Pentominos", "¡Limpia 40 líneas con los 18 pentominos distintos!"},
["sprintMPH"]= {"Sprint", "MPH", "Memoryless (sin memoria)\nPreviewless (sin pzas. siguientes)\nHoldless (sin reserva)."},
["sprintFix"]= {"Sprint", "Sin mover a Izq./Der."},
["sprintLock"]= {"Sprint", "Sin rotar"},
["marathon_bfmax"]= {"Maratón", "Supremo"},
["custom_clear"]= {"Personalizado", "Normal"},
["custom_puzzle"]= {"Personalizado", "Puzzle"},
},
}

20
parts/language/lang_yygq.lua
View File

@@ -182,19 +182,20 @@ return{
["sprint_10"]= {"竞速", "10L", "消10行"},
["sprint_20"]= {"竞速", "20L", "消20行"},
["sprint_40"]= {"竞速", "40L", "消40行"},
["sprint_100"]= {"竞速", "100L", "消100行"},
["sprint_400"]= {"竞速", "400L", "消400行"},
["sprint_1000"]= {"竞速", "1000L", "消1000行"},
["sprintPenta"]= {"竞速", "五连块", "离谱"},
["sprintMPH"]= {"竞速", "纯净", "听说你反应很快?"},
["dig_10"]= {"挖掘", "10L", "挖10行"},
["dig_40"]= {"挖掘", "40L", "挖40行"},
["dig_100"]= {"挖掘", "100L", "挖100行"},
["dig_400"]= {"挖掘", "400L", "挖400行"},
["dig_1000"]= {"挖掘", "1000L", "挖1000行"},
["sprint_100"]= {"竞速", "100L", "消100行"},
["sprint_400"]= {"竞速", "400L", "消400行"},
["sprint_1000"]= {"竞速", "1000L", "消1000行"},
["drought_normal"]= {"干旱", "100L", "放轻松,简单得很"},
["drought_lunatic"]= {"干旱", "100L", "有趣的要来了"},
["marathon_normal"]= {"马拉松", "普通", "休闲模式"},
["marathon_hard"]= {"马拉松", "困难", "休闲模式"},
["marathon_ultimate"]= {"马拉松", "极限", "你再秀?"},
["solo_1"]= {"单挑", "简单", "鲨AI"},
["solo_2"]= {"单挑", "普通", "鲨AI"},
["solo_3"]= {"单挑", "困难", "鲨AI"},
@@ -257,12 +258,11 @@ return{
["ultra"]= {"限时打分", "挑战", "2分钟刷分"},
["infinite"]= {"无尽", "", "真的有人会玩这个?"},
["infinite_dig"]= {"无尽:挖掘", "", "闲得慌的话来挖"},
["custom_clear"]= {"自定义", "普通", "试验场"},
["custom_puzzle"]= {"自定义", "拼图", "宁就是方块艺术家"},
["sprintFix"]= {"竞速", "无移动", "这是可能的。"},
["sprintLock"]= {"竞速", "无旋转", "这不可能。"},
["sprintPenta"]= {"竞速", "五连块", "离谱"},
["sprintMPH"]= {"竞速", "纯净", "听说你反应很快?"},
["sprintFix"]= {"竞速", "无移动"},
["sprintLock"]= {"竞速", "无旋转"},
["marathon_bfmax"]= {"马拉松", "极限"},
["custom_clear"]= {"自定义", "普通"},
["custom_puzzle"]= {"自定义", "拼图"},
},
getTip={refuseCopy=true,
"100apm?你倒是不用开局定式连续打几把",

20
parts/language/lang_zh.lua
View File

@@ -640,19 +640,20 @@ return{
["sprint_10"]= {"竞速", "10L", "消除10行"},
["sprint_20"]= {"竞速", "20L", "消除20行"},
["sprint_40"]= {"竞速", "40L", "消除40行"},
["sprint_100"]= {"竞速", "100L", "消除100行"},
["sprint_400"]= {"竞速", "400L", "消除400行"},
["sprint_1000"]= {"竞速", "1000L", "消除1000行"},
["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"},
["sprintMPH"]= {"竞速", "MPH", "纯随机\n无预览\n无暂存"},
["dig_10"]= {"挖掘", "10L", "挖掘10行"},
["dig_40"]= {"挖掘", "40L", "挖掘40行"},
["dig_100"]= {"挖掘", "100L", "挖掘100行"},
["dig_400"]= {"挖掘", "400L", "挖掘400行"},
["dig_1000"]= {"挖掘", "1000L", "挖掘1000行"},
["sprint_100"]= {"竞速", "100L", "消除100行"},
["sprint_400"]= {"竞速", "400L", "消除400行"},
["sprint_1000"]= {"竞速", "1000L", "消除1000行"},
["drought_normal"]= {"干旱", "100L", "你I没了"},
["drought_lunatic"]= {"干旱", "100L", "后 妈 发 牌"},
["marathon_normal"]= {"马拉松", "普通", "200行加速马拉松"},
["marathon_hard"]= {"马拉松", "困难", "200行高速马拉松"},
["marathon_ultimate"]= {"马拉松", "极限", "禁止0连击单消之外的任何操作"},
["solo_1"]= {"单挑", "简单", "打败AI"},
["solo_2"]= {"单挑", "普通", "打败AI"},
["solo_3"]= {"单挑", "困难", "打败AI"},
@@ -715,12 +716,11 @@ return{
["ultra"]= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"},
["infinite"]= {"无尽", "", "沙盒"},
["infinite_dig"]= {"无尽:挖掘", "", "挖呀挖呀挖"},
["custom_clear"]= {"自定义", "普通", "画点什么然后把它消除!"},
["custom_puzzle"]= {"自定义", "拼图", "画点什么然后把它拼出来吧!"},
["sprintFix"]= {"竞速", "无移动", "这是可能的。"},
["sprintLock"]= {"竞速", "无旋转", "这不可能。"},
["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"},
["sprintMPH"]= {"竞速", "MPH", "纯随机\n无预览\n无暂存"},
["sprintFix"]= {"竞速", "无移动"},
["sprintLock"]= {"竞速", "无旋转"},
["marathon_bfmax"]= {"马拉松", "极限"},
["custom_clear"]= {"自定义", "普通"},
["custom_puzzle"]= {"自定义", "拼图"},
},
getTip={refuseCopy=true,
'注意到"旋转"到底对方块做了些什么吗?',

20
parts/language/lang_zh2.lua
View File

@@ -156,19 +156,20 @@ return{
["sprint_10"]= {"竞速", "10行", "消除10行"},
["sprint_20"]= {"竞速", "20行", "消除20行"},
["sprint_40"]= {"竞速", "40行", "消除40行"},
["sprint_100"]= {"竞速", "100行", "消除100行"},
["sprint_400"]= {"竞速", "400行", "消除400行"},
["sprint_1000"]= {"竞速", "1000行", "消除1000行"},
["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"},
["sprintMPH"]= {"竞速", "纯净", "纯随机\n无预览\n无暂存"},
["dig_10"]= {"挖掘", "10L", "挖掘10行"},
["dig_40"]= {"挖掘", "40L", "挖掘40行"},
["dig_100"]= {"挖掘", "100L", "挖掘100行"},
["dig_400"]= {"挖掘", "400L", "挖掘400行"},
["dig_1000"]= {"挖掘", "1000L", "挖掘1000行"},
["sprint_100"]= {"竞速", "100行", "消除100行"},
["sprint_400"]= {"竞速", "400行", "消除400行"},
["sprint_1000"]= {"竞速", "1000行", "消除1000行"},
["drought_normal"]= {"干旱", "100行", "你I没了"},
["drought_lunatic"]= {"干旱", "100行", "后 妈 发 牌"},
["marathon_normal"]= {"马拉松", "普通", "200行加速马拉松"},
["marathon_hard"]= {"马拉松", "困难", "200行高速马拉松"},
["marathon_ultimate"]= {"马拉松", "极限", "禁止0连击单消之外的任何操作"},
["solo_1"]= {"单挑", "简单", "打败机器人"},
["solo_2"]= {"单挑", "普通", "打败机器人"},
["solo_3"]= {"单挑", "困难", "打败机器人"},
@@ -231,12 +232,11 @@ return{
["ultra"]= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"},
["infinite"]= {"无尽", "", "沙盒"},
["infinite_dig"]= {"无尽:挖掘", "", "挖呀挖呀挖"},
["custom_clear"]= {"自定义", "普通", "画点什么然后把它消除!"},
["custom_puzzle"]= {"自定义", "拼图", "画点什么然后把它拼出来吧!"},
["sprintFix"]= {"竞速", "无移动", "这是可能的。"},
["sprintLock"]= {"竞速", "无旋转", "这不可能。"},
["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"},
["sprintMPH"]= {"竞速", "纯净", "纯随机\n无预览\n无暂存"},
["sprintFix"]= {"竞速", "无移动"},
["sprintLock"]= {"竞速", "无旋转"},
["marathon_bfmax"]= {"马拉松", "极限"},
["custom_clear"]= {"自定义", "普通"},
["custom_puzzle"]= {"自定义", "拼图"},
},
getTip=nil,
}

9
parts/modes.lua
View File

@@ -6,8 +6,8 @@ return{
{name="sprint_400", x=-400, y=-200, size=35,shape=1,icon="sprint", unlock={"sprint_1000"}},
{name="sprint_1000", x=-600, y=-200, size=35,shape=1,icon="sprint"},
{name="sprintPenta", x=210, y=-370, size=40,shape=3,icon="sprint_new"},
{name="sprintMPH", x=210, y=-230, size=40,shape=3,icon="sprint_new"},
{name="sprintPenta", x=210, y=-370, size=40,shape=3,icon="sprint"},
{name="sprintMPH", x=210, y=-230, size=40,shape=3,icon="sprint"},
{name="drought_normal", x=-400, y=0, size=35,shape=1,icon="noI", unlock={"drought_lunatic"}},
{name="drought_lunatic", x=-600, y=0, size=35,shape=1,icon="mess"},
@@ -17,9 +17,8 @@ return{
{name="dig_100", x=-600, y=-400, size=35,shape=1,icon="dig", unlock={"dig_400"}},
{name="dig_400", x=-800, y=-200, size=35,shape=1,icon="dig"},
{name="marathon_normal", x=0, y=-600, size=55,shape=1,icon="marathon", unlock={"marathon_hard","marathon_ultimate","solo_1","round_1","blind_easy","classic_fast","survivor_easy","bigbang","zen"}},
{name="marathon_normal", x=0, y=-600, size=55,shape=1,icon="marathon", unlock={"marathon_hard","solo_1","round_1","blind_easy","classic_fast","survivor_easy","bigbang","zen"}},
{name="marathon_hard", x=0, y=-800, size=45,shape=1,icon="marathon", unlock={"master_beginner"}},
{name="marathon_ultimate", x=-120, y=-490, size=35,shape=2,icon="marathon"},
{name="solo_1", x=-300, y=-1000,size=35,shape=1,icon="solo", unlock={"solo_2"}},
{name="solo_2", x=-500, y=-1000,size=35,shape=1,icon="solo", unlock={"solo_3"}},
@@ -102,6 +101,8 @@ return{
{name="sprintFix"},
{name="sprintLock"},
{name="marathon_bfmax"},
{name="custom_puzzle"},
{name="custom_clear"},
}

3
parts/modes/marathon_ultimate.lua → parts/modes/marathon_bfmax.lua
View File

@@ -40,9 +40,6 @@ return{
mStr(P.modeData.point+10,69,370)
gc.rectangle("fill",25,375,90,4)
end,
score=function(P)return{math.min(P.stat.row,200),P.stat.frame/60}end,
scoreDisp=function(D)return D[1].." Lines "..toTime(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

2
parts/scenes/calculator.lua
View File

@@ -99,6 +99,8 @@ function scene.keyDown(k)
LOG.print("GammaCorrect: "..(gc.isGammaCorrect()and"on"or"off"),"warn")
elseif v==114514 or v==1919810 or v==1145141919810 then
error()
elseif v==200 then
loadGame("marathon_bfmax",true)
elseif v==670 then
SCR.print()
end

8
parts/scenes/staff.lua
View File

@@ -14,9 +14,9 @@ end
function scene.mouseDown(x,y)
if x>230 and x<1050 then
if math.abs(y-800+time*40)<70 then
loadGame("sprintLock")
loadGame("sprintLock",true)
elseif math.abs(y-2160+time*40)<70 then
loadGame("sprintFix")
loadGame("sprintFix",true)
end
end
end
@@ -30,9 +30,9 @@ function scene.keyDown(k)
SCN.back()
elseif kb.isDown("s")then
if k=="l"then
loadGame("sprintLock")
loadGame("sprintLock",true)
elseif k=="f"then
loadGame("sprintFix")
loadGame("sprintFix",true)
end
end
end