From 5b90d01ae370160fe99458b0724efd3d3dd0402d Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sun, 10 Jul 2016 10:45:05 +0800
Subject: [PATCH] 3

---
 card/sp.js     |  9 ++++++++-
 game/game.js   | 26 +++++++++++++-------------
 game/update.js |  3 ++-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/card/sp.js b/card/sp.js
index c61c493a8..506688f7b 100644
--- a/card/sp.js
+++ b/card/sp.js
@@ -34,7 +34,14 @@ card.sp={
 			ai:{
 				value:-5,
 				useful:6,
-			}
+			},
+			enable:true,
+			filterTarget:function(card,player,target){
+				return target==player;
+			},
+			delay:false,
+			content:function(){},
+			selectTarget:-1
 		},
 		shengdong:{
             fullskin:true,
diff --git a/game/game.js b/game/game.js
index 0a34d5964..8472f9e5a 100755
--- a/game/game.js
+++ b/game/game.js
@@ -3861,6 +3861,19 @@
                         var ia=connect_avatar_list[i];
                         lib.mode.connect.config.connect_avatar.item[ia]=lib.translate[ia];
                     }
+					if(lib.cardPack.mode_derivation){
+						for(var i=0;i<lib.cardPack.mode_derivation.length;i++){
+							if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivation=='string'&&!lib.character[lib.card[lib.cardPack.mode_derivation[i]].derivation]){
+								lib.cardPack.mode_derivation.splice(i--,1);
+							}
+                            else if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivationpack=='string'&&!){
+
+                            }
+						}
+						if(lib.cardPack.mode_derivation.length==0){
+							delete lib.cardPack.mode_derivation;
+						}
+					}
                     if(lib.config.mode!='connect'){
                         var pilecfg=lib.config.customcardpile[get.config('cardpilename')];
     					if(pilecfg){
@@ -3942,19 +3955,6 @@
 							}
 						}
 					}
-					if(lib.cardPack.mode_derivation){
-						for(var i=0;i<lib.cardPack.mode_derivation.length;i++){
-							if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivation=='string'&&!lib.character[lib.card[lib.cardPack.mode_derivation[i]].derivation]){
-								lib.cardPack.mode_derivation.splice(i--,1);
-							}
-                            else if(typeof lib.card[lib.cardPack.mode_derivation[i]].derivationpack=='string'&&!lib.config.cards.contains(lib.card[lib.cardPack.mode_derivation[i]].derivationpack)){
-                                lib.cardPack.mode_derivation.splice(i--,1);
-                            }
-						}
-						if(lib.cardPack.mode_derivation.length==0){
-							delete lib.cardPack.mode_derivation;
-						}
-					}
 					for(i in play){
 						if(lib.config.hiddenPlayPack.contains(i)) continue;
 						if(play[i].forbid&&play[i].forbid.contains(lib.config.mode)) continue;
diff --git a/game/update.js b/game/update.js
index c11bac6ed..ec222f981 100644
--- a/game/update.js
+++ b/game/update.js
@@ -6,7 +6,8 @@ window.noname_update={
     files:{
         global:[
             'game/game.js',
-            'card/swd.js'
+            'card/swd.js',
+            'card/sp.js'
         ],
         '1.8.16.3':[]
     }