From 9de71bb6b455f3db42b3c27c5b67b3bafe3a7b4e Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Wed, 23 Mar 2016 10:34:26 +0800
Subject: [PATCH] mode

---
 game/game.js     |   37 +-
 manifest.json    |    1 +
 mode/boss.js     |  687 ++++++++++++++--------------
 mode/chess.js    | 1145 +++++++++++++++++++++++-----------------------
 mode/guozhan.js  |  207 ++++-----
 mode/identity.js |  417 ++++++++---------
 mode/stone.js    | 1089 ++++++++++++++++++++++---------------------
 mode/versus.js   |  498 ++++++++++----------
 8 files changed, 2028 insertions(+), 2053 deletions(-)

diff --git a/game/game.js b/game/game.js
index 2b6dd85e1..341c569a0 100755
--- a/game/game.js
+++ b/game/game.js
@@ -3144,7 +3144,10 @@
 								}
 								_status.characterLoaded=true;
 								if(_status.waitingForCharacters){
-									game.resume();
+									game.createEvent('game',false).content=lib.init.start;
+									delete lib.init.start;
+									game.loop();
+									delete _status.waitingForCharacters;
 								}
 								if(lib.onCharacterLoad){
 									lib.onCharacterLoad();
@@ -12968,7 +12971,7 @@
 		},
 		gameDraw:function(player,num){
 			var next=game.createEvent('gameDraw');
-			next.player=player;
+			next.player=player||game.me;
 			if(num==undefined) next.num=4;
 			else next.num=num;
 			next.content=function(){
@@ -13387,6 +13390,24 @@
 		getExtensionConfig:function(extension,key){
 			return lib.config['extension_'+extension+'_'+key];
 		},
+		clearModeConfig:function(mode){
+			if(_status.reloading) return;
+			var config;
+			try{
+				config=JSON.parse(localStorage.getItem(lib.configprefix+'config'));
+				if(!config||typeof config!='object') throw 'err'
+			}
+			catch(err){
+				config={};
+			}
+			for(var i in config){
+				if(i.substr(i.indexOf('_mode_config')+13)==mode){
+					delete config[i];
+				}
+			}
+			localStorage.setItem(lib.configprefix+'config',JSON.stringify(config));
+			localStorage.removeItem(lib.configprefix+mode);
+		},
 		addPlayer:function(position,character,character2){
 			if(position<0||position>game.players.length+game.dead.length||position==undefined){
 				position=Math.ceil(Math.random()*(game.players.length+game.dead.length));
@@ -22738,6 +22759,7 @@
 				for(i in mode[lib.config.mode].get){
 					get[i]=lib.init.eval(mode[lib.config.mode].get[i]);
 				}
+				lib.init.start=mode[lib.config.mode].start;
 				if(game.onwash){
 					lib.onwash.push(game.onwash);
 					delete game.onwash;
@@ -22760,6 +22782,7 @@
 					if(i=='ui') continue;
 					if(i=='get') continue;
 					if(i=='config') continue;
+					if(i=='start') continue;
 					if(lib[i]==undefined) lib[i]=(get.objtype(mode[lib.config.mode][i])=='array')?[]:{};
 					for(j in mode[lib.config.mode][i]){
 						lib[i][j]=lib.init.eval(mode[lib.config.mode][i][j]);
@@ -23001,8 +23024,14 @@
 				}
 				delete lib.packageReady;
 				ui.create.arena();
-				game.start();
-				game.loop();
+				if(lib.db&&!_status.characterLoaded){
+					_status.waitingForCharacters=true;
+				}
+				else{
+					game.createEvent('game',false).content=lib.init.start;
+					delete lib.init.start;
+					game.loop();
+				}
 			}
 
 			if(!mode[lib.config.mode]){
diff --git a/manifest.json b/manifest.json
index eda1dc1d9..0ffb6a770 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,6 @@
 {
   "name": "noname",
+  "xwalk_version": "1.7.11",
   "xwalk_app_version": "1.7.11",
   "xwalk_package_id": "com.widget.noname",
   "xwalk_android_keep_screen_on":true,
diff --git a/mode/boss.js b/mode/boss.js
index 71e152eb0..00eeebf5a 100755
--- a/mode/boss.js
+++ b/mode/boss.js
@@ -1,5 +1,344 @@
 'use strict';
 mode.boss={
+	start:function(){
+		"step 0"
+		if(lib.config.hiddenCharacterPack.contains('boss')){
+			game.loadPackage('character/boss');
+		}
+		"step 1"
+		var playback=localStorage.getItem(lib.configprefix+'playback');
+		if(playback){
+			ui.create.me();
+			ui.arena.style.display='none';
+			ui.system.style.display='none';
+			_status.playback=playback;
+			localStorage.removeItem(lib.configprefix+'playback');
+			var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
+			store.get(parseInt(playback)).onsuccess=function(e){
+				if(e.target.result){
+					game.playVideoContent(e.target.result.video);
+				}
+				else{
+					alert('播放失败：找不到录像');
+					game.reload();
+				}
+			}
+			event.finish();
+			return;
+		}
+		for(var i in lib.skill){
+			if(lib.skill[i].changeSeat){
+				lib.skill[i]={};
+				if(lib.translate[i+'_info']){
+					lib.translate[i+'_info']='此模式下不可用';
+				}
+			}
+		}
+		lib.init.css('layout/mode','boss');
+		game.delay(0.1);
+		"step 2"
+		var bosslist=ui.create.div('#bosslist.hidden');
+		event.bosslist=bosslist;
+		bosslist.ontouchmove = ui.click.touchScroll;
+		bosslist.style.WebkitOverflowScrolling='touch';
+		if(!lib.config.touchscreen&&lib.config.mousewheel){
+			bosslist._scrollspeed=30;
+			bosslist._scrollnum=10;
+			bosslist.onmousewheel=ui.click.mousewheel;
+		}
+		var bosslistlinks={};
+		var toggleBoss=function(bool){
+			game.saveConfig(this._link.config._name,bool,true);
+			var node=bosslistlinks[this._link.config._name];
+			if(bool){
+				node.style.display='';
+			}
+			else{
+				node.style.display='none';
+			}
+		};
+		var onpause=function(){
+			ui.window.classList.add('bosspaused');
+		}
+		var onresume=function(){
+			ui.window.classList.remove('bosspaused');
+		}
+		game.onpause=onpause;
+		game.onpause2=onpause;
+		game.onresume=onresume;
+		game.onresume2=onresume;
+		ui.create.div(bosslist);
+
+		event.current=null;
+		var list=[];
+		for(var i in lib.character){
+			var info=lib.character[i];
+			if(info[4].contains('boss')&&!lib.config.banned.contains(i)){
+				var cfg=i+'_bossconfig';
+				if(get.config(cfg)==undefined){
+					game.saveConfig(cfg,true,true);
+				}
+				lib.translate[cfg+'_config']=lib.translate[i];
+				lib.config.current_mode.push([cfg,get.config(cfg),toggleBoss]);
+				lib.mode.boss.config[cfg]={
+					name:get.translation(i),
+					onclick:toggleBoss,
+					init:true,
+				}
+				var player=ui.create.player(bosslist).init(i);
+				list.push(player);
+				player.node.hp.classList.add('text');
+				player.node.hp.dataset.condition='';
+				player.node.hp.innerHTML=info[2];
+				if(info[2]==Infinity){
+					player.node.hp.innerHTML='∞';
+				}
+				player.setIdentity(player.name);
+				player.node.identity.dataset.color=info[5];
+				bosslistlinks[cfg]=player;
+				player.classList.add('bossplayer');
+
+				if(lib.storage.current==i){
+					event.current=player;
+					player.classList.add('highlight');
+				}
+
+				if(!get.config(cfg)){
+					player.style.display='none';
+				}
+			}
+		}
+		if(!list.length){
+			alert('挑战模式不可隐藏boss武将包，请在选项－其它中选择“重置隐藏扩展包”');
+			event.finish();
+			_status.over=true;
+			return;
+		}
+		if(!event.current){
+			event.current=bosslist.childNodes[1];
+			event.current.classList.add('highlight');
+		}
+		ui.create.div(bosslist);
+		lib.translate.boss_pangtong='涅槃凤雏';
+		ui.create.cards();
+		game.finishCards();
+		ui.arena.dataset.number=8;
+		ui.control.style.transitionProperty='opacity';
+		ui.control.classList.add('bosslist');
+		setTimeout(function(){
+			ui.control.style.transitionProperty='';
+		},1000);
+
+		ui.window.appendChild(bosslist);
+
+		setTimeout(function(){
+			if(event.current){
+				var left=event.current.offsetLeft-(ui.window.offsetWidth-180)/2;
+				if(bosslist.scrollLeft<left){
+					bosslist.scrollLeft=left;
+				}
+			}
+			bosslist.show();
+		},200);
+		game.me=ui.create.player();
+		if(lib.config.continue_name_boss){
+			event.noslide=true;
+		}
+		else{
+			game.chooseCharacter(function(target){
+				if(event.current){
+					event.current.classList.remove('highlight');
+				}
+				event.current=target;
+				game.save('current',target.name);
+				target.classList.add('highlight');
+			});
+		}
+		if(lib.storage.test){
+			event.current.classList.remove('highlight');
+			if(event.current.nextSibling&&event.current.nextSibling.classList.contains('player')){
+				event.current=event.current.nextSibling;
+			}
+			else{
+				event.current=event.current.parentNode.childNodes[1];
+			}
+			lib.config.game_speed='vfast';
+			_status.auto=true;
+			ui.auto.classList.add('glow');
+			game.save('current',event.current.name);
+		}
+		"step 3"
+		game.bossinfo=lib.boss.global;
+		for(var i in lib.boss[event.current.name]){
+			game.bossinfo[i]=lib.boss[event.current.name][i];
+		}
+		delete lib.boss;
+
+		setTimeout(function(){
+			ui.control.classList.remove('bosslist');
+		},500);
+		var rect=event.current.getBoundingClientRect();
+		var boss=ui.create.player().init(event.current.name);
+		game.boss=boss;
+		boss.side=true;
+		if(!event.noslide){
+			// boss.classList.add('bossplayer');
+			// boss.classList.add('highlight');
+			boss.animate('bossing');
+			boss.node.hp.animate('start');
+			boss.style.left=(rect.left-ui.arena.offsetLeft)+'px';
+			boss.style.top=(rect.top-ui.arena.offsetTop)+'px';
+		}
+		boss.setIdentity('zhu');
+		boss.identity='zhu';
+		if(lib.config.continue_name_boss){
+			result=lib.config.continue_name_boss;
+			game.saveConfig('continue_name_boss');
+		}
+		for(var i=0;i<result.links.length;i++){
+			var player=ui.create.player(ui.arena).init(result.links[i]).animate('start');
+			player.setIdentity('cai');
+			player.identity='cai';
+			player.side=false;
+			game.players.push(player);
+			if(result.boss){
+				player.dataset.position=(i+1)*2;
+			}
+			else{
+				player.dataset.position=i+1;
+			}
+		}
+		if(result.boss){
+			game.players.unshift(boss);
+			boss.dataset.position=0;
+		}
+		else{
+			game.players.push(boss);
+			boss.dataset.position=7;
+		}
+		ui.create.me();
+		if(game.me!==boss){
+			game.singleHandcard=true;
+			ui.arena.classList.add('single-handcard');
+			ui.fakeme=ui.create.div('.fakeme.avatar',ui.me);
+			// ui.fakeme.dataset.position=0;
+			// ui.fakeme.line=lib.element.player.line;
+			// ui.fakemebg=ui.create.div('.avatar',ui.fakeme).hide();
+			// ui.refresh(ui.fakemebg);
+			game.onSwapControl();
+			// ui.fakemebg.show();
+
+			lib.setPopped(ui.create.system('手牌',null,true),function(){
+				var uiintro=ui.create.dialog('hidden');
+
+				var players=game.players.concat(game.dead);
+				for(var i=0;i<players.length;i++){
+					if(players[i].side==game.me.side&&players[i]!=game.me){
+						uiintro.add(get.translation(players[i]));
+						var cards=players[i].get('h');
+						if(cards.length){
+							uiintro.addSmall(cards,true);
+						}
+						else{
+							uiintro.add('（无）');
+						}
+					}
+				}
+
+				return uiintro;
+			},220);
+		}
+		lib.setPopped(ui.create.system('重整',null,true),function(){
+			var uiintro=ui.create.dialog('hidden');
+
+			uiintro.add('重整');
+			var table=ui.create.div('.bosschongzheng');
+
+			var tr,td,added=false;
+			for(var i=0;i<game.dead.length;i++){
+				if(typeof game.dead[i].storage.boss_chongzheng!=='number') continue;
+				added=true;
+				tr=ui.create.div(table);
+				td=ui.create.div(tr);
+				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)+'回合';
+				}
+				else{
+					td.innerHTML='无法重整'
+				}
+			}
+
+			if(!added){
+				uiintro.add('<div class="text center">（无重整角色）</div>');
+				uiintro.add(ui.create.div('.placeholder.slim'))
+			}
+			else{
+				uiintro.add(table);
+			}
+
+			return uiintro;
+		},180);
+		ui.single_swap=ui.create.system('换人',function(){
+			var players=get.players(game.me);
+			players.remove(game.boss);
+			if(players.length>1){
+				if(ui.auto.classList.contains('hidden')){
+					game.me.popup('请稍后换人');
+					return;
+				}
+				if(_status.event.isMine()){
+					ui.click.auto();
+					setTimeout(function(){
+						ui.click.auto();
+					},500);
+				}
+				game.modeSwapPlayer(players[1]);
+			}
+		},true);
+		if(get.config('single_control')||game.me==game.boss){
+			ui.single_swap.style.display='none';
+		}
+
+		ui.arena.appendChild(boss);
+		ui.refresh(boss);
+		boss.classList.remove('highlight');
+		boss.classList.remove('bossplayer');
+		boss.style.left='';
+		boss.style.top='';
+		boss.style.position='';
+
+		event.bosslist.delete();
+
+		game.arrangePlayers();
+		for(var i=0;i<game.players.length;i++){
+			game.players[i].node.action.innerHTML='行动';
+		}
+
+		var players=get.players(lib.sort.position);
+		var info=[];
+		for(var i=0;i<players.length;i++){
+			info.push({
+				name:players[i].name,
+				identity:players[i].identity,
+				position:players[i].dataset.position
+			});
+		}
+		_status.videoInited=true,
+		info.boss=(game.me==game.boss);
+		game.addVideo('init',null,info);
+		if(game.bossinfo.init){
+			game.bossinfo.init();
+		}
+		"step 5"
+		event.trigger('gameStart');
+		game.gameDraw(game.boss);
+		game.bossPhaseLoop();
+		setTimeout(function(){
+			ui.updatehl();
+		},200);
+	},
 	element:{
 		player:{
 			dieAfter:function(){
@@ -63,353 +402,6 @@ mode.boss={
 			var name=[str,str2];
 			return name;
 		},
-		start:function(){
-			var next=game.createEvent('game',false);
-			next.content=function(){
-				"step 0"
-				if(lib.db&&!_status.characterLoaded){
-					_status.waitingForCharacters=true;
-					game.pause();
-				}
-				"step 1"
-				if(lib.config.hiddenCharacterPack.contains('boss')){
-					game.loadPackage('character/boss');
-				}
-				"step 2"
-				var playback=localStorage.getItem(lib.configprefix+'playback');
-				if(playback){
-					ui.create.me();
-					ui.arena.style.display='none';
-					ui.system.style.display='none';
-					_status.playback=playback;
-					localStorage.removeItem(lib.configprefix+'playback');
-					var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
-					store.get(parseInt(playback)).onsuccess=function(e){
-						if(e.target.result){
-							game.playVideoContent(e.target.result.video);
-						}
-						else{
-							alert('播放失败：找不到录像');
-							game.reload();
-						}
-					}
-					event.finish();
-					return;
-				}
-				for(var i in lib.skill){
-					if(lib.skill[i].changeSeat){
-						lib.skill[i]={};
-						if(lib.translate[i+'_info']){
-							lib.translate[i+'_info']='此模式下不可用';
-						}
-					}
-				}
-				lib.init.css('layout/mode','boss');
-				game.delay(0.1);
-				"step 3"
-				var bosslist=ui.create.div('#bosslist.hidden');
-				event.bosslist=bosslist;
-				bosslist.ontouchmove = ui.click.touchScroll;
-				bosslist.style.WebkitOverflowScrolling='touch';
-				if(!lib.config.touchscreen&&lib.config.mousewheel){
-					bosslist._scrollspeed=30;
-					bosslist._scrollnum=10;
-					bosslist.onmousewheel=ui.click.mousewheel;
-				}
-				var bosslistlinks={};
-				var toggleBoss=function(bool){
-					game.saveConfig(this._link.config._name,bool,true);
-					var node=bosslistlinks[this._link.config._name];
-					if(bool){
-						node.style.display='';
-					}
-					else{
-						node.style.display='none';
-					}
-				};
-				var onpause=function(){
-					ui.window.classList.add('bosspaused');
-				}
-				var onresume=function(){
-					ui.window.classList.remove('bosspaused');
-				}
-				game.onpause=onpause;
-				game.onpause2=onpause;
-				game.onresume=onresume;
-				game.onresume2=onresume;
-				ui.create.div(bosslist);
-
-				event.current=null;
-				var list=[];
-				for(var i in lib.character){
-					var info=lib.character[i];
-					if(info[4].contains('boss')&&!lib.config.banned.contains(i)){
-						var cfg=i+'_bossconfig';
-						if(get.config(cfg)==undefined){
-							game.saveConfig(cfg,true,true);
-						}
-						lib.translate[cfg+'_config']=lib.translate[i];
-						lib.config.current_mode.push([cfg,get.config(cfg),toggleBoss]);
-						lib.mode.boss.config[cfg]={
-							name:get.translation(i),
-							onclick:toggleBoss,
-							init:true,
-						}
-						var player=ui.create.player(bosslist).init(i);
-						list.push(player);
-						player.node.hp.classList.add('text');
-						player.node.hp.dataset.condition='';
-						player.node.hp.innerHTML=info[2];
-						if(info[2]==Infinity){
-							player.node.hp.innerHTML='∞';
-						}
-						player.setIdentity(player.name);
-						player.node.identity.dataset.color=info[5];
-						bosslistlinks[cfg]=player;
-						player.classList.add('bossplayer');
-
-						if(lib.storage.current==i){
-							event.current=player;
-							player.classList.add('highlight');
-						}
-
-						if(!get.config(cfg)){
-							player.style.display='none';
-						}
-					}
-				}
-				if(!list.length){
-					alert('挑战模式不可隐藏boss武将包，请在选项－其它中选择“重置隐藏扩展包”');
-					event.finish();
-					_status.over=true;
-					return;
-				}
-				if(!event.current){
-					event.current=bosslist.childNodes[1];
-					event.current.classList.add('highlight');
-				}
-				ui.create.div(bosslist);
-				lib.translate.boss_pangtong='涅槃凤雏';
-				ui.create.cards();
-				game.finishCards();
-				ui.arena.dataset.number=8;
-				ui.control.style.transitionProperty='opacity';
-				ui.control.classList.add('bosslist');
-				setTimeout(function(){
-					ui.control.style.transitionProperty='';
-				},1000);
-
-				ui.window.appendChild(bosslist);
-
-				setTimeout(function(){
-					if(event.current){
-						var left=event.current.offsetLeft-(ui.window.offsetWidth-180)/2;
-						if(bosslist.scrollLeft<left){
-							bosslist.scrollLeft=left;
-						}
-					}
-					bosslist.show();
-				},200);
-				game.me=ui.create.player();
-				if(lib.config.continue_name_boss){
-					event.noslide=true;
-				}
-				else{
-					game.chooseCharacter(function(target){
-						if(event.current){
-							event.current.classList.remove('highlight');
-						}
-						event.current=target;
-						game.save('current',target.name);
-						target.classList.add('highlight');
-					});
-				}
-				if(lib.storage.test){
-					event.current.classList.remove('highlight');
-					if(event.current.nextSibling&&event.current.nextSibling.classList.contains('player')){
-						event.current=event.current.nextSibling;
-					}
-					else{
-						event.current=event.current.parentNode.childNodes[1];
-					}
-					lib.config.game_speed='vfast';
-					_status.auto=true;
-					ui.auto.classList.add('glow');
-					game.save('current',event.current.name);
-				}
-				"step 4"
-				game.bossinfo=lib.boss.global;
-				for(var i in lib.boss[event.current.name]){
-					game.bossinfo[i]=lib.boss[event.current.name][i];
-				}
-				delete lib.boss;
-
-				setTimeout(function(){
-					ui.control.classList.remove('bosslist');
-				},500);
-				var rect=event.current.getBoundingClientRect();
-				var boss=ui.create.player().init(event.current.name);
-				game.boss=boss;
-				boss.side=true;
-				if(!event.noslide){
-					// boss.classList.add('bossplayer');
-					// boss.classList.add('highlight');
-					boss.animate('bossing');
-					boss.node.hp.animate('start');
-					boss.style.left=(rect.left-ui.arena.offsetLeft)+'px';
-					boss.style.top=(rect.top-ui.arena.offsetTop)+'px';
-				}
-				boss.setIdentity('zhu');
-				boss.identity='zhu';
-				if(lib.config.continue_name_boss){
-					result=lib.config.continue_name_boss;
-					game.saveConfig('continue_name_boss');
-				}
-				for(var i=0;i<result.links.length;i++){
-					var player=ui.create.player(ui.arena).init(result.links[i]).animate('start');
-					player.setIdentity('cai');
-					player.identity='cai';
-					player.side=false;
-					game.players.push(player);
-					if(result.boss){
-						player.dataset.position=(i+1)*2;
-					}
-					else{
-						player.dataset.position=i+1;
-					}
-				}
-				if(result.boss){
-					game.players.unshift(boss);
-					boss.dataset.position=0;
-				}
-				else{
-					game.players.push(boss);
-					boss.dataset.position=7;
-				}
-				ui.create.me();
-				if(game.me!==boss){
-					game.singleHandcard=true;
-					ui.arena.classList.add('single-handcard');
-					ui.fakeme=ui.create.div('.fakeme.avatar',ui.me);
-					// ui.fakeme.dataset.position=0;
-					// ui.fakeme.line=lib.element.player.line;
-					// ui.fakemebg=ui.create.div('.avatar',ui.fakeme).hide();
-					// ui.refresh(ui.fakemebg);
-					game.onSwapControl();
-					// ui.fakemebg.show();
-
-					lib.setPopped(ui.create.system('手牌',null,true),function(){
-						var uiintro=ui.create.dialog('hidden');
-
-						var players=game.players.concat(game.dead);
-						for(var i=0;i<players.length;i++){
-							if(players[i].side==game.me.side&&players[i]!=game.me){
-								uiintro.add(get.translation(players[i]));
-								var cards=players[i].get('h');
-								if(cards.length){
-									uiintro.addSmall(cards,true);
-								}
-								else{
-									uiintro.add('（无）');
-								}
-							}
-						}
-
-						return uiintro;
-					},220);
-				}
-				lib.setPopped(ui.create.system('重整',null,true),function(){
-					var uiintro=ui.create.dialog('hidden');
-
-					uiintro.add('重整');
-					var table=ui.create.div('.bosschongzheng');
-
-					var tr,td,added=false;
-					for(var i=0;i<game.dead.length;i++){
-						if(typeof game.dead[i].storage.boss_chongzheng!=='number') continue;
-						added=true;
-						tr=ui.create.div(table);
-						td=ui.create.div(tr);
-						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)+'回合';
-						}
-						else{
-							td.innerHTML='无法重整'
-						}
-					}
-
-					if(!added){
-						uiintro.add('<div class="text center">（无重整角色）</div>');
-						uiintro.add(ui.create.div('.placeholder.slim'))
-					}
-					else{
-						uiintro.add(table);
-					}
-
-					return uiintro;
-				},180);
-				ui.single_swap=ui.create.system('换人',function(){
-					var players=get.players(game.me);
-					players.remove(game.boss);
-					if(players.length>1){
-						if(ui.auto.classList.contains('hidden')){
-							game.me.popup('请稍后换人');
-							return;
-						}
-						if(_status.event.isMine()){
-							ui.click.auto();
-							setTimeout(function(){
-								ui.click.auto();
-							},500);
-						}
-						game.modeSwapPlayer(players[1]);
-					}
-				},true);
-				if(get.config('single_control')||game.me==game.boss){
-					ui.single_swap.style.display='none';
-				}
-
-				ui.arena.appendChild(boss);
-				ui.refresh(boss);
-				boss.classList.remove('highlight');
-				boss.classList.remove('bossplayer');
-				boss.style.left='';
-				boss.style.top='';
-				boss.style.position='';
-
-				event.bosslist.delete();
-
-				game.arrangePlayers();
-				for(var i=0;i<game.players.length;i++){
-					game.players[i].node.action.innerHTML='行动';
-				}
-
-				var players=get.players(lib.sort.position);
-				var info=[];
-				for(var i=0;i<players.length;i++){
-					info.push({
-						name:players[i].name,
-						identity:players[i].identity,
-						position:players[i].dataset.position
-					});
-				}
-				_status.videoInited=true,
-				info.boss=(game.me==game.boss);
-				game.addVideo('init',null,info);
-				if(game.bossinfo.init){
-					game.bossinfo.init();
-				}
-				"step 5"
-				event.trigger('gameStart');
-				game.gameDraw(game.boss);
-				game.bossPhaseLoop();
-				setTimeout(function(){
-					ui.updatehl();
-				},200);
-			}
-		},
 		bossPhaseLoop:function(){
 			var next=game.createEvent('phaseLoop');
 			next.player=game.boss;
@@ -794,5 +786,4 @@ mode.boss={
 			}
 		}
 	},
-	config:['ban_weak','change_choice','free_choose','']
 }
diff --git a/mode/chess.js b/mode/chess.js
index 79bbc4a96..2f9d302a3 100755
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -2,6 +2,575 @@
 mode.chess={
 	canvasUpdates2:[],
 	hiddenCharacters:[],
+	start:function(){
+		"step 0"
+		_status.mode=get.config('chess_mode');
+		if(_status.mode=='combat'){
+			_status.first_less=true;
+		}
+		"step 1"
+		for(var i in lib.skill){
+			if(lib.skill[i].changeSeat){
+				lib.skill[i]={};
+				if(lib.translate[i+'_info']){
+					lib.translate[i+'_info']='此模式下不可用';
+				}
+			}
+		}
+		lib.init.css('layout/mode','chess');
+		ui.chesssheet=document.createElement('style');
+		document.head.appendChild(ui.chesssheet);
+		var playback=localStorage.getItem(lib.configprefix+'playback');
+		lib.treasurelist=[];
+		lib.mechlist=[];
+		if(get.config('chess_character')||playback||_status.mode=='leader'){
+			for(var i in lib.characterPack.mode_chess){
+				if(i.indexOf('treasure_')==0){
+					lib.treasurelist.push(i);
+				}
+				else if(i.indexOf('chess_mech_')==0){
+					lib.mechlist.push(i);
+				}
+				if(!playback&&i.indexOf('leader_')==0&&_status.mode!='leader') continue;
+				lib.character[i]=lib.characterPack.mode_chess[i];
+				if(!lib.character[i][4]){
+					lib.character[i][4]=[];
+				}
+			}
+		}
+		if(get.config('chess_card')){
+			lib.card.list=lib.card.list.concat(lib.chess_cardlist);
+		}
+		if(parseFloat(get.config('chess_obstacle'))>0&&_status.mode!='tafang'){
+			lib.card.list=lib.card.list.concat(lib.chess_obstaclelist);
+			delete lib.chess_obstaclelist
+		}
+		ui.create.cards();
+		game.finishCards();
+		ui.chessContainer=ui.create.div('#chess-container',ui.arena);
+		lib.setScroll(ui.chessContainer);
+		ui.chessContainer.style.WebkitOverflowScrolling='touch';
+		ui.chess=ui.create.div('#chess',ui.chessContainer);
+		ui.canvas2=document.createElement('canvas');
+		ui.canvas2.id='canvas2';
+		ui.chess.appendChild(ui.canvas2);
+		ui.ctx2=ui.canvas2.getContext('2d');
+		game.me=ui.create.player();
+		if(playback){
+			for(var i in lib.characterPack){
+				for(var j in lib.characterPack[i]){
+					lib.character[j]=lib.character[j]||lib.characterPack[i][j];
+				}
+			}
+			game.pause();
+			ui.system.style.display='none';
+			_status.playback=playback;
+			localStorage.removeItem(lib.configprefix+'playback');
+			var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
+			store.get(parseInt(playback)).onsuccess=function(e){
+				if(e.target.result){
+					event.video=e.target.result.video;
+					game.resume();
+				}
+				else{
+					alert('播放失败：找不到录像');
+					game.reload();
+				}
+			}
+		}
+		else{
+			switch(_status.mode){
+				case 'leader':{
+					game.leaderView();
+					break;
+				}
+				case 'combat':{
+					if(lib.storage.test){
+						lib.config.game_speed='vfast';
+						_status.auto=true;
+						setTimeout(function(){
+							console.log(get.translation(game.players));
+							ui.updatehl();
+						},500);
+						ui.auto.classList.add('glow');
+					}
+					game.chooseCharacter();
+					break;
+				}
+				case 'tafang':{
+					_status.mylist=[];
+					_status.enemylist=[];
+					break;
+				}
+				default:{
+					game.chooseCharacter();
+				}
+			}
+		}
+		"step 2"
+		ui.arena.classList.add('chess');
+		var mylistmap,enemylistmap;
+		if(event.video){
+			var videocontent;
+			for(var ii=0;ii<event.video.length;ii++){
+				if(event.video[ii].type=='init'){
+					videocontent=event.video[ii].content;
+					break;
+				}
+			}
+			_status.mylist=[];
+			_status.enemylist=[];
+			mylistmap=[];
+			enemylistmap=[];
+			for(var i=0;i<videocontent.length;i++){
+				if(videocontent[i].lord){
+					_status.lord=videocontent[i].name;
+				}
+				if(videocontent[i].identity=='friend'){
+					_status.mylist.push(videocontent[i].name);
+					mylistmap.push(videocontent[i].position);
+				}
+				else{
+					_status.enemylist.push(videocontent[i].name);
+					enemylistmap.push(videocontent[i].position);
+				}
+			}
+			game.playerMap=lib.posmap;
+		}
+		var	num=Math.round((_status.mylist.length+_status.enemylist.length)/2);
+		var friend,enemy;
+		var side;
+		if(_status.mode=='leader'){
+			side=true;
+		}
+		else{
+			side=Math.random()<0.5;
+		}
+
+		if(_status.mode=='tafang'){
+			ui.chesswidth=parseInt(get.config('tafang_size'));
+			ui.chessheight=11;
+		}
+		else{
+			switch(num){
+				case 1:ui.chessheight=4;break;
+				case 2:ui.chessheight=5;break;
+				case 3:ui.chessheight=5;break;
+				case 4:ui.chessheight=6;break;
+				case 5:ui.chessheight=6;break;
+				case 6:ui.chessheight=7;break;
+				case 7:ui.chessheight=7;break;
+				case 8:ui.chessheight=8;break;
+				default:ui.chessheight=8;
+			}
+			ui.chesswidth=Math.round(ui.chessheight*1.5);
+		}
+		if(num==1) ui.chesswidth++;
+		ui.chess.style.height=148*ui.chessheight+'px';
+		ui.chess.style.width=148*ui.chesswidth+'px';
+		if(!lib.config.touchscreen){
+			ui.chess.addEventListener('mousedown',function(e){
+				if(Array.isArray(e.path)){
+					for(var i=0;i<e.path.length;i++){
+						var itemtype=get.itemtype(e.path[i]);
+						if(itemtype=='button'||itemtype=='card'||itemtype=='player'){
+							return;
+						}
+					}
+				}
+				this._chessdrag=[e,this.parentNode.scrollLeft,this.parentNode.scrollTop];
+			});
+			ui.chess.addEventListener('mouseleave',function(){
+				this._chessdrag=null;
+			});
+			ui.chess.addEventListener('mouseup',function(){
+				if(this._chessdrag){
+					this._chessdrag=null;
+				}
+			});
+			ui.chess.addEventListener('mousemove',function(e){
+				if(this._chessdrag){
+					this.parentNode.scrollLeft=this._chessdrag[1]-e.x+this._chessdrag[0].x;
+					this.parentNode.scrollTop=this._chessdrag[2]-e.y+this._chessdrag[0].y;
+					_status.clicked=true;
+				}
+				e.preventDefault();
+			});
+			ui.chessContainer.addEventListener('mousewheel',function(){
+				if(_status.currentChessFocus){
+					clearInterval(_status.currentChessFocus);
+					delete _status.currentChessFocus;
+				}
+			});
+		}
+
+		ui.chessscroll1=ui.create.div('.chessscroll.left',ui.chessContainer);
+		ui.chessscroll2=ui.create.div('.chessscroll.right',ui.chessContainer);
+		var chessscroll=function(){
+			if(lib.config.touchscreen) return;
+			var direction=this.direction;
+			var speed=parseInt(get.config('chessscroll_speed'));
+			if(!speed) return;
+			var interval=setInterval(function(){
+				ui.chessContainer.scrollLeft+=speed*direction;
+			},16);
+			_status.chessscrolling=interval;
+		};
+		var leavescroll=function(){
+			if(_status.chessscrolling){
+				clearInterval(_status.chessscrolling);
+				delete _status.chessscrolling;
+			}
+		};
+		ui.chessscroll1.direction=-1;
+		ui.chessscroll1.addEventListener('mouseenter',chessscroll);
+		ui.chessscroll1.addEventListener('mouseleave',leavescroll);
+
+		ui.chessscroll2.direction=1;
+		ui.chessscroll2.addEventListener('mouseenter',chessscroll);
+		ui.chessscroll2.addEventListener('mouseleave',leavescroll);
+
+		for(var i=0;i<ui.chesswidth;i++){
+			for(var j=0;j<ui.chessheight;j++){
+				var pos='[data-position="'+(i+j*ui.chesswidth)+'"]';
+				ui.chesssheet.sheet.insertRule('#arena.chess #chess>.player'+pos+
+				'{left:'+(14+i*148)+'px;top:'+(14+j*148)+'px}',0);
+				ui.chesssheet.sheet.insertRule('#arena.chess #chess>.card'+pos+
+				'{left:'+(22+i*148)+'px;top:'+(22+j*148)+'px}',0);
+				ui.chesssheet.sheet.insertRule('#arena.chess #chess>.popup'+pos+
+				'{left:'+(19+i*148)+'px;top:'+(142+j*148)+'px}',0);
+			}
+		}
+
+		var grids=[];
+		var gridnum=ui.chessheight*ui.chesswidth;
+		for(var i=0;i<gridnum;i++){
+			grids.push(i);
+		}
+		event.obs=[];
+		if(!event.video){
+			var tafanglist=[0,2,3,5,6,8,9,11,12];
+			if(_status.mode=='tafang'){
+				for(var i=0;i<ui.chessheight-1;i++){
+					for(var j=0;j<ui.chesswidth;j++){
+						if(i>=8&&j!=0&&j!=ui.chesswidth-1) continue;
+						if(tafanglist.contains(j)){
+							var cg=i*ui.chesswidth+j;
+							grids.remove(cg);
+							game.addObstacle(cg.toString(),false);
+							event.obs.push(cg.toString());
+						}
+					}
+				}
+				for(var i=0;i<ui.chesswidth;i++){
+					switch(ui.chesswidth){
+						case 6:if(i==2||i==3) continue;break;
+						case 9:if(i==3||i==4||i==5) continue;break;
+						case 12:if(i==4||i==5||i==6||i==7) continue;break;
+					}
+					var cg=(ui.chessheight-1)*ui.chesswidth+i;
+					grids.remove(cg);
+					game.addObstacle(cg.toString(),false);
+					event.obs.push(cg.toString());
+				}
+			}
+			else{
+				var nco=parseFloat(get.config('chess_obstacle'));
+				if(nco>0){
+					var ng=Math.floor(gridnum*nco);
+					for(var i=0;i<ng;i++){
+						var cg=grids.randomRemove();
+						game.addObstacle(cg.toString(),false);
+						event.obs.push(cg.toString());
+					}
+				}
+			}
+		}
+		_status.enemyCount=_status.enemylist.length;
+		_status.friendCount=_status.mylist.length;
+		while(_status.mylist.length){
+			friend=ui.create.player().animate('start');
+			if(!event.friendZhu){
+				event.friendZhu=friend;
+			}
+			else if(!event.friendViceZhu){
+				event.friendViceZhu=friend;
+			}
+			friend.init(_status.mylist.shift());
+			friend.side=side;
+			friend.setIdentity('friend');
+			friend.identity='friend';
+			friend.node.identity.dataset.color=get.translation(side+'Color');
+			game.players.push(friend);
+			ui.chess.appendChild(friend);
+			if(event.video){
+				friend.dataset.position=mylistmap.shift();
+			}
+			else{
+				friend.dataset.position=grids.randomRemove();
+				if(_status.enterArena&&game.data.arena.acted.contains(friend.name)){
+					friend.hp--;
+					friend.update();
+				}
+				if(_status.enterArena){
+					friend.addSkill('arenaAdd');
+				}
+			}
+			lib.posmap[friend.dataset.position]=friend;
+		}
+		while(_status.enemylist.length){
+			enemy=ui.create.player().animate('start');
+			enemy.init(_status.enemylist.shift());
+			enemy.side=!side;
+			enemy.setIdentity('enemy');
+			enemy.identity='enemy';
+			enemy.node.identity.dataset.color=get.translation(!side+'Color');
+			game.players.push(enemy);
+			ui.chess.appendChild(enemy);
+			if(event.video){
+				enemy.dataset.position=enemylistmap.shift();
+			}
+			else{
+				enemy.dataset.position=grids.randomRemove();
+			}
+			lib.posmap[enemy.dataset.position]=enemy;
+		}
+
+		lib.setPopped(ui.create.system('手牌',null,true),function(){
+			var uiintro=ui.create.dialog('hidden');
+			var added=false;
+			for(var i=0;i<game.players.length;i++){
+				if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
+					added=true;
+					uiintro.add(get.translation(game.players[i]));
+					var cards=game.players[i].get('h');
+					if(cards.length){
+						uiintro.addSmall(cards,true);
+					}
+					else{
+						uiintro.add('（无）');
+					}
+				}
+			}
+			if(!added){
+				uiintro.add('无队友');
+			}
+
+			return uiintro;
+		},220);
+		if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&(_status.replacelist.length||get.config('additional_player'))){
+			_status.enemyDied=0;
+			_status.friendDied=0;
+			ui.enemyDied=ui.create.system('杀敌: '+get.cnNumber(0),null,true);
+			ui.friendDied=ui.create.system('阵亡: '+get.cnNumber(0),null,true);
+			if(!get.config('additional_player')){
+				lib.setPopped(ui.friendDied,function(){
+					if(_status.replacelist.length){
+						var uiintro=ui.create.dialog('hidden');
+
+						uiintro.add('未上场');
+						uiintro.add([_status.replacelist,'character']);
+
+						return uiintro;
+					}
+				});
+			}
+		}
+		if(!event.video&&_status.mode=='combat'&&!get.config('single_control')&&!_status.boss){
+			ui.single_swap=ui.create.system('换人',function(){
+				var bool=false;
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
+						bool=true;
+						break;
+					}
+				}
+				if(bool){
+					if(ui.auto.classList.contains('hidden')){
+						game.me.popup('请稍后换人');
+						return;
+					}
+					if(_status.event.isMine()){
+						ui.click.auto();
+						setTimeout(function(){
+							ui.click.auto();
+						},500);
+					}
+					var player=game.me;
+					for(var i=0;i<game.players.length;i++){
+						player=player.next;
+						if(player.side==game.me.side){
+							game.modeSwapPlayer(player);
+							return;
+						}
+					}
+				}
+			},true);
+		}
+		if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&get.config('additional_player')){
+			var finishGameBr=document.createElement('br');
+			finishGameBr.classList.add('finish_game');
+			ui.finishGame=ui.create.system('结束游戏',function(){
+				ui.finishGame.remove();
+				if(_status.friendDied<_status.enemyDied){
+					game.forceOver(true);
+				}
+				else if(_status.friendDied>_status.enemyDied){
+					game.forceOver(false);
+				}
+				else{
+					game.forceOver();
+				}
+			});
+			ui.finishGame.classList.add('finish_game');
+			ui.finishGame.parentNode.insertBefore(finishGameBr,ui.finishGame);
+		}
+
+		ui.create.me();
+		ui.create.fakeme();
+
+		if(!event.video&&_status.mode=='combat'&&get.config('zhu')&&!_status.vsboss&&game.players.length>2){
+			game.friendZhu=event.friendZhu;
+			game.friendZhu.hp++;
+			game.friendZhu.maxHp++;
+			game.friendZhu.update();
+			game.friendZhu.node.identity.firstChild.innerHTML='将';
+
+			for(var i=0;i<game.players.length;i++){
+				if(game.players[i].side!=game.me.side){
+					game.enemyZhu=game.players[i];
+					game.players[i].hp++;
+					game.players[i].maxHp++;
+					game.players[i].update();
+					game.players[i].node.identity.firstChild.innerHTML='帅';
+					break;
+				}
+			}
+
+			if(get.config('main_zhu')&&event.friendViceZhu){
+				game.friendViceZhu=event.friendViceZhu;
+				game.friendViceZhu.node.identity.firstChild.innerHTML='仕';
+				for(var i=0;i<game.players.length;i++){
+					if(game.players[i].side!=game.me.side&&game.players[i]!=game.enemyZhu){
+						game.enemyViceZhu=game.players[i];
+						game.players[i].node.identity.firstChild.innerHTML='士';
+						break;
+					}
+				}
+			}
+		}
+
+		ui.chessinfo=ui.create.div('.fakeme.player',ui.me,function(e){
+			e.stopPropagation();
+		});
+		lib.setScroll(ui.chessinfo);
+
+		game.arrangePlayers();
+		"step 3"
+		ui.control.style.display='';
+		var p;
+		for(var i=0;i<game.players.length;i++){
+			if(_status.lord){
+				if(game.players[i].name==_status.lord){
+					p=game.players[i];
+					p.addSkill('tongshuai');
+					p.addSkill('leader_zhaoxiang');
+					break;
+				}
+			}
+			else{
+				if(game.players[i].side){
+					p=game.players[i];
+					break;
+				}
+			}
+		}
+		if(event.video){
+			game.playVideoContent(event.video);
+			game.setChessInfo(p);
+			return;
+		}
+
+		var players=get.players(lib.sort.position);
+		var info=[];
+		for(var i=0;i<players.length;i++){
+			info.push({
+				name:players[i].name,
+				identity:players[i].identity,
+				position:players[i].dataset.position,
+				lord:players[i].name==_status.lord
+			});
+		}
+		_status.videoInited=true;
+		game.addVideo('init',null,info);
+		if(game.friendZhu){
+			game.addVideo('identityText',game.friendZhu,'将');
+			game.addVideo('identityText',game.enemyZhu,'帅');
+			if(game.friendViceZhu){
+				game.addVideo('identityText',game.friendViceZhu,'仕');
+				game.addVideo('identityText',game.enemyViceZhu,'士');
+			}
+		}
+		if(event.obs){
+			game.addVideo('initobs',null,event.obs);
+		}
+
+		if(_status.mode=='tafang'){
+			ui.me.querySelector('.fakeme.player').hide();
+			ui.me.querySelector('.fakeme.avatar').hide();
+
+			var list=[];
+			for(i in lib.character){
+				if(i.indexOf('treasure_')==0) continue;
+				if(i.indexOf('chess_mech_')==0) continue;
+				if(lib.character[i][4]&&lib.character[i][4].contains('forbidai')) continue;
+				if(lib.character[i][4].contains('minskin')) continue;
+				if(lib.config.forbidai.contains(i)) continue;
+				if(lib.config.forbidall.contains(i)) continue;
+				if(lib.config.forbidchess.contains(i)) continue;
+				if(lib.config.banned.contains(i)) continue;
+				if(get.config('ban_weak')&&lib.config.forbidsingle.contains(i)) continue;
+				if(get.config('ban_weak')&&(lib.rank.c.contains(i)||lib.rank.d.contains(i))) continue;
+				if(get.config('ban_strong')&&(lib.rank.s.contains(i)||lib.rank.ap.contains(i))) continue;
+				if(lib.character[i][4].contains('boss')) continue;
+				list.push(i);
+			}
+			list.randomSort();
+			_status.characterList=list;
+			_status.friends=[];
+			_status.enemies=[];
+			_status.turnCount=0;
+			_status.turnTotal=parseInt(get.config('tafang_turn'));
+			ui.turnCount=ui.create.system('',null,true);
+			_status.remainingCount=0;
+			game.me.side=true;
+
+			_status.tafangend=[];
+			for(var i=0;i<ui.chesswidth;i++){
+				var tafangdes=ui.chesswidth*(ui.chessheight-1)+i;
+				if(!lib.posmap[tafangdes]){
+					_status.tafangend.push(tafangdes.toString());
+				}
+			}
+
+			game.phaseLoopTafang();
+		}
+		else{
+			event.trigger('gameStart');
+			game.gameDraw(p);
+			game.me.classList.add('current_action');
+			if(_status.mode=='leader'){
+				game.phaseLoopOrdered(p);
+			}
+			else if(get.config('seat_order')=='交替'){
+				game.phaseLoopOrdered(p);
+			}
+			else{
+				game.phaseLoop(p);
+			}
+			game.setChessInfo(p);
+		}
+	},
 	element:{
 		card:{
 			moveTo:function(player,method){
@@ -1706,582 +2275,6 @@ mode.chess={
 				}
 			}
 		},
-		start:function(){
-			var next=game.createEvent('game',false);
-			next.content=function(){
-				"step 0"
-				if(lib.db&&!_status.characterLoaded){
-					_status.waitingForCharacters=true;
-					game.pause();
-				}
-				_status.mode=get.config('chess_mode');
-				if(_status.mode=='combat'){
-					_status.first_less=true;
-				}
-				"step 1"
-				for(var i in lib.skill){
-					if(lib.skill[i].changeSeat){
-						lib.skill[i]={};
-						if(lib.translate[i+'_info']){
-							lib.translate[i+'_info']='此模式下不可用';
-						}
-					}
-				}
-				lib.init.css('layout/mode','chess');
-				ui.chesssheet=document.createElement('style');
-				document.head.appendChild(ui.chesssheet);
-				var playback=localStorage.getItem(lib.configprefix+'playback');
-				lib.treasurelist=[];
-				lib.mechlist=[];
-				if(get.config('chess_character')||playback||_status.mode=='leader'){
-					for(var i in lib.characterPack.mode_chess){
-						if(i.indexOf('treasure_')==0){
-							lib.treasurelist.push(i);
-						}
-						else if(i.indexOf('chess_mech_')==0){
-							lib.mechlist.push(i);
-						}
-						if(!playback&&i.indexOf('leader_')==0&&_status.mode!='leader') continue;
-						lib.character[i]=lib.characterPack.mode_chess[i];
-						if(!lib.character[i][4]){
-							lib.character[i][4]=[];
-						}
-					}
-				}
-				if(get.config('chess_card')){
-					lib.card.list=lib.card.list.concat(lib.chess_cardlist);
-				}
-				if(parseFloat(get.config('chess_obstacle'))>0&&_status.mode!='tafang'){
-					lib.card.list=lib.card.list.concat(lib.chess_obstaclelist);
-					delete lib.chess_obstaclelist
-				}
-				ui.create.cards();
-				game.finishCards();
-				ui.chessContainer=ui.create.div('#chess-container',ui.arena);
-				lib.setScroll(ui.chessContainer);
-				ui.chessContainer.style.WebkitOverflowScrolling='touch';
-				ui.chess=ui.create.div('#chess',ui.chessContainer);
-				ui.canvas2=document.createElement('canvas');
-				ui.canvas2.id='canvas2';
-				ui.chess.appendChild(ui.canvas2);
-				ui.ctx2=ui.canvas2.getContext('2d');
-				game.me=ui.create.player();
-				if(playback){
-					for(var i in lib.characterPack){
-						for(var j in lib.characterPack[i]){
-							lib.character[j]=lib.character[j]||lib.characterPack[i][j];
-						}
-					}
-					game.pause();
-					ui.system.style.display='none';
-					_status.playback=playback;
-					localStorage.removeItem(lib.configprefix+'playback');
-					var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
-					store.get(parseInt(playback)).onsuccess=function(e){
-						if(e.target.result){
-							event.video=e.target.result.video;
-							game.resume();
-						}
-						else{
-							alert('播放失败：找不到录像');
-							game.reload();
-						}
-					}
-				}
-				else{
-					switch(_status.mode){
-						case 'leader':{
-							game.leaderView();
-							break;
-						}
-						case 'combat':{
-							if(lib.storage.test){
-								lib.config.game_speed='vfast';
-								_status.auto=true;
-								setTimeout(function(){
-									console.log(get.translation(game.players));
-									ui.updatehl();
-								},500);
-								ui.auto.classList.add('glow');
-							}
-							game.chooseCharacter();
-							break;
-						}
-						case 'tafang':{
-							_status.mylist=[];
-							_status.enemylist=[];
-							break;
-						}
-						default:{
-							game.chooseCharacter();
-						}
-					}
-				}
-				"step 2"
-				ui.arena.classList.add('chess');
-				var mylistmap,enemylistmap;
-				if(event.video){
-					var videocontent;
-					for(var ii=0;ii<event.video.length;ii++){
-						if(event.video[ii].type=='init'){
-							videocontent=event.video[ii].content;
-							break;
-						}
-					}
-					_status.mylist=[];
-					_status.enemylist=[];
-					mylistmap=[];
-					enemylistmap=[];
-					for(var i=0;i<videocontent.length;i++){
-						if(videocontent[i].lord){
-							_status.lord=videocontent[i].name;
-						}
-						if(videocontent[i].identity=='friend'){
-							_status.mylist.push(videocontent[i].name);
-							mylistmap.push(videocontent[i].position);
-						}
-						else{
-							_status.enemylist.push(videocontent[i].name);
-							enemylistmap.push(videocontent[i].position);
-						}
-					}
-					game.playerMap=lib.posmap;
-				}
-				var	num=Math.round((_status.mylist.length+_status.enemylist.length)/2);
-				var friend,enemy;
-				var side;
-				if(_status.mode=='leader'){
-					side=true;
-				}
-				else{
-					side=Math.random()<0.5;
-				}
-
-				if(_status.mode=='tafang'){
-					ui.chesswidth=parseInt(get.config('tafang_size'));
-					ui.chessheight=11;
-				}
-				else{
-					switch(num){
-						case 1:ui.chessheight=4;break;
-						case 2:ui.chessheight=5;break;
-						case 3:ui.chessheight=5;break;
-						case 4:ui.chessheight=6;break;
-						case 5:ui.chessheight=6;break;
-						case 6:ui.chessheight=7;break;
-						case 7:ui.chessheight=7;break;
-						case 8:ui.chessheight=8;break;
-						default:ui.chessheight=8;
-					}
-					ui.chesswidth=Math.round(ui.chessheight*1.5);
-				}
-				if(num==1) ui.chesswidth++;
-				ui.chess.style.height=148*ui.chessheight+'px';
-				ui.chess.style.width=148*ui.chesswidth+'px';
-				if(!lib.config.touchscreen){
-					ui.chess.addEventListener('mousedown',function(e){
-						if(Array.isArray(e.path)){
-							for(var i=0;i<e.path.length;i++){
-								var itemtype=get.itemtype(e.path[i]);
-								if(itemtype=='button'||itemtype=='card'||itemtype=='player'){
-									return;
-								}
-							}
-						}
-						this._chessdrag=[e,this.parentNode.scrollLeft,this.parentNode.scrollTop];
-					});
-					ui.chess.addEventListener('mouseleave',function(){
-						this._chessdrag=null;
-					});
-					ui.chess.addEventListener('mouseup',function(){
-						if(this._chessdrag){
-							this._chessdrag=null;
-						}
-					});
-					ui.chess.addEventListener('mousemove',function(e){
-						if(this._chessdrag){
-							this.parentNode.scrollLeft=this._chessdrag[1]-e.x+this._chessdrag[0].x;
-							this.parentNode.scrollTop=this._chessdrag[2]-e.y+this._chessdrag[0].y;
-							_status.clicked=true;
-						}
-						e.preventDefault();
-					});
-					ui.chessContainer.addEventListener('mousewheel',function(){
-						if(_status.currentChessFocus){
-							clearInterval(_status.currentChessFocus);
-							delete _status.currentChessFocus;
-						}
-					});
-				}
-
-				ui.chessscroll1=ui.create.div('.chessscroll.left',ui.chessContainer);
-				ui.chessscroll2=ui.create.div('.chessscroll.right',ui.chessContainer);
-				var chessscroll=function(){
-					if(lib.config.touchscreen) return;
-					var direction=this.direction;
-					var speed=parseInt(get.config('chessscroll_speed'));
-					if(!speed) return;
-					var interval=setInterval(function(){
-						ui.chessContainer.scrollLeft+=speed*direction;
-					},16);
-					_status.chessscrolling=interval;
-				};
-				var leavescroll=function(){
-					if(_status.chessscrolling){
-						clearInterval(_status.chessscrolling);
-						delete _status.chessscrolling;
-					}
-				};
-				ui.chessscroll1.direction=-1;
-				ui.chessscroll1.addEventListener('mouseenter',chessscroll);
-				ui.chessscroll1.addEventListener('mouseleave',leavescroll);
-
-				ui.chessscroll2.direction=1;
-				ui.chessscroll2.addEventListener('mouseenter',chessscroll);
-				ui.chessscroll2.addEventListener('mouseleave',leavescroll);
-
-				for(var i=0;i<ui.chesswidth;i++){
-					for(var j=0;j<ui.chessheight;j++){
-						var pos='[data-position="'+(i+j*ui.chesswidth)+'"]';
-						ui.chesssheet.sheet.insertRule('#arena.chess #chess>.player'+pos+
-						'{left:'+(14+i*148)+'px;top:'+(14+j*148)+'px}',0);
-						ui.chesssheet.sheet.insertRule('#arena.chess #chess>.card'+pos+
-						'{left:'+(22+i*148)+'px;top:'+(22+j*148)+'px}',0);
-						ui.chesssheet.sheet.insertRule('#arena.chess #chess>.popup'+pos+
-						'{left:'+(19+i*148)+'px;top:'+(142+j*148)+'px}',0);
-					}
-				}
-
-				var grids=[];
-				var gridnum=ui.chessheight*ui.chesswidth;
-				for(var i=0;i<gridnum;i++){
-					grids.push(i);
-				}
-				event.obs=[];
-				if(!event.video){
-					var tafanglist=[0,2,3,5,6,8,9,11,12];
-					if(_status.mode=='tafang'){
-						for(var i=0;i<ui.chessheight-1;i++){
-							for(var j=0;j<ui.chesswidth;j++){
-								if(i>=8&&j!=0&&j!=ui.chesswidth-1) continue;
-								if(tafanglist.contains(j)){
-									var cg=i*ui.chesswidth+j;
-									grids.remove(cg);
-									game.addObstacle(cg.toString(),false);
-									event.obs.push(cg.toString());
-								}
-							}
-						}
-						for(var i=0;i<ui.chesswidth;i++){
-							switch(ui.chesswidth){
-								case 6:if(i==2||i==3) continue;break;
-								case 9:if(i==3||i==4||i==5) continue;break;
-								case 12:if(i==4||i==5||i==6||i==7) continue;break;
-							}
-							var cg=(ui.chessheight-1)*ui.chesswidth+i;
-							grids.remove(cg);
-							game.addObstacle(cg.toString(),false);
-							event.obs.push(cg.toString());
-						}
-					}
-					else{
-						var nco=parseFloat(get.config('chess_obstacle'));
-						if(nco>0){
-							var ng=Math.floor(gridnum*nco);
-							for(var i=0;i<ng;i++){
-								var cg=grids.randomRemove();
-								game.addObstacle(cg.toString(),false);
-								event.obs.push(cg.toString());
-							}
-						}
-					}
-				}
-				_status.enemyCount=_status.enemylist.length;
-				_status.friendCount=_status.mylist.length;
-				while(_status.mylist.length){
-					friend=ui.create.player().animate('start');
-					if(!event.friendZhu){
-						event.friendZhu=friend;
-					}
-					else if(!event.friendViceZhu){
-						event.friendViceZhu=friend;
-					}
-					friend.init(_status.mylist.shift());
-					friend.side=side;
-					friend.setIdentity('friend');
-					friend.identity='friend';
-					friend.node.identity.dataset.color=get.translation(side+'Color');
-					game.players.push(friend);
-					ui.chess.appendChild(friend);
-					if(event.video){
-						friend.dataset.position=mylistmap.shift();
-					}
-					else{
-						friend.dataset.position=grids.randomRemove();
-						if(_status.enterArena&&game.data.arena.acted.contains(friend.name)){
-							friend.hp--;
-							friend.update();
-						}
-						if(_status.enterArena){
-							friend.addSkill('arenaAdd');
-						}
-					}
-					lib.posmap[friend.dataset.position]=friend;
-				}
-				while(_status.enemylist.length){
-					enemy=ui.create.player().animate('start');
-					enemy.init(_status.enemylist.shift());
-					enemy.side=!side;
-					enemy.setIdentity('enemy');
-					enemy.identity='enemy';
-					enemy.node.identity.dataset.color=get.translation(!side+'Color');
-					game.players.push(enemy);
-					ui.chess.appendChild(enemy);
-					if(event.video){
-						enemy.dataset.position=enemylistmap.shift();
-					}
-					else{
-						enemy.dataset.position=grids.randomRemove();
-					}
-					lib.posmap[enemy.dataset.position]=enemy;
-				}
-
-				lib.setPopped(ui.create.system('手牌',null,true),function(){
-					var uiintro=ui.create.dialog('hidden');
-					var added=false;
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
-							added=true;
-							uiintro.add(get.translation(game.players[i]));
-							var cards=game.players[i].get('h');
-							if(cards.length){
-								uiintro.addSmall(cards,true);
-							}
-							else{
-								uiintro.add('（无）');
-							}
-						}
-					}
-					if(!added){
-						uiintro.add('无队友');
-					}
-
-					return uiintro;
-				},220);
-				if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&(_status.replacelist.length||get.config('additional_player'))){
-					_status.enemyDied=0;
-					_status.friendDied=0;
-					ui.enemyDied=ui.create.system('杀敌: '+get.cnNumber(0),null,true);
-					ui.friendDied=ui.create.system('阵亡: '+get.cnNumber(0),null,true);
-					if(!get.config('additional_player')){
-						lib.setPopped(ui.friendDied,function(){
-							if(_status.replacelist.length){
-								var uiintro=ui.create.dialog('hidden');
-
-								uiintro.add('未上场');
-								uiintro.add([_status.replacelist,'character']);
-
-								return uiintro;
-							}
-						});
-					}
-				}
-				if(!event.video&&_status.mode=='combat'&&!get.config('single_control')&&!_status.boss){
-					ui.single_swap=ui.create.system('换人',function(){
-						var bool=false;
-						for(var i=0;i<game.players.length;i++){
-							if(game.players[i].side==game.me.side&&game.players[i]!=game.me){
-								bool=true;
-								break;
-							}
-						}
-						if(bool){
-							if(ui.auto.classList.contains('hidden')){
-								game.me.popup('请稍后换人');
-								return;
-							}
-							if(_status.event.isMine()){
-								ui.click.auto();
-								setTimeout(function(){
-									ui.click.auto();
-								},500);
-							}
-							var player=game.me;
-							for(var i=0;i<game.players.length;i++){
-								player=player.next;
-								if(player.side==game.me.side){
-									game.modeSwapPlayer(player);
-									return;
-								}
-							}
-						}
-					},true);
-				}
-				if(!event.video&&_status.mode=='combat'&&!_status.vsboss&&get.config('additional_player')){
-					var finishGameBr=document.createElement('br');
-					finishGameBr.classList.add('finish_game');
-					ui.finishGame=ui.create.system('结束游戏',function(){
-						ui.finishGame.remove();
-						if(_status.friendDied<_status.enemyDied){
-							game.forceOver(true);
-						}
-						else if(_status.friendDied>_status.enemyDied){
-							game.forceOver(false);
-						}
-						else{
-							game.forceOver();
-						}
-					});
-					ui.finishGame.classList.add('finish_game');
-					ui.finishGame.parentNode.insertBefore(finishGameBr,ui.finishGame);
-				}
-
-				ui.create.me();
-				ui.create.fakeme();
-
-				if(!event.video&&_status.mode=='combat'&&get.config('zhu')&&!_status.vsboss&&game.players.length>2){
-					game.friendZhu=event.friendZhu;
-					game.friendZhu.hp++;
-					game.friendZhu.maxHp++;
-					game.friendZhu.update();
-					game.friendZhu.node.identity.firstChild.innerHTML='将';
-
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].side!=game.me.side){
-							game.enemyZhu=game.players[i];
-							game.players[i].hp++;
-							game.players[i].maxHp++;
-							game.players[i].update();
-							game.players[i].node.identity.firstChild.innerHTML='帅';
-							break;
-						}
-					}
-
-					if(get.config('main_zhu')&&event.friendViceZhu){
-						game.friendViceZhu=event.friendViceZhu;
-						game.friendViceZhu.node.identity.firstChild.innerHTML='仕';
-						for(var i=0;i<game.players.length;i++){
-							if(game.players[i].side!=game.me.side&&game.players[i]!=game.enemyZhu){
-								game.enemyViceZhu=game.players[i];
-								game.players[i].node.identity.firstChild.innerHTML='士';
-								break;
-							}
-						}
-					}
-				}
-
-				ui.chessinfo=ui.create.div('.fakeme.player',ui.me,function(e){
-					e.stopPropagation();
-				});
-				lib.setScroll(ui.chessinfo);
-
-				game.arrangePlayers();
-				"step 3"
-				ui.control.style.display='';
-				var p;
-				for(var i=0;i<game.players.length;i++){
-					if(_status.lord){
-						if(game.players[i].name==_status.lord){
-							p=game.players[i];
-							p.addSkill('tongshuai');
-							p.addSkill('leader_zhaoxiang');
-							break;
-						}
-					}
-					else{
-						if(game.players[i].side){
-							p=game.players[i];
-							break;
-						}
-					}
-				}
-				if(event.video){
-					game.playVideoContent(event.video);
-					game.setChessInfo(p);
-					return;
-				}
-
-				var players=get.players(lib.sort.position);
-				var info=[];
-				for(var i=0;i<players.length;i++){
-					info.push({
-						name:players[i].name,
-						identity:players[i].identity,
-						position:players[i].dataset.position,
-						lord:players[i].name==_status.lord
-					});
-				}
-				_status.videoInited=true;
-				game.addVideo('init',null,info);
-				if(game.friendZhu){
-					game.addVideo('identityText',game.friendZhu,'将');
-					game.addVideo('identityText',game.enemyZhu,'帅');
-					if(game.friendViceZhu){
-						game.addVideo('identityText',game.friendViceZhu,'仕');
-						game.addVideo('identityText',game.enemyViceZhu,'士');
-					}
-				}
-				if(event.obs){
-					game.addVideo('initobs',null,event.obs);
-				}
-
-				if(_status.mode=='tafang'){
-					ui.me.querySelector('.fakeme.player').hide();
-					ui.me.querySelector('.fakeme.avatar').hide();
-
-					var list=[];
-					for(i in lib.character){
-						if(i.indexOf('treasure_')==0) continue;
-						if(i.indexOf('chess_mech_')==0) continue;
-						if(lib.character[i][4]&&lib.character[i][4].contains('forbidai')) continue;
-						if(lib.character[i][4].contains('minskin')) continue;
-						if(lib.config.forbidai.contains(i)) continue;
-						if(lib.config.forbidall.contains(i)) continue;
-						if(lib.config.forbidchess.contains(i)) continue;
-						if(lib.config.banned.contains(i)) continue;
-						if(get.config('ban_weak')&&lib.config.forbidsingle.contains(i)) continue;
-						if(get.config('ban_weak')&&(lib.rank.c.contains(i)||lib.rank.d.contains(i))) continue;
-						if(get.config('ban_strong')&&(lib.rank.s.contains(i)||lib.rank.ap.contains(i))) continue;
-						if(lib.character[i][4].contains('boss')) continue;
-						list.push(i);
-					}
-					list.randomSort();
-					_status.characterList=list;
-					_status.friends=[];
-					_status.enemies=[];
-					_status.turnCount=0;
-					_status.turnTotal=parseInt(get.config('tafang_turn'));
-					ui.turnCount=ui.create.system('',null,true);
-					_status.remainingCount=0;
-					game.me.side=true;
-
-					_status.tafangend=[];
-					for(var i=0;i<ui.chesswidth;i++){
-						var tafangdes=ui.chesswidth*(ui.chessheight-1)+i;
-						if(!lib.posmap[tafangdes]){
-							_status.tafangend.push(tafangdes.toString());
-						}
-					}
-
-					game.phaseLoopTafang();
-				}
-				else{
-					event.trigger('gameStart');
-					game.gameDraw(p);
-					game.me.classList.add('current_action');
-					if(_status.mode=='leader'){
-						game.phaseLoopOrdered(p);
-					}
-					else if(get.config('seat_order')=='交替'){
-						game.phaseLoopOrdered(p);
-					}
-					else{
-						game.phaseLoop(p);
-					}
-					game.setChessInfo(p);
-				}
-			}
-		},
 		setChessInfo:function(p){
 			if(!p){
 				if(ui.phasequeue&&ui.phasequeue.length){
diff --git a/mode/guozhan.js b/mode/guozhan.js
index 99a646154..2d2c0dce0 100755
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1,5 +1,103 @@
 'use strict';
 mode.guozhan={
+	start:function(){
+		"step 0"
+		var playback=localStorage.getItem(lib.configprefix+'playback');
+		if(playback){
+			ui.create.me();
+			ui.arena.style.display='none';
+			ui.system.style.display='none';
+			_status.playback=playback;
+			localStorage.removeItem(lib.configprefix+'playback');
+			var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
+			store.get(parseInt(playback)).onsuccess=function(e){
+				if(e.target.result){
+					game.playVideoContent(e.target.result.video);
+				}
+				else{
+					alert('播放失败：找不到录像');
+					game.reload();
+				}
+			}
+			event.finish();
+		}
+		else{
+			game.prepareArena();
+			game.delay();
+			game.showChangeLog();
+		}
+		"step 1"
+		if(lib.storage.test){
+			lib.config.game_speed='vfast';
+			lib.config.low_performance=true;
+			_status.auto=true;
+			ui.auto.classList.add('glow');
+		}
+		for(var i=0;i<game.players.length;i++){
+			game.players[i].node.name.hide();
+			game.players[i].node.name2.hide();
+		}
+		game.chooseCharacter();
+		"step 2"
+		if(ui.coin){
+			_status.coinCoeff=get.coinCoeff([game.me.name1,game.me.name2]);
+		}
+		if(lib.storage.test){
+			var str='';
+			for(var i=0;i<game.players.length;i++){
+				str+=get.translation(game.players[i].name1)+' '+get.translation(game.players[i].name2)+'; ';
+			}
+			console.log(str);
+		}
+		var player;
+		if(_status.cheat_seat){
+			var seat=_status.cheat_seat.link;
+			if(seat==0){
+				player=game.me;
+			}
+			else{
+				player=game.players[game.players.length-seat];
+			}
+			if(!player) player=game.me;
+			delete _status.cheat_seat;
+		}
+		else{
+			player=game.players[Math.floor(Math.random()*game.players.length)];
+		}
+		event.trigger('gameStart');
+
+		game.gameDraw(player);
+		for(var i=0;i<game.players.length;i++){
+			game.players[i].name='unknown'+get.distance(player,game.players[i],'absolute');
+			game.players[i].node.name_seat=ui.create.div('.name.name_seat',get.verticalStr(lib.translate[game.players[i].name]),game.players[i]);
+			if(game.players[i]==game.me){
+				lib.translate[game.players[i].name]+='（你）';
+			}
+		}
+
+
+		var players=get.players(lib.sort.position);
+		var info=[];
+		for(var i=0;i<players.length;i++){
+			info.push({
+				name:game.players[i].name,
+				translate:lib.translate[game.players[i].name],
+				name1:players[i].name1,
+				name2:players[i].name2,
+			});
+		}
+		_status.videoInited=true,
+		game.addVideo('init',null,info);
+		if(get.config('guozhan_mode')=='mingjiang'){
+			game.showIdentity(true);
+		}
+		else{
+			for(var i=0;i<game.players.length;i++){
+				game.players[i].ai.shown=0;
+			}
+		}
+		game.phaseLoop(player);
+	},
 	game:{
 		addRecord:function(bool){
 			if(typeof bool=='boolean'){
@@ -69,112 +167,6 @@ mode.guozhan={
 			var name=[str,str2];
 			return name;
 		},
-		start:function(){
-			var next=game.createEvent('game',false);
-			next.content=function(){
-				"step 0"
-				if(lib.db&&!_status.characterLoaded){
-					_status.waitingForCharacters=true;
-					game.pause();
-				}
-				"step 1"
-				var playback=localStorage.getItem(lib.configprefix+'playback');
-				if(playback){
-					ui.create.me();
-					ui.arena.style.display='none';
-					ui.system.style.display='none';
-					_status.playback=playback;
-					localStorage.removeItem(lib.configprefix+'playback');
-					var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
-					store.get(parseInt(playback)).onsuccess=function(e){
-						if(e.target.result){
-							game.playVideoContent(e.target.result.video);
-						}
-						else{
-							alert('播放失败：找不到录像');
-							game.reload();
-						}
-					}
-					event.finish();
-				}
-				else{
-					game.prepareArena();
-					game.delay();
-					game.showChangeLog();
-				}
-				"step 2"
-				if(lib.storage.test){
-					lib.config.game_speed='vfast';
-					lib.config.low_performance=true;
-					_status.auto=true;
-					ui.auto.classList.add('glow');
-				}
-				for(var i=0;i<game.players.length;i++){
-					game.players[i].node.name.hide();
-					game.players[i].node.name2.hide();
-				}
-				game.chooseCharacter();
-				"step 3"
-				if(ui.coin){
-					_status.coinCoeff=get.coinCoeff([game.me.name1,game.me.name2]);
-				}
-				if(lib.storage.test){
-					var str='';
-					for(var i=0;i<game.players.length;i++){
-						str+=get.translation(game.players[i].name1)+' '+get.translation(game.players[i].name2)+'; ';
-					}
-					console.log(str);
-				}
-				var player;
-				if(_status.cheat_seat){
-					var seat=_status.cheat_seat.link;
-					if(seat==0){
-						player=game.me;
-					}
-					else{
-						player=game.players[game.players.length-seat];
-					}
-					if(!player) player=game.me;
-					delete _status.cheat_seat;
-				}
-				else{
-					player=game.players[Math.floor(Math.random()*game.players.length)];
-				}
-				event.trigger('gameStart');
-
-				game.gameDraw(player);
-				for(var i=0;i<game.players.length;i++){
-					game.players[i].name='unknown'+get.distance(player,game.players[i],'absolute');
-					game.players[i].node.name_seat=ui.create.div('.name.name_seat',get.verticalStr(lib.translate[game.players[i].name]),game.players[i]);
-					if(game.players[i]==game.me){
-						lib.translate[game.players[i].name]+='（你）';
-					}
-				}
-
-
-				var players=get.players(lib.sort.position);
-				var info=[];
-				for(var i=0;i<players.length;i++){
-					info.push({
-						name:game.players[i].name,
-						translate:lib.translate[game.players[i].name],
-						name1:players[i].name1,
-						name2:players[i].name2,
-					});
-				}
-				_status.videoInited=true,
-				game.addVideo('init',null,info);
-				if(get.config('guozhan_mode')=='mingjiang'){
-					game.showIdentity(true);
-				}
-				else{
-					for(var i=0;i<game.players.length;i++){
-						game.players[i].ai.shown=0;
-					}
-				}
-				game.phaseLoop(player);
-			}
-		},
 		showIdentity:function(started){
 			if(game.phaseNumber==0&&!started) return;
 			for(var i=0;i<game.players.length;i++){
@@ -950,7 +942,4 @@ mode.guozhan={
 			},
 		}
 	},
-	config:['player_number','initshow_draw',
-	'free_choose','change_identity','change_choice','change_card',
-	'swap','dierestart','revive','double_hp','difficulty']
 }
diff --git a/mode/identity.js b/mode/identity.js
index f842d616f..6a9b884a8 100755
--- a/mode/identity.js
+++ b/mode/identity.js
@@ -1,5 +1,208 @@
 'use strict';
 mode.identity={
+	start:function(){
+		"step 0"
+		if(!lib.config.new_tutorial){
+			ui.arena.classList.add('only_dialog');
+		}
+		_status.mode=get.config('identity_mode');
+		"step 1"
+		var playback=localStorage.getItem(lib.configprefix+'playback');
+		if(playback){
+			ui.create.me();
+			ui.arena.style.display='none';
+			ui.system.style.display='none';
+			_status.playback=playback;
+			localStorage.removeItem(lib.configprefix+'playback');
+			var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
+			store.get(parseInt(playback)).onsuccess=function(e){
+				if(e.target.result){
+					game.playVideoContent(e.target.result.video);
+				}
+				else{
+					alert('播放失败：找不到录像');
+					game.reload();
+				}
+			}
+			event.finish();
+		}
+		else{
+			if(_status.mode=='zhong'){
+				game.prepareArena(8);
+			}
+			else{
+				game.prepareArena();
+			}
+			if(!lib.config.new_tutorial){
+				game.delay();
+			}
+		}
+		"step 2"
+		if(!lib.config.new_tutorial){
+			game.saveConfig('version',lib.version);
+			var clear=function(){
+				ui.dialog.close();
+				while(ui.controls.length) ui.controls[0].close();
+			};
+			var clear2=function(){
+				ui.auto.show();
+				ui.arena.classList.remove('only_dialog');
+			};
+			var step1=function(){
+				ui.create.dialog('欢迎来到无名杀，是否进入新手向导？');
+				game.saveConfig('new_tutorial',true);
+				ui.dialog.add('<div class="text center">跳过后，你可以在选项-其它中重置新手向导');
+				ui.auto.hide();
+				ui.create.control('跳过向导',function(){
+					clear();
+					clear2();
+					game.resume();
+				});
+				ui.create.control('继续',step2);
+			}
+			var step2=function(){
+				if(lib.config.layout!='phone'){
+					clear();
+					ui.create.dialog('如果你在使用手机，可能会觉得按钮有点小'+
+					'，将布局改成移动可以使按钮变大');
+					ui.dialog.add('<div class="text center">你可以在选项-外观-布局中更改此设置');
+					var lcontrol=ui.create.control('使用移动布局',function(){
+						if(lib.config.layout=='phone'){
+							ui.control.firstChild.firstChild.innerHTML='使用移动布局';
+							lib.init.layout('mobile');
+						}
+						else{
+							ui.control.firstChild.firstChild.innerHTML='使用默认布局';
+							lib.init.layout('phone');
+						}
+					});
+					ui.create.control('继续',step3);
+				}
+				else{
+					step3();
+				}
+			};
+			var step3=function(){
+				if(lib.config.touchscreen){
+					clear();
+					ui.create.dialog('触屏模式中，下划可以显示菜单，上划可以切换托管，双指单击可以暂停');
+					ui.dialog.add('<div class="text center">你可以在选项-通用-中更改手势设置');
+					ui.create.control('继续',step4);
+				}
+				else{
+					step4();
+				}
+			};
+			var step4=function(){
+				clear();
+				ui.window.classList.add('noclick_important');
+				ui.click.configMenu();
+				ui.control.classList.add('noclick_click_important');
+				ui.control.style.top='calc(100% - 105px)';
+				ui.create.control('在菜单中，可以进行各项设置',function(){
+					ui.click.menuTab('选项');
+					ui.controls[0].replace('如果你感到游戏较卡，可以开启流畅模式',function(){
+						ui.controls[0].replace('在技能一栏中，可以设置自动发动或双将禁配的技能',function(){
+							ui.click.menuTab('武将');
+							ui.controls[0].replace('在武将或卡牌一栏中，单击武将/卡牌可以将其禁用',function(){
+								ui.click.menuTab('战局');
+								ui.controls[0].replace('在战局中可以输入游戏命令，或者管理录像',function(){
+									ui.click.configMenu();
+									ui.window.classList.remove('noclick_important');
+									ui.control.classList.remove('noclick_click_important');
+									ui.control.style.top='';
+									step5();
+								});
+							});
+						});
+					});
+				})
+			};
+			var step5=function(){
+				clear();
+				ui.create.dialog('如果还有其它问题，欢迎来到百度无名杀吧进行交流');
+				ui.create.control('完成',function(){
+					clear();
+					clear2();
+					game.resume();
+				})
+			};
+			game.pause();
+			step1();
+		}
+		else{
+			game.showChangeLog();
+		}
+		"step 3"
+		if(lib.storage.test){
+			lib.config.game_speed='vfast';
+			_status.auto=true;
+			ui.auto.classList.add('glow');
+		}
+		game.chooseCharacter();
+		"step 4"
+		if(ui.coin){
+			_status.coinCoeff=get.coinCoeff([game.me.name]);
+		}
+		if(game.players.length==2){
+			game.showIdentity(true);
+		}
+		else{
+			for(var i=0;i<game.players.length;i++){
+				game.players[i].ai.shown=0;
+			}
+		}
+		game.zhu.ai.shown=1;
+		if(game.zhu2){
+			game.zhong=game.zhu;
+			game.zhu=game.zhu2;
+			delete game.zhu2;
+		}
+		if(_status.mode!='zhong'&&get.config('enhance_zhu')&&get.population('fan')>=3){
+			var skill;
+			switch(game.zhu.name){
+				case 'liubei':skill='jizhen';break;
+				case 'dongzhuo':skill='hengzheng';break;
+				case 'sunquan':skill='batu';break;
+				case 'sp_zhangjiao':skill='tiangong';break;
+				case 'liushan':skill='shengxi';break;
+				case 'sunce':skill='ciqiu';break;
+				case 'yuanshao':skill='geju';break;
+				case 're_caocao':skill='dangping';break;
+				case 'caopi':skill='junxing';break;
+				case 'liuxie':skill='moukui';break;
+				default:skill='tianming';break;
+			}
+			game.zhu.addSkill(skill);
+			game.zhu.storage.enhance_zhu=skill;
+		}
+		if(lib.storage.test){
+			var str='';
+			for(var i=0;i<game.players.length;i++){
+				str+=get.translation(game.players[i]);
+				if(game.players[i]==game.zhu) str+='（主）';
+				str+=' ';
+			}
+			console.log(str);
+			game.showIdentity();
+		}
+		event.trigger('gameStart');
+
+		var players=get.players(lib.sort.position);
+		var info=[];
+		for(var i=0;i<players.length;i++){
+			info.push({
+				name:players[i].name,
+				name2:players[i].name2,
+				identity:players[i].identity
+			});
+		}
+		_status.videoInited=true,
+		game.addVideo('init',null,info);
+
+		game.gameDraw(game.zhong||game.zhu);
+		game.phaseLoop(game.zhong||game.zhu);
+	},
 	game:{
 		getIdentityList:function(player){
 			if(player.identityShown) return;
@@ -71,216 +274,6 @@ mode.identity={
 				game.saveConfig('gameRecord',lib.config.gameRecord);
 			}
 		},
-		start:function(){
-			var next=game.createEvent('game',false);
-			next.content=function(){
-				"step 0"
-				if(lib.db&&!_status.characterLoaded){
-					_status.waitingForCharacters=true;
-					game.pause();
-				}
-				if(!lib.config.new_tutorial){
-					ui.arena.classList.add('only_dialog');
-				}
-				_status.mode=get.config('identity_mode');
-				"step 1"
-				var playback=localStorage.getItem(lib.configprefix+'playback');
-				if(playback){
-					ui.create.me();
-					ui.arena.style.display='none';
-					ui.system.style.display='none';
-					_status.playback=playback;
-					localStorage.removeItem(lib.configprefix+'playback');
-					var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
-					store.get(parseInt(playback)).onsuccess=function(e){
-						if(e.target.result){
-							game.playVideoContent(e.target.result.video);
-						}
-						else{
-							alert('播放失败：找不到录像');
-							game.reload();
-						}
-					}
-					event.finish();
-				}
-				else{
-					if(_status.mode=='zhong'){
-						game.prepareArena(8);
-					}
-					else{
-						game.prepareArena();
-					}
-					if(!lib.config.new_tutorial){
-						game.delay();
-					}
-				}
-				"step 2"
-				if(!lib.config.new_tutorial){
-					game.saveConfig('version',lib.version);
-					var clear=function(){
-						ui.dialog.close();
-						while(ui.controls.length) ui.controls[0].close();
-					};
-					var clear2=function(){
-						ui.auto.show();
-						ui.arena.classList.remove('only_dialog');
-					};
-					var step1=function(){
-						ui.create.dialog('欢迎来到无名杀，是否进入新手向导？');
-						game.saveConfig('new_tutorial',true);
-						ui.dialog.add('<div class="text center">跳过后，你可以在选项-其它中重置新手向导');
-						ui.auto.hide();
-						ui.create.control('跳过向导',function(){
-							clear();
-							clear2();
-							game.resume();
-						});
-						ui.create.control('继续',step2);
-					}
-					var step2=function(){
-						if(lib.config.layout!='phone'){
-							clear();
-							ui.create.dialog('如果你在使用手机，可能会觉得按钮有点小'+
-							'，将布局改成移动可以使按钮变大');
-							ui.dialog.add('<div class="text center">你可以在选项-外观-布局中更改此设置');
-							var lcontrol=ui.create.control('使用移动布局',function(){
-								if(lib.config.layout=='phone'){
-									ui.control.firstChild.firstChild.innerHTML='使用移动布局';
-									lib.init.layout('mobile');
-								}
-								else{
-									ui.control.firstChild.firstChild.innerHTML='使用默认布局';
-									lib.init.layout('phone');
-								}
-							});
-							ui.create.control('继续',step3);
-						}
-						else{
-							step3();
-						}
-					};
-					var step3=function(){
-						if(lib.config.touchscreen){
-							clear();
-							ui.create.dialog('触屏模式中，下划可以显示菜单，上划可以切换托管，双指单击可以暂停');
-							ui.dialog.add('<div class="text center">你可以在选项-通用-中更改手势设置');
-							ui.create.control('继续',step4);
-						}
-						else{
-							step4();
-						}
-					};
-					var step4=function(){
-						clear();
-						ui.window.classList.add('noclick_important');
-						ui.click.configMenu();
-						ui.control.classList.add('noclick_click_important');
-						ui.control.style.top='calc(100% - 105px)';
-						ui.create.control('在菜单中，可以进行各项设置',function(){
-							ui.click.menuTab('选项');
-							ui.controls[0].replace('如果你感到游戏较卡，可以开启流畅模式',function(){
-								ui.controls[0].replace('在技能一栏中，可以设置自动发动或双将禁配的技能',function(){
-									ui.click.menuTab('武将');
-									ui.controls[0].replace('在武将或卡牌一栏中，单击武将/卡牌可以将其禁用',function(){
-										ui.click.menuTab('战局');
-										ui.controls[0].replace('在战局中可以输入游戏命令，或者管理录像',function(){
-											ui.click.configMenu();
-											ui.window.classList.remove('noclick_important');
-											ui.control.classList.remove('noclick_click_important');
-											ui.control.style.top='';
-											step5();
-										});
-									});
-								});
-							});
-						})
-					};
-					var step5=function(){
-						clear();
-						ui.create.dialog('如果还有其它问题，欢迎来到百度无名杀吧进行交流');
-						ui.create.control('完成',function(){
-							clear();
-							clear2();
-							game.resume();
-						})
-					};
-					game.pause();
-					step1();
-				}
-				else{
-					game.showChangeLog();
-				}
-				"step 3"
-				if(lib.storage.test){
-					lib.config.game_speed='vfast';
-					_status.auto=true;
-					ui.auto.classList.add('glow');
-				}
-				game.chooseCharacter();
-				"step 4"
-				if(ui.coin){
-					_status.coinCoeff=get.coinCoeff([game.me.name]);
-				}
-				if(game.players.length==2){
-					game.showIdentity(true);
-				}
-				else{
-					for(var i=0;i<game.players.length;i++){
-						game.players[i].ai.shown=0;
-					}
-				}
-				game.zhu.ai.shown=1;
-				if(game.zhu2){
-					game.zhong=game.zhu;
-					game.zhu=game.zhu2;
-					delete game.zhu2;
-				}
-				if(_status.mode!='zhong'&&get.config('enhance_zhu')&&get.population('fan')>=3){
-					var skill;
-					switch(game.zhu.name){
-						case 'liubei':skill='jizhen';break;
-						case 'dongzhuo':skill='hengzheng';break;
-						case 'sunquan':skill='batu';break;
-						case 'sp_zhangjiao':skill='tiangong';break;
-						case 'liushan':skill='shengxi';break;
-						case 'sunce':skill='ciqiu';break;
-						case 'yuanshao':skill='geju';break;
-						case 're_caocao':skill='dangping';break;
-						case 'caopi':skill='junxing';break;
-						case 'liuxie':skill='moukui';break;
-						default:skill='tianming';break;
-					}
-					game.zhu.addSkill(skill);
-					game.zhu.storage.enhance_zhu=skill;
-				}
-				if(lib.storage.test){
-					var str='';
-					for(var i=0;i<game.players.length;i++){
-						str+=get.translation(game.players[i]);
-						if(game.players[i]==game.zhu) str+='（主）';
-						str+=' ';
-					}
-					console.log(str);
-					game.showIdentity();
-				}
-				event.trigger('gameStart');
-
-				var players=get.players(lib.sort.position);
-				var info=[];
-				for(var i=0;i<players.length;i++){
-					info.push({
-						name:players[i].name,
-						name2:players[i].name2,
-						identity:players[i].identity
-					});
-				}
-				_status.videoInited=true,
-				game.addVideo('init',null,info);
-
-				game.gameDraw(game.zhong||game.zhu);
-				game.phaseLoop(game.zhong||game.zhu);
-			}
-		},
 		showIdentity:function(me){
 			for(var i=0;i<game.players.length;i++){
 				// if(me===false&&game.players[i]==game.me) continue;
@@ -1236,8 +1229,4 @@ mode.identity={
 			}
 		}
 	},
-	config:['player_number','double_character','double_hp',
-	'ban_weak','enhance_zhu','free_choose','change_identity',
-	'change_choice','change_card','dierestart','swap','revive',
-	'auto_identity','ai_strategy','ai_identity','difficulty']
 }
diff --git a/mode/stone.js b/mode/stone.js
index c39c707a0..50405e561 100755
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -1,5 +1,545 @@
 'use strict';
 mode.stone={
+	start:function(){
+		"step 0"
+		lib.init.css('layout/mode/','stone');
+		_status.mode=get.config('stone_mode');
+		game.initStone();
+		var playback=localStorage.getItem(lib.configprefix+'playback');
+
+		if(!playback&&_status.mode=='deck'){
+			(function(){
+				ui.deckBuilder=ui.create.div('.popup-container#deck-builder',function(){
+					if(careerList.classList.contains('shown')){
+						careerList.classList.remove('shown');
+						newDeck.classList.remove('active');
+					}
+					else if(!cardDialog.classList.contains('shown')){
+						this.classList.remove('shown');
+						this.timeout=setTimeout(function(){
+							ui.deckBuilder.remove();
+						},500);
+						ui.arena.style.top='';
+						ui.arena.style.transform='';
+						ui.arena.style.opacity='';
+						ui.system.style.opacity='';
+						ui.auto.show();
+						ui.pause.show();
+					}
+				});
+				var clickNode=function(){
+					cardDialog.classList.add('shown');
+					controls.classList.add('shown');
+					var name='未命名';
+					for(var i=1;;i++){
+						if(!lib.storage.deckList[name+i]){
+							break;
+						}
+					}
+					cardDialog.editing={
+						name:name+i,
+						content:{
+							career:this.firstChild.dataset.career,
+							deck:[]
+						},
+					}
+					rename.innerHTML=name+i;
+					newDeck.innerHTML='确认编辑';
+					newDeck.classList.add('active');
+					careerList.classList.remove('shown');
+					listContainer.style.transform='translateX(200px)';
+					deckContainer.innerHTML='';
+					deckContainer.classList.add('shown');
+					updateCardDialog();
+				}
+				var careerList=ui.create.div('.shadowed.career',ui.deckBuilder);
+				for(var i=0;i<lib.careerList.length;i++){
+					var node=ui.create.div(careerList,clickNode);
+					ui.create.div('.menubutton.round',node).dataset.career=lib.careerList[i];
+					ui.create.div('.text',lib.translate[lib.careerList[i]],node);
+				}
+				var controls=ui.create.div('.controls',ui.deckBuilder);
+				var cardCount=ui.create.div('.card-count',controls);
+				ui.create.div('.menubutton.large','删除',controls,function(e){
+					if(this.innerHTML=='删除'){
+						this.innerHTML='确定';
+						var that=this;
+						setTimeout(function(){
+							that.innerHTML='删除';
+						},1000);
+					}
+					else{
+						cardDialog.classList.remove('shown');
+						controls.classList.remove('shown');
+						newDeck.innerHTML='新建卡组';
+						newDeck.classList.remove('active');
+						var editing=cardDialog.editing;
+						if(editing){
+							if(editing.origin){
+								delete lib.storage.deckList[editing.origin];
+								for(var i=0;i<listContainer.childElementCount;i++){
+									if(listContainer.childNodes[i].name==editing.origin){
+										listContainer.childNodes[i].remove();break;
+									}
+								}
+							}
+						}
+						game.save('deckList',lib.storage.deckList);
+						listContainer.style.transform='';
+						deckContainer.classList.remove('shown');
+						updateCardDialog();
+					}
+					e.stopPropagation();
+				});
+				var rename=ui.create.div('.menubutton.large','重命名',controls);
+				rename.contentEditable=true;
+				rename.onfocus=function(){
+					var range = document.createRange();
+					range.selectNodeContents(this);
+					var sel = window.getSelection();
+					sel.removeAllRanges();
+					sel.addRange(range);
+				};
+				rename.onblur=function(){
+					if(cardDialog.editing){
+						if(!lib.storage.deckList[this.innerHTML]){
+							cardDialog.editing.name=this.innerHTML;
+						}
+						else{
+							this.innerHTML=cardDialog.editing.name;
+						}
+					}
+					var sel = window.getSelection();
+					sel.removeAllRanges();
+				};
+				rename.onkeydown=function(e){
+					if(e.keyCode==13){
+						e.preventDefault();
+						e.stopPropagation();
+						rename.blur();
+					}
+				};
+				var removeLine=function() {
+					rename.innerHTML=rename.innerHTML.replace(/\n|<br>/g,'');
+				};
+				var observer = new MutationObserver(removeLine);
+				observer.observe(rename,{characterData:true,subtree:true});
+				rename.addEventListener('keyup',removeLine);
+
+				var cardDialog=ui.create.cardDialog(true,function(name){
+					if(lib.card[name].stonehidden) return true;
+					var type=lib.card[name].type;
+					return type!='stonecard'&&type!='stonecharacter';
+				},{seperate:function(list){
+					var nl=[],ns=[];
+					var career={};
+					var careerspell={};
+					for(var i=0;i<lib.careerList.length;i++){
+						career[lib.careerList[i]]=[];
+						careerspell[lib.careerList[i]]=[];
+					}
+					var result={}
+					for(var i=0;i<list.length;i++){
+						if(lib.card[list[i][2]].type=='stonecard'){
+							if(lib.card[list[i][2]].career&&lib.careerList.contains(lib.card[list[i][2]].career)){
+								careerspell[lib.card[list[i][2]].career].push(list[i]);
+							}
+							else{
+								ns.push(list[i]);
+							}
+						}
+						else{
+							if(lib.card[list[i][2]].career&&lib.careerList.contains(lib.card[list[i][2]].career)){
+								career[lib.card[list[i][2]].career].push(list[i]);
+							}
+							else{
+								nl.push(list[i]);
+							}
+						}
+					}
+					for(var i=0;i<lib.careerList.length;i++){
+						result['法术·'+get.translation(lib.careerList[i])+'_link:'+lib.careerList[i]]=careerspell[lib.careerList[i]];
+						result['随从·'+get.translation(lib.careerList[i])+'_link:'+lib.careerList[i]]=career[lib.careerList[i]];
+					}
+					result['法术·中立']=ns;
+					result['随从·中立']=nl;
+					return result;
+				}});
+				for(var i=0;i<cardDialog.buttons.length;i++){
+					if(cardDialog.buttons[i].node.info.innerHTML.indexOf('随从')!=-1){
+						var buttonName=cardDialog.buttons[i].link[2];
+						buttonName=buttonName.slice(0,buttonName.indexOf('_stonecharacter'));
+						buttonName=lib.character[buttonName];
+						cardDialog.buttons[i].node.info.innerHTML=buttonName[5][1]+'/'+buttonName[2];
+					}
+					if(lib.config.touchscreen){
+						lib.setLongPress(cardDialog.buttons[i],ui.click.intro);
+					}
+					else{
+						if(lib.config.hover_all){
+							lib.setHover(cardDialog.buttons[i],ui.click.hoverplayer);
+						}
+						if(lib.config.right_info){
+							cardDialog.buttons[i].oncontextmenu=ui.click.rightplayer;
+						}
+					}
+				}
+				var updateCardDialog=function(button){
+					if(!deckContainer.classList.contains('shown')){
+						for(var i=0;i<cardDialog.buttons.length;i++){
+							cardDialog.buttons[i].classList.remove('unselectable');
+						}
+						for(var i=0;i<cardDialog.content.childElementCount;i++){
+							cardDialog.content.childNodes[i].classList.remove('nodisplay');
+						}
+						return;
+					}
+					if(deckContainer.childElementCount>=30){
+						for(var i=0;i<cardDialog.buttons.length;i++){
+							cardDialog.buttons[i].classList.add('unselectable');
+						}
+					}
+					else{
+						var nummap={};
+						for(var i=0;i<deckContainer.childElementCount;i++){
+							var name=deckContainer.childNodes[i].name;
+							if(!nummap[name]){
+								nummap[name]=1;
+							}
+							else{
+								nummap[name]++;
+							}
+						}
+						var list=[];
+						for(var i in nummap){
+							if(nummap[i]>=2){
+								list.push(i);
+							}
+						}
+						for(var i=0;i<cardDialog.buttons.length;i++){
+							if(list.contains(cardDialog.buttons[i].link[2])){
+								cardDialog.buttons[i].classList.add('unselectable');
+							}
+							else{
+								cardDialog.buttons[i].classList.remove('unselectable');
+							}
+						}
+					}
+					var career=cardDialog.editing.content.career;
+					for(var i=0;i<cardDialog.content.childElementCount;i++){
+						var currentNode=cardDialog.content.childNodes[i];
+						if(currentNode.link){
+							if(currentNode.link==career){
+								currentNode.classList.remove('nodisplay');
+								currentNode.nextSibling.classList.remove('nodisplay');
+							}
+							else{
+								currentNode.classList.add('nodisplay');
+								currentNode.nextSibling.classList.add('nodisplay');
+							}
+						}
+					}
+					cardCount.innerHTML=deckContainer.childElementCount+'/30';
+				};
+				var clickCard=function(){
+					this.remove();
+					updateCardDialog();
+				};
+				var clickButton=function(){
+					if(!deckContainer.classList.contains('shown')) return;
+					if(!this.classList.contains('unselectable')){
+						var card=ui.create.card(null,'noclick').init(this.link).listen(clickCard);
+						deckContainer.insertBefore(card,deckContainer.firstChild);
+						updateCardDialog();
+					}
+				}
+				for(var i=0;i<cardDialog.buttons.length;i++){
+					cardDialog.buttons[i].listen(clickButton);
+				}
+				cardDialog.classList.add('fullheight');
+				cardDialog.classList.add('scroll1');
+				cardDialog.classList.add('scroll2');
+				cardDialog.classList.add('fixed');
+				cardDialog.listen(function(e){
+					e.stopPropagation();
+				});
+
+				ui.deckBuilder.appendChild(cardDialog);
+				var deckList=ui.create.div('.shadowed.list',ui.deckBuilder,function(e){
+					e.stopPropagation();
+					if(careerList.classList.contains('shown')){
+						careerList.classList.remove('shown');
+						newDeck.classList.remove('active');
+					}
+				});
+				var editDeck=function(){
+					if(!cardDialog.classList.contains('shown')){
+						cardDialog.classList.add('shown');
+						controls.classList.add('shown');
+						var info=lib.storage.deckList[this.name];
+						cardDialog.editing={
+							origin:this.name,
+							name:this.name,
+							content:{
+								career:info.career,
+								deck:info.deck
+							},
+						}
+						rename.innerHTML=this.name;
+						newDeck.innerHTML='确认编辑';
+						newDeck.classList.add('active');
+						careerList.classList.remove('shown');
+						listContainer.style.transform='translateX(200px)';
+						deckContainer.innerHTML='';
+						for(var i=0;i<info.deck.length;i++){
+							ui.create.card(deckContainer,'noclick').init(['',get.translation(lib.card[info.deck[i]].type),info.deck[i]]).listen(clickCard);
+						}
+						deckContainer.classList.add('shown');
+						updateCardDialog();
+					}
+				};
+				var newDeck=ui.create.div('.menubutton.large.create','新建卡组',deckList,function(e){
+					if(this.innerHTML=='新建卡组'){
+						this.classList.toggle('active');
+						if(this.classList.contains('active')){
+							careerList.classList.add('shown');
+						}
+						else{
+							careerList.classList.remove('shown');
+						}
+					}
+					else{
+						cardDialog.classList.remove('shown');
+						controls.classList.remove('shown');
+						this.innerHTML='新建卡组';
+						this.classList.remove('active');
+						var editing=cardDialog.editing;
+						if(editing){
+							editing.content.deck.length=0;
+							for(var i=0;i<deckContainer.childElementCount;i++){
+								editing.content.deck.push(deckContainer.childNodes[i].name);
+							}
+							editing.content.deck.sort(function(a,b){
+								if(a>b) return 1;
+								if(a<b) return -1;
+								return 0;
+							});
+							if(editing.origin){
+								for(var i=0;i<listContainer.childElementCount;i++){
+									if(listContainer.childNodes[i].name==editing.origin){
+										listContainer.childNodes[i].name=editing.name;
+										listContainer.childNodes[i].firstChild.innerHTML=editing.name;
+										break;
+									}
+								}
+								delete lib.storage.deckList[editing.origin];
+							}
+							else if(!lib.storage.deckList[editing.name]){
+								var deckitem=ui.create.div('.deckitem.shadowed','<span>'+editing.name+'</span>',
+									listContainer,editDeck);
+								ui.create.div('.menubutton.round',deckitem).dataset.career=editing.content.career;
+								deckitem.name=editing.name;
+							}
+							lib.storage.deckList[editing.name]=editing.content;
+						}
+						game.save('deckList',lib.storage.deckList);
+						listContainer.style.transform='';
+						deckContainer.classList.remove('shown');
+						updateCardDialog();
+					}
+					e.stopPropagation();
+				});
+				var listContainer=ui.create.div('.list-container',deckList);
+				for(var i in lib.storage.deckList){
+					var deckitem=ui.create.div('.deckitem.shadowed','<span>'+i+'</span>',
+						listContainer,editDeck);
+					ui.create.div('.menubutton.round',deckitem).dataset.career=lib.storage.deckList[i].career;
+					deckitem.name=i;
+				}
+				var deckContainer=ui.create.div('.list-container.deck',deckList);
+			}());
+
+			ui.deckcontrol=ui.create.system('卡组管理',function(){
+				// if(lib.config.low_performance){
+				// 	ui.arena.style.transform='translateY('+ui.window.offsetHeight+'px)';
+				// }
+				// else{
+				// 	ui.arena.style.top='100%';
+				// }
+				// ui.arena.style.transform='scale(0.6)';
+				ui.arena.style.opacity=0;
+				ui.system.style.opacity=0;
+				ui.window.appendChild(ui.deckBuilder);
+				if(ui.deckBuilder.timeout){
+					clearTimeout(ui.deckBuilder.timeout);
+					delete ui.deckBuilder.timeout;
+				}
+				ui.refresh(ui.deckBuilder);
+				ui.deckBuilder.classList.add('shown');
+				ui.auto.hide();
+				ui.pause.hide();
+			},true);
+
+		}
+
+		if(playback){
+			ui.create.me();
+			ui.arena.style.display='none';
+			ui.system.style.display='none';
+			_status.playback=playback;
+			localStorage.removeItem(lib.configprefix+'playback');
+			var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
+			store.get(parseInt(playback)).onsuccess=function(e){
+				if(e.target.result){
+					game.playVideoContent(e.target.result.video);
+				}
+				else{
+					alert('播放失败：找不到录像');
+					game.reload();
+				}
+			}
+			event.finish();
+		}
+		else{
+			game.prepareArena(2);
+			game.delay();
+		}
+		ui.arena.classList.add('stone');
+		"step 1"
+		for(var i=0;i<game.players.length;i++){
+			game.players[i].classList.add('noidentity');
+		}
+		game.enemy=game.me.next;
+		if(lib.storage.test){
+			lib.config.game_speed='vfast';
+			_status.auto=true;
+			ui.auto.classList.add('glow');
+		}
+		game.chooseCharacter();
+		"step 2"
+		if(_status.mode=='deck'){
+			_status.deckButton=ui.create.system('卡组',null,true);
+			lib.setPopped(_status.deckButton,function(){
+				var uiintro=ui.create.dialog('hidden');
+				uiintro.listen(function(e){
+					e.stopPropagation();
+				});
+				uiintro.add('剩余 <span style="font-family:'+'xinwei'+'">'+game.me.deckCards.length);
+				uiintro.addSmall([game.me.deckCards,'card']);
+				return uiintro;
+			},220);
+			if(get.config('skill_bar')){
+				_status.rageEnabled=true;
+
+				ui.friendBar=ui.create.div('.skillbar.right.shadowed.playerbg',ui.arena);
+				ui.enemyBar=ui.create.div('.skillbar.left.shadowed.playerbg',ui.arena);
+				// ui.friendBar.dataset.nature='metal';
+				// ui.enemyBar.dataset.nature='fire';
+				ui.create.div('.skillbarshadow',ui.friendBar);
+				ui.create.div('.skillbarshadow',ui.enemyBar);
+				ui.create.div('.skillbarfill',ui.friendBar);
+				ui.create.div('.skillbarfill',ui.enemyBar);
+				ui.friendBar.fillnode=ui.create.div(ui.friendBar.lastChild);
+				ui.enemyBar.fillnode=ui.create.div(ui.enemyBar.lastChild);
+				// ui.friendBar.popnode=ui.create.div('.skillbartext',ui.friendBar);
+				// ui.enemyBar.popnode=ui.create.div('.skillbartext',ui.enemyBar);
+				_status.friendRage=0;
+				_status.enemyRage=0;
+
+				if(lib.config.touchscreen){
+					lib.setLongPress(ui.friendBar,ui.click.intro);
+					lib.setLongPress(ui.enemyBar,ui.click.intro);
+				}
+				else{
+					if(lib.config.hover_all){
+						lib.setHover(ui.friendBar,ui.click.hoverplayer);
+						lib.setHover(ui.enemyBar,ui.click.hoverplayer);
+					}
+					if(lib.config.right_info){
+						ui.friendBar.oncontextmenu=ui.click.rightplayer;
+						ui.enemyBar.oncontextmenu=ui.click.rightplayer;
+					}
+				}
+			}
+		}
+		_status.friendCount=ui.create.system('',null,true);
+		_status.enemyCount=ui.create.system('',null,true);
+		game.updateStatusCount();
+		lib.setPopped(_status.friendCount,function(){
+			var uiintro=ui.create.dialog('hidden');
+
+			if(_status.deadfriend.length){
+				uiintro.add('已阵亡');
+				uiintro.add([_status.deadfriend,'player']);
+			}
+
+			uiintro.add('未上场');
+			if(_status.mylist.length){
+				uiintro.add([_status.mylist,'character']);
+			}
+			else{
+				uiintro.add('（无）')
+			}
+
+			return uiintro;
+		});
+		lib.setPopped(_status.enemyCount,function(){
+			if(_status.deadenemy.length){
+				var uiintro=ui.create.dialog('hidden');
+				uiintro.add('已阵亡');
+				uiintro.add([_status.deadenemy,'player']);
+				return uiintro;
+			}
+		});
+
+		game.me.side=Math.random()<0.5;
+		game.enemy.side=!game.me.side;
+
+		var players=get.players(lib.sort.position);
+		var info=[];
+		for(var i=0;i<players.length;i++){
+			info.push({
+				name:players[i].name,
+				name2:players[i].name2,
+				count:players[i].actcount
+			});
+		}
+		_status.videoInited=true,
+		game.addVideo('init',null,info);
+
+		event.trigger('gameStart');
+		if(_status.mode=='deck'){
+			game.gameDraw(game.me,3);
+			game.me.drawDeck(1,false);
+			game.me.next.drawDeck(1,false);
+		}
+		else{
+			game.gameDraw(game.me);
+		}
+		"step 3"
+		game.me.chooseBool('是否置换手牌？');
+		"step 4"
+		if(result.bool){
+			var hs=game.me.get('h');
+			for(var i=0;i<hs.length;i++){
+				ui.discardPile.appendChild(hs[i]);
+			}
+			if(_status.mode=='deck'){
+				game.me.drawDeck(1,false);
+				game.me.directgain(get.cards(3));
+			}
+			else{
+				game.me.directgain(get.cards(4));
+			}
+		}
+		"step 5"
+		if(game.me.side){
+			game.stoneLoop(game.me);
+		}
+		else{
+			game.stoneLoop(game.enemy);
+		}
+	},
 	element:{
 		stonecharacter:{
 			type:'stonecharacter',
@@ -885,554 +1425,6 @@ mode.stone={
 			_status.deadenemy=[];
 			game.additionaldead=[];
 		},
-		start:function(){
-			var next=game.createEvent('game',false);
-			next.content=function(){
-				"step 0"
-				if(lib.db&&!_status.characterLoaded){
-					_status.waitingForCharacters=true;
-					game.pause();
-				}
-				"step 1"
-				lib.init.css('layout/mode/','stone');
-				_status.mode=get.config('stone_mode');
-				game.initStone();
-				var playback=localStorage.getItem(lib.configprefix+'playback');
-
-				if(!playback&&_status.mode=='deck'){
-					(function(){
-						ui.deckBuilder=ui.create.div('.popup-container#deck-builder',function(){
-							if(careerList.classList.contains('shown')){
-								careerList.classList.remove('shown');
-								newDeck.classList.remove('active');
-							}
-							else if(!cardDialog.classList.contains('shown')){
-								this.classList.remove('shown');
-								this.timeout=setTimeout(function(){
-									ui.deckBuilder.remove();
-								},500);
-								ui.arena.style.top='';
-								ui.arena.style.transform='';
-								ui.arena.style.opacity='';
-								ui.system.style.opacity='';
-								ui.auto.show();
-								ui.pause.show();
-							}
-						});
-						var clickNode=function(){
-							cardDialog.classList.add('shown');
-							controls.classList.add('shown');
-							var name='未命名';
-							for(var i=1;;i++){
-								if(!lib.storage.deckList[name+i]){
-									break;
-								}
-							}
-							cardDialog.editing={
-								name:name+i,
-								content:{
-									career:this.firstChild.dataset.career,
-									deck:[]
-								},
-							}
-							rename.innerHTML=name+i;
-							newDeck.innerHTML='确认编辑';
-							newDeck.classList.add('active');
-							careerList.classList.remove('shown');
-							listContainer.style.transform='translateX(200px)';
-							deckContainer.innerHTML='';
-							deckContainer.classList.add('shown');
-							updateCardDialog();
-						}
-						var careerList=ui.create.div('.shadowed.career',ui.deckBuilder);
-						for(var i=0;i<lib.careerList.length;i++){
-							var node=ui.create.div(careerList,clickNode);
-							ui.create.div('.menubutton.round',node).dataset.career=lib.careerList[i];
-							ui.create.div('.text',lib.translate[lib.careerList[i]],node);
-						}
-						var controls=ui.create.div('.controls',ui.deckBuilder);
-						var cardCount=ui.create.div('.card-count',controls);
-						ui.create.div('.menubutton.large','删除',controls,function(e){
-							if(this.innerHTML=='删除'){
-								this.innerHTML='确定';
-								var that=this;
-								setTimeout(function(){
-									that.innerHTML='删除';
-								},1000);
-							}
-							else{
-								cardDialog.classList.remove('shown');
-								controls.classList.remove('shown');
-								newDeck.innerHTML='新建卡组';
-								newDeck.classList.remove('active');
-								var editing=cardDialog.editing;
-								if(editing){
-									if(editing.origin){
-										delete lib.storage.deckList[editing.origin];
-										for(var i=0;i<listContainer.childElementCount;i++){
-											if(listContainer.childNodes[i].name==editing.origin){
-												listContainer.childNodes[i].remove();break;
-											}
-										}
-									}
-								}
-								game.save('deckList',lib.storage.deckList);
-								listContainer.style.transform='';
-								deckContainer.classList.remove('shown');
-								updateCardDialog();
-							}
-							e.stopPropagation();
-						});
-						var rename=ui.create.div('.menubutton.large','重命名',controls);
-						rename.contentEditable=true;
-						rename.onfocus=function(){
-							var range = document.createRange();
-						    range.selectNodeContents(this);
-						    var sel = window.getSelection();
-						    sel.removeAllRanges();
-						    sel.addRange(range);
-						};
-						rename.onblur=function(){
-							if(cardDialog.editing){
-								if(!lib.storage.deckList[this.innerHTML]){
-									cardDialog.editing.name=this.innerHTML;
-								}
-								else{
-									this.innerHTML=cardDialog.editing.name;
-								}
-							}
-							var sel = window.getSelection();
-						    sel.removeAllRanges();
-						};
-						rename.onkeydown=function(e){
-							if(e.keyCode==13){
-								e.preventDefault();
-								e.stopPropagation();
-								rename.blur();
-							}
-						};
-						var removeLine=function() {
-							rename.innerHTML=rename.innerHTML.replace(/\n|<br>/g,'');
-						};
-						var observer = new MutationObserver(removeLine);
-						observer.observe(rename,{characterData:true,subtree:true});
-						rename.addEventListener('keyup',removeLine);
-
-						var cardDialog=ui.create.cardDialog(true,function(name){
-							if(lib.card[name].stonehidden) return true;
-							var type=lib.card[name].type;
-							return type!='stonecard'&&type!='stonecharacter';
-						},{seperate:function(list){
-							var nl=[],ns=[];
-							var career={};
-							var careerspell={};
-							for(var i=0;i<lib.careerList.length;i++){
-								career[lib.careerList[i]]=[];
-								careerspell[lib.careerList[i]]=[];
-							}
-							var result={}
-							for(var i=0;i<list.length;i++){
-								if(lib.card[list[i][2]].type=='stonecard'){
-									if(lib.card[list[i][2]].career&&lib.careerList.contains(lib.card[list[i][2]].career)){
-										careerspell[lib.card[list[i][2]].career].push(list[i]);
-									}
-									else{
-										ns.push(list[i]);
-									}
-								}
-								else{
-									if(lib.card[list[i][2]].career&&lib.careerList.contains(lib.card[list[i][2]].career)){
-										career[lib.card[list[i][2]].career].push(list[i]);
-									}
-									else{
-										nl.push(list[i]);
-									}
-								}
-							}
-							for(var i=0;i<lib.careerList.length;i++){
-								result['法术·'+get.translation(lib.careerList[i])+'_link:'+lib.careerList[i]]=careerspell[lib.careerList[i]];
-								result['随从·'+get.translation(lib.careerList[i])+'_link:'+lib.careerList[i]]=career[lib.careerList[i]];
-							}
-							result['法术·中立']=ns;
-							result['随从·中立']=nl;
-							return result;
-						}});
-						for(var i=0;i<cardDialog.buttons.length;i++){
-							if(cardDialog.buttons[i].node.info.innerHTML.indexOf('随从')!=-1){
-								var buttonName=cardDialog.buttons[i].link[2];
-								buttonName=buttonName.slice(0,buttonName.indexOf('_stonecharacter'));
-								buttonName=lib.character[buttonName];
-								cardDialog.buttons[i].node.info.innerHTML=buttonName[5][1]+'/'+buttonName[2];
-							}
-							if(lib.config.touchscreen){
-								lib.setLongPress(cardDialog.buttons[i],ui.click.intro);
-							}
-							else{
-								if(lib.config.hover_all){
-									lib.setHover(cardDialog.buttons[i],ui.click.hoverplayer);
-								}
-								if(lib.config.right_info){
-									cardDialog.buttons[i].oncontextmenu=ui.click.rightplayer;
-								}
-							}
-						}
-						var updateCardDialog=function(button){
-							if(!deckContainer.classList.contains('shown')){
-								for(var i=0;i<cardDialog.buttons.length;i++){
-									cardDialog.buttons[i].classList.remove('unselectable');
-								}
-								for(var i=0;i<cardDialog.content.childElementCount;i++){
-									cardDialog.content.childNodes[i].classList.remove('nodisplay');
-								}
-								return;
-							}
-							if(deckContainer.childElementCount>=30){
-								for(var i=0;i<cardDialog.buttons.length;i++){
-									cardDialog.buttons[i].classList.add('unselectable');
-								}
-							}
-							else{
-								var nummap={};
-								for(var i=0;i<deckContainer.childElementCount;i++){
-									var name=deckContainer.childNodes[i].name;
-									if(!nummap[name]){
-										nummap[name]=1;
-									}
-									else{
-										nummap[name]++;
-									}
-								}
-								var list=[];
-								for(var i in nummap){
-									if(nummap[i]>=2){
-										list.push(i);
-									}
-								}
-								for(var i=0;i<cardDialog.buttons.length;i++){
-									if(list.contains(cardDialog.buttons[i].link[2])){
-										cardDialog.buttons[i].classList.add('unselectable');
-									}
-									else{
-										cardDialog.buttons[i].classList.remove('unselectable');
-									}
-								}
-							}
-							var career=cardDialog.editing.content.career;
-							for(var i=0;i<cardDialog.content.childElementCount;i++){
-								var currentNode=cardDialog.content.childNodes[i];
-								if(currentNode.link){
-									if(currentNode.link==career){
-										currentNode.classList.remove('nodisplay');
-										currentNode.nextSibling.classList.remove('nodisplay');
-									}
-									else{
-										currentNode.classList.add('nodisplay');
-										currentNode.nextSibling.classList.add('nodisplay');
-									}
-								}
-							}
-							cardCount.innerHTML=deckContainer.childElementCount+'/30';
-						};
-						var clickCard=function(){
-							this.remove();
-							updateCardDialog();
-						};
-						var clickButton=function(){
-							if(!deckContainer.classList.contains('shown')) return;
-							if(!this.classList.contains('unselectable')){
-								var card=ui.create.card(null,'noclick').init(this.link).listen(clickCard);
-								deckContainer.insertBefore(card,deckContainer.firstChild);
-								updateCardDialog();
-							}
-						}
-						for(var i=0;i<cardDialog.buttons.length;i++){
-							cardDialog.buttons[i].listen(clickButton);
-						}
-						cardDialog.classList.add('fullheight');
-						cardDialog.classList.add('scroll1');
-						cardDialog.classList.add('scroll2');
-						cardDialog.classList.add('fixed');
-						cardDialog.listen(function(e){
-							e.stopPropagation();
-						});
-
-						ui.deckBuilder.appendChild(cardDialog);
-						var deckList=ui.create.div('.shadowed.list',ui.deckBuilder,function(e){
-							e.stopPropagation();
-							if(careerList.classList.contains('shown')){
-								careerList.classList.remove('shown');
-								newDeck.classList.remove('active');
-							}
-						});
-						var editDeck=function(){
-							if(!cardDialog.classList.contains('shown')){
-								cardDialog.classList.add('shown');
-								controls.classList.add('shown');
-								var info=lib.storage.deckList[this.name];
-								cardDialog.editing={
-									origin:this.name,
-									name:this.name,
-									content:{
-										career:info.career,
-										deck:info.deck
-									},
-								}
-								rename.innerHTML=this.name;
-								newDeck.innerHTML='确认编辑';
-								newDeck.classList.add('active');
-								careerList.classList.remove('shown');
-								listContainer.style.transform='translateX(200px)';
-								deckContainer.innerHTML='';
-								for(var i=0;i<info.deck.length;i++){
-									ui.create.card(deckContainer,'noclick').init(['',get.translation(lib.card[info.deck[i]].type),info.deck[i]]).listen(clickCard);
-								}
-								deckContainer.classList.add('shown');
-								updateCardDialog();
-							}
-						};
-						var newDeck=ui.create.div('.menubutton.large.create','新建卡组',deckList,function(e){
-							if(this.innerHTML=='新建卡组'){
-								this.classList.toggle('active');
-								if(this.classList.contains('active')){
-									careerList.classList.add('shown');
-								}
-								else{
-									careerList.classList.remove('shown');
-								}
-							}
-							else{
-								cardDialog.classList.remove('shown');
-								controls.classList.remove('shown');
-								this.innerHTML='新建卡组';
-								this.classList.remove('active');
-								var editing=cardDialog.editing;
-								if(editing){
-									editing.content.deck.length=0;
-									for(var i=0;i<deckContainer.childElementCount;i++){
-										editing.content.deck.push(deckContainer.childNodes[i].name);
-									}
-									editing.content.deck.sort(function(a,b){
-										if(a>b) return 1;
-										if(a<b) return -1;
-										return 0;
-									});
-									if(editing.origin){
-										for(var i=0;i<listContainer.childElementCount;i++){
-											if(listContainer.childNodes[i].name==editing.origin){
-												listContainer.childNodes[i].name=editing.name;
-												listContainer.childNodes[i].firstChild.innerHTML=editing.name;
-												break;
-											}
-										}
-										delete lib.storage.deckList[editing.origin];
-									}
-									else if(!lib.storage.deckList[editing.name]){
-										var deckitem=ui.create.div('.deckitem.shadowed','<span>'+editing.name+'</span>',
-											listContainer,editDeck);
-										ui.create.div('.menubutton.round',deckitem).dataset.career=editing.content.career;
-										deckitem.name=editing.name;
-									}
-									lib.storage.deckList[editing.name]=editing.content;
-								}
-								game.save('deckList',lib.storage.deckList);
-								listContainer.style.transform='';
-								deckContainer.classList.remove('shown');
-								updateCardDialog();
-							}
-							e.stopPropagation();
-						});
-						var listContainer=ui.create.div('.list-container',deckList);
-						for(var i in lib.storage.deckList){
-							var deckitem=ui.create.div('.deckitem.shadowed','<span>'+i+'</span>',
-								listContainer,editDeck);
-							ui.create.div('.menubutton.round',deckitem).dataset.career=lib.storage.deckList[i].career;
-							deckitem.name=i;
-						}
-						var deckContainer=ui.create.div('.list-container.deck',deckList);
-					}());
-
-					ui.deckcontrol=ui.create.system('卡组管理',function(){
-						// if(lib.config.low_performance){
-						// 	ui.arena.style.transform='translateY('+ui.window.offsetHeight+'px)';
-						// }
-						// else{
-						// 	ui.arena.style.top='100%';
-						// }
-						// ui.arena.style.transform='scale(0.6)';
-						ui.arena.style.opacity=0;
-						ui.system.style.opacity=0;
-						ui.window.appendChild(ui.deckBuilder);
-						if(ui.deckBuilder.timeout){
-							clearTimeout(ui.deckBuilder.timeout);
-							delete ui.deckBuilder.timeout;
-						}
-						ui.refresh(ui.deckBuilder);
-						ui.deckBuilder.classList.add('shown');
-						ui.auto.hide();
-						ui.pause.hide();
-					},true);
-
-				}
-
-				if(playback){
-					ui.create.me();
-					ui.arena.style.display='none';
-					ui.system.style.display='none';
-					_status.playback=playback;
-					localStorage.removeItem(lib.configprefix+'playback');
-					var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
-					store.get(parseInt(playback)).onsuccess=function(e){
-						if(e.target.result){
-							game.playVideoContent(e.target.result.video);
-						}
-						else{
-							alert('播放失败：找不到录像');
-							game.reload();
-						}
-					}
-					event.finish();
-				}
-				else{
-					game.prepareArena(2);
-					game.delay();
-				}
-				ui.arena.classList.add('stone');
-				"step 2"
-				for(var i=0;i<game.players.length;i++){
-					game.players[i].classList.add('noidentity');
-				}
-				game.enemy=game.me.next;
-				if(lib.storage.test){
-					lib.config.game_speed='vfast';
-					_status.auto=true;
-					ui.auto.classList.add('glow');
-				}
-				game.chooseCharacter();
-				"step 3"
-				if(_status.mode=='deck'){
-					_status.deckButton=ui.create.system('卡组',null,true);
-					lib.setPopped(_status.deckButton,function(){
-						var uiintro=ui.create.dialog('hidden');
-						uiintro.listen(function(e){
-							e.stopPropagation();
-						});
-						uiintro.add('剩余 <span style="font-family:'+'xinwei'+'">'+game.me.deckCards.length);
-						uiintro.addSmall([game.me.deckCards,'card']);
-						return uiintro;
-					},220);
-					if(get.config('skill_bar')){
-						_status.rageEnabled=true;
-
-						ui.friendBar=ui.create.div('.skillbar.right.shadowed.playerbg',ui.arena);
-						ui.enemyBar=ui.create.div('.skillbar.left.shadowed.playerbg',ui.arena);
-						// ui.friendBar.dataset.nature='metal';
-						// ui.enemyBar.dataset.nature='fire';
-						ui.create.div('.skillbarshadow',ui.friendBar);
-						ui.create.div('.skillbarshadow',ui.enemyBar);
-						ui.create.div('.skillbarfill',ui.friendBar);
-						ui.create.div('.skillbarfill',ui.enemyBar);
-						ui.friendBar.fillnode=ui.create.div(ui.friendBar.lastChild);
-						ui.enemyBar.fillnode=ui.create.div(ui.enemyBar.lastChild);
-						// ui.friendBar.popnode=ui.create.div('.skillbartext',ui.friendBar);
-						// ui.enemyBar.popnode=ui.create.div('.skillbartext',ui.enemyBar);
-						_status.friendRage=0;
-						_status.enemyRage=0;
-
-						if(lib.config.touchscreen){
-							lib.setLongPress(ui.friendBar,ui.click.intro);
-							lib.setLongPress(ui.enemyBar,ui.click.intro);
-						}
-						else{
-							if(lib.config.hover_all){
-								lib.setHover(ui.friendBar,ui.click.hoverplayer);
-								lib.setHover(ui.enemyBar,ui.click.hoverplayer);
-							}
-							if(lib.config.right_info){
-								ui.friendBar.oncontextmenu=ui.click.rightplayer;
-								ui.enemyBar.oncontextmenu=ui.click.rightplayer;
-							}
-						}
-					}
-				}
-				_status.friendCount=ui.create.system('',null,true);
-				_status.enemyCount=ui.create.system('',null,true);
-				game.updateStatusCount();
-				lib.setPopped(_status.friendCount,function(){
-					var uiintro=ui.create.dialog('hidden');
-
-					if(_status.deadfriend.length){
-						uiintro.add('已阵亡');
-						uiintro.add([_status.deadfriend,'player']);
-					}
-
-					uiintro.add('未上场');
-					if(_status.mylist.length){
-						uiintro.add([_status.mylist,'character']);
-					}
-					else{
-						uiintro.add('（无）')
-					}
-
-					return uiintro;
-				});
-				lib.setPopped(_status.enemyCount,function(){
-					if(_status.deadenemy.length){
-						var uiintro=ui.create.dialog('hidden');
-						uiintro.add('已阵亡');
-						uiintro.add([_status.deadenemy,'player']);
-						return uiintro;
-					}
-				});
-
-				game.me.side=Math.random()<0.5;
-				game.enemy.side=!game.me.side;
-
-				var players=get.players(lib.sort.position);
-				var info=[];
-				for(var i=0;i<players.length;i++){
-					info.push({
-						name:players[i].name,
-						name2:players[i].name2,
-						count:players[i].actcount
-					});
-				}
-				_status.videoInited=true,
-				game.addVideo('init',null,info);
-
-				event.trigger('gameStart');
-				if(_status.mode=='deck'){
-					game.gameDraw(game.me,3);
-					game.me.drawDeck(1,false);
-					game.me.next.drawDeck(1,false);
-				}
-				else{
-					game.gameDraw(game.me);
-				}
-				"step 4"
-				game.me.chooseBool('是否置换手牌？');
-				"step 5"
-				if(result.bool){
-					var hs=game.me.get('h');
-					for(var i=0;i<hs.length;i++){
-						ui.discardPile.appendChild(hs[i]);
-					}
-					if(_status.mode=='deck'){
-						game.me.drawDeck(1,false);
-						game.me.directgain(get.cards(3));
-					}
-					else{
-						game.me.directgain(get.cards(4));
-					}
-				}
-				"step 6"
-				if(game.me.side){
-					game.stoneLoop(game.me);
-				}
-				else{
-					game.stoneLoop(game.enemy);
-				}
-			}
-		},
 		chooseCharacter:function(){
 			var next=game.createEvent('chooseCharacter',false);
 			next.showConfig=true;
@@ -10134,5 +10126,4 @@ mode.stone={
 			}
 		}
 	},
-	config:['battle_number','double_character','double_hp','ban_weak','free_choose','change_choice'],
 }
diff --git a/mode/versus.js b/mode/versus.js
index 47caceace..9c5866ac9 100755
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1,5 +1,250 @@
 'use strict';
 mode.versus={
+	start:function(){
+		"step 0"
+		_status.mode=get.config('versus_mode');
+		"step 1"
+		var playback=localStorage.getItem(lib.configprefix+'playback');
+		if(playback){
+			ui.create.me();
+			ui.arena.style.display='none';
+			ui.system.style.display='none';
+			_status.playback=playback;
+			localStorage.removeItem(lib.configprefix+'playback');
+			var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
+			store.get(parseInt(playback)).onsuccess=function(e){
+				if(e.target.result){
+					game.playVideoContent(e.target.result.video);
+				}
+				else{
+					alert('播放失败：找不到录像');
+					game.reload();
+				}
+			}
+			event.finish();
+			return;
+		}
+		if(_status.mode=='jiange'||_status.mode=='four'){
+			game.prepareArena(8);
+			// game.pause();
+		}
+		else{
+			if(lib.storage.choice==undefined) game.save('choice',20);
+			if(lib.storage.zhu==undefined) game.save('zhu',true);
+			if(lib.storage.noreplace_end==undefined) game.save('noreplace_end',true);
+			if(get.config('first_less')==undefined) game.saveConfig('first_less',true,true);
+			if(lib.storage.autoreplaceinnerhtml==undefined) game.save('autoreplaceinnerhtml',true);
+			if(lib.storage.single_control==undefined) game.save('single_control',true);
+			if(lib.storage.number==undefined) game.save('number',3);
+			if(lib.storage.versus_reward==undefined) game.save('versus_reward',3);
+			if(lib.storage.versus_punish==undefined) game.save('versus_punish','弃牌');
+			if(lib.storage.replace_number==undefined) game.save('replace_number',3);
+
+			switch(lib.storage.seat_order){
+				case '交叉':lib.storage.cross_seat=true;lib.storage.random_seat=false;break;
+				case '随机':lib.storage.cross_seat=false;lib.storage.random_seat=true;break;
+				default:lib.storage.cross_seat=false;lib.storage.random_seat=false;
+			}
+			game.save('only_zhu',true);
+			game.save('control_all',true);
+			ui.wuxie.hide();
+			ui.create.cards();
+			game.finishCards();
+		}
+		game.delay();
+		"step 2"
+		if(_status.mode=='four'){
+			var list=['zhu','zhong','zhong','zhong','ezhu','ezhong','ezhong','ezhong'];
+			list.randomSort();
+			var side=Math.random()<0.5;
+			for(var i=0;i<8;i++){
+				if(list[i][0]=='e'){
+					game.players[i].side=side;
+					game.players[i].identity=list[i].slice(1);
+				}
+				else{
+					game.players[i].side=!side;
+					game.players[i].identity=list[i];
+				}
+				if(game.players[i].identity=='zhu'){
+					game[game.players[i].side+'Zhu']=game.players[i];
+					game.players[i].isZhu=true;
+				}
+				game.players[i].setIdentity(game.players[i].identity);
+				game.players[i].node.identity.dataset.color=get.translation(game.players[i].side+'Color');
+			}
+			game.chooseCharacterFour();
+		}
+		else if(_status.mode=='jiange'){
+			var list=['shumech','shu','shuboss','shu','wei','weiboss','wei','weimech'];
+			var pos=Math.floor(Math.random()*8);
+			for(var i=0;i<8;i++){
+				var j=pos+i;
+				if(j>=8){
+					j-=8;
+				}
+				if(list[i][0]=='w'){
+					game.players[j].side=true;
+					game.players[j].setIdentity('wei');
+					game.players[j].identity='wei';
+				}
+				else{
+					game.players[j].side=false;
+					game.players[j].setIdentity('shu');
+					game.players[j].identity='shu';
+				}
+				if(list[i].indexOf('mech')!=-1){
+					game.players[j].type='mech';
+				}
+				else if(list[i].indexOf('boss')!=-1){
+					game.players[j].type='boss';
+				}
+				else{
+					game.players[j].type='human';
+				}
+			}
+			game.chooseCharacterJiange();
+		}
+		else{
+			game.chooseCharacter();
+		}
+		"step 3"
+		var players=get.players(lib.sort.position);
+		var info=[];
+		for(var i=0;i<players.length;i++){
+			info.push({
+				name:players[i].name,
+				name2:players[i].name2,
+				identity:players[i].node.identity.firstChild.innerHTML,
+				color:players[i].node.identity.dataset.color
+			});
+		}
+		_status.videoInited=true;
+		if(_status.mode=='four'||_status.mode=='jiange'){
+			info.push(false);
+		}
+		else{
+			info.push(lib.storage.single_control&&lib.storage.control_all&&game.players.length>=4);
+		}
+		game.addVideo('init',null,info);
+		event.trigger('gameStart');
+		if(_status.mode=='four'){
+			game.gameDraw(_status.firstAct,function(player){
+				if(player==_status.firstAct.previousSeat){
+					return 5;
+				}
+				return 4;
+			});
+			if(game.me==_status.firstAct.previous||game.me==_status.firstAct.previous.previous){
+				game.me.chooseBool('是否置换手牌？');
+				event.replaceCard=true;
+			}
+		}
+		else if(_status.mode=='jiange'){
+			var firstAct;
+			for(var i=0;i<game.players.length;i++){
+				if(game.players[i].type=='mech'&&game.players[i].group=='wei'){
+					firstAct=game.players[i];break;
+				}
+			}
+			_status.actlist=[
+				firstAct,
+				firstAct.next,
+				firstAct.previous,
+				firstAct.next.next,
+				firstAct.previous.previous,
+				firstAct.next.next.next,
+				firstAct.previous.previous.previous,
+				firstAct.next.next.next.next
+			];
+			game.gameDraw(firstAct);
+			game.phaseLoopJiange();
+		}
+		else{
+			var firstAct;
+			if(lib.storage.zhu){
+				firstAct=(_status.currentSide==game.me.side)?game.friendZhu:game.enemyZhu;
+			}
+			else{
+				if(!lib.storage.cross_seat&&!lib.storage.random_seat&&lib.storage.number>1){
+					for(var i=0;i<game.players.length-1;i++){
+						if(game.players[i].side!=game.players[i+1].side){
+							var actcount;
+							if(Math.random()<0.5){
+								actcount=i;
+							}
+							else{
+								if(i>=lib.storage.number){
+									actcount=i-lib.storage.number;
+								}
+								else{
+									actcount=i+lib.storage.number;
+								}
+							}
+							if(actcount>0){
+								actcount--;
+							}
+							else{
+								actcount=game.players.length-1;
+							}
+							firstAct=game.players[actcount];
+							break;
+						}
+					}
+				}
+				else{
+					firstAct=game.players[Math.floor(Math.random()*game.players.length)];
+				}
+			}
+			game.gameDraw(firstAct,4);
+			_status.first_less=true;
+			_status.round=0;
+			if(lib.storage.single_control){
+				lib.skill.global.push('versus_swap');
+				ui.autoreplace=ui.create.div('.caption.normal');
+				ui.autoreplace.innerHTML='<div class="underline">自动换人</div>';
+				ui.autoreplace.style.textAlign='center';
+				if(lib.storage.autoreplaceinnerhtml){
+					ui.autoreplace.classList.add('on')
+				}
+				ui.autoreplace.listen(game.switchAutoreplace);
+
+				// ui.versusreplace=ui.create.system('换人',null,true);
+				// lib.setPopped(ui.versusreplace,game.versusHoverReplace);
+				if(game.players.length>2){
+					ui.versushs=ui.create.system('手牌',null,true);
+					lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
+				}
+			}
+			_status.enemyCount=ui.create.system('杀敌: '+get.cnNumber(0,true),null,true);
+			_status.friendCount=ui.create.system('阵亡: '+get.cnNumber(0,true),null,true);
+			// _status.friendCount=ui.create.system('友方',null,true);
+			// _status.enemyCount=ui.create.system('敌方',null,true);
+
+			lib.setPopped(_status.friendCount,game.versusHoverFriend);
+			lib.setPopped(_status.enemyCount,game.versusHoverEnemy);
+
+			if(lib.storage.zhu){
+				_status.currentSide=true;
+				game.versusPhaseLoop(firstAct);
+			}
+			else{
+				game.versusPhaseLoop(firstAct);
+			}
+		}
+		if(_status.mode!='four'){
+			event.finish();
+		}
+		"step 4"
+		if(event.replaceCard&&result.bool){
+			var hs=game.me.get('h');
+			for(var i=0;i<hs.length;i++){
+				ui.discardPile.appendChild(hs[i]);
+			}
+			game.me.directgain(get.cards(hs.length));
+		}
+		game.phaseLoop(_status.firstAct);
+	},
 	game:{
 		getVideoName:function(){
 			var str=get.translation(game.me.name);
@@ -35,258 +280,6 @@ mode.versus={
 				game.saveConfig('gameRecord',lib.config.gameRecord);
 			}
 		},
-		start:function(){
-			var next=game.createEvent('game',false);
-			next.content=function(){
-				"step 0"
-				if(lib.db&&!_status.characterLoaded){
-					_status.waitingForCharacters=true;
-					game.pause();
-				}
-				_status.mode=get.config('versus_mode');
-				"step 1"
-				var playback=localStorage.getItem(lib.configprefix+'playback');
-				if(playback){
-					ui.create.me();
-					ui.arena.style.display='none';
-					ui.system.style.display='none';
-					_status.playback=playback;
-					localStorage.removeItem(lib.configprefix+'playback');
-					var store=lib.db.transaction(['video'],'readwrite').objectStore('video');
-					store.get(parseInt(playback)).onsuccess=function(e){
-						if(e.target.result){
-							game.playVideoContent(e.target.result.video);
-						}
-						else{
-							alert('播放失败：找不到录像');
-							game.reload();
-						}
-					}
-					event.finish();
-					return;
-				}
-				if(_status.mode=='jiange'||_status.mode=='four'){
-					game.prepareArena(8);
-					// game.pause();
-				}
-				else{
-					if(lib.storage.choice==undefined) game.save('choice',20);
-					if(lib.storage.zhu==undefined) game.save('zhu',true);
-					if(lib.storage.noreplace_end==undefined) game.save('noreplace_end',true);
-					if(get.config('first_less')==undefined) game.saveConfig('first_less',true,true);
-					if(lib.storage.autoreplaceinnerhtml==undefined) game.save('autoreplaceinnerhtml',true);
-					if(lib.storage.single_control==undefined) game.save('single_control',true);
-					if(lib.storage.number==undefined) game.save('number',3);
-					if(lib.storage.versus_reward==undefined) game.save('versus_reward',3);
-					if(lib.storage.versus_punish==undefined) game.save('versus_punish','弃牌');
-					if(lib.storage.replace_number==undefined) game.save('replace_number',3);
-
-					switch(lib.storage.seat_order){
-						case '交叉':lib.storage.cross_seat=true;lib.storage.random_seat=false;break;
-						case '随机':lib.storage.cross_seat=false;lib.storage.random_seat=true;break;
-						default:lib.storage.cross_seat=false;lib.storage.random_seat=false;
-					}
-					game.save('only_zhu',true);
-					game.save('control_all',true);
-					ui.wuxie.hide();
-					ui.create.cards();
-					game.finishCards();
-				}
-				game.delay();
-				"step 2"
-				if(_status.mode=='four'){
-					var list=['zhu','zhong','zhong','zhong','ezhu','ezhong','ezhong','ezhong'];
-					list.randomSort();
-					var side=Math.random()<0.5;
-					for(var i=0;i<8;i++){
-						if(list[i][0]=='e'){
-							game.players[i].side=side;
-							game.players[i].identity=list[i].slice(1);
-						}
-						else{
-							game.players[i].side=!side;
-							game.players[i].identity=list[i];
-						}
-						if(game.players[i].identity=='zhu'){
-							game[game.players[i].side+'Zhu']=game.players[i];
-							game.players[i].isZhu=true;
-						}
-						game.players[i].setIdentity(game.players[i].identity);
-						game.players[i].node.identity.dataset.color=get.translation(game.players[i].side+'Color');
-					}
-					game.chooseCharacterFour();
-				}
-				else if(_status.mode=='jiange'){
-					var list=['shumech','shu','shuboss','shu','wei','weiboss','wei','weimech'];
-					var pos=Math.floor(Math.random()*8);
-					for(var i=0;i<8;i++){
-						var j=pos+i;
-						if(j>=8){
-							j-=8;
-						}
-						if(list[i][0]=='w'){
-							game.players[j].side=true;
-							game.players[j].setIdentity('wei');
-							game.players[j].identity='wei';
-						}
-						else{
-							game.players[j].side=false;
-							game.players[j].setIdentity('shu');
-							game.players[j].identity='shu';
-						}
-						if(list[i].indexOf('mech')!=-1){
-							game.players[j].type='mech';
-						}
-						else if(list[i].indexOf('boss')!=-1){
-							game.players[j].type='boss';
-						}
-						else{
-							game.players[j].type='human';
-						}
-					}
-					game.chooseCharacterJiange();
-				}
-				else{
-					game.chooseCharacter();
-				}
-				"step 3"
-				var players=get.players(lib.sort.position);
-				var info=[];
-				for(var i=0;i<players.length;i++){
-					info.push({
-						name:players[i].name,
-						name2:players[i].name2,
-						identity:players[i].node.identity.firstChild.innerHTML,
-						color:players[i].node.identity.dataset.color
-					});
-				}
-				_status.videoInited=true;
-				if(_status.mode=='four'||_status.mode=='jiange'){
-					info.push(false);
-				}
-				else{
-					info.push(lib.storage.single_control&&lib.storage.control_all&&game.players.length>=4);
-				}
-				game.addVideo('init',null,info);
-				event.trigger('gameStart');
-				if(_status.mode=='four'){
-					game.gameDraw(_status.firstAct,function(player){
-						if(player==_status.firstAct.previousSeat){
-							return 5;
-						}
-						return 4;
-					});
-					if(game.me==_status.firstAct.previous||game.me==_status.firstAct.previous.previous){
-						game.me.chooseBool('是否置换手牌？');
-						event.replaceCard=true;
-					}
-				}
-				else if(_status.mode=='jiange'){
-					var firstAct;
-					for(var i=0;i<game.players.length;i++){
-						if(game.players[i].type=='mech'&&game.players[i].group=='wei'){
-							firstAct=game.players[i];break;
-						}
-					}
-					_status.actlist=[
-						firstAct,
-						firstAct.next,
-						firstAct.previous,
-						firstAct.next.next,
-						firstAct.previous.previous,
-						firstAct.next.next.next,
-						firstAct.previous.previous.previous,
-						firstAct.next.next.next.next
-					];
-					game.gameDraw(firstAct);
-					game.phaseLoopJiange();
-				}
-				else{
-					var firstAct;
-					if(lib.storage.zhu){
-						firstAct=(_status.currentSide==game.me.side)?game.friendZhu:game.enemyZhu;
-					}
-					else{
-						if(!lib.storage.cross_seat&&!lib.storage.random_seat&&lib.storage.number>1){
-							for(var i=0;i<game.players.length-1;i++){
-								if(game.players[i].side!=game.players[i+1].side){
-									var actcount;
-									if(Math.random()<0.5){
-										actcount=i;
-									}
-									else{
-										if(i>=lib.storage.number){
-											actcount=i-lib.storage.number;
-										}
-										else{
-											actcount=i+lib.storage.number;
-										}
-									}
-									if(actcount>0){
-										actcount--;
-									}
-									else{
-										actcount=game.players.length-1;
-									}
-									firstAct=game.players[actcount];
-									break;
-								}
-							}
-						}
-						else{
-							firstAct=game.players[Math.floor(Math.random()*game.players.length)];
-						}
-					}
-					game.gameDraw(firstAct,4);
-					_status.first_less=true;
-					_status.round=0;
-					if(lib.storage.single_control){
-						lib.skill.global.push('versus_swap');
-						ui.autoreplace=ui.create.div('.caption.normal');
-						ui.autoreplace.innerHTML='<div class="underline">自动换人</div>';
-						ui.autoreplace.style.textAlign='center';
-						if(lib.storage.autoreplaceinnerhtml){
-							ui.autoreplace.classList.add('on')
-						}
-						ui.autoreplace.listen(game.switchAutoreplace);
-
-						// ui.versusreplace=ui.create.system('换人',null,true);
-						// lib.setPopped(ui.versusreplace,game.versusHoverReplace);
-						if(game.players.length>2){
-							ui.versushs=ui.create.system('手牌',null,true);
-							lib.setPopped(ui.versushs,game.versusHoverHandcards,220);
-						}
-					}
-					_status.enemyCount=ui.create.system('杀敌: '+get.cnNumber(0,true),null,true);
-					_status.friendCount=ui.create.system('阵亡: '+get.cnNumber(0,true),null,true);
-					// _status.friendCount=ui.create.system('友方',null,true);
-					// _status.enemyCount=ui.create.system('敌方',null,true);
-
-					lib.setPopped(_status.friendCount,game.versusHoverFriend);
-					lib.setPopped(_status.enemyCount,game.versusHoverEnemy);
-
-					if(lib.storage.zhu){
-						_status.currentSide=true;
-						game.versusPhaseLoop(firstAct);
-					}
-					else{
-						game.versusPhaseLoop(firstAct);
-					}
-				}
-				if(_status.mode!='four'){
-					event.finish();
-				}
-				"step 4"
-				if(event.replaceCard&&result.bool){
-					var hs=game.me.get('h');
-					for(var i=0;i<hs.length;i++){
-						ui.discardPile.appendChild(hs[i]);
-					}
-					game.me.directgain(get.cards(hs.length));
-				}
-				game.phaseLoop(_status.firstAct);
-			}
-		},
 		chooseCharacterJiange:function(){
 			var next=game.createEvent('chooseCharacter',false);
 			next.showConfig=true;
@@ -1755,5 +1748,4 @@ mode.versus={
 			},
 		}
 	},
-	config:['change_choice','ban_weak']
 }