选择性删除Interaction等各种功能 (#193)

- 给interaction喂nil或者空choices可以禁止出interaction小黑框
- 可以给主动技/视为技上prompt
- 装备的技能现在会独立显示在最下方

Fk/Pages/Room.qml

@@ -25,6 +25,7 @@ Item {
   property alias manualBox: manualBox
   property alias bigAnim: bigAnim
   property alias promptText: prompt.text
+  property var currentPrompt
   property alias okCancel: okCancel
   property alias okButton: okButton
   property alias cancelButton: cancelButton
@@ -146,6 +147,7 @@ Item {
         script: {
           skillInteraction.sourceComponent = undefined;
           promptText = "";
+          currentPrompt = "";
           progress.visible = false;
           okCancel.visible = false;
           endPhaseButton.visible = false;
@@ -900,6 +902,15 @@ Item {
     mainStack.currentItem.loadPlayerData(datalist);
   }
 
+  function setPrompt(text, iscur) {
+    promptText = text;
+    if (iscur) currentPrompt = text;
+  }
+
+  function resetPrompt() {
+    promptText = currentPrompt;
+  }
+
   function loadPlayerData(datalist) {
     datalist.forEach(d => {
       if (d.id == Self.id) {

Fk/Pages/RoomLogic.js

@@ -708,7 +708,7 @@ callbacks["AskForGeneral"] = (jsonData) => {
   const generals = data[0];
   const n = data[1];
   const heg = data[2];
-  roomScene.promptText = Backend.translate("#AskForGeneral");
+  roomScene.setPrompt(Backend.translate("#AskForGeneral"), true);
   roomScene.state = "replying";
   roomScene.popupBox.sourceComponent = Qt.createComponent("../RoomElement/ChooseGeneralBox.qml");
   const box = roomScene.popupBox.item;
@@ -810,7 +810,7 @@ callbacks["AskForChoice"] = (jsonData) => {
     roomScene.promptText = Backend.translate("#AskForChoice")
       .arg(Backend.translate(skill_name));
   } else {
-    roomScene.promptText = processPrompt(prompt);
+    roomScene.setPrompt(processPrompt(prompt), true);
   }
   roomScene.state = "replying";
   let qmlSrc;
@@ -952,7 +952,7 @@ callbacks["PlayCard"] = (jsonData) => {
   // jsonData: int playerId
   const playerId = parseInt(jsonData);
   if (playerId === Self.id) {
-    roomScene.promptText = Backend.translate("#PlayCard");
+    roomScene.setPrompt(Backend.translate("#PlayCard"), true);
     roomScene.state = "playing";
     okButton.enabled = false;
   }
@@ -1012,7 +1012,7 @@ callbacks["AskForUseActiveSkill"] = (jsonData) => {
     roomScene.promptText = Backend.translate("#AskForUseActiveSkill")
       .arg(Backend.translate(skill_name));
   } else {
-    roomScene.promptText = processPrompt(prompt);
+    roomScene.setPrompt(processPrompt(prompt), true);
   }
 
   roomScene.respond_play = false;
@@ -1052,7 +1052,7 @@ callbacks["AskForUseCard"] = (jsonData) => {
     roomScene.promptText = Backend.translate("#AskForUseCard")
       .arg(Backend.translate(cardname));
   } else {
-    roomScene.promptText = processPrompt(prompt);
+    roomScene.setPrompt(processPrompt(prompt), true);
   }
   roomScene.responding_card = pattern;
   roomScene.respond_play = false;
@@ -1072,7 +1072,7 @@ callbacks["AskForResponseCard"] = (jsonData) => {
     roomScene.promptText = Backend.translate("#AskForResponseCard")
       .arg(Backend.translate(cardname));
   } else {
-    roomScene.promptText = processPrompt(prompt);
+    roomScene.setPrompt(processPrompt(prompt), true);
   }
   roomScene.responding_card = pattern;
   roomScene.respond_play = true;
@@ -1281,7 +1281,7 @@ callbacks["ChangeSelf"] = (j) => {
 callbacks["AskForLuckCard"] = (j) => {
   // jsonData: int time
   const time = parseInt(j);
-  roomScene.promptText = Backend.translate("#AskForLuckCard").arg(time);
+  roomScene.setPrompt(Backend.translate("#AskForLuckCard").arg(time), true);
   roomScene.state = "replying";
   roomScene.extra_data = {
     luckCard: true,

Fk/RoomElement/Dashboard.qml

@@ -251,11 +251,31 @@ RowLayout {
     }
   }
 
+  function processPrompt(prompt) {
+    const data = prompt.split(":");
+    let raw = Backend.translate(data[0]);
+    const src = parseInt(data[1]);
+    const dest = parseInt(data[2]);
+    if (raw.match("%src")) raw = raw.replace("%src", Backend.translate(getPhoto(src).general));
+    if (raw.match("%dest")) raw = raw.replace("%dest", Backend.translate(getPhoto(dest).general));
+    if (raw.match("%arg")) raw = raw.replace("%arg", Backend.translate(data[3]));
+    if (raw.match("%arg2")) raw = raw.replace("%arg2", Backend.translate(data[4]));
+    return raw;
+  }
+
   function updatePending() {
+    roomScene.resetPrompt();
     if (pending_skill === "") return;
 
     const enabled_cards = [];
     const targets = roomScene.selected_targets;
+    const prompt = JSON.parse(Backend.callLuaFunction(
+      "ActiveSkillPrompt",
+      [pending_skill, pendings, targets]
+    ));
+    if (prompt !== "") {
+      roomScene.setPrompt(processPrompt(prompt));
+    }
 
     handcardAreaItem.cards.forEach((card) => {
       if (card.selected || JSON.parse(Backend.callLuaFunction(
@@ -337,6 +357,7 @@ RowLayout {
     handcardAreaItem.adjustCards();
     handcardAreaItem.unselectAll();
     cardSelected(-1);
+    roomScene.resetPrompt();
   }
 
   function addSkill(skill_name, prelight) {

lua/client/client_util.lua

@@ -187,12 +187,25 @@ end
 
 function GetPlayerSkills(id)
   local p = ClientInstance:getPlayerById(id)
-  return json.encode(table.map(p.player_skills, function(s)
+  local equip = {}
-    return s.visible and {
+  local ret = {}
+  table.forEach(p.player_skills, function(s)
+    if s:isEquipmentSkill() then
+      table.insert(equip, s.attached_equip)
+    elseif s.visible then
+      table.insert(ret, {
         name = s.name,
         description = Fk:getDescription(s.name),
-    } or nil
+      })
+    end
+  end)
+  table.insertTable(ret, table.map(equip, function(e)
+    return {
+      name = e,
+      description = Fk:getDescription(e),
+    }
   end))
+  return json.encode(ret)
 end
 
 ---@param card string | integer
@@ -352,6 +365,19 @@ function ActiveCanUse(skill_name)
   return json.encode(ret)
 end
 
+function ActiveSkillPrompt(skill_name, selected, selected_targets)
+  local skill = Fk.skills[skill_name]
+  local ret = false
+  if skill then
+    if type(skill.prompt) == "function" then
+      ret = skill:prompt(selected, selected_targets)
+    else
+      ret = skill.prompt
+    end
+  end
+  return json.encode(ret)
+end
+
 function ActiveCardFilter(skill_name, to_select, selected, selected_targets)
   local skill = Fk.skills[skill_name]
   local ret = false

lua/core/skill_type/active.lua

@@ -162,4 +162,8 @@ function ActiveSkill:onEffect(room, cardEffectEvent) end
 ---@param cardEffectEvent CardEffectEvent | SkillEffectEvent
 function ActiveSkill:onNullified(room, cardEffectEvent) end
 
+---@param selected integer[] @ ids of selected players
+---@param selected_cards integer[] @ ids of selected cards
+function ActiveSkill:prompt(selected, selected_cards) return "" end
+
 return ActiveSkill

lua/core/skill_type/view_as.lua

@@ -39,4 +39,8 @@ end
 ---@param cardUseStruct CardUseStruct
 function ViewAsSkill:beforeUse(player, cardUseStruct) end
 
+---@param selected integer[] @ ids of selected players
+---@param selected_cards integer[] @ ids of selected cards
+function ActiveSkill:prompt(selected, selected_cards) return "" end
+
 return ViewAsSkill

lua/fk_ex.lua

@@ -170,6 +170,7 @@ end
 ---@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 prompt fun(self: ActiveSkill, selected: integer[], selected_cards: integer[]): string
 
 ---@param spec ActiveSkillSpec
 ---@return ActiveSkill
@@ -193,6 +194,7 @@ function fk.CreateActiveSkill(spec)
   if spec.about_to_effect then skill.aboutToEffect = spec.about_to_effect end
   if spec.on_effect then skill.onEffect = spec.on_effect end
   if spec.on_nullified then skill.onNullified = spec.on_nullified end
+  if spec.prompt then skill.prompt = spec.prompt end
 
   if spec.interaction then
     skill.interaction = setmetatable({}, {
@@ -215,6 +217,7 @@ end
 ---@field public enabled_at_play fun(self: ViewAsSkill, player: Player): boolean
 ---@field public enabled_at_response fun(self: ViewAsSkill, player: Player): boolean
 ---@field public before_use fun(self: ViewAsSkill, player: ServerPlayer)
+---@field public prompt fun(self: ActiveSkill, selected: integer[], selected_cards: integer[]): string
 
 ---@param spec ViewAsSkillSpec
 ---@return ViewAsSkill
@@ -242,6 +245,7 @@ function fk.CreateViewAsSkill(spec)
       return spec.enabled_at_response(curSkill, player, cardResponsing) and curSkill:isEffectable(player)
     end
   end
+  if spec.prompt then skill.prompt = spec.prompt end
 
   if spec.interaction then
     skill.interaction = setmetatable({}, {

lua/ui-util.lua

@@ -14,8 +14,9 @@ local UI = {}
 -- * default: string，默认的选项，默认为choices的第一个
 -- * detailed: bool，为真的话送详细信息
 UI.ComboBox = function(spec)
-  assert(type(spec.choices) == "table", "Choices is not a table")
+  -- assert(type(spec.choices) == "table", "Choices is not a table")
-  assert(#spec.choices > 0, "Choices is empty")
+  -- assert(#spec.choices > 0, "Choices is empty")
+  spec.choices = type(spec.choices) == "table" and spec.choices or Util.DummyTable
   spec.default = spec.default or spec.choices[1]
   spec.detailed = spec.detailed
   spec.type = "combo"

packages/test/init.lua

@@ -150,6 +150,7 @@ local test_vs = fk.CreateViewAsSkill{
     c:addSubcard(cards[1])
     return c
   end,
+  prompt = "#test_vs",
 }
 local test_trig = fk.CreateTriggerSkill{
   name = "test_trig",
@@ -280,6 +281,7 @@ Fk:loadTranslationTable{
 
   ["test_vs"] = "视为",
   [":test_vs"] = "你可以将牌当包含无懈在内的某张锦囊使用。",
+  ["#test_vs"] = "视为：你可以学习锦囊牌的用法",
 
   ["damage_maker"] = "制伤",
   [":damage_maker"] = "出牌阶段，你可以进行一次伤害制造器。",