From 158ecc4535db08f285f11470174088d37ad7dfd3 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sun, 14 May 2017 15:05:00 +0800
Subject: [PATCH] x

---
 card/gwent.js       |  6 ------
 card/swd.js         | 15 ++++++++++++---
 character/hearth.js |  3 +++
 character/ow.js     |  6 +++++-
 character/swd.js    |  6 +++++-
 game/game.js        |  3 +++
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/card/gwent.js b/card/gwent.js
index 7419a3137..1037765e6 100644
--- a/card/gwent.js
+++ b/card/gwent.js
@@ -3,12 +3,6 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	return {
 		name:'gwent',
 		card:{
-			gw_dudayuanshuai1:{
-				fullimage:true
-			},
-				gw_dudayuanshuai2:{
-					fullimage:true
-				},
 			gw_dieyi:{
 				fullskin:true
 			},
diff --git a/card/swd.js b/card/swd.js
index 50e510a32..89ec530f4 100644
--- a/card/swd.js
+++ b/card/swd.js
@@ -915,8 +915,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						for(var i=0;i<list.length;i++){
 							list[i]=game.createCard(list[i]);
 						}
+						target.gain(list,'gain2');
 					}
-					target.gain(list,'gain2');
 				},
 				ai:{
 					order:10,
@@ -990,9 +990,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						event.finish();
 						return;
 					}
+					if(!list.length&&!list2.length){
+						event.finish();
+						return;
+					}
 					var num=get.rand(es.length);
 					var card;
 					target.removeEquipTrigger();
+					var delayed=0;
 					for(var i=0;i<es.length;i++){
 						if(i==num){
 							card=game.createCard(list2.randomGet());
@@ -1000,6 +1005,10 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						else{
 							card=game.createCard(list.randomGet());
 						}
+						if(!card){
+							delayed++;
+							continue;
+						}
 						cards.push(card);
 						time+=200;
 						setTimeout((function(card,name,last){
@@ -1014,7 +1023,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 									card.classList.remove('glow');
 								},500);
 							}
-						}(es[i],lib.skill._lingjianduanzao.process([card,es[i]]),i==es.length-1)),i*200);
+						}(es[i],lib.skill._lingjianduanzao.process([card,es[i]]),i==es.length-1)),(i-delayed)*200);
 					}
 					target.$gain2(cards);
 					game.pause();
@@ -3927,8 +3936,8 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 						for(var i=0;i<list.length;i++){
 							list[i]=game.createCard(list[i]);
 						}
+						player.gain(list,'gain2');
 					}
-					player.gain(list,'gain2');
 				}
 			},
 			_lingjianduanzao:{
diff --git a/character/hearth.js b/character/hearth.js
index 8ffc01387..eb74af377 100644
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -3028,6 +3028,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     					num=1;
     				}
     				var list=get.typeCard('hslingjian');
+                    if(!list.length){
+                        return;
+                    }
     				var cards=[];
     				while(num--){
     					cards.push(game.createCard(list.randomGet()));
diff --git a/character/ow.js b/character/ow.js
index 494536fef..efa4ff998 100644
--- a/character/ow.js
+++ b/character/ow.js
@@ -803,7 +803,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 	            },
 	            alter:true,
 	            content:function(){
-	                player.gain(game.createCard(get.typeCard('hslingjian').randomGet()),'gain2');
+					var list=get.typeCard('hslingjian');
+					if(!list.length){
+						return;
+					}
+	                player.gain(game.createCard(list.randomGet()),'gain2');
 	            },
 	            group:'maoding2',
 	            ai:{
diff --git a/character/swd.js b/character/swd.js
index 8de725622..cbbc40a7a 100644
--- a/character/swd.js
+++ b/character/swd.js
@@ -5420,7 +5420,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     				return false;
     			},
     			content:function(){
-    				player.gain(game.createCard(get.typeCard('hslingjian').randomGet()),'gain2');
+                    var list=get.typeCard('hslingjian');
+					if(!list.length){
+						return;
+					}
+	                player.gain(game.createCard(list.randomGet()),'gain2');
     			}
     		},
     		meihuo:{
diff --git a/game/game.js b/game/game.js
index 075c9c18a..47da53147 100644
--- a/game/game.js
+++ b/game/game.js
@@ -40130,6 +40130,7 @@
             var list=[];
             for(var i in lib.card){
                 if(typeof filter=='function'&&!filter(i)) continue;
+				if(lib.config.bannedcards.contains(i)) continue;
                 if(!lib.translate[i+'_info']) continue;
                 if((type.indexOf('equip')==0&&type.length==6)||
 					(type.indexOf('hslingjian')==0&&type.length==11)||
@@ -40145,6 +40146,8 @@
 		libCard:function(filter){
 			var list=[];
 			for(var i in lib.card){
+				if(lib.config.bannedcards.contains(i)) continue;
+				if(!lib.translate[i+'_info']) continue;
 				if(filter(lib.card[i],i)){
 					list.push(i);
 				}