diff --git a/parts/language/dict_en.lua b/parts/language/dict_en.lua index ab6f1772..95b3cda6 100644 --- a/parts/language/dict_en.lua +++ b/parts/language/dict_en.lua @@ -1266,12 +1266,12 @@ return{ "(Zǐ Xīn Koishi)\n\nTetris Research community member, Virtual content creator.\nA top Tetris 99 players known for his strategies.", "https://space.bilibili.com/147529", }, - {"ditoly", - "ditoly icrem kuimei jk", - "name", - "Tetris Research community member. The developer of Nanamino.", - "https://space.bilibili.com/13014410", - }, + {"ditoly", + "ditoly icrem kuimei jk", + "name", + "Tetris Research community member. The developer of Nanamino.", + "https://space.bilibili.com/13014410", + }, {"蓝绿", "lanlv lanlyu gompyn imple lee blari'o blariho", "name", diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 358aa6f9..f03455b3 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -757,7 +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."}, + ['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 e9b8d457..c6bd3589 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -715,7 +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."}, + ['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 bd6cb776..020cbdef 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -717,7 +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."}, + ['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 54d86a32..5be71dbf 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -747,7 +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."}, + ['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 30945da3..5f37f667 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -286,7 +286,7 @@ return{fallback='zh', ['ultra']= {"限时打分", "挑战", "2分钟刷分"}, ['infinite']= {"无尽", "", "真的有人会玩这个?"}, ['infinite_dig']= {"无尽:挖掘", "", "闲得慌就来挖"}, - ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 1e921b3d..bb2076f5 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -761,7 +761,7 @@ return{ ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, ['infinite']= {"无尽", "", "沙盒"}, ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, - ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, @@ -783,8 +783,8 @@ return{ "《游戏的意义》", "《知识的力量》", "《主题曲进化史》", - "∫u dv=uv-∫v du", "↑↑↓↓←→←→BA", + "∫u dv=uv-∫v du", "$include", "0next 0hold.", "11renPC!", @@ -1068,7 +1068,7 @@ return{ "Staff名单里飘过的是赞助榜单,喜欢本游戏的话可以给我们打赞助支持开发哦~", "STSD必死", "sudo rm -rf /*", - "Techmino = Technique + tetromino", + "Techmino = Technique + Tetromino", "Techmino 好玩!", "Techmino 濂界帺锛", "Techmino 英['tɛkmɪnəʊ] 美/'tekmɪnoʊ/ n.铁壳米诺(游戏名)", @@ -1076,7 +1076,7 @@ return{ "Techmino安卓下载", "Techmino不是工业产品也不是练手程序,是游戏作品(至少目前是,嗯……)", "Techmino好玩!", - "Techmino没有抽卡没有氪金没有逼肝,良不良心~", + "Techmino没有氪金没有逼肝,良不良心~", "Techmino生日不太清楚,那就定在2019.6.26吧", "Techmino也有节日主题了哦", "Techmino有一个Nspire-CX版本!", diff --git a/parts/language/lang_zh_full.lua b/parts/language/lang_zh_full.lua index e00d49d9..0d8fa57d 100644 --- a/parts/language/lang_zh_full.lua +++ b/parts/language/lang_zh_full.lua @@ -175,7 +175,7 @@ return{ ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, ['infinite']= {"无尽", "", "沙盒"}, ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, - ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"自定义", "普通"}, ['custom_puzzle']= {"自定义", "拼图"}, diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index e96e2088..6190ce0a 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -758,7 +758,7 @@ return{ ['ultra']= {"Ultra", "额外", "2分钟的得分进攻"}, ['infinite']= {"无限", "", "这只是一个沙箱"}, ['infinite_dig']= {"无限:挖掘", "", "挖,挖,挖"}, - ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, + ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, ['custom_clear']= {"习俗", "正常"} , ['custom_puzzle']= {"习俗", "令人费解的"}, diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 0fd52c6e..fef41fda 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -761,7 +761,7 @@ return{ ['ultra']= {"限時打分", "挑戰", "在兩分鐘內盡可能拿到最多的分數"}, ['infinite']= {"無盡", "", "沙盒"}, ['infinite_dig']= {"無盡:挖掘", "", "挖呀挖呀挖"}, - ['marathon_inf']= {"馬拉松", "無盡", "無盡馬拉松"}, + ['marathon_inf']= {"馬拉松", "無盡", "無盡馬拉松"}, ['custom_clear']= {"自定義", "普通"}, ['custom_puzzle']= {"自定義", "拼圖"}, diff --git a/parts/modes.lua b/parts/modes.lua index 4608b611..89a7ceee 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -119,5 +119,5 @@ return{ {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"} + {name='marathon_inf', x=-800, y=-400, size=40,shape=1,icon="marathon"} } diff --git a/parts/scenes/app_dropper.lua b/parts/scenes/app_dropper.lua index 19b784c3..d0c4b7c1 100644 --- a/parts/scenes/app_dropper.lua +++ b/parts/scenes/app_dropper.lua @@ -51,7 +51,7 @@ function scene.keyDown(key,isRep) move.x=move.x-10 end end - SFX.play('swipe') + SFX.play('hold') state='drop' elseif state=='dead'then move.x,move.y,move.l=1e99,0,0 diff --git a/parts/scenes/app_pong.lua b/parts/scenes/app_pong.lua index 14d96696..615b72cb 100644 --- a/parts/scenes/app_pong.lua +++ b/parts/scenes/app_pong.lua @@ -138,7 +138,7 @@ function scene.update() if bx<-120 or bx>1400 or by<-40 or by>760 then P=bx>640 and p1 or p2 P.score=P.score+1 - TEXT.show("+1",bx>1400 and 470 or 810,226,50,'score') + TEXT.show("+1",P==p1 and 470 or 810,226,50,'score') SFX.play('reach') state=0