From d38b0ca8058ca8d52bdf5a091cc1e96b501467e4 Mon Sep 17 00:00:00 2001 From: Nyutanislavsky Date: Thu, 3 Aug 2023 15:26:52 +0800 Subject: [PATCH] bugfix (#237) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 修复甄姬等 2. 将弃置所有牌、武将牌上的牌等修复为一次性弃置 3. 添加连环状态改变的音效 4. 改进notifyMoveCards的可见 --------- Signed-off-by: Mechanel --- audio/system/chain.mp3 | Bin 0 -> 32706 bytes lua/server/room.lua | 40 +++++++------------- lua/server/serverplayer.lua | 27 +++++++++----- packages/standard/i18n/zh_CN.lua | 1 + packages/standard/init.lua | 61 ++++++++++++++++++++----------- 5 files changed, 72 insertions(+), 57 deletions(-) create mode 100644 audio/system/chain.mp3 diff --git a/audio/system/chain.mp3 b/audio/system/chain.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..2dc29409050a2c5f6d8dd85bc6e4d5a67e8562cf GIT binary patch literal 32706 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 A9smFU literal 0 HcmV?d00001 diff --git a/lua/server/room.lua b/lua/server/room.lua index ddce55c0..4bbeb212 100644 --- a/lua/server/room.lua +++ b/lua/server/room.lua @@ -777,15 +777,6 @@ function Room:notifyMoveCards(players, card_moves, forceVisible) for _, move in ipairs(arg) do -- local to = self:getPlayerById(move.to) - local function infosContainArea(info, area) - for _, i in ipairs(info) do - if i.fromArea == area then - return true - end - end - return false - end - for _, info in ipairs(move.moveInfo) do local realFromArea = self:getCardArea(info.cardId) local playerAreas = { Player.Hand, Player.Equip, Player.Judge, Player.Special } @@ -800,28 +791,25 @@ function Room:notifyMoveCards(players, card_moves, forceVisible) end end - -- forceVisible make the move visible - -- FIXME: move.moveInfo is an array, fix this - move.moveVisible = move.moveVisible or (forceVisible) - -- if move is relevant to player, it should be open - or ((move.from == p.id) or (move.to == p.id)) - -- cards move from/to equip/judge/discard/processing should be open - or infosContainArea(move.moveInfo, Card.PlayerEquip) - or move.toArea == Card.PlayerEquip - or infosContainArea(move.moveInfo, Card.PlayerJudge) - or move.toArea == Card.PlayerJudge - or infosContainArea(move.moveInfo, Card.DiscardPile) - or move.toArea == Card.DiscardPile - or infosContainArea(move.moveInfo, Card.Processing) - or move.toArea == Card.Processing - -- TODO: PlayerSpecial + local function containArea(area, relevant) --处理区的处理？ + local areas = relevant + and {Card.PlayerEquip, Card.PlayerJudge, Card.DiscardPile, Card.Processing, Card.PlayerHand} + or {Card.PlayerEquip, Card.PlayerJudge, Card.DiscardPile, Card.Processing} + return table.contains(areas, area) + end - if not move.moveVisible then + -- forceVisible make the move visible + -- if move is relevant to player's hands or equips, it should be open + -- cards move from/to equip/judge/discard/processing should be open + + if not (move.moveVisible or forceVisible or containArea(move.toArea, move.to == p.id)) then for _, info in ipairs(move.moveInfo) do + if not containArea(info.fromArea, move.from == p.id) then info.cardId = -1 end end end + end p:doNotify("MoveCards", json.encode(arg)) end end @@ -2580,7 +2568,7 @@ function Room:drawCards(player, num, skillName, fromPlace) skillName = skillName, fromPlace = fromPlace, } - if self.logic:trigger(fk.BeforeDrawCard, player, drawData) or drawData.num < 1 then + if self.logic:trigger(fk.BeforeDrawCard, player, drawData) then self.logic:breakEvent(false) end diff --git a/lua/server/serverplayer.lua b/lua/server/serverplayer.lua index dbe2cdf1..3b04fde1 100644 --- a/lua/server/serverplayer.lua +++ b/lua/server/serverplayer.lua @@ -589,19 +589,21 @@ function ServerPlayer:bury() end function ServerPlayer:throwAllCards(flag) - local room = self.room + local cardIds = {} flag = flag or "hej" if string.find(flag, "h") then - room:throwCard(self.player_cards[Player.Hand], "", self) + table.insertTable(cardIds, self.player_cards[Player.Hand]) end if string.find(flag, "e") then - room:throwCard(self.player_cards[Player.Equip], "", self) + table.insertTable(cardIds, self.player_cards[Player.Equip]) end if string.find(flag, "j") then - room:throwCard(self.player_cards[Player.Judge], "", self) + table.insertTable(cardIds, self.player_cards[Player.Judge]) end + + self.room:throwCard(cardIds, "", self) end function ServerPlayer:throwAllMarks() @@ -611,9 +613,11 @@ function ServerPlayer:throwAllMarks() end function ServerPlayer:clearPiles() + local cardIds = {} for _, ids in pairs(self.special_cards) do - self.room:throwCard(ids, "", self) + table.insertTable(cardIds, ids) end + self.room:moveCardTo(cardIds, Card.DiscardPile, nil, fk.ReasonPutIntoDiscardPile, "", nil, true) end function ServerPlayer:addVirtualEquip(card) @@ -656,19 +660,22 @@ end ---@param chained boolean function ServerPlayer:setChainState(chained) - if self.room.logic:trigger(fk.BeforeChainStateChange, self) then + local room = self.room + if room.logic:trigger(fk.BeforeChainStateChange, self) then return end self.chained = chained - self.room:broadcastProperty(self, "chained") - self.room:sendLog{ + + room:broadcastProperty(self, "chained") + room:sendLog{ type = "#ChainStateChange", from = self.id, arg = self.chained and "chained" or "un-chained" } - - self.room.logic:trigger(fk.ChainStateChanged, self) + room:delay(150) + room:broadcastPlaySound("./audio/system/chain") + room.logic:trigger(fk.ChainStateChanged, self) end function ServerPlayer:reset() diff --git a/packages/standard/i18n/zh_CN.lua b/packages/standard/i18n/zh_CN.lua index 11a510c4..9cc520b5 100644 --- a/packages/standard/i18n/zh_CN.lua +++ b/packages/standard/i18n/zh_CN.lua @@ -76,6 +76,7 @@ Fk:loadTranslationTable{ ["$luoshen2"] = "飘飖兮若流风之回雪。", ["luoshen"] = "洛神", [":luoshen"] = "准备阶段开始时，你可以进行判定：若结果为黑色，判定牌生效后你获得之，然后你可以再次发动“洛神”。", + ["#luoshen_obtain"] = "洛神", ["$qingguo1"] = "凌波微步，罗袜生尘。", ["$qingguo2"] = "体迅飞凫，飘忽若神。", ["qingguo"] = "倾国", diff --git a/packages/standard/init.lua b/packages/standard/init.lua index 4f8c314c..e7240c9f 100644 --- a/packages/standard/init.lua +++ b/packages/standard/init.lua @@ -130,10 +130,7 @@ local fankui = fk.CreateTriggerSkill{ on_use = function(self, event, target, player, data) local room = player.room local from = data.from - local flag = "he" - if from == player then - flag = "e" - end + local flag = from == player and "e" or "he" local card = room:askForCardChosen(player, from, flag, self.name) room:obtainCard(player.id, card, false, fk.ReasonPrey) end @@ -366,16 +363,24 @@ local luoshen = fk.CreateTriggerSkill{ pattern = ".|.|spade,club", } room:judge(judge) - if judge.card.color ~= Card.Black then - break - end - room:obtainCard(player.id, judge.card, true, fk.ReasonJustMove) - if player.dead or not room:askForSkillInvoke(player, self.name) then + if judge.card.color ~= Card.Black or player.dead or not room:askForSkillInvoke(player, self.name) then break end end end, } +local luoshen_obtain = fk.CreateTriggerSkill{ + name = "#luoshen_obtain", + mute = true, + frequency = Skill.Compulsory, + events = {fk.FinishJudge}, + can_trigger = function(self, event, target, player, data) + return target == player and data.reason == "luoshen" and data.card.color == Card.Black end, + on_use = function(self, event, target, player, data) + player.room:obtainCard(player.id, data.card) + end, +} +luoshen:addRelatedSkill(luoshen_obtain) local qingguo = fk.CreateViewAsSkill{ name = "qingguo", anim_type = "defensive", @@ -383,7 +388,7 @@ local qingguo = fk.CreateViewAsSkill{ card_filter = function(self, to_select, selected) if #selected == 1 then return false end return Fk:getCardById(to_select).color == Card.Black - and Fk:currentRoom():getCardArea(to_select) ~= Player.Hand + and Fk:currentRoom():getCardArea(to_select) == Player.Hand end, view_as = function(self, cards) if #cards ~= 1 then @@ -951,24 +956,38 @@ local xiaoji = fk.CreateTriggerSkill{ events = {fk.AfterCardsMove}, can_trigger = function(self, event, target, player, data) if not player:hasSkill(self.name) then return end - self.trigger_times = 0 for _, move in ipairs(data) do if move.from == player.id then for _, info in ipairs(move.moveInfo) do if info.fromArea == Card.PlayerEquip then - self.trigger_times = self.trigger_times + 1 + return true end end end end - return self.trigger_times > 0 end, on_trigger = function(self, event, target, player, data) - local ret - for i = 1, self.trigger_times do - ret = self:doCost(event, target, player, data) - if ret then return ret end + local i = 0 + for _, move in ipairs(data) do + if move.from == player.id then + for _, info in ipairs(move.moveInfo) do + if info.fromArea == Card.PlayerEquip then + i = i + 1 + end + end + end end + self.cancel_cost = false + for i = 1, i do + if self.cancel_cost or not player:hasSkill(self.name) then break end + self:doCost(event, target, player, data) + end + end, + on_cost = function(self, event, target, player, data) + if player.room:askForSkillInvoke(player, self.name) then + return true + end + self.cancel_cost = true end, on_use = function(self, event, target, player, data) player:drawCards(2, self.name) @@ -997,14 +1016,14 @@ local jieyin = fk.CreateActiveSkill{ room:recover({ who = room:getPlayerById(effect.tos[1]), num = 1, - recoverBy = room:getPlayerById(effect.from), + recoverBy = from, skillName = self.name }) if from:isWounded() then room:recover({ - who = room:getPlayerById(effect.from), + who = from, num = 1, - recoverBy = room:getPlayerById(effect.from), + recoverBy = from, skillName = self.name }) end @@ -1034,7 +1053,7 @@ local qingnang = fk.CreateActiveSkill{ room:recover({ who = room:getPlayerById(effect.tos[1]), num = 1, - recoverBy = room:getPlayerById(effect.from), + recoverBy = from, skillName = self.name }) end,