Просмотр исходного кода

BT15 bird support bugs, build settings

mbunch_kascope 2 лет назад
Родитель
Сommit
29ce0d5e92

+ 1 - 8
Assets/CardEffect/BT15/Red/Birdramon_BT15_013.cs

@@ -28,15 +28,8 @@ public class Birdramon_BT15_013 : CEntity_Effect
                 {
                     if (cardSource.CardColors.Contains(CardColor.Red))
                     {
-                        if (cardSource.HasBirdTraits)
-                        {
-                            return true;
-                        }
-
-                        if (cardSource.HasBeastTraits)
-                        {
+                        if (cardSource.HasAvianBeastAnimalTraits)
                             return true;
-                        }
                     }
                 }
 

+ 1 - 8
Assets/CardEffect/BT15/Red/Biyomon_BT15_007.cs

@@ -28,15 +28,8 @@ public class Biyomon_BT15_007 : CEntity_Effect
             {
                 if (cardSource.IsDigimon)
                 {
-                    if (cardSource.HasBirdTraits)
-                    {
-                        return true;
-                    }
-
-                    if (cardSource.HasBeastTraits)
-                    {
+                    if (cardSource.HasAvianBeastAnimalTraits)
                         return true;
-                    }
                 }
 
                 return false;

+ 1 - 21
Assets/CardEffect/BT15/Red/Sora_Takenouchi_BT15_082.cs

@@ -77,30 +77,10 @@ public class Sora_Takenouchi_BT15_082 : CEntity_Effect
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false,
                             cardEffect: activateClass))
                     {
-                        if (cardSource.ContainsTraits("Avian"))
+                        if (cardSource.HasAvianBeastAnimalTraits)
                         {
                             return true;
                         }
-                        if (cardSource.ContainsTraits("Bird"))
-                        {
-                            return true;
-                        }
-                        if (cardSource.ContainsTraits("Beast"))
-                        {
-                            return true;
-                        }
-                        if (cardSource.ContainsTraits("Animal"))
-                        {
-                            return true;
-                        }
-                        if (cardSource.ContainsTraits("Sovereign"))
-                        {
-                            return true;
-                        }
-                        if (cardSource.ContainsTraits("Sea Animal"))
-                        {
-                            return false;
-                        }
                     }
                 }
 

+ 2 - 0
Assets/CardEffect/RB1/Purple/Arkturusmon_RB1_031.cs

@@ -74,6 +74,8 @@ public class Arkturusmon_RB1_031 : CEntity_Effect
             {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
+                    return true;
+
                     if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                     {
                         return true;

+ 25 - 2
Assets/Scripts/CardSource.cs

@@ -1175,9 +1175,7 @@ public class CardSource : MonoBehaviour
     public bool ContainsTraits(string trait)
     {
         if (string.IsNullOrEmpty(trait))
-        {
             return false;
-        }
 
         string replaced = trait.Replace(" ", "");
 
@@ -1355,6 +1353,31 @@ public class CardSource : MonoBehaviour
     }
     #endregion
 
+    #region whether this card has at least 1 trait that contains "Avian", "Bird", "Beast", "Animal", "Sovereign", other than "Sea Animal"
+    public bool HasAvianBeastAnimalTraits
+    {
+        get
+        {
+            if (ContainsTraits("Avian"))
+                return true;
+
+            if (ContainsTraits("Bird"))
+                return true;
+
+            if (ContainsTraits("Beast"))
+                return true;
+
+            if (ContainsTraits("Animal") && !ContainsTraits("Sea Animal"))
+                return true;
+
+            if (ContainsTraits("Sovereign"))
+                return true;
+
+            return false;
+        }
+    }
+    #endregion
+
     #region whether this card has "XAntibody" trait
     public bool HasXAntibodyTraits => CardTraits.Some(DataBase.IsXAntibodyString);
     #endregion

+ 1 - 1
ProjectSettings/EditorBuildSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8c89e3cb39fb551e383029728839919c6ba3c63de9c829919d9f1c2384b6ba7
+oid sha256:1f7eefd30354e4b01bd03e2fcabb59cc2efef8c7954ded67a463c975c182b36b
 size 702