diff --git a/card/gwent.js b/card/gwent.js index 0c0d99c2e..09974f3ae 100644 --- a/card/gwent.js +++ b/card/gwent.js @@ -932,9 +932,17 @@ game.import('card',function(lib,game,ui,get,ai,_status){ return target!=player&&target.countCards('h'); }, content:function(){ + 'step 0' player.gainPlayerCard(target,'h',true,'visible').set('ai',function(button){ return get.value(button.link); }); + 'step 1' + var card=get.cardPile(function(card){ + return get.subtype(card)=='equip4'; + }); + if(card){ + target.equip(card,true); + } }, ai:{ basic:{ @@ -943,7 +951,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){ useful:[5,1], }, result:{ - target:-1 + target:function(player,target){ + if(target.getEquip(4)) return -2; + return -1; + } }, } }, @@ -2197,7 +2208,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ gw_youer_bg:'饵', gw_youer_info:'将一名其他角色的所有手牌移出游戏,然后摸一张牌,当前回合结束后该角色将以此法失去的牌收回手牌', gw_tongdi:'通敌', - gw_tongdi_info:'观看一名其他角色的手牌并获得其中一张', + gw_tongdi_info:'观看一名其他角色的手牌并获得其中一张,然后令目标装备一件进攻马', gw_baoxueyaoshui:'暴雪药水', gw_baoxueyaoshui_info:'令一名角色弃置两张手牌并摸一张牌', gw_birinongwu:'蔽日浓雾', diff --git a/card/sp.js b/card/sp.js index 58eb52f3d..47ac6a4cc 100644 --- a/card/sp.js +++ b/card/sp.js @@ -296,7 +296,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, shengdong:{ fullskin:true, - enable:true, + enable:function(){ + return game.countPlayer()>2; + }, chongzhu:function(){ return game.countPlayer()<=2; }, diff --git a/card/standard.js b/card/standard.js index 3995e10f5..2e7749c7b 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1070,6 +1070,15 @@ game.import('card',function(lib,game,ui,get,ai,_status){ multitarget:true, targetprompt:['被借刀','出杀目标'], complexTarget:true, + multicheck:function(){ + return game.hasPlayer(function(current){ + if(current.getEquip(1)){ + return game.hasPlayer(function(current2){ + return lib.filter.filterTarget({name:'sha'},current,current2); + }) + } + }); + }, filterTarget:function(card,player,target){ if(ui.selected.targets.length==0){ return (player!=target&&target.getCards('e',{subtype:'equip1'}).length); diff --git a/game/game.js b/game/game.js index f95c18a1a..a603e5d9f 100644 --- a/game/game.js +++ b/game/game.js @@ -12597,6 +12597,11 @@ event.finish(); return; } + if(event.draw){ + game.delay(0,300); + player.$draw(card); + } + "step 2" if(card.clone){ game.broadcast(function(card,player){ if(card.clone){ @@ -12608,7 +12613,7 @@ } player.equiping=true; player.lose(player.getCards('e',{subtype:get.subtype(card)}),false); - "step 2" + "step 3" if(player.isMin()){ event.finish(); card.discard(); @@ -12624,9 +12629,6 @@ } },get.subtype(card)); player.$equip(card); - if(event.draw){ - player.$draw(card); - } game.addVideo('equip',player,get.cardInfo(card)); game.log(player,'装备了',card); "step 3" @@ -12649,10 +12651,6 @@ if(info.equipDelay!='false') game.delayx(); } delete player.equiping; - "step 4" - if(event.draw){ - game.delay(); - } }, addJudge:function(){ "step 0" @@ -14485,6 +14483,9 @@ next.forced=true; next.onresult=function(result){ if(result.bool){ + if(info.multitarget&&result.targets.length