小bugfix (#304)

- 修改了无双相关的描述
- 添加了“体力上限改变前”，新三窟专属
- 将多选框改成了等宽按钮
- 添加了遗漏的装备技能名

Fk/RoomElement/CheckBox.qml

@@ -43,7 +43,7 @@ GraphicsBox {
       model: all_options
 
       MetroToggleButton {
-        // Layout.fillWidth: true
+        Layout.fillWidth: true
         text: processPrompt(modelData)
         enabled: options.indexOf(modelData) !== -1 && (root.result.length < max_num || triggered)
 

lua/server/event.lua

@@ -33,6 +33,7 @@ fk.PreHpLost = 17
 fk.HpLost = 18
 fk.BeforeHpChanged = 19
 fk.HpChanged = 20
+fk.BeforeMaxHpChanged = 97
 fk.MaxHpChanged = 21
 
 fk.EventLoseSkill = 22

lua/server/events/hp.lua

@@ -290,7 +290,7 @@ end
 GameEvent.functions[GameEvent.ChangeMaxHp] = function(self)
   local player, num = table.unpack(self.data)
   local room = self.room
-  if num == 0 then
+  if room.logic:trigger(fk.BeforeMaxHpChanged, player, { num = num }) or num == 0 then
     return false
   end
 

lua/server/room.lua

@@ -2715,7 +2715,11 @@ function Room:handleCardEffect(event, cardEffectEvent)
         local to = self:getPlayerById(cardEffectEvent.to)
         local prompt = ""
         if cardEffectEvent.from then
-          prompt = "#slash-jink:" .. cardEffectEvent.from .. "::" .. 1
+          if loopTimes == 1 then
+            prompt = "#slash-jink:" .. cardEffectEvent.from
+          else
+            prompt = "#slash-jink-multi:" .. cardEffectEvent.from .. "::" .. i .. ":" .. loopTimes
+          end
         end
 
         local use = self:askForUseCard(

packages/maneuvering/i18n/en_US.lua

@@ -36,6 +36,7 @@ return {
 
   ["guding_blade"] = "Ancient Scimitar",
 	[":guding_blade"] = "Ancient Scimitar (equip card, weapon)<br /><b>ATK range</b>: 2<br /><b>Weapon skill</b>: When your used Slash is about to cause DMG, if the target player has no hand cards: the DMG is increased by +1.",
+  ["#guding_blade_skill"] = "Ancient Scimitar",
 
   ["fan"] = "Fan",
 	[":fan"] = "Fan (equip card, weapon)<br /><b>ATK range</b>: 4<br /><b>Weapon skill</b>: You can use any basic Slash as Fire Slash.",
@@ -43,9 +44,11 @@ return {
 
   ["vine"] = "Vine",
 	[":vine"] = "Vine (equip card, armor)<br /><b>Armor skill</b>: Savage Assault, Archery Attack and basic Slash have no effect on you. When you are about to suffer Fire DMG, the DMG is increased by +1.",
+  ["#vine_skill"] = "Vine",
 
   ["silver_lion"] = "Sliver Lion",
 	[":silver_lion"] = "Sliver Lion (equip card, armor)<br /><b>Armor skill</b>: When you are about to suffer DMG: that DMG is reduced to 1. When you lose this card in your equipment area: you heal 1 HP.",
+  ["#silver_lion_skill"] = "Sliver Lion",
 
   ["hualiu"] = "Hua Liu",
   [":hualiu"] = "Hua Liu (equip card, horse)<br /><b>Horse skill</b>: The distance from other players to you is increased by +1.",

packages/maneuvering/init.lua

@@ -518,6 +518,7 @@ Fk:loadTranslationTable{
 
   ["guding_blade"] = "古锭刀",
 	[":guding_blade"] = "装备牌·武器<br /><b>攻击范围</b>：２<br /><b>武器技能</b>：锁定技。每当你使用【杀】对目标角色造成伤害时，若该角色没有手牌，此伤害+1。",
+  ["#guding_blade_skill"] = "古锭刀",
 
   ["fan"] = "朱雀羽扇",
 	[":fan"] = "装备牌·武器<br /><b>攻击范围</b>：４<br /><b>武器技能</b>：你可以将一张普通【杀】当火【杀】使用。",
@@ -525,9 +526,11 @@ Fk:loadTranslationTable{
 
   ["vine"] = "藤甲",
 	[":vine"] = "装备牌·防具<br /><b>防具技能</b>：锁定技。【南蛮入侵】、【万箭齐发】和普通【杀】对你无效。每当你受到火焰伤害时，此伤害+1。",
+  ["#vine_skill"] = "藤甲",
 
   ["silver_lion"] = "白银狮子",
 	[":silver_lion"] = "装备牌·防具<br /><b>防具技能</b>：锁定技。每当你受到伤害时，若此伤害大于1点，防止多余的伤害。每当你失去装备区里的【白银狮子】后，你回复1点体力。",
+  ["#silver_lion_skill"] = "白银狮子",
 
   ["hualiu"] = "骅骝",
   [":hualiu"] = "装备牌·坐骑<br /><b>坐骑技能</b>：其他角色与你的距离+1。",

packages/standard_cards/i18n/en_US.lua

@@ -54,7 +54,8 @@ Fk:loadTranslationTable({
 
   ["slash"] = "Slash",
   [":slash"] = "Slash (basic card)<br /><b>Phase</b>: Action phase<br /><b>Target</b>: Another player within your ATK range<br /><b>Effect</b>: Deal 1 DMG to the targets.<br/><b>Note</b>: You can only use 1 Slash per action phase.",
-  ["#slash-jink"] = "%src used Slash to you, please use %arg Dodge(s)",
+  ["#slash-jink"] = "%src used Slash to you, please use a Dodge",
+  ["#slash-jink-multi"] = "%src used Slash to you, please use a Dodge( %arg th, %arg2 total )",
   ["#slash_skill"] = "Choose 1 player within your ATK range, deal 1 DMG to him",
   ["#slash_skill_multi"] = "Choose up to %arg players within your ATK range. Deal 1 DMG to them",
 
@@ -119,6 +120,7 @@ Fk:loadTranslationTable({
 
   ["crossbow"] = "Crossbow",
   [":crossbow"] = "Crossbow (equip card, weapon)<br /><b>ATK range</b>: 1<br /><b>Weapon skill</b>: You can use any amount of Slash in your action phase.",
+  ["#crossbow_skill"] = "Crossbow",
 
   ["qinggang_sword"] = "Qinggang Sword",
   [":qinggang_sword"] = "Qinggang Sword (equip card, weapon)<br /><b>ATK range</b>: 2<br /><b>Weapon skill</b>: Your Slash ignores the target's armor.",
@@ -151,6 +153,7 @@ Fk:loadTranslationTable({
 
   ["halberd"] = "Halberd",
   [":halberd"] = "Halberd (equip card, weapon)<br /><b>ATK range</b>: 4<br /><b>Weapon skill</b>: When you are about to use Slash which is your last hand card, you can target up to +2 extra targets.",
+  ["#halberd_skill"] = "Halberd",
 
   ["kylin_bow"] = "Kylin Bow",
   [":kylin_bow"] = "Kylin Bow (equip card, weapon)<br /><b>ATK range</b>: 5<br /><b>Weapon skill</b>: When your used Slash is about to cause DMG, you can discard 1 of his equipped horse.",
@@ -162,6 +165,7 @@ Fk:loadTranslationTable({
 
   ["nioh_shield"] = "Nioh Shield",
   [":nioh_shield"] = "Nioh Shield (equip card, armor)<br /><b>Armor skill</b>: Black Slash has no effect on you.",
+  ["#nioh_shield_skill"] = "Nioh Shield",
 
   ["dilu"] = "Di Lu",
   [":dilu"] = "Di Lu (equip card, horse)<br /><b>Horse skill</b>: The distance from other players to you is increased by +1.",

packages/standard_cards/i18n/zh_CN.lua

@@ -54,7 +54,8 @@ Fk:loadTranslationTable{
 
   ["slash"] = "杀",
   [":slash"] = "基本牌<br /><b>时机</b>：出牌阶段<br /><b>目标</b>：攻击范围内的一名角色<br /><b>效果</b>：对目标角色造成1点伤害。",
-  ["#slash-jink"] = "%src 对你使用了杀，请使用 %arg 张闪",
+  ["#slash-jink"] = "%src 对你使用了杀，请使用一张闪",
+  ["#slash-jink-multi"] = "%src 对你使用了杀，请使用一张闪（此为第 %arg 张，共需 %arg2 张）",
   ["#slash_skill"] = "选择攻击范围内的一名角色，对其造成1点伤害",
   ["#slash_skill_multi"] = "选择攻击范围内的至多%arg名角色，对这些角色各造成1点伤害",
 
@@ -119,6 +120,7 @@ Fk:loadTranslationTable{
 
   ["crossbow"] = "诸葛连弩",
   [":crossbow"] = "装备牌·武器<br /><b>攻击范围</b>：１<br /><b>武器技能</b>：锁定技，你于出牌阶段内使用【杀】无次数限制。",
+  ["#crossbow_skill"] = "诸葛连弩",
 
   ["qinggang_sword"] = "青釭剑",
   [":qinggang_sword"] = "装备牌·武器<br /><b>攻击范围</b>：２<br /><b>武器技能</b>：锁定技，你的【杀】无视目标角色的防具。",
@@ -151,6 +153,7 @@ Fk:loadTranslationTable{
 
   ["halberd"] = "方天画戟",
   [":halberd"] = "装备牌·武器<br /><b>攻击范围</b>：４<br /><b>武器技能</b>：锁定技，你使用最后的手牌【杀】可以额外选择至多两名目标。",
+  ["#halberd_skill"] = "方天画戟",
 
   ["kylin_bow"] = "麒麟弓",
   [":kylin_bow"] = "装备牌·武器<br /><b>攻击范围</b>：５<br /><b>武器技能</b>：当你使用【杀】对目标角色造成伤害时，你可以弃置其装备区里的一张坐骑牌。",
@@ -162,6 +165,7 @@ Fk:loadTranslationTable{
 
   ["nioh_shield"] = "仁王盾",
   [":nioh_shield"] = "装备牌·防具<br /><b>防具技能</b>：锁定技，黑色【杀】对你无效。",
+  ["#nioh_shield_skill"] = "仁王盾",
 
   ["dilu"] = "的卢",
   [":dilu"] = "装备牌·坐骑<br /><b>坐骑技能</b>：其他角色与你的距离+1。",