diff --git a/game/game.js b/game/game.js index 8e5dce98e..e92edadec 100644 --- a/game/game.js +++ b/game/game.js @@ -23208,6 +23208,9 @@ player.smoothAvatar(); } }, + arenaNumber:function(content){ + ui.arena.dataset.number=content; + }, reinit:function(source,content){ if(source&&content){ source.uninit(); @@ -23331,6 +23334,12 @@ player.hide(); } }, + deleteHandcards:function(player){ + if(player){ + player.node.handcards1.delete(); + player.node.handcards2.delete(); + } + }, hideCharacter:function(player,num){ if(player&&player.classList){ switch(num){ diff --git a/game/phantom.js b/game/phantom.js index 4f6b64f6f..6f248308c 100644 --- a/game/phantom.js +++ b/game/phantom.js @@ -18,7 +18,3 @@ var load=function(id){ load(1); // load(2); // load(3); - -setTimeout(function(){ - phantom.exit(); -},72000000); diff --git a/mode/boss.js b/mode/boss.js index df3b5a212..9ea947f35 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -733,11 +733,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ boss_mingxingzhu:['male','shen',3,['boss_qingzhu','boss_jiazu','boss_jiding'],['qun','hiddenboss','bossallowed']], boss_shaohao:['male','shen',6,['boss_shenyi','boss_shenen','boss_baiyi'],['qun','hiddenboss','bossallowed']], - // boss_xuanlinshilian:['male','',0,['boss_baimang','boss_baimang_intro1','boss_baimang_intro2','boss_baimang_intro3'],['boss'],'qun'], - // boss_xuanwu:['male','shen',4,['boss_shenyi','boss_kuangxiao','boss_baimang2'],['qun','hiddenboss','bossallowed']], - // boss_shuishengonggong:['male','shen',5,['boss_shenyi','boss_xingqiu','boss_baimang3'],['qun','hiddenboss','bossallowed']], - // boss_shuishenxuanming:['male','shen',3,['boss_qingzhu','boss_jiazu','boss_jiding'],['qun','hiddenboss','bossallowed']], - // boss_zhuanxu:['male','shen',6,['boss_shenyi','boss_shenen','boss_baiyi'],['qun','hiddenboss','bossallowed']], + boss_xuanlinshilian:['male','',0,['boss_xuanlin','boss_xuanlin_intro1','boss_xuanlin_intro2','boss_xuanlin_intro3'],['boss'],'qun'], + boss_xuanwu:['male','shen',4,['boss_shenyi','boss_lingqu','boss_xuanlin2'],['qun','hiddenboss','bossallowed']], + boss_shuishengonggong:['male','shen',5,['boss_shenyi','boss_juehong','boss_xuanlin3'],['qun','hiddenboss','bossallowed']], + boss_shuishenxuanming:['female','shen',5,['boss_shenyi','boss_zirun','boss_xuanlin3'],['qun','hiddenboss','bossallowed']], + boss_zhuanxu:['male','shen',6,['boss_shenyi','boss_shenen','boss_zaoyi'],['qun','hiddenboss','bossallowed']], boss_zhuoguiquxie:['male','',0,['boss_bianshen','boss_bianshen_intro1','boss_bianshen_intro2','boss_bianshen_intro3','boss_bianshen_intro4'],['boss'],'shu'], boss_nianshou_heti:['male','shen',12,['boss_nianrui','boss_mengtai','boss_nbianshen','boss_nbianshenx'],['shu','boss','bossallowed'],'shu'], @@ -1429,6 +1429,18 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ lib.boss.boss_chiyanshilian.init(); } }, + boss_xuanlinshilian:{ + chongzheng:0, + loopType:2, + checkResult:function(player){ + if(player==game.boss&&game.boss.name!='boss_zhuanxu'){ + return false; + } + }, + init:function(){ + lib.boss.boss_chiyanshilian.init(); + } + }, boss_zhuoguiquxie:{ chongzheng:0, checkResult:function(player){ @@ -1524,6 +1536,147 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, }, skill:{ + boss_zirun:{ + trigger:{player:'phaseBegin'}, + forced:true, + logTarget:function(){ + return game.filterPlayer(); + }, + content:function(){ + var list=game.filterPlayer().sortBySeat(); + game.asyncDraw(list,function(current){ + if(current.countCards('e')) return 2; + return 1; + }); + } + }, + boss_juehong:{ + trigger:{player:'phaseBegin'}, + forced:true, + logTarget:function(event,player){ + return player.getEnemies(); + }, + content:function(){ + 'step 0' + event.list=player.getEnemies().sortBySeat(); + 'step 1' + if(event.list.length){ + var target=event.list.shift(); + if(target.countCards('he')){ + var es=target.getCards('e'); + if(es.length){ + target.discard(es); + } + else{ + player.discardPlayerCard(target,'h',true); + } + } + event.redo(); + } + } + }, + boss_zaoyi:{ + trigger:{global:'dieAfter'}, + forced:true, + filter:function(event,player){ + if(lib.config.mode!='boss') return false; + var list=['boss_shuishenxuanming','boss_shuishengonggong']; + if(list.contains(event.player.name)){ + return !game.hasPlayer(function(current){ + return list.contains(current.name); + }); + } + return false; + }, + content:function(){ + player.draw(4); + player.addSkill('boss_zaoyi_hp'); + }, + subSkill:{ + hp:{ + trigger:{player:'phaseBegin'}, + forced:true, + mark:true, + intro:{ + content:'每个回合开始时使体力值最少的敌方角色失去所有体力' + }, + content:function(){ + var list=player.getEnemies(); + var min=list[0].hp; + for(var i=0;imin){ + list.splice(i--,1); + } + } + player.line(list,'green'); + list.sortBySeat(); + for(var i=0;i1; + }, + content:function(){ + trigger.cancel(); + } + } + } + }, boss_baiyi:{ group:['boss_baiyi_draw','boss_baiyi_thunder','boss_baiyi_discard'], subSkill:{ @@ -2582,6 +2735,185 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ game.roundNumber=0; } }, + boss_xuanlin:{ + trigger:{global:'gameStart'}, + forced:true, + popup:false, + fixed:true, + unique:true, + content:function(){ + player.smoothAvatar(); + player.init('boss_xuanwu'); + _status.noswap=true; + game.addVideo('reinit2',player,player.name); + } + }, + boss_xuanlin2:{ + mode:['boss'], + global:'boss_xuanlin2x', + trigger:{player:'dieBegin'}, + silent:true, + unique:true, + fixed:true, + filter:function(event,player){ + return player==game.boss; + }, + content:function(){ + player.hide(); + game.addVideo('hidePlayer',player); + } + }, + boss_xuanlin2x:{ + trigger:{global:'dieAfter'}, + forced:true, + priority:-10, + globalFixed:true, + unique:true, + fixed:true, + filter:function(event){ + if(lib.config.mode!='boss') return false; + return event.player==game.boss&&event.player.hasSkill('boss_xuanlin2'); + }, + content:function(){ + 'step 0' + game.delay(); + 'step 1' + if(game.me!=game.boss){ + game.boss.changeSeat(6); + } + else{ + game.boss.nextSeat.changeSeat(3); + game.boss.previousSeat.changeSeat(5); + } + game.changeBoss('boss_shuishengonggong'); + for(var i=0;i0&&dead[i].parentNode==player.parentNode){ + dead[i].revive(dead[i].maxHp); + dnum++; + } + } + for(var i=0;i0&&dead[i].parentNode==player.parentNode){ + dead[i].revive(dead[i].maxHp); + dnum++; + } + } + for(var i=0;i