diff --git a/card/sp.js b/card/sp.js
index d8c143282..a8e0fcee4 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -547,9 +547,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					'step 0'
-					player.chooseToUse({name:'jinchan'},'是否对'+get.translation(trigger.card)+'使用【金蝉脱壳】？').set('ai1',function(card){
+					player.chooseToUse('是否对'+get.translation(trigger.card)+'使用【金蝉脱壳】？').set('ai1',function(card){
 						return _status.event.bool;
-					}).set('bool',-get.effect(player,trigger.card,trigger.player,player)).set('respondTo',[trigger.player,trigger.card]);
+					}).set('bool',-get.effect(player,trigger.card,trigger.player,player)).set('respondTo',[trigger.player,trigger.card]).set('filterCard',function(card,player){
+						if(get.name(card)!='jinchan') return false;
+						return lib.filter.cardEnabled(card,player,'forceEnable');
+					});
 					trigger.jinchan=true;
 					'step 1'
 					delete trigger.jinchan;
diff --git a/character/diy.js b/character/diy.js
index 63d751807..7b933649d 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -41,6 +41,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			key_hisako:['female','key',3,['hisako_yinbao','hisako_zhuanyun']],
 			key_hinata:['male','key',4,['hinata_qiulve','hinata_ehou']],
 			key_noda:['male','key',4,['noda_fengcheng','noda_xunxin']],
+			key_tomoya:['male','key',4,['tomoya_shangxian','tomoya_wangjin']],
+			key_nagisa:['female','key',3,['nagisa_tiandu','nagisa_fuxin']],
+			key_ayato:['male','key',3,['ayato_jianshen','ayato_zonghuan']],
 			// diy_caocao:['male','wei',4,['xicai','diyjianxiong','hujia']],
 			// diy_hanlong:['male','wei',4,['siji','ciqiu']],
 			diy_feishi:['male','shu',3,['shuaiyan','moshou']],
@@ -106,6 +109,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			ns_xinnanhua:['male','qun',3,['ns_xiandao','ns_xiuzheng','ns_chuanshu'],[]],
 		},
 		characterFilter:{
+			key_tomoya:function(mode){
+				return mode!='chess'&&mode!='tafang'&&mode!='stone';
+			},
 			key_sunohara:function(mode){
 				return mode!='guozhan';
 			},
@@ -120,7 +126,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			diy:{
 				diy_tieba:["diy_wenyang","ns_zuoci","ns_lvzhi","ns_wangyun","ns_nanhua","ns_nanhua_left","ns_nanhua_right","ns_huamulan","ns_huangzu","ns_jinke","ns_yanliang","ns_wenchou","ns_caocao","ns_caocaosp","ns_zhugeliang","ns_wangyue","ns_yuji","ns_xinxianying","ns_guanlu","ns_simazhao","ns_sunjian","ns_duangui","ns_zhangbao","ns_masu","ns_zhangxiu","ns_lvmeng","ns_shenpei","ns_yujisp","ns_yangyi","ns_liuzhang","ns_xinnanhua","ns_zhangwei"],
 				diy_default:["diy_feishi","diy_liuyan","diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","diy_liufu","diy_xizhenxihong","diy_liuzan","diy_zaozhirenjun","diy_yangyi","diy_tianyu"],
-				diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa","key_kengo","key_yoshino","key_yui","key_tsumugi","key_saya","key_harukakanata","key_inari","key_shiina","key_sunohara","key_rin","key_sasami","key_akane","key_doruji","key_yuiko","key_riki","key_hisako","key_hinata","key_noda"],
+				diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa","key_kengo","key_yoshino","key_yui","key_tsumugi","key_saya","key_harukakanata","key_inari","key_shiina","key_sunohara","key_rin","key_sasami","key_akane","key_doruji","key_yuiko","key_riki","key_hisako","key_hinata","key_noda","key_tomoya","key_nagisa","key_ayato"],
 				diy_yongjian:["ns_chendao","yj_caoang"],
 			},
 		},
@@ -136,6 +142,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			diy_tianyu:'字国让，渔阳雍奴（今天津市武清区东北）人。三国时期曹魏将领。初从刘备，因母亲年老回乡，后跟随公孙瓒，公孙瓒败亡，劝说鲜于辅加入曹操。曹操攻略河北时，田豫正式得到曹操任用，历任颖阴、郎陵令、弋阳太守等。',
 		},
 		characterTitle:{
+			key_ayato:'#rAngel Beats!',
+			key_nagisa:'#gClannad',
+			key_tomoya:'#gClannad',
 			key_noda:'#rAngel Beats!',
 			key_hinata:'#rAngel Beats!',
 			key_hisako:'#rAngel Beats!',
@@ -201,6 +210,246 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			yuji:['zuoci']
 		},
 		skill:{
+			ayato_jianshen:{
+				mod:{
+					cardnature:function(card,player){
+						if(get.name(card)=='sha') return 'kami';
+					},
+				},
+				ai:{threaten:3},
+			},
+			ayato_zonghuan:{
+				enable:'phaseUse',
+				usable:1,
+				filterTarget:function(card,player,target){
+					return target!=player&&target.countCards('h')>0;
+				},
+				content:function(){
+					'step 0'
+					player.chooseButton(['请选择'+get.translation(target)+'的一张手牌',target.getCards('h')],true).set('ai',get.buttonValue);
+					'step 1'
+					if(result.bool){
+						var card=result.links[0];
+						event.card=card;
+						if(!lib.filter.cardEnabled(card,target)) event._result={bool:false};
+						else{
+							var targets=game.players.slice(0);
+							var info=get.info(card);
+  					var range;
+  					if(!info.notarget){
+    				var select=get.copy(info.selectTarget);
+    				if(select==undefined){
+    					range=[1,1];
+    				}
+    				else if(typeof select=='number') range=[select,select];
+    				else if(get.itemtype(select)=='select') range=select;
+    				else if(typeof select=='function') range=select(card,player);
+    				game.checkMod(card,target,range,'selectTarget',target);
+   				}
+  					if(info.notarget||range[1]==-1){
+  						if(range[1]==-1){
+  							for(var i=0;i<targets.length;i++){
+  								if(!target.canUse(card,targets[i])){
+  									targets.splice(i--,1);
+  								}
+  							}
+  							if(targets.length){
+  								event.targets2=targets;
+  							}
+  							else{
+  								event.finish();
+  								return;
+  							}
+  						}
+  						else event.targets2=[];
+ 							var next=player.chooseBool();
+ 							next.set('prompt',event.prompt||('是否令'+get.translation(target)+(event.targets2.length?'对':'')+get.translation(event.targets2)+'使用'+get.translation(card)+'?'));
+ 							next.set('prompt2','或点「取消」，令其将此牌置入弃牌堆');
+ 							next.ai=function(){
+ 								var eff=0;
+ 								for(var i=0;i<event.targets2.length;i++){
+ 									eff+=get.effect(event.targets2[i],card,target,player);
+ 								}
+ 								return eff>0;
+ 							};
+  					}
+  					else{
+  						var next=player.chooseTarget();
+  						next.set('_get_card',card);
+  						next.set('source',target);
+  						next.set('filterTarget',function(card,player,target){
+  							return lib.filter.filterTarget(_status.event._get_card,_status.event.source,target);
+  						});
+  						next.set('ai',function(target){
+  							var evt=_status.event;
+  							return get.effect(target,evt._get_card,evt.source,evt.player)
+  						});
+  						next.set('selectTarget',function(){
+   						var card=get.card(),player=_status.event.source;
+     				if(card==undefined) return;
+     				var range;
+     				var select=get.copy(get.info(card).selectTarget);
+     				if(select==undefined){
+     					if(get.info(card).filterTarget==undefined) return[0,0];
+     					range=[1,1];
+     				}
+     				else if(typeof select=='number') range=[select,select];
+     				else if(get.itemtype(select)=='select') range=select;
+     				else if(typeof select=='function') range=select(card,player);
+     				game.checkMod(card,player,range,'selectTarget',player);
+     				return range;
+  						});
+  						next.set('prompt',event.prompt||('选择'+get.translation(target)+'使用'+get.translation(card)+'的目标'));
+  						next.set('prompt2','或点「取消」令其将此牌置入弃牌堆');
+  					}
+						}
+					}
+					else event.finish();
+					'step 2'
+					if(result.bool){
+						target.useCard(card,event.targets2||result.targets,false,'noai');
+						player.draw();
+					}
+					else{
+						target.lose(card,ui.discardPile);
+						target.$throw(card);
+						game.log(target,'将',card,'置入了弃牌堆');
+					}
+				},
+				ai:{order:10,result:{target:-1}},
+			},
+			nagisa_tiandu:{
+				trigger:{player:'judgeEnd'},
+				frequent:function(event){
+					if(event.result.card.name=='du') return false;
+					return true;
+				},
+				check:function(event){
+					if(event.result.card.name=='du') return false;
+					return true;
+				},
+				filter:function(event,player){
+					return get.position(event.result.card,true)=='o';
+				},
+				content:function(){
+					player.gain(trigger.result.card,'gain2');
+				}
+			},
+			nagisa_fuxin:{
+				trigger:{
+					global:["gainAfter","loseAfter","damageEnd"],
+				},
+				filter:function (event){
+					var evt=event;
+					if(event.name=='lose'){
+						if(event.type!='discard') return false;
+						evt=event.getParent();
+					}
+					var player=evt[event.name=='gain'?'source':'player'];
+					if(!player||player==_status.currentPhase||player.isDead()) return false;
+					if(event.name=='damage') return true;
+					if(evt[event.name=='gain'?'bySelf':'notBySelf']!=true) return false;
+					if(event.name=='lose') return event.hs.length>0;
+					return event.relatedLose&&event.relatedLose.hs&&event.relatedLose.hs.length>0;
+				},
+				check:function(event,player){
+					return get.attitude(player,event[event.name=='gain'?'source':'player'])>0&&get.attitude(player,_status.currentPhase)<=0;
+				},
+				logTarget:function(event){
+					return event[event.name=='gain'?'source':'player'];
+				},
+				content:function(){
+					"step 0"
+					event.target=trigger[trigger.name=='gain'?'source':'player'];
+					event.target.judge();
+					"step 1"
+					if(result.color=='red') target.draw();
+					else if(_status.currentPhase&&_status.currentPhase.countCards('he')) _status.currentPhase.chooseToDiscard('he',true);
+				},
+				ai:{expose:0.2},
+			},
+			tomoya_shangxian:{
+				trigger:{player:'phaseUseBegin'},
+				mark:true,
+				intro:{
+					content:function(s){
+						return '计算与其他角色的距离时始终从'+(s?'逆':'顺')+'时针计算'
+					},
+				},
+				content:function(){
+					player.draw();
+					player.storage.tomoya_shangxian=!player.storage.tomoya_shangxian;
+				},
+				ai:{
+					left_hand:true,
+					right_hand:true,
+					skillTagFilter:function(player,tag){
+						return (player.storage.tomoya_shangxian==true)==(tag=='left_hand');
+					},
+				},
+			},
+			tomoya_wangjin:{
+				trigger:{global:'phaseJieshuBegin'},
+				filter:function(event,player){
+					return player!=event.player&&!player.hasSkill('tomoya_wangjin_'+player.inRange(event.player));
+				},
+				logTarget:'player',
+				check:function(event,player){
+					var target=event.player;
+					var bool=player.inRange(target);
+					if(!bool){
+						if(target.hp>player.hp) return get.effect(target,{name:'sha',isCard:true},player,player)>0;
+						var temp=target;
+						while(true){
+							temp=temp.getNext();
+							if(temp==target||temp==_status.roundStart) return true;
+							if(temp==player) continue;
+							if(temp.hp>player.hp&&!player.inRange(temp)&&get.effect(temp,{name:'sha',isCard:true},player,player)>0) return false;
+						}
+					}
+					if(get.attitude(player,target)<2) return false;
+					if(target.hp<player.hp&&!target.hasSkillTag('nogain')) return true;
+					var temp=target;
+					while(true){
+						temp=temp.getNext();
+						if(temp==target||temp==_status.roundStart) return true;
+						if(temp==player) continue;
+						if(temp.hp<player.hp&&player.inRange(temp)&&get.attitude(player,target)>=2&&!temp.hasSkillTag('nogain')) return false;
+					}
+				},
+				content:function(){
+					'step 0'
+					event.bool=player.inRange(trigger.player);
+					player.addTempSkill('tomoya_wangjin_'+event.bool,{global:'roundStart'});
+					if(event.bool){
+						trigger.player.draw();
+					}
+					else player.draw(2);
+					'step 1'
+					if(event.bool){
+						if(trigger.player.hp<player.hp) player.draw();
+						else event.finish();
+					}
+					else{
+						if(player.countDiscardableCards(trigger.player,'h')>0) trigger.player.discardPlayerCard(player,'h',true);
+						else event.finish();
+					}
+					'step 2'
+					if(event.bool){
+						player.chooseCard('h','是否交给'+get.translation(trigger.player)+'一张牌？');
+					}
+					else{
+						event.finish();
+						if(player.hp>=trigger.player.hp) return;
+						var card={name:'sha',isCard:true};
+						if(player.canUse(card,trigger.player,false)) player.useCard(card,trigger.player,false);
+					}
+					'step 3'
+					if(result.bool) trigger.player.gain(result.cards,player,'giveAuto')
+				},
+				subSkill:{true:{},false:{}},
+				ai:{expose:0.2},
+			},
 			noda_fengcheng:{
 				trigger:{
 					player:"gainAfter",
@@ -338,6 +587,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					else event.finish();
 					'step 2'
 					var target=result.targets[0];
+					player.addExpose(0.2);
 					player.line(target,'thunder');
 					target.damage();
 				},
@@ -397,6 +647,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						event.target.give(result.cards,player,true);
 					}
 				},
+				ai:{expose:0.2},
 				subSkill:{
 					respond:{
 						onremove:true,
@@ -484,6 +735,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.addTempSkill('zishou2','phaseEnd');
 					}
 				},
+				ai:{expose:0.2},
 			},
 			yuiko_fenglun:{
 				enable:'phaseUse',
@@ -2490,6 +2742,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						if(lib.card[card.name].type=='delay') return 'wuzhong';
 					},
 				},
+				trigger:{player:'drawBefore'},
+				forced:true,
+				filter:function(event,player){
+					return event.getParent().name=='wuzhong';
+				},
+				content:function(){trigger.num+=2},
 			},
 			haruko_zhuishi:{
 				trigger:{global:'phaseJudgeBegin'},
@@ -2497,14 +2755,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return misuzu.player.countCards('j')>0;
 				},
 				check:function(event,player){
-					return player.hp>1&&get.attitude(player,event.player)>1;
+					return get.attitude(player,event.player)>1;
 				},
 				logTarget:'player',
 				content:function(){
 					'step 0'
-					player.loseHp();
-					'step 1'
 					player.gain(trigger.player.getCards('j'),trigger.player,'give');
+					'step 1'
+					if(player.hp>1) player.loseHp();
 				},
 			},
 			yuri_xingdong:{
@@ -7585,6 +7843,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			key_hisako:'久子',
 			key_hinata:'日向秀树',
 			key_noda:'野田',
+			key_tomoya:'冈崎朋也',
+			key_nagisa:'古河渚',
+			key_ayato:'直井文人',
 			lucia_duqu:'毒躯',
 			lucia_duqu_info:'锁定技，①当你对其他角色造成伤害或受到其他角色的伤害时，你和对方各获得一张花色点数随机的【毒】。<br>②当你因【毒】失去体力时，你改为回复等量的体力。<br>③当你处于濒死状态时，你可以使用一张【毒】（每回合限一次）。',
 			lucia_zhenren:'振刃',
@@ -7598,9 +7859,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			yuri_wangxi:'忘隙',
 			yuri_wangxi_info:'主公技，限定技，当有角色因你发动的【行动】而死亡后，若其身份不为【明忠】，则其可以将身份改为忠臣并重新加入游戏，然后将势力改为与你相同，将体力值回复至2点并摸一张牌。',
 			haruko_haofang:'豪放',
-			haruko_haofang_info:'锁定技，你的延时锦囊牌视为【无中生有】。',
+			haruko_haofang_info:'锁定技，你的延时锦囊牌视为【无中生有】。当你因执行【无中生有】的效果而摸牌时，你令摸牌数+2。',
 			haruko_zhuishi:'追逝',
-			haruko_zhuishi_info:'一名角色的判定阶段开始时，若其判定区内有牌，则你可以失去1点体力，然后获得其判定区内的所有牌。',
+			haruko_zhuishi_info:'一名角色的判定阶段开始时，若其判定区内有牌，则你可以获得其判定区内的所有牌。若你的体力值大于1，你失去1点体力。',
 			kagari_zongsi:'纵丝',
 			kagari_zongsi_info:'出牌阶段限一次，你可以选择一张不在游戏外的牌，然后将其置于牌堆/弃牌堆的顶部/底部或一名角色的对应区域内。',
 			umi_chaofan:'炒饭',
@@ -7735,7 +7996,20 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			noda_fengcheng_info:'锁定技，其他角色交给你牌后，其摸一张牌。',
 			noda_xunxin:'寻衅',
 			noda_xunxin2:'寻衅',
-			noda_xunxin_info:'出牌阶段限X次，你可以视为对一名体力值不小于你的角色使用【决斗】。若如此做，此【决斗】结算完成后，没赢的角色交给赢的角色一张牌。',
+			noda_xunxin_info:'出牌阶段限X次，你可以视为对一名体力值不小于你的角色使用【决斗】。若如此做，此【决斗】结算完成后，没赢的角色交给赢的角色一张牌。（X为你的体力值）',
+			tomoya_shangxian:'伤弦',
+			tomoya_shangxian_info:'锁定技，你计算与其他角色的距离时始终从逆时针方向计算。出牌阶段开始时，你可摸一张牌，并改变此方向。',
+			tomoya_wangjin:'往今',
+			tomoya_wangjin_info:'每项每轮各限一次。一名其他角色的回合结束时，若其：在你的攻击范围内，你可令其摸一张牌。若其的体力值小于你，则你摸一张牌，并可交给其一张牌。不在你的攻击范围内，则你摸两张牌，并令其弃置你的一张手牌。若其的体力值大于你，则你视为对其使用一张【杀】（无距离限制）。',
+			nagisa_tiandu:'天妒',
+			nagisa_tiandu_info:'当你的判定牌生效后，你可以获得此牌。',
+			nagisa_fuxin:'抚心',
+			nagisa_fuxin_info:'当一名角色于回合外受到伤害，或其手牌被其他角色弃置或获得后，你可以令其判定。若结果为：红色，其摸一张牌。黑色，当前回合角色弃置一张牌。',
+			ayato_jianshen:'僭神',
+			ayato_jianshen_info:'锁定技，你手牌中的【杀】均视为神属性。',
+			ayato_zonghuan:'纵幻',
+			ayato_zonghuan_info:'出牌阶段限一次，你可以观看一名其他角色的手牌，然后选择一项：将其中的一张牌置入弃牌堆，或以该角色的视角使用其中的一张，然后摸一张牌。',
+			
 			
 			yj_caoang:'SP曹昂',
 			yjxuepin:'血拼',
diff --git a/character/extra.js b/character/extra.js
index bcb461f92..592f09d07 100755
--- a/character/extra.js
+++ b/character/extra.js
@@ -299,9 +299,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.logSkill('olzhiti',target);
 						var list=[];
 						for(var i=1;i<6;i++){
-							if(!target.isDisabled(i)) list.push(i);
+							if(!target.isDisabled(i)) list.add((i==3||i==4)?6:i);
+						}
+						var num=list.randomGet();
+						if(num!=6) target.disableEquip(num);
+						else{
+							target.disableEquip(3);
+							target.disableEquip(4);
 						}
-						target.disableEquip(list.randomGet());
 					}
 				},
 			},
diff --git a/character/mobile.js b/character/mobile.js
index 1792d8666..5471537a7 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -1280,7 +1280,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						player.draw();
 					}
 					else{
-						var next=player.chooseUseTarget({name:trigger.card.name,nature:trigger.card.nature},false,true);
+						var next=player.chooseUseTarget({name:trigger.card.name,nature:trigger.card.nature,isCard:true},false,true);
 						_status.event.next.remove(next);
 						event.evt.after.push(next);
 						next.logSkill='zhiyi';
@@ -1775,11 +1775,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					if(get.nature(card)) return 1.5;
 					return 1;
 				},
-				prepare:'give',
 				discard:false,
 				content:function(){
 					'step 0'
-					target.gain(cards,player);
+					target.gain(cards,player,'giveAuto');
 					player.recover();
 					'step 1'
 					var num=1;
diff --git a/character/refresh.js b/character/refresh.js
index 2236d04fa..d52a184ed 100755
--- a/character/refresh.js
+++ b/character/refresh.js
@@ -542,10 +542,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 				}
 			},
-			jiushi:{
-				audio:'jiushi1',
-				group:['jiushi1','jiushi2','jiushi3'],
-			},
 			chengzhang:{
 				trigger:{player:'phaseZhunbeiBegin'},
 				derivation:'rejiushi_mark',
@@ -585,6 +581,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
   				filter:function(event,player){
   					return player.storage.chengzhang==true;
   				},
+  				prompt:'是否发动【酒诗】，获得牌堆中的一张锦囊牌？',
   				content:function(){
   					var card=get.cardPile2(function(card){
   						return get.type2(card)=='trick';
@@ -599,12 +596,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:'chooseToUse',
 				filter:function(event,player){
 					if(player.classList.contains('turnedover')) return false;
-					if(event.parent.name=='phaseUse'){
-						return lib.filter.filterCard({name:'jiu'},player,event);
-					}
-					if(event.type!='dying') return false;
-					if(player!=event.dying) return false;
-					return true;
+					return event.filterCard({name:'jiu',isCard:true},player,event);
 				},
 				content:function(){
 					if(_status.event.getParent(2).type=='dying'){
@@ -704,6 +696,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					}
 					return false;
 				},
+				prompt:function(event,player){
+					var str='是否发动【酒诗】，将武将牌翻面';
+					if(!player.storage.chengzhang) str+='，并获得牌堆中的一张锦囊牌';
+					str+='？'
+					return str;
+				},
 				content:function(){
 					delete trigger.rejiushi;
 					player.turnOver();
@@ -731,7 +729,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				trigger:{player:'loseEnd'},
 				filter:function(event,player){
-					if(player==_status.currentPhase||!event.visible||player.hp>=player.countCards('h')) return false;
+					if(player==_status.currentPhase||!event.visible||player.hp<=player.countCards('h')) return false;
 					for(var i=0;i<event.cards2.length;i++){
 						if(get.suit(event.cards2[i],player)=='heart') return true;
 					}
@@ -1910,10 +1908,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				addHuashen:function(player){
 					if(!player.storage.rehuashen) return;
 					if(!_status.characterlist){
-						var list=[];
-						for(var i in lib.character){
-							if(lib.filter.characterDisabled2(i)||lib.filter.characterDisabled(i)) continue;
-							list.push(i);
+						if(_status.connectMode) var list=get.charactersOL();
+						else{
+ 						var list=[];
+ 						for(var i in lib.character){
+ 							if(lib.filter.characterDisabled2(i)||lib.filter.characterDisabled(i)) continue;
+ 							list.push(i);
+ 						}
 						}
 						game.countPlayer2(function(current){
 							list.remove(current.name);
@@ -4590,11 +4591,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return 8-get.value(card);
 				},
 				discard:false,
-				prepare:'give',
+				lose:false,
+				delay:false,
 				content:function(){
 					"step 0"
 					target.storage.refanjian=cards[0];
-					target.gain(cards[0],player);
+					target.gain(cards[0],player,'give');
 					"step 1"
 					target.chooseControl('refanjian_card','refanjian_hp').ai=function(event,player){
 						var cards=player.getCards('he',{suit:get.suit(player.storage.refanjian)});
diff --git a/character/shenhua.js b/character/shenhua.js
index 6689f5dcf..ebad27668 100755
--- a/character/shenhua.js
+++ b/character/shenhua.js
@@ -2015,7 +2015,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						},
 						discard:false,
 						line:true,
-						prepare:'give',
+						lose:false,
+						delay:false,
 						position:'he',
 						filterCard:true,
 						filterTarget:function(card,player,target){
@@ -2029,7 +2030,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						content:function(){
 							'step 0'
 							player.storage.nzry_shenshi=true;
-							target.gain(cards,player);
+							target.gain(cards,player,'giveAuto');
 							target.damage('nocard');
 							'step 1'
 							if(!target.isAlive()){
@@ -6638,11 +6639,12 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				enable:'phaseUse',
 				discard:false,
+				lose:false,
+				delay:false,
 				line:true,
 				direct:true,
 				prepare:function(cards,player,targets){
 					targets[0].logSkill('huangtian');
-					player.$give(cards,targets[0]);
 				},
 				prompt:function(){
 					var player=_status.event.player;
@@ -6671,7 +6673,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				//usable:1,
 				//forceaudio:true,
 				content:function(){
-					target.gain(cards,player);
+					target.gain(cards,player,'giveAuto');
 					target.addTempSkill('huangtian3','phaseUseEnd');
 				},
 				ai:{
diff --git a/character/sp.js b/character/sp.js
index 3ca90b516..df2454429 100755
--- a/character/sp.js
+++ b/character/sp.js
@@ -590,6 +590,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return (player.getStat().skill.liji||0)<(event.liji_num||0);
 				},
 				onChooseToUse:function(event){
+					if(game.online) return
 					var num=0;
 					game.getGlobalHistory('cardMove',function(evt){
 						if(evt.name=='cardsDiscard'||(evt.name=='lose'&&evt.position==ui.discardPile)) num+=evt.cards.length;
@@ -612,6 +613,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xinkuangfu:{
 				enable:'phaseUse',
 				usable:1,
+				delay:false,
 				filterTarget:function(card,player,target){
 					if(player==target) return player.countCards('e',function(card){
 						return lib.filter.cardDiscardable(card,player);
@@ -1965,9 +1967,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				initList:function(){
 					var list=[];
-					for(var i in lib.character){
-						if(lib.filter.characterDisabled2(i)||lib.filter.characterDisabled(i)) continue;
-						list.push(i);
+					if(_status.connectMode) var list=get.charactersOL();
+					else{
+						var list=[];
+						for(var i in lib.character){
+							if(lib.filter.characterDisabled2(i)||lib.filter.characterDisabled(i)) continue;
+							list.push(i);
+						}
 					}
 					game.countPlayer2(function(current){
 						list.remove(current.name);
@@ -6908,10 +6914,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return player.countCards('h','sha');
 				},
 				discard:false,
-				prepare:'give',
+				lose:false,
+				delay:false,
 				filterCard:{name:'sha'},
 				content:function(){
-					target.gain(cards,player);
+					target.gain(cards,player,'giveAuto');
 					target.storage.fuman3=cards[0];
 					target.storage.fuman2=player;
 					target.addTempSkill('fuman2',{player:'phaseAfter'});
@@ -7455,10 +7462,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return 0;
 				},
 				discard:false,
-				prepare:'give',
+				lose:false,
+				delay:false,
 				content:function(){
 					'step 0'
-					target.gain(cards,player);
+					target.gain(cards,player,'giveAuto');
 					if(get.color(cards[0])=='black'){
 						target.chooseToDiscard(2,'he','弃置两张牌，或令'+get.translation(player)+'摸两张牌').set('ai',function(card){
 							if(_status.event.goon) return 7-get.value(card);
@@ -8098,7 +8106,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return ui.selected.cards.length+2;
 				},
 				discard:false,
-				prepare:'give',
+				lose:false,
+				delay:false,
 				filterTarget:function(card,player,target){
 					return player!=target;
 				},
@@ -8121,7 +8130,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return 0;
 				},
 				content:function(){
-					target.gain(cards,player);
+					target.gain(cards,player,'giveAuto');
 					target.recover();
 				},
 				ai:{
@@ -13444,15 +13453,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				direct:true,
 				content:function(){
 					"step 0"
+					event.count=trigger.num;
+					"step 1"
 					player.chooseTarget(get.prompt('shushen'),'令一名其他角色选择摸两张牌或回复1点体力',function(card,player,target){
 						return target!=player;
 					}).set('ai',function(target){
 						return get.attitude(_status.event.player,target);
 					});
-					"step 1"
+					"step 2"
 					if(result.bool){
+						event.count--;
 						player.logSkill('shushen',result.targets);
 						result.targets[0].chooseDrawRecover(2,true);
+						if(event.count) event.goto(1);
 					}
 				},
 				ai:{
@@ -17171,6 +17184,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sunluyu:'孙鲁育',
 			hanba:'旱魃',
 			panfeng:'旧潘凤',
+			gz_panfeng:'潘凤',
 			zumao:'祖茂',
 			daxiaoqiao:'大小乔',
 			sp_daqiao:'☆SP大乔',
diff --git a/character/yijiang.js b/character/yijiang.js
index 60d92b6c6..d0d064e4a 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -6912,10 +6912,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				filterCard:true,
 				selectCard:-1,
 				discard:false,
-				lose:true,
+				lose:false,
+				delay:false,
 				content:function(){
-					player.$give(cards.length,target);
-					target.gain(cards,player);
+					target.gain(cards,player,'giveAuto');
 					target.addTempSkill('mingjian2',{player:'phaseAfter'});
 					target.storage.mingjian2++;
 					target.updateMarks('mingjian2');
@@ -8894,8 +8894,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				selectTarget:2,
 				multitarget:true,
 				discard:false,
+				lose:false,
 				targetprompt:['得到牌','出杀目标'],
-				prepare:'give',
 				filterTarget:function(card,player,target){
 					if(ui.selected.targets.length==0){
 						return player!=target;
@@ -8904,9 +8904,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						return ui.selected.targets[0].inRange(target);
 					}
 				},
+				delay:false,
 				content:function(){
 					"step 0"
-					targets[0].gain(cards,player);
+					targets[0].gain(cards,player,'give');
 					"step 1"
 					if(!lib.filter.filterTarget({name:'sha',isCard:true},targets[0],targets[1])) event._result={control:'draw_card'};
 					else targets[0].chooseControl('draw_card','出杀',function(){
@@ -9525,12 +9526,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:'chooseToUse',
 				filter:function(event,player){
 					if(player.classList.contains('turnedover')) return false;
-					if(event.parent.name=='phaseUse'){
-						return lib.filter.filterCard({name:'jiu'},player,event);
-					}
-					if(event.type!='dying') return false;
-					if(player!=event.dying) return false;
-					return true;
+					return event.filterCard({name:'jiu',isCard:true},player,event);
 				},
 				content:function(){
 					if(_status.event.getParent(2).type=='dying'){
@@ -9624,6 +9620,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				check:function(event,player){
 					return player.isTurnedOver();
 				},
+				prompt:'是否发动【酒诗】，将武将牌翻面？',
 				filter:function(event,player){
 					if(event.jiushi){
 						return true;
@@ -10151,7 +10148,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				enable:'phaseUse',
 				usable:1,
 				discard:false,
-				prepare:'give2',
+				lose:false,
+				delay:0,
 				filter:function(event,player){
 					return player.countCards('he',{suit:'heart'});
 				},
@@ -10173,7 +10171,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					"step 0"
-					target.gain(cards,player);
+					target.gain(cards,player,'give');
 					// game.delay();
 					"step 1"
 					player.gainPlayerCard(target,'he',true);
diff --git a/game/asset.js b/game/asset.js
index 76cc61364..4170a80e4 100644
--- a/game/asset.js
+++ b/game/asset.js
@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.9.99.2',
+	'v1.9.99.3',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -3042,6 +3042,9 @@ window.noname_asset_list=[
 	'image/character/yujin_yujin.jpg',	'image/character/key_hinata.jpg',
 	'image/character/key_hisako.jpg',
 	'image/character/key_noda.jpg',
+	'image/character/key_ayato.jpg',
+	'image/character/key_nagisa.jpg',
+	'image/character/key_tomoya.jpg',
 	
 	'image/character/baiwuchang.jpg',
 	'image/character/baosanniang.jpg',
diff --git a/game/game.js b/game/game.js
index 8af571f0c..49a06fc7c 100644
--- a/game/game.js
+++ b/game/game.js
@@ -9822,11 +9822,21 @@
 						return;
 					}
 					var info=get.info(card);
-					var select=get.select(info.selectTarget);
-					if(select[1]==-1||info.notarget){
-						if(select[1]==-1){
+					var range;
+					if(!info.notarget){
+  				var select=get.copy(info.selectTarget);
+  				if(select==undefined){
+  					range=[1,1];
+  				}
+  				else if(typeof select=='number') range=[select,select];
+  				else if(get.itemtype(select)=='select') range=select;
+  				else if(typeof select=='function') range=select(card,player);
+  				game.checkMod(card,player,range,'selectTarget',player);
+ 				}
+					if(info.notarget||range[1]==-1){
+						if(range[1]==-1){
 							for(var i=0;i<targets.length;i++){
-								if(!player.canUse(card,targets[i],false)){
+								if(!player.canUse(card,targets[i],event.nodistance?false:null)){
 									targets.splice(i--,1);
 								}
 							}
@@ -13369,7 +13379,7 @@
 							if(att>0){
 								if(!_status.event.nojudge&&target.countCards('j',function(card){
 									return game.hasPlayer(function(current){
-										return !current.hasJudge(card);
+										return !current.hasJudge(card)&&get.attitude(player,current)<0;
 									})
 								})) return 14;
 								if(target.countCards('e',function(card){
@@ -13431,7 +13441,7 @@
 							var player=_status.event.player;
 							var targets0=_status.event.targets0;
 							var targets1=_status.event.targets1;
-							if(get.attitude(player,targets0)>get.attitude(player,targets1)){
+							if(get.attitude(player,targets0)>0&&get.attitude(player,targets1)<0){
 								if(get.position(button.link)=='j') return 12;
 								if(get.value(button.link,targets0)<0) return 10;
 								return 0;
@@ -15506,7 +15516,10 @@
   				}
   				if(from.isDead()) length++;
   				if(to.isDead()) length++;
-  				n=Math.min(n,length-n);
+  				var left=from.hasSkillTag('left_hand');
+  				var right=from.hasSkillTag('right_hand');
+  				if(left===right) n=Math.min(n,length-n);
+  				else if(left==true) n=length-n;
   			}
   
   			n=game.checkMod(from,to,n,'globalFrom',from);
@@ -18110,7 +18123,7 @@
 								if(game.hasPlayer(function(current2){
 									if(withatt){
 										var att2=get.attitude(player,current2);
-										if(att2>0) return false;
+										if(att2>=0) return false;
 									}
 									return current!=current2&&!current2.storage._disableJudge&&!current2.hasJudge(js[i]);
 								})){
@@ -30677,14 +30690,15 @@
 					for(i=0;i<cards.length;i++){
 						if(lib.config.cardtempname!='off'){
  						var cardname=get.name(cards[i]);
- 						if(cards[i].name!=cardname){
+ 						var cardnature=get.nature(cards[i]);
+ 						if(cards[i].name!=cardname||((cardnature||cards[i].nature)&&cards[i].nature!=cardnature)){
  							if(!cards[i]._tempName) cards[i]._tempName=ui.create.div('.tempname',cards[i]);
  							var tempname=get.translation(cardname);
  							cards[i]._tempName.dataset.nature='fire';
  							if(cardname=='sha'){
- 								var nature=get.nature(cards[i]);
- 								if(nature) tempname=get.translation(nature)+tempname;
- 								if(nature=='thunder') cards[i]._tempName.dataset.nature='thunder';
+ 								if(cardnature) tempname=get.translation(cardnature)+tempname;
+ 								if(cardnature=='thunder') cards[i]._tempName.dataset.nature='thunder';
+ 								if(cardnature=='kami') cards[i]._tempName.dataset.nature='kami';
  							}
  							cards[i]._tempName.innerHTML=lib.config.cardtempname=='default'?get.verticalStr(tempname):tempname;
  							cards[i]._tempName.tempname=tempname;
@@ -48551,7 +48565,10 @@
 				if(method=='absolute') return n;
 				if(from.isDead()) length++;
 				if(to.isDead()) length++;
-				n=Math.min(n,length-n);
+				var left=from.hasSkillTag('left_hand');
+				var right=from.hasSkillTag('right_hand');
+				if(left===right) n=Math.min(n,length-n);
+				else if(left==true) n=length-n;
 				if(method=='raw'||method=='pure') return n;
 			}
 
@@ -48922,10 +48939,12 @@
 		},
 		selectableTargets:function(sort){
 			var selectable=[];
-			for(var i=0;i<game.players.length;i++){
-				if(game.players[i].classList.contains('selectable')&&
-					game.players[i].classList.contains('selected')==false){
-					selectable.push(game.players[i]);
+			var players=game.players.slice(0);
+			if(_status.event.deadTarget) players.addArray(game.dead);
+			for(var i=0;i<players.length;i++){
+				if(players[i].classList.contains('selectable')&&
+					players[i].classList.contains('selected')==false){
+					selectable.push(players[i]);
 				}
 			}
 			selectable.randomSort();
diff --git a/game/update.js b/game/update.js
index da24a5073..d182d0208 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,14 +1,13 @@
 window.noname_update={
-	version:'1.9.99.2',
-	update:'1.9.99.1',
+	version:'1.9.99.3',
+	update:'1.9.99.2',
 	changeLog:[
-		'船新版本的神武再临',
 		'bug修复',
 	],
 	files:[
 		//'card/extra.js',
 		//'card/huanlekapai.js',
-		//'card/sp.js',
+		'card/sp.js',
 		'card/standard.js',
 		//'card/swd.js',
 		//'card/mtg.js',
@@ -23,7 +22,7 @@ window.noname_update={
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		//'character/mobile.js',
+		'character/mobile.js',
 		//'character/mtg.js',
 		'character/old.js',
 		'character/refresh.js',
@@ -34,10 +33,10 @@ window.noname_update={
 		//'character/swd.js',
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
-		//'character/yijiang.js',
+		'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
-		'layout/default/layout.css',
+		//'layout/default/layout.css',
 		//'layout/nova/layout.css',
 		//'mode/identity.js',
 		//'mode/doudizhu.js',
@@ -46,9 +45,9 @@ window.noname_update={
 		//'mode/tafang.js',
 		//'mode/single.js',
 		//'mode/stone.js',
-		//'mode/brawl.js',
-		//'mode/versus.js',
-		'mode/boss.js',
+		'mode/brawl.js',
+		'mode/versus.js',
+		//'mode/boss.js',
 		'game/game.js',
 		//'game/NoSleep.js',
 		//'game/config.js',
diff --git a/image/character/key_ayato.jpg b/image/character/key_ayato.jpg
new file mode 100644
index 000000000..93c60e9c0
Binary files /dev/null and b/image/character/key_ayato.jpg differ
diff --git a/image/character/key_nagisa.jpg b/image/character/key_nagisa.jpg
new file mode 100644
index 000000000..ebdbac83c
Binary files /dev/null and b/image/character/key_nagisa.jpg differ
diff --git a/image/character/key_tomoya.jpg b/image/character/key_tomoya.jpg
new file mode 100644
index 000000000..261c6363c
Binary files /dev/null and b/image/character/key_tomoya.jpg differ
diff --git a/mode/brawl.js b/mode/brawl.js
index fd39deba6..5ebd703f1 100644
--- a/mode/brawl.js
+++ b/mode/brawl.js
@@ -1564,6 +1564,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					var exclude=['界','新','大','旧','☆','神'];
 					for(var i in lib.character){
 						if(lib.filter.characterDisabled(i)) continue;
+						if(lib.character[i][1]=='key') continue;
 						var surname=lib.translate[i];
 						for(var j=0;j<surname.length;j++){
 							if(exclude.contains(surname[j])) continue;
diff --git a/mode/versus.js b/mode/versus.js
index 3d5e1f134..52ddc77ae 100644
--- a/mode/versus.js
+++ b/mode/versus.js
@@ -1100,6 +1100,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					}
 					var choose=[];
 					event.list=list;
+					_status.characterlist=list;
 
 					var addSetting=function(dialog){
 						dialog.add('选择座位').classList.add('add-setting');
@@ -1323,6 +1324,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 							}
 						}
 					}
+					for(var i=0;i<game.players.length;i++){
+						_status.characterlist.remove(game.players[i].name);
+						_status.characterlist.remove(game.players[i].replacetwo);
+					}
 					setTimeout(function(){
 						ui.arena.classList.remove('choose-character');
 					},500);
@@ -2791,6 +2796,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					var list=get.charactersOL();
 					var choose=[];
 					event.list=list;
+					_status.characterlist=list;
 					for(var i=0;i<game.players.length;i++){
 						choose.push([game.players[i],['选择角色',[list.randomRemove(7),'character']],true]);
 					}
@@ -2805,6 +2811,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						else{
 							result[i]=result[i].links[0];
 						}
+						_status.characterlist.remove(result[i]);
 						if(!lib.playerOL[i].name){
 							lib.playerOL[i].init(result[i]);
 						}