Merge pull request #1246 from mengxinzxz/PR-Branch

族钟繇;bugfix
This commit is contained in:
Spmario233 2024-04-21 16:28:52 +08:00 committed by GitHub
commit 0a485c3185
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 2306 additions and 576 deletions

File diff suppressed because it is too large Load Diff

View File

@ -33,7 +33,7 @@ game.import("character", function () {
character: {
dc_shen_huatuo: ["male", "shen", 3, ["jingyu", "lvxin", "huandao"], ["qun"]],
shen_xuzhu: ["male", "shen", 5, ["zhengqing", "zhuangpo"], ["wei"]],
shen_lusu: ["male", "shen", 3, ["dingzhou", "tamo", "zhimeng"], ["wu"]],
shen_lusu: ["male", "shen", 3, ["tamo", "dingzhou", "zhimeng"], ["wu"]],
shen_huatuo: ["male", "shen", 3, ["wuling", "youyi"], ["qun"]],
le_shen_jiaxu: ["male", "shen", 4, ["jxlianpo", "jxzhaoluan"], ["qun"]],
shen_dianwei: ["male", "shen", 4, ["juanjia", "qiexie", "cuijue"], ["wei"]],
@ -715,7 +715,7 @@ game.import("character", function () {
eff = ui.selected.cards
.map((card) => get.value(card))
.reduce((p, c) => p + c, 0);
if (player.hasSkill("zhimeng")) eff *= 1 + get.sgnAttitude(player, target) * 0.15;
if (player.hasSkill("zhimeng") && (get.mode() == 'identity' || (player.countCards('h') - target.countCards('h') > 2 * ui.selected.cards.length))) eff *= 1 + get.sgnAttitude(player, target) * 0.15;
const es = target.getCards("e"),
js = target.getCards("j");
es.forEach((card) => {
@ -931,8 +931,7 @@ game.import("character", function () {
filter(event, player) {
return game.hasPlayer(target => {
if (target == player || target.countCards('h') + player.countCards('h') == 0) return false;
// return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1;
return true;
return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1;
});
},
direct: true,
@ -945,8 +944,7 @@ game.import("character", function () {
"与一名其他角色平分手牌",
(card, player, target) => {
if (target == player || target.countCards('h') + player.countCards('h') == 0) return false;
// return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1;
return true;
return get.mode() == 'identity' || target.countCards('h') <= player.countCards('h') + 1;
}
)
.set("ai", (target) => {
@ -10845,14 +10843,16 @@ game.import("character", function () {
dingzhou_info:
"出牌阶段限一次。你可以将X张牌交给一名场上有牌的角色然后你获得其场上的所有牌X为其场上的牌数。",
tamo: "榻谟",
tamo_info_doudizhu: "游戏开始时,你可以重新分配除三号位角色外所有角色的座次。",
tamo_info: "游戏开始时,你可以重新分配除主公外所有角色的座次。",
tamo_info_doudizhu: "游戏开始时,你可以重新分配除三号位角色外所有角色的座次。",
tamo_faq: "FAQ",
tamo_faq_info:
"<br><li>Q在一号位不为主公的情况下〖榻谟〗如何结算</li><li>A该角色可以正常进行座次交换。若受此技能影响导致一号位角色发生了变化则以排列后的一号位角色为起始角色开始本局游戏。</li>",
zhimeng: "智盟",
zhimeng_info:
zhimeng_info_identity:
"回合结束后,你可以选择一名其他角色。若如此做,你与其将各自所有手牌置于处理区,然后你随机获得这些牌中的一半(向上取整),其获得剩余的牌。",
zhimeng_info:
"回合结束后你可以选择一名手牌数不大于Y的其他角色Y为你的手牌数+1。若如此做你与其将各自所有手牌置于处理区然后你随机获得这些牌中的一半向上取整其获得剩余的牌。",
shen_xuzhu: "神许褚",
shen_xuzhu_prefix: "神",
zhengqing: "争擎",

View File

@ -142,6 +142,7 @@ window.noname_character_rank = {
"dc_shen_huatuo",
"sp_zhenji",
"wu_guanyu",
"clan_zhongyao",
],
a: [
"star_caoren",
@ -1916,6 +1917,7 @@ window.noname_character_rank = {
"wu_guanyu",
],
epic: [
"clan_zhongyao",
"dc_caoshuang",
"tianchou",
"star_yuanshao",

View File

@ -1424,22 +1424,21 @@ game.import("character", function () {
player.removeMark("sbxingshang", get.info("sbxingshang").getNum(num + 4));
switch (num) {
case 1:
case 2:
case 5:
case 6:
const type = ["basic", "equip", "trick"][[1, 2, 6].indexOf(num)];
const type = ["basic", "equip", "trick"][[1, 5, 6].indexOf(num)];
target.addTempSkill("sbfangzhu_ban", { player: "phaseEnd" });
target.markAuto("sbfangzhu_ban", [type]);
break;
case 2:
target.addTempSkill("baiban", { player: "phaseEnd" });
break;
case 3:
target.addTempSkill("sbfangzhu_kill", { player: "phaseEnd" });
break;
case 4:
target.turnOver();
break;
case 5:
target.addTempSkill("sbfangzhu_ban", { player: "phaseEnd" });
target.markAuto("sbfangzhu_ban", ["equip"]);
break;
}
},
ai: {

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

View File

@ -674,6 +674,7 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
if (!this.classList.toggle("on")) {
game.saveConfig("asset_toggle_off", true);
[
span114514_br,
span7,
span7_br,
span7_check,
@ -695,6 +696,7 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
} else {
game.saveConfig("asset_toggle_off");
[
span114514_br,
span7,
span7_br,
span7_check,
@ -721,6 +723,8 @@ export const otherMenu = function (/** @type { boolean | undefined } */ connectM
// var span6_br = ui.create.node('br');
// li2.lastChild.appendChild(span6_br);
// var span2_br = ui.create.node('br');
var span114514_br = ui.create.node('br');
li2.lastChild.appendChild(span114514_br);
var span7 = ui.create.div("", `不替换已有素材`);
span7.style.fontSize = "small";