diff --git a/lua/client/i18n/en_US.lua b/lua/client/i18n/en_US.lua
index c34249a86aad0fd2d18af1493cb13a497238c0d4..585c1d19c1453cab276f8c7c890249d0ed1a3301 100644
--- a/lua/client/i18n/en_US.lua
+++ b/lua/client/i18n/en_US.lua
@@ -347,7 +347,7 @@ Fk:loadTranslationTable({
-- get/lose skill
["#AcquireSkill"] = '%from acquired the skill "%arg"',
- ["#LoseSkill"] = '%from lost the skill "%arg"',
+ ["#LoseSkill"] = '%from lost the skill "%arg"',
-- moveCards (they are sent by notifyMoveCards)
["$PutCard"] = "%arg card(s) of %from were put into draw pile",
@@ -405,8 +405,8 @@ Fk:loadTranslationTable({
-- turnOver
["#TurnOver"] = "%from turned over character card, now his status is %arg",
- ["face_up"] = "face up",
- ["face_down"] = "face down",
+ ["face_up"] = "face up",
+ ["face_down"] = "face down",
-- damage, heal and lose HP
["#Damage"] = "%to dealt %arg %arg2 DMG to %from",
diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua
index b4488c8346d13b72b93b76a71a29dafd8ecdf302..a0d54bba5df8c05e66d146f81c5638b66e86dfd4 100644
--- a/lua/client/i18n/zh_CN.lua
+++ b/lua/client/i18n/zh_CN.lua
@@ -222,7 +222,7 @@ FreeKill使用的是libgit2的C API,与此同时使用Git完成拓展包的下
["#PlayCard"] = "出牌阶段,请使用一张牌",
["#AskForGeneral"] = "请选择 1 名武将",
- ["#AskForSkillInvoke"] = "你想发动技能“%1”吗?",
+ ["#AskForSkillInvoke"] = "你想发动〖%1〗吗?",
["#AskForLuckCard"] = "你想使用手气卡吗?还可以使用 %1 次,剩余手气卡∞张",
["AskForLuckCard"] = "手气卡",
["#AskForChoice"] = "%1:请选择",
@@ -254,13 +254,13 @@ FreeKill使用的是libgit2的C API,与此同时使用Git完成拓展包的下
["$Equip"] = "装备区",
["$Judge"] = "判定区",
['$Selected'] = "已选择",
- ["#AskForUseActiveSkill"] = "请使用技能 %1",
- ["#AskForUseCard"] = "请使用卡牌 %1",
- ["#AskForResponseCard"] = "请打出卡牌 %1",
- ["#AskForNullification"] = "是否为目标为 %dest 的 %arg 使用无懈可击?",
- ["#AskForNullificationWithoutTo"] = "是否对 %src 使用的 %arg 使用无懈可击?",
- ["#AskForPeaches"] = "%src 生命危急,需要 %arg 个桃",
- ["#AskForPeachesSelf"] = "你生命危急,需要 %arg 个桃或酒",
+ ["#AskForUseActiveSkill"] = "请发动〖%1〗",
+ ["#AskForUseCard"] = "请使用【%1】",
+ ["#AskForResponseCard"] = "请打出【%1】",
+ ["#AskForNullification"] = "是否为目标为 %dest 的【%arg】使用【无懈可击】?",
+ ["#AskForNullificationWithoutTo"] = "是否对 %src 使用的【%arg】使用【无懈可击】?",
+ ["#AskForPeaches"] = "%src 生命危急,需要 %arg 个【桃】",
+ ["#AskForPeachesSelf"] = "你生命危急,需要 %arg 个【桃】或【酒】",
["#AskForDiscard"] = "请弃置 %arg 张牌,最少 %arg2 张",
["#AskForCard"] = "请选择 %arg 张牌,最少 %arg2 张",
@@ -411,8 +411,8 @@ Fk:loadTranslationTable{
["$GameEnd"] = "== 游戏结束 ==",
-- get/lose skill
- ["#AcquireSkill"] = "%from 获得了技能 “%arg”",
- ["#LoseSkill"] = "%from 失去了技能 “%arg”",
+ ["#AcquireSkill"] = "%from 获得了〖%arg〗",
+ ["#LoseSkill"] = "%from 失去了〖%arg〗",
-- moveCards (they are sent by notifyMoveCards)
["$GetCardsFromPile"] = "%from 从 %arg 中获得了 %arg2 张牌 %card",
@@ -469,25 +469,25 @@ Fk:loadTranslationTable{
["#FilterCard"] = "由于 %arg 的效果,与 %from 相关的 %arg2 被视为了 %arg3",
-- skill
- ["#InvokeSkill"] = "%from 发动了 “%arg”",
+ ["#InvokeSkill"] = "%from 发动了〖%arg〗",
-- judge
["#StartJudgeReason"] = "%from 开始了 %arg 的判定",
["#InitialJudge"] = "%from 的判定牌为 %arg",
- ["#ChangedJudge"] = "%from 发动“%arg”把 %to 的判定牌改为 %arg2",
+ ["#ChangedJudge"] = "%from 发动了〖%arg〗把 %to 的判定牌改为 %arg2",
["#JudgeResult"] = "%from 的判定结果为 %arg",
-- turnOver
["#TurnOver"] = "%from 将武将牌翻面,现在是 %arg",
- ["face_up"] = "正面朝上",
- ["face_down"] = "背面朝上",
+ ["face_up"] = "正面朝上",
+ ["face_down"] = "背面朝上",
-- damage, heal and lose HP
["#Damage"] = "%to 对 %from 造成了 %arg 点 %arg2 伤害",
["#DamageWithNoFrom"] = "%from 受到了 %arg 点 %arg2 伤害",
["#LoseHP"] = "%from 失去了 %arg 点体力",
["#HealHP"] = "%from 回复了 %arg 点体力",
- ["#ShowHPAndMaxHP"] = "%from 现在的体力值为 %arg,体力上限为 %arg2",
+ ["#ShowHPAndMaxHP"] = "%from 的体力值为 %arg,体力上限为 %arg2",
["#LoseMaxHP"] = "%from 减了 %arg 点体力上限",
["#HealMaxHP"] = "%from 加了 %arg 点体力上限",
@@ -504,7 +504,7 @@ Fk:loadTranslationTable{
["#GuanxingResult"] = "%from 的观星结果为 %arg 上 %arg2 下",
["#ChainStateChange"] = "%from %arg 了武将牌",
["#ChainDamage"] = "%from 处于连环状态,将受到传导的伤害",
- ["#ChangeKingdom"] = "%from 的国籍从 %arg 变成了 %arg2",
+ ["#ChangeKingdom"] = "%from 的势力从 %arg 变成了 %arg2",
["#RoomOutdated"] = "服务器更新完毕!该房间已过期,将无法再次游玩",
}
diff --git a/lua/core/skill_type/active.lua b/lua/core/skill_type/active.lua
index 9c5d13c9e206bea9a46d717f69711d15fcf8c644..267b706a05afa10bef4ce88a117236f55f3a844e 100644
--- a/lua/core/skill_type/active.lua
+++ b/lua/core/skill_type/active.lua
@@ -204,11 +204,11 @@ end
------- }
---@param room Room
----@param cardUseEvent CardUseStruct
+---@param cardUseEvent CardUseStruct | SkillEffectEvent
function ActiveSkill:onUse(room, cardUseEvent) end
---@param room Room
----@param cardUseEvent CardUseStruct
+---@param cardUseEvent CardUseStruct | SkillEffectEvent
---@param finished? bool
function ActiveSkill:onAction(room, cardUseEvent, finished) end
diff --git a/lua/fk_ex.lua b/lua/fk_ex.lua
index 074ef0509099b3984dbdde416c130c40e36a813b..a0456e0ad36392c4e67b1d41167145ed7c9e91d1 100644
--- a/lua/fk_ex.lua
+++ b/lua/fk_ex.lua
@@ -180,11 +180,11 @@ end
---@field public card_filter? fun(self: ActiveSkill, to_select: integer, selected: integer[], selected_targets: integer[]): boolean?
---@field public target_filter? fun(self: ActiveSkill, to_select: integer, selected: integer[], selected_cards: integer[], card: Card, extra_data: any): boolean?
---@field public feasible? fun(self: ActiveSkill, selected: integer[], selected_cards: integer[]): boolean?
----@field public on_use? fun(self: ActiveSkill, room: Room, cardUseEvent: CardUseStruct): boolean?
----@field public on_action? fun(self: ActiveSkill, room: Room, cardUseEvent: CardUseStruct, finished: boolean): boolean?
----@field public about_to_effect? fun(self: ActiveSkill, room: Room, cardEffectEvent: CardEffectEvent): boolean?
----@field public on_effect? fun(self: ActiveSkill, room: Room, cardEffectEvent: CardEffectEvent): boolean?
----@field public on_nullified? fun(self: ActiveSkill, room: Room, cardEffectEvent: CardEffectEvent): boolean?
+---@field public on_use? fun(self: ActiveSkill, room: Room, cardUseEvent: CardUseStruct | SkillEffectEvent): boolean?
+---@field public on_action? fun(self: ActiveSkill, room: Room, cardUseEvent: CardUseStruct | SkillEffectEvent, finished: boolean): boolean?
+---@field public about_to_effect? fun(self: ActiveSkill, room: Room, cardEffectEvent: CardEffectEvent | SkillEffectEvent): boolean?
+---@field public on_effect? fun(self: ActiveSkill, room: Room, cardEffectEvent: CardEffectEvent | SkillEffectEvent): boolean?
+---@field public on_nullified? fun(self: ActiveSkill, room: Room, cardEffectEvent: CardEffectEvent | SkillEffectEvent): boolean?
---@field public mod_target_filter? fun(self: ActiveSkill, to_select: integer, selected: integer[], user: integer, card: Card, distance_limited: boolean): boolean?
---@field public prompt? string|fun(self: ActiveSkill, selected_cards: integer[], selected_targets: integer[]): string
---@field public interaction any
diff --git a/lua/server/room.lua b/lua/server/room.lua
index 0f58aadb7e5f5195f1c261a7a2a0b527e0abbee9..30cc9460988922604b5dc68b26dfcad12b09e866 100644
--- a/lua/server/room.lua
+++ b/lua/server/room.lua
@@ -336,7 +336,7 @@ end
--- 获得当前房间中的所有玩家。
---
--- 返回的数组的第一个元素是当前回合玩家,并且按行动顺序进行排序。
----@param sortBySeat? boolean @ 是否无视按座位排序直接返回
+---@param sortBySeat? boolean @ 是否按座位排序,默认是
---@return ServerPlayer[] @ 房间中玩家的数组
function Room:getAllPlayers(sortBySeat)
if not self.game_started then
@@ -358,7 +358,7 @@ function Room:getAllPlayers(sortBySeat)
end
--- 获得所有存活玩家,参看getAllPlayers
----@param sortBySeat? boolean
+---@param sortBySeat? boolean @ 是否按座位排序,默认是
---@return ServerPlayer[]
function Room:getAlivePlayers(sortBySeat)
if sortBySeat == nil or sortBySeat then
@@ -369,7 +369,7 @@ function Room:getAlivePlayers(sortBySeat)
if temp == nil then
return { table.unpack(self.players) }
end
- local ret = {current}
+ local ret = current.dead and {} or {current}
while temp ~= current do
if not temp.dead then
table.insert(ret, temp)
@@ -385,7 +385,7 @@ end
--- 获得除一名玩家外的其他玩家。
---@param player ServerPlayer @ 要排除的玩家
----@param sortBySeat? boolean @ 是否要按座位排序?
+---@param sortBySeat? boolean @ 是否按座位排序,默认是
---@param include_dead? boolean @ 是否要把死人也算进去?
---@return ServerPlayer[] @ 其他玩家列表
function Room:getOtherPlayers(player, sortBySeat, include_dead)
diff --git a/maneuvering/i18n/en_US.lua b/maneuvering/i18n/en_US.lua
index 1186e44eb9384cd1f35af082554fa63807e0326f..6b0ff49eed5693ceaac7b7ff0a75557ab1c8912c 100644
--- a/maneuvering/i18n/en_US.lua
+++ b/maneuvering/i18n/en_US.lua
@@ -2,21 +2,21 @@ return {
["maneuvering"] = "Maneuvering",
["thunder__slash"] = "Thunder Slash",
- [":thunder__slash"] = "Thunder Slash (basic card)
Phase: Action phase
Target: Another player within your ATK range
Effect: Deal 1 Thunder DMG to the targets.
Note: You can only use 1 Slash per action phase.",
+ [":thunder__slash"] = "Thunder Slash (basic card)
Phase: Action phase
Target: Another player within your ATK range
Effect: Deal 1 Thunder DMG to the targets.
Note: You can only use 1 Slash per action phase.",
["#thunder__slash_skill"] = "Choose 1 player within your ATK range, deal 1 Thunder DMG to him",
["#thunder__slash_skill_multi"] = "Choose up to %arg players within your ATK range. Deal 1 Thunder DMG to them",
["fire__slash"] = "Fire Slash",
- [":fire__slash"] = "Fire Slash (basic card)
Phase: Action phase
Target: Another player within your ATK range
Effect: Deal 1 Fire DMG to the targets.
Note: You can only use 1 Slash per action phase.",
+ [":fire__slash"] = "Fire Slash (basic card)
Phase: Action phase
Target: Another player within your ATK range
Effect: Deal 1 Fire DMG to the targets.
Note: You can only use 1 Slash per action phase.",
["#fire__slash_skill"] = "Choose 1 player within your ATK range, deal 1 Fire DMG to him",
["#fire__slash_skill_multi"] = "Choose up to %arg players within your ATK range. Deal 1 Fire DMG to them",
["analeptic"] = "Alcohol",
- [":analeptic"] = "Alcohol (basic card)
Phase: 1. Action phase 2. When you are dying
Target: Yourself
Effect: 1. the DMG of the next Slash you use this turn is increased by +1. (This effect can only be used once per turn) 2. You heal 1 HP.",
+ [":analeptic"] = "Alcohol (basic card)
Phase: 1. Action phase 2. When you are dying
Target: Yourself
Effect: 1. the DMG of the next Slash you use this turn is increased by +1. (This effect can only be used once per turn) 2. You heal 1 HP.",
["#analeptic_skill"] = "the DMG of the next Slash you use this turn is increased by +1",
["iron_chain"] = "Iron Chain",
- [":iron_chain"] = "Iron Chain (trick card)
Phase: Action phase
Target: 1~2 players
Effect: Change chain state of the targets.",
+ [":iron_chain"] = "Iron Chain (trick card)
Phase: Action phase
Target: 1~2 players
Effect: Change chain state of the targets.",
["#iron_chain_skill"] = "Choose 1~2 players. Change their chain states",
["_normal_use"] = "Normally use",
["recast"] = "Recast",
@@ -25,29 +25,29 @@ return {
["fire_attack"] = "Fire Attack",
["fire_attack_skill"] = "Fire Attack",
- [":fire_attack"] = "Fire Attack (trick card)
Phase: Action phase
Target: A player with hand cards
Effect: The target player shows 1 hand card; then, if you discard 1 card with the same suit, you deal 1 Fire DMG to him.",
+ [":fire_attack"] = "Fire Attack (trick card)
Phase: Action phase
Target: A player with hand cards
Effect: The target player shows 1 hand card; then, if you discard 1 card with the same suit, you deal 1 Fire DMG to him.",
["#fire_attack-show"] = "%src used Fire Attack to you, please show 1 hand card",
["#fire_attack-discard"] = "You can discard 1 %arg hand card, then deal 1 Fire DMG to %src",
["#fire_attack_skill"] = "Choose a player with hand cards. He shows 1 hand card;
then, if you discard 1 card with the same suit, you deal 1 Fire DMG to him",
["supply_shortage"] = "Supply Shortage",
- [":supply_shortage"] = "Supply Shortage (delayed trick card)
Phase: Action phase
Target: Another player at distance 1
Effect: Place this card in target's judgement area. He performs a judgement in his judge phase: if result is not ♣, he skips his draw phase.",
+ [":supply_shortage"] = "Supply Shortage (delayed trick card)
Phase: Action phase
Target: Another player at distance 1
Effect: Place this card in target's judgement area. He performs a judgement in his judge phase: if result is not ♣, he skips his draw phase.",
["#supply_shortage_skill"] = "Place this card in another player's judgement area. He performs a judgement in his judge phase:
If result is not ♣, he skips his draw phase",
["guding_blade"] = "Ancient Scimitar",
- [":guding_blade"] = "Ancient Scimitar (equip card, weapon)
ATK range: 2
Weapon skill: 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"] = "Ancient Scimitar (equip card, weapon)
ATK range: 2
Weapon skill: 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)
ATK range: 4
Weapon skill: You can use any basic Slash as Fire Slash.",
+ [":fan"] = "Fan (equip card, weapon)
ATK range: 4
Weapon skill: You can use any basic Slash as Fire Slash.",
["#fan_skill"] = "Fan",
["vine"] = "Vine",
- [":vine"] = "Vine (equip card, armor)
Armor skill: 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"] = "Vine (equip card, armor)
Armor skill: 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)
Armor skill: 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"] = "Sliver Lion (equip card, armor)
Armor skill: 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",
diff --git a/maneuvering/init.lua b/maneuvering/init.lua
index 336f0ffafb76eff955a25a9962eae11d62c6aaf5..7fc54ae428594c314db92f60be22aae076baf6d9 100644
--- a/maneuvering/init.lua
+++ b/maneuvering/init.lua
@@ -497,21 +497,21 @@ Fk:loadTranslationTable{
["maneuvering"] = "军争",
["thunder__slash"] = "雷杀",
- [":thunder__slash"] = "基本牌
时机:出牌阶段
目标:攻击范围内的一名角色
效果:对目标角色造成1点雷电伤害。",
+ [":thunder__slash"] = "基本牌
时机:出牌阶段
目标:攻击范围内的一名角色
效果:对目标角色造成1点雷电伤害。",
["#thunder__slash_skill"] = "选择攻击范围内的一名角色,对其造成1点雷电伤害",
["#thunder__slash_skill_multi"] = "选择攻击范围内的至多%arg名角色,对这些角色各造成1点雷电伤害",
["fire__slash"] = "火杀",
- [":fire__slash"] = "基本牌
时机:出牌阶段
目标:攻击范围内的一名角色
效果:对目标角色造成1点火焰伤害。",
+ [":fire__slash"] = "基本牌
时机:出牌阶段
目标:攻击范围内的一名角色
效果:对目标角色造成1点火焰伤害。",
["#fire__slash_skill"] = "选择攻击范围内的一名角色,对其造成1点火焰伤害",
["#fire__slash_skill_multi"] = "选择攻击范围内的至多%arg名角色,对这些角色各造成1点火焰伤害",
["analeptic"] = "酒",
- [":analeptic"] = "基本牌
时机:出牌阶段/你处于濒死状态时
目标:你
效果:目标角色本回合使用的下一张【杀】将要造成的伤害+1/目标角色回复1点体力。",
+ [":analeptic"] = "基本牌
时机:出牌阶段/你处于濒死状态时
目标:你
效果:目标角色本回合使用的下一张【杀】将要造成的伤害+1/目标角色回复1点体力。",
["#analeptic_skill"] = "你于此回合内使用的下一张【杀】的伤害值基数+1",
["iron_chain"] = "铁锁连环",
- [":iron_chain"] = "锦囊牌
时机:出牌阶段
目标:一至两名角色
效果:横置或重置目标角色的武将牌。",
+ [":iron_chain"] = "锦囊牌
时机:出牌阶段
目标:一至两名角色
效果:横置或重置目标角色的武将牌。",
["#iron_chain_skill"] = "选择一至两名角色,这些角色横置或重置",
["_normal_use"] = "正常使用",
["recast"] = "重铸",
@@ -520,29 +520,29 @@ Fk:loadTranslationTable{
["fire_attack"] = "火攻",
["fire_attack_skill"] = "火攻",
- [":fire_attack"] = "锦囊牌
时机:出牌阶段
目标:一名有手牌的角色
效果:目标角色展示一张手牌,然后你可以弃置一张与此牌花色相同的手牌对其造成1点火焰伤害。",
+ [":fire_attack"] = "锦囊牌
时机:出牌阶段
目标:一名有手牌的角色
效果:目标角色展示一张手牌,然后你可以弃置一张与此牌花色相同的手牌对其造成1点火焰伤害。",
["#fire_attack-show"] = "%src 对你使用了火攻,请展示一张手牌",
["#fire_attack-discard"] = "你可弃置一张 %arg 手牌,对 %src 造成1点火属性伤害",
["#fire_attack_skill"] = "选择一名有手牌的角色,令其展示一张手牌,
然后你可以弃置一张与此牌花色相同的手牌对其造成1点火焰伤害",
["supply_shortage"] = "兵粮寸断",
- [":supply_shortage"] = "延时锦囊牌
时机:出牌阶段
目标:距离1的一名其他角色
效果:将此牌置于目标角色判定区内。其判定阶段进行判定:若结果不为♣,其跳过摸牌阶段。然后将【兵粮寸断】置入弃牌堆。",
+ [":supply_shortage"] = "延时锦囊牌
时机:出牌阶段
目标:距离1的一名其他角色
效果:将此牌置于目标角色判定区内。其判定阶段进行判定:若结果不为♣,其跳过摸牌阶段。然后将【兵粮寸断】置入弃牌堆。",
["#supply_shortage_skill"] = "选择距离1的一名角色,将此牌置于其判定区内。其判定阶段判定:
若结果不为♣,其跳过摸牌阶段",
["guding_blade"] = "古锭刀",
- [":guding_blade"] = "装备牌·武器
攻击范围:2
武器技能:锁定技。每当你使用【杀】对目标角色造成伤害时,若该角色没有手牌,此伤害+1。",
+ [":guding_blade"] = "装备牌·武器
攻击范围:2
武器技能:锁定技。每当你使用【杀】对目标角色造成伤害时,若该角色没有手牌,此伤害+1。",
["#guding_blade_skill"] = "古锭刀",
["fan"] = "朱雀羽扇",
- [":fan"] = "装备牌·武器
攻击范围:4
武器技能:当你声明使用普【杀】后,你可以将此【杀】改为火【杀】。",
+ [":fan"] = "装备牌·武器
攻击范围:4
武器技能:当你声明使用普【杀】后,你可以将此【杀】改为火【杀】。",
["#fan_skill"] = "朱雀羽扇",
["vine"] = "藤甲",
- [":vine"] = "装备牌·防具
防具技能:锁定技。【南蛮入侵】、【万箭齐发】和普通【杀】对你无效。每当你受到火焰伤害时,此伤害+1。",
+ [":vine"] = "装备牌·防具
防具技能:锁定技。【南蛮入侵】、【万箭齐发】和普通【杀】对你无效。每当你受到火焰伤害时,此伤害+1。",
["#vine_skill"] = "藤甲",
["silver_lion"] = "白银狮子",
- [":silver_lion"] = "装备牌·防具
防具技能:锁定技。每当你受到伤害时,若此伤害大于1点,防止多余的伤害。每当你失去装备区里的【白银狮子】后,你回复1点体力。",
+ [":silver_lion"] = "装备牌·防具
防具技能:锁定技。每当你受到伤害时,若此伤害大于1点,防止多余的伤害。每当你失去装备区里的【白银狮子】后,你回复1点体力。",
["#silver_lion_skill"] = "白银狮子",
["hualiu"] = "骅骝",
diff --git a/standard/i18n/en_US.lua b/standard/i18n/en_US.lua
index bef7f82d8e7d657bf2bef200271b1b68c614ffc1..514843d93bb9be45f460336542bda237a06345f2 100644
--- a/standard/i18n/en_US.lua
+++ b/standard/i18n/en_US.lua
@@ -52,6 +52,7 @@ Fk:loadTranslationTable({
["liubei"] = "Liu Bei",
["rende"] = "Benevolence",
[":rende"] = "In your Action Phase: you can give any # of hand cards to other players; then, if you have given a total of 2 or more cards, you heal 1 HP (only once).",
+ ["#rende-active"] = "Use Benevolence, give any # of hand cards to other players;
then, if you have given a total of 2 or more cards, you heal 1 HP (only once)",
["jijiang"] = "Rouse",
[":jijiang"] = "(lord) When you need to use/play Slash: you can ask other Shu characters to play Slash, which is regard as you use/play that.",
["#jijiang-ask"] = "Rouse: you can play a Slash, which is regarded as %src uses/plays",
@@ -89,6 +90,7 @@ Fk:loadTranslationTable({
["sunquan"] = "Sun Quan",
["zhiheng"] = "Balance of Power",
[":zhiheng"] = "Once per Action Phase: you can discard any # of cards; then, draw the same # of cards.",
+ ["#zhiheng-active"] = "Use Balance of Power, discard any # of cards; then, draw the same # of cards",
["jiuyuan"] = "Rescued",
[":jiuyuan"] = "(lord, forced) When another Wu character uses Peach to you, you heal +1 HP.",
@@ -103,18 +105,20 @@ Fk:loadTranslationTable({
["huanggai"] = "Huang Gai",
["kurou"] = "Trojan Flesh",
[":kurou"] = "In your Action Phase: you can lose 1 HP; then, draw 2 cards.",
+ ["#kurou-active"] = "Use Trojan Flesh, lose 1 HP; then, draw 2 cards",
["zhouyu"] = "Zhou Yu",
["yingzi"] = "Handsome",
[":yingzi"] = "In your Draw Phase: you can draw +1 additional card.",
["fanjian"] = "Sow Dissension",
- [":fanjian"] = "Once per Action Phase: you can make another player choose 1 suit; then, that player takes 1 hand card from you and displays it. If the guess was wrong, you cause him 1 DMG.",
+ [":fanjian"] = "Once per Action Phase: you can make another player choose 1 suit; then, he takes 1 hand card from you and displays it. If the guess was wrong, you cause him 1 DMG.",
+ ["#fanjian-active"] = "Use Sow Dissension, select another player; he chooses 1 suit;
then he takes 1 hand card from you and displays it. If the guess was wrong, you cause him 1 DMG",
["daqiao"] = "Da Qiao",
["guose"] = "National Beauty",
[":guose"] = "You can use any diamond card as Indulgence.",
["liuli"] = "Shirk",
- [":liuli"] = "When you become the target of Slash: you can discard 1 card and select another player (except the attacker) within your attack range; then, that player becomes the target of the Slash instead.",
+ [":liuli"] = "When you become the target of Slash: you can discard 1 card and select another player (except the attacker) within your attack range; then, he becomes the target of the Slash instead.",
["#liuli-target"] = "Shirk: you can discard 1 card and transfer the Slash",
["luxun"] = "Lu Xun",
@@ -128,10 +132,12 @@ Fk:loadTranslationTable({
[":xiaoji"] = "After you lose 1 card in your equipment area: you can draw 2 cards.",
["jieyin"] = "Marriage",
[":jieyin"] = "Once per Action Phase: you can discard 2 hand cards and select a hurt male character; then, both of you heal 1 HP.",
+ ["#jieyin-active"] = "Use Marriage, discard 2 hand cards and select a hurt male character; then, both of you heal 1 HP",
["huatuo"] = "Hua Tuo",
["qingnang"] = "Green Salve",
[":qingnang"] = "Once per Action Phase: you can discard 1 hand card and select a wounded player; then, he heals 1 HP.",
+ ["#qingnang-active"] = "Use Green Salve, discard 1 hand card and select a wounded player; then, he heals 1 HP",
["jijiu"] = "First Aid",
[":jijiu"] = "Outside of your turn: you can use any red card as Peach.",
@@ -142,6 +148,7 @@ Fk:loadTranslationTable({
["diaochan"] = "Diao Chan",
["lijian"] = "Seed of Animosity",
[":lijian"] = "Once per Action Phase: you may discard 1 card and select 2 male characters; then, this is regarded as one of them having used Duel to target the other. This Duel can't be countered by Nullification.",
+ ["#lijian-active"] = "Use Seed of Animosity, discard 1 card and select 2 male characters;
then, this is regarded as one of them having used Duel to target the other.
This Duel can't be countered by Nullification",
["biyue"] = "Envious by Moon",
[":biyue"] = "In your Finish Phase, you can draw 1 card.",
diff --git a/standard/i18n/zh_CN.lua b/standard/i18n/zh_CN.lua
index 495763164422f7255c5bc08a523e9e94c608ed5a..2fa2e65dbf753625bac09fb607fb2c3bb957ed37 100644
--- a/standard/i18n/zh_CN.lua
+++ b/standard/i18n/zh_CN.lua
@@ -100,6 +100,7 @@ Fk:loadTranslationTable{
["$rende2"] = "唯贤唯德,能服于人。",
["rende"] = "仁德",
[":rende"] = "出牌阶段,你可以将至少一张手牌任意分配给其他角色。你于本阶段内以此法给出的手牌首次达到两张或更多后,你回复1点体力。",
+ ["#rende-active"] = "发动 仁德,将至少一张手牌交给其他角色",
["$jijiang1"] = "蜀将何在?",
["$jijiang2"] = "尔等敢应战否?",
["jijiang"] = "激将",
@@ -175,7 +176,8 @@ Fk:loadTranslationTable{
["$zhiheng1"] = "容我三思。",
["$zhiheng2"] = "且慢。",
["zhiheng"] = "制衡",
- [":zhiheng"] = "出牌阶段限一次,你可以弃置至少一张牌然后摸等量的牌。",
+ [":zhiheng"] = "出牌阶段限一次,你可以弃置任意张牌,然后摸等量的牌。",
+ ["#zhiheng-active"] = "发动 制衡,弃置任意张牌,然后摸等量的牌",
["$jiuyuan1"] = "有汝辅佐,甚好!",
["$jiuyuan2"] = "好舒服啊。",
["jiuyuan"] = "救援",
@@ -206,7 +208,8 @@ Fk:loadTranslationTable{
["$kurou1"] = "请鞭笞我吧,公瑾!",
["$kurou2"] = "赴汤蹈火,在所不辞!",
["kurou"] = "苦肉",
- [":kurou"] = "出牌阶段,你可以失去1点体力然后摸两张牌。",
+ [":kurou"] = "出牌阶段,你可以失去1点体力,然后摸两张牌。",
+ ["#kurou-active"] = "发动 苦肉,失去1点体力,然后摸两张牌",
["zhouyu"] = "周瑜",
["#zhouyu"] = "大都督",
@@ -219,7 +222,8 @@ Fk:loadTranslationTable{
["$fanjian1"] = "挣扎吧,在血和暗的深渊里!",
["$fanjian2"] = "痛苦吧,在仇与恨的地狱中!",
["fanjian"] = "反间",
- [":fanjian"] = "阶段技。你可以令一名其他角色选择一种花色,然后正面朝上获得你的一张手牌。若此牌花色与该角色所选花色不同,你对其造成1点伤害。",
+ [":fanjian"] = "出牌阶段限一次,你可以令一名其他角色选择一种花色,然后正面朝上获得你的一张手牌。若此牌花色与其所选花色不同,你对其造成1点伤害。",
+ ["#fanjian-active"] = "发动 反间,选择一名其他角色,令其选择一种花色,然后正面朝上获得你的一张手牌
若此牌花色与其所选花色不同,你对其造成1点伤害",
["daqiao"] = "大乔",
["#daqiao"] = "矜持之花",
@@ -259,7 +263,8 @@ Fk:loadTranslationTable{
["$jieyin1"] = "夫君,身体要紧。",
["$jieyin2"] = "他好,我也好。",
["jieyin"] = "结姻",
- [":jieyin"] = "出牌阶段限一次,你可以弃置两张手牌并选择一名已受伤的男性角色:若如此做,你和该角色各回复1点体力。",
+ [":jieyin"] = "出牌阶段限一次,你可以弃置两张手牌并选择一名已受伤的男性角色,然后你与其各回复1点体力。",
+ ["#jieyin-active"] = "发动 结姻,弃置两张手牌并选择一名已受伤的男性角色,你与其各回复1点体力",
["huatuo"] = "华佗",
["#huatuo"] = "神医",
@@ -268,7 +273,8 @@ Fk:loadTranslationTable{
["$qingnang1"] = "早睡早起,方能养生。",
["$qingnang2"] = "越老越要补啊。",
["qingnang"] = "青囊",
- [":qingnang"] = "出牌阶段限一次,你可以弃置一张手牌并选择一名已受伤的角色:若如此做,该角色回复1点体力。",
+ [":qingnang"] = "出牌阶段限一次,你可以弃置一张手牌并选择一名已受伤的角色,然后其回复1点体力。",
+ ["#qingnang-active"] = "发动 青囊,弃置一张手牌并选择一名已受伤的角色,其回复1点体力",
["$jijiu1"] = "别紧张,有老夫呢。",
["$jijiu2"] = "救人一命,胜造七级浮屠。",
["jijiu"] = "急救",
@@ -291,6 +297,7 @@ Fk:loadTranslationTable{
["$lijian2"] = "夫君,你要替妾身作主啊……",
["lijian"] = "离间",
[":lijian"] = "出牌阶段限一次,你可以弃置一张牌并选择两名其他男性角色,后选择的角色视为对先选择的角色使用了一张不能被【无懈可击】的【决斗】。",
+ ["#lijian-active"] = "发动 离间,弃置一张手牌并选择两名其他男性角色,后选择的角色视为对先选择的角色使用了一张不能被【无懈可击】的【决斗】",
["$biyue1"] = "失礼了~",
["$biyue2"] = "羡慕吧~",
["biyue"] = "闭月",
diff --git a/standard/init.lua b/standard/init.lua
index 940920963d624aab497ab3652772fe6eae344a36..cf1d84619aaddc5a94897079428c464b933943ac 100644
--- a/standard/init.lua
+++ b/standard/init.lua
@@ -1153,6 +1153,7 @@ local role_getlogic = function()
room:prepareGeneral(lord, lord_general, deputy, true)
room:askForChooseKingdom({lord})
+ room:broadcastProperty(lord, "kingdom")
-- 显示技能
local canAttachSkill = function(player, skillName)
diff --git a/standard_cards/i18n/zh_CN.lua b/standard_cards/i18n/zh_CN.lua
index 66f7700fe0b9eef3400f20f38d7182213438433b..8b1902131296e0eb37a04499688b5a1aaac99e3e 100644
--- a/standard_cards/i18n/zh_CN.lua
+++ b/standard_cards/i18n/zh_CN.lua
@@ -54,8 +54,8 @@ Fk:loadTranslationTable{
["slash"] = "杀",
[":slash"] = "基本牌
时机:出牌阶段
目标:攻击范围内的一名角色
效果:对目标角色造成1点伤害。",
- ["#slash-jink"] = "%src 对你使用了杀,请使用一张闪",
- ["#slash-jink-multi"] = "%src 对你使用了杀,请使用一张闪(此为第 %arg 张,共需 %arg2 张)",
+ ["#slash-jink"] = "%src 对你使用了【杀】,请使用一张【闪】",
+ ["#slash-jink-multi"] = "%src 对你使用了【杀】,请使用一张【闪】(此为第 %arg 张,共需 %arg2 张)",
["#slash_skill"] = "选择攻击范围内的一名角色,对其造成1点伤害",
["#slash_skill_multi"] = "选择攻击范围内的至多%arg名角色,对这些角色各造成1点伤害",