From d28e352d93c631220ddb5f07f324813d533decd8 Mon Sep 17 00:00:00 2001
From: libccy <operawidget@163.com>
Date: Sat, 15 Apr 2017 06:14:25 +0800
Subject: [PATCH] q

---
 game/game.js   |  23 +++++----
 mode/boss.js   | 127 +++++++++++++++++++++++++++++++++++++++++++++----
 mode/chess.js  |   1 +
 mode/versus.js |   1 +
 4 files changed, 135 insertions(+), 17 deletions(-)

diff --git a/game/game.js b/game/game.js
index 7c0a385da..169dc71ff 100644
--- a/game/game.js
+++ b/game/game.js
@@ -22214,12 +22214,7 @@
 			},
 			changeSeat:function(player,info){
 				if(player){
-					player.style.transition='all 0s';
-					ui.refresh(player);
-					player.dataset.position=info;
-					setTimeout(function(){
-						player.style.transition='';
-					},100);
+					game.changeSeat(player,info);
 					game.playerMap={};
 					var players=game.players.concat(game.dead);
 					for(var i=0;i<players.length;i++){
@@ -23889,7 +23884,9 @@
     						if(pointer==game.boss){
     							break;
     						}
-    						map.links.push(pointer.name);
+							if(!pointer.side){
+								map.links.push(pointer.name);
+							}
     					}
     					game.saveConfig('continue_name_boss',map);
     					game.saveConfig('mode',lib.config.mode);
@@ -24560,8 +24557,18 @@
 			_status.dragline.length=0;
 		},
 		changeSeat:function(player,position){
-			game.addVideo('changeSeat',player,position);
+			var rect1=player.getBoundingClientRect();
+			player.style.transition='all 0s';
+			ui.refresh(player);
 			player.dataset.position=position;
+			var rect2=player.getBoundingClientRect();
+			player.style.transform='translate('+(rect1.left-rect2.left)+'px,'+(rect1.top-rect2.top)+'px)';
+			setTimeout(function(){
+				player.style.transition='';
+				ui.refresh(player);
+				player.style.transform='';
+			},100);
+			game.addVideo('changeSeat',player,position);
 		},
 		swapSeat:function(player1,player2,prompt,behind){
 			if(behind){
diff --git a/mode/boss.js b/mode/boss.js
index 111474c6b..a499ede32 100644
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -156,6 +156,7 @@ mode.boss={
 		game.me=ui.create.player();
 		if(lib.config.continue_name_boss){
 			event.noslide=true;
+			lib.init.onfree();
 		}
 		else{
 			game.chooseCharacter(function(target){
@@ -281,7 +282,7 @@ mode.boss={
 				td.innerHTML=get.translation(game.dead[i]);
 				td=ui.create.div(tr);
 				if(game.dead[i].maxHp>0){
-					td.innerHTML='剩余'+get.cnNumber(game.bossinfo.chongzheng-game.dead[i].storage.boss_chongzheng)+'回合';
+					td.innerHTML='剩余'+(game.bossinfo.chongzheng-game.dead[i].storage.boss_chongzheng)+'回合';
 				}
 				else{
 					td.innerHTML='无法重整'
@@ -381,7 +382,9 @@ mode.boss={
 				if(game.bossinfo.checkResult&&game.bossinfo.checkResult(this)===false){
 					return;
 				}
-				if(this==game.boss||game.players.length==1){
+				if(this==game.boss||!game.hasPlayer(function(current){
+					return !current.side;
+				})){
 					game.checkResult();
 				}
 			},
@@ -396,8 +399,8 @@ mode.boss={
 			boss_yandi:['male','shen',6,['boss_shenyi','boss_shenen','boss_chiyi'],['shu','hiddenboss','bossallowed']],
 
 			boss_qingmushilian:['male','',0,['boss_qingmu','boss_qingmu_intro1','boss_qingmu_intro2','boss_qingmu_intro3'],['boss'],'wu'],
-			boss_qinglong:['male','shen',4,['boss_shenyi','releiji'],['wu','hiddenboss','bossallowed']],
-			boss_mushengoumang:['male','shen',5,['boss_shenyi','boss_buchun'],['wu','hiddenboss','bossallowed']],
+			boss_qinglong:['male','shen',4,['boss_shenyi','releiji','boss_qingmu2'],['wu','hiddenboss','bossallowed']],
+			boss_mushengoumang:['male','shen',5,['boss_shenyi','boss_buchun','boss_qingmu3'],['wu','hiddenboss','bossallowed']],
 			boss_shujing:['female','shen',2,['boss_cuidu','boss_zhongdu'],['wu','hiddenboss','bossallowed']],
 			boss_taihao:['male','shen',6,['boss_shenyi','boss_shenen','boss_qingyi'],['wu','hiddenboss','bossallowed']],
 
@@ -963,9 +966,6 @@ mode.boss={
 				'step 0'
 				game.delay();
 				'step 1'
-				game.animate.window(1);
-				'step 2'
-				game.changeBoss('boss_huoshenzhurong');
 				if(game.me!=game.boss){
 					game.changeSeat(game.boss,6);
 				}
@@ -973,13 +973,15 @@ mode.boss={
 					game.changeSeat(game.boss.nextSeat,3);
 					game.changeSeat(game.boss.previousSeat,5);
 				}
+				game.changeBoss('boss_huoshenzhurong');
 				for(var i=0;i<game.players.length;i++){
 					game.players[i].hp=game.players[i].maxHp;
 					game.players[i].update();
 				}
+				game.delay(0.5);
+				'step 2'
 				game.addBossFellow(game.me==game.boss?1:5,'boss_yanling');
 				game.addBossFellow(7,'boss_yanling');
-				game.animate.window(2);
 				'step 3'
 				while(_status.event.name!='phaseLoop'){
 					_status.event=_status.event.parent;
@@ -988,9 +990,9 @@ mode.boss={
 				_status.paused=false;
 				_status.event.player=game.boss;
 				_status.event.step=0;
+				_status.roundStart=game.boss;
 				if(game.bossinfo){
 					game.bossinfo.loopType=1;
-					_status.roundStart=game.boss;
 				}
 			}
 		},
@@ -1012,6 +1014,112 @@ mode.boss={
 				game.delay();
 				'step 1'
 				game.changeBoss('boss_yandi');
+				game.boss.nextSeat.hide();
+				game.boss.previousSeat.hide();
+				game.delay(0.5);
+				'step 2'
+				game.changeBoss('boss_yanling',game.boss.previousSeat);
+				game.changeBoss('boss_huoshenzhurong',game.boss.nextSeat);
+				'step 3'
+				while(_status.event.name!='phaseLoop'){
+					_status.event=_status.event.parent;
+				}
+				game.resetSkills();
+				_status.paused=false;
+				_status.event.player=game.boss;
+				_status.event.step=0;
+			}
+		},
+		boss_qingmu:{
+			trigger:{global:'gameStart'},
+			forced:true,
+			popup:false,
+			content:function(){
+				player.smoothAvatar();
+				player.init('boss_qinglong');
+				_status.noswap=true;
+				game.addVideo('reinit2',player,player.name);
+			}
+		},
+		boss_qingmu2:{
+			mode:['boss'],
+			global:'boss_qingmu2x'
+		},
+		boss_qingmu2x:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			priority:-10,
+			globalFixed:true,
+			filter:function(event){
+				if(lib.config.mode!='boss') return false;
+				return event.player==game.boss&&event.player.hasSkill('boss_qingmu2');
+			},
+			content:function(){
+				'step 0'
+				game.delay();
+				'step 1'
+				if(game.me!=game.boss){
+					game.changeSeat(game.boss,6);
+				}
+				else{
+					game.changeSeat(game.boss.nextSeat,3);
+					game.changeSeat(game.boss.previousSeat,5);
+				}
+				game.changeBoss('boss_mushengoumang');
+				for(var i=0;i<game.players.length;i++){
+					game.players[i].hp=game.players[i].maxHp;
+					game.players[i].update();
+				}
+				game.delay(0.5);
+				'step 2'
+				game.addBossFellow(game.me==game.boss?1:5,'boss_shujing');
+				game.addBossFellow(7,'boss_shujing');
+				'step 3'
+				while(_status.event.name!='phaseLoop'){
+					_status.event=_status.event.parent;
+				}
+				game.resetSkills();
+				_status.paused=false;
+				_status.event.player=game.boss;
+				_status.event.step=0;
+				_status.roundStart=game.boss;
+				if(game.bossinfo){
+					game.bossinfo.loopType=1;
+				}
+			}
+		},
+		boss_qingmu3:{
+			mode:['boss'],
+			global:'boss_qingmu3x'
+		},
+		boss_qingmu3x:{
+			trigger:{global:'dieAfter'},
+			forced:true,
+			priority:-10,
+			globalFixed:true,
+			filter:function(event){
+				if(lib.config.mode!='boss') return false;
+				return event.player==game.boss&&event.player.hasSkill('boss_qingmu3');
+			},
+			content:function(){
+				'step 0'
+				game.delay();
+				'step 1'
+				game.changeBoss('boss_taihao');
+				game.boss.nextSeat.hide();
+				game.boss.previousSeat.hide();
+				game.delay(0.5);
+				'step 2'
+				game.changeBoss('boss_shujing',game.boss.previousSeat);
+				game.changeBoss('boss_mushengoumang',game.boss.nextSeat);
+				'step 3'
+				while(_status.event.name!='phaseLoop'){
+					_status.event=_status.event.parent;
+				}
+				game.resetSkills();
+				_status.paused=false;
+				_status.event.player=game.boss;
+				_status.event.step=0;
 			}
 		},
 		boss_shenyi:{},
@@ -1020,6 +1128,7 @@ mode.boss={
 		boss_xingxia:{},
 		boss_huihuo:{},
 		boss_chiyi:{},
+		boss_buchun:{},
 		boss_shenbuchun:{},
 		boss_cuidu:{},
 		boss_zhongdu:{},
diff --git a/mode/chess.js b/mode/chess.js
index bf0d46d0e..1de21bdd4 100644
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -91,6 +91,7 @@ mode.chess={
 						_status.color=lib.config.continue_name_chess.color;
 						game.saveConfig('continue_name_chess');
 						game.delay(0.5);
+						lib.init.onfree();
 					}
 					else{
 						game.chooseCharacterDouble(function(i){
diff --git a/mode/versus.js b/mode/versus.js
index 83987e8fe..214fde731 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1299,6 +1299,7 @@ mode.versus={
 					game.additionaldead=[];
 					event.goto(1);
 					game.saveConfig('continue_name_versus');
+					lib.init.onfree();
 					return;
 				}
 				event.check=function(){