Browse Source

bug fixes found

mbunch_kascope 1 year ago
parent
commit
2aa3520c56

+ 1 - 1
Assets/CardBaseEntity/BT17/Blue/Digimon/Labramon-BT17-021.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6de718404aaca3540e6e98a2ea28308b39c9aa7db160aeac42c0e2a7c25bde5f
+oid sha256:43d36e11e289ae6b0995c0b3b43109f6e68f2446926906c713899a793700f0c6
 size 1299

+ 2 - 23
Assets/CardEffect/BT11/Red/ShoutmonDX_BT11_018.cs

@@ -16,8 +16,9 @@ public class ShoutmonDX_BT11_018 : CEntity_Effect
         if (timing == EffectTiming.None)
         {
             ChangeCardNamesClass changeCardNamesClass = new ChangeCardNamesClass();
-            changeCardNamesClass.SetUpICardEffect("Also treated as [OmniShoutmon]", CanUseCondition, card);
+            changeCardNamesClass.SetUpICardEffect("Also treated as [OmniShoutmon]/[ZeigGreymon]", CanUseCondition, card);
             changeCardNamesClass.SetUpChangeCardNamesClass(changeCardNames: changeCardNames);
+            
             cardEffects.Add(changeCardNamesClass);
 
             bool CanUseCondition(Hashtable hashtable)
@@ -30,28 +31,6 @@ public class ShoutmonDX_BT11_018 : CEntity_Effect
                 if (cardSource == card)
                 {
                     CardNames.Add("OmniShoutmon");
-                }
-
-                return CardNames;
-            }
-        }
-
-        if (timing == EffectTiming.None)
-        {
-            ChangeCardNamesClass changeCardNamesClass = new ChangeCardNamesClass();
-            changeCardNamesClass.SetUpICardEffect("Also treated as [ZeigGreymon]", CanUseCondition, card);
-            changeCardNamesClass.SetUpChangeCardNamesClass(changeCardNames: changeCardNames);
-            cardEffects.Add(changeCardNamesClass);
-
-            bool CanUseCondition(Hashtable hashtable)
-            {
-                return true;
-            }
-
-            List<string> changeCardNames(CardSource cardSource, List<string> CardNames)
-            {
-                if (cardSource == card)
-                {
                     CardNames.Add("ZeigGreymon");
                 }
 

+ 1 - 4
Assets/CardEffect/BT16/Purple/GesomonXAntibody_BT16_069.cs

@@ -255,10 +255,7 @@ namespace DCGO.CardEffects.BT16
                     {
                         if (permanent.IsDigimon || permanent.IsTamer)
                         {
-                            if (permanent.DigivolutionCards.Count(CanSelectCardCondition) >= 1)
-                            {
-                                return true;
-                            }
+                            return true;
                         }
                     }
 

+ 1 - 1
Assets/CardEffect/BT9/Red/OmegashoutmonXAntibody_BT9_013.cs

@@ -20,7 +20,7 @@ public class OmegashoutmonXAntibody_BT9_013 : CEntity_Effect
                 return targetPermanent.TopCard.CardNames.Contains("OmniShoutmon");
             }
 
-            cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
+            cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: true, card: card, condition: null));
         }
 
         if (timing == EffectTiming.OnEnterFieldAnyone)

+ 1 - 1
Assets/CardEffect/EX7/Purple/BeelStarmonXAntibody_EX7_073.cs

@@ -16,7 +16,7 @@ namespace DCGO.CardEffects.EX7
             {
                 bool PermanentCondition(Permanent targetPermanent)
                 {
-                    return targetPermanent.TopCard.EqualsTraits("Three Musketeers") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 6 && targetPermanent.TopCard.EqualsTraits("X Antibody");
+                    return targetPermanent.TopCard.EqualsTraits("Three Musketeers") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 6 && !targetPermanent.TopCard.EqualsTraits("X Antibody");
                 }
 
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 1, ignoreDigivolutionRequirement: false, card: card, condition: null));

+ 6 - 3
Assets/CardEffect/EX7/Red/ChaosTriangular_EX7_066.cs

@@ -113,11 +113,14 @@ namespace DCGO.CardEffects.EX7
                 int count()
                 {
                     List<Permanent> cards = new List<Permanent>();
+                    List<Permanent> choices = card.Owner.GetBattleAreaDigimons();
 
-                    foreach (Permanent card in card.Owner.GetBattleAreaPermanents().Filter(permanent => permanent.TopCard.EqualsTraits("Three Musketeers")))
+                    choices = choices.Filter(permanent => permanent.TopCard.EqualsTraits("Three Musketeers"));
+
+                    foreach (Permanent selection in choices)
                     {
-                        if (cards.Some(permanent => !permanent.TopCard.HasSameCardName(card.TopCard)))
-                            cards.Add(card);
+                        if (cards.Some(permanent => !permanent.TopCard.HasSameCardName(selection.TopCard)))
+                            cards.Add(selection);
                     }
 
                     return cards.Count;

+ 34 - 0
Assets/Scenes/ContinuousControllerScene.unity

@@ -4324,6 +4324,10 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3329c5b9d405f464ebca9d3be4491f24, type: 2}
   - {fileID: 11400000, guid: ba19e86a642716648a7c7e4a52580cfc, type: 2}
   - {fileID: 11400000, guid: 8d6f2508edcc1614a90cc3838114e6fc, type: 2}
+  - {fileID: 11400000, guid: 223e4a1470ac3dd458f86d58648c5345, type: 2}
+  - {fileID: 11400000, guid: 274c9606e9efff84ab1b1d202cac564b, type: 2}
+  - {fileID: 11400000, guid: c4333926df4d1414198aa32b9b2b075b, type: 2}
+  - {fileID: 11400000, guid: d439ee6397bd7a14caa067cd44e9234a, type: 2}
   - {fileID: 11400000, guid: d592dc908760e46428f7effd8beeae5b, type: 2}
   - {fileID: 11400000, guid: be19ebe3b1538c642b77284f50a7b38a, type: 2}
   - {fileID: 11400000, guid: 38b97d0cb38130c4aa3a278de1832b48, type: 2}
@@ -4408,6 +4412,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 08bffc393060c28459d64bea8e6e4979, type: 2}
   - {fileID: 11400000, guid: fa218108d5366e2448103b258fb9c890, type: 2}
   - {fileID: 11400000, guid: 1fc84f81a0a0d844e8aa1b091bb634fe, type: 2}
+  - {fileID: 11400000, guid: b5fdbbb0b62596b4895b8df21869a232, type: 2}
+  - {fileID: 11400000, guid: 5f8f16803494ad9498bbbf31b19ed84f, type: 2}
   - {fileID: 11400000, guid: 99de8b57fc534a740a455255aad17046, type: 2}
   - {fileID: 11400000, guid: dcbf45052e02194418adbe47efa87dee, type: 2}
   - {fileID: 11400000, guid: b6e5c316902d4f14c86a57636a0b145f, type: 2}
@@ -4476,6 +4482,12 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0cdaea2c5d842684b93f26fade928dcf, type: 2}
   - {fileID: 11400000, guid: 3bacafe6e7140364c9113f751eed26f8, type: 2}
   - {fileID: 11400000, guid: 362a8a85a8106244a8b331c2f22cdc08, type: 2}
+  - {fileID: 11400000, guid: be4b3bd768c13fe4cbd8b2f33a002a4b, type: 2}
+  - {fileID: 11400000, guid: 517d9954b4d9cb64783dab620df7b585, type: 2}
+  - {fileID: 11400000, guid: da5a163453eca4a46a47b27b9cd9afb1, type: 2}
+  - {fileID: 11400000, guid: b0a0c5cfe8bfe914fbc27fb07ac21345, type: 2}
+  - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
+  - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
   - {fileID: 11400000, guid: eabf1c609de718c42a5ce2d0ed2c3f66, type: 2}
   - {fileID: 11400000, guid: 60d73225a93ad3241b36dae2d75b2a70, type: 2}
   - {fileID: 11400000, guid: 825356da447018b479ff316363a9a555, type: 2}
@@ -4509,6 +4521,11 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 1d6f529e270f06348ac07f573cc30f9c, type: 2}
   - {fileID: 11400000, guid: 0cd79dfaea820654299a03a40b44a7dd, type: 2}
   - {fileID: 11400000, guid: 9cc34051767c68b47a0d9c58bcceba89, type: 2}
+  - {fileID: 11400000, guid: a794a294e74e6b2459890f4aaef50fd7, type: 2}
+  - {fileID: 11400000, guid: 744f3bf871455bb43bb10fe678cdffbf, type: 2}
+  - {fileID: 11400000, guid: 0011de4a49b3d5747874a483b1213dc5, type: 2}
+  - {fileID: 11400000, guid: ce1cb488e42b8d94d9548fc880ab7140, type: 2}
+  - {fileID: 11400000, guid: fd8ef57a1463e34429218795883ae573, type: 2}
   SortedCardList:
   - {fileID: 11400000, guid: a2d5d459eb08e8e4e9efe55c803b7b73, type: 2}
   - {fileID: 11400000, guid: a0fc0332535f72b4ebf0377a7e5141eb, type: 2}
@@ -8582,6 +8599,23 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 84cac9987896e8541a1a8b97f4e94867, type: 2}
   - {fileID: 11400000, guid: a141a1a92b40a3d44b9265260c7537d4, type: 2}
   - {fileID: 11400000, guid: f88b396a2dccf854c9039538225c89e1, type: 2}
+  - {fileID: 11400000, guid: 223e4a1470ac3dd458f86d58648c5345, type: 2}
+  - {fileID: 11400000, guid: 274c9606e9efff84ab1b1d202cac564b, type: 2}
+  - {fileID: 11400000, guid: b5fdbbb0b62596b4895b8df21869a232, type: 2}
+  - {fileID: 11400000, guid: 5f8f16803494ad9498bbbf31b19ed84f, type: 2}
+  - {fileID: 11400000, guid: be4b3bd768c13fe4cbd8b2f33a002a4b, type: 2}
+  - {fileID: 11400000, guid: 517d9954b4d9cb64783dab620df7b585, type: 2}
+  - {fileID: 11400000, guid: c4333926df4d1414198aa32b9b2b075b, type: 2}
+  - {fileID: 11400000, guid: d439ee6397bd7a14caa067cd44e9234a, type: 2}
+  - {fileID: 11400000, guid: a794a294e74e6b2459890f4aaef50fd7, type: 2}
+  - {fileID: 11400000, guid: 744f3bf871455bb43bb10fe678cdffbf, type: 2}
+  - {fileID: 11400000, guid: 0011de4a49b3d5747874a483b1213dc5, type: 2}
+  - {fileID: 11400000, guid: da5a163453eca4a46a47b27b9cd9afb1, type: 2}
+  - {fileID: 11400000, guid: b0a0c5cfe8bfe914fbc27fb07ac21345, type: 2}
+  - {fileID: 11400000, guid: ce1cb488e42b8d94d9548fc880ab7140, type: 2}
+  - {fileID: 11400000, guid: fd8ef57a1463e34429218795883ae573, type: 2}
+  - {fileID: 11400000, guid: ef9bbb046adbc4b4aa454d36df1b7c09, type: 2}
+  - {fileID: 11400000, guid: adbdca6d2fa1484428442a6acca762d0, type: 2}
   ReverseCard: {fileID: 21300000, guid: ff90b0f41defc6e4d8331cae90f2edfa, type: 3}
   ReverseCard_Digitama: {fileID: 21300000, guid: 542271417046c25458d624e43223c985, type: 3}
   soundObject: {fileID: 2099658912993173812, guid: bd165147db2f1de478fbb125a5222199, type: 3}

+ 1 - 1
Assets/Scripts/DeckData.cs

@@ -802,7 +802,7 @@ public class DeckData
         StringBuilder sb = new StringBuilder();
         foreach (char c in deckName)
         {
-            if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))
+            if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c == ' '))
             {
                 sb.Append(c);
             }

+ 1 - 2
Assets/Scripts/SelectCardEffect.cs

@@ -225,8 +225,7 @@ public class SelectCardEffect : MonoBehaviourPunCallbacks
                 }
                 break;
             case Root.EnemyHand:
-                _selectPlayer.Enemy.HandCards = RandomUtility.ShuffledDeckCards(_selectPlayer.Enemy.HandCards);
-                foreach (CardSource cardSource in _selectPlayer.Enemy.HandCards)
+                foreach (CardSource cardSource in RandomUtility.ShuffledDeckCards(_selectPlayer.Enemy.HandCards))
                 {
                     RootCardList.Add(cardSource);
                 }