Skip to content

Commit a41138c

Browse files
committed
谋龙胆显示调整;eslint
1 parent a21cebc commit a41138c

File tree

3 files changed

+49
-54
lines changed

3 files changed

+49
-54
lines changed

character/onlyOL/skill.js

Lines changed: 44 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,58 +1218,51 @@ const skills = {
12181218
const choices = trigger.targets[0].getStorage("olquanyu_record");
12191219
const map = get.info("olquanyu").map;
12201220
const list = Object.keys(map);
1221-
const result = true
1222-
? {
1223-
bool: true,
1224-
links: choices,
1221+
/*const result = await player
1222+
.chooseButton(
1223+
[
1224+
`乾纲:请选择要额外执行的“权御”效果`,
1225+
[list.slice(0, 2).map(i => [i, map[i]]), "tdnodes"],
1226+
[list.slice(2, 4).map(i => [i, map[i]]), "tdnodes"],
1227+
[list.slice(4).map(i => [i, map[i]]), "tdnodes"],
1228+
[
1229+
dialog => {
1230+
dialog.buttons.forEach(i => {
1231+
i.style.setProperty("width", "200px", "important");
1232+
i.style.setProperty("text-align", "left", "important");
1233+
});
1234+
},
1235+
"handle",
1236+
],
1237+
],
1238+
[1, 6]
1239+
)
1240+
.set("choices", choices)
1241+
.set("filterButton", button => {
1242+
if (!get.event().choices.includes(button.link)) {
1243+
return false;
12251244
}
1226-
: await player
1227-
.chooseButton(
1228-
[
1229-
`乾纲:请选择要额外执行的“权御”效果`,
1230-
[list.slice(0, 2).map(i => [i, map[i]]), "tdnodes"],
1231-
[list.slice(2, 4).map(i => [i, map[i]]), "tdnodes"],
1232-
[list.slice(4).map(i => [i, map[i]]), "tdnodes"],
1233-
[
1234-
dialog => {
1235-
dialog.buttons.forEach(i => {
1236-
i.style.setProperty("width", "200px", "important");
1237-
i.style.setProperty("text-align", "left", "important");
1238-
});
1239-
},
1240-
"handle",
1241-
],
1242-
],
1243-
[1, 6]
1244-
)
1245-
.set("choices", choices)
1246-
.set("filterButton", button => {
1247-
if (!get.event().choices.includes(button.link)) {
1248-
return false;
1249-
}
1250-
if (button.link == "olquanyu_qingmin") {
1251-
const trigger = get.event().getTrigger();
1252-
const card = trigger.card;
1253-
const player = get.player();
1254-
return game.hasPlayer(target => !trigger.targets.includes(target) && lib.filter.targetEnabled2(card, player, target) && lib.filter.targetInRange(card, player, target));
1255-
}
1256-
return true;
1257-
})
1258-
.set("ai", button => {
1259-
const trigger = get.event().getTrigger();
1260-
const card = trigger.card;
1261-
const player = get.player();
1262-
if (button.link == "olquanyu_qingmin") {
1263-
if (!game.hasPlayer(target => !trigger.targets.includes(target) && get.effect(target, card, player, player) > 0)) {
1264-
return 0;
1265-
}
1266-
}
1267-
return 1;
1268-
})
1269-
.forResult();
1270-
if (result?.links?.length) {
1271-
event.result = { bool: true, cost_data: result.links };
1272-
}
1245+
if (button.link == "olquanyu_qingmin") {
1246+
const trigger = get.event().getTrigger();
1247+
const card = trigger.card;
1248+
const player = get.player();
1249+
return game.hasPlayer(target => !trigger.targets.includes(target) && lib.filter.targetEnabled2(card, player, target) && lib.filter.targetInRange(card, player, target));
1250+
}
1251+
return true;
1252+
})
1253+
.set("ai", button => {
1254+
const trigger = get.event().getTrigger();
1255+
const card = trigger.card;
1256+
const player = get.player();
1257+
if (button.link == "olquanyu_qingmin") {
1258+
if (!game.hasPlayer(target => !trigger.targets.includes(target) && get.effect(target, card, player, player) > 0)) {
1259+
return 0;
1260+
}
1261+
}
1262+
return 1;
1263+
})
1264+
.forResult();*/
1265+
event.result = { bool: true, cost_data: choices };
12731266
},
12741267
async content(event, trigger, player) {
12751268
const { cost_data: list } = event;

character/sb/skill.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7286,7 +7286,9 @@ const skills = {
72867286
}
72877287
}
72887288
}
7289-
return ui.create.dialog("龙胆", [list, "vcard"], "hidden");
7289+
const dialog = ui.create.dialog("龙胆", [list, "vcard"], "hidden");
7290+
dialog.direct = true;
7291+
return dialog;
72907292
},
72917293
check(button) {
72927294
if (_status.event.getParent().type != "phase") {

noname/ui/click/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4042,7 +4042,7 @@ export class Click {
40424042
var initskill = false;
40434043
let deri = [];
40444044
for (var i = 0; i < list.length; i++) {
4045-
if (!get.info(list[i]) || get.info(list[i]).nopop) {
4045+
if (get.info(list[i])?.nopop) {
40464046
continue;
40474047
}
40484048
if (!lib.translate[list[i]] || !lib.translate[list[i] + "_info"]) {
@@ -4074,7 +4074,7 @@ export class Click {
40744074
continue;
40754075
}
40764076
let info = get.info(skill);
4077-
if (!Object.keys(info)?.length || info.nopop) {
4077+
if (info?.nopop) {
40784078
continue;
40794079
}
40804080
if (!lib.translate[skill] || !lib.translate[skill + "_info"]) {

0 commit comments

Comments
 (0)