From f475fafbf1818ac7ac0b9f0610124b68d6248194 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 26 Sep 2021 01:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AA=E5=BD=A9?= =?UTF-8?q?=E8=9B=8B=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/eventsets/sprintMD.lua | 44 ++++++++++++++++++++++++++++++++++++ parts/language/lang_en.lua | 1 + parts/language/lang_es.lua | 1 + parts/language/lang_fr.lua | 1 + parts/language/lang_pt.lua | 1 + parts/language/lang_yygq.lua | 3 ++- parts/language/lang_zh.lua | 1 + parts/language/lang_zh2.lua | 3 ++- parts/language/lang_zh3.lua | 1 + parts/modes.lua | 1 + parts/modes/sprintMD.lua | 20 ++++++++++++++++ parts/scenes/stat.lua | 6 +++++ 12 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 parts/eventsets/sprintMD.lua create mode 100644 parts/modes/sprintMD.lua diff --git a/parts/eventsets/sprintMD.lua b/parts/eventsets/sprintMD.lua new file mode 100644 index 00000000..dcbe6aa1 --- /dev/null +++ b/parts/eventsets/sprintMD.lua @@ -0,0 +1,44 @@ +return{ + mesDisp=function(P) + setFont(55) + local r=40-P.stat.row + if r<0 then r=0 end + mStr(r,63,265) + PLY.draw.drawTargetLine(P,r) + end, + task=function(P) + YIELD() + while true do + for _=1,P.holeRND:random(40,200)do YIELD()end + local r=P.holeRND:random(7) + if r==1 then + if P.cur and not P:ifoverlap(P.cur.bk,P.curX-1,P.curY)then + P:createMoveFX('left') + P.curX=P.curX-1 + P:freshBlock('move') + end + elseif r==2 then + if P.cur and not P:ifoverlap(P.cur.bk,P.curX-1,P.curY)then + P:createMoveFX('left') + P.curX=P.curX-1 + P:freshBlock('move') + end + elseif r==3 then + P:act_rotRight() + elseif r==4 then + P:act_rotLeft() + elseif r==5 then + P:act_rot180() + elseif r==6 then + P:act_hardDrop() + elseif r==7 then + P:act_hold() + end + end + end, + dropPiece=function(P) + if P.stat.row>=40 then + P:win('finish') + end + end +} diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 9ef2b213..531fddba 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -838,6 +838,7 @@ return{ ['sprintLock']= {"Sprint", "NO ROTATIONS"}, ['sprintSmooth']= {"Sprint", "NO FRICTION"}, ['marathon_bfmax']={"Marathon", "ULTIMATE"}, + ['sprintMD']= {"Sprint", "MISDROP"}, ['master_l']= {"Master", "LUNATIC"}, ['master_u']= {"Master", "ULTIMATE"}, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index db89ae38..ea9bb8b4 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -746,6 +746,7 @@ return{ ['sprintLock']= {"Sprint", "Sin rotar"}, ['sprintSmooth']= {"Sprint", "SIN FRICCIÓN"}, ['marathon_bfmax']= {"Maratón", "Supremo"}, + -- ['sprintMD']= {"Sprint", "MISDROP"}, ['master_l']= {"Master", "Lunático"}, ['master_u']= {"Master", "Supremo"}, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 2f51217d..9efe9459 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -749,6 +749,7 @@ return{ ['sprintLock']= {"Sprint", "Sans rotation"}, -- ['sprintSmooth']= {"Sprint", "NO FRICTION"}, ['marathon_bfmax']={"Marathon", "ULTIME"}, + -- ['sprintMD']= {"Sprint", "MISDROP"}, ['master_l']= {"Master", "LUNATIQUE"}, ['master_u']= {"Master", "ULTIME"}, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 9649cad7..082a1900 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -831,6 +831,7 @@ return{ ['sprintLock']= {"Sprint", "SEM ROTAÇÃO"}, -- ['sprintSmooth']= {"Sprint", "NO FRICTION"}, ['marathon_bfmax']= {"Maratona", "ULTIMATE"}, + -- ['sprintMD']= {"Sprint", "MISDROP"}, ['master_l']= {"Mestre", "LUNÁTICO"}, ['master_u']= {"Mestre", "ULTIMATE"}, diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index feabd389..803f41d2 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -324,7 +324,8 @@ return{ ['sprintFix']= {"竞速", "无移动"}, ['sprintLock']= {"竞速", "无旋转"}, ['sprintSmooth']= {"竞速", "无摩擦"}, - ['marathon_bfmax']= {"马拉松", "极限"}, + ['marathon_bfmax']= {"马拉松", "极限"}, + ['sprintMD']= {"竞速", "MD"}, ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index ebe927a5..6fbbea19 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -843,6 +843,7 @@ return{ ['sprintLock']= {"竞速", "无旋转"}, ['sprintSmooth']= {"竞速", "无摩擦"}, ['marathon_bfmax']= {"马拉松", "极限"}, + ['sprintMD']= {"竞速", "MD"}, ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index f9dbf857..59f90ad5 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -232,7 +232,8 @@ return{ ['sprintFix']= {"竞速", "无移动"}, ['sprintLock']= {"竞速", "无旋转"}, ['sprintSmooth']= {"竞速", "无摩擦"}, - ['marathon_bfmax']= {"马拉松", "极限"}, + ['marathon_bfmax']= {"马拉松", "极限"}, + ['sprintMD']= {"竞速", "手滑"}, ['master_l']= {"大师", "疯狂"}, ['master_u']= {"大师", "极限"}, diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index befeeb8d..43b498f9 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -842,6 +842,7 @@ return{ ['sprintLock']= {"冲刺", "不轮换"}, ['sprintSmooth']= {"冲刺", "无摩擦"}, ['marathon_bfmax']={"马拉松赛跑", "终极"} , + ['sprintMD']= {"竞速", "失误"}, ['master_l']= {"主人", "疯子"}, ['master_u']= {"主人", "终极"} , diff --git a/parts/modes.lua b/parts/modes.lua index 086729b2..e3cf26f8 100644 --- a/parts/modes.lua +++ b/parts/modes.lua @@ -123,6 +123,7 @@ return{ {name='sprintLock'}, {name='sprintSmooth'}, {name='marathon_bfmax'}, + {name='sprintMD'}, --Old {name='master_l'}, diff --git a/parts/modes/sprintMD.lua b/parts/modes/sprintMD.lua new file mode 100644 index 00000000..566d48ea --- /dev/null +++ b/parts/modes/sprintMD.lua @@ -0,0 +1,20 @@ +return{ + color=COLOR.green, + env={ + drop=60,lock=60, + eventSet='sprintMD', + bg='aura',bgm='waterfall', + }, + getRank=function(P) + if P.stat.row<40 then return end + local T=P.stat.time + return + T<=30 and 5 or + T<=42 and 5 or + T<=60 and 4 or + T<=100 and 3 or + T<=150 and 2 or + T<=210 and 1 or + 0 + end, +} diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index c02eb386..6f30ea7d 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -47,6 +47,12 @@ function scene.sceneInit() end end +function scene.mouseDown(x,y) + if x>35 and y>515 and x<490 and y<705 then + loadGame('sprintMD',true) + end +end + function scene.draw() local minoColor,skinSet=minoColor,SETTING.skin local A,B=form.A1,form.A2