diff --git a/lua/server/room.lua b/lua/server/room.lua index 203c6e98cf1fb8229989917d999af188f922e097..df6a9f09a5759ce6143dbaaae5239fed9f063b07 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,8 +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) if ret then diff --git a/standard/aux_skills.lua b/standard/aux_skills.lua index 93d7a849512a8e12b0952888ce12dfacf6207f7e..a85eaf4c6bcf4e70078125beccc4fe2c6b552cf9 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))