From 6c1867fee81abc66b3e6361f0c5e2731965da048 Mon Sep 17 00:00:00 2001
From: seven <786852516@qq.com>
Date: Mon, 1 Jul 2024 12:53:31 +0800
Subject: [PATCH 1/2] ex__choose_skill

---
 lua/server/room.lua     | 4 ----
 standard/aux_skills.lua | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/lua/server/room.lua b/lua/server/room.lua
index 203c6e9..7142b58 100644
--- a/lua/server/room.lua
+++ b/lua/server/room.lua
@@ -1446,9 +1446,6 @@ end
 ---@param no_indicate? boolean @ 是否不显示指示线
 ---@return integer[], integer[]
 function Room:askForChooseCardsAndPlayers(player, minCardNum, maxCardNum, targets, minTargetNum, maxTargetNum, pattern, prompt, skillName, cancelable, no_indicate)
-  if minCardNum < 1 or minTargetNum < 1 then
-    return {}, {}
-  end
   cancelable = (cancelable == nil) and true or cancelable
   no_indicate = no_indicate or false
   pattern = pattern or "."
@@ -1467,7 +1464,6 @@ function Room:askForChooseCardsAndPlayers(player, minCardNum, maxCardNum, target
     min_c_num = minCardNum,
     pattern = pattern,
     skillName = skillName,
-    -- include_equip = includeEquip, -- FIXME: 预定一个破坏性更新
     -- expand_pile = expandPile,
   }
   local _, ret = self:askForUseActiveSkill(player, "ex__choose_skill", prompt or "", cancelable, data, no_indicate)
diff --git a/standard/aux_skills.lua b/standard/aux_skills.lua
index 93d7a84..a85eaf4 100644
--- a/standard/aux_skills.lua
+++ b/standard/aux_skills.lua
@@ -104,9 +104,6 @@ local exChooseSkill = fk.CreateActiveSkill{
     local checkpoint = true
     local card = Fk:getCardById(to_select)
 
-    if not self.include_equip then
-      checkpoint = checkpoint and (Fk:currentRoom():getCardArea(to_select) ~= Player.Equip)
-    end
 
     if self.pattern and self.pattern ~= "" then
       checkpoint = checkpoint and (Exppattern:Parse(self.pattern):match(card))
-- 
Gitee


From f86c2e35cbc54f4467b64f093a19b0009574684f Mon Sep 17 00:00:00 2001
From: seven <786852516@qq.com>
Date: Mon, 1 Jul 2024 13:21:02 +0800
Subject: [PATCH 2/2] 1

---
 lua/server/room.lua | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lua/server/room.lua b/lua/server/room.lua
index 7142b58..df6a9f0 100644
--- a/lua/server/room.lua
+++ b/lua/server/room.lua
@@ -1464,7 +1464,6 @@ function Room:askForChooseCardsAndPlayers(player, minCardNum, maxCardNum, target
     min_c_num = minCardNum,
     pattern = pattern,
     skillName = skillName,
-    -- expand_pile = expandPile,
   }
   local _, ret = self:askForUseActiveSkill(player, "ex__choose_skill", prompt or "", cancelable, data, no_indicate)
   if ret then
-- 
Gitee