diff --git a/parts/eventsets/marathon_inf.lua b/parts/eventsets/marathon_inf.lua new file mode 100644 index 00000000..efe3883b --- /dev/null +++ b/parts/eventsets/marathon_inf.lua @@ -0,0 +1,25 @@ +local dropSpeed={50,40,30,24,18,14,10,8,6,5,4,3,2,1,1,.5,.5,.25,.125,0} + +return +{ + drop=60, + wait=8, + fall=20, + mesDisp=function(P) + PLY.draw.drawProgress(P.stat.row,P.modeData.target) + end, + task=function(P) + P.modeData.target=10 + end, + dropPiece=function(P) + if P.stat.row>=P.modeData.target then + if P.modeData.target>200 then + P:set20G(true) + else + P.gameEnv.drop=dropSpeed[P.modeData.target/10] + end + P.modeData.target=P.modeData.target+10 + SFX.play('reach') + end + end +} \ No newline at end of file diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 13fe9cb8..358aa6f9 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -757,6 +757,7 @@ return{ ['ultra']= {'Ultra', "EXTRA", "A 2-minute score attack"}, ['infinite']= {'infinite', "", "Just a sandbox"}, ['infinite_dig']= {"Infinite: Dig", "", "Dig-diggin'-dug"}, + ['marathon_inf']= {"Marathon", "INFINITE", "Infinite marathon."}, ['custom_clear']= {"Custom", "NORMAL"}, ['custom_puzzle']= {"Custom", "PUZZLE"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 462fa81d..e9b8d457 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -715,6 +715,7 @@ 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ú."}, + ['marathon_inf']= {"Maratón", "Infinito", "Infinito maratón."}, ['custom_clear']= {"Personalizado", "Normal"}, ['custom_puzzle']= {"Personalizado", "Puzzle"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index eaae6c37..bd6cb776 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -717,6 +717,7 @@ return{ ['ultra']= {'Ultra', "EXTRA", "2 minutes pour avoir le meilleur score."}, ['infinite']= {"Infini", "", "Mode tranquile."}, ['infinite_dig']= {"Infini : Dig", "", "Creuser, creuser, creuser."}, + ['marathon_inf']= {"Marathon", "Infini", "Infini marathon."}, ['custom_clear']= {"Perso.", "NORMAL"}, ['custom_puzzle']= {"Perso.", "PUZZLE"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index c29e0585..54d86a32 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -747,6 +747,7 @@ return{ ['ultra']= {'Ultra', "EXTRA", "Pegue a maior pontuação em 2 minutos."}, ['infinite']= {"Infinito", "", "Modo Sandbox."}, ['infinite_dig']= {"Infinito:Cave", "", "Cava, Cava, Cava."}, + ['marathon_inf']= {"Maratona", "Infinito", "Infinito maratona."}, ['custom_clear']= {"Custom", "NORMAL"}, ['custom_puzzle']= {"Custom", "PUZZLE"}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index c99b271b..73cf1d87 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -286,6 +286,7 @@ return{fallback='zh', ['ultra']= {"限时打分", "挑战", "2分钟刷分"}, ['infinite']= {"无尽", "", "真的有人会玩这个?"}, ['infinite_dig']= {"无尽:挖掘", "", "闲得慌就来挖"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 275c9efc..c88191bf 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -761,6 +761,7 @@ return{ ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, ['infinite']= {"无尽", "", "沙盒"}, ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh_full.lua b/parts/language/lang_zh_full.lua index f739bb2f..b686cadb 100644 --- a/parts/language/lang_zh_full.lua +++ b/parts/language/lang_zh_full.lua @@ -175,6 +175,7 @@ return{ ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, ['infinite']= {"无尽", "", "沙盒"}, ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 9cdd79f9..45e313b3 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -758,6 +758,7 @@ return{ ['ultra']= {"Ultra", "额外", "2分钟的得分进攻"}, ['infinite']= {"无限", "", "这只是一个沙箱"}, ['infinite_dig']= {"无限:挖掘", "", "挖，挖，挖"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"习俗", "正常"} , ['custom_puzzle']= {"习俗", "令人费解的"}, diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 62bede58..e45d771d 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -761,6 +761,7 @@ return{ ['ultra']= {"限時打分", "挑戰", "在兩分鐘內盡可能拿到最多的分數"}, ['infinite']= {"無盡", "", "沙盒"}, ['infinite_dig']= {"無盡:挖掘", "", "挖呀挖呀挖"}, + ['marathon_inf']= {"馬拉松", "無盡", "無盡馬拉松"}, ['custom_clear']= {"自定義", "普通"}, ['custom_puzzle']= {"自定義", "拼圖"}, diff --git a/parts/modes.lua b/parts/modes.lua index 819543af..4608b611 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -115,8 +115,9 @@ return{ {name='backfire_l', x=1050, y=350, size=40,shape=3,icon="backfire", unlock={'backfire_u'}}, {name='backfire_u', x=1250, y=350, size=35,shape=2,icon="backfire"}, - {name='zen', x=-800, y=-600, size=40,shape=1,icon="zen", unlock={'ultra','infinite','infinite_dig'}}, - {name='ultra', x=-1000, y=-600, size=40,shape=1,icon="ultra"}, - {name='infinite', x=-1000, y=-400, size=40,shape=1,icon='infinite'}, - {name='infinite_dig', x=-800, y=-400, size=40,shape=1,icon="dig"}, + {name='zen', x=-1000, y=-600, size=40,shape=1,icon="zen", unlock={'ultra','infinite','infinite_dig','marathon_inf'}}, + {name='ultra', x=-1200, y=-600, size=40,shape=1,icon="ultra"}, + {name='infinite', x=-1200, y=-400, size=40,shape=1,icon='infinite'}, + {name='infinite_dig', x=-1000, y=-400, size=40,shape=1,icon="dig"}, + {name='marathon_inf', x=-800, y=-400, size=40,shape=1,icon="marathon"} } diff --git a/parts/modes/marathon_inf.lua b/parts/modes/marathon_inf.lua new file mode 100644 index 00000000..121a868e --- /dev/null +++ b/parts/modes/marathon_inf.lua @@ -0,0 +1,10 @@ +return{ + color=COLOR.white, + env={ + noTele=true, + mindas=7,minarr=1,minsdarr=1, + sequence="bagES", + eventSet='marathon_inf', + bg='bg2',bgm='push', + }, +}