Skip to content
Merged

bugfix #3025

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
5 changes: 2 additions & 3 deletions character/mobile/skill.js
Original file line number Diff line number Diff line change
Expand Up @@ -4563,9 +4563,8 @@ const skills = {
async content(event, trigger, player) {
const target = event.targets[0];
const num = Math.min(5, target.maxHp) - target.countCards("h");
const isMax = target.isMaxHandcard();
if (num > 0) {
await target.drawTo(target.maxHp);
await target.draw(num);
} else if (num < 0 && target.countDiscardableCards(target, "h") > 0) {
await target.chooseToDiscard("h", -num, true, "allowChooseAll");
}
Expand Down Expand Up @@ -14099,7 +14098,7 @@ const skills = {
const cardname = "huashen_card_" + list[i];
lib.card[cardname] = {
fullimage: true,
image: "character/" + list[i],
image: "character:" + list[i],
};
lib.translate[cardname] = get.rawName2(list[i]);
cards.push(game.createCard(cardname, "", ""));
Expand Down
2 changes: 1 addition & 1 deletion character/sp/skill.js
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ const skills = {
return;
}
if (get.itemtype(card.cards[0]) === "card" && card.cards[0].hasGaintag("olkuangjuan_effect")) {
return true;
return Infinity;
}
},
},
Expand Down
24 changes: 11 additions & 13 deletions character/xianding/skill.js
Original file line number Diff line number Diff line change
Expand Up @@ -14304,13 +14304,12 @@ const skills = {
}
return 1 / (get.value(card) || 0.5);
},
*content(event, map) {
const player = map.player,
cards = event.cards,
target = event.target;
yield player.give(cards, target).gaintag.add("dczengou_debuff");
yield player.draw(cards.length);
target.addSkill("dczengou_debuff");
async content(event, trigger, player) {
const next = player.give(event.cards, event.target);
next.gaintag.add("dczengou_debuff");
await next;
await player.draw(event.cards.length);
event.target.addSkill("dczengou_debuff");
},
ai: {
order: 10,
Expand All @@ -14329,13 +14328,12 @@ const skills = {
},
forced: true,
popup: false,
content() {
player.removeSkill("dczengou_debuff");
const cards = player.getCards("h", card => card.hasGaintag("dczengou_debuff"));
player.showHandcards();
async content(event, trigger, player) {
await player.showHandcards();
const cards = player.getCards("h", card => card.hasGaintag(event.name));
player.removeSkill(event.name);
if (cards.length) {
player.loseHp(cards.length);
player.removeGaintag(event.name);
await player.loseHp(cards.length);
}
},
onremove(player, skill) {
Expand Down