diff --git a/card/extra.js b/card/extra.js index 076e944b0..312c53007 100644 --- a/card/extra.js +++ b/card/extra.js @@ -18,7 +18,7 @@ card.extra={ return target==player; }, content:function(){ - if(target==_status.event.getParent(2).dying){ + if(target==_status.event.getParent(2).dying||target==_status.dying){ target.recover(); if(_status.currentPhase==target){ target.getStat().card.jiu--; diff --git a/card/swd.js b/card/swd.js index 1a9eed820..35855093b 100644 --- a/card/swd.js +++ b/card/swd.js @@ -1131,7 +1131,7 @@ card.swd={ }, content:function(){ "step 0" - if(target==_status.event.getParent(2).dying) target.recover(); + if(target==_status.event.getParent(2).dying||target==_status.dying) target.recover(); else{ target.addTempSkill('tianxianjiu',['phaseAfter','shaAfter']); if(target==targets[0]&&card.clone&&(card.clone.parentNode==player.parentNode||card.clone.parentNode==ui.arena)){ diff --git a/character/sp.js b/character/sp.js index 80503bae6..0b36a1fab 100644 --- a/character/sp.js +++ b/character/sp.js @@ -288,7 +288,10 @@ character.sp={ intro:{ content:'cards' }, - group:'tuifeng2' + group:'tuifeng2', + ai:{ + threaten:0.8 + } }, tuifeng2:{ trigger:{player:'phaseBegin'}, diff --git a/character/yijiang.js b/character/yijiang.js index 537d525e3..4220ab926 100644 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -5714,6 +5714,9 @@ character.yijiang={ return true; }, content:function(){ + if(_status.event.getParent(2).type=='dying'){ + event.dying=player; + } player.turnOver(); player.useCard({name:'jiu'},player); }, diff --git a/game/game.js b/game/game.js index d5fd345bf..8d39b851b 100644 --- a/game/game.js +++ b/game/game.js @@ -2696,6 +2696,11 @@ name:'末位可换牌', init:true, frequent:true, + }, + replace_character_two:{ + name:'替补模式', + init:false, + frequent:true, }, ban_weak:{ name:'屏蔽弱将', @@ -14259,6 +14264,7 @@ event.finish(); return; } + _status.dying=event.dying; event.acted.push(player); // else if(trigger.source&&trigger.source.isDead()){ // trigger.start=game.findNext(trigger.source); diff --git a/game/update.js b/game/update.js index 74d5f3447..955d4f03e 100644 --- a/game/update.js +++ b/game/update.js @@ -1,15 +1,18 @@ window.noname_update={ - version:'1.9.1', + version:'1.9.1.1', changeLog:[ 'bug修复', - '增加牌堆补充扩展', - '塔防模式调整', - '新武将' ], files:{ global:[ - + 'game/game.js', + 'game/asset.js', + 'mode/versus.js', + 'character/yijiang.js', + 'character/sp.js', + 'card/swd.js', + 'card/extra.js', ], - // '1.9.1':[] + '1.9.1':[] } } diff --git a/mode/versus.js b/mode/versus.js index 4257b998f..3f970a387 100644 --- a/mode/versus.js +++ b/mode/versus.js @@ -694,7 +694,14 @@ mode.versus={ characterChoice=list.randomGets(7); } var dialog=ui.create.dialog('选择角色',[characterChoice,'character']); - game.me.chooseButton(true,dialog); + if(get.config('replace_character_two')){ + game.me.chooseButton(true,dialog,2); + _status.replacetwo=true; + game.additionaldead=[]; + } + else{ + game.me.chooseButton(true,dialog); + } if(!_status.brawl||!_status.brawl.noAddSetting){ if(get.config('change_identity')){ addSetting(dialog); @@ -773,6 +780,9 @@ mode.versus={ delete ui.cheat2; } game.me.init(result.links[0]); + if(_status.replacetwo){ + game.me.replacetwo=result.links[1]; + } game.addRecentCharacter(game.me.name); event.list.remove(game.me.name); for(var i=0;i4v4