From fce08c83ef9f777d00f44a70b42f5ac4f1fc279f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 12 Nov 2021 21:17:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A0=86=E7=A7=AF=E6=A8=A1=E5=BC=8F=E7=A7=BB?= =?UTF-8?q?=E5=87=BA=E5=9C=B0=E5=9B=BE=EF=BC=8C=E5=88=A0=E9=99=A4h?= =?UTF-8?q?=E9=9A=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 2 +- parts/eventsets/stack_h.lua | 22 ---------------------- parts/language/lang_en.lua | 3 --- parts/language/lang_es.lua | 3 --- parts/language/lang_fr.lua | 1 - parts/language/lang_pt.lua | 1 - parts/language/lang_yygq.lua | 3 --- parts/language/lang_zh.lua | 3 --- parts/language/lang_zh_full.lua | 3 --- parts/language/lang_zh_grass.lua | 3 --- parts/language/lang_zh_trad.lua | 3 --- parts/modes.lua | 6 +----- parts/modes/stack_e.lua | 13 ------------- parts/modes/stack_h.lua | 24 ------------------------ parts/modes/stack_u.lua | 13 ------------- 15 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 parts/eventsets/stack_h.lua delete mode 100644 parts/modes/stack_h.lua diff --git a/main.lua b/main.lua index 896f63d1..9f1cd3b7 100644 --- a/main.lua +++ b/main.lua @@ -450,7 +450,7 @@ do fs.remove('record/round_l.rec') fs.remove('record/round_u.rec') end - if STAT.version<1604 then + if RANKS.stack_e then RANKS.stack_e=nil RANKS.stack_h=nil RANKS.stack_u=nil diff --git a/parts/eventsets/stack_h.lua b/parts/eventsets/stack_h.lua deleted file mode 100644 index a1f80bb0..00000000 --- a/parts/eventsets/stack_h.lua +++ /dev/null @@ -1,22 +0,0 @@ -return{ - fieldH=21, - fillClear=false, - mesDisp=function(P) - setFont(60) - mStr(P.stat.row,63,280) - mText(TEXTOBJ.line,63,350) - PLY.draw.drawMarkLine(P,18,.3,1,1,TIME()%.42<.21 and .95 or .6) - end, - dropPiece=function(P) - if #P.field>20 then - local cc=P:clearFilledLines(P.garbageBeneath+1,#P.field-P.garbageBeneath) - local h=20-cc-P.garbageBeneath-2 - if h>0 then - P:garbageRise(21,h,2e10-1) - if P.garbageBeneath>=20 then - P:lose() - end - end - end - end, -} \ No newline at end of file diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index b484b8af..d23a191b 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -677,9 +677,6 @@ return{ ['dig_400l']= {"Dig", "400L", "Dig 400 garbage lines"}, ['drought_n']= {"Drought", "100L", "No I-pieces available"}, ['drought_l']= {"Drought+", "100L", "W T F"}, - ['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 increasing 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 43d0fb3e..8458c266 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -636,9 +636,6 @@ return{ ['dig_400l']= {"Queso", "400L", "Limpia 400 líneas de queso."}, ['drought_n']= {"Sequía", "100L", "¡Sin piezas I!"}, ['drought_l']= {"Sequía+", "100L", "Guat de foc..."}, - ['stack_e']= {"Stack", "Fácil", "¡Sin dejar huecos!"}, - ['stack_h']= {"Stack", "Difícil", "¡Sin dejar huecos!"}, - ['stack_u']= {"Stack", "Supremo", "¡Sin dejar huecos!"}, ['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 ab31ce49..8358cc73 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -638,7 +638,6 @@ return{ ['drought_n']= {"Drought", "100L", "Pas de pièce I !"}, ['drought_l']= {"Drought+", "100L", "WTF ??!!"}, -- ['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"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index b39855eb..e0e24afc 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -668,7 +668,6 @@ return{ ['drought_n']= {"Drought", "100L", "Sem peça I !"}, ['drought_l']= {"Drought+", "100L", "WTF"}, -- ['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."}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index 5c80cf32..1c98fa4b 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -206,9 +206,6 @@ return{fallback='zh', ['dig_400l']= {"挖掘", "400L", "挖400行"}, ['drought_n']= {"干旱", "100L", "放轻松,简单得很"}, ['drought_l']= {"干旱+", "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 bbd874f5..bd7d42f9 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -681,9 +681,6 @@ return{ ['dig_400l']= {"挖掘", "400L", "挖掘400行"}, ['drought_n']= {"干旱", "100L", "你I没了"}, ['drought_l']= {"干旱+", "100L", "后 妈 发 牌"}, - ['stack_e']= {"堆积", "简单", "搭积木"}, - ['stack_h']= {"堆积", "困难", "搭积木"}, - ['stack_u']= {"堆积", "极限", "搭积木"}, ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, ['solo_e']= {"单挑", "简单", "打败AI"}, diff --git a/parts/language/lang_zh_full.lua b/parts/language/lang_zh_full.lua index bb580f2c..be81abd4 100644 --- a/parts/language/lang_zh_full.lua +++ b/parts/language/lang_zh_full.lua @@ -95,9 +95,6 @@ return{ ['dig_400l']= {"挖掘", "400L", "挖掘400行"}, ['drought_n']= {"干旱", "100行", "你I没了"}, ['drought_l']= {"干旱+", "100行", "后 妈 发 牌"}, - ['stack_e']= {"堆积", "简单", "搭积木"}, - ['stack_h']= {"堆积", "困难", "搭积木"}, - ['stack_u']= {"堆积", "极限", "搭积木"}, ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, ['solo_e']= {"单挑", "简单", "打败机器人"}, diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index a4507d44..72ef1cc0 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -678,9 +678,6 @@ return{ ['dig_400l']= {"挖掘", "400升", "挖400条垃圾线"}, ['drought_n']= {"干旱", "100升", "没有工装"}, ['drought_l']= {"干旱+", "100升", "搞什么呀"}, - ['stack_e']= {"堆栈", "容易", "打包！"}, - ['stack_h']= {"堆栈", "硬的", "打包！"}, - ['stack_u']= {"堆栈", "终极", "打包！"}, ['marathon_n']= {"马拉松赛跑", "正常", "200线加速马拉松"}, ['marathon_h']= {"马拉松赛跑", "硬的", "200线高速马拉松"}, ['solo_e']= {"战争", "容易", "打败AI！"}, diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 8425816f..8dc8e969 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -681,9 +681,6 @@ return{ ['dig_400l']= {"挖掘", "400L", "挖掘400行"}, ['drought_n']= {"乾旱", "100L", "你I沒了"}, ['drought_l']= {"乾旱+", "100L", "後 媽 發 牌"}, - ['stack_e']= {"堆疊", "簡單", "搭積木"}, - ['stack_h']= {"堆疊", "困難", "搭積木"}, - ['stack_u']= {"堆疊", "極限", "搭積木"}, ['marathon_n']= {"馬拉松", "普通", "200行加速馬拉松"}, ['marathon_h']= {"馬拉松", "困難", "200行高速馬拉松"}, ['solo_e']= {"單挑", "簡單", "打敗AI"}, diff --git a/parts/modes.lua b/parts/modes.lua index b451567e..54555e9b 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_e'}}, + {name='sprint_40l', x=0, y=-300, size=40,shape=1,icon="sprint2", unlock={'dig_10l','sprint_100l','marathon_n','sprintPenta','sprintMPH'}}, {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,10 +12,6 @@ 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_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'}}, {name='dig_100l', x=-600, y=-200, size=40,shape=1,icon="dig_sprint", unlock={'dig_400l'}}, diff --git a/parts/modes/stack_e.lua b/parts/modes/stack_e.lua index f9cdef62..9f977352 100644 --- a/parts/modes/stack_e.lua +++ b/parts/modes/stack_e.lua @@ -8,17 +8,4 @@ return{ eventSet='stack_e', bg='blockrain',bgm='there', }, - score=function(P)return{P.stat.row,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines".." "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=200 and 5 or - L>=175 and 4 or - L>=150 and 3 or - L>=120 and 2 or - L>=90 and 1 or - L>=30 and 0 - end, } diff --git a/parts/modes/stack_h.lua b/parts/modes/stack_h.lua deleted file mode 100644 index e6eb2911..00000000 --- a/parts/modes/stack_h.lua +++ /dev/null @@ -1,24 +0,0 @@ -return{ - env={ - drop=60,lock=60, - wait=0,fall=50, - highCam=false, - garbageSpeed=30, - seqData={1,2,3,4,5,6,7,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25}, - eventSet='stack_h', - bg='blockrain',bgm='there', - }, - score=function(P)return{P.stat.row,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines".." "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=80 and 5 or - L>=70 and 4 or - L>=60 and 3 or - L>=50 and 2 or - L>=35 and 1 or - L>=20 and 0 - end, -} \ No newline at end of file diff --git a/parts/modes/stack_u.lua b/parts/modes/stack_u.lua index 1ee33bfb..c0d1f32a 100644 --- a/parts/modes/stack_u.lua +++ b/parts/modes/stack_u.lua @@ -8,17 +8,4 @@ return{ eventSet='stack_u', bg='blockrain',bgm='there', }, - score=function(P)return{P.stat.row,P.stat.time}end, - scoreDisp=function(D)return D[1].." Lines".." "..STRING.time(D[2])end, - comp=function(a,b)return a[1]>b[1]or a[1]==b[1]and a[2]=60 and 5 or - L>=50 and 4 or - L>=45 and 3 or - L>=30 and 2 or - L>=20 and 1 or - L>=10 and 0 - end, } \ No newline at end of file