diff --git a/card/standard.js b/card/standard.js index e40401008..d6d59a4b8 100644 --- a/card/standard.js +++ b/card/standard.js @@ -1524,7 +1524,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){ bagua_skill:{ trigger:{player:'chooseToRespondBegin'}, filter:function(event,player){ - console.log(123); if(event.responded) return false; if(!event.filterCard({name:'shan'})) return false; if(!lib.filter.cardRespondable({name:'sha'},player,event)) return false; diff --git a/character/xianjian.js b/character/xianjian.js index b94eb3a16..8cbdea5b4 100644 --- a/character/xianjian.js +++ b/character/xianjian.js @@ -4056,6 +4056,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ trigger:{player:'damageBefore'}, filter:function(event){ if(event.nature) return true; + return false; }, forced:true, content:function(){ diff --git a/game/asset.js b/game/asset.js index f881530dd..1a4254775 100644 --- a/game/asset.js +++ b/game/asset.js @@ -972,6 +972,8 @@ window.noname_asset_list=[ 'image/mode/stone/career/shaman.png', 'image/mode/stone/career/warlock.png', 'image/mode/stone/career/warrior.png', + 'image/mode/boss/character/boss_baihu.jpg', + 'image/mode/boss/character/boss_baimangshilian.jpg', 'image/mode/boss/character/boss_baiwuchang.jpg', 'image/mode/boss/character/boss_caiwenji.jpg', 'image/mode/boss/character/boss_caocao.jpg', @@ -985,6 +987,7 @@ window.noname_asset_list=[ 'image/mode/boss/character/boss_huatuo.jpg', 'image/mode/boss/character/boss_hundun.jpg', 'image/mode/boss/character/boss_huoshenzhurong.jpg', + 'image/mode/boss/character/boss_jinshenrushou.jpg', 'image/mode/boss/character/boss_liang.jpg', 'image/mode/boss/character/boss_liubei.jpg', 'image/mode/boss/character/boss_luocha.jpg', @@ -993,6 +996,7 @@ window.noname_asset_list=[ 'image/mode/boss/character/boss_lvbu2.jpg', 'image/mode/boss/character/boss_lvbu3.jpg', 'image/mode/boss/character/boss_mamian.jpg', + 'image/mode/boss/character/boss_mingxingzhu.jpg', 'image/mode/boss/character/boss_mo.jpg', 'image/mode/boss/character/boss_mushengoumang.jpg', 'image/mode/boss/character/boss_nianshou.jpg', @@ -1007,13 +1011,18 @@ window.noname_asset_list=[ 'image/mode/boss/character/boss_qingmushilian.jpg', 'image/mode/boss/character/boss_qiongqi.jpg', 'image/mode/boss/character/boss_satan.jpg', + 'image/mode/boss/character/boss_shaohao.jpg', 'image/mode/boss/character/boss_shuijing.jpg', + 'image/mode/boss/character/boss_shuishengonggong.jpg', + 'image/mode/boss/character/boss_shuishenxuanming.jpg', 'image/mode/boss/character/boss_shujing.jpg', 'image/mode/boss/character/boss_sunshangxiang.jpg', 'image/mode/boss/character/boss_taihao.jpg', 'image/mode/boss/character/boss_taotie.jpg', 'image/mode/boss/character/boss_taowu.jpg', 'image/mode/boss/character/boss_wang.jpg', + 'image/mode/boss/character/boss_xuanlinshilian.jpg', + 'image/mode/boss/character/boss_xuanwu.jpg', 'image/mode/boss/character/boss_yandi.jpg', 'image/mode/boss/character/boss_yanling.jpg', 'image/mode/boss/character/boss_yecha.jpg', @@ -1023,6 +1032,7 @@ window.noname_asset_list=[ 'image/mode/boss/character/boss_zhaoyun.jpg', 'image/mode/boss/character/boss_zhenji.jpg', 'image/mode/boss/character/boss_zhouyu.jpg', + 'image/mode/boss/character/boss_zhuanxu.jpg', 'image/mode/boss/character/boss_zhugeliang.jpg', 'image/mode/boss/character/boss_zhuoguiquxie.jpg', 'image/mode/boss/character/boss_zhuque.jpg', diff --git a/game/update.js b/game/update.js index 0c0307dd4..33d15e55c 100644 --- a/game/update.js +++ b/game/update.js @@ -1,8 +1,8 @@ window.noname_update={ - version:'1.9.39.1', + version:'1.9.40', // update:'1.9.38.1', changeLog:[ - '原7武将、新张宝', + '蔡邕、嵇康、新张宝', // '诸侯伐董、神之试炼', // '武将称号', 'bug修复' diff --git a/image/mode/boss/character/boss_baihu.jpg b/image/mode/boss/character/boss_baihu.jpg new file mode 100644 index 000000000..6a331041f Binary files /dev/null and b/image/mode/boss/character/boss_baihu.jpg differ diff --git a/image/mode/boss/character/boss_baimangshilian.jpg b/image/mode/boss/character/boss_baimangshilian.jpg new file mode 100644 index 000000000..0587ca09a Binary files /dev/null and b/image/mode/boss/character/boss_baimangshilian.jpg differ diff --git a/image/mode/boss/character/boss_jinshenrushou.jpg b/image/mode/boss/character/boss_jinshenrushou.jpg new file mode 100644 index 000000000..3a6d74b7d Binary files /dev/null and b/image/mode/boss/character/boss_jinshenrushou.jpg differ diff --git a/image/mode/boss/character/boss_mingxingzhu.jpg b/image/mode/boss/character/boss_mingxingzhu.jpg new file mode 100644 index 000000000..b27bbc7d2 Binary files /dev/null and b/image/mode/boss/character/boss_mingxingzhu.jpg differ diff --git a/image/mode/boss/character/boss_shaohao.jpg b/image/mode/boss/character/boss_shaohao.jpg new file mode 100644 index 000000000..0587ca09a Binary files /dev/null and b/image/mode/boss/character/boss_shaohao.jpg differ diff --git a/image/mode/boss/character/boss_shuishengonggong.jpg b/image/mode/boss/character/boss_shuishengonggong.jpg new file mode 100644 index 000000000..09f55ecef Binary files /dev/null and b/image/mode/boss/character/boss_shuishengonggong.jpg differ diff --git a/image/mode/boss/character/boss_shuishenxuanming.jpg b/image/mode/boss/character/boss_shuishenxuanming.jpg new file mode 100644 index 000000000..9c3970dac Binary files /dev/null and b/image/mode/boss/character/boss_shuishenxuanming.jpg differ diff --git a/image/mode/boss/character/boss_xuanlinshilian.jpg b/image/mode/boss/character/boss_xuanlinshilian.jpg new file mode 100644 index 000000000..b6321b52f Binary files /dev/null and b/image/mode/boss/character/boss_xuanlinshilian.jpg differ diff --git a/image/mode/boss/character/boss_xuanwu.jpg b/image/mode/boss/character/boss_xuanwu.jpg new file mode 100644 index 000000000..77adfe08f Binary files /dev/null and b/image/mode/boss/character/boss_xuanwu.jpg differ diff --git a/image/mode/boss/character/boss_zhuanxu.jpg b/image/mode/boss/character/boss_zhuanxu.jpg new file mode 100644 index 000000000..b6321b52f Binary files /dev/null and b/image/mode/boss/character/boss_zhuanxu.jpg differ diff --git a/mode/boss.js b/mode/boss.js index 385198e30..3cb22c7af 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -727,6 +727,12 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ boss_shujing:['female','shen',2,['boss_cuidu'],['wu','hiddenboss','bossallowed']], boss_taihao:['male','shen',6,['boss_shenyi','boss_shenen','boss_qingyi'],['wu','hiddenboss','bossallowed']], + boss_baimangshilian:['male','',0,['boss_baimang','boss_baimang_intro1','boss_baimang_intro2','boss_baimang_intro3'],['boss'],'qun'], + boss_baihu:['male','shen',4,['boss_shenyi','boss_kuangxiao','boss_baimang2'],['qun','hiddenboss','bossallowed']], + boss_jinshenrushou:['male','shen',5,['boss_shenyi','boss_xingqiu','boss_baimang3'],['qun','hiddenboss','bossallowed']], + 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_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'], boss_nianshou_jingjue:['male','shen',12,['boss_nianrui','boss_mengtai','boss_jingjue','boss_nbianshen'],['shu','hiddenboss','bossallowed'],'shu'], @@ -1402,25 +1408,19 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, init:function(){ - _status.additionalReward=function(){ - return 500; - } - lib.inpile.remove('shandian'); - lib.inpile.remove('huoshan'); - lib.inpile.remove('hongshui'); - lib.inpile.remove('fulei'); - lib.inpile.add('honghuangzhili'); - for(var i=0;i0; + }, + logTarget:function(event,player){ + return lib.skill.boss_jiazu.getTargets(player); + }, + content:function(){ + 'step 0' + event.list=lib.skill.boss_jiazu.getTargets(player).sortBySeat(); + 'step 1' + if(event.list.length){ + var target=event.list.shift(); + var cards=target.getCards('e',function(card){ + var subtype=get.subtype(card); + return subtype=='equip3'||subtype=='equip4'; + }); + if(cards.length){ + target.discard(cards); + } + event.redo(); + } + } + }, + boss_jiding:{ + trigger:{global:'damageEnd'}, + forced:true, + mark:true, + intro:{ + content:'info' + }, + filter:function(event,player){ + return event.player!=player&&event.player.isFriendOf(player)&& + event.source&&event.source.isIn()&&event.source.isEnemyOf(player); + }, + logTarget:'source', + content:function(){ + 'step 0' + player.useCard({name:'sha',nature:'thunder'},trigger.source); + 'step 1' + player.removeSkill('boss_jiding'); + }, + group:'boss_jiding_recover', + subSkill:{ + recover:{ + trigger:{source:'damageEnd'}, + silent:true, + filter:function(event,player){ + return event.getParent(3).name=='boss_jiding'; + }, + content:function(){ + 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