From d3e4d7e62c5faf1fd9ec0832d8630f24e0921c5f Mon Sep 17 00:00:00 2001
From: Imple Lee <80144331+ImpleLee@users.noreply.github.com>
Date: Mon, 4 Dec 2023 19:23:01 +0800
Subject: [PATCH] add hold i_s from next (#1061)

---
 parts/player/init.lua   |  1 +
 parts/player/player.lua | 20 ++++++++++++++++----
 version.lua             |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/parts/player/init.lua b/parts/player/init.lua
index 1d8dc645..b573f4aa 100644
--- a/parts/player/init.lua
+++ b/parts/player/init.lua
@@ -151,6 +151,7 @@ local function _newEmptyPlayer(id,mini)
     P.nextQueue={}
     P.holdQueue={}
     P.holdTime=0
+    P.holdIXSFromNext=nil
     P.lastPiece={
         id=0,name=0,-- block id/name
 
diff --git a/parts/player/player.lua b/parts/player/player.lua
index 9dcfda14..a17c4069 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1275,13 +1275,21 @@ function Player:_try_physical_hold_with(H)
 end
 function Player:hold_norm(ifpre)
     local ENV=self.gameEnv
-    if #self.holdQueue<ENV.holdCount and self.nextQueue[1] then-- Skip
+    if self.holdIXSFromNext or #self.holdQueue<ENV.holdCount and self.nextQueue[1] then-- Skip
         local C=self.cur
-        ins(self.holdQueue,self:_getBlock(C.id,C.name,C.color))
+        if C then
+            ins(self.holdQueue,self:_getBlock(C.id,C.name,C.color))
 
-        local t=self.holdTime
+            if self:willDieWith(self.nextQueue[1]) then
+                self.cur=nil
+                self.waiting=ENV.hang
+                self.holdIXSFromNext={ifpre}
+                return
+            end
+        else
+            self.holdIXSFromNext=nil
+        end
         self:_popNext(true)
-        self.holdTime=t
     else-- Hold
         local C,H=self.cur,self.holdQueue[1]
         self.ctrlCount=0
@@ -1420,6 +1428,10 @@ function Player:getNext(id,bagLineCounter)-- Push a block to nextQueue
 end
 function Player:spawn()-- Spawn a piece
     local ENV=self.gameEnv
+    if self.holdIXSFromNext then
+        self:hold(self.holdIXSFromNext[1],true)
+        return
+    end
     if #self.holdQueue>ENV.holdCount or ENV.holdMode=='swap' and #self.holdQueue>0 then
         self:hold(true,true)
         return
diff --git a/version.lua b/version.lua
index dd9996a6..331775f3 100644
--- a/version.lua
+++ b/version.lua
@@ -2,6 +2,6 @@ return {
     ["apkCode"]=1715,
     ["code"]=1715,
     ["string"]="V0.17.15",
-    ["room"]="ver A-10",
+    ["room"]="ver A-11",
     ["name"]="暂停 Break",
 }