Maneuvering (#72)

军争包还差火攻、酒、朱雀羽扇没做
铁索还没法重铸
除此之外还行

android/copy_assets.sh

@@ -21,6 +21,7 @@ chmod 644 assets/res/certs/*
 mkdir assets/res/packages
 cp -r ../packages/standard assets/res/packages
 cp -r ../packages/standard_cards assets/res/packages
+cp -r ../packages/maneuvering assets/res/packages
 cp -r ../packages/test assets/res/packages
 rm assets/res/packages/test/test.lua
 cp ../packages/init.sql assets/res/packages

lua/client/i18n/zh_CN.lua

@@ -125,6 +125,9 @@ Fk:loadTranslationTable{
   ["phase_draw"] = "摸牌阶段",
   ["phase_play"] = "出牌阶段",
   ["phase_discard"] = "弃牌阶段",
+
+  ["chained"] = "横置",
+  ["not-chained"] = "重置",
 }
 
 -- related to sendLog
@@ -142,6 +145,8 @@ Fk:loadTranslationTable{
 
   ["$DrawCards"] = "%from 摸了 %arg 张牌 %card",
   ["$DiscardCards"] = "%from 弃置了 %arg 张牌 %card",
+  ["$InstallEquip"] = "%from 装备了 %card",
+  ["$UninstallEquip"] = "%from 卸载了 %card",
 
   -- phase
   ["#PhaseSkipped"] = "%from 跳过了 %arg",
@@ -192,4 +197,6 @@ Fk:loadTranslationTable{
 
   -- misc
   ["#GuanxingResult"] = "%from 的观星结果为 %arg 上 %arg2 下",
+  ["#ChainStateChange"] = "%from %arg 了武将牌",
+  ["#ChainDamage"] = "%from 处于连环状态，将受到传导的伤害",
 }

lua/core/exppattern.lua

@@ -57,7 +57,8 @@ local function matchCard(matcher, card)
     card = Fk:getCardById(card)
   end
 
-  if matcher.name and not table.contains(matcher.name, card.name) then
+  if matcher.name and not table.contains(matcher.name, card.name) and
+    not table.contains(matcher.name, card.trueName) then
     return false
   end
 

lua/core/player.lua

@@ -463,6 +463,10 @@ function Player:isWounded()
   return self.hp < self.maxHp
 end
 
+function Player:getLostHp()
+  return math.min(self.maxHp - self.hp, self.maxHp)
+end
+
 ---@param skill string | Skill
 ---@return Skill
 local function getActualSkill(skill)

lua/server/events/usecard.lua

@@ -1,7 +1,13 @@
 local playCardEmotionAndSound = function(room, player, card)
   if card.type ~= Card.TypeEquip then
-    room:setEmotion(player, "./packages/" ..
+    local anim_path = "./packages/" .. card.package.extensionName .. "/image/anim/" .. card.name
-      card.package.extensionName .. "/image/anim/" .. card.name)
+    if not FileIO.exists(anim_path) then
+      for _, dir in ipairs(FileIO.ls("./packages/")) do
+        anim_path = "./packages/" .. dir .. "/image/anim/" .. card.name
+        if FileIO.exists(anim_path) then break end
+      end
+    end
+    if FileIO.exists(anim_path) then room:setEmotion(player, anim_path) end
   end
 
   local soundName
@@ -19,6 +25,13 @@ local playCardEmotionAndSound = function(room, player, card)
   else
     soundName = "./packages/" .. card.package.extensionName .. "/audio/card/"
       .. (player.gender == General.Male and "male/" or "female/") .. card.name
+    if not FileIO.exists(soundName .. ".mp3") then
+      for _, dir in ipairs(FileIO.ls("./packages/")) do
+        soundName = "./packages/" .. dir .. "/audio/card/"
+          .. (player.gender == General.Male and "male/" or "female/") .. card.name
+        if FileIO.exists(soundName .. ".mp3") then break end
+      end
+    end
   end
   room:broadcastPlaySound(soundName)
 end

lua/server/room.lua

@@ -899,7 +899,10 @@ function Room:askForCardsChosen(chooser, target, min, max, flag, reason)
   end
 
   local new_ret = table.filter(ret, function(id) return id ~= -1 end)
-  table.insertTable(new_ret, table.random(target:getCardIds(Player.Hand), #ret - #new_ret))
+  local hand_num = #ret - #new_ret
+  if hand_num > 0 then
+    table.insertTable(new_ret, table.random(target:getCardIds(Player.Hand), hand_num))
+  end
 
   return new_ret
 end

lua/server/serverplayer.lua

@@ -510,4 +510,15 @@ function ServerPlayer:setSkillUseHistory(cardName, num, scope)
   self:doNotify("SetSkillUseHistory", json.encode{cardName, num, scope})
 end
 
+---@param chained boolean
+function ServerPlayer:setChainState(chained)
+  self.chained = chained
+  self.room:broadcastProperty(self, "chained")
+  self.room:sendLog{
+    type = "#ChainStateChange",
+    from = self.id,
+    arg = self.chained and "chained" or "not-chained"
+  }
+end
+
 return ServerPlayer

lua/server/system_enum.lua

@@ -47,6 +47,7 @@ fk.FireDamage = 3
 ---@field to ServerPlayer
 ---@field damage integer
 ---@field card Card
+---@field chain boolean
 ---@field damageType DamageType
 ---@field skillName string
 

packages/.gitignore

@@ -2,6 +2,6 @@
 !standard/
 !standard_cards/
 !test/
-!manuvering/
+!maneuvering/
 !.gitignore
 !init.sql