Merge pull request #1313 from PZ157/PR-Branch

技能修复
This commit is contained in:
Spmario233 2024-05-04 18:22:43 +08:00 committed by GitHub
commit 22b0a3b285
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions

View File

@ -4930,7 +4930,10 @@ const skills = {
content() { content() {
"step 0"; "step 0";
trigger.source.chooseCard("是否响应" + get.translation(player) + "的【附义】?", "弃置两张牌,令其获得其武将牌上的一个技能", "he", 2, lib.filter.cardDiscardable).set("ai", () => { trigger.source.chooseCard("是否响应" + get.translation(player) + "的【附义】?", "弃置两张牌,令其获得其武将牌上的一个技能", "he", 2, lib.filter.cardDiscardable).set("ai", () => {
if (get.attitude(_status.event.player, _status.event.getParent().player) <= 2) return 0; let zhu = _status.event.getParent().player;
if (!zhu.getStockSkills(true, true).some(skill => {
return !zhu.hasSkill(skill, null, false, false);
}) || get.attitude(_status.event.player, zhu) <= 2) return 0;
return 6 - get.value(card); return 6 - get.value(card);
}); });
"step 1"; "step 1";
@ -4941,6 +4944,7 @@ const skills = {
return !player.hasSkill(skill, null, false, false); return !player.hasSkill(skill, null, false, false);
}); });
if (skills.length == 1) event._result = { control: skills[0] }; if (skills.length == 1) event._result = { control: skills[0] };
else if (!skills.length) event.finish();
else else
trigger.source trigger.source
.chooseControl(skills) .chooseControl(skills)

View File

@ -8723,6 +8723,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
gzyimie: { gzyimie: {
audio: "yimie", audio: "yimie",
inherit: "yimie", inherit: "yimie",
mainSkill: true,
init: function (player) { init: function (player) {
if (player.checkMainSkill("gzyimie")) { if (player.checkMainSkill("gzyimie")) {
player.removeMaxHp(2); player.removeMaxHp(2);
@ -20769,6 +20770,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
player.removeMaxHp(); player.removeMaxHp();
} }
}, },
viceSkill: true,
group: ["hunshang_yingzi", "hunshang_yinghun"], group: ["hunshang_yingzi", "hunshang_yinghun"],
}, },
reyingzi_sunce: { audio: 2 }, reyingzi_sunce: { audio: 2 },