فهرست منبع

1.7.1-a build

mbunch_kascope 1 سال پیش
والد
کامیت
f5bcbb516b
26فایلهای تغییر یافته به همراه193 افزوده شده و 119 حذف شده
  1. 2 2
      Assets/CardBaseEntity/BT10/Yellow/Digimon/BT10_041.asset
  2. 2 2
      Assets/CardBaseEntity/BT10/Yellow/Digimon/BT10_041_P1.asset
  3. 0 3
      Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P1.asset
  4. 0 8
      Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P1.asset.meta
  5. 0 3
      Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P2.asset
  6. 0 8
      Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P2.asset.meta
  7. 0 3
      Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P3.asset
  8. 0 8
      Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P3.asset.meta
  9. 2 2
      Assets/CardBaseEntity/BT19/Purple/Digimon/BT19_068.asset
  10. 1 1
      Assets/CardBaseEntity/ST6/Purple/Digimon/ST6_08_P4.asset
  11. 1 1
      Assets/CardBaseEntity/ST6/Purple/Digimon/ST6_08_P5.asset
  12. 1 1
      Assets/CardBaseEntity/ST6/Purple/Digimon/ST6_08_P6.asset
  13. 4 2
      Assets/CardEffect/BT18/Green/BT18_056.cs
  14. 3 3
      Assets/CardEffect/BT19/Green/BT19_084.cs
  15. 99 47
      Assets/CardEffect/BT19/Red/BT19_011.cs
  16. 1 1
      Assets/CardEffect/BT19/Red/BT19_080.cs
  17. 10 6
      Assets/CardEffect/EX8/Blue/EX8_027.cs
  18. 2 2
      Assets/CardEffect/EX8/Green/EX8_074.cs
  19. 1 1
      Assets/CardEffect/EX8/Purple/EX8_057.cs
  20. 1 0
      Assets/CardEffect/EX8/Purple/EX8_064.cs
  21. 0 7
      Assets/CardEffect/P/Blue/P_164.cs
  22. 47 0
      Assets/Editor/Fixing Scripts/FindInconsistentCardType.cs
  23. 11 0
      Assets/Editor/Fixing Scripts/FindInconsistentCardType.cs.meta
  24. 0 6
      Assets/Scenes/ContinuousControllerScene.unity
  25. 3 0
      Assets/Scripts/CardSource.cs
  26. 2 2
      ProjectSettings/ProjectSettings.asset

+ 2 - 2
Assets/CardBaseEntity/BT10/Yellow/Digimon/BT10_041.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77de52a4373a3fb4ecef14c5b055170d3146161794862c401588ecf992a5ad44
-size 2712
+oid sha256:190d8f328dc84eee32158793383f1024457efc4b7456ee2a39767396b5520492
+size 2716

+ 2 - 2
Assets/CardBaseEntity/BT10/Yellow/Digimon/BT10_041_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60700ecfca1f64cc0ce3dcdd7a168575f229d56189f9597125325385a0a87b27
-size 2718
+oid sha256:cf039b640dac9b8e843108f5e86309cb5ec57d2da3c519cc563831007d17d3ce
+size 2722

+ 0 - 3
Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P1.asset

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60858951683ef3ef249f8373c497d6fe276279721dcd93d337b0cf5a38792d6e
-size 3078

+ 0 - 8
Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P1.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e32a176ee00410641a85201d7dfae9a1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 3
Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P2.asset

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d81e3873bfbca26ddc2d16b4c70b7148446cbd093cdcd8e21578c8f28764c8c
-size 3078

+ 0 - 8
Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P2.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1e4712d0e6630f94193db81323c1b6dd
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 3
Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P3.asset

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d084b5282c2f839b872e9a228b4a1ee898f9ad9a2cf5550de0e62fba2d23ee7
-size 3078

+ 0 - 8
Assets/CardBaseEntity/BT12/Red/Digimon/BT12-011_P3.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 127aa6dbd30c8d0459ba90fcd023c46a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
Assets/CardBaseEntity/BT19/Purple/Digimon/BT19_068.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e61216315f74e58cacc5bc674110f0f51331e3c0c2c255b86c43a0ba551c3ee4
-size 1447
+oid sha256:5d250612f9457d7e486e045bc2cf84b6f283066399ca3393e3e882cf4e6d8e1d
+size 1461

+ 1 - 1
Assets/CardBaseEntity/ST6/Purple/Digimon/ST6_08_P4.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4301862a4c9e51e65974342291ac0dd15b90a2ab78e6f9ce65fc59ea602356ca
+oid sha256:71f68c4a2365a6c14e6c3d5bb13df3d4494135d9475b51968ee3de23fd339e4c
 size 1099

+ 1 - 1
Assets/CardBaseEntity/ST6/Purple/Digimon/ST6_08_P5.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddc72a5a861d69fe0ac3efd8bc8961641d515485abce24832485b62cde5f0946
+oid sha256:d74486abb8baae014c49b9cb17e4d660337e7a1b7105b2ef71c0c40d618d11d1
 size 1099

+ 1 - 1
Assets/CardBaseEntity/ST6/Purple/Digimon/ST6_08_P6.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08b2eb9282cedf70809b79e127c030e56d7812b6e64c1ed72a4b8027efd91f13
+oid sha256:8af4c8eba0cd050cf46eb048229deafd26665027f9bc6ca14a70371b8b8d32b3
 size 1099

+ 4 - 2
Assets/CardEffect/BT18/Green/BT18_056.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using UnityEngine;
 
 namespace DCGO.CardEffects.BT18
 {
@@ -85,7 +87,7 @@ namespace DCGO.CardEffects.BT18
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    int maxCount = card.Owner.SecurityCards.Count(cardSource => !cardSource.IsFlipped);
+                    int maxCount = Mathf.Min(card.Owner.Enemy.GetBattleAreaDigimons().Count, card.Owner.SecurityCards.Count(cardSource => !cardSource.IsFlipped));
 
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
@@ -152,7 +154,7 @@ namespace DCGO.CardEffects.BT18
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    int maxCount = card.Owner.SecurityCards.Count(cardSource => !cardSource.IsFlipped);
+                    int maxCount = Mathf.Min(card.Owner.Enemy.GetBattleAreaDigimons().Count, card.Owner.SecurityCards.Count(cardSource => !cardSource.IsFlipped));
 
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 

+ 3 - 3
Assets/CardEffect/BT19/Green/BT19_084.cs

@@ -64,7 +64,7 @@ namespace DCGO.CardEffects.BT19
 
                 string EffectDiscription()
                 {
-                    return "[Main] By suspending this Tamer, 1 of your Digimon may digivolve into a Digimon card in your face up security cards. If this effect digivolved, you may place 1 Digimon card with the [Royal Base] trait from your hand face up as your bottom security card.";
+                    return "[Main] By suspending this Tamer, 1 of your Digimon digivolves into a Digimon card in your face up security cards. If this effect digivolved, you may place 1 Digimon card with the [Royal Base] trait from your hand face up as your bottom security card.";
                 }
 
                 bool OwnersDigivolveTarget(Permanent permanent)
@@ -122,7 +122,7 @@ namespace DCGO.CardEffects.BT19
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
                             maxCount: 1,
-                            canNoSelect: true,
+                            canNoSelect: false,
                             canEndNotMax: false,
                             selectPermanentCoroutine: SelectDigivolveTarget,
                             afterSelectPermanentCoroutine: null,
@@ -149,7 +149,7 @@ namespace DCGO.CardEffects.BT19
                             canTargetCondition: DigivolveTarget,
                             canTargetCondition_ByPreSelecetedList: null,
                             canEndSelectCondition: null,
-                            canNoSelect: () => true,
+                            canNoSelect: () => false,
                             selectCardCoroutine: SelectCardCoroutine,
                             afterSelectCardCoroutine: null,
                             message: "Select 1 card to digivolve.",

+ 99 - 47
Assets/CardEffect/BT19/Red/BT19_011.cs

@@ -18,73 +18,71 @@ namespace DCGO.CardEffects.BT19
             }
             #endregion
 
-            #region On Play/When Digivolving Shared
-            int enemyCount = Math.Min(card.Owner.Enemy.GetBattleAreaDigimons().Count, card.Owner.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()));
-            int maxDP = 3000 + 2000 * enemyCount;
-
-            bool CanSelectOpponentsPermanent(Permanent permanent)
+            #region On Play
+            if (timing == EffectTiming.OnEnterFieldAnyone)
             {
-                if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                int enemyCount = Math.Min(card.Owner.Enemy.GetBattleAreaDigimons().Count, card.Owner.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()));
+                int maxDP = 3000 + 2000 * enemyCount;
+
+                ActivateClass activateClass = new ActivateClass();
+                activateClass.SetUpICardEffect("Delete up to 3000 DP of your opponents Digimon, this DP-based deletion increases by 2000 DP for each of your opponent's Digimon and gain memory", CanUseCondition, card);
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                cardEffects.Add(activateClass);
+
+                string EffectDiscription()
                 {
-                    if (permanent.TopCard.CardDP <= maxDP)
+                    return "[On Play] Delete any of your opponent's Digimon with DP adding up to 3000. For each of your opponent's Digimon, add 2000 to this DP-Based deletion effect's maximum. Then, for each Digimon deleted by this effect, gain 1 memory.";
+                }
+
+                bool CanSelectOpponentsPermanent(Permanent permanent)
+                {
+                    if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
                     {
-                        if (permanent.TopCard.HasDP)
+                        if (permanent.TopCard.CardDP <= card.Owner.MaxDP_DeleteEffect(maxDP, activateClass))
                         {
-                            return true;
+                            if (permanent.TopCard.HasDP)
+                            {
+                                return true;
+                            }
                         }
                     }
-                }
-
-                return false;
-            }
 
-            bool CanEndSelectCondition(List<Permanent> permanents)
-            {
-                if (permanents.Count <= 0)
                     return false;
+                }
 
-                int sumDP = 0;
-
-                foreach (Permanent permanent1 in permanents)
+                bool CanEndSelectCondition(List<Permanent> permanents)
                 {
-                    sumDP += permanent1.TopCard.CardDP;
-                }
+                    if (permanents.Count <= 0)
+                        return false;
 
-                if (sumDP > maxDP)
-                    return false;
+                    int sumDP = 0;
 
-                return true;
-            }
+                    foreach (Permanent permanent1 in permanents)
+                    {
+                        sumDP += permanent1.TopCard.CardDP;
+                    }
 
-            bool CanTargetCondition_ByPreSelecetedList(List<Permanent> permanents, Permanent permanent)
-            {
-                int sumDP = 0;
+                    if (sumDP > card.Owner.MaxDP_DeleteEffect(maxDP, activateClass))
+                        return false;
 
-                foreach (Permanent permanent1 in permanents)
-                {
-                    sumDP += permanent1.TopCard.CardDP;
+                    return true;
                 }
 
-                sumDP += permanent.TopCard.CardDP;
+                bool CanTargetCondition_ByPreSelecetedList(List<Permanent> permanents, Permanent permanent)
+                {
+                    int sumDP = 0;
 
-                if (sumDP > maxDP)
-                    return false;
+                    foreach (Permanent permanent1 in permanents)
+                    {
+                        sumDP += permanent1.TopCard.CardDP;
+                    }
 
-                return true;
-            }
-            #endregion
+                    sumDP += permanent.TopCard.CardDP;
 
-            #region On Play
-            if (timing == EffectTiming.OnEnterFieldAnyone)
-            {
-                ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("Delete up to 3000 DP of your opponents Digimon, this DP-based deletion increases by 2000 DP for each of your opponent's Digimon and gain memory", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
-                cardEffects.Add(activateClass);
+                    if (sumDP > card.Owner.MaxDP_DeleteEffect(maxDP, activateClass))
+                        return false;
 
-                string EffectDiscription()
-                {
-                    return "[On Play] Delete any of your opponent's Digimon with DP adding up to 3000. For each of your opponent's Digimon, add 2000 to this DP-Based deletion effect's maximum. Then, for each Digimon deleted by this effect, gain 1 memory.";
+                    return true;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -138,6 +136,9 @@ namespace DCGO.CardEffects.BT19
             #region When Digivolving
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {
+                int enemyCount = Math.Min(card.Owner.Enemy.GetBattleAreaDigimons().Count, card.Owner.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()));
+                int maxDP = 3000 + 2000 * enemyCount;
+
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Delete up to 3000 DP of your opponents Digimon, this DP-based deletion increases by 2000 DP for each of your opponent's Digimon and gain memory", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
@@ -148,6 +149,57 @@ namespace DCGO.CardEffects.BT19
                     return "[When Digivolving] Delete any of your opponent's Digimon with DP adding up to 3000. For each of your opponent's Digimon, add 2000 to this DP-Based deletion effect's maximum. Then, for each Digimon deleted by this effect, gain 1 memory.";
                 }
 
+                bool CanSelectOpponentsPermanent(Permanent permanent)
+                {
+                    if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                    {
+                        if (permanent.TopCard.CardDP <= card.Owner.MaxDP_DeleteEffect(maxDP, activateClass))
+                        {
+                            if (permanent.TopCard.HasDP)
+                            {
+                                return true;
+                            }
+                        }
+                    }
+
+                    return false;
+                }
+
+                bool CanEndSelectCondition(List<Permanent> permanents)
+                {
+                    if (permanents.Count <= 0)
+                        return false;
+
+                    int sumDP = 0;
+
+                    foreach (Permanent permanent1 in permanents)
+                    {
+                        sumDP += permanent1.TopCard.CardDP;
+                    }
+
+                    if (sumDP > card.Owner.MaxDP_DeleteEffect(maxDP, activateClass))
+                        return false;
+
+                    return true;
+                }
+
+                bool CanTargetCondition_ByPreSelecetedList(List<Permanent> permanents, Permanent permanent)
+                {
+                    int sumDP = 0;
+
+                    foreach (Permanent permanent1 in permanents)
+                    {
+                        sumDP += permanent1.TopCard.CardDP;
+                    }
+
+                    sumDP += permanent.TopCard.CardDP;
+
+                    if (sumDP > card.Owner.MaxDP_DeleteEffect(maxDP, activateClass))
+                        return false;
+
+                    return true;
+                }
+
                 bool CanUseCondition(Hashtable hashtable)
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))

+ 1 - 1
Assets/CardEffect/BT19/Red/BT19_080.cs

@@ -124,7 +124,7 @@ namespace DCGO.CardEffects.BT19
                                 selectAttackEffect.SetUp(
                                     attacker: selectedPermanent,
                                     canAttackPlayerCondition: () => true,
-                                    defenderCondition: (permanent) => true,
+                                    defenderCondition: (permanent) => false,
                                     cardEffect: activateClass);
 
                                 selectAttackEffect.SetCanNotSelectNotAttack();

+ 10 - 6
Assets/CardEffect/EX8/Blue/EX8_027.cs

@@ -124,7 +124,8 @@ namespace DCGO.CardEffects.EX8
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("DNA Digivole into [DS] trait, then attack", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetHashString("DNA_EX8-027");
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
@@ -161,13 +162,16 @@ namespace DCGO.CardEffects.EX8
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsOwnerTurn(card))
+                    if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
-                        if (CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, MyDigimonCondition))
-                            return true;
+                        if (CardEffectCommons.IsOwnerTurn(card))
+                        {
+                            if (CardEffectCommons.CanTriggerOnPermanentPlay(hashtable, MyDigimonCondition))
+                                return true;
 
-                        if (CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, MyDigimonCondition))
-                            return true;
+                            if (CardEffectCommons.CanTriggerWhenPermanentDigivolving(hashtable, MyDigimonCondition))
+                                return true;
+                        }
                     }
 
                     return false;

+ 2 - 2
Assets/CardEffect/EX8/Green/EX8_074.cs

@@ -190,7 +190,7 @@ namespace DCGO.CardEffects.EX8
                                                                      targetPermanent != null &&
                                                                      targetPermanent.TopCard &&
                                                                      !targetPermanent.TopCard.CanNotBeAffected(changeCostClass) &&
-                                                                     !targetPermanent.IsSuspended && targetPermanent.CanSuspend) < 2;
+                                                                     !targetPermanent.IsSuspended && targetPermanent.CanSuspend) >= 2;
                 }
 
                 bool CardSourceCondition(CardSource cardSource)
@@ -257,7 +257,7 @@ namespace DCGO.CardEffects.EX8
 
                 int DeletionMaxDP()
                 {
-                    return 8000 + (3000 * CardEffectCommons.MatchConditionPermanentCount(permanent => permanent.IsSuspended && permanent != card.PermanentOfThisCard()));
+                    return 8000 + (3000 * CardEffectCommons.MatchConditionPermanentCount(permanent => permanent.IsDigimon && permanent.IsSuspended && permanent != card.PermanentOfThisCard()));
                 }
 
                 bool CanSelectDeletePermanentCondition(Permanent permanent)

+ 1 - 1
Assets/CardEffect/EX8/Purple/EX8_057.cs

@@ -52,7 +52,7 @@ namespace DCGO.CardEffects.EX8
 
                 bool CanSelectFallenAngelCardCondition(CardSource cardSource)
                 {
-                    return cardSource.ContainsTraits("Fallen Angel") || cardSource.ContainsTraits("FallenAngel");
+                    return cardSource.EqualsTraits("Fallen Angel");
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

+ 1 - 0
Assets/CardEffect/EX8/Purple/EX8_064.cs

@@ -257,6 +257,7 @@ namespace DCGO.CardEffects.EX8
                                        cardSource: cardSource,
                                        payCost: false,
                                        cardEffect: activateClass) &&
+                                   cardSource.IsDigimon &&
                                    cardSource.GetCostItself <= maxCost &&
                                    cardSource.ContainsTraits("NSo");
                         }

+ 0 - 7
Assets/CardEffect/P/Blue/P_164.cs

@@ -101,14 +101,7 @@ namespace DCGO.CardEffects.P
                             yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(
                                 new List<CardSource> { selectedCard },
                                 activateClass));
-                        }
 
-                        List<ICardEffect> candidateEffects = selectedCard.EffectList_ForCard(EffectTiming.OnEnterFieldAnyone, card)
-                                .Clone()
-                                .Filter(cardEffect => cardEffect != null && cardEffect is ActivateICardEffect && !cardEffect.IsSecurityEffect && cardEffect.IsOnPlay);
-
-                        if (candidateEffects.Count >= 1)
-                        {
                             yield return ContinuousController.instance.StartCoroutine(
                                 new DrawClass(card.Owner, 1, activateClass).Draw());
                         }

+ 47 - 0
Assets/Editor/Fixing Scripts/FindInconsistentCardType.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor.SceneManagement;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using DCGO.CardEntities;
+using Unity.EditorCoroutines.Editor;
+using System.Collections;
+using UnityEngine.Networking;
+using WebSocketSharp;
+using static UnityEngine.ParticleSystem;
+
+namespace DCGO.Tools.Repair{
+
+
+    public class FindInconsistentCardType : MonoBehaviour
+    {
+        InconsistentName _stringValue;
+        List<TrackedData> _entities;
+
+
+        [MenuItem("Window/DCGO/Repair/Find Inconsistent Card Types")]
+        static void FindInconsistentCardTypes()
+        {
+            List<CEntity_Base> Entities = GetAsset.LoadAll<CEntity_Base>("Assets/CardBaseEntity/");
+
+            foreach (CEntity_Base card in Entities)
+            {
+                if(card.Level == 2)
+                {
+                    if(card.cardKind != CardKind.DigiEgg)
+                        Debug.Log($"Mismatched Type (Egg): {card.CardSprite} - {card.cardColors[0]}");
+                }
+                else if (card.Level > 2)
+                {
+                    if (card.cardKind != CardKind.Digimon)
+                        Debug.Log($"Mismatched Type (Digimon): {card.CardSprite} - {card.cardColors[0]}");
+                }
+            }
+
+            Debug.Log($"FIND INCONSISTANCY COMPLETE");
+        }
+    }
+}
+

+ 11 - 0
Assets/Editor/Fixing Scripts/FindInconsistentCardType.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5eca2c40d97888546b8be6fe080443d7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 6
Assets/Scenes/ContinuousControllerScene.unity

@@ -1751,9 +1751,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 7164a89e56c52b0449eac16495bc75e4, type: 2}
   - {fileID: 11400000, guid: ebf5c021a7bdd3b4e9e417c67f8e1b74, type: 2}
   - {fileID: 11400000, guid: 348771b651dcb484c9a6aa5de24040c9, type: 2}
-  - {fileID: 11400000, guid: e32a176ee00410641a85201d7dfae9a1, type: 2}
-  - {fileID: 11400000, guid: 1e4712d0e6630f94193db81323c1b6dd, type: 2}
-  - {fileID: 11400000, guid: 127aa6dbd30c8d0459ba90fcd023c46a, type: 2}
   - {fileID: 11400000, guid: c25758f1d87459d4f90602e008db320e, type: 2}
   - {fileID: 11400000, guid: 47d99c95220064a4782c669e390cfee4, type: 2}
   - {fileID: 11400000, guid: 341c56e401c5062479f8174a977640ba, type: 2}
@@ -8257,9 +8254,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 7164a89e56c52b0449eac16495bc75e4, type: 2}
   - {fileID: 11400000, guid: ebf5c021a7bdd3b4e9e417c67f8e1b74, type: 2}
   - {fileID: 11400000, guid: 348771b651dcb484c9a6aa5de24040c9, type: 2}
-  - {fileID: 11400000, guid: e32a176ee00410641a85201d7dfae9a1, type: 2}
-  - {fileID: 11400000, guid: 1e4712d0e6630f94193db81323c1b6dd, type: 2}
-  - {fileID: 11400000, guid: 127aa6dbd30c8d0459ba90fcd023c46a, type: 2}
   - {fileID: 11400000, guid: 6efaabdbbd2e3bc4eb5ebe4ec79bc542, type: 2}
   - {fileID: 11400000, guid: 55f7ce8d8f8711948b135c689c3f7a4f, type: 2}
   - {fileID: 11400000, guid: d73a00a2c9548014cae339a17408628b, type: 2}

+ 3 - 0
Assets/Scripts/CardSource.cs

@@ -1658,6 +1658,9 @@ public class CardSource : MonoBehaviour
         foreach (string attribute in _cEntity_Base.Type_ENG)
             checkStrings.Add(DataBase.ReplaceToASCII(attribute));
 
+        foreach(JogressConditionElement element in jogressCondition.elements)
+            checkStrings.Add(element.SelectMessage);
+
         foreach (string checkString in checkStrings)
         {
             if (!string.IsNullOrEmpty(checkString))

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2946ad211e41ecab63ab2c048263cbac48ac22747911845382545939509cbbed
-size 20166
+oid sha256:6408a6286423d4764669d99a9d9bfa61a15239bdc08bb4c040a71b129f9c866e
+size 20168