From 87afe763f4cedf563d0df78c4431bed402188b8f Mon Sep 17 00:00:00 2001
From: seven <786852516@qq.com>
Date: Fri, 30 Aug 2024 22:04:33 +0800
Subject: [PATCH 1/3] room_settings

---
 lua/server/room.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lua/server/room.lua b/lua/server/room.lua
index 84f95ea..f206531 100644
--- a/lua/server/room.lua
+++ b/lua/server/room.lua
@@ -4241,7 +4241,7 @@ function Room:addTableMark(sth, mark, value)
 end
 
 --- 为角色或牌的表型标记移除值
----@param sth ServerPlayer @ 更新标记的玩家或卡牌
+---@param sth ServerPlayer|Card @ 更新标记的玩家或卡牌
 ---@param mark string @ 标记的名称
 ---@param value any @ 要移除的值
 function Room:removeTableMark(sth, mark, value)
@@ -4254,5 +4254,10 @@ function Room:removeTableMark(sth, mark, value)
   end
 end
 
+function Room:__index(k)
+  if k == "room_settings" then
+    return self.settings
+  end
+end
 
 return Room
-- 
Gitee


From 812b6111776ae2d1161b794eba277bc600e2cb68 Mon Sep 17 00:00:00 2001
From: seven <786852516@qq.com>
Date: Sat, 31 Aug 2024 20:43:23 +0800
Subject: [PATCH 2/3] throwCard

---
 lua/server/room.lua | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lua/server/room.lua b/lua/server/room.lua
index f206531..809066c 100644
--- a/lua/server/room.lua
+++ b/lua/server/room.lua
@@ -3710,18 +3710,15 @@ function Room:retrial(card, player, judge, skillName, exchange)
 end
 
 --- 弃置一名角色的牌。
----@param card_ids integer[]|integer @ 被弃掉的牌
+---@param card_ids integer[]|integer|Card|Card[] @ 被弃掉的牌
 ---@param skillName? string @ 技能名
 ---@param who ServerPlayer @ 被弃牌的人
 ---@param thrower? ServerPlayer @ 弃别人牌的人
 function Room:throwCard(card_ids, skillName, who, thrower)
-  if type(card_ids) == "number" then
-    card_ids = {card_ids}
-  end
   skillName = skillName or ""
   thrower = thrower or who
   self:moveCards({
-    ids = card_ids,
+    ids = Card:getIdList(card_ids),
     from = who.id,
     toArea = Card.DiscardPile,
     moveReason = fk.ReasonDiscard,
-- 
Gitee


From 546fc8b96d0907e8b4660038970a993e66fe73f4 Mon Sep 17 00:00:00 2001
From: seven <786852516@qq.com>
Date: Sat, 31 Aug 2024 20:55:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/client/i18n/zh_CN.lua | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua
index c11f078..4465fc9 100644
--- a/lua/client/i18n/zh_CN.lua
+++ b/lua/client/i18n/zh_CN.lua
@@ -370,6 +370,7 @@ Fk:loadTranslationTable{
   ["chained"] = "横置",
   ["un-chained"] = "重置",
   ["reset-general"] = "复原",
+  ["reset"] = "复原武将牌",
 
   ["yang"] = "阳",
   ["yin"] = "阴",
@@ -396,6 +397,7 @@ Fk:loadTranslationTable{
   ["Distance"] = "距离",
   ["Judge"] = "判定",
   ["Retrial"] = "改判",
+  ["Pindian"] = "拼点",
 
   ["_sealed"] = "废除",
   ["weapon_sealed"] = "武器栏废除",
@@ -408,6 +410,8 @@ Fk:loadTranslationTable{
   ["DefensiveRideSlot"] = "防御坐骑栏",
   ["TreasureSlot"] = "宝物栏",
   ["JudgeSlot"] = "判定区",
+
+  ["skill"] = "技能",
 }
 
 -- related to sendLog
@@ -474,6 +478,8 @@ Fk:loadTranslationTable{
   ["#ResponsePlayV0Card"] = "%from 打出了 %arg",
 
   ["#FilterCard"] = "由于 %arg 的效果，与 %from 相关的 %arg2 被视为了 %arg3",
+  ["#AddTargetsBySkill"] = "用于 %arg 的效果，%from 使用的 %arg2 增加了目标 %to",
+  ["#RemoveTargetsBySkill"] = "用于 %arg 的效果，%from 使用的 %arg2 取消了目标 %to",
 
   -- skill
   ["#InvokeSkill"] = "%from 发动了〖%arg〗",
-- 
Gitee