SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加防止死亡延时 close #459

Browse Source
This commit is contained in:
MrZ626
2021-11-16 11:18:32 +08:00
parent d85d92fb43
commit 26682509f7
12 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
parts/customEnv0.lua
View File

@@ -13,6 +13,7 @@ return{
holdCount=1,
infHold=true,
phyHold=false,
hang=0,
--Visual
bone=false,

1
parts/language/lang_en.lua
View File

@@ -478,6 +478,7 @@ return{
lock="Lock Delay",
wait="Entry Delay",
fall="Line Delay",
hang="Death Delay",
bg="Background",
bgm="Music",

1
parts/language/lang_es.lua
View File

@@ -443,6 +443,7 @@ return{
lock="Retraso de Bloqueo",
wait="Retraso de Spawneo",
fall="Retraso de Línea",
-- hang="Death Delay",
bg="Fondo",
bgm="Música",

1
parts/language/lang_fr.lua
View File

@@ -444,6 +444,7 @@ return{
lock="Délai de verrouillage",
wait="Délai d'apparition",
fall="Délai de ligne",
-- hang="Death Delay",
bg="Arrière-plan",
bgm="Musique",

1
parts/language/lang_pt.lua
View File

@@ -466,6 +466,7 @@ return{
lock="Delay Trava",
wait="Delay Entrada",
fall="Delay Linha",
-- hang="Death Delay",
bg="Fundo",
bgm="Música",

1
parts/language/lang_symbol.lua
View File

@@ -351,6 +351,7 @@ return{
lock="↓_",
wait="→=",
fall="↓=",
hang=":(=",
bg="{~}",
bgm="(~)",

1
parts/language/lang_zh.lua
View File

@@ -478,6 +478,7 @@ return{
lock="锁定延迟",
wait="出块等待",
fall="消行延迟",
hang="死亡延迟",
bg="背景",
bgm="音乐",

1
parts/language/lang_zh_grass.lua
View File

@@ -475,6 +475,7 @@ return{
lock="锁定延迟",
wait="进入延迟",
fall="线路延迟",
hang="死亡延迟",
bg="背景",
bgm="音乐",

1
parts/language/lang_zh_trad.lua
View File

@@ -476,6 +476,7 @@ return{
lock="鎖定延遲",
wait="方塊生成等待",
fall="行清除延遲",
hang="死亡延遲",
bg="背景",
bgm="音樂",

2
parts/player/gameEnv0.lua
View File

@@ -3,7 +3,7 @@ return{
dascut=0,dropcut=0,
sddas=2,sdarr=2,
ihs=true,irs=true,ims=true,
FTLock=true,
hang=0,FTLock=true,
ghostType='gray',
block=true,ghost=.3,center=1,

9
parts/player/player.lua
View File

@@ -1256,6 +1256,7 @@ do
piece.curX,piece.curY,piece.dir=self.curX,self.curY,C.dir
piece.centX,piece.centY=self.curX+sc[2],self.curY+sc[1]
piece.frame,piece.autoLock=self.frameRun,autoLock
self.waiting=ENV.wait
--Tri-corner spin check
@@ -1642,6 +1643,14 @@ do
end
end
--Prevent sudden death if hang>0
if ENV.hang>ENV.wait and self.nextQueue[1]then
local B=self.nextQueue[1]
if self:ifoverlap(B.bk,int(6-#B.bk[1]*.5),int(ENV.fieldH+1-modf(B.RS.centerPos[B.id][B.dir][1]))+ceil(self.fieldBeneath/30))then
self.waiting=self.waiting+ENV.hang
end
end
--Check bot things
if self.bot then
self.bot:checkDest()

4
parts/scenes/customGame.lua
View File

@@ -16,6 +16,7 @@ local sList={
lock={0,1,2,3,4,5,6,7,8,9,10,12,14,16,18,20,25,30,40,60,180,1e99},
wait={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
fall={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
hang={0,1,2,3,4,5,6,7,8,10,15,20,30,60},
eventSet=EVENTSETS,
holdMode={'hold','swap'},
}
@@ -211,6 +212,7 @@ scene.widgetList={
WIDGET.newSelector{name='lock', x=730,y=410,w=260,color='O',list=sList.lock,disp=CUSval('lock'),code=CUSsto('lock')},
WIDGET.newSelector{name='wait', x=730,y=520,w=260,color='G',list=sList.wait,disp=CUSval('wait'),code=CUSsto('wait')},
WIDGET.newSelector{name='fall', x=730,y=600,w=260,color='G',list=sList.fall,disp=CUSval('fall'),code=CUSsto('fall')},
WIDGET.newSelector{name='hang', x=730,y=680,w=260,color='G',list=sList.hang,disp=CUSval('hang'),code=CUSsto('hang')},
--Copy / Paste / Start
WIDGET.newButton{name='copy', x=1070,y=300,w=310,h=70,color='lR',font=25,code=pressKey"cC"},
@@ -220,7 +222,7 @@ scene.widgetList={
WIDGET.newButton{name='back', x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=pressKey"escape"},
--Rule set
WIDGET.newSelector{name='eventSet', x=930, y=740,w=360,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')},
WIDGET.newSelector{name='eventSet', x=1050,y=740,w=340,color='H',list=sList.eventSet,disp=CUSval('eventSet'),code=CUSsto('eventSet')},
--Special rules
WIDGET.newSwitch{name='ospin', x=850, y=810,lim=210,disp=CUSval('ospin'), code=CUSrev('ospin')},