From 071454f0281e9350db879477903ae80f74c424a1 Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 9 May 2016 18:34:08 +0800 Subject: [PATCH] liru --- character/yijiang.js | 145 +++++++++++++++++++++++++++++++++++++++++++ game/asset.js | 1 + game/game.js | 33 +++++++--- 3 files changed, 169 insertions(+), 10 deletions(-) diff --git a/character/yijiang.js b/character/yijiang.js index 169757cc8..dde33940a 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -83,6 +83,89 @@ character.yijiang={ guanping:['guanyu'], }, skill:{ + xinfencheng:{ + skillAnimation:'epic', + animationColor:'fire', + audio:2, + enable:'phaseUse', + filter:function(event,player){ + return !player.storage.xinfencheng; + }, + filterTarget:function(card,player,target){ + return player!=target; + }, + unique:true, + selectTarget:-1, + multitarget:true, + multiline:true, + mark:true, + line:'fire', + content:function(){ + "step 0" + player.storage.xinfencheng=true; + player.unmarkSkill('xinfencheng'); + event.num=1; + event.targets=targets.slice(0); + "step 1" + if(event.targets.length){ + var target=event.targets.shift(); + event.target=target; + var res=ai.get.damageEffect(target,player,target,'fire'); + target.chooseToDiscard('he','弃置至少'+get.cnNumber(event.num)+'张牌或受到2点火焰伤害',[num,Infinity]).set('ai',function(card){ + if(ui.selected.cards.length>=_status.event.getParent().num) return -1; + if(_status.event.player.hasSkillTag('nofire')) return -1; + if(_status.event.res>=0) return 6-ai.get.value(card); + if(get.type(card)!='basic'){ + return 10-ai.get.value(card); + } + return 8-ai.get.value(card); + }).set('res',res); + } + else{ + event.finish(); + } + "step 2" + if(!result.bool){ + event.target.damage(2,'fire'); + event.num=1; + } + else{ + event.num=result.cards.length+1; + } + event.goto(1); + }, + ai:{ + order:1, + result:{ + player:function(player){ + var num=0; + for(var i=0;i0){ + num--; + } + else if(att<0){ + num++; + } + } + } + if(game.players.length<5){ + return num-1; + } + else{ + return num-2; + } + } + } + }, + init:function(player){ + player.storage.xinfencheng=false; + }, + intro:{ + content:'limited' + } + }, xinjuece:{ trigger:{player:'phaseEnd'}, direct:true, @@ -106,6 +189,68 @@ character.yijiang={ } } }, + xinmieji:{ + enable:'phaseUse', + usable:1, + filterCard:function(card){ + return get.color(card)=='black'&&get.type(card,'trick')=='trick'; + }, + filterTarget:function(card,player,target){ + return target!=player&&target.num('h')>0; + }, + discard:false, + delay:false, + check:function(card){ + return 8-ai.get.value(card); + }, + content:function(){ + 'step 0' + player.showCards(cards); + 'step 1' + ui.cardPile.insertBefore(cards[0],ui.cardPile.firstChild); + var n1=target.get('he',function(card){ + return get.type(card,'trick')=='trick'; + }); + var n2=target.get('he',function(card){ + return get.type(card,'trick')!='trick'; + }); + if(n1.length>1||n2.length>2||(n1.length==1&&n2.length==2)){ + target.chooseToDiscard('弃置一张锦囊牌，或两张非锦囊牌',true,'he',function(card){ + if(!_status.event.nontrick){ + return get.type(card,'trick')=='trick'; + } + if(ui.selected.cards.length){ + return get.type(card,'trick')!='trick'; + } + return true; + }).set('ai',function(card){ + if(get.type(card,'trick')=='trick'){ + return 8-ai.get.value(card); + } + return -ai.get.value(card); + }).set('selectCard',function(){ + if(ui.selected.cards.length==1&&get.type(ui.selected.cards[0],'trick')=='trick'){ + return 1; + } + return 2; + }).set('nontrick',n2.length>=2); + } + else{ + if(n1.length){ + target.discard(n1); + } + else if(n2.length){ + target.discard(n2); + } + } + }, + ai:{ + order:9, + result:{ + target:-1 + } + } + }, qianju:{ mod:{ globalFrom:function(from,to,distance){ diff --git a/game/asset.js b/game/asset.js index e9c933454..7b1c5a89e 100644 --- a/game/asset.js +++ b/game/asset.js @@ -865,6 +865,7 @@ window.noname_asset_list=[ 'image/character/xiahouyuan.jpg', 'image/character/xiaoqiao.jpg', 'image/character/xin_fazheng.jpg', + 'image/character/xin_liru.jpg', 'image/character/xin_masu.jpg', 'image/character/xin_xushu.jpg', 'image/character/xin_yujin.jpg', diff --git a/game/game.js b/game/game.js index 24d575b4e..c07501270 100755 --- a/game/game.js +++ b/game/game.js @@ -4953,7 +4953,7 @@ game.check(); if(event.isMine()){ game.pause(); - if(range[1]>1){ + if(range[1]>1&&typeof event.selectCard!='function'){ event.promptdiscard=ui.create.control('提示',function(){ ai.basic.chooseCard(event.ai); if(_status.event.custom.add.card){ @@ -4980,11 +4980,13 @@ str+='牌'; } event.dialog=ui.create.dialog(str); - event.dialog.add('0/'+event.selectCard[1]); - event.custom.add.card=function(){ - _status.event.dialog.content.childNodes[1].innerHTML= - ui.selected.cards.length+'/'+_status.event.selectCard[1]; - } + if(Array.isArray(event.selectCard)){ + event.dialog.add('0/'+get.numStr(event.selectCard[1])); + event.custom.add.card=function(){ + _status.event.dialog.content.childNodes[1].innerHTML= + ui.selected.cards.length+'/'+get.numStr(_status.event.selectCard[1]); + } + } } else if(get.itemtype(event.dialog)=='dialog'){ event.dialog.style.display=''; @@ -5311,10 +5313,10 @@ str+='牌'; } event.dialog=ui.create.dialog(str); - event.dialog.add('0/'+event.selectCard[1]); + event.dialog.add('0/'+get.numStr(event.selectCard[1])); event.custom.add.card=function(){ _status.event.dialog.content.childNodes[1].innerHTML= - ui.selected.cards.length+'/'+_status.event.selectCard[1]; + ui.selected.cards.length+'/'+get.numStr(_status.event.selectCard[1]); } } } @@ -5366,10 +5368,10 @@ str+='个目标'; } event.dialog=ui.create.dialog(str); - event.dialog.add('0/'+event.selectTarget[1]); + event.dialog.add('0/'+get.numStr(event.selectTarget[1])); event.custom.add.target=function(){ _status.event.dialog.content.childNodes[1].innerHTML= - ui.selected.targets.length+'/'+_status.event.selectTarget[1]; + ui.selected.targets.length+'/'+get.numStr(_status.event.selectTarget[1]); } } else if(get.itemtype(event.dialog)=='dialog'){ @@ -8101,6 +8103,7 @@ if(next.ai==undefined) next.ai=ai.get.unuseful; next.autochoose=function(){ if(!this.forced) return false; + if(typeof this.selectCard=='function') return false; return get.select(this.selectCard)[0]>=this.player.num(this.position||'h'); } next.content=lib.element.playerproto.chooseToDiscard; @@ -25546,6 +25549,9 @@ } } } + else if(item===Infinity){ + return '_noname_infinity'; + } else{ return item; } @@ -25562,6 +25568,9 @@ else if(item.indexOf('_noname_player:')==0){ return get.infoPlayerOL(item); } + else if(item=='_noname_infinity'){ + return Infinity; + } else{ return item; } @@ -25602,6 +25611,10 @@ } return str2; }, + numStr:function(num){ + if(num==Infinity) return '∞'; + return num.toString(); + }, slimName:function(str){ var str2=lib.translate[str]; if(!str2) return '';