diff --git a/main.lua b/main.lua index 680dd2fe..363ad219 100644 --- a/main.lua +++ b/main.lua @@ -44,7 +44,7 @@ CUSTOMENV={ nextCount=6, nextStartPos=1, holdCount=1, - oncehold=true, + infHold=false, --Visual block=true, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 7f3a262d..d5dbebfb 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -344,7 +344,9 @@ return{ title="Custom Game", subTitle="Advance", - next="Next",hold="Hold",oncehold="Hold Once", + nextCount="Next", + holdCount="Hold", + infHold="Infinite Hold", block="Draw Block", ghost="Ghost", center="Center", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index dae81db0..3269cc07 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -350,7 +350,9 @@ return{ title="Mode personnalisé", subTitle="Avancer", - next="Prévisualisations de pièces",hold="Réserve",oncehold="Réserver une fois", + nextCount="Prévisualisations de pièces", + holdCount="Réserve", + -- infHold="Réserver une fois", block="Dessiner le bloc", ghost="Pièce fantôme", center="Centre", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 3893dc35..294b73df 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -348,7 +348,9 @@ return{ title="Juego Personalizado", subTitle="Avanzado", - next="Siguiente",hold="Reserva",oncehold="Hold Único", + nextCount="Siguiente", + holdCount="Reserva", + -- infHold="Hold Único", block="Dibujar Bloques", ghost="Fantasma", center="Centrar", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index e4d2cc27..74a31054 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -281,7 +281,9 @@ return{ title="!@#$%^&*", subTitle="##", - next="→",hold="[ ]",oncehold="[ ]*1", + nextCount="→", + holdCount="[ ]", + infHold="∞*[ ]", block="==↓==", ghost="__↓__", center="+", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 402f7a5e..f95fde2c 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -347,7 +347,9 @@ return{ title="自定义游戏", subTitle="高级", - next="Next",hold="Hold",oncehold="Hold一次", + nextCount="Next", + holdCount="Hold", + infHold="无限Hold", block="方块可见", ghost="阴影透明度", center="中心透明度", diff --git a/parts/modes/c4wtrain_normal.lua b/parts/modes/c4wtrain_normal.lua index 24103844..feae5bf8 100644 --- a/parts/modes/c4wtrain_normal.lua +++ b/parts/modes/c4wtrain_normal.lua @@ -18,7 +18,7 @@ end return{ color=COLOR.green, env={ - drop=30,lock=60,oncehold=false, + drop=30,lock=60,infHold=true, dropPiece=check_c4w, freshLimit=15,ospin=false, bg="rgb",bgm="oxygen", diff --git a/parts/modes/infinite.lua b/parts/modes/infinite.lua index c47a77bc..d6c405a3 100644 --- a/parts/modes/infinite.lua +++ b/parts/modes/infinite.lua @@ -3,7 +3,7 @@ return{ color=COLOR.white, env={ drop=1e99,lock=1e99, - oncehold=false, + infHold=true, bg="glow",bgm="infinite", }, load=function() diff --git a/parts/modes/infinite_dig.lua b/parts/modes/infinite_dig.lua index 022f22dd..9565052c 100644 --- a/parts/modes/infinite_dig.lua +++ b/parts/modes/infinite_dig.lua @@ -30,7 +30,7 @@ return{ color=COLOR.white, env={ drop=1e99,lock=1e99, - oncehold=false, + infHold=true, dropPiece=check_rise, pushSpeed=1.2, bg="wing",bgm="infinite", diff --git a/parts/modes/pcchallenge_normal.lua b/parts/modes/pcchallenge_normal.lua index 0038e889..18ff06dd 100644 --- a/parts/modes/pcchallenge_normal.lua +++ b/parts/modes/pcchallenge_normal.lua @@ -1,7 +1,7 @@ return{ color=COLOR.green, env={ - oncehold=false, + infHold=true, drop=300,lock=1e99, target=100,dropPiece=PLY.check_lineReach, ospin=false, diff --git a/parts/modes/round_1.lua b/parts/modes/round_1.lua index 12df5ecf..cd0d9815 100644 --- a/parts/modes/round_1.lua +++ b/parts/modes/round_1.lua @@ -14,7 +14,7 @@ return{ color=COLOR.cyan, env={ drop=300,lock=300, - oncehold=false, + infHold=true, dropPiece=update_round, bg="rainbow",bgm="push", }, diff --git a/parts/modes/round_2.lua b/parts/modes/round_2.lua index c9eac0d8..01c5cb8a 100644 --- a/parts/modes/round_2.lua +++ b/parts/modes/round_2.lua @@ -14,7 +14,7 @@ return{ color=COLOR.green, env={ drop=300,lock=300, - oncehold=false, + infHold=true, dropPiece=update_round, bg="rainbow",bgm="push", }, diff --git a/parts/modes/round_3.lua b/parts/modes/round_3.lua index bc31e8a7..13ba45cd 100644 --- a/parts/modes/round_3.lua +++ b/parts/modes/round_3.lua @@ -14,7 +14,7 @@ return{ color=COLOR.magenta, env={ drop=300,lock=300, - oncehold=false, + infHold=true, dropPiece=update_round, bg="rainbow",bgm="push", }, diff --git a/parts/modes/round_4.lua b/parts/modes/round_4.lua index d0152a1f..5ec61a0b 100644 --- a/parts/modes/round_4.lua +++ b/parts/modes/round_4.lua @@ -14,7 +14,7 @@ return{ color=COLOR.red, env={ drop=300,lock=300, - oncehold=false, + infHold=true, dropPiece=update_round, bg="rainbow",bgm="push", }, diff --git a/parts/modes/round_5.lua b/parts/modes/round_5.lua index 3562fab5..0bdb5916 100644 --- a/parts/modes/round_5.lua +++ b/parts/modes/round_5.lua @@ -14,7 +14,7 @@ return{ color=COLOR.lYellow, env={ drop=300,lock=300, - oncehold=false, + infHold=true, dropPiece=update_round, bg="rainbow",bgm="push", }, diff --git a/parts/modes/tech_normal.lua b/parts/modes/tech_normal.lua index b3fee72b..0f1a4bcc 100644 --- a/parts/modes/tech_normal.lua +++ b/parts/modes/tech_normal.lua @@ -11,7 +11,7 @@ end return{ color=COLOR.green, env={ - oncehold=false, + infHold=true, drop=1e99,lock=1e99, dropPiece=tech_check_easy, bg="matrix",bgm="new era", diff --git a/parts/modes/tech_normal2.lua b/parts/modes/tech_normal2.lua index 61806c97..74054621 100644 --- a/parts/modes/tech_normal2.lua +++ b/parts/modes/tech_normal2.lua @@ -16,7 +16,7 @@ end return{ color=COLOR.dGreen, env={ - oncehold=false, + infHold=true, drop=1e99,lock=1e99, dropPiece=tech_check_hard, bg="matrix",bgm="new era", diff --git a/parts/modes/tsd_easy.lua b/parts/modes/tsd_easy.lua index 1fbbab4b..b673b4a4 100644 --- a/parts/modes/tsd_easy.lua +++ b/parts/modes/tsd_easy.lua @@ -13,7 +13,7 @@ return{ color=COLOR.green, env={ drop=1e99,lock=1e99, - oncehold=false, + infHold=true, dropPiece=check_tsd, ospin=false, bg="matrix",bgm="push", diff --git a/parts/modes/zen.lua b/parts/modes/zen.lua index 3c8a231f..f2d8a195 100644 --- a/parts/modes/zen.lua +++ b/parts/modes/zen.lua @@ -2,7 +2,7 @@ return{ color=COLOR.lGrey, env={ drop=120,lock=120, - oncehold=false, + infHold=true, target=200,dropPiece=PLY.check_lineReach, bg="bg2",bgm="infinite", }, diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 9c79be3d..c9bf5fac 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -26,7 +26,7 @@ return{ wait=0,fall=0, bone=false, nextCount=6,nextStartPos=1, - holdCount=1,oncehold=true, + holdCount=1,infHold=false, ospin=true, RS="TRS", sequence="bag", diff --git a/parts/player/player.lua b/parts/player/player.lua index 4964103b..feefc1c2 100644 --- a/parts/player/player.lua +++ b/parts/player/player.lua @@ -544,7 +544,7 @@ function Player.hold(P,ifpre) P.cur,P.holdQueue[N]=H,C--Swap hold H,C=P.holdQueue[N],P.cur - if P.gameEnv.oncehold and(P.nextQueue[1]or C)then--Make hold available in fixed sequence + if not P.gameEnv.infHold and(P.nextQueue[1]or C)then--Make hold available in fixed sequence P.holdTime=P.holdTime-1 end @@ -611,7 +611,7 @@ function Player.popNext(P)--Pop nextQueue to hand local _=P.keyPressing --IHS - if _[8]and P.gameEnv.hold and P.gameEnv.ihs then + if _[8]and P.gameEnv.holdCount>0 and P.gameEnv.ihs then P:hold(true) _[8]=false else diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index a96b4208..be0eaf9f 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -13,9 +13,9 @@ WIDGET.init("custom_advance",{ WIDGET.newSwitch({name="bone", x=1190, y=550, disp=WIDGET.lnk_CUSval("bone"), code=WIDGET.lnk_CUSrev("bone")}), --Control - WIDGET.newSlider({name="next", x=130, y=410,w=200,unit=6, disp=WIDGET.lnk_CUSval("nextCount"),code=WIDGET.lnk_CUSsto("nextCount")}), - WIDGET.newSwitch({name="hold", x=260, y=480, disp=WIDGET.lnk_CUSval("hold"), code=WIDGET.lnk_CUSrev("hold")}), - WIDGET.newSwitch({name="oncehold", x=260, y=560, disp=WIDGET.lnk_CUSval("oncehold"), code=WIDGET.lnk_CUSrev("oncehold"),hide=function()return not CUSTOMENV.hold end}), + WIDGET.newSlider({name="nextCount", x=130, y=410,w=200,unit=6, disp=WIDGET.lnk_CUSval("nextCount"),code=WIDGET.lnk_CUSsto("nextCount")}), + WIDGET.newSlider({name="holdCount", x=130, y=480,w=200,unit=6, disp=WIDGET.lnk_CUSval("holdCount"),code=WIDGET.lnk_CUSsto("holdCount")}), + WIDGET.newSwitch({name="infHold", x=260, y=560, disp=WIDGET.lnk_CUSval("infHold"), code=WIDGET.lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}), WIDGET.newSlider({name="mindas", x=180, y=150,w=400,unit=15,font=25, disp=WIDGET.lnk_CUSval("mindas"), code=WIDGET.lnk_CUSsto("mindas")}), WIDGET.newSlider({name="minarr", x=180, y=220,w=400,unit=10,font=25, disp=WIDGET.lnk_CUSval("minarr"), code=WIDGET.lnk_CUSsto("minarr")}),