diff --git a/character/shiji.js b/character/shiji.js index 4ea096396..a4024ff04 100644 --- a/character/shiji.js +++ b/character/shiji.js @@ -2229,8 +2229,15 @@ game.import('character',function(lib,game,ui,get,ai,_status){ selectCard:-1, log:false, precontent:function(){ + 'step 0' player.logSkill('dbzhuifeng'); player.loseHp(); + event.forceDie=true; + 'step 1' + //特殊处理 + if(player.isDead()){ + player.useResult(event.result,event.getParent()) + } }, ai:{ order:function(){ diff --git a/character/xianding.js b/character/xianding.js index df5ea5b05..b278244a1 100644 --- a/character/xianding.js +++ b/character/xianding.js @@ -308,7 +308,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ } 'step 1' if(get.owner(card)==player&&get.position(card)=='h'&&game.hasPlayer(current=>current!=player)){ - player.chooseTarget(`赏誉:将${get.translation(card)}交给一名角色`,lib.filter.notMe,true); + player.chooseTarget(`是否将${get.translation(card)}交给一名其他角色?`,lib.filter.notMe); } else event.finish(); 'step 2' @@ -316,8 +316,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var target=result.targets[0]; player.line(target); player.give(card,target).gaintag.add('dcshangyu_tag'); - player.addSkill('dcshangyu_effect'); } + player.addSkill('dcshangyu_effect'); }, subSkill:{ effect:{ @@ -12656,7 +12656,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ dc_xujing:'许靖', dcshangyu:'赏誉', dcshangyu_tag:'赏誉', - dcshangyu_info:'锁定技。游戏开始时,你获得一张【杀】并记录之,然后将此牌交给一名角色,你获得如下效果:1.当一名角色使用此牌造成伤害后,你与其各摸一张牌;2.当此牌进入弃牌堆后,你将此牌交给一名本回合未以此法得到过此牌的角色。', + dcshangyu_info:'锁定技。游戏开始时,你获得一张【杀】并记录之,并可以将此牌交给一名角色。然后你获得如下效果:1.当一名角色使用此牌造成伤害后,你与其各摸一张牌;2.当此牌进入弃牌堆后,你将此牌交给一名本回合未以此法得到过此牌的角色。', dccaixia:'才瑕', dccaixia_info:'当你造成或受到伤害后,若你没有“瑕”,你可以摸至多X张牌并获得X枚“瑕”,然后当你使用牌时,移去1枚“瑕”(X为场上角色数且至多为5)。', wu_luxun:'武陆逊', diff --git a/game/game.js b/game/game.js index a96b2ef3d..76771a5e4 100644 --- a/game/game.js +++ b/game/game.js @@ -47840,7 +47840,7 @@ var nodeturnover=ui.create.div('.menubutton','翻面',row1,clickrow1); var noderevive=ui.create.div('.menubutton','复活',row1,clickrow1); var nodereplace=ui.create.div('.menubutton','换人',row1,clickrow1); - if(lib.config.mode!='identity'&&lib.config.mode!='guozhan'&&lib.config.mode!='doudizhu'){ + if(!game.canReplaceViewpoint||!game.canReplaceViewpoint()){ nodereplace.classList.add('unselectable'); } diff --git a/mode/doudizhu.js b/mode/doudizhu.js index 5a74cb418..9a8a6c125 100644 --- a/mode/doudizhu.js +++ b/mode/doudizhu.js @@ -154,6 +154,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ game.zhu.showGiveup(); }, game:{ + canReplaceViewpoint:()=>true, recommendDizhu:[ 're_guojia','re_huanggai','re_lvbu','re_guanyu','re_sunquan','re_xusheng','re_wuyi','re_sunben', 'xuyou','zhangchunhua','caochong','zhangsong','zhongyao','wangyi', diff --git a/mode/guozhan.js b/mode/guozhan.js index c8e341396..8a177350f 100644 --- a/mode/guozhan.js +++ b/mode/guozhan.js @@ -13259,6 +13259,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ }, }, game:{ + canReplaceViewpoint:()=>true, showYexings:function(){ if(_status.showYexings) return; _status.showYexings=true; diff --git a/mode/identity.js b/mode/identity.js index 960178783..30d72fcac 100644 --- a/mode/identity.js +++ b/mode/identity.js @@ -304,6 +304,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ game.phaseLoop(_status.firstAct2||game.zhong||game.zhu||_status.firstAct||game.me); }, game:{ + canReplaceViewpoint:()=>true, getState:function(){ var state={}; for(var i in lib.playerOL){ diff --git a/mode/single.js b/mode/single.js index 825e82f79..7d37dff5e 100644 --- a/mode/single.js +++ b/mode/single.js @@ -250,6 +250,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){ game.phaseLoop(game.zhu); }, game:{ + canReplaceViewpoint:()=>true, addRecord:function(bool){ if(typeof bool=='boolean'){ var mode=_status.mode;