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

toast fixes

This commit is contained in:
baisebaoma 2024-04-18 14:10:12 +08:00
parent d368d7fc36
commit a7b9eb8e49
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jianyu_tg.lua
View File

@ -2486,11 +2486,10 @@ 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)
-- TODO：合法性检测
local feasible = { "jy_suzhan", "jy_zhuojing" } local feasible = { "jy_suzhan", "jy_zhuojing" }
if target.hp == target.maxHp then table.removeOne(feasible, "jy_suzhan") end
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_zhuojing") table.removeOne(feasible, "jy_suzhan")
if target.hp == target.maxHp then table.removeOne(feasible, "jy_zhuojing") end
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, self.name,
@ -2498,7 +2497,7 @@ local zhuojing = fk.CreateViewAsSkill {
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))
else else
room:doBroadcastNotify("ShowToast", "#jy_zhuojing-fail::" .. target.id, { player, target }) room:doBroadcastNotify("ShowToast", Fk:translate("#jy_zhuojing-fail::" .. target.id), { player, target })
end end
end end
end, end,