diff --git a/card/swd.js b/card/swd.js index e81dbf926..87c210354 100644 --- a/card/swd.js +++ b/card/swd.js @@ -3,55 +3,55 @@ game.import('card',function(lib,game,ui,get,ai,_status){ return { name:'swd', card:{ - yihuajiemu:{ - fullskin:true, - type:'trick', - enable:true, - singleCard:true, - filterTarget:function(card,player,target){ - if(target.isMin()) return false; - if(ui.selected.targets.length){ - return target.getCards('e',{subtype:'equip5'}).length==0; - } - else{ - return target.getCards('e',{subtype:'equip5'}).length>0; - } - }, - selectTarget:2, - multitarget:true, - complexTarget:true, - multicheck:function(){ - return game.hasPlayer(function(current){ - return current.getEquip(5); - })&&game.hasPlayer(function(current){ - return !current.getEquip(5); - }); - }, - content:function(){ - if(target.getEquip(5)){ - target.$give(target.getEquip(5),event.addedTarget); - event.addedTarget.equip(target.getEquip(5)); - game.delay(); - } - }, - ai:{ - order:1, - result:{ - target:function(player,target){ - if(target.getCards('e',{subtype:'equip5'}).length){ - if(get.attitude(target,player)>0){ - return -0.5; - } - return -1; - } - return 1; - } - }, - tag:{ - loseCard:1 - } - } - }, + // yihuajiemu:{ + // fullskin:true, + // type:'trick', + // enable:true, + // singleCard:true, + // filterTarget:function(card,player,target){ + // if(target.isMin()) return false; + // if(ui.selected.targets.length){ + // return target.getCards('e',{subtype:'equip5'}).length==0; + // } + // else{ + // return target.getCards('e',{subtype:'equip5'}).length>0; + // } + // }, + // selectTarget:2, + // multitarget:true, + // complexTarget:true, + // multicheck:function(){ + // return game.hasPlayer(function(current){ + // return current.getEquip(5); + // })&&game.hasPlayer(function(current){ + // return !current.getEquip(5); + // }); + // }, + // content:function(){ + // if(target.getEquip(5)){ + // target.$give(target.getEquip(5),event.addedTarget); + // event.addedTarget.equip(target.getEquip(5)); + // game.delay(); + // } + // }, + // ai:{ + // order:1, + // result:{ + // target:function(player,target){ + // if(target.getCards('e',{subtype:'equip5'}).length){ + // if(get.attitude(target,player)>0){ + // return -0.5; + // } + // return -1; + // } + // return 1; + // } + // }, + // tag:{ + // loseCard:1 + // } + // } + // }, liuxinghuoyu:{ fullskin:true, type:'trick', @@ -4780,8 +4780,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){ '护甲:和体力类似,每点护甲可抵挡一点伤害,但不影响手牌上限' }, translate:{ - yihuajiemu:'移花接木', - yihuajiemu_info:'对一名装备区内有宝物的角色使用,将其宝物牌转移至另一名角色', + // yihuajiemu:'移花接木', + // yihuajiemu_info:'对一名装备区内有宝物的角色使用,将其宝物牌转移至另一名角色', liuxinghuoyu:'流星火羽', liuxinghuoyu_info:'出牌阶段,对一名角色使用,令目标弃置2张牌,或受到一点火焰伤害', g_yuchan_equip:'玉蝉', @@ -5153,9 +5153,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){ lianyaohu_info:'出牌阶段各限一次,你可以选择一项:1.弃置一张手牌,并将一名其他角色的一张手牌置入炼妖壶;2.弃置两张炼妖壶中的牌,从牌堆中获得一张与弃置的牌类别均不相同的牌', }, list:[ - ['heart',3,'yihuajiemu'], - ['diamond',1,'yihuajiemu'], - ['diamond',7,'yihuajiemu'], + // ['heart',3,'yihuajiemu'], + // ['diamond',1,'yihuajiemu'], + // ['diamond',7,'yihuajiemu'], ['diamond',3,'liuxinghuoyu','fire'], ['heart',6,'liuxinghuoyu','fire'], diff --git a/game/asset.js b/game/asset.js index 2d0101026..e44d35cff 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1018,8 +1018,10 @@ window.noname_asset_list=[ 'image/mode/boss/card/honghuangzhili.png', 'image/mode/boss/card/juechenjinge.jpg', 'image/mode/boss/card/qimenbagua.jpg', + 'image/mode/boss/card/sadouchengbing.png', 'image/mode/boss/card/xiuluolianyuji.jpg', 'image/mode/boss/card/xuwangzhimian.jpg', + 'image/mode/boss/card/yihuajiemu.png', 'image/mode/chess/difficulty/leader_easy.jpg', 'image/mode/chess/difficulty/leader_hard.jpg', 'image/mode/chess/difficulty/leader_medium.jpg', diff --git a/image/mode/boss/card/sadouchengbing.png b/image/mode/boss/card/sadouchengbing.png new file mode 100644 index 000000000..e46df8cad Binary files /dev/null and b/image/mode/boss/card/sadouchengbing.png differ diff --git a/image/mode/boss/card/yihuajiemu.png b/image/mode/boss/card/yihuajiemu.png new file mode 100644 index 000000000..599ed4e54 Binary files /dev/null and b/image/mode/boss/card/yihuajiemu.png differ diff --git a/mode/boss.js b/mode/boss.js index 4e632206c..3b852ecfa 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -471,6 +471,98 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, card:{ + sadouchengbing:{ + type:'trick', + fullskin:true, + modeimage:'boss', + enable:true, + }, + yihuajiemu:{ + type:'trick', + fullskin:true, + modeimage:'boss', + enable:true, + }, + guilongzhanyueado:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + guofengyupao:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + qimenbagua:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + chixueqingfeng:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + chiyanzhenhunqin:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + juechenjinge:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + xiuluolianyuji:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, + xuwangzhimian:{ + type:'equip', + fullimage:true, + subtype:'equip1', + distance:{attackFrom:-2}, + skills:[], + ai:{ + equipValue:8 + } + }, honghuangzhili:{ type:'trick', enable:true, @@ -577,7 +669,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, cardPack:{ - mode_boss:['honghuangzhili'] + mode_boss:['honghuangzhili','guilongzhanyueado','guofengyupao','chiyanzhenhunqin','qimenbagua','xuwangzhimian','juechenjinge','xiuluolianyuji','chixueqingfeng'] }, init:function(){ for(var i in lib.characterPack.mode_boss){ @@ -1022,20 +1114,18 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ } }, init:function(){ - // for(var i=0;i