diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua index 0789c86305bf8ea9c8e30e2793c4254874f16847..374ce4fb350fe1ef65c04bae44b6b99b36e6c854 100644 --- a/lua/client/i18n/zh_CN.lua +++ b/lua/client/i18n/zh_CN.lua @@ -449,7 +449,7 @@ Fk:loadTranslationTable{ --utility ["draw1"] = "摸一张牌", ["draw2"] = "摸两张牌", - ["draw3"] = "摸两张牌", + ["draw3"] = "摸三张牌", ["recover"] = "回复1点体力", ["loseHp"] = "失去1点体力", ["damage1"] = "造成1点伤害", diff --git a/lua/core/card.lua b/lua/core/card.lua index 020a1c52d3d922d240972f68aefe8cfa553473c2..dd61611c1f6757ad005f28fe6374c59041f04a13 100644 --- a/lua/core/card.lua +++ b/lua/core/card.lua @@ -239,7 +239,7 @@ function Card:matchPattern(pattern) return Exppattern:Parse(pattern):match(self) end ---- 获取卡牌花色并返回花色文字描述(如 黑桃、红桃、梅花、方块)或者符号(如♠♥♣♦,带颜色)。 +--- 获取卡牌花色并返回花色文字描述(如``spade``黑桃、``heart``红桃、``club``梅花、``diamond``方块)或者符号(如♠♥♣♦,带颜色)。 ---@param symbol? boolean @ 是否以符号形式显示 ---@return string @ 描述花色的字符串 function Card:getSuitString(symbol) @@ -259,7 +259,7 @@ function Card:getSuitString(symbol) return symbol and "log_" .. ret or ret end ---- 获取卡牌颜色并返回点数颜色描述(例如黑色/红色/无色)。 +--- 获取卡牌颜色并返回点数颜色描述(例如``black``黑色/``red``红色/``nocolor``无色)。 ---@return string @ 描述颜色的字符串 function Card:getColorString() local color = self.color @@ -273,7 +273,7 @@ function Card:getColorString() return "unknown" end ---- 获取卡牌类型并返回类型描述(例如基本牌/锦囊牌/装备牌)。 +--- 获取卡牌类型并返回类型描述(例如``basic``基本牌/``trick``锦囊牌/``equip``装备牌)。 function Card:getTypeString() local t = self.type if t == Card.TypeBasic then diff --git a/lua/server/ai/init.lua b/lua/server/ai/init.lua index 22630e022e07024e55a534684073a3112ed16c5c..fa6c20f27ec4e483be961dc27fec94b921e2ee2e 100644 --- a/lua/server/ai/init.lua +++ b/lua/server/ai/init.lua @@ -7,12 +7,13 @@ TrustAI = require "server.ai.trust_ai" SmartAI = require "server.ai.smart_ai" -- load ai module from packages -local directories +local directories = {} if UsingNewCore then - directories = FileIO.ls("..") require "standard_cards.ai" require "standard.ai" require "maneuvering.ai" + FileIO.cd("../..") + directories = FileIO.ls("packages") else directories = FileIO.ls("packages") require "packages.standard_cards.ai" @@ -34,3 +35,7 @@ for _, dir in ipairs(directories) do end end + +if UsingNewCore then + FileIO.cd("packages/freekill-core") +end diff --git a/lua/server/room.lua b/lua/server/room.lua index bf7eea7fa2a6be092f568ad1d9ef1864bc273caf..42ff5e3d9e82bcf41bbd368fd4fb956d19d75a93 100644 --- a/lua/server/room.lua +++ b/lua/server/room.lua @@ -1275,7 +1275,6 @@ function Room:askForYiji(player, cards, targets, skillName, minNum, maxNum, prom residued_list = residueMap, expand_pile = expand_pile } - -- p(json.encode(residueMap)) while maxNum > 0 and #_cards > 0 do data.max_num = maxNum @@ -1287,7 +1286,9 @@ function Room:askForYiji(player, cards, targets, skillName, minNum, maxNum, prom for _, id in ipairs(give_cards) do table.insert(list[to], id) table.removeOne(_cards, id) - self:setCardMark(Fk:getCardById(id), "@DistributionTo", Fk:translate(self:getPlayerById(to).general)) + local p = self:getPlayerById(to) + self:setCardMark(Fk:getCardById(id), "@DistributionTo", + Fk:translate(p.general == "anjiang" and "seat#" .. tostring(p.seat) or p.general)) end minNum = math.max(0, minNum - #give_cards) maxNum = maxNum - #give_cards diff --git a/standard/init.lua b/standard/init.lua index 7bb6a12d8eea8321586bd06084cf2536255c1667..29fb2e4051e0783698d2e5657337299677a3ea50 100644 --- a/standard/init.lua +++ b/standard/init.lua @@ -730,9 +730,7 @@ local keji = fk.CreateTriggerSkill{ and #player.room.logic:getEventsOfScope(GameEvent.RespondCard, 1, PlayCheck, Player.HistoryTurn) == 0 end end, - on_use = function(self, event, target, player, data) - return true - end + on_use = Util.TrueFunc, } local lvmeng = General:new(extension, "lvmeng", "wu", 4) lvmeng:addSkill(keji)