From d5d4229b7bd3b66dc245126f984e73d31758f543 Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 24 Jul 2017 00:07:59 +0800 Subject: [PATCH] u --- card/yunchou.js | 52 ++----------------------------------------- character/hearth.js | 38 ++++++++++++++++++------------- character/rank.js | 2 +- character/xianjian.js | 5 +++++ character/yijiang.js | 4 +--- game/update.js | 1 + 6 files changed, 32 insertions(+), 70 deletions(-) diff --git a/card/yunchou.js b/card/yunchou.js index 624bb2bc7..7100dc623 100644 --- a/card/yunchou.js +++ b/card/yunchou.js @@ -768,59 +768,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){ } } else{ - if(!card.expired){ - var target=player.next; - for(var iwhile=0;iwhile<10;iwhile++){ - if(target.hasJudge('hongshui')){ - target=target.next; - } - else{ - break; - } - } - if(target.hasJudge('hongshui')||target==player){ - ui.discardPile.appendChild(card); - } - else{ - if(card.name!='hongshui'){ - target.addJudge('hongshui',card); - } - else{ - target.addJudge(card); - } - } - } - else{ - card.expired=false; - } + player.addJudgeNext(card); } }, cancel:function(){ - if(!card.expired){ - var target=player.next; - for(var iwhile=0;iwhile<10;iwhile++){ - if(target.hasJudge('hongshui')){ - target=target.next; - } - else{ - break; - } - } - if(target.hasJudge('hongshui')||target==player){ - ui.discardPile.appendChild(card); - } - else{ - if(card.name!='hongshui'){ - target.addJudge('hongshui',card); - } - else{ - target.addJudge(card); - } - } - } - else{ - card.expired=false; - } + player.addJudgeNext(card); }, ai:{ basic:{ diff --git a/character/hearth.js b/character/hearth.js index 88e74516b..6163138cd 100644 --- a/character/hearth.js +++ b/character/hearth.js @@ -5753,7 +5753,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ filter:function(event,player){ if(!player.countCards('h',{suit:'spade'})) return false; return !game.hasPlayer(function(current){ - return current.hasJudge('shandian'); + return current.hasJudge('fulei'); }); }, forced:true, @@ -5761,22 +5761,28 @@ game.import('character',function(lib,game,ui,get,ai,_status){ return false; }, content:function(){ - 'step 0' - var card=get.cardPile('shandian',true); - if(card){ - player.addJudge(card); - player.$draw(card); - game.delay(); - } - else{ - event.finish(); - } - 'step 1' - game.delay(); + var card=game.createCard('fulei'); + player.addJudge(card); + player.$draw(card); + game.delay(2); }, ai:{ threaten:1.5 - } + }, + group:'zuzhou_remove', + subSkill:{ + remove:{ + trigger:{global:'damageEnd'}, + filter:function(event,player){ + return event.card&&event.card.name=='fulei'; + }, + forced:true, + content:function(){ + trigger.card.expired=true; + game.log(trigger.card,'被移去'); + } + } + } }, mdzhoufu:{ enable:'phaseUse', @@ -5798,7 +5804,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ ui.special.appendChild(cards[0]); }, check:function(card){ - if(get.suit(card)=='spade'&&card.number>=2&&card.number<=9){ + if(get.suit(card)=='spade'){ return 6-get.value(card); } return -1; @@ -7897,7 +7903,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ mdzhoufu2:'缚魂', mdzhoufu_info:'出牌阶段，你可以将一张黑色手牌置于一名其他角色的武将牌上，在其判定时以此牌作为判定结果，然后你获得亮出的判定牌', zuzhou:'诅咒', - zuzhou_info:'锁定技，准备阶段，若场上没有闪电且你手牌中有黑桃牌，你将牌堆中的一张闪电置于你的判定区', + zuzhou_info:'锁定技，准备阶段，若场上没有浮雷且你手牌中有黑桃牌，你将牌堆中的一张浮雷置于你的判定区；当一名角色受到浮雷伤害时，你移去此浮雷', zuzhou_old_info:'每当你造成或受到一次伤害，你可以令伤害目标或来源进行一次判定，若结果为黑色，其流失一点体力', jingxiang:'镜像', jingxiang_info:'每回合限一次，当你需要打出卡牌时，你可以观看一名角色的手牌并将其视为你的手牌打出', diff --git a/character/rank.js b/character/rank.js index f105cb805..e2dc9ba9d 100644 --- a/character/rank.js +++ b/character/rank.js @@ -54,6 +54,7 @@ window.noname_character_rank={ 'hs_aya', 'hs_tyrande', 'swd_shuwaner', + 'pal_yueqi', ], a:[ 'gw_meizi', @@ -70,7 +71,6 @@ window.noname_character_rank={ 'gw_zhuoertan', 'gw_gaier', 'pal_mingxiu', - 'pal_yueqi', 'pal_luozhaoyan', 'pal_xia', 'hs_yashaji', diff --git a/character/xianjian.js b/character/xianjian.js index 7f488c778..f4445050d 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -869,13 +869,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){ tianwu:{ trigger:{player:'useCardToBegin'}, filter:function(event,player){ + if(get.is.altered('tianwu')&&player.hasSkill('tianwu2')) return false; return event.targets&&event.targets.length==1&&player.getEnemies().contains(event.target); }, + alter:true, frequent:true, content:function(){ trigger.target.getDebuff(); + player.addTempSkill('tianwu2'); } }, + tianwu2:{}, shiying:{ trigger:{global:'dieBefore'}, skillAnimation:'epic', @@ -4284,6 +4288,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ chengxin_info:'每四轮限一次，当一名角色进入濒死状态时，你可以令其将体力值回复至1，然后该角色防止一切伤害直到下一回合结束', tianwu:'天舞', tianwu_info:'每当你使用卡牌指定一名敌方角色为惟一目标，你可以对其施加一个随机的负面效果', + tianwu_info_alter:'每当你使用卡牌指定一名敌方角色为惟一目标，你可以对其施加一个随机的负面效果，每回合限发动一次', liguang:'离光', liguang_info:'结束阶段，你可以弃置一张手牌并将场上的一张牌移动到另一个合理的位置', shiying:'逝影', diff --git a/character/yijiang.js b/character/yijiang.js index bc282cac7..8ce0fdf90 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -5785,11 +5785,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){ game.delay(2); trigger.player.$give(result.links[0],player); player.equip(result.links[0]); + player.addExpose(0.2); } }, - ai:{ - expose:0.1 - } }, qieting2:{ trigger:{player:'useCard'}, diff --git a/game/update.js b/game/update.js index 1300908c5..9653d1f93 100644 --- a/game/update.js +++ b/game/update.js @@ -23,6 +23,7 @@ window.noname_update={ 'character/swd.js', 'character/rank.js', 'character/yijiang.js', + 'character/xianjian.js', // 'mode/identity.js', // 'mode/guozhan.js', // 'mode/versus.js',