YunFeiyang
/
jianyu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixes

This commit is contained in:
baisebaoma 2024-04-18 14:19:51 +08:00
parent 2a0497ff0e
commit 777eacf303
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jianyu_tg.lua
View File

@ -2486,16 +2486,15 @@ local zhuojing = fk.CreateViewAsSkill {
local target = room:getPlayerById(result[1]) local target = room:getPlayerById(result[1])
room:askForDiscard(target, #use.card.subcards, #use.card.subcards, true, self.name, false, nil, room:askForDiscard(target, #use.card.subcards, #use.card.subcards, true, self.name, false, nil,
"#jy_zhuojing-discard:" .. player.id .. "::" .. #use.card.subcards) "#jy_zhuojing-discard:" .. player.id .. "::" .. #use.card.subcards)
local feasible = { "jy_suzhan", "jy_zhuojing" } local feasible = {}
if #table.filter(player.room.alive_players, function(p) return #p:getCardIds("h") == 0 end) == 0 then if #table.filter(player.room.alive_players, function(p) return #p:getCardIds("h") == 0 end) > 0 then
table.removeOne(feasible, "jy_suzhan") table.insert(feasible, "jy_suzhan")
if not target:canUse(Fk:cloneCard("peach")) or #target:getCardIds("h") == 0 then
table.removeOne(feasible,
"jy_zhuojing")
end end
if target:canUse(Fk:cloneCard("peach")) and #target:getCardIds("h") ~= 0 then
table.insert(feasible, "jy_zhuojing")
end end
if #feasible > 0 then if #feasible > 0 then
local skill_name = room:askForChoice(target, feasible, self.name, local skill_name = room:askForChoice(target, feasible, "#jy_zhuojing-skill",
"#jy_zhuojing-skill:" .. player.id, true, { "jy_suzhan", "jy_zhuojing" }) "#jy_zhuojing-skill:" .. player.id, true, { "jy_suzhan", "jy_zhuojing" })
room:askForUseActiveSkill(target, skill_name, room:askForUseActiveSkill(target, skill_name,
"#jy_zhuojing-use::" .. target.id .. ":" .. Fk:translate(skill_name)) "#jy_zhuojing-use::" .. target.id .. ":" .. Fk:translate(skill_name))