v1.9.96.6

character/mobile.js

@@ -6,10 +6,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		connect:true,
 		characterSort:{
 			mobile:{
-				mobile_default:["miheng","taoqian","liuzan","lingcao","sunru","lifeng","zhuling","liuye","zhaotongzhaoguang","majun","simazhao","wangyuanji","pangdegong","shenpei"],
+				mobile_default:["miheng","taoqian","liuzan","lingcao","sunru","lifeng","zhuling","liuye","zhaotongzhaoguang","majun","simazhao","wangyuanji","pangdegong","shenpei","hujinding"],
-				mobile_fire:["re_sp_zhugeliang","re_xunyu","re_dianwei","re_yanwen","re_pangtong","xin_yuanshao"],
-				mobile_forest:['re_zhurong','re_menghuo','re_dongzhuo','re_sunjian','re_caopi'],
-				mobile_mountain:['re_dengai','re_jiangwei','re_caiwenji'],
 				mobile_others:["re_jikang","old_bulianshi","old_yuanshu","re_wangyun","re_baosanniang"],
 			},
 		},
@@ -28,29 +25,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			simazhao:["male","wei",3,["xinfu_daigong","xinfu_zhaoxin"],[]],
 			wangyuanji:["female","wei",3,["xinfu_qianchong","xinfu_shangjian"],[]],
 			pangdegong:["male","qun",3,["xinfu_pingcai","xinfu_pdgyingshi"],[]],
-			re_sp_zhugeliang:["male","shu",3,["rehuoji","rekanpo","bazhen"],[]],
-			re_xunyu:["male","wei",3,["quhu","rejieming"],[]],
-			re_dianwei:["male","wei",4,["reqiangxi"],[]],
-			re_yanwen:["male","qun",4,["reshuangxiong"],[]],
-			re_pangtong:['male','shu',3,['xinlianhuan','niepan'],[]],
-			xin_yuanshao:['male','qun',4,['reluanji','xueyi'],['zhu']],
 			old_yuanshu:['male','qun',4,['xinyongsi','yjixi']],
 			
 			shenpei:["male","qun","2/3",["shouye","liezhi"],[]],
-			re_zhurong:['female','shu',4,['juxiang','relieren']],
-			re_menghuo:['male','shu',4,['huoshou','rezaiqi']],
 			re_wangyun:['male','qun',3,['relianji','remoucheng']],
-			re_dongzhuo:['male','qun',8,['rejiuchi','roulin','benghuai','baonue'],['zhu']],
-			re_sunjian:['male','wu',4,['gzyinghun','repolu']],
-			re_caopi:['male','wei',3,['rexingshang','refangzhu','songwei'],['zhu']],
 			
-			re_dengai:['male','wei',4,['retuntian','zaoxian']],
-			re_jiangwei:['male','shu',4,['retiaoxin','zhiji']],
-			re_caiwenji:['female','qun',3,['rebeige','duanchang']],
 			re_baosanniang:['female','shu',3,['meiyong','rexushen','rezhennan']],
+			
+			hujinding:['female','shu','2/6',['renshi','wuyuan','huaizi']],
 		},
 		characterIntro:{
 			shenpei:'审配（？－204年），字正南，魏郡阴安（今河北清丰北）人。为人正直， 袁绍领冀州，审配被委以腹心之任，并总幕府。河北平定，袁绍以审配、逢纪统军事，审配恃其强盛，力主与曹操决战。曾率领弓弩手大破曹军于官渡。官渡战败，审配二子被俘，反因此受谮见疑，幸得逢纪力保。袁绍病死，审配等矫诏立袁尚为嗣，导致兄弟相争，被曹操各个击破。曹操围邺，审配死守数月，终城破被擒，拒不投降，慷慨受死。',
+			hujinding:'胡金定，女，传说中关羽之妻。关索之母，配偶关羽，出处《花关索传》和元代《三国志评话》民间传说人物。',
 		},
 		card:{
 			pss_paper:{
@@ -91,6 +77,146 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		},
 		characterFilter:{},
 		skill:{
+			renshi:{
+				audio:2,
+				trigger:{player:'damageBegin4'},
+				forced:true,
+				filter:function(event,player){
+					return player.isDamaged()&&event.getParent().name=='sha';
+				},
+				content:function(){
+					'step 0'
+					trigger.cancel();
+					var cards=trigger.cards.filterInD();
+					if(cards.length) player.gain(cards,'gain2');
+					'step 1'
+					player.loseMaxHp();
+				},
+			},
+			wuyuan:{
+				audio:2,
+				enable:'phaseUse',
+				usable:1,
+				filter:function(event,player){
+					return player.countCards('h','sha')>0;
+				},
+				filterCard:{name:'sha'},
+				filterTarget:lib.filter.notMe,
+				check:function(card){
+					var player=_status.event.player;
+					if(get.color(card)=='red'&&game.hasPlayer(function(current){
+						return current!=player&&current.isDamaged()&&get.attitude(player,current)>2;
+					})) return 2;
+					return 1;
+				},
+				prepare:'give',
+				discard:false,
+				content:function(){
+					'step 0'
+					target.gain(cards,player);
+					player.recover();
+					'step 1'
+					var num=1;
+					if(get.color(cards[0])=='black') num++;
+					target.draw(num);
+					if(num==1) target.recover();
+				},
+				ai:{
+					order:1,
+					result:{
+						player:function(player,target){
+							if(player.isDamaged()) return 1;
+							return 0;
+						},
+						target:function(player,target){
+							if(ui.selected.cards.length){
+								var num=2;
+								if(target.hasSkillTag('nogain')) num=0;
+								if(get.color(ui.selected.cards[0])=='red') return num+2
+								else return num+1;
+							}
+							return 1;
+						},
+					},
+				},
+			},
+			huaizi:{
+				mod:{
+					maxHandcard:function(player,num){
+						return num+player.getDamagedHp();
+					},
+				},
+				audio:2,
+				trigger:{player:'phaseDiscardBegin'},
+				forced:true,
+				firstDo:true,
+				filter:function(event,player){
+					return player.isDamaged()&&player.countCards('h')>player.hp;
+				},
+				content:function(){},
+			},
+			refangquan:{
+				audio:2,
+				trigger:{player:'phaseUseBefore'},
+				filter:function(event,player){
+					return player.countCards('h')>0&&!player.hasSkill('fangquan3');
+				},
+				direct:true,
+				content:function(){
+					"step 0"
+					var fang=player.hp>=2&&player.countCards('h')<=player.hp+1;
+					player.chooseBool(get.prompt2('refangquan')).set('ai',function(){
+						if(!_status.event.fang) return false;
+						return game.hasPlayer(function(target){
+							if(target.hasJudge('lebu')||target==player) return false;
+							if(get.attitude(player,target)>4){
+								return (get.threaten(target)/Math.sqrt(target.hp+1)/Math.sqrt(target.countCards('h')+1)>0);
+							}
+							return false;
+						});
+					}).set('fang',fang);
+					"step 1"
+					if(result.bool){
+						player.logSkill('refangquan');
+						trigger.cancel();
+						player.addSkill('fangquan2');
+						player.addTempSkill('refangquan2');
+						//player.storage.fangquan=result.targets[0];
+					}
+				}
+			},
+			refangquan2:{
+				mod:{
+					maxHandcard:function(player,num){
+						return num+player.getDamagedHp();
+					},
+				},
+			},
+			rehunzi:{
+				inherit:'hunzi',
+				filter:function(event,player){
+					return player.hp<=2&&!player.storage.rehunzi;
+				},
+			},
+			rezhijian:{
+				inherit:'zhijian',
+				group:['rezhijian_use'],
+				subfrequent:['use'],
+				subSkill:{
+					use:{
+						audio:'rezhijian',
+						trigger:{player:'useCard'},
+						frequent:true,
+						filter:function(event,player){
+							return get.type(event.card)=='equip';
+						},
+						prompt:'是否发动【直谏】摸一张牌？',
+						content:function(){
+							player.draw('nodelay');
+						},
+					},
+				},
+			},
 			rexushen:{
 				derivation:['new_rewusheng','xindangxian'],
 				audio:'xinfu_xushen',
@@ -1101,9 +1227,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			rejingong:'矜功',
 			rejingong_info:'每回合可以用三个随机锦囊中的一个，三个锦囊中有一个是专属锦囊，本回合未造成伤害会失去1点体力。',
 			mobile_default:'常规',
-			mobile_fire:'界限突破•火',
-			mobile_forest:'界限突破•林',
-			mobile_mountain:'界限突破•山',
 			mobile_others:'其他',
 			
 			pss:'手势',
@@ -1153,6 +1276,22 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			rexushen_info:'限定技，出牌阶段，你可以失去X点体力（X为场上男性角色的数量）。若你以此法进入了濒死状态，则当你因一名角色而脱离此濒死状态后，你可以令其获得技能〖武圣〗和〖当先〗。',
 			rezhennan:'镇南',
 			rezhennan_info:'当你成为其他角色使用的牌的目标后，若此牌的目标数大于该角色的体力值，则你可以弃置一张牌并对其造成1点伤害。',
+			
+			hujinding:'胡金定',
+			re_liushan:'界刘禅',
+			re_sunben:'界孙策',
+			re_zhangzhang:'界张昭张纮',
+			rehunzi:'魂姿',
+			rehunzi_info:'觉醒技，准备阶段，若你的体力值不大于2，你减1点体力上限，并获得技能〖英姿〗和〖英魂〗。',
+			zhijian_info:'出牌阶段，你可以将手牌中的一张装备牌置于一名其他角色装备区里（不得替换原装备），然后摸一张牌。当你使用装备牌时，你可以摸一张牌。',
+			refangquan:'放权',
+			refangquan_info:'你可跳过你的出牌阶段，若如此做，你本回合的手牌上限+X（X为你已损失的体力值），且回合结束时，你可以弃置一张手牌并令一名其他角色进行一个额外的回合。',
+			huaizi:'怀子',
+			huaizi_info:'锁定技，你的手牌上限+X（X为你已损失的体力值）',
+			renshi:'仁释',
+			renshi_info:'锁定技，当你受到【杀】的伤害时，若你已受伤，则你防止此伤害并获得此【杀】对应的所有实体牌，然后减1点体力上限。',
+			wuyuan:'武缘',
+			wuyuan_info:'出牌阶段限一次，你可将一张【杀】交给一名其他角色，然后你回复1点体力。若此【杀】为：红色，其摸一张牌并回复1点体力；黑色，其摸两张牌。',
 		}
 	};
 });

character/old.js

@@ -4,7 +4,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		name:'old',
 		characterSort:{
 			old:{
-				old_shenhua:["yuji","zhangjiao","old_zhugezhan","old_zhoutai","old_caoren","xiahouyuan","xiaoqiao","huangzhong","weiyan","xuhuang","pangde"],
+				old_shenhua:["yuji","zhangjiao","old_zhugezhan"],
 				old_refresh:["old_zhangfei","old_huatuo"],
 				old_yijiang1:["masu","xushu","fazheng","yujin","xin_yujin","old_xusheng","old_lingtong","ol_yujin"],
 				old_yijiang2:["old_madai","old_zhonghui","old_wangyi","old_guanzhang","ol_liaohua"],
@@ -18,16 +18,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		character:{
 			old_fuhuanghou:['female','qun',3,['oldzhuikong','oldqiuyuan']],
 			old_caochong:['male','wei',3,['oldrenxin','oldchengxiang']],
-			xuhuang:['male','wei',4,['gzduanliang']],
-			pangde:['male','qun',4,['mashu','mengjin']],
-			xiahouyuan:['male','wei',4,['shensu']],
-			huangzhong:['male','shu',4,['liegong']],
-			weiyan:['male','shu',4,['kuanggu']],
-			xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
 			yuji:['male','qun',3,['old_guhuo'],['forbidai']],
 			zhangjiao:['male','qun',3,['leiji','guidao','huangtian'],['zhu']],
-			old_zhoutai:['male','wu',4,['gzbuqu']],
-			old_caoren:['male','wei',4,['moon_jushou','jiewei']],
 			old_zhangfei:['male','shu',4,['paoxiao','retishen']],
 			old_huatuo:['male','qun',3,['jijiu','chulao']],
 			jsp_caoren:['male','wei',4,['kuiwei','yanzheng']],
@@ -868,8 +860,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			old_zhugezhan:"旧诸葛瞻",
 			zhangliang:'SP张梁',
 			yuji:'旧于吉',
-			old_zhoutai:'旧周泰',
-			old_caoren:'旧曹仁',
 			old_guanzhang:'旧关兴张苞',
 			old_zhangfei:'OL张飞',
 			old_huatuo:'OL华佗',

character/refresh.js

@@ -5,7 +5,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		characterSort:{
 			refresh:{
     refresh_standard:["re_caocao","re_simayi","re_guojia","re_lidian","re_zhangliao","re_xuzhu","re_xiahoudun","re_zhangfei","re_zhaoyun","re_guanyu","re_machao","re_xushu","re_zhouyu","re_lvmeng","re_ganning","re_luxun","re_daqiao","re_huanggai","re_lvbu","re_gongsunzan","re_huatuo","re_liubei","re_diaochan","re_huangyueying","re_sunquan","re_sunshangxiang","re_zhenji","re_zhugeliang","re_huaxiong"],
-    refresh_ol:["re_zhangjiao","xin_yuji","re_zuoci"],
+    
+    refresh_feng:['caoren','re_xiahouyuan','re_huangzhong','re_weiyan','re_xiaoqiao','zhoutai','re_zhangjiao','xin_yuji'],
+				refresh_huo:["re_sp_zhugeliang","re_xunyu","re_dianwei","re_yanwen","re_pangtong","xin_yuanshao","re_pangde"],
+				refresh_lin:['re_zhurong','re_menghuo','re_dongzhuo','re_sunjian','re_caopi','re_xuhuang'],
+				refresh_shan:['re_dengai','re_jiangwei','re_caiwenji','re_sunben','re_liushan','re_zhangzhang','re_zuoci'],
    },
 		},
 		connect:true,
@@ -43,6 +47,32 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			re_zhangjiao:['male','qun',3,['xinleiji','xinguidao','huangtian'],['zhu']],
 			xin_yuji:['male','qun',3,['reguhuo']],
 			re_zuoci:['male','qun',3,['rehuashen','rexinsheng']],
+			
+			re_xiahouyuan:['male','wei',4,['xinshensu']],
+			caoren:['male','wei',4,['xinjushou','xinjiewei']],
+			re_huangzhong:['male','shu',4,['xinliegong']],
+			re_weiyan:['male','shu',4,['xinkuanggu','qimou']],
+			re_xiaoqiao:['female','wu',3,['retianxiang','hongyan']],
+			zhoutai:['male','wu',4,['buqu','fenji']],
+			re_pangde:['male','qun',4,['mashu','jianchu']],
+			re_xuhuang:['male','wei',4,['duanliang','jiezi']],
+			re_sp_zhugeliang:["male","shu",3,["rehuoji","rekanpo","bazhen"],[]],
+			re_xunyu:["male","wei",3,["quhu","rejieming"],[]],
+			re_dianwei:["male","wei",4,["reqiangxi"],[]],
+			re_yanwen:["male","qun",4,["reshuangxiong"],[]],
+			re_pangtong:['male','shu',3,['xinlianhuan','niepan'],[]],
+			xin_yuanshao:['male','qun',4,['reluanji','xueyi'],['zhu']],
+			re_zhurong:['female','shu',4,['juxiang','relieren']],
+			re_menghuo:['male','shu',4,['huoshou','rezaiqi']],
+			re_dongzhuo:['male','qun',8,['rejiuchi','roulin','benghuai','baonue'],['zhu']],
+			re_sunjian:['male','wu',4,['gzyinghun','repolu']],
+			re_caopi:['male','wei',3,['rexingshang','refangzhu','songwei'],['zhu']],
+			re_dengai:['male','wei',4,['retuntian','zaoxian']],
+			re_jiangwei:['male','shu',4,['retiaoxin','zhiji']],
+			re_caiwenji:['female','qun',3,['rebeige','duanchang']],
+			re_liushan:['male','shu',3,['xiangle','refangquan','ruoyu'],['zhu']],
+			re_sunben:['male','wu',4,['jiang','rehunzi','zhiba'],['zhu']],
+			re_zhangzhang:['male','wu',3,['rezhijian','guzheng']],
 		},
 		characterIntro:{
 			re_gongsunzan:'群雄之一。出身贵族，因母地位卑贱，只当了郡中小吏。他貌美，声音洪亮，机智善辩。后随卢植于缑氏山中读书，粗通经传。',
@@ -53,6 +83,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				return mode=='identity'||mode=='single';
 			}
 		},
+		perfectPair:{
+			sunben:['zhouyu','taishici','daqiao'],
+		},
 		skill:{
 			rehuashen:{
 				mode:['identity','single'],
@@ -4031,7 +4064,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			rexinsheng:'新生',
 			rexinsheng_info:'当你受到1点伤害后，你可以获得一张新的化身牌。',
 			refresh_standard:'界限突破·标',
-			refresh_ol:'界限突破OL',
+			refresh_feng:'界限突破·风',
+			refresh_huo:'界限突破·火',
+			refresh_lin:'界限突破·林',
+			refresh_shan:'界限突破·山',
 		},
 	};
 });

character/shenhua.js

@@ -6,21 +6,23 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 		connectBanned:['zuoci'],
 		characterSort:{
 			shenhua:{
-				shenhua_feng:['caoren','re_xiahouyuan','re_huangzhong','re_weiyan','re_xiaoqiao','zhoutai','sp_zhangjiao','re_yuji'],
+				shenhua_feng:["sp_zhangjiao","re_yuji","old_zhoutai","old_caoren","xiahouyuan","xiaoqiao","huangzhong","weiyan"],
-				shenhua_huo:['dianwei','xunyu','pangtong','sp_zhugeliang','taishici','yanwen','re_yuanshao','re_pangde'],
+				shenhua_huo:['dianwei','xunyu','pangtong','sp_zhugeliang','taishici','yanwen','re_yuanshao','pangde'],
-				shenhua_lin:['caopi','re_xuhuang','menghuo','zhurong','re_lusu','sunjian','dongzhuo','jiaxu'],
+				shenhua_lin:['caopi','xuhuang','menghuo','zhurong','re_lusu','sunjian','dongzhuo','jiaxu'],
 				shenhua_shan:['dengai','zhanghe','liushan','jiangwei','zhangzhang','sunce','caiwenji','zuoci'],
 				shenhua_yin:['wangji','kuailiangkuaiyue','yanyan','wangping','sunliang','luji','xuyou','yl_luzhi'],
 				shenhua_lei:['haozhao','guanqiujian','chendao','zhugezhan','lukang','zhoufei','zhangxiu','yl_yuanshu'],
 			},
 		},
 		character:{
-			re_xiahouyuan:['male','wei',4,['xinshensu']],
+			old_zhoutai:['male','wu',4,['gzbuqu']],
-			caoren:['male','wei',4,['xinjushou','xinjiewei']],
+			old_caoren:['male','wei',4,['moon_jushou','jiewei']],
-			re_huangzhong:['male','shu',4,['xinliegong']],
+			xuhuang:['male','wei',4,['gzduanliang']],
-			re_weiyan:['male','shu',4,['xinkuanggu','qimou']],
+			pangde:['male','qun',4,['mashu','mengjin']],
-			re_xiaoqiao:['female','wu',3,['retianxiang','hongyan']],
+			xiahouyuan:['male','wei',4,['shensu']],
-			zhoutai:['male','wu',4,['buqu','fenji']],
+			huangzhong:['male','shu',4,['liegong']],
+			weiyan:['male','shu',4,['kuanggu']],
+			xiaoqiao:['female','wu',3,['tianxiang','hongyan']],
 			sp_zhangjiao:['male','qun',3,['releiji','guidao','huangtian'],['zhu']],
 			re_yuji:["male","qun",3,["xinfu_guhuo"],["forbidai"]],
 			// yuji:['male','qun',3,['guhuo']],
@@ -33,12 +35,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			taishici:['male','wu',4,['tianyi']],
 			yanwen:['male','qun',4,['shuangxiong']],
 			re_yuanshao:['male','qun',4,['luanji','xueyi'],['zhu']],
-			re_pangde:['male','qun',4,['mashu','jianchu']],
 
 			menghuo:['male','shu',4,['huoshou','zaiqixx']],
 			zhurong:['female','shu',4,['juxiang','lieren']],
 			caopi:['male','wei',3,['xingshang','fangzhu','songwei'],['zhu']],
-			re_xuhuang:['male','wei',4,['duanliang','jiezi']],
 			re_lusu:['male','wu',3,['haoshi','dimeng']],
 			sunjian:['male','wu',4,['gzyinghun']],
 			dongzhuo:['male','qun',8,['jiuchi','roulin','benghuai','baonue'],['zhu']],
@@ -2532,6 +2532,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			xiangle:{
 				audio:2,
+				audioname:['re_liushan'],
 				trigger:{target:'useCardToTargeted'},
 				forced:true,
 				filter:function(event,player){
@@ -2650,6 +2651,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				skillAnimation:true,
 				animationColor:'fire',
 				audio:2,
+				audioname:['re_liushan'],
 				unique:true,
 				juexingji:true,
 				zhuSkill:true,
@@ -2663,9 +2665,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					return player.isMinHp();
 				},
 				content:function(){
+					'step 0'
 					player.storage.ruoyu=true;
-					player.maxHp++;
+					player.gainMaxHp();
-					player.update();
+					'step 1'
 					player.recover();
 					if(player.hasSkill('ruoyu')){
 						player.addSkill('jijiang');
@@ -3033,7 +3036,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			jiang:{
 				audio:2,
-				audioname:['sp_lvmeng'],
+				audioname:['sp_lvmeng','re_sunben'],
 				trigger:{
 					player:'useCardToPlayered',
 					target:'useCardToTargeted',
@@ -3066,7 +3069,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				unique:true,
 				trigger:{player:'phaseZhunbeiBegin'},
 				filter:function(event,player){
-					return player.hp==1&&!player.storage.hunzi;
+					return player.hp<=1&&!player.storage.hunzi;
 				},
 				forced:true,
 				//priority:3,
@@ -3075,8 +3078,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					player.addSkill('reyingzi');
 					player.addSkill('gzyinghun');
 					game.log(player,'获得了技能','#g【英姿】和【英魂】')
-					player.awakenSkill('hunzi');
+					player.awakenSkill(event.name);
-					player.storage.hunzi=true;
+					player.storage[event.name]=true;
 				},
 				ai:{
 					threaten:function(player,target){
@@ -3125,7 +3128,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				usable:1,
 				content:function(){
 					"step 0"
-					if(target.storage.hunzi){
+					if(target.storage.hunzi||target.storage.rehunzi){
 						target.chooseControl('拒绝','不拒绝').set('prompt','是否拒绝制霸拼点？').set('choice',get.attitude(target,player)<=0);
 					}
 					else{
@@ -3232,6 +3235,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 			guzheng:{
 				audio:2,
+				audioname:['re_zhangzhang'],
 				// unique:true,
 				// gainable:true,
 				group:["guzheng_count"],
@@ -4618,7 +4622,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				mod:{
 					cardSavable:function(card,player){
 						if(!_status.currentPhase) return;
-						if(_status.currentPhase.hasSkill('wansha')&&_status.currentPhase!=player){
+						if(_status.currentPhase.isAlive()&&_status.currentPhase.hasSkill('wansha')&&_status.currentPhase!=player){
+							if(card.name=='tao'&&!player.isDying()) return false;
+						}
+					},
+					cardEnabled:function(card,player){
+						if(!_status.currentPhase) return;
+						if(_status.currentPhase.isAlive()&&_status.currentPhase.hasSkill('wansha')&&_status.currentPhase!=player){
 							if(card.name=='tao'&&!player.isDying()) return false;
 						}
 					}
@@ -4693,7 +4703,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 				viewAs:{name:'wuxie'},
 				prompt:'将一张黑色手牌当无懈可击使用',
-				check:function(card){return 8-get.value(card)},
+				check:function(card){
+					var tri=_status.event.getTrigger();
+					if(tri&&tri.card&&tri.card.name=='chiling') return -1;
+					return 8-get.value(card)
+				},
 				threaten:1.2
 			},
 			lianhuan:{
@@ -6734,10 +6748,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			xueyi_info:'主公技，锁定技，场上每有一名其他群雄角色存活，你的手牌上限便+2。',
 			mengjin_info:'当你使用的【杀】被【闪】抵消时，你可以弃置目标角色的一张牌。',
 
-			re_xiahouyuan:'夏侯渊',
+			re_xiahouyuan:'界夏侯渊',
-			re_huangzhong:'黄忠',
+			re_huangzhong:'界黄忠',
-			re_weiyan:'魏延',
+			re_weiyan:'界魏延',
-			re_xiaoqiao:'小乔',
+			re_xiaoqiao:'界小乔',
 			
 			gz_xiahouyuan:'夏侯渊',
 			gz_huangzhong:'黄忠',
@@ -6745,17 +6759,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gz_xiaoqiao:'小乔',
 			gz_xuhuang:'徐晃',
 			gz_pangde:'庞德',
+			gz_caoren:'曹仁',
+			gz_zhoutai:'周泰',
 			
-			xuhuang:'旧徐晃',
+			old_zhoutai:'周泰',
-			pangde:'旧庞德',
+			old_caoren:'曹仁',
-			xiahouyuan:'旧夏侯渊',
+			xuhuang:'徐晃',
-			caoren:'曹仁',
+			pangde:'庞德',
-			huangzhong:'旧黄忠',
+			xiahouyuan:'夏侯渊',
+			caoren:'界曹仁',
+			huangzhong:'黄忠',
 			sp_zhangjiao:'张角',
-			weiyan:'旧魏延',
+			weiyan:'魏延',
-			xiaoqiao:'旧小乔',
+			xiaoqiao:'小乔',
-			zhoutai:'周泰',
+			zhoutai:'界周泰',
-			zhangjiao:'旧张角',
+			zhangjiao:'张角',
 			yuji:'于吉',
 			shensu:'神速',
 			shensu1:'神速',

character/sp.js

@@ -21,7 +21,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			},
 		},
 		character:{
-			puyuan:['male','shu',3,['pytianjiang','pyzhuren'],['unseen']],
+			puyuan:['male','shu',3,['pytianjiang','pyzhuren']],
 			xinpi:['male','wei',3,['xpchijie','yinju']],
 			lisu:['male','qun',2,['lslixun','lskuizhu']],
 			zhangwen:['male','wu',3,['songshu','sibian']],
@@ -997,7 +997,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					'step 1'
 					delete _status.lslixun;
 					if(!result.bool){
-						player.chooseToDiscard(true,'h',player.storage.lslixun).ai=lib.skill.qiangxi.check;
+						player.chooseToDiscard([1,player.storage.lslixun],'h').ai=lib.skill.qiangxi.check;
 					}
 					else event.finish();
 					'step 2'
@@ -3778,6 +3778,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				audio:2,
 				trigger:{player:'useCardAfter'},
 				direct:true,
+				onremove:function(player,skill){
+					delete player.storage[skill];
+				},
 				filter:function(event,player){
 					if(_status.currentPhase!=player) return false;
 					if(player.storage.yingyuan&&player.storage.yingyuan.contains(event.card.name)){
@@ -8631,7 +8634,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 						trigger:{target:'useCardToTargeted'},
 						direct:true,
 						filter:function(event,player){
-							return player.countCards('h');
+							return event.card.name=='sha'&&player.countCards('h');
 						},
 						content:function(){
 							"step 0"
@@ -14303,7 +14306,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			sp_longzhou:"同舟共济",
 			sp_zizouqi:"自走棋",
 			sp_sbfm:'上兵伐谋',
-			sp_shengun:'未命名分组',
+			sp_shengun:'三国奇人传',
 			sp_zhongdan:"忠胆英杰",
 			sp_star:"☆SP系列",
 			sp_guozhan:"国战",

character/xinghuoliaoyuan.js

@@ -1484,7 +1484,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 								return get.attitude(player,target)<0?-999:-3;
 							}
 							else{
-								return target.countCards('h');
+								return target.countCards('h')+1;
 							}
 						},
 					},