From 28bd794bf8bac7d0a91f7701e59823045cfc4f47 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 6 Nov 2020 16:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=886=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E6=B6=88=E4=BA=94=E5=92=8C=E6=B6=88?= =?UTF-8?q?=E5=85=AD=E7=9A=84=E6=98=BE=E7=A4=BA=E5=90=8D=E5=AD=97=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=94=BB=E5=87=BB=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LANG/lang_en.lua | 2 +- LANG/lang_fr.lua | 2 +- LANG/lang_sp.lua | 2 +- LANG/lang_symbol.lua | 2 +- LANG/lang_yygq.lua | 2 +- LANG/lang_zh.lua | 2 +- LANG/lang_zh2.lua | 2 +- parts/player.lua | 34 +++++++++++++++++----------------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/LANG/lang_en.lua b/LANG/lang_en.lua index d8e6a94f..ca37fb1c 100644 --- a/LANG/lang_en.lua +++ b/LANG/lang_en.lua @@ -10,7 +10,7 @@ return{ royale_remain="$1 Players Remaining", cmb={nil,"1 Combo","2 Combo","3 Combo","4 Combo","5 Combo","6 Combo","7 Combo","8 Combo","9 Combo","10 Combo!","11 Combo!","12 Combo!","13 Combo!","14 Combo!!","15 Combo!!","16 Combo!!","17 Combo!!!","18 Combo!!!","19 Combo!!!","MEGACMB"}, spin="-Spin ", - clear={"Single","Double","Triple","Techrash","Techrash+"}, + clear={"Single","Double","Triple","Techrash","Pentcrash","Hexcrash"}, mini="Mini",b2b="B2B ",b3b="B2B2B ", PC="Perfect Clear",HPC="Clear", hold="HOLD",next="NEXT", diff --git a/LANG/lang_fr.lua b/LANG/lang_fr.lua index 906cf290..262574bc 100644 --- a/LANG/lang_fr.lua +++ b/LANG/lang_fr.lua @@ -11,7 +11,7 @@ return{ royale_remain="$1 Joueurs restants", cmb={nil,"1 Combo","2 Combo","3 Combo","4 Combo","5 Combo","6 Combo","7 Combo","8 Combo","9 Combo","10 Combo!","11 Combo!","12 Combo!","13 Combo!","14 Combo!!","15 Combo!!","16 Combo!!","17 Combo!!!","18 Combo!!!","19 Combo!!!","MEGACMB"}, spin="-Spin ", - clear={"Simple","Double","Triple","Techrash","Techrash+"}, + clear={"Simple","Double","Triple","Techrash","Pentcrash","Hexcrash"}, mini="Mini",b2b="B2B ",b3b="B2B2B ", PC="Perfect Clear",HPC="Clear", hold="RESERVE",next="SUIVANT", diff --git a/LANG/lang_sp.lua b/LANG/lang_sp.lua index 40cc840a..0fa7aa7c 100644 --- a/LANG/lang_sp.lua +++ b/LANG/lang_sp.lua @@ -11,7 +11,7 @@ return{ royale_remain="$1 Jugadores Restantes", cmb={nil,"Combo de 1","Combo de 2","Combo de 3","Combo de 4","Combo de 5","Combo de 6","Combo de 7","Combo de 8","Combo de 9","¡Combo de 10!","¡Combo de 11!","¡Combo de 12!","¡Combo de 13!","¡Combo de 14!","¡Combo de 15!","¡Combo de 16!","¡Combo de 17!","¡Combo de 18!","¡Combo de 19!","MEGACOMBO"}, spin="-spin ", - clear={"single","doble","triple","Techrash","Techrash+"}, + clear={"single","doble","triple","Techrash","Pentcrash","Hexcrash"}, mini="Mini",b2b="B2B ",b3b="B2B2B ", PC="Perfect Clear",HPC="Half Clear", hold="Reserva",next="Siguiente", diff --git a/LANG/lang_symbol.lua b/LANG/lang_symbol.lua index 779be4a9..17865752 100644 --- a/LANG/lang_symbol.lua +++ b/LANG/lang_symbol.lua @@ -11,7 +11,7 @@ return{ royale_remain="$1 ~", cmb={nil,"!","!!","!!!","!!!!","!!!!!","!!!!!!","!!!!!!!","!!!!!!!!","!!!!!!!!!","!!!!!!!!!!","!!!!!!!!!!!","!!!!!!!!!!!!","!!!!!!!!!!!!!","!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!!!","!!!!!!!!!!!!!!!!!!!!",}, spin=" ~", - clear={"1","2","3","4","5"}, + clear={"1","2","3","4","5","6"}, mini="v",b2b="^ ",b3b="^^ ", PC="#<>#",HPC="<>", hold="[ ]",next="→", diff --git a/LANG/lang_yygq.lua b/LANG/lang_yygq.lua index 474dd6cb..c0321a3e 100644 --- a/LANG/lang_yygq.lua +++ b/LANG/lang_yygq.lua @@ -7,7 +7,7 @@ return{ royale_remain="剩 $1 人", cmb={nil,"1连","2连","3连","4连","5连","6连","7连","8连","9连","10连!","11连!","12连!","13连!","14连!","15连!","16连!","17连!","18连!","19连!","MEGACMB"}, spin="旋", - clear={"消一","消二","消三","消四","卧槽"}, + clear={"消一","消二","消三","消四","卧槽","离谱"}, mini="矬",b2b="牛逼",b3b="很牛逼", PC="消干净了",HPC="消挺干净", diff --git a/LANG/lang_zh.lua b/LANG/lang_zh.lua index 7d13ad2c..52d08b0c 100644 --- a/LANG/lang_zh.lua +++ b/LANG/lang_zh.lua @@ -10,7 +10,7 @@ return{ royale_remain="剩余 $1 名玩家", cmb={nil,"1 Combo","2 Combo","3 Combo","4 Combo","5 Combo","6 Combo","7 Combo","8 Combo","9 Combo","10 Combo!","11 Combo!","12 Combo!","13 Combo!","14 Combo!","15 Combo!","16 Combo!","17 Combo!","18 Combo!","19 Combo!","MEGACMB"}, spin="-spin ", - clear={"single","double","triple","Techrash","Techrach+"}, + clear={"single","double","triple","Techrash","Pentcrash","Hexcrash"}, mini="Mini",b2b="B2B ",b3b="B2B2B ", PC="Perfect Clear",HPC="Half Clear", hold="暂存",next="下一个", diff --git a/LANG/lang_zh2.lua b/LANG/lang_zh2.lua index a47935ad..5057971a 100644 --- a/LANG/lang_zh2.lua +++ b/LANG/lang_zh2.lua @@ -1,7 +1,7 @@ return{ cmb={nil,"1连击","2连击","3连击","4连击","5连击","6连击","7连击","8连击","9连击","10连击!","11连击!","12连击!","13连击!","14连击!","15连击!","16连击!","17连击!","18连击!","19连击!","巨型连击"}, spin="型回旋", - clear={"单清","双清","三清","四清","五清"}, + clear={"单清","双清","三清","四清","五清","六清"}, mini="迷你",b2b="满贯",b3b="大满贯", PC="场地全清",HPC="场地半清", diff --git a/parts/player.lua b/parts/player.lua index b119597e..19e28202 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -1035,8 +1035,8 @@ local function getNewStatTable() maxCombo=0,maxFinesseCombo=0, } for i=1,25 do - T.clear[i]={0,0,0,0,0} - T.spin[i]={0,0,0,0,0,0} + T.clear[i]={0,0,0,0,0,0} + T.spin[i]={0,0,0,0,0,0,0} T.clears[i]=0 T.spins[i]=0 end @@ -2067,11 +2067,11 @@ do--player.drop(P)--Place piece --Mini*=.6 local reAtk={0,0,1,1,1,2,2,3,3} local reDef={0,1,1,2,3,3,4,4,5} - local spinName={"zspin","sspin","jspin","lspin","tspin","ospin","ispin","zspin","sspin","pspin","qspin","fspin","espin","tspin","uspin","vspin","wspin","xspin","jspin","lspin","rspin","yspin","hspin","nspin","ispin"} - local clearName={"single","double","triple","techrash","pentcrash"} - local spin_n={[0]="spin_0","spin_1","spin_2","spin_3","spin_3","spin_3"} - local clear_n={"clear_1","clear_2","clear_3","clear_4","clear_4"} - local ren_n={}for i=1,11 do ren_n[i]="ren_"..i end + local spinVoice={"zspin","sspin","jspin","lspin","tspin","ospin","ispin","zspin","sspin","pspin","qspin","fspin","espin","tspin","uspin","vspin","wspin","xspin","jspin","lspin","rspin","yspin","hspin","nspin","ispin"} + local clearVoice={"single","double","triple","techrash","pentcrash","hexcrash"} + local spinSFX={[0]="spin_0","spin_1","spin_2"} + local clearSFX={"clear_1","clear_2","clear_3"} + local renSFX={}for i=1,11 do renSFX[i]="ren_"..i end local finesseList={ [1]={ {1,2,1,0,1,2,2,1}, @@ -2334,14 +2334,14 @@ do--player.drop(P)--Place piece C.mini=mini C.special=true if P.sound then - SFX.play(spin_n[cc]) - VOC.play(spinName[CB.name],CHN) + SFX.play(spinSFX[cc]or"spin_3") + VOC.play(spinVoice[CB.name],CHN) end elseif cc>=4 then - cscore=cc==4 and 1000 or 1500 + cscore=cc==4 and 1000 or cc==5 and 1500 or 2000 if P.b2b>1000 then P:showText(text.b3b..text.clear[cc],0,-30,50,"fly") - atk=cc*1.5 + atk=4*cc-10 sendTime=100 exblock=exblock+1 cscore=cscore*1.8 @@ -2352,7 +2352,7 @@ do--player.drop(P)--Place piece elseif P.b2b>=50 then P:showText(text.b2b..text.clear[cc],0,-30,50,"drive") sendTime=80 - atk=cc+1 + atk=3*cc-7 cscore=cscore*1.3 STAT.b2b=STAT.b2b+1 if P.sound then @@ -2361,7 +2361,7 @@ do--player.drop(P)--Place piece else P:showText(text.clear[cc],0,-30,70,"stretch") sendTime=60 - atk=cc + atk=2*cc-4 end P.b2b=P.b2b+cc*100-300 C.special=true @@ -2369,7 +2369,7 @@ do--player.drop(P)--Place piece C.special=false end if P.sound then - VOC.play(clearName[cc],CHN) + VOC.play(clearVoice[cc],CHN) end --PC/HPC bonus @@ -2517,8 +2517,8 @@ do--player.drop(P)--Place piece --SFX & Vibrate if P.sound then - SFX.play(clear_n[cc]) - SFX.play(ren_n[min(cmb,11)]) + SFX.play(clearSFX[cc]or"clear_4") + SFX.play(renSFX[min(cmb,11)]) if cmb>14 then SFX.play("ren_mega",(cmb-10)*.1)end VIB(cc+1) end @@ -2531,7 +2531,7 @@ do--player.drop(P)--Place piece P.b2b=P.b2b+20 if P.sound then SFX.play("spin_0") - VOC.play(spinName[CB.name],CHN) + VOC.play(spinVoice[CB.name],CHN) end cscore=30 end