diff --git a/character/hearth.js b/character/hearth.js
index 66eca6429..babcea0c6 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -17,7 +17,7 @@ character.hearth={
 		hs_liadrin:['female','shu',4,['xueren']],
 		hs_morgl:['male','wu',3,['s_tuteng']],
 		// hs_khadgar:['male','shu',3,['s_tuteng']],
-		// hs_tyrande:['female','wei',3,['s_tuteng']],
+		// hs_tyrande:['female','wei',3,['yuelu','xingluo']],
 
 		hs_neptulon:['male','wu',4,['liechao','qingliu']],
 		hs_wvelen:['male','qun',3,['shengyan','xianzhi']],
@@ -5386,6 +5386,10 @@ character.hearth={
 		hs_tyrande:'泰兰德',
 		hs_fenjie:'芬杰',
 
+		yuelu:'月印',
+		yuelu_info:'出牌阶段限一次，你可以弃置一张红桃牌令一名角色回复一点体力并获得一点护甲',
+		xingluo:'星落',
+		xingluo_info:'星落',
 		yushou:'御兽',
 		yushou_info:'出牌阶段，你可以弃置一张牌并召唤一个随机的野兽宠物，效果持续到你的下一回合开始',
 		yushou_misha:'米莎',
diff --git a/game/game.js b/game/game.js
index 34477ab3d..a93438550 100644
--- a/game/game.js
+++ b/game/game.js
@@ -1281,19 +1281,25 @@
                             oblong:'长方',
                         },
                         onclick:function(item){
+                            var linked=false;
+                            if(game.me&&game.me.isLinked()){
+                                linked=true;
+                            }
                             game.saveConfig('cardshape',item);
                             if(item=='oblong'&&(lib.config.layout=='long'||lib.config.layout=='mobile')){
                                 ui.arena.classList.add('oblongcard');
-                                if(game.me&&game.me.classList.contains('linked')){
-                                    game.me.classList.remove('linked');
-                                    game.me.classList.add('linked2');
-                                }
                             }
                             else{
                                 ui.arena.classList.remove('oblongcard');
-                                if(game.me&&game.me.classList.contains('linked2')){
-                                    game.me.classList.remove('linked2');
+                            }
+                            if(linked){
+                                if(get.is.linked2(game.me)){
+                                    game.me.classList.remove('linked');
+                                    game.me.classList.add('linked2');
+                                }
+                                else{
                                     game.me.classList.add('linked');
+                                    game.me.classList.remove('linked2');
                                 }
                             }
                         }
@@ -31731,6 +31737,7 @@
         is:{
             linked2:function(player){
                 if(lib.config.link_style=='mark') return true;
+                if(game.chess) return false;
                 if(lib.config.layout=='long'||lib.config.layout=='long2') return true;
                 if(player.dataset.position=='0'){
                     return ui.arena.classList.contains('oblongcard');