diff --git a/character/ow.js b/character/ow.js index 080d26353..c011799f7 100644 --- a/character/ow.js +++ b/character/ow.js @@ -3081,7 +3081,7 @@ character.ow={ shanxian:'闪现', shanxian_info:'在一名其他角色的回合开始前，若你的武将牌正面朝上，你可以摸一张牌并进行一个额外回合，并在回合结束后将武将牌翻至背面。若如此做，你对其使用卡牌无视距离直到回合结束。', shanhui:'闪回', - shanhui_info:'每当你造成或受到一次伤害，你可以将你的牌重置为上次发动闪现时的状态，若你的牌数因此而减少，你回复一点体力', + shanhui_info:'当你造成或受到伤害后，你可以将你的牌重置为上次发动闪现时的状态，若你的牌数因此而减少，你回复一点体力', ow_liekong:'猎空', ow_sishen:'死神', ow_tianshi:'天使', diff --git a/extension/boss/extension.js b/extension/boss/extension.js index 0fef4c1f7..211c671ad 100644 --- a/extension/boss/extension.js +++ b/extension/boss/extension.js @@ -172,7 +172,7 @@ play.boss={ lib.translate[i]=lib.translate[i]||mode.versus.translate[i]; } for(var i in mode.versus.skill){ - if(i!='versus_swap'&&i!='versus_ladder'){ + if(i!='versus_ladder'){ lib.skill[i]=lib.init.eval(mode.versus.skill[i]); game.finishSkill(i); } @@ -188,10 +188,8 @@ play.boss={ lib.translate[i]=lib.translate[i]||mode.boss.translate[i]; } for(var i in mode.boss.skill){ - if(i!='_bossswap'){ - lib.skill[i]=lib.init.eval(mode.boss.skill[i]); - game.finishSkill(i); - } + lib.skill[i]=lib.init.eval(mode.boss.skill[i]); + game.finishSkill(i); } delete window.mode; loadversus(); diff --git a/game/game.js b/game/game.js index 632acf16c..5ba4c1014 100644 --- a/game/game.js +++ b/game/game.js @@ -133,7 +133,7 @@ init:true, }, tao_enemy:{ - name:'不对敌将使用桃', + name:'不对敌方使用桃', init:false, }, touchscreen:{ @@ -6754,41 +6754,18 @@ } else if(event.isMine()){ if(event.type=='wuxie'){ - if(ui.wuxie&&ui.wuxie.classList.contains('glow')){ - event.result={ + if(ui.tempnowuxie){ + var triggerevent=event.getTrigger(); + if(triggerevent.targets&&triggerevent.num==triggerevent.targets.length-1){ + ui.tempnowuxie.close(); + } + } + if(lib.filter.wuxieSwap(event)){ + event.result={ bool:false } return; - } - if(ui.tempnowuxie&&ui.tempnowuxie.classList.contains('glow')&&event.state>0){ - var triggerevent=event.getTrigger(); - if(triggerevent){ - if(ui.tempnowuxie._origin==triggerevent.parent.id){ - event.result={ - bool:false - } - if(triggerevent.targets&&triggerevent.num==triggerevent.targets.length-1){ - ui.tempnowuxie.close(); - } - return; - } - } - else if(ui.tempnowuxie._origin==_status.event.id2){ - event.result={ - bool:false - } - return; - } - } - if(!_status.connectMode&&lib.config.wuxie_self&&event.getParent().state){ - var tw=event.getTrigger().parent; - if(tw.player.isUnderControl(true)&&tw.targets&&tw.targets.length==1&&!tw.noai){ - event.result={ - bool:false - } - return; - } - } + } } var ok=game.check(); if(!ok||!lib.config.auto_confirm){ @@ -12844,8 +12821,7 @@ if(lib.config.mode=='versus'){ if(_status.mode=='three') return this.side==me.side; if(_status.mode=='four'||_status.mode=='jiange'||_status.mode=='one') return false; - return ui.autoreplace&&ui.autoreplace.classList.contains('on')&& - this.side==me.side; + return lib.storage.single_control&&this.side==me.side; } else if(lib.config.mode=='boss'){ return this.side==me.side&&get.config('single_control'); @@ -15620,6 +15596,23 @@ others:{}, zhu:{}, zhuSkill:{}, + autoswap:{ + trigger:{player:['phaseBegin','chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin', + 'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin', + 'chooseBoolBegin','choosePlayerCardBegin','discardPlayerCardBegin','gainPlayerCardBegin']}, + forced:true, + priority:100, + popup:false, + filter:function(event,player){ + if(event.autochoose&&event.autochoose()) return false; + if(lib.filter.wuxieSwap(event)) return false; + if(_status.auto||!player.isUnderControl()) return false; + return true; + }, + content:function(){ + game.modeSwapPlayer(player); + }, + }, fengyin:{ init:function(player,skill){ var skills=player.get('s',true,false); diff --git a/mode/boss.js b/mode/boss.js index ecc2c5aa5..e7503e026 100644 --- a/mode/boss.js +++ b/mode/boss.js @@ -130,6 +130,7 @@ mode.boss={ lib.translate.boss_pangtong='涅槃凤雏'; ui.create.cards(); game.finishCards(); + game.addGlobalSkill('autoswap'); ui.arena.setNumber(8); ui.control.style.transitionProperty='opacity'; ui.control.classList.add('bosslist'); @@ -3565,23 +3566,6 @@ mode.boss={ } } }, - _bossswap:{ - trigger:{player:['phaseBegin','chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin', - 'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin', - 'chooseBoolBegin','choosePlayerCardBegin','discardPlayerCardBegin','gainPlayerCardBegin']}, - forced:true, - priority:100, - popup:false, - filter:function(event,player){ - if(!get.config('single_control')) return false; - if(event.autochoose&&event.autochoose()) return false; - if(lib.filter.wuxieSwap(event)) return false; - return player.isUnderControl(); - }, - content:function(){ - game.modeSwapPlayer(player); - }, - }, }, translate:{ zhu:'神', diff --git a/mode/chess.js b/mode/chess.js index fc32676a3..70abaf4a7 100644 --- a/mode/chess.js +++ b/mode/chess.js @@ -42,6 +42,7 @@ mode.chess={ } ui.create.cards(); game.finishCards(); + game.addGlobalSkill('autoswap'); ui.chessContainer=ui.create.div('#chess-container',ui.arena); lib.setScroll(ui.chessContainer); ui.chess=ui.create.div('#chess',ui.chessContainer); @@ -4902,23 +4903,6 @@ mode.chess={ } } }, - _chessswap:{ - trigger:{player:['phaseBegin','chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin', - 'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin', - 'chooseBoolBegin','choosePlayerCardBegin','discardPlayerCardBegin','gainPlayerCardBegin']}, - forced:true, - priority:100, - popup:false, - filter:function(event,player){ - if(event.autochoose&&event.autochoose()) return false; - if(lib.config.mode=='chess'&&_status.mode=='combat'&&!get.config('single_control')) return false; - if(lib.filter.wuxieSwap(event)) return false; - return player.isUnderControl(); - }, - content:function(){ - game.modeSwapPlayer(player); - }, - }, _chesscenter:{ trigger:{player:['phaseBegin','useCardBegin','useSkillBegin','respondBegin','damageBegin','loseHpBegin'], target:'useCardToBegin'}, diff --git a/mode/story.js b/mode/story.js index f45da2ed8..8d497a7db 100644 --- a/mode/story.js +++ b/mode/story.js @@ -391,7 +391,6 @@ mode.story={ game.isChessNeighbour=result.game.isChessNeighbour; get.chessDistance=result.get.chessDistance; lib.skill._chessmove=result.skill._chessmove; - lib.skill._chessswap=result.skill._chessswap; lib.skill._chesscenter=result.skill._chesscenter; lib.skill._phasequeue=result.skill._phasequeue; 'step 2' diff --git a/mode/tafang.js b/mode/tafang.js index 071b46c9a..b72f95496 100644 --- a/mode/tafang.js +++ b/mode/tafang.js @@ -26,7 +26,7 @@ mode.tafang={ for(var i=0;i2&&lib.config.show_handcardbutton){ ui.versushs=ui.create.system('手牌',null,true); lib.setPopped(ui.versushs,game.versusHoverHandcards,220); @@ -3888,22 +3887,6 @@ mode.versus={ threaten:2 } }, - versus_swap:{ - trigger:{player:['phaseBegin','chooseToUseBegin','chooseToRespondBegin','chooseToDiscardBegin','chooseToCompareBegin', - 'chooseButtonBegin','chooseCardBegin','chooseTargetBegin','chooseCardTargetBegin','chooseControlBegin', - 'chooseBoolBegin','choosePlayerCardBegin','discardPlayerCardBegin','gainPlayerCardBegin']}, - forced:true, - priority:100, - popup:false, - filter:function(event,player){ - if(event.autochoose&&event.autochoose()) return false; - if(lib.filter.wuxieSwap(event)) return false; - return !_status.auto&&player!=game.me&&player.side==game.me.side; - }, - content:function(){ - game.modeSwapPlayer(player); - }, - }, versus_ladder:{ trigger:{global:['damageEnd','recoverEnd','dieEnd','gainEnd','phaseDiscardEnd']}, forced:true, diff --git a/theme/woodden/style.css b/theme/woodden/style.css index 3de38a202..fd4350359 100644 --- a/theme/woodden/style.css +++ b/theme/woodden/style.css @@ -75,9 +75,12 @@ html{ .dialog.popped .yellowtext{ color:#631515; } -.dialog.popped .greentext{ +.dialog.popped .greentext,.control span.greentext{ color:#00312d; } +.control span.firetext{ + color:#631515; +} .legendtext.legendauto{ color: rgba(106, 27, 154, 1); }