diff --git a/card/extra.js b/card/extra.js index e38029dc5..076e944b0 100644 --- a/card/extra.js +++ b/card/extra.js @@ -511,7 +511,7 @@ card.extra={ }, translate:{ jiu:'酒', - jiu_info:'出牌阶段,对自己使用,令自己的下一张使用的【杀】造成的伤害+1(每回合限使用1次); 濒死阶段,对自己使用,回复1点体力', + jiu_info:'出牌阶段,对自己使用,令自己的下一张使用的【杀】造成的伤害+1(每回合限使用1次);濒死阶段,对自己使用,回复1点体力', huogong:'火攻', tiesuo:'铁锁连环', tiesuo_info:'出牌阶段使用,选择1至2个角色,分别横置或重置这些角色', diff --git a/card/hearth.js b/card/hearth.js index 4a0ca0546..d14c33325 100644 --- a/card/hearth.js +++ b/card/hearth.js @@ -668,8 +668,8 @@ card.hearth={ jihuocard_info:'跳过本回合的弃牌阶段,摸一张牌', }, list:[ - ['heart',2,'shenenshu'], - ['diamond',12,'shenenshu'], + // ['heart',2,'shenenshu'], + // ['diamond',12,'shenenshu'], ['club',7,'zhiliaobo'], ['spade',1,'zhiliaobo'], ['spade',13,'yuansuhuimie'], diff --git a/card/swd.js b/card/swd.js index 6e3081348..afe1c20ff 100644 --- a/card/swd.js +++ b/card/swd.js @@ -44,7 +44,9 @@ card.swd={ } }, zhiluxiaohu:{ - enable:true, + enable:function(card,player){ + return lib.filter.filterCard({name:'sha'},player); + }, fullskin:true, type:'jiguan', wuxieable:true, @@ -102,7 +104,7 @@ card.swd={ return !target.hasSkill('gouhunluo'); }, content:function(){ - target.storage.gouhunluo=Math.max(1,target.hp); + target.storage.gouhunluo=3; target.storage.gouhunluo2=player; target.addSkill('gouhunluo'); }, @@ -1471,6 +1473,17 @@ card.swd={ type:'equip', subtype:'equip5', skills:['yiluan'], + ai:{ + basic:{ + equipValue:7 + } + }, + }, + shuchui:{ + fullskin:true, + type:'equip', + subtype:'equip5', + skills:['shuchui'], ai:{ basic:{ equipValue:5.5 @@ -1501,6 +1514,57 @@ card.swd={ }, }, skill:{ + shuchui:{ + enable:'phaseUse', + usable:1, + filterTarget:function(card,player,target){ + return player.canUse('sha',target); + }, + filter:function(event,player){ + return player.num('h','sha')>0; + }, + content:function(){ + 'step 0' + player.addSkill('shuchui2'); + event.num=0; + 'step 1' + var card=player.get('h','sha')[0]; + if(card){ + player.useCard(card,target); + } + else{ + player.removeSkill('shuchui2'); + event.finish(); + } + 'step 2' + event.num++; + if(event.num<4&&target.isAlive()){ + event.goto(1); + } + else{ + player.removeSkill('shuchui2'); + } + }, + ai:{ + order:3.11, + result:{ + target:function(player,target){ + return ai.get.effect(target,{name:'sha'},player,target); + } + } + } + }, + shuchui2:{ + trigger:{source:'damageEnd'}, + forced:true, + popup:false, + filter:function(event,player){ + return event.card&&event.card.name=='sha'; + }, + content:function(){ + player.draw(); + } + }, xuejibingbao:{ trigger:{player:'phaseDrawBegin'}, forced:true, @@ -1528,7 +1592,7 @@ card.swd={ if(storage==1){ '在'+get.translation(player.storage.gouhunluo2)+'的下个回合开始时失去两点体力' } - return '在'+get.translation(player.storage.gouhunluo2)+'的第'+storage+'个回合开始时失去两点体力' + return '在'+storage+'轮后'+get.translation(player.storage.gouhunluo2)+'的回合开始时失去两点体力' } }, nopop:true, @@ -3827,12 +3891,14 @@ card.swd={ jiguan:0.45 }, translate:{ + shuchui:'鼠槌', + shuchui_info:'出牌阶段限一次,你可以指定一名攻击范围内的角色,依次将手牌中的所有杀对该角色使用,杀每造成一次伤害你摸一张牌(最多使用4张杀)', zhiluxiaohu:'指路小狐', zhiluxiaohu_info:'出牌阶段对自己使用,视为对一名随机敌方角色使用一张杀,然后摸一张牌', xuejibingbao:'雪肌冰鲍', xuejibingbao_info:'出牌阶段对一名角色使用,该角色摸牌阶段摸牌数+1,持续2个回合', gouhunluo:'勾魂锣', - gouhunluo_info:'出牌阶段对一名角色使用,在你的第X个回合开始时令该角色失去2点体力,若你死亡则失效(X为该角色的当前体力值且至少为1)', + gouhunluo_info:'出牌阶段对一名角色使用,在3轮后你的回合开始时令该角色失去2点体力,若你死亡则失效', jiguan:'机关', jiqi:'祭器', qinglongzhigui:'青龙之圭', @@ -3995,7 +4061,7 @@ card.swd={ guiyanfadao_info:'每当你使用杀命中目标,你可以防止伤害,改为令目标失去一点体力', tianxianjiu:'天仙酒', tianxianjiu_bg:'仙', - tianxianjiu_info:'出牌阶段对自己使用,你使用的下一张杀造成伤害后可以摸两张牌', + tianxianjiu_info:'出牌阶段对自己使用,你使用的下一张杀造成伤害后可以摸两张牌;濒死阶段,对自己使用,回复1点体力', xiangyuye:'翔羽叶', xiangyuye_info:'出牌阶段,对一名攻击范围外的角色使用,令其弃置一张黑色手牌或流失一点体力', huanpodan:'还魄丹', @@ -4225,5 +4291,7 @@ card.swd={ ['club',7,'mujiaren'], ['heart',6,'mujiaren'], ['diamond',11,'mujiaren'], + + ['club',6,'shuchui'], ], } diff --git a/game/asset.js b/game/asset.js index dd8a5978c..6ed5467c8 100644 --- a/game/asset.js +++ b/game/asset.js @@ -127,6 +127,7 @@ window.noname_asset_list=[ 'image/card/shentoumianju.png', 'image/card/shihuawuqi.png', 'image/card/shijieshu.png', + 'image/card/shuchui.png', 'image/card/shuiyanqijun.png', 'image/card/shuiyanqijunx.png', 'image/card/shunshou.png', diff --git a/image/card/shuchui.png b/image/card/shuchui.png new file mode 100644 index 000000000..d81e3eb31 Binary files /dev/null and b/image/card/shuchui.png differ diff --git a/image/card/tianxianjiu.png b/image/card/tianxianjiu.png old mode 100755 new mode 100644 index e9ed0751c..7fad6c7d8 Binary files a/image/card/tianxianjiu.png and b/image/card/tianxianjiu.png differ diff --git a/image/card/xianglu.png b/image/card/xianglu.png new file mode 100755 index 000000000..e9ed0751c Binary files /dev/null and b/image/card/xianglu.png differ