YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复意外生成的括号

This commit is contained in:
Spmario233 2024-05-04 12:11:59 +08:00
parent 1c92bd3b7e
commit b425b8209b
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
character/collab/skill.js
View File

@ -439,7 +439,7 @@ const skills = {
player.gain(trigger.cards, "gain2"); player.gain(trigger.cards, "gain2");
} }
player.draw(player.countMark("dcjianxiong") + 1, "nodelay"); player.draw(player.countMark("dcjianxiong") + 1, "nodelay");
("step 1"); "step 1";
if (player.countMark("dcjianxiong") < 4) player.addMark("dcjianxiong", 1, false); if (player.countMark("dcjianxiong") < 4) player.addMark("dcjianxiong", 1, false);
}, },
marktext: "雄", marktext: "雄",
@ -494,7 +494,7 @@ const skills = {
player.addTempSkill("dcrende_targeted", "phaseUseAfter"); player.addTempSkill("dcrende_targeted", "phaseUseAfter");
player.markAuto("dcrende_targeted", [target]); player.markAuto("dcrende_targeted", [target]);
player.gainPlayerCard(target, "h", true, 2); player.gainPlayerCard(target, "h", true, 2);
("step 1"); "step 1";
var list = []; var list = [];
for (var name of lib.inpile) { for (var name of lib.inpile) {
if (get.type(name) != "basic") continue; if (get.type(name) != "basic") continue;
@ -553,7 +553,7 @@ const skills = {
} else { } else {
event.finish(); event.finish();
} }
("step 2"); "step 2";
if (result && result.bool && result.links[0]) { if (result && result.bool && result.links[0]) {
var card = { var card = {
name: result.links[0][2], name: result.links[0][2],
@ -627,7 +627,7 @@ const skills = {
break; break;
} }
} }
("step 1"); "step 1";
player.draw(event.num + cards.length); player.draw(event.num + cards.length);
}, },
subSkill: { subSkill: {
@ -708,7 +708,7 @@ const skills = {
} }
var skills = characters.map(i => lib.skill.dcbianzhuang.characterMap[i]); var skills = characters.map(i => lib.skill.dcbianzhuang.characterMap[i]);
player.chooseControl(skills).set("dialog", ["选择获得一个技能并“变装”", [characters, "character"]]); player.chooseControl(skills).set("dialog", ["选择获得一个技能并“变装”", [characters, "character"]]);
("step 1"); "step 1";
var skill = result.control; var skill = result.control;
player.addTempSkills(skill, "dcbianzhuangAfter"); player.addTempSkills(skill, "dcbianzhuangAfter");
for (var i in lib.skill.dcbianzhuang.characterMap) { for (var i in lib.skill.dcbianzhuang.characterMap) {
@ -720,7 +720,7 @@ const skills = {
} }
} }
player.chooseUseTarget("sha", true, false, "nodistance"); player.chooseUseTarget("sha", true, false, "nodistance");
("step 2"); "step 2";
if (result.bool && !player.storage.dcbianzhuang_inited) { if (result.bool && !player.storage.dcbianzhuang_inited) {
player.addMark("dcbianzhuang", 1, false); player.addMark("dcbianzhuang", 1, false);
if (player.countMark("dcbianzhuang") > 2) { if (player.countMark("dcbianzhuang") > 2) {
@ -797,7 +797,7 @@ const skills = {
var player = _status.event.player; var player = _status.event.player;
return 1 + Math.max(0, player.getUseValue(card, null, true)); return 1 + Math.max(0, player.getUseValue(card, null, true));
}); });
("step 1"); "step 1";
if (result.bool) { if (result.bool) {
player.logSkill("dctongliao"); player.logSkill("dctongliao");
player.addGaintag(result.cards, "dctongliao"); player.addGaintag(result.cards, "dctongliao");
@ -919,7 +919,7 @@ const skills = {
return get.effect(target, { name: "sha" }, _status.event.player); return get.effect(target, { name: "sha" }, _status.event.player);
}) })
.setHiddenSkill("clbjisu"); .setHiddenSkill("clbjisu");
("step 1"); "step 1";
if (result.bool) { if (result.bool) {
player.useCard({ name: "sha", isCard: true }, result.targets[0], false, "clbjisu"); player.useCard({ name: "sha", isCard: true }, result.targets[0], false, "clbjisu");
trigger.cancel(); trigger.cancel();
@ -1067,7 +1067,7 @@ const skills = {
content() { content() {
"step 0"; "step 0";
player.removeGaintag("dcshixian_yayun"); player.removeGaintag("dcshixian_yayun");
("step 1"); "step 1";
player.addGaintag( player.addGaintag(
player.getCards("h", card => { player.getCards("h", card => {
return get.is.yayun(get.translation(card.name), get.translation(trigger.card.name)); return get.is.yayun(get.translation(card.name), get.translation(trigger.card.name));
@ -1093,7 +1093,7 @@ const skills = {
content() { content() {
"step 0"; "step 0";
trigger.cancel(); trigger.cancel();
("step 1"); "step 1";
var card = get.cardPile2(function (card) { var card = get.cardPile2(function (card) {
return get.type(card, null, false) == "equip"; return get.type(card, null, false) == "equip";
}), }),
@ -1138,7 +1138,7 @@ const skills = {
player.chooseButton(true, ["请选择执行一个天气", [list.map(i => [i, '<div class="popup text" style="width:calc(100% - 10px);display:inline-block"><div class="skill">【' + i + "】</div><div>" + lib.skill.dcsitian.weathers[i].description + "</div></div>"]), "textbutton"]]).set("ai", function (button) { player.chooseButton(true, ["请选择执行一个天气", [list.map(i => [i, '<div class="popup text" style="width:calc(100% - 10px);display:inline-block"><div class="skill">【' + i + "】</div><div>" + lib.skill.dcsitian.weathers[i].description + "</div></div>"]), "textbutton"]]).set("ai", function (button) {
return lib.skill.dcsitian.weathers[button.link].ai(_status.event.player); return lib.skill.dcsitian.weathers[button.link].ai(_status.event.player);
}); });
("step 1"); "step 1";
if (result.bool) { if (result.bool) {
var choice = result.links[0]; var choice = result.links[0];
game.log(player, "将当前天气变更为", "#g" + choice); game.log(player, "将当前天气变更为", "#g" + choice);
@ -1210,7 +1210,7 @@ const skills = {
var targets = game.filterPlayer(current => current != player).sortBySeat(); var targets = game.filterPlayer(current => current != player).sortBySeat();
player.line(targets, "thunder"); player.line(targets, "thunder");
event.targets = targets; event.targets = targets;
("step 1"); "step 1";
var target = targets.shift(); var target = targets.shift();
if (!target.isIn()) { if (!target.isIn()) {
if (targets.length > 0) event.redo(); if (targets.length > 0) event.redo();
@ -1223,7 +1223,7 @@ const skills = {
event.judgestr = get.translation("shandian"); event.judgestr = get.translation("shandian");
target.judge(lib.card.shandian.judge, event.judgestr).judge2 = lib.card.shandian.judge2; target.judge(lib.card.shandian.judge, event.judgestr).judge2 = lib.card.shandian.judge2;
//game.delayx(1.5); //game.delayx(1.5);
("step 2"); "step 2";
var name = "shandian"; var name = "shandian";
if (event.cancelled && !event.direct) { if (event.cancelled && !event.direct) {
if (lib.card[name].cancel) { if (lib.card[name].cancel) {
@ -1263,7 +1263,7 @@ const skills = {
var targets = game.filterPlayer(current => current != player).sortBySeat(); var targets = game.filterPlayer(current => current != player).sortBySeat();
player.line(targets, "green"); player.line(targets, "green");
event.targets = targets; event.targets = targets;
("step 1"); "step 1";
var target = targets.shift(); var target = targets.shift();
if (target.isIn()) { if (target.isIn()) {
var num = target.countCards("e"); var num = target.countCards("e");
@ -1304,7 +1304,7 @@ const skills = {
} }
return get.effect(current, { name: "losehp" }, player, player); return get.effect(current, { name: "losehp" }, player, player);
}); });
("step 1"); "step 1";
if (result.bool) { if (result.bool) {
var target = result.targets[0]; var target = result.targets[0];
player.line(target, "green"); player.line(target, "green");
@ -1596,14 +1596,14 @@ const skills = {
} }
event.finish(); event.finish();
} }
("step 1"); "step 1";
if (result.bool) { if (result.bool) {
if (!event.isMine() && !event.isOnline()) game.delayx(); if (!event.isMine() && !event.isOnline()) game.delayx();
event.targets = result.targets; event.targets = result.targets;
} else { } else {
event.finish(); event.finish();
} }
("step 2"); "step 2";
player.logSkill("ruyijingubang_effect", event.targets); player.logSkill("ruyijingubang_effect", event.targets);
trigger.targets.addArray(event.targets); trigger.targets.addArray(event.targets);
}, },
@ -1709,7 +1709,7 @@ const skills = {
event.card = get.cards()[0]; event.card = get.cards()[0];
game.cardsGotoOrdering(event.card); game.cardsGotoOrdering(event.card);
player.showCards(event.card); player.showCards(event.card);
("step 1"); "step 1";
player player
.chooseTarget("令一名角色获得" + get.translation(card), true) .chooseTarget("令一名角色获得" + get.translation(card), true)
.set("ai", function (target) { .set("ai", function (target) {
@ -1725,7 +1725,7 @@ const skills = {
return att; return att;
}) })
.set("du", card.name == "du"); .set("du", card.name == "du");
("step 2"); "step 2";
if (result && result.bool) { if (result && result.bool) {
var target = result.targets[0]; var target = result.targets[0];
target.gain(card, "gain2"); target.gain(card, "gain2");
@ -1757,7 +1757,7 @@ const skills = {
content() { content() {
"step 0"; "step 0";
player.chooseDrawRecover("###" + get.prompt("spcangni") + "###摸两张牌或回复1点体力，然后将武将牌翻面", 2).logSkill = "spcangni"; player.chooseDrawRecover("###" + get.prompt("spcangni") + "###摸两张牌或回复1点体力，然后将武将牌翻面", 2).logSkill = "spcangni";
("step 1"); "step 1";
if (result.control != "cancel2") player.turnOver(); if (result.control != "cancel2") player.turnOver();
}, },
group: ["spcangni_gain", "spcangni_lose"], group: ["spcangni_gain", "spcangni_lose"],
@ -1839,7 +1839,7 @@ const skills = {
content() { content() {
"step 0"; "step 0";
player.give(cards, targets[0]); player.give(cards, targets[0]);
("step 1"); "step 1";
if (!targets[0].isIn() || !targets[1].isIn()) { if (!targets[0].isIn() || !targets[1].isIn()) {
event.finish(); event.finish();
return; return;
@ -1858,7 +1858,7 @@ const skills = {
return lib.filter.targetEnabled.apply(this, arguments); return lib.filter.targetEnabled.apply(this, arguments);
}) })
.set("sourcex", targets[1]); .set("sourcex", targets[1]);
("step 2"); "step 2";
if (!result.bool && targets[0].countCards("h")) targets[1].gainPlayerCard(targets[0], "visible", "h", true); if (!result.bool && targets[0].countCards("h")) targets[1].gainPlayerCard(targets[0], "visible", "h", true);
}, },
ai: { ai: {
@ -1912,7 +1912,7 @@ const skills = {
return true; return true;
})() })()
); );
("step 1"); "step 1";
if (result.bool) { if (result.bool) {
var target = trigger.player; var target = trigger.player;
player.logSkill("spfengyin", target); player.logSkill("spfengyin", target);