@@ -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 ;
0 commit comments