c

character/rank.js

@@ -13,10 +13,10 @@ window.characterRank={
         'swd_yuxiaoxue',
         'gjqt_bailitusu',
         'swd_huanglei',
-        'pal_liumengli',
         'hs_medivh',
     ],
     ap:[
+        'pal_liumengli',
         'pal_yuntianhe',
         'pal_lixiaoyao',
         'swd_huanyuanzhi',

character/yxs.js

@@ -2723,7 +2723,7 @@ character.yxs={
 		heqin:'和亲',
 		heqin2:'和亲',
 		heqin3:'和亲',
-		heqin_info:'限定技，你可以与场上一名男性角色形成【和亲】状态，你与该男性角色于摸牌阶段摸牌数+1。你或者男性角色阵亡，【和亲】状态消失',
+		heqin_info:'限定技，你可以与场上一名男性角色形成【和亲】状态，你与该男性角色于摸牌阶段摸牌数+1。你或者男性角色阵亡时，【和亲】状态消失',
 		chajue:'察觉',
 		chajue2:'察觉',
 		chajue_info:'锁定技，你的回合外，你每受到一次伤害，任何【杀】或普通锦囊牌均对你无效，直到你的回合开始',

game/game.js

@@ -7058,14 +7058,14 @@
 								}
 								ui.click.cancel();
 							});
-							event.forced=true;
+							event.fakeforce=true;
 						}
 						else{
 							if(event.endButton){
 								event.endButton.close();
 								delete event.endButton;
 							}
-							event.forced=false;
+							event.fakeforce=false;
 						}
 					}
 					if(event.player.isUnderControl()){
@@ -15327,6 +15327,7 @@
 						selectCard:this.selectCard,
 						position:this.position,
 						forced:this.forced,
+						fakeforce:this.fakeforce,
 						aiexclude:this.aiexclude,
                         complexSelect:this.complexSelect,
 						complexCard:this.complexCard,
@@ -15371,6 +15372,7 @@
                             if(info.ai1!=undefined) this.ai1=info.ai1;
 							if(info.ai2!=undefined) this.ai2=info.ai2;
 						}
+						delete this.fakeforce;
 					}
 					delete this._cardChoice;
 					delete this._targetChoice;
@@ -15386,6 +15388,7 @@
 						this.selectCard=this._backup.selectCard;
 						this.position=this._backup.position;
 						this.forced=this._backup.forced;
+						this.fakeforce=this._backup.fakeforce;
                         this.aiexclude=this._backup.aiexclude;
 						this.complexSelect=this._backup.complexSelect;
 						this.complexCard=this._backup.complexCard;
@@ -21351,7 +21354,7 @@
 						if(!_status.mousedown||_status.mouseleft){
 							var str='';
 							if(ok) str+='o';
-							if(!event.forced&&get.noSelected()) str+='c';
+							if(!event.forced&&!event.fakeforce&&get.noSelected()) str+='c';
 							ui.create.confirm(str);
 						}
 					}
@@ -33725,6 +33728,7 @@
 					if(_status.event.type=='phase'&&ui.confirm){
 						ui.confirm.classList.add('removing');
 					}
+					ui.control.animate('nozoom',100);
 					event.restore();
                     var cards=event.player.get('hej');
                     for(var i=0;i<cards.length;i++){

game/update.js

@@ -8,6 +8,7 @@ window.noname_update={
         'game/game.js',
         // 'game/asset.js',
         // 'card/*',
+        'character/rank.js',
         // 'character/*',
         // 'mode/boss.js',
         'mode/chess.js',

mode/chess.js

@@ -1340,12 +1340,9 @@ mode.chess={
 							}
 						}
 						else{
-							var targets=[];
-							for(var i=0;i<game.players.length;i++){
-								if(game.players[i].side!=player.side){
-									targets.push(game.players[i]);
-								}
-							}
+							var targets=game.filterPlayer(function(current){
+								return current.side!=player.side&&current.isIn();
+							});
 							targets.sort(function(a,b){
 								return get.distance(player,a)-get.distance(player,b);
 							});