bug fixes, nerfed gaotianliang

jianyu.lua

@@ -471,7 +471,7 @@ local jy_yuyu = fk.CreateTriggerSkill {
     if self.choice == "#jy_yuyu_draw3" then
       player:drawCards(3, self.name)
     else
-      player:drawCards(4, self.name)
+      player:drawCards(2, self.name)
       player:turnOver()
       Fk:currentRoom():damage({
         from = player,
@@ -512,11 +512,11 @@ Fk:loadTranslationTable {
   ["illustrator:jy__gaotianliang"] = "高天亮",
 
   ["jy_yuyu"] = "玉玉",
-  [":jy_yuyu"] = [[当有角色对你使用【杀】造成了伤害时，其获得“致郁”。受到没有“致郁”的角色或因本次伤害而获得“致郁”的角色造成的伤害时，你可以选择一项：摸3张牌；摸4张牌并翻面，然后对自己造成1点伤害。你对持有“致郁”的角色造成的非传导伤害+1。]],
+  [":jy_yuyu"] = [[当有角色对你使用【杀】造成了伤害时，其获得“致郁”。受到没有“致郁”的角色或因本次伤害而获得“致郁”的角色造成的伤害时，你可以选择一项：摸三张牌；摸两张牌并翻面，然后对自己造成一点伤害。你对有“致郁”的角色造成的非传导伤害+1。]],
   ["@jy_yuyu_enemy"] = "致郁",
-  ["#jy_yuyu_ask_which"] = "玉玉：请选择你要触发的效果",
-  ["#jy_yuyu_draw3"] = "摸3张牌",
-  ["#jy_yuyu_draw4turnover"] = "摸4张牌并翻面，然后对自己造成1点伤害",
+  ["#jy_yuyu_ask_which"] = "玉玉：请选择",
+  ["#jy_yuyu_draw3"] = "摸三张牌",
+  ["#jy_yuyu_draw4turnover"] = "摸两张牌并翻面，然后对自己造成一点伤害",
   ["$jy_yuyu1"] = "我……我真的很想听到你们说话……",
   ["$jy_yuyu2"] = "我天天被队霸欺负，他们天天骂我。",
   ["$jy_yuyu3"] = "有什么话是真的不能讲的……为什么一定……每次都是……一个人在讲……",

jianyu_tg.lua

@@ -1336,7 +1336,8 @@ local yingyuan = fk.CreateTriggerSkill {
         if move.from == player.id then
           for _, info in ipairs(move.moveInfo) do
             -- 不因使用而失去
-            if move.toArea == Card.DiscardPile and move.moveReason ~= fk.ReasonUse and move.from and (info.fromArea == Card.PlayerHand or info.fromArea == Card.PlayerEquip) and room:getCardArea(info.cardId) == Card.DiscardPile then
+            -- TODO：参考乐蔡重新写这个
+            if (move.toArea == Card.DiscardPile or move.toArea == Card.Processing) and move.moveReason ~= fk.ReasonUse and move.from and (info.fromArea == Card.PlayerHand or info.fromArea == Card.PlayerEquip) and (room:getCardArea(info.cardId) == Card.DiscardPile or room:getCardArea(info.cardId) == Card.Processing) then
               data.is_jy_yingyuan_first = true
             end
             -- 连营
@@ -1446,9 +1447,10 @@ shiyuan:addRelatedSkill(shiyuan_mod)
 local mouyuan = fk.CreateTriggerSkill {
   name = "jy_mouyuan",
   frequency = Skill.Wake,
-  events = { fk.RoundStart },
+  events = { fk.EventPhaseProceeding },
   can_trigger = function(self, event, target, player, data)
-    return player:hasSkill(self) and player:usedSkillTimes(self.name, Player.HistoryGame) == 0
+    return player:hasSkill(self) and target == player and player.phase == Player.Finish and
+        player:usedSkillTimes(self.name, Player.HistoryGame) == 0
   end,
   can_wake = function(self, event, target, player, data)
     return type(player:getMark("@jy_mouyuan")) == "table" and #player:getMark("@jy_mouyuan") == 3
@@ -1474,17 +1476,17 @@ Fk:loadTranslationTable {
   ["illustrator:jy__yjds"] = [[未知]],
 
   ["jy_yingyuan"] = [[应援]],
-  [":jy_yingyuan"] = [[锁定技，当你的牌不因使用或〖施援〗进入弃牌堆后，你令一名其他角色摸一张牌；每回合限一次，当你失去最后的手牌后，你<font color="red">失去一点体力</font>并摸等同于体力上限张牌。]],
+  [":jy_yingyuan"] = [[锁定技，当你的牌不因使用或〖施援〗进入弃牌堆<font color="red">或处理区</font>后，你令一名其他角色摸一张牌；每回合限一次，当你失去最后的手牌后，你<font color="red">失去一点体力</font>并摸等同于体力上限张牌。]],
   ["#jy_yingyuan-prompt"] = [[应援：令一名其他角色摸一张牌]],
 
   ["jy_shiyuan"] = [[施援]],
-  [":jy_shiyuan"] = [[出牌阶段限一次，你可以弃一张牌。若此牌与你使用的上一张牌类型相同，你令一名其他角色从牌堆正面朝上获得一张同类型的牌并重置此技能。]],
+  [":jy_shiyuan"] = [[出牌阶段限一次，你可以弃一张牌。若此牌与你使用的上一张牌类型相同，你令一名其他角色从牌堆获得一张同类型的牌（正面朝上）并重置此技能。]],
   ["@jy_shiyuan"] = [[施援]],
   ["#jy_shiyuan-prompt"] = [[施援：令一名其他角色获得一张%arg]],
 
   ["jy_mouyuan"] = [[谋援]],
   ["@jy_mouyuan"] = [[谋援]],
-  [":jy_mouyuan"] = [[觉醒技，每轮开始时，若〖施援〗已令其他角色获得三种类型的牌，你减一点体力上限令〖应援〗改为失去最后的手牌后<font color="red">不再失去体力</font>。]],
+  [":jy_mouyuan"] = [[觉醒技，结束阶段，若〖施援〗已令其他角色获得三种类型的牌，你减一点体力上限令〖应援〗改为失去最后的手牌后<font color="red">不再失去体力</font>。]],
   ["$jy_mouyuan1"] = [[援神，启动！]],
   ["$jy_mouyuan2"] = [[援神，启动！]],
 }