Merge branch 'Comments' of https://github.com/IceCola97/noname into C…

…omments

character/collab/skill.js

@@ -338,15 +338,23 @@ const skills = {
  order: 10,
  result: {
  target(player, target) {
+ if (player === target) {
+ if (ui.selected.targets.length) return 8;
+ return 0;
+ }
  if (target.getStorage("dclisao_gaifa").includes(player)) return 0;
  if (get.damageEffect(target, player, player) < 0 && get.attitude(player, target) > 0) return 0;
- let cards = player.getCards("hs", card => get.tag(card, "damage") && player.canUse(card, target) && get.effect(target, card, player, player) > 0);
+ let cards = player.getCards("hs", card => get.tag(card, "damage") && get.effect(target, card, player, player) > 0);
  if (!cards.length) return 0;
  let cardx = cards.filter(card => get.name(card) == "sha");
  cardx.sort((a, b) => get.effect(target, b, player, player) - get.effect(target, a, player, player));
  cardx = cardx.slice(Math.min(cardx.length, player.getCardUsable("sha")), cardx.length);
  cards.removeArray(cardx);
- return -cards.reduce((sum, card) => sum + get.effect(target, card, player, player), 0) - 10;
+ return cards.reduce((sum, card) => {
+ if (player.canUse(card, target)) return sum + get.effect(target, card, player, target);
+ if (player.canUse(card, target, false)) return sum + get.effect(target, card, player, target) / 10;
+ return 0;
+ }, 0) - 10;
  },
  },
  },

character/collab/voices.js

@@ -3,7 +3,7 @@ export default {
  "#dcqiusuo2": "路漫漫其修远兮，吾将上下而求索。",
  "#dclisao1": "朝饮木兰之坠露，夕餐秋菊之落英。",
  "#dclisao2": "惟草木之零落兮，恐美人之迟暮。",
- "#quyuan:die": "伏清白以死直兮，固前圣之所厚。",
+ "#quyuan:die": "伏清白以死直兮，固前圣之所厚……",
  "#dcjuejing1": "龙翔九天，曳日月于天地，换旧符于新岁。",
  "#dcjuejing2": "御风万里，辟邪祟于宇外，映祥瑞于神州。",
  "#dclonghun1": "龙诞新岁，普天同庆，魂佑宇内，裔泽炎黄。",

character/key/skill.js

@@ -6041,6 +6041,7 @@ const skills = {
  filter(event, player) {
  return event.name != "phase" || game.phaseNumber == 0;
  },
+ derivation: ["kotori_skill_wei", "kotori_skill_shu", "kotori_skill_wu", "kotori_skill_qun", "kotori_skill_jin", "kotori_skill_key"],
  content() {
  var list = ["wei", "shu", "wu", "qun", "jin"];
  for (var i of list) {

character/mobile/character.js

@@ -66,7 +66,7 @@ const characters = {
  re_zhonghui: ["male", "wei", 4, ["requanji", "zili"], ["clan:颍川钟氏"]],
  xin_caifuren: ["female", "qun", 3, ["xinqieting", "xianzhou"]],
  xin_zhoucang: ["male", "shu", 4, ["mobilezhongyong"]],
- ol_yujin: ["male", "wei", 4, ["rejieyue"]],
+ ol_yujin: ["male", "wei", 4, ["rejieyue"], ["die:yujin_yujin"]],
  zhouqun: ["male", "shu", 3, ["tiansuan"]],
  re_zhurong: ["female", "shu", 4, ["juxiang", "relieren"]],
  re_jiangwei: ["male", "shu", 4, ["retiaoxin", "zhiji"]],

character/mobile/dynamicTranslate.js

@@ -41,8 +41,8 @@ const dynamicTranslates = {
  },
  mbzuoyou(player) {
  const mbzuoyou = player.storage.mbzuoyou;
- if (mbzuoyou) return '转换技。出牌阶段限一次，阴：你可以令一名角色摸两张牌，然后其弃置一张牌；<span class="bluetext">阳：你可以令一名手牌数不少于二的角色弃置两张手牌，然后其获得1点护甲。</span>';
- return '转换技。出牌阶段限一次，<span class="bluetext">阴：你可以令一名角色摸两张牌，然后其弃置一张牌；</span>阳：你可以令一名手牌数不少于二的角色弃置两张手牌，然后其获得1点护甲。';
+ if (mbzuoyou) return '转换技。出牌阶段限一次，阴：你可以令一名角色摸三张牌，然后其弃置两张牌；<span class="bluetext">阳：你可以令一名有手牌的角色弃置一张手牌，然后其获得1点护甲。</span>';
+ return '转换技。出牌阶段限一次，<span class="bluetext">阴：你可以令一名角色摸三张牌，然后其弃置两张牌；</span>阳：你可以令一名有手牌的角色弃置一张手牌，然后其获得1点护甲。';
  },
 };
 export default dynamicTranslates;

character/mobile/skill.js

@@ -52,21 +52,21 @@ const skills = {
  }
  }
  if (list.includes(SUB)) {
- if (att > 0 && attSource > 0) return SUB;
+ if (att > 0 && attSource >= 0) return SUB;
  if (canFilterDamage && att > 0) return "cancel2";
  if (damageEff > 0) {
  if (target.getHp() > trigger.num && attSource > 0 && source.countCards("h") + source.getHp() <= 4) return SUB;
  } else {
  if (att > 0) {
  if (trigger.num >= target.getHp()) return SUB;
  if (
- !source.countCards("hs", card => {
+ souce && !source.countCards("hs", card => {
  return source.canUse(card, target, true) && get.effect(target, card, source, player) > 0;
  })
  )
  return Math.random() < 0.7 ? ADD : "cancel2";
  } else {
- if (attSource > 0) return SUB;
+ if (attSource >= 0) return SUB;
  if (target.hasSkillTag("maixie") && trigger.num === 1 && damageEff < -20) return SUB;
  }
  }
@@ -130,16 +130,16 @@ const skills = {
  usable: 1,
  zhuanhuanji: true,
  filterTarget(card, player, target) {
- if (player.storage.mbzuoyou) return target.countCards("h") >= 2;
+ if (player.storage.mbzuoyou) return target.countCards("h");
  return true;
  },
  async content(event, trigger, player) {
  const storage = player.storage.mbzuoyou,
  target = event.target;
  if (event.name === "mbzuoyou") player.changeZhuanhuanji("mbzuoyou");
  if (!storage) {
- await target.draw(2);
- await target.chooseToDiscard(1, true, "h");
+ await target.draw(3);
+ await target.chooseToDiscard(2, true, "h");
  } else {
  await target.chooseToDiscard(target === player ? "佐佑" : `${get.translation(player)}对你发动了【佐佑】`, "请弃置两张手牌，然后获得1点护甲", 2, true);
  await target.changeHujia(1, null, true);
@@ -149,8 +149,8 @@ const skills = {
  marktext: "☯",
  intro: {
  content(storage, player) {
- if (!storage) return "转换技。出牌阶段限一次，你可以令一名角色摸两张牌，然后其弃置一张手牌。";
- return "转换技。出牌阶段限一次，你可以令一名手牌数不少于二的角色弃置两张手牌，然后其获得1点护甲。";
+ if (!storage) return "转换技。出牌阶段限一次，你可以令一名角色摸三张牌，然后其弃置两张手牌。";
+ return "转换技。出牌阶段限一次，你可以令一名有手牌的角色弃置一张手牌，然后其获得1点护甲。";
  },
  },
  ai: {
@@ -344,8 +344,7 @@ const skills = {
  (event.name != "phase" || game.phaseNumber == 0) &&
  game.hasPlayer(current => {
  return current !== player && current.hasEnabledSlot(1);
- }) &&
- get.mode() == "identity"
+ })
  );
  },
  async cost(event, trigger, player) {

character/mobile/translate.js

@@ -858,7 +858,7 @@ const translates = {
  mbweiming_info: "使命技，锁定技。①出牌阶段开始时，你记录一名未以此法记录过的角色。②成功：当你杀死一名未被〖威命①〗记录过的角色后，修改〖血途〗为成功版本。③失败：当一名被〖威命①〗记录过的角色死亡后，你修改〖血途〗为失败版本。",
  lizhaojiaobo: "李昭焦伯",
  mbzuoyou: "佐佑",
- mbzuoyou_info: "转换技。出牌阶段限一次，阴：你可以令一名角色摸两张牌，然后其弃置一张手牌；阳：你可以令一名手牌数不少于二的角色弃置两张手牌，然后其获得1点护甲。",
+ mbzuoyou_info: "转换技。出牌阶段限一次，阴：你可以令一名角色摸三张牌，然后其弃置两张手牌；阳：你可以令一名有手牌的角色弃置一张手牌，然后其获得1点护甲。",
  mbshishou: "侍守",
  mbshishou_info: "锁定技。当你发动〖佐佑〗后，若目标角色不为你，你执行〖佐佑〗中目标角色未执行的一项。",
  chengji: "成济",
@@ -869,8 +869,7 @@ const translates = {
  mb_sp_guanqiujian: "SP毌丘俭",
  mb_sp_guanqiujian_prefix: "SP",
  mbcuizhen: "摧阵",
- mbcuizhen_info_identity: "①游戏开始时，你可以废除至多两名其他角色的武器栏。②当你于出牌阶段使用伤害类牌指定其他角色为目标后，若目标角色的手牌数不小于体力值，你可以废除其武器栏。③摸牌阶段，你令额定摸牌数+X（X为所有角色被废除的武器栏数之和，至多为2）。",
- mbcuizhen_info: "①当你于出牌阶段使用伤害类牌指定其他角色为目标后，若目标角色的手牌数不小于体力值，你可以废除其武器栏。②摸牌阶段，你令额定摸牌数+X（X为所有角色被废除的武器栏数之和，至多为2）。",
+ mbcuizhen_info: "①游戏开始时，你可以废除至多两名其他角色的武器栏。②当你于出牌阶段使用伤害类牌指定其他角色为目标后，若目标角色的手牌数不小于体力值，你可以废除其武器栏。③摸牌阶段，你令额定摸牌数+X（X为所有角色被废除的武器栏数之和，至多为2）。",
  mbkuili: "溃离",
  mbkuili_info: "锁定技。当你受到伤害后，你弃置等同于伤害值的手牌；若来源有被废除的武器栏，你令其恢复武器栏。",
  mb_caomao: "手杀曹髦",

character/mobile/voices.js

@@ -245,6 +245,7 @@ export default {
  "#jueyong2": "身陷敌阵，战而弥勇！",
  "#poxiang1": "王瓘既然假降，吾等可将计就计。",
  "#poxiang2": "佥率已降两千魏兵，便可大破魏军主力。",
+ "#fuqian:die": "生为蜀臣，死……亦当为蜀！",
  "#disordersidi1": "司敌之动，先发而制。",
  "#disordersidi2": "料敌之行，伏兵灭之。",
  "#xin_caozhen:die": "雍凉动乱，皆吾之过也……",

character/old/character.js

@@ -7,7 +7,7 @@ const characters = {
  old_chendao: ["male", "shu", 4, ["drlt_wanglie"]],
  old_liyan: ["male", "shu", 3, ["duliang", "fulin"]],
  old_guanzhang: ["male", "shu", 4, ["old_fuhun"]],
- new_caoren: ["male", "wei", 4, ["moon_jushou", "jiewei"]],
+ new_caoren: ["male", "wei", 4, ["moon_jushou", "jiewei"], ["die:caoren"]],
  huangzhong: ["male", "shu", 4, ["liegong"]],
  junk_sunquan: ["male", "shen", 4, ["dili", "yuheng"], ["wei"]],
  old_dingfeng: ["male", "wu", 4, ["fenxun", "duanbing"]],
@@ -43,7 +43,7 @@ const characters = {
  masu: ["male", "shu", 3, ["xinzhan", "huilei"]],
  xushu: ["male", "shu", 3, ["xswuyan", "jujian"], ["border:wei"]],
  liru: ["male", "qun", 3, ["juece", "mieji", "fencheng"]],
- xin_yujin: ["male", "wei", 4, ["jieyue"]],
+ xin_yujin: ["male", "wei", 4, ["jieyue"], ["die:yujin"]],
  //lusu:['male','wu',3,['haoshi','dimeng']],
  //yuanshao:['male','qun',4,['luanji','xueyi'],['zhu']],
  old_zhonghui: ["male", "wei", 3, ["zzhenggong", "zquanji", "zbaijiang"], ["clan:颍川钟氏"]],
@@ -63,7 +63,7 @@ const characters = {
  old_guanqiujian: ["male", "wei", 4, ["drlt_zhenrong", "drlt_hongju"], []],
  old_wanglang: ["male", "wei", 3, ["gushe", "jici"]],
  old_wangyi: ["female", "wei", 3, ["oldzhenlie", "oldmiji"]],
- re_yujin: ["male", "wei", 4, ["yizhong"]],
+ re_yujin: ["male", "wei", 4, ["yizhong"], ["die:yujin"]],
 };
 
 export default characters;

character/old/voices.js

@@ -1,4 +1,18 @@
 export default {
+ "#yizhong1": "不先为备，何以待敌？",
+ "#yizhong2": "稳重行军，百战不殆！",
+ "#xin_yujin:die": "呃，晚节不保……",
+ "#xiahouyuan:die": "竟然……比我还……快……",
+ "#weiyan:die": "谁敢杀我？！呃啊……",
+ "#xuhuang:die": "一顿不吃，饿得慌……",
+ "#huangtian2_zhangjiao1": "岁在甲子，天下大吉！",
+ "#huangtian2_zhangjiao2": "苍天已死，黄天当立！",
+ "#zhangjiao:die": "黄天，也死了……",
+ "#wuyan1": "唉，一切尽在不言中。",
+ "#wuyan2": "嘘，言多必失啊。",
+ "#jujian1": "将军岂愿抓牌乎？",
+ "#jujian2": "我看好你！",
+ "#xushu:die": "娘……孩儿不孝……向您……请罪……",
  "#old_guhuo1": "你信吗？",
  "#old_guhuo2": "猜猜看哪~",
  "#yuji:die": "竟然……被猜到了……",

character/onlyOL/character.js

@@ -12,6 +12,7 @@ const characters = {
  ol_wangyi: ["female", "wei", 3, ["olzhenlie", "olmiji"]],
  ol_sb_pangtong: ["male", "shu", 3, ["olsbhongtu", "olsbqiwu"]],
  ol_fazheng: ["male", "shu", 3, ["olxuanhuo", "olenyuan"]],
+ ol_caifuren: ["female", "qun", 3, ["olqieting", "xianzhou"]],
 };
 
 export default characters;

character/onlyOL/skill.js

@@ -2,6 +2,90 @@ import { lib, game, ui, get, ai, _status } from "../../noname.js";
 
 /** @type { importCharacterConfig['skill'] } */
 const skills = {
+ //OL界蔡夫人
+ olqieting: {
+ audio: 2,
+ trigger: {
+ global: "phaseEnd",
+ },
+ filter(event, player) {
+ const target = event.player;
+ if (target == player || !target.isIn()) return false;
+ return !target.hasHistory("useCard", evt => evt.targets && evt.targets.some(i => i != target)) || !target.hasHistory("sourceDamage", evt => evt.player != target);
+ },
+ async cost(event, trigger, player) {
+ const target = trigger.player;
+ let num = 0;
+ if (!target.hasHistory("useCard", evt => evt.targets && evt.targets.some(i => i != target))) num++;
+ if (!target.hasHistory("sourceDamage", evt => evt.player != target)) num++;
+ const next = player.chooseButton([
+ "窃听：请选择" + (num > 1 ? "一至两" : "一") + "项",
+ [
+ [
+ ["move", "将" + get.translation(target) + "装备区的一张牌置于你的装备区"],
+ ["draw", "摸一张牌"],
+ ],
+ "textbutton",
+ ],
+ ]);
+ next.set("selectButton", [1, num]);
+ next.set("filterButton", button => {
+ if (
+ button.link == "move" &&
+ !get
+ .event()
+ .getTrigger()
+ .player.countCards("e", card => {
+ return player.canEquip(card);
+ })
+ )
+ return false;
+ return true;
+ });
+ next.set("ai", button => {
+ const target = get.event().getTrigger().player,
+ val = target.hasSkillTag("noe") ? 6 : 0;
+ if (
+ button.link == "move" &&
+ (get.attitude(player, target) > 0 ||
+ !target.countCards("e", function (card) {
+ return player.canEquip(card) && get.value(card, target) > val && get.effect(player, card, player, player) > 0;
+ }))
+ )
+ return 0;
+ return 1;
+ });
+ const {
+ result: { bool, links },
+ } = await next;
+ event.result = {
+ bool: bool,
+ cost_data: links,
+ };
+ },
+ logTarget: "player",
+ async content(event, trigger, player) {
+ const target = trigger.player,
+ choices = event.cost_data;
+ if (choices.includes("move")) {
+ const cards = await player
+ .choosePlayerCard(target, "e", true)
+ .set("filterButton", button => {
+ return get.player().canEquip(button.link);
+ })
+ .set("ai", button => {
+ const player = get.player();
+ return get.effect(player, button.link, player, player);
+ })
+ .forResultCards();
+ const card = cards[0];
+ target.$give(card, player, false);
+ await game.asyncDelay(0.5);
+ await player.equip(card);
+ }
+ if (choices.includes("draw")) await player.draw();
+ },
+ },
  //谋庞统
  olsbhongtu: {
  audio: 2,

character/onlyOL/sort.js

@@ -2,13 +2,15 @@ const characterSort = {
  onlyOL_yijiang1: ["ol_jianyong", "ol_lingtong", "ol_gaoshun", "ol_fazheng"],
  onlyOL_yijiang2: ["ol_caozhang", "ol_chengpu", "ol_wangyi"],
  onlyOL_yijiang3: ["ol_yufan"],
+ onlyOL_yijiang4: ["ol_caifuren"],
  onlyOL_sb: ["ol_sb_jiangwei", "ol_sb_guanyu", "ol_sb_taishici", "ol_sb_yuanshao", "ol_sb_pangtong"],
 };
 
 const characterSortTranslate = {
  onlyOL_yijiang1: "OL专属·将1",
  onlyOL_yijiang2: "OL专属·将2",
  onlyOL_yijiang3: "OL专属·将3",
+ onlyOL_yijiang4: "OL专属·将4",
  onlyOL_sb: "OL专属·上兵伐谋",
 };
 

character/onlyOL/translate.js

@@ -86,6 +86,10 @@ const translates = {
  olenyuan1: "恩怨",
  olenyuan2: "恩怨",
  olenyuan_info: "①当你一次性获得一名其他角色超过一张牌后，你可以令其摸一张牌。②当你受到1点伤害后，你可以令伤害来源选择一项：1.将一张红色手牌交给你；2.失去1点体力。",
+ ol_caifuren: "OL界蔡夫人",
+ ol_caifuren_prefix: "OL界",
+ olqieting: "窃听",
+ olqieting_info: "其他角色的回合结束后，你可以选择X项：1.将其装备区的一张牌置入你的装备区；2.摸一张牌（X为以下条件中其本回合满足的项数：未对其他角色造成伤害、未对其他角色使用过牌）。",
 };
 
 export default translates;

character/rank.js

@@ -400,6 +400,7 @@ window.noname_character_rank = {
  "matie",
  "dc_sb_caoang",
  "dc_sb_guanping",
+ "ol_caifuren",
  ],
  am: [
  "tw_yanliang",
@@ -1145,6 +1146,9 @@ window.noname_character_rank = {
  "std_feiyi",
  "tw_zhugejun",
  "mb_simafu",
+ "huan_weiyan",
+ "huan_simayi",
+ "huan_zhaoyun",
  ],
  b: [
  "star_zhangzhao",
@@ -1991,6 +1995,7 @@ window.noname_character_rank = {
  "jsrg_yuanshao",
  ],
  epic: [
+ "huan_simayi",
  "dc_sb_zhangxiu",
  "ol_jiangwan",
  "xukun",
@@ -2292,6 +2297,7 @@ window.noname_character_rank = {
  "dc_sp_zhurong",
  ],
  rare: [
+ "ol_caifuren",
  "dc_sb_caoang",
  "dc_sb_guanping",
  "yue_zhugeguo",
@@ -2818,6 +2824,8 @@ window.noname_character_rank = {
  "sb_handang",
  "sb_gongsunzan",
  "matie",
+ "huan_weiyan",
+ "huan_zhaoyun",
  ],
  junk: [
  "ol_peixiu",

character/refresh/character.js

@@ -68,7 +68,7 @@ const characters = {
  re_masu: ["male", "shu", 3, ["resanyao", "rezhiman"]],
  re_sunluban: ["female", "wu", 3, ["rechanhui", "rejiaojin"]],
  xin_handang: ["male", "wu", 4, ["xingongji", "xinjiefan"]],
- yujin_yujin: ["male", "wei", 4, ["decadezhenjun"]],
+ yujin_yujin: ["male", "wei", 4, ["decadezhenjun"], ["die:xin_yujin"]],
  re_caozhang: ["male", "wei", 4, ["xinjiangchi"]],
  re_chengpu: ["male", "wu", 4, ["ollihuo", "rechunlao"]],
  re_quancong: ["male", "wu", 4, ["xinyaoming"]],

character/refresh/skill.js

@@ -2395,7 +2395,6 @@ const skills = {
  }
  },
  ai: {
- combo: "fenli",
  effect: {
  target: function (card) {
  if (card.name == "lebu" || card.name == "bingliang") return 0.5;