From 485c694811458980276828ddf4d2e0931fa86914 Mon Sep 17 00:00:00 2001
From: baisebaoma <baisebaoma@foxmail.com>
Date: Fri, 12 Apr 2024 03:14:32 +0800
Subject: [PATCH] gambler ux improved

---
 jianyu.lua    | 38 +++++++++++++++++++++-----------------
 jianyu_tg.lua |  5 ++---
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/jianyu.lua b/jianyu.lua
index 137131a..c10ea1f 100644
--- a/jianyu.lua
+++ b/jianyu.lua
@@ -2498,24 +2498,27 @@ local guiyi = fk.CreateTriggerSkill {
     return player:hasSkill(self) and
         target.phase == Player.Finish and not player:isNude()
   end,
+  on_cost = function(self, event, target, player, data)
+    local success, dat = player.room:askForUseActiveSkill(player, "#jy_guiyi_viewas", "#jy_guiyi-use", true)
+    if success then
+      self.cost_data = dat
+      return true
+    end
+  end,
   on_use = function(self, event, target, player, data)
     local room = player.room
-    local success, dat = room:askForUseActiveSkill(player, "#jy_guiyi_viewas", "#jy_guiyi-use", true,
-      { bypass_distances = true })
-    if success then
-      local card = Fk:cloneCard("duel")
-      card:addSubcards(dat.cards)
-      card.skillName = self.name
-      local use = {
-        from = player.id,
-        tos = table.map(dat.targets, function(p) return { p } end),
-        card = card,
-        extraData = { bypass_distances = true },
-      }
-      room:useCard(use)
-      if use.damageDealt and use.damageDealt[player.id] then
-        room:killPlayer({ who = player.id })
-      end
+    local card = Fk:cloneCard("duel")
+    card:addSubcards(self.cost_data.cards)
+    card.skillName = self.name
+    local use = {
+      from = player.id,
+      tos = table.map(self.cost_data.targets, function(p) return { p } end),
+      card = card,
+      extraData = { bypass_distances = true },
+    }
+    room:useCard(use)
+    if use.damageDealt and use.damageDealt[player.id] then
+      room:killPlayer({ who = player.id })
     end
   end,
 }
@@ -2552,7 +2555,8 @@ Fk:loadTranslationTable {
   ["#jy_guiyi-use"] = [[命弈：将一张牌当【决斗】使用，若其对你造成伤害则你死亡]],
 }
 
-local gambler = General(extension, "jy__gambler", "qun", 6)
+local gambler = General(extension, "jy__gambler", "qun", 8)
 gambler:addSkill(guiyi)
+gambler:addSkill("benghuai")
 
 return extension
diff --git a/jianyu_tg.lua b/jianyu_tg.lua
index 2281852..c8277c5 100644
--- a/jianyu_tg.lua
+++ b/jianyu_tg.lua
@@ -1360,8 +1360,7 @@ local yingyuan = fk.CreateTriggerSkill {
       end), Util.IdMapper)
       if #targets == 0 then return false end
       local result = room:askForChoosePlayers(player, targets, 1, 1, "#jy_yingyuan-prompt",
-        self.name,
-        false, false)
+        self.name, false, false)
       if #result ~= 0 then
         local to = room:getPlayerById(result[1])
         if not to.dead then
@@ -1476,7 +1475,7 @@ Fk:loadTranslationTable {
   ["illustrator:jy__yjds"] = [[未知]],
 
   ["jy_yingyuan"] = [[应援]],
-  [":jy_yingyuan"] = [[锁定技，当你的牌不因使用或〖施援〗进入弃牌堆<font color="red">或处理区</font>后，你令一名其他角色摸一张牌；每回合限一次，当你失去最后的手牌后，你<font color="red">失去一点体力</font>并摸等同于体力上限张牌。]],
+  [":jy_yingyuan"] = [[锁定技，当你的牌不因使用或〖施援〗进入弃牌堆或处理区后，你令一名其他角色摸一张牌；每回合限一次，当你失去最后的手牌后，你<font color="red">失去一点体力</font>并摸等同于体力上限张牌。]],
   ["#jy_yingyuan-prompt"] = [[应援：令一名其他角色摸一张牌]],
 
   ["jy_shiyuan"] = [[施援]],