diff --git a/card/gwent.js b/card/gwent.js
new file mode 100644
index 000000000..6b6b3071e
--- /dev/null
+++ b/card/gwent.js
@@ -0,0 +1,23 @@
+'use strict';
+game.import('card',function(lib,game,ui,get,ai,_status){
+	return {
+		name:'gwent',
+		card:{
+			
+		},
+		skill:{
+
+		},
+		translate:{
+
+		},
+		cardType:{
+			spell_bronze:0.2,
+			spell_silver:0.3,
+			spell_gold:0.4
+		},
+		list:[
+
+		],
+	};
+});
diff --git a/game/game.js b/game/game.js
index b2315e642..0d4647c5d 100644
--- a/game/game.js
+++ b/game/game.js
@@ -29347,7 +29347,11 @@
 							list.push(['',get.translation(get.type(info[i],'trick')),info[i]]);
 						}
                         var sortCard=function(card){
-                            var type=lib.card[card[2]].type;
+							var type=lib.card[card[2]].type;
+                            var subtype=lib.card[card[2]].subtype;
+							if(lib.cardType[subtype]){
+                                return lib.cardType[subtype];
+                            }
                             if(lib.cardType[type]){
                                 return lib.cardType[type];
                             }
@@ -40546,7 +40550,8 @@
 						lib.onwash[i]();
 					}
 					for(i=0;i<ui.discardPile.childNodes.length;i++){
-						if(get.info(ui.discardPile.childNodes[i]).vanish) continue;
+						if(get.info(ui.discardPile.childNodes[i]).vanish||
+						ui.discardPile.childNodes[i].storage.vanish) continue;
 						cards.push(ui.discardPile.childNodes[i]);
 					}
 					cards.randomSort();
@@ -41026,7 +41031,11 @@
 			var func;
 			if(sort=='type_sort'){
 				func=function(card){
-                    var type=get.type(card);
+					var type=get.type(card);
+                    var subtype=get.subtype(card);
+					if(lib.cardType[subtype]){
+                        return lib.cardType[subtype];
+                    }
                     if(lib.cardType[type]){
                         return lib.cardType[type];
                     }
diff --git a/game/package.js b/game/package.js
index c7bc15f3d..25b8f45ae 100644
--- a/game/package.js
+++ b/game/package.js
@@ -26,6 +26,7 @@ window.noname_package={
         swd:'轩辕剑',
         gujian:'古剑奇谭',
         hearth:'炉石传说',
+        gwent:'昆特牌',
     },
     play:{
         boss:'诸神降临',
diff --git a/game/source.js b/game/source.js
index 8325d39d1..aec8541e9 100644
--- a/game/source.js
+++ b/game/source.js
@@ -2,6 +2,7 @@ window.noname_source_list=[
     'card/extra.js',
     'card/gujian.js',
     'card/guozhan.js',
+    'card/gwent.js',
     'card/hearth.js',
     'card/sp.js',
     'card/standard.js',