From 2010433d2decec043eea0ff6eec46f33763c3eca Mon Sep 17 00:00:00 2001 From: libccy Date: Tue, 14 Mar 2017 23:35:47 +0800 Subject: [PATCH] 1.9.10.6 --- character/diy.js | 17 +++++++++++------ character/extra.js | 22 ++++++++++++++++++---- character/gwent.js | 29 +++++++++++++++++++++++++---- character/rank.js | 3 ++- game/game.js | 27 +++++++++++++++++++++------ game/update.js | 7 +++++-- mode/guozhan.js | 29 +++++++++++++++++++++++++++-- 7 files changed, 109 insertions(+), 25 deletions(-) diff --git a/character/diy.js b/character/diy.js index ad14787cb..5035a5553 100644 --- a/character/diy.js +++ b/character/diy.js @@ -839,15 +839,20 @@ character.diy={ } }, luweiyan:{ - enable:'chooseToUse', - filterCard:{type:'equip'}, + enable:'phaseUse', + usable:1, + filterCard:function(card){ + return get.type(card)!='basic'; + }, position:'he', filter:function(event,player){ - return player.num('he',{type:'equip'})>0; + return player.num('he',function(card){ + return get.type(card)!='basic'; + })>0; }, viewAs:{name:'shuiyanqijun'}, - prompt:'将一张装备牌当水淹七军使用', - check:function(card){return 8-ai.get.equipValue(card)}, + prompt:'将一张非基本牌当水淹七军使用', + check:function(card){return 8-ai.get.value(card)}, group:'luweiyan2' }, luweiyan2:{ @@ -1365,7 +1370,7 @@ character.diy={ diyqiangxi_info:'出牌阶段，你可以自减一点体力或弃一张武器牌，然后你对你攻击范围内的一名角色造成一点伤害并弃置其一张牌，每回合限一次。', diyduanliang_info:'出牌阶段限一次，你可以将一张黑色的基本牌当兵粮寸断对一名角色使用，然后摸一张牌。你的兵粮寸断可以指定距离2以内的角色作为目标', guihan_info:'限定技，当你进入濒死状态时，可以指定一名男性角色与其各回复一点体力并摸两张牌', - luweiyan_info:'你可以将一张装备牌当作水攻使用；结算后你可以视为对其中一个目标使用一张不计入出杀次数的杀', + luweiyan_info:'出牌阶段限一次，你可以将一张非基本牌当作水攻使用；结算后你可以视为对其中一个目标使用一张不计入出杀次数的杀', xiongzi_info:'锁定技，你于摸牌阶段额外摸X+1张牌，X为你装备区牌数的一半，向下取整', honglian_info:'每当你受到来自其他角色的伤害，可以弃置伤害来源的所有红色牌', jieyan_info:'出牌阶段限一次，你可以弃置一张红色手牌令场上所有角色受到一点火焰伤害', diff --git a/character/extra.js b/character/extra.js index 2cae5fcbf..7beb6ff93 100644 --- a/character/extra.js +++ b/character/extra.js @@ -926,7 +926,9 @@ character.extra={ longhun1:{ audio:true, enable:['chooseToUse','chooseToRespond'], - prompt:'将一张红桃牌当桃使用', + prompt:function(){ + return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张红桃牌当作桃使用'; + }, position:'he', check:function(card,event){ if(_status.event.player.hp>1) return 0; @@ -936,6 +938,9 @@ character.extra={ return Math.max(1,_status.event.player.hp); }, viewAs:{name:'tao'}, + filter:function(event,player){ + return player.num('he',{suit:'heart'})>=player.hp; + }, filterCard:function(card){ return get.suit(card)=='heart'; } @@ -943,7 +948,9 @@ character.extra={ longhun2:{ audio:true, enable:['chooseToUse','chooseToRespond'], - prompt:'将一张方片牌当火杀使用或打出', + prompt:function(){ + return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张方片当作火杀使用或打出'; + }, position:'he', check:function(card,event){ if(_status.event.player.hp>1) return 0; @@ -953,6 +960,9 @@ character.extra={ return Math.max(1,_status.event.player.hp); }, viewAs:{name:'sha',nature:'fire'}, + filter:function(event,player){ + return player.num('he',{suit:'diamond'})>=player.hp; + }, filterCard:function(card){ return get.suit(card)=='diamond'; } @@ -960,7 +970,9 @@ character.extra={ longhun3:{ audio:true, enable:['chooseToUse','chooseToRespond'], - prompt:'将一张黑桃牌当无懈可击使用', + prompt:function(){ + return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张黑桃牌当作无懈可击使用'; + }, position:'he', check:function(card,event){ if(_status.event.player.hp>1) return 0; @@ -980,7 +992,9 @@ character.extra={ longhun4:{ audio:true, enable:['chooseToUse','chooseToRespond'], - prompt:'将一张梅花牌当闪打出', + prompt:function(){ + return '将'+get.cnNumber(Math.max(1,_status.event.player.hp))+'张梅花牌当作闪打出'; + }, position:'he', check:function(card,event){ if(_status.event.player.hp>1) return 0; diff --git a/character/gwent.js b/character/gwent.js index f79a0f1f9..1771312f0 100644 --- a/character/gwent.js +++ b/character/gwent.js @@ -9,13 +9,14 @@ character.gwent={ gw_falanxisika:['female','wu',3,['shewu']], gw_haluo:['male','qun',4,['nuhou']], - // gw_gaier:['male','shu',3,['hunmo']], - // gw_dagong:['male','qun',3,[]], + gw_airuiting:['male','wei',4,['kuanglie']], + + // gw_gaier:['male','shu',3,['gwyinhua']], + // gw_dagong:['male','qun',4,[]], + // gw_bulanwang:['male','qun',3,[]], // gw_kuite:['male','qun',3,[]], - // gw_airuiting:['male','qun',3,[]], // gw_fuertaisite:['male','qun',3,[]], // gw_hengsaite:['male','qun',3,[]], - // gw_bulanwang:['male','qun',3,[]], // gw_fulisi:['male','qun',3,[]], // gw_laduoweide:['male','qun',3,[]], @@ -40,6 +41,24 @@ character.gwent={ gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个是一个', }, skill:{ + kuanglie:{ + trigger:{player:'useCardToBegin'}, + filter:function(event,player){ + return event.target!=player&&event.target.num('he')&&get.color(event.card)=='black'; + }, + init:function(player){ + player.storage.kuanglie=0; + }, + forced:true, + content:function(){ + trigger.target.randomDiscard(); + player.storage.kuanglie++; + if(player.storage.kuanglie%2==0){ + player.draw(); + } + } + }, + kuanglie2:{}, gwjiquan:{ enable:'phaseUse', usable:1, @@ -658,6 +677,8 @@ character.gwent={ gw_luoqi:'罗契', gw_yioufeisi:'伊欧菲斯', + kuanglie:'狂猎', + kuanglie_info:'锁定技，当一名其他角色成为你的黑色牌的目标后，该角色随机弃置一张牌；每当你发动两次“狂猎”，你摸一张牌', gwjiquan:'集权', gwjiquan_info:'出牌阶段限一次，你可以从任意名角色处各获得一张牌，每拿一张牌，被拿牌的角色视为对你使用一张杀', nuhou:'怒吼', diff --git a/character/rank.js b/character/rank.js index bb6e50b30..cc370fce3 100644 --- a/character/rank.js +++ b/character/rank.js @@ -53,6 +53,7 @@ window.characterRank={ 'hs_tyrande', ], a:[ + 'gw_airuiting', 'gw_huoge', 'gw_xili', 'gw_yenaifa', @@ -240,6 +241,7 @@ window.characterRank={ ], bp:[ 'zoushi', + 'diy_lukang', 'yxs_meixi', 'yxs_lanlinwang', 'jianyong', @@ -402,7 +404,6 @@ window.characterRank={ 're_xuzhu', 're_simayi', 'yxs_mingchenghuanghou', - 'diy_lukang', 'diy_tianyu', 'old_zhuran', 'old_lingtong', diff --git a/game/game.js b/game/game.js index 54e7b870d..de53b53ae 100644 --- a/game/game.js +++ b/game/game.js @@ -30271,7 +30271,7 @@ // return ui.create.characterDialog2.apply(this,arguments); // } // } - var filter,str,noclick,thisiscard,seperate,expandall; + var filter,str,noclick,thisiscard,seperate,expandall,onlypack; for(var i=0;i