From 527af1bebf282d1e79c6ecabdd3550b5f0e608f5 Mon Sep 17 00:00:00 2001 From: libccy Date: Tue, 27 Oct 2015 15:56:42 +0800 Subject: [PATCH] 1.3.2 --- CHANGELOG.MD | 10 +-- card/standard.js | 9 +++ character/swd.js | 2 +- character/yijiang.js | 4 + game/config.js | 1 + game/game.js | 8 +- layout/default/layout.css | 10 ++- layout/mode/chess.css | 8 +- mode/chess.js | 158 +++++++++++++++++++++++++++++++++----- mode/identity.js | 2 +- 10 files changed, 177 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index cac02e6bd..35b44c434 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,6 +1,4 @@ -1.3.1 -战棋模式改进 -单人控制改进 -新武将 -修bug -统率模式（战棋子模式） +1.3.2 +战棋模式调整（见帮助） +通用选项：不无懈自己 +奇策调整 diff --git a/card/standard.js b/card/standard.js index 676db3f7f..4b1ce4783 100755 --- a/card/standard.js +++ b/card/standard.js @@ -1195,6 +1195,15 @@ card.standard={ return; } } + if(lib.config.wuxie_self&&event.state){ + if((event.current==game.me||event.current.isUnderControl())&& + (trigger.player==game.me||trigger.player.isUnderControl())){ + if(trigger.targets&&trigger.targets.length==1){ + event._result={bool:false}; + return; + } + } + } if(event.current.num('h','wuxie')==0){ var noask=true; var skills=event.current.get('s',true).concat(lib.skill.global); diff --git a/character/swd.js b/character/swd.js index 3154e21f5..34a4c84d4 100755 --- a/character/swd.js +++ b/character/swd.js @@ -2914,7 +2914,7 @@ character.swd={ event.finish(); } else{ - player.logSkill(_status.event.name); + player.logSkill('qinyin'); event.bool=(result.control=='回复体力'); event.num=0; event.players=game.players.slice(0); diff --git a/character/yijiang.js b/character/yijiang.js index 8e831544a..a381b3b0a 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -2118,6 +2118,10 @@ character.yijiang={ if(lib.card[i].mode&&lib.card[i].mode.contains(lib.config.mode)==false) continue; if(lib.card[i].type=='trick') list.push(['锦囊','',i]); } + list=['taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman']; + for(var i=0;i.avatar>.action:not(.freecolor){ text-shadow: black 0 0 1px, rgba(10, 155, 67, 1) 0 0 5px, rgba(10, 155, 67, 1) 0 0 10px; } .player>.avatar:not(.glow2)>.action{opacity: 0} @@ -853,6 +855,6 @@ div[data-color="unknownm"]{ #arena{width: 1152px;left: calc(50% - 576px);} } @media screen and (min-width: 1600px) { - #arena.right{left: calc(50% - 576px);} - #arena.left{left: calc(50% - 576px);} + #arena.right:not(.noleft){left: calc(50% - 576px);} + #arena.left:not(.noleft){left: calc(50% - 576px);} } diff --git a/layout/mode/chess.css b/layout/mode/chess.css index 85b7e6fe1..2d98ba909 100755 --- a/layout/mode/chess.css +++ b/layout/mode/chess.css @@ -1,8 +1,8 @@ #arena.chess{ - width:100%; - height:100%; - left:0; - top:0; + width:100% !important; + height:100% !important; + left:0 !important; + top:0 !important; transition:all 0s !important; } #arena.chess>#me, diff --git a/mode/chess.js b/mode/chess.js index 66be929c4..afad1800f 100755 --- a/mode/chess.js +++ b/mode/chess.js @@ -1,6 +1,7 @@ 'use strict'; mode.chess={ canvasUpdates2:[], + hiddenCharacters:[], element:{ card:{ moveTo:function(player,method){ @@ -521,6 +522,39 @@ mode.chess={ game:{ minskin:true, singleHandcard:true, + addChessPlayer:function(name,enemy,num){ + if(typeof num!='number'){ + num=4; + } + var grids=[]; + var gridnum=ui.chessheight*ui.chesswidth; + for(var i=0;inum1&&get.config('chess_mode')!='leader'){ + if(num2>num1){ if(next.side==game.me.side){ next=game.me; } @@ -912,6 +953,13 @@ mode.chess={ ui.chess.appendChild(friend); friend.dataset.position=grids.randomRemove(); lib.posmap[friend.dataset.position]=friend; + if(_status.enterArena&&game.data.arena.acted.contains(friend.name)){ + friend.hp--; + friend.update(); + } + if(_status.enterArena){ + friend.addSkill('arenaAdd'); + } } while(_status.enemylist.length){ enemy=ui.create.player().animate('start'); @@ -1593,24 +1641,26 @@ mode.chess={ } var rank=game.getRank(_status.challenge); var total=Math.max(2,_status.mylist.length-1); + var list; + switch(rank){ + case 's':list=game.rank.ap;break; + case 'ap':list=game.rank.s.concat(game.rank.a);break; + case 'a':list=game.rank.ap.concat(game.rank.am);break; + case 'am':list=game.rank.a.concat(game.rank.bp);break; + case 'bp':list=game.rank.am.concat(game.rank.b);break; + case 'b':list=game.rank.bp.concat(game.rank.bm);break; + case 'bm':list=game.rank.b.concat(game.rank.c);break; + case 'c':list=game.rank.bm.concat(game.rank.d);break; + case 'd':list=game.rank.c;break; + } for(var i=0;i0){ + switch(difficulty){ + case 'leader_easy':reward+=10*numdel;break; + case 'leader_medium':reward+=20*numdel;break; + case 'leader_hard':reward+=40*numdel;break; + } + } var punish=0; for(var i=0;i<_status.mylist.length;i++){ switch(game.getRank(_status.mylist[i])){ @@ -1668,6 +1732,13 @@ mode.chess={ case 'd':punish+=2;break; } } + if(numdel<0){ + switch(difficulty){ + case 'leader_easy':punish-=5*numdel;break; + case 'leader_medium':punish-=10*numdel;break; + case 'leader_hard':punish-=20*numdel;break; + } + } game.reward=Math.max(3*_status.enemylist.length,reward-punish); if(!_status.lord){ switch(difficulty){ @@ -1942,6 +2013,7 @@ mode.chess={ game.data.arena={ win:0, dead:[], + acted:[], choice:choice, arenachoice:event.arenachoice } @@ -1991,6 +2063,7 @@ mode.chess={ } 'step 6' game.minskin=true; + ui.arena.classList.add('noleft'); var nodes=event.arenachoicenodes; for(var i=0;igame.data.arena.dead.length; + }, + direct:true, + delay:0, + preservecancel:true, + content:function(){ + "step 0" + var list=game.data.arena.arenachoice.slice(0); + for(var i=0;i'+ '战斗中有君主出场时可招降敌将，成功率取决于敌将的稀有度、剩余体力值以及手牌数。成功后战斗立即结束且没有金钱奖励。每发动一次招降，无论成功还是失败，都会扣除10招募令
  • '+ '挑战武将会与该武将以及与其强度相近的武将进行战斗，敌方人数与我方出场人数相同，但不少于3。胜利后可通过招募令招募该武将
  • '+ - '竞技场中，你随机选择9名武将，每次派出1〜3名武将参战。战斗中阵亡的武将不能再次上场。当取得12场胜利或所有武将全部阵亡后结束，并根据胜场数获得随机奖励' + '竞技场：
    随机选择9名武将，每次派出1〜3名武将参战。战斗中阵亡的武将不能再次上场。

    战斗后武将进入疲劳状态，若立即再次出场则初始体力值-1。

    战斗中本方武将行动时可召唤后援，令一名未出场的已方武将加入战斗。后援武将在战斗结束后无论存活与否均不能再次出场

    当取得12场胜利或所有武将全部阵亡后结束，并根据胜场数获得随机奖励' }, config:[ function(game,lib,get,ui){ diff --git a/mode/identity.js b/mode/identity.js index 436e873a9..b737a8d2d 100755 --- a/mode/identity.js +++ b/mode/identity.js @@ -588,7 +588,7 @@ mode.identity={ case 'zhong': switch(identity2){ case 'zhu': return 10; - case 'zhong': return get.population('fan')>0?4:0.1; + case 'zhong': return 4; case 'nei': if(get.population('fan')==0) return -2; return Math.min(3,-situation);