Merge pull request libccy#1484 from xizifu/PR-Branch

补全幻系列武将；素材补充；武将bugfix；部分武将分包移动和描述勘误

character/jsrg/skill.js

@@ -798,8 +798,11 @@ const skills = {
  jsrgsaojian: {
  enable: "phaseUse",
  usable: 1,
+ filter(event, player) {
+ return game.hasPlayer(current => current != player && current.countCards("h") > 0);
+ },
  filterTarget(card, player, target) {
- return target.countCards("h") > 0;
+ return target != player && target.countCards("h") > 0;
  },
  async content(event, trigger, player) {
  const target = event.target;

character/onlyOL/skill.js

@@ -924,7 +924,7 @@ const skills = {
  eff = get.effect(target, trigger.card, trigger.player, player);
  if (trigger.card.name == "tiesuo") return eff > 0 ? 0 : get.sgn(att) * (2 + get.sgn(att));
  const sum = trigger.targets.reduce((i, j) => i + get.effect(j, trigger.card, trigger.player, player), 0);
- return get.sgn(att) * (eff * 2 - sum);
+ return eff * 2 - sum;
  },
  })
  .set("prompt2", "弃置一张" + get.translation(get.color(trigger.card)) + "牌，令" + get.translation(trigger.card) + "改为对其中一个目标结算两次");

character/onlyOL/translate.js

@@ -42,7 +42,7 @@ const translates = {
  ol_sb_yuanshao: "OL谋袁绍",
  ol_sb_yuanshao_prefix: "OL谋",
  olsbhetao: "合讨",
- olsbhetao_info: "其他角色使用牌执行第一个目标后，若此牌指定的目标数大于1，则你可以弃置一张与此牌颜色相同的牌并令此牌改为对其中一名目标角色结算两次。",
+ olsbhetao_info: "其他角色使用牌指定第一个目标后，若此牌指定的目标数大于1，则你可以弃置一张与此牌颜色相同的牌并令此牌改为对其中一名目标角色结算两次。",
  olsbshenli: "神离",
  olsbshenli_info: "出牌阶段限一次，当你使用【杀】指定目标后，你可以令所有可成为此牌目标的其他角色均成为此牌目标，此牌结算完毕后，若你因此牌造成的伤害值X：大于你的手牌数，你摸X张牌（至多摸五张）；大于你的体力值，你再次对所有目标角色中可以成为此牌目标的角色使用此牌。",
  olsbyufeng: "玉锋",

character/rank.js

@@ -1151,8 +1151,10 @@ window.noname_character_rank = {
  "huan_simayi",
  "huan_zhaoyun",
  "huan_guojia",
+ "huan_jiangwei",
  ],
  b: [
+ "huan_zhugeliang",
  "huan_zhanghe",
  "star_zhangzhao",
  "dc_sp_zhurong",
@@ -2832,6 +2834,8 @@ window.noname_character_rank = {
  "matie",
  "huan_weiyan",
  "huan_zhaoyun",
+ "huan_jiangwei",
+ "huan_zhugeliang",
  ],
  junk: [
  "ol_peixiu",

character/sb/skill.js

@@ -370,12 +370,12 @@ const skills = {
  charlotte: true,
  mod: {
  globalTo(from, to, distance) {
- return distance - to.countMark("sbyicong_to");
+ return distance + to.countMark("sbyicong_to");
  },
  },
  marktext: "从",
  intro: {
- content: "本轮其他角色至你的距离-#",
+ content: "本轮其他角色至你的距离+#",
  },
  },
  },

character/shenhua/characterReplace.js

@@ -26,7 +26,7 @@ const characterReplaces = {
  dongzhuo: ["dongzhuo", "ol_dongzhuo", "re_dongzhuo", "star_dongzhuo", "jsrg_dongzhuo", "sp_dongzhuo", "yj_dongzhuo"],
  dengai: ["dengai", "ol_dengai", "re_dengai"],
  sp_ol_zhanghe: ["sp_ol_zhanghe", "yj_zhanghe", "sp_zhanghe", "jsrg_zhanghe", "huan_zhanghe"],
- jiangwei: ["jiangwei", "ol_jiangwei", "re_jiangwei", "ol_sb_jiangwei", "sb_jiangwei", "jsrg_jiangwei"],
+ jiangwei: ["jiangwei", "ol_jiangwei", "re_jiangwei", "ol_sb_jiangwei", "sb_jiangwei", "jsrg_jiangwei", "huan_jiangwei"],
  liushan: ["liushan", "ol_liushan", "re_liushan"],
  sunce: ["sunce", "re_sunce", "re_sunben", "sb_sunce", "dc_sunce"],
  zhangzhang: ["zhangzhang", "ol_zhangzhang", "re_zhangzhang", "tw_zhangzhao", "tw_zhanghong", "star_zhangzhao"],

character/sp/sort.js

@@ -2,7 +2,7 @@ const characterSort = {
  sp_tianji: ["sunhao", "liuxie", "caoang", "hetaihou", "sunluyu", "ol_wangrong", "zuofen", "ol_bianfuren", "qinghegongzhu", "tengfanglan", "ruiji", "caoxiancaohua", "caoyu"],
  sp_sibi: ["ol_lukai", "yangxiu", "guotu", "chenlin", "chengyu", "shixie", "fuwan", "wangyun", "zhugejin", "simalang", "maliang", "buzhi", "dongyun", "kanze", "sunqian", "xizhicai", "sunshao", "duxi", "jianggan", "ol_dengzhi", "ol_yangyi", "ol_dongzhao", "ol_chendeng", "jin_yanghu", "wangyan", "xiahouxuan", "quhuang", "zhanghua", "wangguan", "sunhong", "caoxi", "tianchou"],
  sp_tianzhu: ["ol_liupi", "yadan", "liyi", "zhangyan", "niujin", "hejin", "hansui", "wutugu", "yanbaihu", "shamoke", "zhugedan", "huangzu", "gaogan", "tadun", "fanjiangzhangda", "ahuinan", "dongtuna", "ol_wenqin"],
- sp_nvshi: ["ol_dingshangwan", "lingju", "guanyinping", "zhangxingcai", "mayunlu", "dongbai", "zhaoxiang", "ol_zhangchangpu", "daxiaoqiao", "jin_guohuai", "ol_hujinding", "ol_luyusheng"],
+ sp_nvshi: ["ol_dingshangwan", "lingju", "guanyinping", "zhangxingcai", "mayunlu", "dongbai", "zhaoxiang", "ol_zhangchangpu", "daxiaoqiao", "jin_guohuai", "ol_hujinding", "ol_luyusheng", "ol_liwan"],
  sp_shaowei: ["ol_pengyang", "simahui", "zhangbao", "zhanglu", "zhugeguo", "xujing", "zhangling", "huangchengyan", "zhangzhi", "lushi"],
  sp_huben: ["duanjiong", "liupan", "ol_mengda", "caohong", "xiahouba", "zhugeke", "zumao", "wenpin", "litong", "mazhong", "heqi", "quyi", "luzhi", "yuejin", "dingfeng", "wuyan", "ol_zhuling", "tianyu", "huojun", "zhaoyǎn", "dengzhong", "ol_furong", "macheng", "ol_zhangyì", "ol_zhujun", "maxiumatie", "luoxian", "ol_huban", "haopu", "ol_qianzhao", "caimao"],
  sp_liesi: ["lvboshe", "mizhu", "weizi", "ol_liuba", "zhangshiping"],
@@ -12,7 +12,7 @@ const characterSort = {
  sp_zhongdan: ["cuiyan", "huangfusong"],
  sp_guozhan2: ["sp_dongzhuo", "zhangren"],
  sp_others: ["hanba", "caiyang", "ol_peixiu"],
- sp_waitforsort: ["ol_tw_zhangji", "ol_liwan", "ol_jiangwan", "mawan"],
+ sp_waitforsort: ["ol_tw_zhangji", "ol_jiangwan", "mawan"],
 };
 
 const characterSortTranslate = {

character/standard/characterReplace.js

@@ -15,7 +15,7 @@ const characterReplaces = {
  sp_zhaoyun: ["sp_zhaoyun", "jsp_zhaoyun"],
  machao: ["machao", "re_machao", "sb_machao", "ps_machao"],
  sp_machao: ["sp_machao", "dc_sp_machao", "jsrg_machao", "old_machao"],
- zhugeliang: ["zhugeliang", "re_zhugeliang", "sb_zhugeliang", "ps2066_zhugeliang", "ps_zhugeliang"],
+ zhugeliang: ["zhugeliang", "re_zhugeliang", "sb_zhugeliang", "ps2066_zhugeliang", "ps_zhugeliang", "huan_zhugeliang"],
  huangyueying: ["huangyueying", "re_huangyueying", "junk_huangyueying", "sb_huangyueying"],
  sunquan: ["sunquan", "re_sunquan", "sb_sunquan", "dc_sunquan", "xin_sunquan"],
  zhouyu: ["zhouyu", "re_zhouyu", "dc_sb_zhouyu", "sb_zhouyu", "ps1062_zhouyu", "ps2080_zhouyu"],

character/standard/skill.js

@@ -596,7 +596,10 @@ const skills = {
  await target.loseToDiscardpile(target.getCards("h"));
  await target.gain(cards, "gain2").set("giver", player);
  if (player.isDamaged()) {
- const bool = await target.chooseBool("是否令" + get.translation(player) + "回复1点体力？").forResult("bool");
+ const bool = await target
+ .chooseBool("是否令" + get.translation(player) + "回复1点体力？")
+ .set("choice", get.recoverEffect(player, target, target) > 0)
+ .forResult("bool");
  if (bool) {
  target.line(player);
  await player.recover();

character/tw/character.js

@@ -1,4 +1,6 @@
 const characters = {
+ huan_zhugeliang: ["male", "shu", "3/4", ["huan_zhugeliang_A", "huan_zhugeliang_B", "huan_zhugeliang_C"]],
+ huan_jiangwei: ["male", "shu", 4, ["huan_jiangwei_A", "huan_jiangwei_B"]],
  huan_guojia: ["male", "wei", 3, ["huan_guojia_A", "huan_guojia_B"]],
  huan_zhanghe: ["male", "wei", 4, ["huan_zhanghe_A"]],
  huan_zhaoyun: ["male", "shu", 4, ["huan_zhaoyun_A", "huan_zhaoyun_B"]],