diff --git a/card/shenqi.js b/card/shenqi.js index 93fdc2235..637cbb356 100755 --- a/card/shenqi.js +++ b/card/shenqi.js @@ -1,6 +1,7 @@ card.shenqi={ card:{ donghuangzhong:{ + fullskin:true, type:'equip', subtype:'equip5', skills:['donghuangzhong'], @@ -13,13 +14,14 @@ card.shenqi={ } }, xuanyuanjian:{ + fullskin:true, type:'equip', subtype:'equip1', skills:['xuanyuanjian','xuanyuanjian2'], enable:function(card,player){ return player.skills.contains('xuanyuan')||player.hp>2; }, - distance:{attackFrom:-Infinity}, + distance:{attackFrom:-3}, onEquip:function(){ //player.loseHp(); if(!player.skills.contains('xuanyuan')&&player.hp<=2){ @@ -56,6 +58,7 @@ card.shenqi={ skills:['lianhua','shouna'] }, haotianta:{ + fullskin:true, type:'equip', subtype:'equip5', skills:['haotianta'], @@ -103,20 +106,21 @@ card.shenqi={ } } }, - // kunlunjing:{ - // type:'equip', - // subtype:'equip5', - // skills:['kunlunjing'], - // onEquip:function(){ - // //if(player==game.me) player.loseHp(); - // }, - // onLose:function(){ - // //if(player==game.me) player.loseHp(); - // }, - // ai:{ - // equipValue:5 - // } - // }, + kunlunjingc:{ + fullskin:true, + type:'equip', + subtype:'equip5', + skills:['kunlunjing'], + onEquip:function(){ + //if(player==game.me) player.loseHp(); + }, + onLose:function(){ + //if(player==game.me) player.loseHp(); + }, + ai:{ + equipValue:5 + } + }, nvwashi:{ fullskin:true, type:'equip', @@ -365,10 +369,11 @@ card.shenqi={ }, haotianta:{ trigger:{global:'judgeBefore'}, + direct:true, content:function(){ "step 0" event.cards=get.cards(9); - player.chooseCardButton(event.cards,'选择一张牌作为判定结果',true).ai=function(button){ + player.chooseCardButton(event.cards,'昊天塔:选择一张牌作为'+get.translation(trigger.player)+'的'+trigger.judgestr+'判定结果').ai=function(button){ if(ai.get.attitude(player,trigger.player)>0){ return trigger.judge(button.link); } @@ -379,6 +384,13 @@ card.shenqi={ "step 1" var card=result.links[0]; event.cards.remove(card); + var judgestr=get.translation(trigger.player)+'的'+trigger.judgestr+'判定'; + event.videoId=lib.status.videoId++; + event.dialog=ui.create.dialog(judgestr); + event.dialog.classList.add('center'); + event.dialog.videoId=event.videoId; + + game.addVideo('judge1',player,[get.cardInfo(card),trigger.judgestr,event.videoId]); for(var i=0;i0){ trigger.result.bool=true; @@ -406,15 +421,12 @@ card.shenqi={ event.finish(); } "step 2" + event.dialog.close(); + game.addVideo('judge2',null,event.videoId); + ui.clear(); var card=trigger.result.card; - if(trigger.position!=ui.discardPile){ - trigger.position.appendChild(card); - trigger.result.node.delete(); - } - else{ - player.gain(card); - player.$gain2(card); - } + trigger.position.appendChild(card); + trigger.result.node.delete(); game.delay(); }, ai:{ @@ -626,8 +638,7 @@ card.shenqi={ fuxiqin:'伏羲琴', shennongding:'神农鼎', kongdongyin:'崆峒印', - //kunlunjing:'昆仑镜', - //kunlunjing1:'昆仑镜', + kunlunjingc:'昆仑镜', nvwashi:'女娲石', donghuangzhong_bg:'钟', lianyaohu_bg:'壶', @@ -635,20 +646,20 @@ card.shenqi={ fuxiqin_bg:'琴', shennongding_bg:'鼎', kongdongyin_bg:'印', - kunlunjing_bg:'镜', + kunlunjingc_bg:'镜', nvwashi_bg:'石', kongxin:'控心', lianhua:'炼化', lianhua_info:'出牌阶段限一次,你可以弃置两张炼妖壶中的牌,从牌堆中获得一张与弃置的牌类别均不相同的牌', shouna:'收纳', shouna_info:'当一名其他角色于回合外弃置的卡牌进入弃牌堆后,你可以选择其中的一张放入炼妖壶,每名角色的回合限一次', - // donghuangzhong_info:'出牌阶段,你可以将一名已死亡角色永久移出游戏,然后回复一点体力,或创建一名与你身份相同的新角色,然后流失X点体力,X为新角色的体力上限', - // xuanyuanjian_info:'锁定技,你使用的杀无视距离,可以额外指定一个目标,每当你造成一次伤害,有50%的机率使伤害加一并变为雷属性。任何时候,若你体力值不超过2,则立即失去轩辕剑', + donghuangzhong_info:'出牌阶段,你可以将一名已死亡角色永久移出游戏,然后回复一点体力,或创建一名与你身份相同的新角色,然后流失X点体力,X为新角色的体力上限', + xuanyuanjian_info:'锁定技,你使用的杀无视距离,可以额外指定一个目标,每当你造成一次伤害,有50%的机率使伤害加一并变为雷属性。任何时候,若你体力值不超过2,则立即失去轩辕剑', pangufu_info:'锁定技,每当你造成一次伤害,受伤角色须弃置一张牌', - // haotianta_info:'任意一名角色进行判定前,你可以亮出牌堆顶的9张牌,并选择一张作为判定结果,此结果不可被更改,也不能触发技能', + haotianta_info:'任意一名角色进行判定前,你可以亮出牌堆顶的9张牌,并选择一张作为判定结果,此结果不可被更改,也不能触发技能', shennongding_info:'出牌阶段,你可以弃置两张手牌,然后回复一点体力。每阶段限一次', kongdongyin_info:'令你抵挡一次死亡,将体力回复至1,并摸一张牌,发动后进入弃牌堆', - //kunlunjing_info:'回合开始前,你可以令场上所有牌还原到你上一回合结束后的位置,然后流失一点体力', + kunlunjingc_info:'回合开始前,你可以令场上所有牌还原到你上一回合结束后的位置,然后流失一点体力', nvwashi_info:'意一名角色濒死时,你可以令其进行一次判定,若结果为红桃,其回复一点体力', kongxin_info:'出牌阶段限一次,你可以与一名其他角色进行拼点,若你赢,你可以指定另一名角色视为对方对该角色使用一张杀,否则对方可弃置你一张牌', fuxiqin_info:'出牌阶段限一次,你可以与一名其他角色进行拼点,若你赢,你可以指定另一名角色视为对方对该角色使用一张杀,否则对方可弃置你一张牌', @@ -657,13 +668,13 @@ card.shenqi={ // fuxiqin_info:'', }, list:[ - // ['diamond',13,'donghuangzhong'], + ['diamond',13,'donghuangzhong'], ['diamond',13,'fuxiqin'], - // ['spade',13,'kunlunjing'], - // ['spade',13,'xuanyuanjian'], + ['spade',13,'kunlunjingc'], + ['spade',13,'xuanyuanjian'], ['spade',13,'pangufu'], ['club',13,'lianyaohu'], - // ['diamond',13,'haotianta'], + ['diamond',13,'haotianta'], ['club',13,'shennongding'], ['heart',13,'nvwashi'], ['heart',13,'kongdongyin'], diff --git a/card/swd.js b/card/swd.js index 20aada54a..66c1d8357 100755 --- a/card/swd.js +++ b/card/swd.js @@ -44,7 +44,7 @@ card.swd={ skills:['fengxueren'], ai:{ basic:{ - equipValue:6 + equipValue:5 }, }, }, @@ -677,24 +677,6 @@ card.swd={ player.recover(); }, }, - // fengxueren:{ - // trigger:{source:'damageEnd'}, - // filter:function(event){ - // return event.card&&event.card.name=='sha'; - // }, - // forced:true, - // content:function(){ - // "step 0" - // trigger.player.turnOver(); - // trigger.player.popup('fengxueren'); - // "step 1" - // trigger.player.draw(); - // "step 2" - // if(player.num('he')){ - // player.chooseToDiscard(true); - // } - // } - // }, fengxueren:{ trigger:{player:'shaHit'}, check:function(event,player){ @@ -718,11 +700,13 @@ card.swd={ }, fengxueren2:{}, chilongya:{ - trigger:{source:'damageBefore'}, + trigger:{source:'damageBegin'}, forced:true, - priority:5, + filter:function(event){ + return event.nature=='fire'; + }, content:function(){ - trigger.nature='fire'; + trigger.num++; } }, chilongya2:{ diff --git a/game/asset.js b/game/asset.js index fb06a94b1..485a9438d 100644 --- a/game/asset.js +++ b/game/asset.js @@ -22,6 +22,7 @@ window.noname_asset_list=[ 'image/card/cixiong.png', 'image/card/dawan.png', 'image/card/dilu.png', + 'image/card/donghuangzhong.png', 'image/card/dujian.png', 'image/card/dujian1.png', 'image/card/dujian2.png', @@ -36,6 +37,7 @@ window.noname_asset_list=[ 'image/card/guiyoujie.png', 'image/card/guohe.png', 'image/card/hanbing.png', + 'image/card/haotianta.png', 'image/card/hongshui.png', 'image/card/hsbaowu_cangbaotu.jpg', 'image/card/hsbaowu_huangjinyuanhou.jpg', @@ -74,6 +76,7 @@ window.noname_asset_list=[ 'image/card/juedou.png', 'image/card/jueying.png', 'image/card/kongdongyin.png', + 'image/card/kunlunjingc.png', 'image/card/langeguaiyi.png', 'image/card/lebu.png', 'image/card/lianyaohu.png', @@ -256,6 +259,7 @@ window.noname_asset_list=[ 'image/card/xingjiegoutong.png', 'image/card/xingjunyan.png', 'image/card/xixueguizhihuan.png', + 'image/card/xuanyuanjian.png', 'image/card/yihuajiemu.png', 'image/card/yiyi.png', 'image/card/yuanjiao.png', diff --git a/game/game.js b/game/game.js index 4287d2a7c..cdc9ce1ef 100755 --- a/game/game.js +++ b/game/game.js @@ -25628,7 +25628,7 @@ if(_status.paused2) return; if(_status.nopause) return; if(ui.pause.classList.contains('hidden')) return; - if(!_status.gameStarted) return; + if(!_status.gameStarted&&!_status.video) return; ui.system.hide(); game.pause2(); var node=ui.create.pause().animate('start'); diff --git a/image/card/chilongya.png b/image/card/chilongya.png index b4dc9f424..6e200b7b4 100644 Binary files a/image/card/chilongya.png and b/image/card/chilongya.png differ diff --git a/image/card/donghuangzhong.png b/image/card/donghuangzhong.png new file mode 100644 index 000000000..d26975910 Binary files /dev/null and b/image/card/donghuangzhong.png differ diff --git a/image/card/fengxueren.png b/image/card/fengxueren.png index 415e2930f..c0e1fb594 100644 Binary files a/image/card/fengxueren.png and b/image/card/fengxueren.png differ diff --git a/image/card/haotianta.png b/image/card/haotianta.png new file mode 100644 index 000000000..bd842abe5 Binary files /dev/null and b/image/card/haotianta.png differ diff --git a/image/card/kunlunjingc.png b/image/card/kunlunjingc.png new file mode 100644 index 000000000..69b613aee Binary files /dev/null and b/image/card/kunlunjingc.png differ diff --git a/image/card/xuanyuanjian.png b/image/card/xuanyuanjian.png new file mode 100644 index 000000000..5f3e4a0d9 Binary files /dev/null and b/image/card/xuanyuanjian.png differ