diff --git a/card/hearth.js b/card/hearth.js
index efc5f899e..bf6392497 100644
--- a/card/hearth.js
+++ b/card/hearth.js
@@ -646,8 +646,8 @@ card.hearth={
 		['club',3,'shandianjian','thunder'],
 		['spade',1,'shandianjian','thunder'],
 		['spade',7,'shijieshu'],
-		['diamond',5,'zhaomingdan'],
-		['heart',10,'zhaomingdan'],
+		// ['diamond',5,'zhaomingdan'],
+		// ['heart',10,'zhaomingdan'],
 		['diamond',2,'jihuocard'],
 		['diamond',1,'linghunzhihuo'],
 	],
diff --git a/character/diy.js b/character/diy.js
index 5e91444dd..db86173fc 100755
--- a/character/diy.js
+++ b/character/diy.js
@@ -450,10 +450,9 @@ character.diy={
 					player.logSkill('diyleiji',result.targets,'thunder');
 					event.target=result.targets[0];
 					event.target.judge(function(card){
-						// var suit=get.suit(card);
-						// if(suit=='spade') return -4;
-						// if(suit=='club') return -2;
-						if(get.color(card)=='black') return -2;
+						var suit=get.suit(card);
+						if(suit=='spade') return -4;
+						if(suit=='club') return -2;
 						return 0;
 					});
 				}
@@ -461,10 +460,13 @@ character.diy={
 					event.finish();
 				}
 				"step 2"
-				if(result.bool==false){
+				if(result.suit=='club'){
 					event.target.damage('thunder');
 					player.recover();
 				}
+				else if(result.suit=='spade'){
+					event.target.damage(2,'thunder');
+				}
 			},
 			ai:{
 				effect:{
@@ -789,7 +791,7 @@ character.diy={
 		zonghuo_info:'你可弃置一张牌将你即将造成的伤害变为火焰伤害',
 		shaoying_info:'每当你造成一次火焰伤害，可指定距离受伤害角色1以内的另一名角色，并展示牌堆顶的一张牌，若此牌为红色，该角色受到一点火焰伤害',
 		tiangong_info:'锁定技，你防止即将受到的雷电伤害，每当你造成一次雷电伤害，你摸一张牌',
-		diyleiji_info:'每当你使用或打出一张【闪】，可令任意一名角色进行一次判定，若结果为黑色，其受到一点雷电伤害，然后你摸回复一点体力',
+		diyleiji_info:'每当你使用或打出一张【闪】，可令任意一名角色进行一次判定，若结果为梅花，其受到一点雷电伤害，然后你摸回复一点体力；若结果为黑桃，其受到两点雷电伤害',
 		juedao_info:'出牌阶段，你可以弃置一张手牌，横置你的武将牌；锁定技，若你处于连环状态，你与其他角色的距离、其他角色与你的距离各+1。',
 		geju_info:'准备阶段开始时，你可以摸X张牌（X为攻击范围内不含有你的势力数）。',
 		siji_info:'弃牌阶段结束后，你可以摸2X张牌（X为你于此阶段内弃置的【杀】的数量）。',
diff --git a/character/rank.js b/character/rank.js
new file mode 100644
index 000000000..7e042948b
--- /dev/null
+++ b/character/rank.js
@@ -0,0 +1,287 @@
+window.rank={
+    s:[
+        'swd_muyun',
+        'swd_zhaoyun',
+        'swd_septem',
+        'hs_sthrall',
+        'hs_malorne',
+        'swd_yuwentuo',
+        'swd_duguningke',
+        'swd_guyue',
+        'swd_murongshi',
+        'swd_tuobayuer',
+        'swd_yuxiaoxue',
+        'gjqt_bailitusu',
+        'swd_huanglei',
+        'pal_yuntianhe',
+        'pal_liumengli',
+    ],
+    ap:[
+        'swd_xuanyuanjianxian',
+        'pal_xuanxiao',
+        'xk_fujianhan',
+        'swd_cheyun',
+        'swd_jipeng',
+        'lusu',
+        'yuanshu',
+        'xunyu',
+        'pal_murongziying',
+        'diaochan',
+        'swd_jiliang',
+        'swd_shuijing',
+        'shen_caocao',
+        'liuxie',
+        'hs_neptulon',
+        'gjqt_aruan',
+        'hs_totemic',
+        'shen_lvbu',
+        'zhangxingcai',
+        'swd_sikongyu',
+        'swd_muyue',
+        'swd_qi',
+        'zhangliao',
+        'swd_huzhongxian',
+        'swd_anka',
+        'pal_zixuan',
+        'shen_lvmeng',
+        'swd_tuwei',
+    ],
+    a:[
+        'yxs_diaochan',
+        'swd_linyue',
+        'swd_lanyin',
+        'swd_hengai',
+        'jg_liubei',
+        're_huangyueying',
+        'hs_medivh',
+        'hs_bchillmaw',
+        'shen_zhugeliang',
+        'gjqt_fanglansheng',
+        'gjqt_xiayize',
+        'swd_fuyan',
+        'hs_yngvar',
+        're_huanggai',
+        're_zhangliao',
+        'hs_wujiyuansu',
+        'hs_antonidas',
+        'chenlin',
+        'swd_chenjingchou',
+        'hs_alakir',
+        'hs_anduin',
+        'yxs_yangyuhuan',
+        'caoang',
+        'swd_shanxiaoxiao',
+        'gjqt_fengqingxue',
+        'swd_ziqiao',
+        'pal_jingtian',
+        'yxs_wuzetian',
+        'yxs_caocao',
+        'sp_pangtong',
+    ],
+    am:[
+        'pal_xuejian',
+        'swd_maixing',
+        'hs_zhouzhuo',
+        're_daqiao',
+        'swd_fengyu',
+        'swd_xuanyuanjiantong',
+        'diy_caiwenji',
+        'zhugeke',
+        'pal_changqing',
+        'zhugejin',
+        'gjqt_xiangling',
+        'diy_zhenji',
+        'gjqt_yuewuyi',
+        'diy_xuhuang',
+        'hs_magni',
+        're_zhouyu',
+        'dengai',
+        'hs_ronghejuren',
+        'hs_wvelen',
+        'swd_yuchiyanhong',
+        'swd_zidashu',
+        're_luxun',
+        'pal_hanlingsha',
+        'hs_jaina',
+        'jg_xiahouyuan',
+        'jg_pangtong',
+        'diy_liuyan',
+        'diy_zhouyu',
+        'shen_zhouyu',
+        'swd_jiuyou',
+        'swd_duopeng',
+        'swd_kama',
+        'swd_yuli',
+        'taishici',
+        'swd_rongshuang',
+        'zhanghe',
+        'zhangzhang',
+        'xk_guyuexuan',
+        'pal_zhaoliner',
+        'swd_xiarou',
+    ],
+    bp:[
+        'yxs_mozi',
+        'yxs_aijiyanhou',
+        'yxs_bole',
+        'swd_zhiyin',
+        're_machao',
+        'swd_duanmeng',
+        'yuanshao',
+        'hs_waleera',
+        'gjqt_yinqianshang',
+        'gjqt_hongyu',
+        'gjqt_wenrenyu',
+        'shen_zhaoyun',
+        'jg_caozhen',
+        'swd_shangzhang',
+        'swd_situqiang',
+        'jg_zhanghe',
+        'hs_mijiaojisi',
+        'hs_malfurion',
+        'swd_haidapang',
+        'hs_wuther',
+        'sp_dongzhuo',
+        'jiangwei',
+        'liubei',
+        'mateng',
+        'swd_chunyuheng',
+        'hetaihou',
+        'hs_alleria',
+        'swd_fengtianling',
+        'kongrong',
+        'swd_qiner',
+        'sp_diaochan',
+        'swd_jiangziya',
+        'liushan',
+        'zhugedan',
+        'sp_zhaoyun',
+        're_guanyu',
+        're_huatuo',
+        'swd_jiangwu',
+        'swd_nicole',
+        'sp_jiangwei',
+        'zhugeliang',
+        'swd_huanyuanzhi',
+        'swd_huyue',
+        'swd_zhuoshanzhu',
+        'swd_shaowei',
+        'swd_hanlong',
+        'swd_hupo',
+        'caopi',
+        'jiaxu',
+        'xk_jinji',
+        'maliang',
+    ],
+    b:[
+        'pal_linyueru',
+        'swd_youzhao',
+        'swd_fu',
+        'swd_yeyaxi',
+        'swd_jialanduo',
+        'swd_jiting',
+        'sp_machao',
+        're_zhaoyun',
+        'fuwan',
+        're_xuzhu',
+        're_guojia',
+        'ganfuren',
+        'hs_huzhixiannv',
+        'jg_simayi',
+        'jg_huangyueying',
+        'jg_zhugeliang',
+        'diy_dianwei',
+        'sp_sunshangxiang',
+        're_lidian',
+        'jiangqing',
+        'hs_jgarrosh',
+        'hs_lrexxar',
+        'mifuren',
+        'diy_huangzhong',
+        'diy_weiyan',
+        're_simayi',
+        'shen_simayi',
+        'caiwenji',
+        're_xushu',
+        'swd_hanluo',
+        'swd_zhanggao',
+        'simalang',
+        're_yuanshu',
+        'sp_caoren',
+        'sunhao',
+        'sunshangxiang',
+        'daqiao',
+        'huatuo',
+        'swd_luchengxuan',
+        'swd_moye',
+        'diy_zhangjiao',
+        'dongzhuo',
+        'niutou',
+    ],
+    bm:[
+        'pal_lixiaoyao',
+        'zhouyu',
+        'guanyinping',
+        'dingfeng',
+        'pangtong',
+        'zhugeliangwolong',
+        'shen_guanyu',
+        'diy_feishi',
+        'jiangfei',
+        'yuejin',
+        're_caocao',
+        're_lvbu',
+        'chendong',
+        'diy_yuji',
+        're_ganning',
+        'xiahouba',
+        'simayi',
+        'guojia',
+        'zhenji',
+        'huangyueying',
+        'ganning',
+        'luxun',
+        'zhangjiao',
+        'zhurong',
+        'xuhuang',
+        'sunjian',
+        'jsp_zhaoyun',
+        'tianfeng',
+        'sunce',
+        'hs_guldan',
+        'diy_lukang',
+        'old_zhonghui',
+    ],
+    c:[
+        'xiahouyuan',
+        'caoren',
+        'huangzhong',
+        'zhaoyun',
+        'machao',
+        'zhangliang',
+        're_lvmeng',
+        're_zhangfei',
+        're_gongsunzan',
+        're_xiahoudun',
+        'caohong',
+        'caocao',
+        'lvbu',
+        'xiaoqiao',
+    ],
+    d:[
+        'menghuo',
+        'zhoutai',
+        'weiyan',
+        'guanyu',
+        'xuzhu',
+        'lvmeng',
+        'huanggai',
+        'xiahoudun',
+        'zhangbao',
+        'gongsunzan',
+        'yangxiu',
+        'yanwen',
+        'dianwei',
+        'pangde',
+    ]
+};
diff --git a/character/swd.js b/character/swd.js
index f1f1a9c0b..20ad61aed 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -5824,25 +5824,21 @@ character.swd={
 			trigger:{source:'damageEnd'},
 			priority:1,
 			forced:true,
-			filter:function(event,player){
-				return player.hp<player.maxHp;
-			},
 			content:function(){
 				"step 0"
-				player.recover();
-				event.finish();
-				"step 1"
 				if(player.hp<player.maxHp){
-					player.chooseControl('draw_card','recover_hp',function(event,target){
-						if(player.num('h')>=player.hp) return 'recover_hp';
-						return 'draw_card';
-					});
+					player.recover();
+					event.finish();
+					// player.chooseControl('draw_card','recover_hp',function(event,target){
+					// 	if(player.num('h')>=player.hp) return 'recover_hp';
+					// 	return 'draw_card';
+					// });
 				}
 				else{
 					player.draw();
 					event.finish();
 				}
-				"step 2"
+				"step 1"
 				if(result.control=='draw_card'){
 					player.draw();
 				}
@@ -7710,7 +7706,7 @@ character.swd={
 		daofa:'道法',
 		daofa_info:'每当有一名其他角色造成伤害，你可以令其弃置一张牌',
 		xiaomoyu:'魔愈',
-		xiaomoyu_info:'锁定技，每当你造成一次伤害，你回复一点体力',
+		xiaomoyu_info:'锁定技，每当你造成一次伤害，你回复一点体力，若你没有受伤，则改为摸一张牌',
 		yihua:'移花',
 		yihua_info:'每当你成为其他角色的某张卡牌的惟一目标时，你可以弃置两张手牌，将使用者与目标对调',
 		youyin:'游吟',
diff --git a/character/yijiang.js b/character/yijiang.js
index 8c68535f6..268979634 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -2989,16 +2989,17 @@ character.yijiang={
 			init:function(player){
 				player.storage.zbaijiang=false;
 			},
-			intro:{
-				content:'limited'
-			},
+			// intro:{
+			// 	content:'limited'
+			// },
 			filter:function(event,player){
-				return !player.storage.zbaijiang&&player.num('e')>=3;
+				return !player.storage.zbaijiang&&player.num('e')>=2;
 			},
 			content:function(){
 				player.storage.zbaijiang=true;
 				player.removeSkill('zzhenggong');
 				player.removeSkill('zquanji');
+				player.removeSkill('zbaijiang');
 				player.addSkill('zyexin');
 				player.addSkill('zzili');
 				player.gainMaxHp();
@@ -3069,10 +3070,11 @@ character.yijiang={
 				player.storage.zzili=true;
 				player.loseMaxHp();
 				player.addSkill('zpaiyi');
+				player.removeSkill('zzili');
 			},
-			intro:{
-				content:'limited'
-			}
+			// intro:{
+			// 	content:'limited'
+			// }
 		},
 		zpaiyi:{
 			trigger:{player:'phaseEnd'},
@@ -3181,7 +3183,7 @@ character.yijiang={
 		zquanji:'权计',
 		zquanji_info:'其他角色的回合即将开始时，你可以与该角色进行一次拼点。若你赢，该角色跳过回合开始阶段及判定阶段。',
 		zbaijiang:'拜将',
-		zbaijiang_info:'觉醒技，回合开始阶段若你的装备区的装备牌为三张或更多时，你必须增加1点体力上限，失去技能【权计】和【争功】并获得技能【野心】。',
+		zbaijiang_info:'觉醒技，回合开始阶段若你的装备区的装备牌为两张或更多时，你必须增加1点体力上限，失去技能【权计】和【争功】并获得技能【野心】和【自立】。',
 		zyexin:'野心',
 		zyexin2:'野心',
 		zyexin_info:'你每造成或受到一次伤害，可将牌堆顶的一张牌放置在武将牌上，称为“权”。出牌阶段，你可以用任意数量的手牌与等量的“权”交换，每阶段限一次。',
diff --git a/mode/chess.js b/mode/chess.js
index cca710d38..ce1889c54 100755
--- a/mode/chess.js
+++ b/mode/chess.js
@@ -974,74 +974,6 @@ mode.chess={
 			var next=game.createEvent('leaderView',false);
 			next.content=function(){
 				'step 0'
-				game.characterInfo={
-					free:[
-						'caocao',
-						'simayi',
-						'xiahoudun',
-						'zhangliao',
-						'xuzhu',
-						'guojia',
-						'zhenji',
-						'liubei',
-						'guanyu',
-						'zhangfei',
-						'zhugeliang',
-						'zhaoyun',
-						'machao',
-						'huangyueying',
-						'sunquan',
-						'ganning',
-						'lvmeng',
-						'huanggai',
-						'zhouyu',
-						'daqiao',
-						'luxun',
-						'sunshangxiang',
-						'huatuo',
-						'lvbu',
-						'diaochan'
-					],
-					rare:[
-						'diy_xuhuang',
-						'diy_zhenji',
-						're_huangyueying',
-						'diy_lukang',
-						'zhugeliangwolong',
-						'taishici',
-						'gjqt_xiayize',
-						'gjqt_fengqingxue',
-						'gjqt_fanglansheng',
-						'gjqt_yuewuyi',
-					],
-					epic:[
-						'diy_caiwenji',
-						'old_zhonghui',
-						'diy_zhouyu',
-						'xunyu',
-						'gjqt_bailitusu',
-						'gjqt_aruan',
-					],
-					legend:[
-						'shen_guanyu',
-						'shen_zhaoyun',
-						'shen_zhugeliang',
-						'shen_lvmeng',
-						'shen_zhouyu',
-						'shen_simayi',
-						'shen_caocao',
-						'shen_lvbu',
-					],
-					common:[],
-				};
-				for(var i in lib.character){
-					if(!game.characterInfo.free.contains('i')&&
-					!game.characterInfo.rare.contains('i')&&
-					!game.characterInfo.epic.contains('i')&&
-					!game.characterInfo.legend.contains('i')){
-						game.characterInfo.common.push(i);
-					}
-				}
 				var save=get.config('chess_leader_save');
 				if(!save){
 					save='save1';
@@ -1051,6 +983,7 @@ mode.chess={
 				}
 				game.pause();
 				'step 1'
+				console.log(1);
 			}
 		},
 		chooseCharacter:function(){