十常侍大礼包；修改_turnover事件和giveup的includeOut为true

character/rank.js

@@ -300,6 +300,7 @@ window.noname_character_rank={
 		'wangguan',
 		'duanqiaoxiao',
 		'old_wanglang',
+		'shichangshi',
 		'key_misuzu',
 		'key_sunohara',
 		'key_umi',

game/game.js

@@ -12303,6 +12303,7 @@
 					next.setContent(info.content);
 					next.skillHidden=event.skillHidden;
 					if(info.forceDie) next.forceDie=true;
+					if(event.skill=='_turnover') next.includeOut=true;
 					"step 4"
 					if(player._hookTrigger){
 						for(var i=0;i<player._hookTrigger.length;i++){
@@ -12963,10 +12964,17 @@
 									var filterButton=info.chooseButton.filter||function(){return true};
 									var selectButton=info.chooseButton.select||1;
 									var chooseable=[];
+									var evt=game.createEvent('emptyEvent');
+									event.next.remove(evt);
+									evt.parent=_status.event;
+									evt.player=player;
+									var tmpevt=_status.event;
+									_status.event=evt;
 									for(var i=0;i<dialog.buttons.length;i++){
 										var btn=dialog.buttons[i];
-										if(filterButton(btn)) chooseable.push(btn);
+										if(filterButton(btn,player)) chooseable.push(btn);
 									}
+									_status.event=tmpevt;
 									if(chooseable.length==1&&dialog.direct||dialog.forceDirect){
 										event._result={
 											bool:true,
@@ -13171,10 +13179,17 @@
 									var filterButton=info.chooseButton.filter||function(){return true};
 									var selectButton=info.chooseButton.select||1;
 									var chooseable=[];
+									var evt=game.createEvent('emptyEvent');
+									event.next.remove(evt);
+									evt.parent=_status.event;
+									evt.player=player;
+									var tmpevt=_status.event;
+									_status.event=evt;
 									for(var i=0;i<dialog.buttons.length;i++){
 										var btn=dialog.buttons[i];
-										if(filterButton(btn)) chooseable.push(btn);
+										if(filterButton(btn,player)) chooseable.push(btn);
 									}
+									_status.event=tmpevt;
 									if(chooseable.length==1&&dialog.direct||dialog.forceDirect){
 										event._result={
 											bool:true,
@@ -19191,6 +19206,7 @@
 						dead:this.isDead(),
 						linked:this.isLinked(),
 						turnedover:this.isTurnedOver(),
+						out:this.isOut(),
 						phaseNumber:this.phaseNumber,
 						unseen:this.isUnseen(0),
 						unseen2:this.isUnseen(1),
@@ -22388,6 +22404,7 @@
 					}
 					var next=game.createEvent('turnOver');
 					next.player=this;
+					next.includeOut=true;
 					next.setContent('turnOver');
 					return next;
 				},
@@ -29677,10 +29694,10 @@
 				giveup:function(player){
 					if(lib.node.observing.contains(this)||!player||!player._giveUp) return;
 					_status.event.next.length=0;
-					game.createEvent('giveup',false).setContent(function(){
+					game.createEvent('giveup',false).set('includeOut',true).setContent(function(){
 						game.log(player,'投降');
 						player.popup('投降');
-						player.die('nosource');
+						player.die('nosource').includeOut=true;
 					}).player=player;
 				},
 				auto:function(){
@@ -30261,6 +30278,7 @@
 							}
 							else{
 								player.init(info.name1,info.name2);
+								if(info.name&&info.name!=info.name1) player.name=info.name;
 							}
 							if(!info.unseen) player.classList.remove('unseen');
 							if(!info.unseen2) player.classList.remove('unseen2');
@@ -30300,6 +30318,9 @@
 							if(info.turnedover){
 								player.classList.add('turnedover');
 							}
+							if(info.out){
+								player.classList.add('out');
+							}
 							if(info.disableJudge){
 								player.$disableJudge();
 							}
@@ -34021,7 +34042,7 @@
 			}
 		},
 		createTrigger:function(name,skill,player,event){
-			if(player.isOut()||player.removed) return;
+			if((player.isOut()||player.removed)&&skill!='_turnover') return;
 			if(player.isDead()&&!lib.skill[skill].forceDie) return;
 			var next=game.createEvent('trigger',false);
 			next.skill=skill;
@@ -34029,6 +34050,7 @@
 			next.triggername=name;
 			next.forceDie=true;
 			next._trigger=event;
+			if(skill=='_turnover') next.includeOut=true;
 			next.setContent('createTrigger');
 		},
 		createEvent:function(name,trigger,triggerevent){
@@ -45416,10 +45438,10 @@
 					}
 					else{
 						_status.event.next.length=0;
-						game.createEvent('giveup',false).setContent(function(){
+						game.createEvent('giveup',false).set('includeOut',true).setContent(function(){
 							game.log(player,'投降');
 							player.popup('投降');
-							player.die('nosource');
+							player.die('nosource').includeOut=true;
 						}).player=player;
 					}
 					if(_status.paused&&_status.imchoosing&&!_status.auto){
@@ -50480,7 +50502,7 @@
 				}
 				// ui.click.skin(this,player.name);
 				game.pause2();
-				ui.click.charactercard(player.name,null,null,true,this);
+				ui.click.charactercard(player.name1||player.name,null,null,true,this);
 			},
 			avatar2:function(){
 				if(!lib.config.doubleclick_intro) return;