diff --git a/character/extra.js b/character/extra.js index 7d45ed433..761c5eafe 100755 --- a/character/extra.js +++ b/character/extra.js @@ -219,7 +219,7 @@ game.import('character', function () { while (skills.length) { const skill = skills.shift(), skillName = get.translation(skill); if (!ownedSkillsName.includes(skillName)) { - skillToGain = skill; + skillToGain = skill; break outer; } } @@ -5795,6 +5795,7 @@ game.import('character', function () { return 0; }, }, + combo:'baonu' }, global:'ol_wuqian_ai', subSkill:{ @@ -5851,7 +5852,8 @@ game.import('character', function () { return [0,-2]; } } - } + }, + neg:true } }, qinyin:{ @@ -6023,7 +6025,8 @@ game.import('character', function () { } }); } - } + }, + combo:'baonu' } }, wuqian:{ @@ -6053,7 +6056,8 @@ game.import('character', function () { } return 0; } - } + }, + combo:'baonu' } }, renjie:{ @@ -6137,6 +6141,9 @@ game.import('character', function () { player.addSkills('jilue'); }, derivation:['jilue','reguicai','fangzhu','rejizhi','rezhiheng','rewansha'], + ai:{ + combo:'renjie' + } }, jilue:{ unique:true, @@ -7595,6 +7602,9 @@ game.import('character', function () { content(){ player.addMark('nzry_junlve',trigger.num); }, + ai:{ + combo:'nzry_cuike' + } }, "nzry_cuike":{ audio:2, @@ -7693,6 +7703,7 @@ game.import('character', function () { ai:{ order:1, fireAttack:true, + combo:'nzry_junlve', result:{ target(player,target){ if(target.hasSkillTag('nofire')) return 0; diff --git a/character/huicui.js b/character/huicui.js index d6cef9104..8e6021440 100644 --- a/character/huicui.js +++ b/character/huicui.js @@ -12191,6 +12191,9 @@ game.import('character', function () { }); player.draw(num); }, + ai:{ + combo:'cxliushi' + } }, //说出吾名吓汝一跳 xuxie:{ diff --git a/character/offline.js b/character/offline.js index 149c06db2..b840e75ce 100644 --- a/character/offline.js +++ b/character/offline.js @@ -1547,7 +1547,7 @@ game.import('character', function () { player.addSkills('pkmiewu'); }, ai:{ - combo:'wuku', + combo:'pkwuku', }, derivation:'pkmiewu', }, @@ -6207,6 +6207,9 @@ game.import('character', function () { target.addToExpansion(card,target,'give').gaintag.add('junwei2'); target.addSkill('junwei2'); } + }, + ai:{ + combo:'yinling' } }, junwei2:{ @@ -6366,6 +6369,9 @@ game.import('character', function () { else{ player.chooseUseTarget({name:'sha'},true,false,'nodistance'); } + }, + ai:{ + combo:'fenyong' } }, mouduan:{ diff --git a/character/refresh.js b/character/refresh.js index 1b4f3bb6b..f392c4f97 100755 --- a/character/refresh.js +++ b/character/refresh.js @@ -5652,6 +5652,7 @@ game.import('character', function () { ai:{ order:1, result:{player:1}, + combo:'xinquanji' }, subSkill:{ 0:{}, diff --git a/character/shenhua.js b/character/shenhua.js index 7f3bbf8c1..4d985fd5c 100755 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -732,6 +732,7 @@ game.import('character', function () { return 0; }, }, + combo:'qingce' }, }, //阴雷 @@ -3760,7 +3761,8 @@ game.import('character', function () { player:function(player){ return player.getExpansions('tuntian').length-1; } - } + }, + combo:'tuntian' } }, jiang:{ diff --git a/character/sp.js b/character/sp.js index 9dd15c6dd..8c0e31c11 100755 --- a/character/sp.js +++ b/character/sp.js @@ -15910,6 +15910,9 @@ game.import('character', function () { }, derivation:['oltianxiang','liuli'], locked:true, + ai:{ + combo:'new_xingwu' + } }, //新孙鲁育 "new_meibu":{ @@ -19523,6 +19526,9 @@ game.import('character', function () { else{ player.getStat().skill.gushe--; } + }, + ai:{ + combo:'gushe' } }, juesi:{ @@ -20441,6 +20447,9 @@ game.import('character', function () { }, luoyan:{ group:['luoyan_tianxiang','luoyan_liuli'], + ai:{ + combo:'xingwu' + } }, xingwu:{ audio:2, @@ -20595,7 +20604,8 @@ game.import('character', function () { threaten:function(player,target){ if(target.getExpansions('yinbing').length) return 2; return 1; - } + }, + combo:'juedi' }, subSkill:{ discard:{ @@ -20669,6 +20679,9 @@ game.import('character', function () { target.draw(cards.length); } } + }, + ai:{ + combo:'yinbing' } }, meibu:{ @@ -20889,6 +20902,9 @@ game.import('character', function () { player.awakenSkill('zhiri'); player.loseMaxHp(); player.storage.zhiri=true; + }, + ai:{ + combo:'fentian' } }, xintan:{ @@ -20914,7 +20930,8 @@ game.import('character', function () { order:8, result:{ target:-1 - } + }, + combo:'fentian' } }, danji:{ @@ -22826,6 +22843,9 @@ game.import('character', function () { } else trigger.player.markSkill('rezhoufu2'); }, + ai:{ + combo:'rezhoufu' + } }, zhoufu:{ audio:2, @@ -26215,7 +26235,10 @@ game.import('character', function () { if(!player.hasMark('xinfu_falu_'+suit)) player.addMark('xinfu_falu_'+suit); } }, - ai:{threaten:1.4}, + ai:{ + threaten:1.4, + combo:'xinfu_dianhua' + }, }, "xinfu_dianhua":{ trigger:{ @@ -26329,6 +26352,9 @@ game.import('character', function () { player.gain(event.togain,'gain2'); } }, + ai:{ + combo:'xinfu_dianhua' + } }, "zhenyi_spade":{ trigger:{ diff --git a/character/sp2.js b/character/sp2.js index 3dfc5136b..3252dad1f 100644 --- a/character/sp2.js +++ b/character/sp2.js @@ -9659,6 +9659,9 @@ game.import('character', function () { audio:2, audioname:['tw_beimihu'], group:['bmcanshi_add','bmcanshi_remove'], + ai:{ + combo:'zongkui' + }, subSkill:{ add:{ audio:'bmcanshi', diff --git a/character/tw.js b/character/tw.js index ea24cffca..18d5364c8 100644 --- a/character/tw.js +++ b/character/tw.js @@ -15391,6 +15391,7 @@ game.import('character', function () { ai:{ order:1, result:{player:1}, + combo:'twdanfa' }, }, twsidao:{ diff --git a/character/xinghuoliaoyuan.js b/character/xinghuoliaoyuan.js index f60fa3fad..9b4fa6936 100755 --- a/character/xinghuoliaoyuan.js +++ b/character/xinghuoliaoyuan.js @@ -558,6 +558,7 @@ game.import('character', function () { if(get.type(card)=='equip'&&player==target&&player==_status.currentPhase&&get.subtype(card)=='equip1') return [1,3]; }, }, + combo:'xinfu_fangtong' }, audio:2, trigger:{ @@ -714,6 +715,9 @@ game.import('character', function () { player.line(target,'thunder'); target.damage(3,'thunder'); }, + ai:{ + combo:'xinfu_jijun' + } }, xinfu_weilu:{ audio:2, diff --git a/character/yijiang.js b/character/yijiang.js index 1a9d29b20..65ef4939a 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -13926,6 +13926,9 @@ game.import('character', function () { else event.finish(); 'step 3' if(result.bool) player.draw(); + }, + ai:{ + combo:'zyexin' } } }, diff --git a/character/yingbian.js b/character/yingbian.js index c5e917fd6..5d54ef623 100644 --- a/character/yingbian.js +++ b/character/yingbian.js @@ -2323,7 +2323,6 @@ game.import('character', function () { if(arg.player.hasSkillTag('jueqing',false,player)) return false; } }, - combo:'xianzhu', }, }, xianzhu:{ @@ -2348,7 +2347,7 @@ game.import('character', function () { content:function(){ 'step 0' event.cards = player.getExpansions('qiaoyan'); - event.target = targets[0]; + event.target = targets[0]; 'step 1' player.give(cards,target,'give'); 'step 2'