Skip to content

Commit 65dca9b

Browse files
committed
bugfix
1.修复OL界廖化当先即使不摸杀也会受到伤害的bug 2.葛玄忘记get.player()以及backup改为直接使用links
1 parent 1db563f commit 65dca9b

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

character/onlyOL/skill.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2426,7 +2426,7 @@ const skills = {
24262426
if (event._extraPhaseReason !== "oldangxian") {
24272427
return false;
24282428
}
2429-
return name.endsWith("Begin") || !player.hasHistory("sourceDamage", evt => evt.getParent(event.name) === event);
2429+
return name.endsWith("Begin") || (event.oldangxian_draw && !player.hasHistory("sourceDamage", evt => evt.getParent(event.name) === event));
24302430
},
24312431
async cost(event, trigger, player) {
24322432
if (event.triggername.endsWith("Begin")) {
@@ -2442,14 +2442,15 @@ const skills = {
24422442
event.result = { bool: true };
24432443
}
24442444
},
2445-
content() {
2445+
async content(event, trigger, player) {
24462446
if (event.triggername.endsWith("Begin")) {
2447+
trigger.set("oldangxian_draw", true);
24472448
const card = get.cardPile({ name: "sha" });
24482449
if (card) {
2449-
player.gain(card, "draw").gaintag.add("oldangxian");
2450+
await player.gain(card, "draw").gaintag.add("oldangxian");
24502451
}
24512452
} else {
2452-
player.damage();
2453+
await player.damage();
24532454
}
24542455
},
24552456
},

character/onlyOL/translate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const translates = {
3636
ol_liaohua: "OL界廖化",
3737
ol_liaohua_prefix: "OL界",
3838
oldangxian: "当先",
39-
oldangxian_info: "回合开始时,你执行一个额外的出牌阶段。此阶段开始时,你可以从牌堆或弃牌堆获得一张无距离限制的【杀】若如此做,此阶段结束时,若你未于此阶段造成过伤害,则你对自己造成1点伤害。",
39+
oldangxian_info: "回合开始时,你执行一个额外的出牌阶段。此阶段开始时,你可以从牌堆或弃牌堆获得一张无距离限制的【杀】若如此做,此阶段结束时,若你未于此阶段造成过伤害,则你对自己造成1点伤害。",
4040
olfuli: "伏枥",
4141
olfuli_info: "限定技,当你处于濒死状态时,你可将体力回复至X点,将手牌摸至X张。若你本局游戏造成的伤害数小于X,则你将武将牌翻面(X为存活势力数)。",
4242
ol_sb_huangyueying: "OL谋黄月英",

character/tw/skill.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25181,7 +25181,7 @@ const skills = {
2518125181
complexSelect: true,
2518225182
check(button) {
2518325183
const card = button.link;
25184-
const suits = player
25184+
const suits = get.player()
2518525185
.getHistory("lose", evt => {
2518625186
return evt.getParent().name == "discard" && evt.getParent(2).skill == "twlingbao_backup";
2518725187
})
@@ -25197,13 +25197,12 @@ const skills = {
2519725197
return {
2519825198
audio: "twlingbao",
2519925199
filterCard(card) {
25200-
return lib.skill.twlingbao_backup.cards.includes(card);
25200+
return links.includes(card);
2520125201
},
25202-
cards: links,
2520325202
selectCard: -1,
2520425203
position: "x",
2520525204
async content(event, trigger, player) {
25206-
const cards = lib.skill.twlingbao_backup.cards,
25205+
const cards = links,
2520725206
colors = cards.map(card => get.color(card)).unique();
2520825207
await player.draw(2);
2520925208
if (colors.length == 1 && colors[0] == "red") {

0 commit comments

Comments
 (0)