Skip to content

sp蒲元1号加伤，流失体力效果修正,sp蒲元二号可选兵主技能修正 #3079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

sp蒲元1号加伤，流失体力效果修正,sp蒲元二号可选兵主技能修正 #3079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions character/newjiang/skill.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,19 @@ const skills = {
return trigger.target.countCards("he") > 0;
}
if (button.link == "losehp") {
return !trigger.yjspshenfeng;
return !trigger.getParent().yjspshenfeng;
}
return true;
})
.set("ai", button => Math.random())
.forResult();
if (result.links[0] == "damge") {
trigger.baseDamage++;
if (result.links[0] == "damage") {
trigger.getParent().baseDamage++;
} else if (result.links[0] == "losehp") {
trigger.yjspshenfeng = true;
trigger.getParent().yjspshenfeng = true;
if (!player.hasSkill("yj_sp_shenfeng_effect", null, false, false)) {
player.addTempSkill("yj_sp_shenfeng_effect");
}
} else {
await trigger.target.chooseToDiscard(2, "he", true);
}
Expand All @@ -179,7 +182,7 @@ const skills = {
charlotte: true,
forced: true,
filter(event, player) {
return event.yjspshenfeng;
return event.getParent(2).yjspshenfeng;
},
async content(event, trigger, player) {
trigger.cancel();
Expand All @@ -201,8 +204,8 @@ const skills = {
init(player, skill) {
const bingzhuSkill = {};
lib.inpile
.filter(name => get.type(name) == "equip" && lib.card[name].bingzhu)
.map(name => lib.card[name].bingzhu)
.filter(name => get.type(name) == "equip" && get.bingzhu(name))
.map(name => get.bingzhu(name))
.flat()
.forEach(name => (bingzhuSkill[name] = []));
if (!_status.characterlist) {
Expand All @@ -212,6 +215,8 @@ const skills = {
const name = get.rawName(character);
if (bingzhuSkill[name]) {
bingzhuSkill[name].push(get.character(character, 3));
} else if (bingzhuSkill[character]) {
bingzhuSkill[character].push(get.character(character, 3));
}
});
for (let name in bingzhuSkill) {
Expand Down Expand Up @@ -245,8 +250,12 @@ const skills = {
})
.set("forced", true)
.forResult();
const name = get.bingzhu(card).randomGet();
const skills = (_status.bingzhuSkill.get(name) || []).filter(skill => !result1.targets[0].hasSkill(skill, null, false, false)).randomGets(3);
const skills = get
.bingzhu(card)
.map(name => _status.bingzhuSkill.get(name))
.flat()
.filter(skill => !result1.targets[0].hasSkill(skill, null, false, false))
.randomGets(3);
if (!skills?.length) {
player.chat("没有技能喵");
} else {
Expand Down