diff --git a/character/gwent.js b/character/gwent.js index 87e9efe3e..f7c831b44 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -1475,6 +1475,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ gw_zhangyujushou:'章鱼巨兽', gw_zhuoertan:'卓尔坦', + gwjushi:'巨噬', + gwjushi_info:'出牌阶段限一次,你可以将一名距离1以内的其他角色的一张随机牌置于你的武将牌上;当你受到伤害后,“巨噬”牌将回到原来的位置;准备阶段,若你有“巨噬”牌,你移去之然后增加一点体力和体力上限', bolang:'搏浪', bolang_info:'准备阶段,你可以观看牌堆顶的6张牌,然后将其中至多3张移入弃牌堆;每当你造成一次伤害,你可以从弃牌堆中获得一张以此法移入弃牌堆的牌', lingji:'灵计', diff --git a/game/game.js b/game/game.js index 32d5fb0ae..46a095447 100644 --- a/game/game.js +++ b/game/game.js @@ -16606,7 +16606,7 @@ var group=lib.character[player.name1][1]; targets=game.filterPlayer(function(target){ if(func&&!func(target)) return false; - return lib.character[target.name1][1]!=group; + return target.identity=='ye'||lib.character[target.name1][1]!=group; }); } } @@ -16619,6 +16619,44 @@ targets.remove(player); return targets; }, + getFriends:function(func){ + var player=this; + var targets; + var mode=get.mode(); + if(mode=='identity'){ + switch(player.identity){ + case 'zhu':case 'zhong':case 'mingzhong':targets=game.filterPlayer(function(target){ + if(func&&!func(target)) return false; + return ['zhu','zhong','mingzhong'].contains(target.identity); + });break; + case 'nei':targets=[];break; + case 'fan':targets=game.filterPlayer(function(target){ + if(func&&!func(target)) return false; + return target.identity=='fan'; + });break; + } + } + else if(mode=='guozhan'){ + if(player.identity=='ye'){ + targets=[]; + } + else{ + var group=lib.character[player.name1][1]; + targets=game.filterPlayer(function(target){ + if(func&&!func(target)) return false; + return target.identity!='ye'&&lib.character[target.name1][1]==group; + }); + } + } + else{ + targets=game.filterPlayer(function(target){ + if(func&&!func(target)) return false; + return target.side==player.side; + }); + } + targets.remove(player); + return targets; + }, isEnemyOf:function(){ return !this.isFriendOf.apply(this,arguments); }, @@ -24183,7 +24221,7 @@ } else{ try{ - lib.node.fs.rmdir(__dirname+'/extension/'+extname); + lib.node.fs.rmdir(__dirname+'/extension/'+extname,function(){}); } catch(e){} }