diff --git a/card/gwent.js b/card/gwent.js
index e58bf91fa..cd8797499 100644
--- a/card/gwent.js
+++ b/card/gwent.js
@@ -1197,6 +1197,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					var nongwu2=game.hasPlayer(function(current){
 						return get.attitude(player,current)<0&&get.attitude(player,current.getNext())<0&&get.attitude(player,current.getPrevious())<0;
 					});
+					var yanzi=game.hasPlayer(function(current){
+						return get.attitude(player,current)>0&&current.isMinHandcard();
+					});
     				player.chooseButton(dialog,true,function(button){
 						var name=button.link[2];
 						switch(name){
@@ -1214,6 +1217,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 								if(aozu) return 1.2;
 								if(aozu3) return 0.2;
 								return 0;
+							case 'gw_yanziyaoshui':
+								if(yanzi) return 2;
+								return 0.6;
 						}
 						if(game.hasPlayer(function(current){
 							return player.canUse(name,current)&&get.effect(current,{name:name},player,player)>0;
@@ -1276,7 +1282,9 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 					value:[7,1],
 					useful:[4,1],
 					result:{
-						target:-1.5
+						target:function(player,target){
+							return -2/Math.sqrt(1+target.hp);
+						}
 					},
 					order:1.2,
 				}
@@ -1322,7 +1330,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 							if(target.needsToDiscard()) return -1;
 							if(target.needsToDiscard(1)) return -0.7;
 							if(target.needsToDiscard(2)) return -0.4;
-							return -0.1*num;
+							return -0.1;
 						}
 					},
 					order:1.2,
diff --git a/card/swd.js b/card/swd.js
index 7656bdb0a..70e810808 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -5206,8 +5206,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			['club',13,'sadengjinhuan'],
 
 			['club',2,'lingjiandai'],
-			['spade',3,'lingjiandai'],
-			['heart',5,'lingjiandai'],
+			// ['spade',3,'lingjiandai'],
+			// ['heart',5,'lingjiandai'],
 			['diamond',8,'lingjiandai'],
 
 			['club',2,'jiguanshu'],
diff --git a/character/gwent.js b/character/gwent.js
index c2256fa63..b83f7678d 100644
--- a/character/gwent.js
+++ b/character/gwent.js
@@ -56,6 +56,78 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_yioufeisi:'国王还是乞丐，两者有何区别，人类少一个算一个',
 		},
 		skill:{
+			huanshu:{
+				trigger:{player:'phaseEnd'},
+				direct:true,
+				filter:function(event,player){
+					return player.countCards('h')>0&&!player.hasSkill('huangshu2');
+				},
+				content:function(){
+					"step 0"
+					player.chooseCard(get.prompt2('huanshu')).ai=function(card){
+						return 6-get.value(card);
+					};
+					"step 1"
+					if(result.bool){
+						player.$give(result.cards,player);
+						player.logSkill('huanshu');
+						player.storage.huanshu2=result.cards[0];
+						player.lose(result.cards,ui.special);
+						player.addSkill('huanshu2');
+					}
+				},
+				ai:{
+					threaten:1.4
+				},
+			},
+			huanshu2:{
+				intro:{
+					content:function(storage,player){
+						if(player.isUnderControl(true)){
+							return '当一名敌方角色使用'+get.translation(get.color(storage))+'锦囊牌时，移去'+get.translation(storage)+'，取消锦囊的效果，并摸两张牌';
+						}
+						else{
+							return '当一名敌方角色使用与“幻术”牌颜色相同的锦囊牌时，移去“幻术”牌，取消锦囊的效果，并摸两张牌';
+						}
+					},
+					onunmark:function(storage,player){
+						if(storage){
+							storage.discard();
+							delete player.storage.huanshu2;
+						}
+					}
+				},
+				trigger:{global:'useCard'},
+				forced:true,
+				filter:function(event,player){
+					return player.getEnemies().contains(event.player)&&
+						get.type(event.card,'trick')=='trick'&&get.color(event.card)==get.color(player.storage.huanshu2);
+				},
+				mark:true,
+				content:function(){
+					'step 0'
+					game.delay(0.5);
+					player.addExpose(0.1);
+					trigger.player.addExpose(0.1);
+					'step 1'
+					player.showCards(player.storage.huanshu2,get.translation(player)+'发动了【幻术】');
+					'step 2'
+					player.removeSkill('huanshu2');
+					trigger.untrigger();
+					trigger.finish();
+					player.draw(2);
+				},
+				group:'huanshu3'
+			},
+			huanshu3:{
+				trigger:{player:'phaseBegin'},
+				forced:true,
+				content:function(){
+					player.$throw(player.storage.huanshu2);
+					game.log(player,'弃置了',player.storage.huanshu2);
+					player.removeSkill('huanshu2');
+				}
+			},
 			gwjieyin:{
 				group:'gwjieyin_reset',
 				init:function(player){
@@ -1884,7 +1956,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			gw_aimin:'艾敏',
 
 			huanshu:'幻术',
-			huanshu_info:'结束阶段，你可以将一张手牌背面朝上置于你的武将牌上；当一名敌方角色使用一张与之颜色相同的普通锦囊牌时，你展示并移去此牌，取消锦囊的效果，然后摸两张牌；准备阶段，你移去武将牌上的“幻术”牌',
+			huanshu2:'幻术',
+			huanshu3:'幻术',
+			huanshu_info:'结束阶段，你可以将一张手牌背面朝上置于你的武将牌上；当一名敌方角色使用一张与之颜色相同的锦囊牌时，你展示并移去此牌，取消锦囊的效果，然后摸两张牌；准备阶段，你移去武将牌上的“幻术”牌',
 			gwjieyin:'结印',
 			gwjieyin_info:'出牌阶段，你可以视为使用瘟疫、燕子药水或昆恩法印（不能重复使用同一法术），技能两轮重置一次',
 			zhengjun:'整军',
diff --git a/character/rank.js b/character/rank.js
index 4533ecb5a..992cab76b 100644
--- a/character/rank.js
+++ b/character/rank.js
@@ -56,6 +56,8 @@ window.noname_character_rank={
         'swd_shuwaner',
     ],
     a:[
+        'gw_meizi',
+        'gw_aimin',
         'gw_bulanwang',
         'gw_kaxier',
         'gw_zhangyujushou',