diff --git a/card/guozhan.js b/card/guozhan.js index a3583d76d..5e9e0b5f9 100644 --- a/card/guozhan.js +++ b/card/guozhan.js @@ -4,6 +4,32 @@ game.import('card',function(lib,game,ui,get,ai,_status){ name:'guozhan', connect:true, card:{ + dinglanyemingzhu:{ + mode:['guozhan'], + fullskin:true, + type:'equip', + subtype:'equip5', + nomod:true, + nopower:true, + unique:true, + global:'g_dinglanyemingzhu_ai', + skills:['dinglanyemingzhu_skill'], + ai:{ + equipValue:function(card,player){ + if(player.hasSkill('jubao')) return 8; + if(player.hasSkill('gzzhiheng')) return 6; + if(game.hasPlayer(function(current){ + return current.hasSkill('jubao')&&get.attitude(player,current)<=0; + })){ + return 0; + } + return 7; + }, + basic:{ + equipValue:6.5 + } + } + }, feilongduofeng:{ mode:['guozhan'], fullskin:true, @@ -639,6 +665,31 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, }, skill:{ + dinglanyemingzhu_skill:{ + inherit:'gzzhiheng', + filter:function(event,player){ + return !player.hasSkill('gzzhiheng'); + }, + selectCard:function(){ + var player=_status.event.player; + return [1,player.maxHp]; + }, + prompt:'出牌阶段限一次，你可以弃置至多X张牌（X为你的体力上限），然后摸等量的牌' + }, + g_dinglanyemingzhu_ai:{ + ai:{ + effect:{ + player:function(card,player){ + if(player.hasSkill('jubao')) return; + if(card.name=='dinglanyemingzhu'&&game.hasPlayer(function(current){ + return current.hasSkill('jubao')&&get.attitude(player,current)<=0; + })){ + return [0,0,0,0]; + } + } + } + } + }, g_feilongduofeng_ai:{ ai:{ effect:{ @@ -1164,6 +1215,11 @@ game.import('card',function(lib,game,ui,get,ai,_status){ }, }, translate:{ + dinglanyemingzhu:'定澜夜明珠', + dinglanyemingzhu_bg:'珠', + dinglanyemingzhu_info:'锁定技，你视为拥有技能“制衡”，若你已经有“制衡”，则改为取消弃置牌数的限制。', + dinglanyemingzhu_skill:'制衡', + dinglanyemingzhu_skill_info:'出牌阶段限一次，你可以弃置至多X张牌（X为你的体力上限），然后摸等量的牌', feilongduofeng:'飞龙夺凤', feilongduofeng2:'飞龙夺凤', feilongduofeng_info:'当你使用【杀】指定一名角色为目标后，你可令该角色弃置一张牌。你使用【杀】杀死一名角色后，若你所属的势力是全场最少的（或之一），你可令该角色的使用者选择是否从未使用的武将牌中选择一张与你势力相同的武将牌重新加入游戏', diff --git a/character/refresh.js b/character/refresh.js index 37257aa3a..93d86ace3 100644 --- a/character/refresh.js +++ b/character/refresh.js @@ -212,7 +212,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ forced:true, filter:function(event,player){ if(event._notrigger.contains(event.player)) return false; - return event.card&&event.card.name=='sha'&&event.player.isAlive()&&event.player.countCards('he')>0; + return event.card&&event.card.name=='sha'&&event.player.isAlive()&&event.player.countGainableCards(player,'he')>0; }, check:function(){ return false; @@ -353,7 +353,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'damageEnd'}, direct:true, filter:function(event,player){ - return (event.source&&event.source.countCards('he')&&event.num>0&&event.source!=player); + return (event.source&&event.source.countGainableCards(player,'he')&&event.num>0&&event.source!=player); }, content:function(){ player.gainPlayerCard([1,trigger.num],get.prompt('fankui',trigger.source),trigger.source,get.buttonValue,'he').set('logSkill',['refankui',trigger.source]); diff --git a/character/shenhua.js b/character/shenhua.js index 128859636..d3a079455 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -1973,7 +1973,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ "step 0" player.chooseToCompare(trigger.player); "step 1" - if(result.bool&&trigger.player.countCards('he')){ + if(result.bool&&trigger.player.countGainableCards(player,'he')){ player.gainPlayerCard(trigger.player,true,'he'); } } diff --git a/character/standard.js b/character/standard.js index 1f364df47..a260bc727 100644 --- a/character/standard.js +++ b/character/standard.js @@ -182,7 +182,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'damageEnd'}, direct:true, filter:function(event,player){ - return (event.source&&event.source.countCards('he')&&event.source!=player); + return (event.source&&event.source.countGainableCards(player,'he')&&event.source!=player); }, content:function(){ player.gainPlayerCard(get.prompt('fankui',trigger.source),trigger.source,get.buttonValue,'he').set('logSkill',['fankui',trigger.source]); diff --git a/character/xianjian.js b/character/xianjian.js index 01e9b9ca5..4d3c05d11 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -12,7 +12,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ pal_sumei:['female','shu',3,['sheying','dujiang','huahu']], pal_shenqishuang:['female','wei',3,['qixia','jianzhen','binxin']], - pal_jingtian:['male','wu',3,['sajin','jubao']], + pal_jingtian:['male','wu',3,['sajin','jtjubao']], pal_xuejian:['female','shu',3,['xshuangren','shenmu','duci']], pal_longkui:['female','qun',3,['fenxing','diewu','lingyu']], pal_zixuan:['female','wei',3,['shuiyun','wangyou','changnian']], @@ -3271,10 +3271,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){ threaten:1.5 } }, - jubao:{ + jtjubao:{ trigger:{global:'discardAfter'}, filter:function(event,player){ - if(player.hasSkill('jubao2')) return false; + if(player.hasSkill('jtjubao2')) return false; if(event.player==player) return false; if(_status.currentPhase==player) return false; for(var i=0;i0) return true; } - var cards=event.player.getCards('e'); + var cards=event.player.getGainableCards(player,'e'); for(var i=0;i=6) return true; } return false; }, content:function(){ - if(trigger.player.countCards('ej')){ + if(trigger.player.countGainableCards(player,'ej')){ player.gainPlayerCard(trigger.player,'ej',true); } trigger.cancel(); diff --git a/game/asset.js b/game/asset.js index 9d03b7d59..6a439e813 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1238,6 +1238,7 @@ window.noname_asset_list=[ 'image/card/diaobingqianjiang.png', 'image/card/diaohulishan.png', 'image/card/dilu.png', + 'image/card/dinglanyemingzhu.png', 'image/card/donghuangzhong.png', 'image/card/du.png', 'image/card/dunpaigedang.png', @@ -1789,6 +1790,7 @@ window.noname_asset_list=[ 'image/character/jsp_huangyueying.jpg', 'image/character/jsp_zhaoyun.jpg', 'image/character/jun_liubei.jpg', + 'image/character/jun_sunquan.jpg', 'image/character/jun_zhangjiao.jpg', 'image/character/kanze.jpg', 'image/character/kongrong.jpg', @@ -1814,6 +1816,7 @@ window.noname_asset_list=[ 'image/character/luxun.jpg', 'image/character/luzhi.jpg', 'image/character/lvbu.jpg', + 'image/character/lvfan.jpg', 'image/character/lvmeng.jpg', 'image/character/machao.jpg', 'image/character/madai.jpg', @@ -1977,6 +1980,7 @@ window.noname_asset_list=[ 'image/character/re_zhangliao.jpg', 'image/character/re_zhaoyun.jpg', 'image/character/re_zhouyu.jpg', + 'image/character/shamoke.jpg', 'image/character/shen_caocao.jpg', 'image/character/shen_guanyu.jpg', 'image/character/shen_lvbu.jpg', diff --git a/game/game.js b/game/game.js index 7d3e7d34d..01c9c10e0 100644 --- a/game/game.js +++ b/game/game.js @@ -11267,6 +11267,9 @@ } else if(event.prompt){ event.dialog=ui.create.dialog(event.prompt); + if(event.prompt2){ + event.dialog.addText(event.prompt2,event.prompt2.length<=20||event.centerprompt2); + } } } game.pause(); @@ -18541,6 +18544,9 @@ hasSkill:function(skill){ return game.expandSkills(this.getSkills()).contains(skill); }, + hasStockSkill:function(skill,arg1,arg2){ + return this.getStockSkills(arg1,arg2).contains(skill); + }, hasZhuSkill:function(skill,player){ if(!this.hasSkill(skill)) return false; var mode=get.mode(); @@ -18693,6 +18699,13 @@ } return false; }, + canEquip:function(name,replace){ + if(get.type(name)=='card'){ + name=get.equiptype(name); + } + if(!replace&&this.getEquip(name)) return false; + return true; + }, getEquip:function(name){ var es=this.getCards('e'); if(typeof name=='object'&&get.info(name)){ @@ -44470,6 +44483,11 @@ if(!lib.card[obj.name]) return; return lib.card[obj.name].subtype; }, + equiptype:function(card){ + var subtype=get.subtype(card); + if(subtype.indexOf('equip')==0) return parseInt(subtype[5]); + return 0; + }, suit:function(card){ if(get.itemtype(card)=='cards'){ var suit=get.suit(card[0]) @@ -45361,7 +45379,7 @@ for(i=0;i
'; if(node.forbiddenSkills[skills[i]].length){ @@ -46016,7 +46034,7 @@ var skills=infoitem[3]; for(i=0;i
'+get.translation(skills[i])+'
'+get.skillInfoTranslation(skills[i])+'
'); } diff --git a/game/update.js b/game/update.js index 840cbde61..769fe94f8 100644 --- a/game/update.js +++ b/game/update.js @@ -6,11 +6,21 @@ window.noname_update={ ], files:[ 'card/standard.js', + 'card/guozhan.js', + 'character/diy.js', + 'character/extra.js', + 'character/hearth.js', + 'character/refresh.js', 'character/shenhua.js', + 'character/sp.js', + 'character/yijiang.js', 'character/standard.js', + 'character/xianjian.js', 'character/yijiang.js', 'game/asset.js', 'game/game.js', + 'game/directory.js', + 'layout/default/layout.css', 'mode/guozhan.js' ] -}; \ No newline at end of file +}; diff --git a/image/card/dinglanyemingzhu.png b/image/card/dinglanyemingzhu.png new file mode 100644 index 000000000..2adaf1f82 Binary files /dev/null and b/image/card/dinglanyemingzhu.png differ diff --git a/image/character/jun_sunquan.jpg b/image/character/jun_sunquan.jpg new file mode 100644 index 000000000..ac376e0eb Binary files /dev/null and b/image/character/jun_sunquan.jpg differ diff --git a/image/character/lvfan.jpg b/image/character/lvfan.jpg new file mode 100644 index 000000000..384b5e0e1 Binary files /dev/null and b/image/character/lvfan.jpg differ diff --git a/image/character/shamoke.jpg b/image/character/shamoke.jpg new file mode 100644 index 000000000..7f69f5c67 Binary files /dev/null and b/image/character/shamoke.jpg differ diff --git a/layout/default/layout.css b/layout/default/layout.css index f8179ebd5..42961cece 100644 --- a/layout/default/layout.css +++ b/layout/default/layout.css @@ -1036,6 +1036,12 @@ table { .dialog.character>.packnode>div:last-child { margin-bottom: 9px; } +.dialog.popped .caption>.text>ul>li:not(*:last-child){ + margin-bottom: 8px; +} +.dialog.popped .caption>.caption>div>.skillinfo:not(*:last-child){ + margin-bottom: 8px; +} #sidebar>div,#sidebar3>div { margin: 10px; diff --git a/mode/guozhan.js b/mode/guozhan.js index 0fc9b7e4f..2b15b77ba 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -267,14 +267,630 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gz_jun_liubei:['male','shu',4,['zhangwu','jizhao','shouyue','wuhujiangdaqi']], gz_jun_zhangjiao:['male','qun',4,['wuxin','hongfa','wendao','huangjintianbingfu']], + gz_jun_sunquan:['male','wu',4,['jiahe','lianzi','jubao','yuanjiangfenghuotu']], gz_liqueguosi:['male','qun',4,['xiongsuan']], gz_zuoci:['male','qun',3,['gzhuashen','gzxinsheng']], gz_bianfuren:['female','wei',3,['wanwei','yuejian']], gz_xunyou:['male','wei',3,['gzqice','zhiyu']], + gz_lingtong:['male','wu',4,['xuanlve','yongjin']], + gz_lvfan:['male','wu',3,['diaodu','diancai']], + gz_masu:['male','shu',3,['sanyao','gzzhiman']], + gz_shamoke:['male','shu',4,['gzjili']], } }, skill:{ + gzjili:{ + subSkill:{ + count:{ + trigger:{player:['useCard','respond']}, + silent:true, + priority:1, + content:function(){ + player.storage.gzjili++; + } + }, + init:{ + trigger:{global:'phaseBefore'}, + silent:true, + content:function(){ + player.storage.gzjili=0; + } + } + }, + group:['gzjili_count','gzjili_init'], + trigger:{player:['useCard','respond']}, + frequent:true, + filter:function(event,player){ + return player.storage.gzjili==player.getAttackRange(); + }, + content:function(){ + player.draw(player.getAttackRange()); + }, + ai:{ + threaten:1.8 + } + }, + gzzhiman:{ + inherit:'zhiman', + content:function(){ + 'step 0' + if(trigger.player.countGainableCards(player,'ej')){ + player.gainPlayerCard(trigger.player,'ej',true); + } + trigger.cancel(); + 'step 1' + player.mayChangeVice(); + } + }, + diancai:{ + group:['diancai_count','diancai_init'], + trigger:{global:'phaseUseEnd'}, + filter:function(event,player){ + return _status.currentPhase!=player&&player.storage.diancai>=player.hp; + }, + content:function(){ + 'step 0' + var num=player.maxHp-player.countCards('h'); + if(num>0){ + player.draw(num); + } + 'step 1' + player.mayChangeVice(); + }, + subSkill:{ + init:{ + trigger:{global:'phaseUseBegin'}, + filter:function(event,player){ + return _status.currentPhase!=player; + }, + silent:true, + content:function(){ + player.storage.diancai=0; + } + }, + count:{ + trigger:{player:'loseEnd'}, + silent:true, + filter:function(event,player){ + return _status.currentPhase!=player; + }, + content:function(){ + player.storage.diancai+=trigger.cards.length; + } + } + } + }, + diaodu:{ + enable:'phaseUse', + usable:1, + filterTarget:function(card,player,target){ + return target.sameIdentityAs(player); + }, + selectTarget:-1, + content:function(){ + 'step 0' + var use=target.countCards('h',{type:'equip'})>0; + var move=false; + var es=target.getCards('e'); + if(es.length&&target.identity!='ye'){ + move=game.hasPlayer(function(current){ + if(current!=target&&target.identity!=current.identity){ + for(var i=0;i=4; + }); + var vacancies={ + equip1:0, + equip2:0, + equip3:0, + equip4:0, + equip5:0 + }; + for(var i=0;i'+get.translation(targets[i])+''); + info.push(es); + } + } + var next=player.chooseButton(true,[1,3]); + next.set('createDialog',info); + next.set('filterButton',function(button){ + return game.hasPlayer(function(current){ + return !current.countCards('e',{subtype:get.subtype(button.link)}); + }); + }); + next.set('ai',function(button){ + var player=_status.event.player; + var owner=get.owner(button.link); + var att=get.attitude(player,owner); + if(att>0) return 0; + var subtype=get.subtype(button.link); + var vacancies=_status.event.vacancies; + var num=vacancies[subtype]; + for(var i=0;i0){ + var val=get.equipValue(button.link); + if(att>=-1){ + val-=2; + } + return val; + } + return 0; + }); + next.set('vacancies',vacancies); + 'step 1' + event.cards=result.links.slice(0); + event.num=0; + 'step 2' + if(event.num=4; + }); + var vacancies={ + equip1:0, + equip2:0, + equip3:0, + equip4:0, + equip5:0 + }; + for(var i=0;i=3){ + return 1; + } + vacancies[type]--; + } + } + } + if(num&&player.hp==1){ + return 0.5; + } + return 0; + } + } + } + }, + xuanlve:{ + trigger:{player:'loseEnd'}, + direct:true, + filter:function(event,player){ + for(var i=0;i=5){ + return 8-get.value(card); + } + if(num>=3){ + return 7-get.value(card); + } + if(num>=2){ + return 3-get.value(card); + } + return 0; + }, + content:function(){ + 'step 0' + var num=game.countPlayer(function(current){ + if(current.identity=='wu'){ + return current.countCards('e'); + } + })+player.storage.yuanjiangfenghuotu.length; + if(num){ + event.shown=get.cards(num); + player.showCards(event.shown,get.translation('lianzi')); + } + else{ + event.finish(); + return; + } + 'step 1' + var list=[]; + var type=get.type(cards[0],'trick'); + for(var i=0;i=3&&player.hasStockSkill('lianzi')){ + player.removeSkill('lianzi'); + player.addSkill('gzzhiheng'); + } + } + }, + ai:{ + order:7, + result:{ + player:1 + } + } + }, + jubao:{ + mod:{ + canBeGained:function(card){ + if(get.position(card)=='e'&&get.subtype(card)=='equip5') return false; + } + }, + trigger:{player:'phaseEnd'}, + forced:true, + unique:true, + filter:function(event,player){ + return game.hasPlayer(function(current){ + return current.countCards('ej',function(card){ + return card.name=='dinglanyemingzhu'; + }); + }); + }, + content:function(){ + 'step 0' + player.draw(); + 'step 1' + var target=game.findPlayer(function(current){ + return current!=player&¤t.countCards('e','dinglanyemingzhu'); + }); + if(target&&target.countGainableCards(player,'he')){ + player.line(target,'green'); + player.gainPlayerCard(target,true); + } + }, + ai:{ + threaten:1.5 + } + }, + jiahe:{ + unique:true, + forceunique:true, + derivation:'yuanjiangfenghuotu', + mark:true, + global:['jiahe_put','jiahe_skill'], + init:function(player){ + player.storage.yuanjiangfenghuotu=[]; + }, + ai:{ + threaten:2 + }, + trigger:{player:'damageEnd'}, + forced:true, + filter:function(event,player){ + return event.card&&(event.card.name=='sha'||get.type(event.card,'trick'))&&player.storage.yuanjiangfenghuotu.length>0; + }, + content:function(){ + 'step 0' + player.chooseCardButton('将一张“烽火”置入弃牌堆',player.storage.yuanjiangfenghuotu,true); + 'step 1' + if(result.bool){ + player.$throw(result.links); + var card=result.links[0]; + card.discard(); + player.storage.yuanjiangfenghuotu.remove(card); + player.syncStorage('yuanjiangfenghuotu'); + player.updateMarks('yuanjiangfenghuotu'); + } + } + }, + jiahe_put:{ + enable:'phaseUse', + filter:function(event,player){ + var zhu=get.zhu(player,'jiahe'); + if(zhu&&zhu.storage.yuanjiangfenghuotu){ + return player.countCards('he',{type:'equip'})>0; + } + return false; + }, + filterCard:{type:'equip'}, + position:'he', + check:function(card){ + var num=7-get.value(card); + if(get.position(card)=='h'){ + num+=3; + } + return num; + }, + discard:false, + lose:true, + prepare:function(cards,player){ + var zhu=get.zhu(player,'jiahe'); + player.$give(cards,zhu); + player.line(zhu); + }, + content:function(){ + var zhu=get.zhu(player,'jiahe'); + zhu.storage.yuanjiangfenghuotu.add(cards[0]); + zhu.syncStorage('yuanjiangfenghuotu'); + zhu.updateMarks('yuanjiangfenghuotu'); + }, + ai:{ + order:1, + result:{ + player:1 + } + } + }, + jiahe_skill:{ + trigger:{player:'phaseBeginStart'}, + direct:true, + filter:function(event,player){ + var zhu=get.zhu(player,'jiahe'); + if(zhu&&zhu.storage.yuanjiangfenghuotu&&zhu.storage.yuanjiangfenghuotu.length){ + return true; + } + return false; + }, + content:function(){ + 'step 0' + var zhu=get.zhu(player,'jiahe'); + event.num=zhu.storage.yuanjiangfenghuotu.length; + 'step 1' + var list=[]; + if(event.num>=1&&!player.hasSkill('yingzi')) list.push('yingzi'); + if(event.num>=2&&!player.hasSkill('haoshi')) list.push('haoshi'); + if(event.num>=3&&!player.hasSkill('shelie')) list.push('shelie'); + if(event.num>=4&&!player.hasSkill('duoshi')) list.push('duoshi'); + if(!list.length){ + event.finish(); + return; + } + list.push('cancel2'); + var prompt2='你可以获得下列一项技能直到回合结束'; + if(list.length>=5){ + if(event.done){ + prompt2+=' (2/2)'; + } + else{ + prompt2+=' (1/2)'; + } + } + player.chooseControl(list).set('prompt',get.translation('yuanjiangfenghuotu')). + set('prompt2',prompt2).set('centerprompt2',true).set('ai',function(evt,player){ + var controls=_status.event.controls; + if(controls.contains('haoshi')){ + var nh=player.countCards('h'); + if(player.hasSkill('yingzi')||(player.hp==1&&player.hasSkill('hunshang'))){ + if(nh==0) return 'haoshi'; + } + else{ + if(nh<=1) return 'haoshi'; + } + } + if(controls.contains('shelie')){ + return 'shelie'; + } + if(controls.contains('yingzi')&&(player.hp!=1||!player.hasSkill('hunshang'))){ + return 'yingzi'; + } + if(controls.contains('duoshi')){ + return 'duoshi'; + } + return controls.randomGet(); + }); + 'step 2' + if(result.control!='cancel2'){ + player.addTempSkill(result.control); + if(!event.done) player.logSkill('jiahe'); + game.log(player,'获得了技能','【'+get.translation(result.control)+'】'); + if(event.num>=5&&!event.done){ + event.done=true; + event.goto(1); + } + } + } + }, + yuanjiangfenghuotu:{ + unique:true, + forceunique:true, + nopop:true, + mark:true, + intro:{ + content:'cards', + mark:function(dialog,content,player){ + if(content&&content.length){ + dialog.addSmall(content); + } + dialog.addText('
  • 每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。
  • 根据“烽火”的数量，所有吴势力角色可于其准备阶段开始时选择并获得其中一个技能直到回合结束：一张以上~英姿；两张以上~好施；三张以上~涉猎；四张以上~度势；五张以上~可额外选择一项。
  • 锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。',false) + } + } + }, gzqice:{ enable:'phaseUse', usable:1, @@ -287,15 +903,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ change:{ trigger:{player:'useCardAfter'}, filter:function(event,player){ - return event.skill=='gzqice_backup'&&player.hasViceCharacter(); + return event.skill=='gzqice_backup'; }, - check:function(event,player){ - return get.rank(player.name2,true)<=5; - }, - prompt:'是否变更副将？', - popup:false, + silent:true, content:function(){ - player.changeVice(); + player.mayChangeVice(); } } }, @@ -868,7 +1480,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ player.loseHp(); } }, - _hongfa2:{ + hongfa_respond:{ trigger:{player:'chooseToRespondBegin'}, direct:true, filter:function(event,player){ @@ -897,11 +1509,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ zhu.storage.huangjintianbingfu.remove(card); zhu.syncStorage('huangjintianbingfu'); zhu.updateMarks('huangjintianbingfu'); - player.logSkill('_hongfa2'); + player.logSkill('hongfa_respond'); } } }, - _hongfa:{ + hongfa_use:{ enable:'chooseToUse', filter:function(event,player){ if(!event.filterCard({name:'sha'},player)) return false; @@ -929,7 +1541,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ zhu.storage.huangjintianbingfu.remove(card); zhu.syncStorage('huangjintianbingfu'); zhu.updateMarks('huangjintianbingfu'); - player.logSkill('_hongfa',result.targets); + player.logSkill('hongfa_use',result.targets); } } }, @@ -978,6 +1590,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ threaten:2, }, group:'hongfa_hp', + global:['hongfa_use','hongfa_respond'], subSkill:{ hp:{ trigger:{player:'loseHpBefore'}, @@ -1071,11 +1684,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ dialog.addSmall(content); } dialog.addText('
    • 当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。
    • 每当你失去体力时，你可改为将一张“天兵”置入弃牌堆。
    • 与你势力相同的角色可将一张“天兵”当【杀】使用或打出。',false) - }, + } } }, wuxin:{ - unique:true, + // unique:true, trigger:{player:'phaseDrawBegin'}, // frequent:'check', // check:function(event,player){ @@ -1335,7 +1948,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ nopop:true, mark:true, intro:{ - content:'@
      【武圣】
      将“红色牌”改为“任意牌”
      【咆哮】
      增加描述“你使用的【杀】无视其他角色的防具”
      【龙胆】
      增加描述“你每发动一次‘龙胆’便摸一张牌”
      【烈弓】
      增加描述“你的攻击范围+1”
      【铁骑】
      将“若结果为红色”改为“若结果不为黑桃”
      ' + content:'@
      【武圣】
      将“红色牌”改为“任意牌”
      【咆哮】
      增加描述“你使用的【杀】无视其他角色的防具”
      【龙胆】
      增加描述“你每发动一次‘龙胆’便摸一张牌”
      【烈弓】
      增加描述“你的攻击范围+1”
      【铁骑】
      将“若结果为红色”改为“若结果不为黑桃”
      ' } }, jizhao:{ @@ -1512,9 +2125,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, }, heyi:{ - zhenfa:'inline' + zhenfa:'inline', + global:'heyi_distance' }, - _heyi:{ + heyi_distance:{ mod:{ globalTo:function(from,to,distance){ if(game.hasPlayer(function(current){ @@ -1595,9 +2209,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, }, niaoxiang:{ - zhenfa:'siege' + zhenfa:'siege', + global:'niaoxiang_sha' }, - _niaoxiang:{ + niaoxiang_sha:{ trigger:{player:'shaBegin'}, filter:function(event,player){ if(game.countPlayer()<4) return false; @@ -1617,9 +2232,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, fengshi:{ - zhenfa:'siege' + zhenfa:'siege', + global:'fengshi_sha' }, - _fengshi:{ + fengshi_sha:{ trigger:{player:'shaBegin'}, filter:function(event,player){ if(game.countPlayer()<4) return false; @@ -2105,9 +2721,15 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gzzhiheng:{ inherit:'zhiheng', selectCard:function(){ - return [1,_status.event.player.maxHp]; + var player=_status.event.player; + if(player.hasSkill('dinglanyemingzhu_skill')) return [1,Infinity]; + return [1,player.maxHp]; }, - prompt:'出牌阶段限一次，你可以弃置至多X张牌（X为你的体力上限），然后摸等量的牌' + prompt:function(){ + var player=_status.event.player; + if(player.hasSkill('dinglanyemingzhu_skill')) return '出牌阶段限一次，你可以弃置任意张牌，然后摸等量的牌'; + return '出牌阶段限一次，你可以弃置至多X张牌（X为你的体力上限），然后摸等量的牌'; + } }, huoshui:{ enable:'phaseUse', @@ -2120,9 +2742,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ content:function(){ if(player.name1=='gz_zoushi') player.showCharacter(0); else player.showCharacter(1); - } + }, + global:'huoshui_mingzhi' }, - _huoshui:{ + huoshui_mingzhi:{ ai:{ nomingzhi:true, skillTagFilter:function(player){ @@ -2403,7 +3026,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, _mingzhi3:{ - trigger:{player:'phaseBegin'}, + trigger:{player:'phaseBeginStart'}, priority:19.1, forced:true, popup:false, @@ -3344,9 +3967,27 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gz_jun_liubei:'君刘备', gz_jun_zhangjiao:'君张角', + gz_jun_sunquan:'君孙权', gz_liqueguosi:'李傕郭汜', gz_bianfuren:'卞夫人', + gz_lvfan:'吕范', + gz_shamoke:'沙摩柯', + gz_masu:'马谡', + gzjili:'蒺藜', + gzjili_info:'当你于一回合内使用或打出第X张牌时，你可以摸X张牌（X为你的攻击范围）。', + gzzhiman:'制蛮', + gzzhiman_info:'当你对其他角色造成伤害时，你可以防止此伤害。若如此做，你获得其装备区或判定区里的一张牌。然后若该角色与你势力相同，则该角色可以变更其副将。', + diaodu:'调度', + diaodu_info:'出牌阶段限一次，所有与你势力相同的角色，可以依次选择一项：1、使用一张装备牌；2、将装备区里的一张牌移动至另一名与你势力相同的角色的装备区里。', + diancai:'典财', + diancai_info:'其他角色的出牌阶段结束时，若你于此阶段失去了x张或更多的牌，则你可以将手牌摸至体力上限。若如此做，你可以变更副将（x为你的体力值）。', + xuanlve:'旋略', + xuanlve_info:'当你失去装备区里的牌后，你可以弃置一名其他角色的一张牌。', + yongjin:'勇进', + yongjin_info:'限定技，出牌阶段，你可以移动场上的至多三张装备牌。', + lianzi:'敛资', + lianzi_info:'出牌阶段限一次，你可以弃置一张手牌，然后亮出牌堆顶X张牌（X为吴势力角色装备区里的牌和“烽火”的总和），获得其中所有与你弃置牌类别相同的牌，将其余的牌置入弃牌堆，若一次获得的牌超过三张，则你失去技能“敛资”并获得技能“制衡”。', gzqice:'奇策', gzqice_info:'出牌阶段限一次，你可以将所有手牌当任意一张普通锦囊牌使用，你不能以此法使用目标数超过X的牌（X为你的手牌数），然后你可以变更副将。', wanwei:'挽危', @@ -3360,18 +4001,31 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gzxinsheng:'新生', gzxinsheng_info:'当你受到伤害后，你可以从剩余武将牌堆中扣置一张牌加入到“化身”牌中。', + jubao:'聚宝', + jubao_info:'锁定技，你装备区里的宝物牌不能被其他角色获得，结束阶段开始时，若场上或弃牌堆有【定澜夜明珠】，则你摸一张牌，然后获得装备区里有【定澜夜明珠】角色的一张牌。', + jiahe:'嘉禾', + jiahe_info:'君主技，只要此武将牌处于明置状态，你便拥有“缘江烽火图”。', + jiahe_put:'烽火', + jiahe_put_info:'出牌阶段限一次，你可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。', + jiahe_skill:'缘江烽火图', + yuanjiangfenghuotu:'缘江烽火图', + yuanjiangfenghuotu_info:'每名吴势力角色的出牌阶段限一次，该角色可以将一张装备牌置于“缘江烽火图”上，称之为“烽火”。
      根据“烽火”的数量，所有吴势力角色可于其准备阶段开始时选择并获得其中一个技能直到回合结束：一张以上~英姿；两张以上~好施；三张以上~涉猎；四张以上~度势；五张以上~可额外选择一项。
      锁定技，当你受到【杀】或锦囊牌造成的伤害后，你将一张“烽火”置入弃牌堆。', + yuanjiangfenghuotu_ab:'江图', + yuanjiangfenghuotu_bg:'图', wuxin:'悟心', wuxin_info:'摸牌阶段开始时，你可以观看牌堆顶的X张牌（X为群势力角色的数量），然后将这些牌以任意顺序置于牌堆顶', hongfa:'弘法', - _hongfa:'天兵', - _hongfa2:'天兵', + hongfa_use:'天兵', + hongfa_respond:'天兵', hongfa_info:'君主技，锁定技，当此武将牌明置时，你获得“黄巾天兵符”；准备阶段开始时，若没有“天兵”，你将牌堆顶的X张牌置于“黄巾天兵符”上，称为“天兵”（X为群势力角色的数量）', wendao:'问道', wendao_info:'出牌阶段限一次，你可以弃置一张红色牌，获得弃牌堆里或场上的一张【太平要术】', huangjintianbingfu:'黄巾天兵符', + huangjintianbingfu_ab:'兵符', huangjintianbingfu_bg:'符', huangjintianbingfu_info:'锁定技 ：当你计算群势力角色数时，每一张“天兵”均可视为一名群势力角色。
      每当你失去体力时，你可改为将一张“天兵”置入弃牌堆。
      与你势力相同的角色可将一张“天兵”当【杀】使用或打出。', wuhujiangdaqi:'五虎将大旗', + wuhujiangdaqi_ab:'将旗', wuhujiangdaqi_bg:'旗', wuhujiangdaqi_info:'存活的蜀势力角色的技能按以下规则改动：
      武圣：将“红色牌”改为“任意牌”
      咆哮：增加描述“你使用的【杀】无视其他角色的防具”
      龙胆：增加描述“你每发动一次‘龙胆’便摸一张牌”
      烈弓：增加描述“你的攻击范围+1”
      铁骑：将“若结果为红色”改为“若结果不为黑桃”', zhangwu:'章武', @@ -3386,7 +4040,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gzmingshi:'名士', gzmingshi_info:'锁定技，当你受到伤害时，若伤害来源有暗置的武将牌，此伤害-1', fengshi:'锋矢', - _fengshi:'锋矢', + fengshi_sha:'锋矢', fengshi_info:'阵法技，在同一个围攻关系中，若你是围攻角色，则你或另一名围攻角色使用【杀】指定被围攻角色为目标后，可令该角色弃置装备区里的一张牌', gzsuishi:'随势', gzsuishi_info:'锁定技，当其他角色进入濒死状态时，若伤害来源与你势力相同，你摸一张牌；当其他角色死亡时，若其与你势力相同，你失去1点体力', @@ -3407,7 +4061,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gzshangyi:'尚义', gzshangyi_info:'出牌阶段限一次，你可以令一名其他角色观看你的手牌。若如此做，你选择一项：1.观看其手牌并可以弃置其中的一张黑色牌；2.观看其所有暗置的武将牌', niaoxiang:'鸟翔', - _niaoxiang:'鸟翔', + niaoxiang_sha:'鸟翔', niaoxiang_info:'阵法技，在同一个围攻关系中，若你是围攻角色，则你或另一名围攻角色使用【杀】指定被围攻角色为目标后，你令该角色需依次使用两张【闪】才能抵消', yicheng:'疑城', yicheng_info:'当与你势力相同的一名角色成为【杀】的目标后，你可以令该角色摸一张牌然后弃置一张牌', @@ -3456,7 +4110,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ gzduanliang:'断粮', gzduanliang_info:'你可以将一张黑色基本牌或黑色装备牌当【兵粮寸断】使用；你可以对距离为2的角色使用【兵粮寸断】', }, - junList:['liubei','zhangjiao'], + junList:['liubei','zhangjiao','sunquan'], guozhanPile:[ ["spade",7,"sha"], ["spade",8,"sha"], @@ -3652,9 +4306,20 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ ['diamond',4,'xietianzi'], ['club',1,'yuxi'], ['heart',3,'taipingyaoshu'], + ['diamond',6,'dinglanyemingzhu'], ], element:{ content:{ + mayChangeVice:function(){ + 'step 0' + player.chooseBool('是否变更副将？').set('ai',function(){ + return get.rank(_status.event.player.name2,true)<=5; + }); + 'step 1' + if(result.bool){ + player.changeVice(); + } + }, zhulian:function(){ player.popup('珠联璧合'); game.log(player,'发动了【珠联璧合】'); @@ -3662,6 +4327,14 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, player:{ + mayChangeVice:function(){ + if(this.hasViceCharacter()){ + var next=game.createEvent('mayChangeVice'); + next.setContent('mayChangeVice'); + next.player=this; + return next; + } + }, differentIdentityFrom:function(target,self){ if(this==target) return false; if(self){