Update DefaultExecutor.cs

Game/AI/DefaultExecutor.cs

@@ -248,13 +248,7 @@ namespace WindBot.Game.AI
 
             SetFuncFilter(ExecutorType.SummonOrSet, () => {
 				if (Card.IsCode(71625222)) return Enemy.GetMonsterCount() > 0; //[时间魔术师]对方场上有怪兽存在才召唤
-				int[] codes = new[] {23434538, 46502744, 87170768, 25137581,14558127,60643553,27204311,
-					94145021,59438930,2830693,19665973,18964575,34267821,24508238,78661338,84192580,
-					52038441,62015408
-				};
-
-				if (Card.IsCode(codes)) return false;//过滤手坑
-				return true;
+				return !DontSummon(Card);
 			});
 
             SetFuncFilter(ExecutorType.SpSummon,() => {
@@ -279,6 +273,25 @@ namespace WindBot.Game.AI
 			AddExecutor(ExecutorType.Activate, DefaultGambleCard);//默认发动的赌博卡
 			AddExecutor(ExecutorType.SpellSet, 9373534);//[封魔手里剑]始终盖放
 		}
+        /// <summary>
+        /// Dont summon cards'id in the following list
+        /// </summary>
+        private bool DontSummon(ClientCard card)
+        {
+            if (card.HasSetcode(0x40) || card.HasSetcode(0xa4) || card.HasSetcode(0xd3)) return true;
+            int[] codes = new[] {74762582, 90179822, 16759958, 26964762, 42352091, 2511, 74018812, 76214441, 62886670, 69105797, 32391566, 94076521, 73625877, 1980574, 42090294, 68823957, 34976176, 89785779, 76133574, 3248469, 87102774
+            , 57647597, 37961969, 51993760, 87988305, 38339996, 37629703, 58131925, 71133680, 42790071, 34475451, 63009228, 24725825, 48427163, 86028783, 51852507, 29280589, 87462901, 73640163, 68120130, 84813516, 55461064, 59042331, 26775203, 89169343
+            , 67750322, 68819554, 26084285, 15613529, 19096726, 59546797, 12235475, 38695361, 37742478, 26914168, 43534808, 13313278, 99581584, 04192696, 89662736, 81109178, 18444902, 04807253, 12423762, 72318602, 86613346, 82489470, 16223761, 08152834/*像是手坑的时尚小垃圾*/
+            , 97268402/*效果遮蒙者*/, 24508238/*D.D.乌鸦*/, 94145021/*锁鸟*/
+            , 14558127, 14558128, 52038441, 52038442, 59438930, 59438931, 60643553, 60643554, 62015408, 62015409, 73642296, 73642297/*手坑六姐妹*/
+            , 15721123, 23434538, 25137581, 46502744, 80978111, 87170768, 94081496/*xx的G*/
+            , 17266660, 21074344, 94689635/*宣告者*/
+            , 18964575, 20450925, 19665973, 28427869, 27352108/*攻宣坑*/
+            };
+
+            if (card.IsCode(codes)) return true;
+            return false;
+        }
 
         BattlePhaseAction DealerMaidenModeOnSelectAttackTarget(ClientCard attacker, IList<ClientCard> defenders) 
         {
@@ -1164,26 +1177,6 @@ namespace WindBot.Game.AI
             return tributecount <= 0;
         }
 
-        /// <summary>
-        /// Dont summon cards'id in the following list
-        /// </summary>
-        private bool DontSummon(ClientCard card)
-        {
-            if (card.HasSetcode(0x40) || card.HasSetcode(0xa4) || card.HasSetcode(0xd3)) return true;
-            int[] cardsname = new[] {74762582, 90179822, 16759958, 26964762, 42352091, 2511, 74018812, 76214441, 62886670, 69105797, 32391566, 94076521, 73625877, 1980574, 42090294, 68823957, 34976176, 89785779, 76133574, 3248469, 87102774
-            , 57647597, 37961969, 51993760, 87988305, 38339996, 37629703, 58131925, 71133680, 42790071, 34475451, 63009228, 24725825, 48427163, 86028783, 51852507, 29280589, 87462901, 73640163, 68120130, 84813516, 55461064, 59042331, 26775203, 89169343
-            , 67750322, 68819554, 26084285, 15613529, 19096726, 59546797, 12235475, 38695361, 37742478, 26914168, 43534808, 13313278, 99581584, 04192696, 89662736, 81109178, 18444902, 04807253, 12423762, 72318602, 86613346, 82489470, 16223761, 08152834/*像是手坑的时尚小垃圾*/
-            , 97268402/*效果遮蒙者*/, 24508238/*D.D.乌鸦*/, 94145021/*锁鸟*/
-            , 14558127, 14558128, 52038441, 52038442, 59438930, 59438931, 60643553, 60643554, 62015408, 62015409, 73642296, 73642297/*手坑六姐妹*/
-            , 15721123, 23434538, 25137581, 46502744, 80978111, 87170768, 94081496/*xx的G*/
-            , 17266660, 21074344, 94689635/*宣告者*/
-            , 18964575, 20450925, 19665973, 28427869, 27352108/*攻宣坑*/
-            };
-
-            if (card.IsCode(cardsname)) return true;
-            return false;
-        }
-
         /// <summary>
         /// Activate when we have no field.
         /// </summary>