diff --git a/main.lua b/main.lua index c8d5770d..547eeeaf 100644 --- a/main.lua +++ b/main.lua @@ -290,7 +290,7 @@ do if RANKS.tsd_u then RANKS.tsd_u=0 end needSave=true end - if STAT.version==1600 then + if RANKS.stack_20l then RANKS.stack_20l=nil RANKS.stack_40l=nil RANKS.stack_100l=nil diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 9ca54a07..f34b949e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -740,9 +740,9 @@ return{ ['dig_1000l']= {"Dig", "1000L", "Dig 1000 garbage lines."}, ['drought_n']= {"Drought", "100L", "There are no I-pieces."}, ['drought_l']= {"Drought+", "100L", "W T F"}, - ['stack_20l']= {"Stack", "20L", "Pack them!"}, - ['stack_40l']= {"Stack", "40L", "Pack them!"}, - ['stack_100l']= {"Stack", "100L", "Pack them!"}, + ['stack_e']= {"Stack", "EASY", "Pack them!"}, + ['stack_h']= {"Stack", "HARD", "Pack them!"}, + ['stack_u']= {"Stack", "ULTIMATE", "Pack them!"}, ['marathon_n']= {"Marathon", "NORMAL", "200-line marathon with accelerating speed."}, ['marathon_h']= {"Marathon", "HARD", "200-line high-speed marathon."}, ['solo_e']= {"Battle", "EASY", "Defeat the AI!"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index e3d96c92..da14a20a 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -645,9 +645,9 @@ return{ ['dig_1000l']= {"Queso", "1000L", "Limpia 1000 líneas de queso."}, ['drought_n']= {"Sequía", "100L", "¡Sin piezas I!"}, ['drought_l']= {"Sequía+", "100L", "Guat de foc..."}, - -- ['stack_20l']= {"Stack", "20L", "Pack them!"}, - -- ['stack_40l']= {"Stack", "40L", "Pack them!"}, - -- ['stack_100l']= {"Stack", "100L", "Pack them!"}, + -- ['stack_e']= {"Stack", "Fácil", "Pack them!"}, + -- ['stack_h']= {"Stack", "Difícil", "Pack them!"}, + -- ['stack_u']= {"Stack", "Supremo", "Pack them!"}, ['marathon_n']= {"Maratón", "Normal", "Maratón de 200 líneas con velocidad en aumento."}, ['marathon_h']= {"Maratón", "Difícil", "Maratón de 200 líneas a velocidad máxima."}, ['solo_e']= {"VS.", "Fácil", "¡Derrota a la CPU!"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 4d39d5de..7f4255d9 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -647,9 +647,9 @@ return{ ['dig_1000l']= {"Dig", "1000L", "Creusez 1000 lines"}, ['drought_n']= {"Drought", "100L", "Pas de pièce I !"}, ['drought_l']= {"Drought+", "100L", "WTF ??!!"}, - -- ['stack_20l']= {"Stack", "20L", "Pack them!"}, - -- ['stack_40l']= {"Stack", "40L", "Pack them!"}, - -- ['stack_100l']= {"Stack", "100L", "Pack them!"}, + -- ['stack_e']= {"Stack", "FACILE", "Pack them!"}, + -- ['stack_h']= {"Stack", "DIFFICILE", "Pack them!"}, + -- ['stack_u']= {"Stack", "ULTIME", "Pack them!"}, ['marathon_n']= {"Marathon", "NORMAL", "Marathon de 200 lignes."}, ['marathon_h']= {"Marathon", "DIFFICILE", "Marathon de 200 lignes à très haute vitesse"}, ['solo_e']= {"Battle", "FACILE", "Battez l'IA !"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 0f1f017c..c6871dff 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -731,9 +731,9 @@ return{ ['dig_1000l']= {"Cave", "1000L", "Cave 1000 linhas de lixo."}, ['drought_n']= {"Drought", "100L", "Sem peça I !"}, ['drought_l']= {"Drought+", "100L", "WTF"}, - -- ['stack_20l']= {"Stack", "20L", "Pack them!"}, - -- ['stack_40l']= {"Stack", "40L", "Pack them!"}, - -- ['stack_100l']= {"Stack", "100L", "Pack them!"}, + -- ['stack_e']= {"Stack", "FÁCIL", "Pack them!"}, + -- ['stack_h']= {"Stack", "DIFÍCIL", "Pack them!"}, + -- ['stack_u']= {"Stack", "ULTIMATE", "Pack them!"}, ['marathon_n']= {"Maratona", "NORMAL", "200-line Maratona com velocidade aumentando."}, ['marathon_h']= {"Maratona", "DIFÍCIL", "200-line Maratona com velocidade alta."}, ['solo_e']= {"Batalha", "FÁCIL", "Derrote a inteligência!"}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 63ded132..19b56fd0 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -223,9 +223,9 @@ return{ ['dig_1000l']= {"挖掘", "1000L", "挖1000行"}, ['drought_n']= {"干旱", "100L", "放轻松,简单得很"}, ['drought_l']= {"干旱+", "100L", "有趣的要来了"}, - ['stack_20l']= {"堆叠", "20L", "拼图(确信"}, - ['stack_40l']= {"堆叠", "40L", "拼图(确信"}, - ['stack_100l']= {"堆叠", "100L", "盖楼(确信"}, + ['stack_e']= {"堆叠", "简单", "智力启蒙玩具(确信"}, + ['stack_h']= {"堆叠", "困难", "智力启蒙玩具(确信"}, + ['stack_u']= {"堆叠", "极限", "智力启蒙玩具(确信"}, ['marathon_n']= {"马拉松", "普通", "休闲模式"}, ['marathon_h']= {"马拉松", "困难", "休闲模式"}, ['solo_e']= {"单挑", "简单", "鲨AI"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 6feb623a..ec37fa8f 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -741,9 +741,9 @@ return{ ['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"}, ['drought_n']= {"干旱", "100L", "你I没了"}, ['drought_l']= {"干旱+", "100L", "后 妈 发 牌"}, - ['stack_20l']= {"堆积", "20L", "搭积木"}, - ['stack_40l']= {"堆积", "40L", "搭积木"}, - ['stack_100l']= {"堆积", "100L", "搭积木"}, + ['stack_e']= {"堆积", "简单", "搭积木"}, + ['stack_h']= {"堆积", "困难", "搭积木"}, + ['stack_u']= {"堆积", "极限", "搭积木"}, ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, ['solo_e']= {"单挑", "简单", "打败AI"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 8a7e3d03..f3fbe43c 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -140,9 +140,9 @@ return{ ['dig_1000l']= {"挖掘", "1000L", "挖掘1000行"}, ['drought_n']= {"干旱", "100行", "你I没了"}, ['drought_l']= {"干旱+", "100行", "后 妈 发 牌"}, - ['stack_20l']= {"堆积", "20L", "搭积木"}, - ['stack_40l']= {"堆积", "40L", "搭积木"}, - ['stack_100l']= {"堆积", "100L", "搭积木"}, + ['stack_e']= {"堆积", "简单", "搭积木"}, + ['stack_h']= {"堆积", "困难", "搭积木"}, + ['stack_u']= {"堆积", "极限", "搭积木"}, ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, ['solo_e']= {"单挑", "简单", "打败机器人"}, diff --git a/parts/modes.lua b/parts/modes.lua index 7c6bfa69..ef69b019 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -1,7 +1,7 @@ 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','stack_20l'}}, + {name='sprint_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH','stack_e'}}, {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"}, @@ -12,9 +12,9 @@ return{ {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"}, - {name='stack_20l', x=-200, y=-400, size=40,shape=1,icon="mess", unlock={'stack_40l'}}, - {name='stack_40l', x=-400, y=-400, size=40,shape=1,icon="mess", unlock={'stack_100l'}}, - {name='stack_100l', x=-600, y=-400, size=40,shape=1,icon="mess"}, + {name='stack_e', x=-200, y=-400, size=40,shape=1,icon="mess", unlock={'stack_h'}}, + {name='stack_h', x=-400, y=-400, size=40,shape=1,icon="mess", unlock={'stack_u'}}, + {name='stack_u', x=-600, y=-400, size=40,shape=1,icon="mess"}, {name='dig_10l', x=-200, y=-200, size=40,shape=1,icon="dig_sprint",unlock={'dig_40l'}}, {name='dig_40l', x=-400, y=-200, size=40,shape=1,icon="dig_sprint",unlock={'dig_100l'}}, diff --git a/parts/modes/stack_20l.lua b/parts/modes/stack_e.lua similarity index 88% rename from parts/modes/stack_20l.lua rename to parts/modes/stack_e.lua index fcee7ae9..01bbc668 100644 --- a/parts/modes/stack_20l.lua +++ b/parts/modes/stack_e.lua @@ -1,7 +1,7 @@ local function getHoleCount(P) local hole=0 for x=1,10 do - for y=1,20 do + for y=1,100 do if not P:solid(x,y)then hole=hole+1 end @@ -13,13 +13,13 @@ return{ color=COLOR.cyan, env={ drop=60,lock=60, - freshLimit=15, - fieldH=20, + fieldH=100, highCam=true, fillClear=false, seqData={1,2,3,4,5,6,7}, bg='blockrain',bgm='there', }, + mesDisp=function(P)PLY.draw.drawTargetLine(P,100)end, score=function(P)return{getHoleCount(P),P.stat.time}end, scoreDisp=function(D)return D[1].." Holes".." "..STRING.time(D[2])end, comp=function(a,b)return a[1]