Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 65 additions & 37 deletions card/extra.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ game.import("card", function () {
card.storage.mb_qingnangshu_skill = lib.card.mb_qingnangshu.maxNum;
lib.skill.mb_qingnangshu_skill.broadcast(card, player);
}
player.markSkill("mb_qingnangshu_skill");
if (player.getVCards("e", i => (i.name == "mb_qingnangshu" && i.storage?.mb_qingnangshu_skill > 0)).length) {
player.markSkill("mb_qingnangshu_skill");
}
},
onLose() {
if (!player.getCards("e", i => i.name == "mb_qingnangshu").length) {
if (!player.getVCards("e", i => (i.name == "mb_qingnangshu" && i.storage?.mb_qingnangshu_skill > 0)).length) {
player.unmarkSkill("mb_qingnangshu_skill");
} else {
player.markSkill("mb_qingnangshu_skill");
Expand Down Expand Up @@ -1480,11 +1482,14 @@ game.import("card", function () {
//青囊书
mb_qingnangshu_skill: {
equipSkill: true,
mark: true,
//mark: true,
marktext: "书",
intro: {
markcount(_, player) {
let cards = player.getCards("e", card => {
if (!player.getVCards("e", i => i.name == "mb_qingnangshu").length) {
return "∞";
}
let cards = player.getVCards("e", card => {
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
}),
num = 0;
Expand All @@ -1494,7 +1499,10 @@ game.import("card", function () {
return `${num}/${lib.card.mb_qingnangshu.maxNum}`;
},
content(_, player) {
let cards = player.getCards("e", card => {
if (!player.getVCards("e", i => i.name == "mb_qingnangshu").length) {
return "<li>剩余可用∞次<br><li>锁定技,准备阶段,你加1点体力上限并回复1点体力。";
}
let cards = player.getVCards("e", card => {
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
}),
num = 0;
Expand All @@ -1508,7 +1516,10 @@ game.import("card", function () {
trigger: { player: "phaseZhunbeiBegin" },
forced: true,
filter(event, player) {
return player.hasCard(card => {
if (!player.getVCards("e", i => i.name == "mb_qingnangshu").length) {
return true;
}
return player.hasVCard(card => {
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
}, "e");
},
Expand All @@ -1528,33 +1539,43 @@ game.import("card", function () {
}
if (card.storage.mb_qingnangshu_skill <= 0) {
if (player) {
player.lose(card, ui.special);
player.$throw(card, 1000);
if (!player.getCards("e", i => i.name == "mb_qingnangshu" && i != card).length) {
player.lose(card.cards, ui.special);
player.$throw(card.cards, 1000);
if (!player.getVCards("e", i => (i.name == "mb_qingnangshu" && i != card && i.storage?.mb_qingnangshu_skill > 0)).length) {
player.unmarkSkill("mb_qingnangshu_skill");
}
card.fix();
card.remove();
card.destroyed = true;
card.cards.forEach(cardx => {
cardx.fix();
cardx.remove();
cardx.destroyed = true;
});
} else {
game.cardsGotoSpecial(card);
game.cardsGotoSpecial(card.cards);
}
game.log(card, "被移出了游戏");
game.log(card.cards, "被移出了游戏");
}
},
getIndex(event, player) {
const cards = player.getVCards("e", card => {
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
});
if (cards?.length) {
return cards;
}
return 1;
},
async content(event, trigger, player) {
player.flashAvatar(event.name, "yangbiao");
player.chat("天道昭昭,再兴如光武亦可期!");
const cards = player.getCards("e", card => {
return card.name == "mb_qingnangshu" && card.storage?.mb_qingnangshu_skill > 0;
});
for (const card of cards) {
card.storage.mb_qingnangshu_skill--;
game.log(card, "减少了", "#y1点", "#g耐久值");
lib.skill.mb_qingnangshu_skill.broadcast(card, player);
}
await player.gainMaxHp();
await player.recover();
/*player.flashAvatar(event.name, "yangbiao");
player.chat("天道昭昭,再兴如光武亦可期!");*/
await player.gainMaxHp();
await player.recover();
const card = event.indexedData;
if (!card) {
return;
}
card.storage.mb_qingnangshu_skill--;
game.log(card, "减少了", "#y1点", "#g耐久值");
lib.skill.mb_qingnangshu_skill.broadcast(card, get.owner(card));
},
},

Expand All @@ -1569,18 +1590,25 @@ game.import("card", function () {
},
trigger: { player: "phaseDiscardBegin" },
forced: true,
getIndex(event, player) {
const cards = player.getVCards("e", card => card.name == "mb_chuanguoyuxi");
if (cards?.length) {
return cards;
}
return 1;
},
async content(event, trigger, player) {
player.flashAvatar(event.name, "yuanshu");
await player.draw();
player.addSkill(event.name + "_add");
player.addMark(event.name + "_add", 2, false);
game.log(player, "的手牌上限", "#y+2");
let str = "受命于天,既寿永昌!";
if (!player.isZhu2()) {
await player.loseHp();
str = ["你们都得听我的号令!", "我才是皇帝!"].randomGet();
}
player.chat(str);
/*player.flashAvatar(event.name, "yuanshu");*/
let str = "受命于天,既寿永昌!";
await player.draw();
player.addSkill(event.name + "_add");
player.addMark(event.name + "_add", 2, false);
game.log(player, "的手牌上限", "#y+2");
if (!player.isZhu2()) {
await player.loseHp();
str = ["你们都得听我的号令!", "我才是皇帝!"].randomGet();
}
player.chat(str);
},
subSkill: {
add: {
Expand Down
18 changes: 11 additions & 7 deletions character/mobile/skill.js
Original file line number Diff line number Diff line change
Expand Up @@ -25373,13 +25373,17 @@ const skills = {
check(event, player) {
return player.phaseNumber < 3;
},
content() {
if (player.phaseNumber < 5) {
player.gainMaxHp();
player.recover();
} else {
player.loseMaxHp();
}
logAudio(event, player) {
const num = (player.phaseNumber < 5) ? 1 : 2;
return `zhaohan${num}.mp3`;
},
async content(event, trigger, player) {
if (player.phaseNumber < 5) {
await player.gainMaxHp();
await player.recover();
} else {
await player.loseMaxHp();
}
},
},
rangjie: {
Expand Down
12 changes: 10 additions & 2 deletions character/sp/skill.js
Original file line number Diff line number Diff line change
Expand Up @@ -31262,6 +31262,14 @@ const skills = {
button.style.setProperty("margin-right", margin, "important");
} else {
button.style.setProperty("opacity", "1", "important");
//彩蛋喵
if (!skillMap[button.link]?.length) {
setTimeout(() => {
button.setBackground("sunce", "character");
button.node.name.innerText = "蜀奸";
button.node.name.dataset.nature = "wood";
}, 824);
}
}
if (button.link == "taofen") {
button.style.setProperty("opacity", "0", "important");
Expand Down Expand Up @@ -31296,7 +31304,7 @@ const skills = {
if (result?.links?.length) {
await player.addSkills(result.links);
}
game.broadcastAll(function (list) {
/*game.broadcastAll(function (list) {
game.expandSkills(list);
for (const i of list) {
var info = lib.skill[i];
Expand All @@ -31308,7 +31316,7 @@ const skills = {
}
info.audioname2.dc_zhaoxiang = "fuhan";
}
}, result.links);
}, result.links);*/
if (player.isMinHp()) {
await player.recover();
}
Expand Down
Binary file modified image/card/jingxiangshengshi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/card/mb_chuanguoyuxi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/card/mb_qingnangshu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/card/xuanjian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/card/zhuangshu_basic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/card/zhuangshu_equip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/card/zhuangshu_trick.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion noname/library/element/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -12701,7 +12701,7 @@ export class Player extends HTMLDivElement {
return true;
}
} else {
if (this.countCards(position, name)) {
if (this.countVCards(position, name)) {
return true;
}
}
Expand Down