mbunch_kascope 1 рік тому
батько
коміт
5d104604e4
50 змінених файлів з 80 додано та 254 видалено
  1. 2 2
      Assets/CardBaseEntity/BT16/Black/Digimon/Shakkoumon-BT16-063.asset
  2. 2 2
      Assets/CardBaseEntity/BT16/Black/Digimon/Shakkoumon-BT16-063_P1.asset
  3. 2 2
      Assets/CardBaseEntity/BT16/Blue/Digimon/Veemon-BT16-017.asset
  4. 2 2
      Assets/CardBaseEntity/BT16/Green/Digimon/BladeKuwagamon-BT16-042.asset
  5. 2 2
      Assets/CardBaseEntity/BT16/Green/Digimon/Pulsemon-BT16-039.asset
  6. 2 2
      Assets/CardBaseEntity/BT16/White/Digimon/Ukkomon-BT16-082.asset
  7. 2 2
      Assets/CardBaseEntity/BT16/White/Digimon/Ukkomon-BT16-082_P1.asset
  8. 2 2
      Assets/CardBaseEntity/BT16/Yellow/Digimon/Chaosmon-BT16-036.asset
  9. 2 2
      Assets/CardBaseEntity/BT16/Yellow/Digimon/Magnamon(XAntibody)-BT16-102.asset
  10. 2 2
      Assets/CardBaseEntity/BT16/Yellow/Digimon/Magnamon(XAntibody)-BT16-102_P1.asset
  11. 2 2
      Assets/CardBaseEntity/BT16/Yellow/Digimon/Magnamon(XAntibody)-BT16-102_P2.asset
  12. 2 2
      Assets/CardBaseEntity/BT16/Yellow/Digimon/SlashAngemon-BT16-035.asset
  13. 2 2
      Assets/CardBaseEntity/BT17/Blue/Digimon/Cerberusmon_Werewolf_Mode-BT17-025.asset
  14. 2 2
      Assets/CardBaseEntity/BT17/Blue/Digimon/Labramon-BT17-021.asset
  15. 2 2
      Assets/CardBaseEntity/BT17/Blue/Digimon/Seasarmon-BT17-024.asset
  16. 2 2
      Assets/CardBaseEntity/BT17/White/Digimon/Imperialdramon_Paladin_Mode-BT17-077.asset
  17. 2 2
      Assets/CardBaseEntity/BT17/White/Digimon/Imperialdramon_Paladin_Mode-BT17-077_P1.asset
  18. 2 2
      Assets/CardBaseEntity/BT17/White/Digimon/Imperialdramon_Paladin_Mode-BT17-077_P2.asset
  19. 2 2
      Assets/CardBaseEntity/BT7/Black/Tamer/堂本コータ-BT7-090.asset
  20. 2 2
      Assets/CardBaseEntity/EX6/Black/Digimon/Keramon-EX6-036.asset
  21. 2 2
      Assets/CardBaseEntity/EX6/Blue/Digimon/Xiangpengmon-EX6-015.asset
  22. 2 2
      Assets/CardBaseEntity/EX6/Blue/Digimon/Xiangpengmon-EX6-015_P1.asset
  23. 2 2
      Assets/CardBaseEntity/EX6/Blue/Digimon/Xiquemon-EX6-013.asset
  24. 2 2
      Assets/CardBaseEntity/EX6/Red/Digimon/Durandamon-EX6-010.asset
  25. 2 2
      Assets/CardBaseEntity/EX6/Yellow/Digimon/ArkhaiAngemon-EX6-021.asset
  26. 2 2
      Assets/CardBaseEntity/EX6/Yellow/Digimon/Dominimon-EX6-030.asset
  27. 2 2
      Assets/CardBaseEntity/EX6/Yellow/Digimon/Dominimon-EX6-030_P1.asset
  28. 2 2
      Assets/CardBaseEntity/EX7/Blue/Digimon/CrysPaledramon-EX7-021.asset
  29. 1 1
      Assets/CardEffect/BT10/Blue/BlazingMemoryBoost_BT10_097.cs
  30. 2 2
      Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs
  31. 1 1
      Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs
  32. 1 1
      Assets/CardEffect/BT15/Black/Numemon_X_Antibody_BT15_057.cs
  33. 1 1
      Assets/CardEffect/BT15/Yellow/Gatomon_BT15_037.cs
  34. 1 1
      Assets/CardEffect/BT15/Yellow/Geremon_BT15_035.cs
  35. 1 1
      Assets/CardEffect/BT15/Yellow/Salamon_BT15_034.cs
  36. 0 27
      Assets/CardEffect/BT16/Black/Shakkoumon_BT16_063.cs
  37. 0 25
      Assets/CardEffect/BT16/Green/BladeKuwagamon_BT16_042.cs
  38. 1 4
      Assets/CardEffect/BT16/Purple/GesomonXAntibody_BT16_069.cs
  39. 0 26
      Assets/CardEffect/BT16/Yellow/Chaosmon_BT16_036.cs
  40. 1 1
      Assets/CardEffect/BT16/Yellow/HackerJudge_BT16_086.cs
  41. 0 25
      Assets/CardEffect/BT16/Yellow/MagnamonXAntibody_BT16_102.cs
  42. 0 25
      Assets/CardEffect/BT16/Yellow/SlashAngemon_BT16_035.cs
  43. 0 21
      Assets/CardEffect/BT17/Blue/CerberusmonWerewolfMode_BT17_025.cs
  44. 1 1
      Assets/CardEffect/BT17/Purple/CrackerFang_BT17_091.cs
  45. 1 0
      Assets/CardEffect/BT17/Red/WarGreymon_BT17_015.cs
  46. 0 23
      Assets/CardEffect/BT17/White/ImperialdramonPaladinMode_BT17_077.cs
  47. 1 1
      Assets/CardEffect/P/Black/MameTyramon_P_141.cs
  48. 1 0
      Assets/Scripts/CardSource.cs
  49. 9 10
      Assets/Scripts/DeckData.cs
  50. 1 1
      ProjectSettings/ProjectSettings.asset

+ 2 - 2
Assets/CardBaseEntity/BT16/Black/Digimon/Shakkoumon-BT16-063.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:401985e6f33c99d3dbb72063160e3936152b651bd188ea0708ecc5dc234d0677
-size 2560
+oid sha256:8c27bdad127e6e37aadbd2e09e26a567454ed4658d92d2d6353c0100e5501f15
+size 2570

+ 2 - 2
Assets/CardBaseEntity/BT16/Black/Digimon/Shakkoumon-BT16-063_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9980fe742513be0ead786df4cab32f5e66d2380d8527dea2e7120a7a739e97f9
-size 2566
+oid sha256:eef6f4a3ecdb3c0eaaeb48eb74e429e1184f933e2e3299dcd063b5c0546a4b9c
+size 2576

+ 2 - 2
Assets/CardBaseEntity/BT16/Blue/Digimon/Veemon-BT16-017.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42e352cc26de61fd0251a1c33d7045afee0d780890ddb212773d5a3dd392ece0
-size 1523
+oid sha256:75d87c392e5b59c294d99b48d7b13358089c4a5285f147c6253e5bb043e03d5a
+size 1524

+ 2 - 2
Assets/CardBaseEntity/BT16/Green/Digimon/BladeKuwagamon-BT16-042.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eaa0983b42b2a98bb8806bb0525bf36c95b9698d968002a6f481654bc319c113
-size 1632
+oid sha256:16f8c4862e1bda124090337e21d68f77d83c9dae9f613f508c452b8ce24dcc68
+size 1646

+ 2 - 2
Assets/CardBaseEntity/BT16/Green/Digimon/Pulsemon-BT16-039.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eafe127101ca9671258ad8b1474bed3c982eb50b34517f4d690e0a5dac5ae4f8
-size 1766
+oid sha256:1606e63daf73d8f945aca45d6dcc1f4ec951faa5214497f55530b7a79440a5e3
+size 1767

+ 2 - 2
Assets/CardBaseEntity/BT16/White/Digimon/Ukkomon-BT16-082.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:286476e6d02857f0466917f0fb2e36ecc1de7af3571a4500ed4e53097a8e9b1f
-size 1751
+oid sha256:707ad2e4e28f086fec08119adb5c33fd4f8e727a2226741394cce020903b2e3d
+size 1752

+ 2 - 2
Assets/CardBaseEntity/BT16/White/Digimon/Ukkomon-BT16-082_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a7401b381894d360ccbf33aba98db545a2b98eb2afee01a0cc0132cef25b57a
-size 1757
+oid sha256:4cc9aa7d4515a8e315b9bba98a3469d0f1a1a777ebafcc91bb16164768060a95
+size 1758

+ 2 - 2
Assets/CardBaseEntity/BT16/Yellow/Digimon/Chaosmon-BT16-036.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a96469fda1e2328865b741595418de2cc373c3723ee5b0dd4f66818a97da072
-size 1894
+oid sha256:72a998200e941cb0ec712c3ef7b49727f7b12d83996ea621347d71fa5dd2014e
+size 1917

+ 2 - 2
Assets/CardBaseEntity/BT16/Yellow/Digimon/Magnamon(XAntibody)-BT16-102.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e6ff9fb91714b3cc895f3f85413b509bef737cc719ae8d184a74c3173ed78cf1
-size 1961
+oid sha256:beebe3430ae3a36117ef969167266fe7f073c5668281110a20250f983b84e9c0
+size 1972

+ 2 - 2
Assets/CardBaseEntity/BT16/Yellow/Digimon/Magnamon(XAntibody)-BT16-102_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3f1a69d8a6117678d75011ff8504605ba9b770a53cacc6c7ec610ad025fcf02
-size 1967
+oid sha256:e921460671c8e194f118b3ddd3d10d6ed9b277dc06fc3550de4df73d9f55c1f8
+size 1978

+ 2 - 2
Assets/CardBaseEntity/BT16/Yellow/Digimon/Magnamon(XAntibody)-BT16-102_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:791441b83f2a737d35a99f5ec0cd627905098d46fe5cd6b3f0b45710fc4975c5
-size 1967
+oid sha256:4d46281566a3418526ead485331906e1e07c67995568c57673f5d8776538a631
+size 1978

+ 2 - 2
Assets/CardBaseEntity/BT16/Yellow/Digimon/SlashAngemon-BT16-035.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fd9a375218d4bf810855a77c782f7c86024c74fd358d0ccfeaf5c5fa3c01fc5
-size 1448
+oid sha256:2b64963ae912706944cfcb9179cfd27902a1838915a99fdbd88c918c720ed9bf
+size 1458

+ 2 - 2
Assets/CardBaseEntity/BT17/Blue/Digimon/Cerberusmon_Werewolf_Mode-BT17-025.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fba790388207e0dfe0a3ad5af1ad237845a8fa1159dfee4562676f5c939506fe
-size 1620
+oid sha256:82dac431b21161736f82afaca90932f69dfd11e007a40f59521c7a1c768dfa30
+size 1636

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

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

+ 2 - 2
Assets/CardBaseEntity/BT17/Blue/Digimon/Seasarmon-BT17-024.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04e6e73115495467df75c161838f6dbc3e5755a1f35ab772bbc612b8154d64c9
-size 1279
+oid sha256:75d219b8d8b7ea49ce237f8b22c161e5704b14055c2c06f5b4186a6dd908d5c5
+size 1280

+ 2 - 2
Assets/CardBaseEntity/BT17/White/Digimon/Imperialdramon_Paladin_Mode-BT17-077.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02ad4551a4f69cbdd275698d524df8986232baf63c2ff43768b00cd8704fee33
-size 1744
+oid sha256:8fc7267969b71395136bf80c6d1f58cf4b20005733a57adf8d79291f097668b5
+size 1753

+ 2 - 2
Assets/CardBaseEntity/BT17/White/Digimon/Imperialdramon_Paladin_Mode-BT17-077_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:54fee1118980bebe1688eea6bcaa82a9d0c0efd0d39e8cdb397de86e777b742d
-size 1750
+oid sha256:8c6b76381db194700d92ffa4baddaba35991e025c043f570da926d1d8e8d68b6
+size 1759

+ 2 - 2
Assets/CardBaseEntity/BT17/White/Digimon/Imperialdramon_Paladin_Mode-BT17-077_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7811e703b8fcaec757af4de9296886cac4392b1368548dd3b59e447a42dcf6d
-size 1750
+oid sha256:58cd621c560474501c1c273cc96e58121b2f22e86da20f484c138abb55b08343
+size 1759

+ 2 - 2
Assets/CardBaseEntity/BT7/Black/Tamer/堂本コータ-BT7-090.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb92775af222535d7046c6bd27423bc590aed674355fad8aa5ac22c68eec6146
-size 2334
+oid sha256:2e7ec48e7baae5f7584f1570221f29737204584fbd817d8afcbc0c9338e27f6a
+size 2133

+ 2 - 2
Assets/CardBaseEntity/EX6/Black/Digimon/Keramon-EX6-036.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d806706da9f25023b6698f0fe24201828cee805a6d2626b5c70a6427d8d5a445
-size 1451
+oid sha256:7282f30fd3e5ec8d5e8f02572c362e4b99a5f69d81e1e8d424a4ae9313627956
+size 1443

+ 2 - 2
Assets/CardBaseEntity/EX6/Blue/Digimon/Xiangpengmon-EX6-015.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7090a777e5ed7b90c8dc0c29a782054012c985d07c4a260a90f8918315e2d335
-size 1671
+oid sha256:4b0a35f74c982aa0e04c2d8ebcec47bcc1d338821ada51038762c580bffbb019
+size 1683

+ 2 - 2
Assets/CardBaseEntity/EX6/Blue/Digimon/Xiangpengmon-EX6-015_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ed9261f54637d540beb8990065de033dfeb26d3110e298f34e137b18e972554
-size 1677
+oid sha256:5f11c7eed268c4457dbef83f05e9e8e98069da59922f61ab8c7aedde55acb352
+size 1689

+ 2 - 2
Assets/CardBaseEntity/EX6/Blue/Digimon/Xiquemon-EX6-013.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92f2cad836d6f3cfa8c8810763469d3ca1762630d7780ffd75b6bbf0fe4da8c8
-size 1199
+oid sha256:0cf84b8c1ef947569ea2447e23ed30e654988f2d83e45a168ad978bc27baebfd
+size 1211

+ 2 - 2
Assets/CardBaseEntity/EX6/Red/Digimon/Durandamon-EX6-010.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9d7f26a3c8e9c169f550259336fdf795299013a581d1bc1dc7c701cfe37969ee
-size 1620
+oid sha256:a2b15474d7fab154f7fa2c44dca98487cc80aef21a99bdc41dc68b2be5e1df3f
+size 1624

+ 2 - 2
Assets/CardBaseEntity/EX6/Yellow/Digimon/ArkhaiAngemon-EX6-021.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:428e9b3b250aac26da124aa97945ef8858916d2612341aaaa6451972822b6e5a
-size 1556
+oid sha256:911c98392a1b21b959282cffc5d1a4a83c17614853673d538abd7439d1a0c3b6
+size 1566

+ 2 - 2
Assets/CardBaseEntity/EX6/Yellow/Digimon/Dominimon-EX6-030.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:335f8204e71b503f6db5ba8ee9658079574c2fb298e45b3b92fd92728f76f1dd
-size 1613
+oid sha256:a9190d9b34838f4679fddfdd0ebc60cdc711f252c9f8f8b6bf48580003d63b69
+size 1623

+ 2 - 2
Assets/CardBaseEntity/EX6/Yellow/Digimon/Dominimon-EX6-030_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4148ee47baf0c19aa08211bfd1b2419fda68f3ce0c4d7e3dbadb0737a3b42c92
-size 1619
+oid sha256:eb785e39d7bb60454a2ba0012836d26a16d736065d1c324d4c018a46b749b8d1
+size 1629

+ 2 - 2
Assets/CardBaseEntity/EX7/Blue/Digimon/CrysPaledramon-EX7-021.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fad08a7dca66b48d9e600014db02540b7491c9d7501eee4f3870419232212e82
-size 1624
+oid sha256:3c8d087baab4853ec8ec4c66e8ff949d7eaf68845986c62e1529a5ee992df2b8
+size 1627

+ 1 - 1
Assets/CardEffect/BT10/Blue/BlazingMemoryBoost_BT10_097.cs

@@ -81,7 +81,7 @@ public class BlazingMemoryBoost_BT10_097 : CEntity_Effect
                             canTargetCondition:CanSelectCardCondition1,
                             canTargetCondition_ByPreSelecetedList:null,
                             canEndSelectCondition:null,
-                            canNoSelect:true,
+                            canNoSelect:false,
                             selectCardCoroutine: SelectCardCoroutine,
                             message: "Select 1 [Kiriha Aonuma].",
                             maxCount: 1,

+ 2 - 2
Assets/CardEffect/BT14/Purple/Devimon_BT14_075.cs

@@ -170,8 +170,8 @@ public class Devimon_BT14_075 : CEntity_Effect
                         canEndNotMax: false,
                         isShowOpponent: false,
                         mode: SelectCardEffect.Mode.Discard,
-                        root: SelectCardEffect.Root.Custom,
-                        customRootCardList: card.Owner.Enemy.HandCards,
+                        root: SelectCardEffect.Root.EnemyHand,
+                        customRootCardList: null,
                         canLookReverseCard: false,
                         selectPlayer: card.Owner,
                         cardEffect: activateClass);

+ 1 - 1
Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs

@@ -36,7 +36,7 @@ public class Solgarumon_BT14_079 : CEntity_Effect
                     }
                 }
 
-                if (cardSource.Level <= maxLevel)
+                if (cardSource.Level <= maxLevel && cardSource.Level != 2)
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {

+ 1 - 1
Assets/CardEffect/BT15/Black/Numemon_X_Antibody_BT15_057.cs

@@ -135,7 +135,7 @@ public class Numemon_X_Antibody_BT15_057 : CEntity_Effect
             activateDeletion.SetUpICardEffect("Play 1 [Numemon] from trash", CanUseOnDeletion, card);
             activateDeletion.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
             activateDeletion.SetIsInheritedEffect(true);
-            activateDeletion.SetHashString("Play1NumemonFromTrash_BT15_057");
+            activateDeletion.SetHashString("Play1NumemonFromTrashESS_BT15_057");
             cardEffects.Add(activateDeletion);
 
             if (card.PermanentOfThisCard() != null)

+ 1 - 1
Assets/CardEffect/BT15/Yellow/Gatomon_BT15_037.cs

@@ -68,7 +68,7 @@ public class Gatomon_BT15_037 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Play this card without paying the cost", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             cardEffects.Add(activateClass);
 
             string EffectDiscription()

+ 1 - 1
Assets/CardEffect/BT15/Yellow/Geremon_BT15_035.cs

@@ -12,7 +12,7 @@ public class Geremon_BT15_035 : CEntity_Effect
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-        #region Rule Text
+        #region Rule Text - Name
 
         if (timing == EffectTiming.None)
         {

+ 1 - 1
Assets/CardEffect/BT15/Yellow/Salamon_BT15_034.cs

@@ -193,7 +193,7 @@ public class Salamon_BT15_034 : CEntity_Effect
                         selectHandEffect.SetUpCustomMessage(
                             "Select 1 card to place at the top or bottom of security.",
                             "The opponent is selecting 1 card to place at the bottom of security.");
-                        selectHandEffect.SetUpCustomMessage_ShowCard("Security Bottom Card");
+                        selectHandEffect.SetUpCustomMessage_ShowCard("Security Top/Bottom Card");
 
                         yield return StartCoroutine(selectHandEffect.Activate());
 

+ 0 - 27
Assets/CardEffect/BT16/Black/Shakkoumon_BT16_063.cs

@@ -14,33 +14,6 @@ namespace DCGO.CardEffects.BT16
             partitionConditions.Add(new PartitionCondition(4, CardColor.Black));
             partitionConditions.Add(new PartitionCondition(4, CardColor.Yellow));
 
-            #region Rule - Trait: Also has [Angel]
-
-            if (timing == EffectTiming.None)
-            {
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Trait: Also has [Angel]", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: ChangeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> ChangeTraits(CardSource cardSource, List<string> cardTraits)
-                {
-                    if (cardSource == card)
-                    {
-                        cardTraits.Add("Angel");
-                    }
-
-                    return cardTraits;
-                }
-            }
-
-            #endregion
-
             #region DNA Digivolution - Black Lv.4 + Yellow Lv.4: Cost 0
             if (timing == EffectTiming.None)
             {

+ 0 - 25
Assets/CardEffect/BT16/Green/BladeKuwagamon_BT16_042.cs

@@ -14,31 +14,6 @@ namespace DCGO.CardEffects.BT16
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            #region Rule Text
-            if (timing == EffectTiming.None)
-            {
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Also treated as [Insectiod]", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> changeTraits(CardSource cardSource, List<string> CardTraits)
-                {
-                    if (cardSource == card)
-                    {
-                        CardTraits.Add("Insectoid");
-                    }
-
-                    return CardTraits;
-                }
-            }
-            #endregion
-
             #region On Play
             if (timing == EffectTiming.OnEnterFieldAnyone)
             {

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

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

+ 0 - 26
Assets/CardEffect/BT16/Yellow/Chaosmon_BT16_036.cs

@@ -304,32 +304,6 @@ namespace DCGO.CardEffects.BT16
                 }
             #endregion
 
-            #region Rule Text
-            if (timing == EffectTiming.None)
-            {
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Also treated as [Boss]/[D-Brigade]", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> changeTraits(CardSource cardSource, List<string> CardTraits)
-                {
-                    if (cardSource == card)
-                    {
-                        CardTraits.Add("Boss");
-                        CardTraits.Add("D-Brigade");
-                    }
-
-                    return CardTraits;
-                }
-            }
-            #endregion
-
             return cardEffects;
         }
     }

+ 1 - 1
Assets/CardEffect/BT16/Yellow/HackerJudge_BT16_086.cs

@@ -230,7 +230,7 @@ namespace DCGO.CardEffects.BT16
             }
             #endregion
 
-            #region Rule Text
+            #region Rule Text - Name
             if (timing == EffectTiming.None)
             {
                 ChangeCardNamesClass changeCardNamesClass = new ChangeCardNamesClass();

+ 0 - 25
Assets/CardEffect/BT16/Yellow/MagnamonXAntibody_BT16_102.cs

@@ -11,31 +11,6 @@ namespace DCGO.CardEffects.BT16
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            #region Rule Text
-            if (timing == EffectTiming.None)
-            {
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Also treated as [Free]", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> changeTraits(CardSource cardSource, List<string> CardTraits)
-                {
-                    if (cardSource == card)
-                    {
-                        CardTraits.Add("Free");
-                    }
-
-                    return CardTraits;
-                }
-            }
-            #endregion
-
             #region Armor Purge and Blocker
             if (timing == EffectTiming.WhenPermanentWouldBeDeleted)
             {

+ 0 - 25
Assets/CardEffect/BT16/Yellow/SlashAngemon_BT16_035.cs

@@ -9,31 +9,6 @@ namespace DCGO.CardEffects.BT16
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            #region Rule Text
-            if (timing == EffectTiming.None)
-            {
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Also treated as [Angel]", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: changeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> changeTraits(CardSource cardSource, List<string> CardTraits)
-                {
-                    if (cardSource == card)
-                    {
-                        CardTraits.Add("Angel");
-                    }
-
-                    return CardTraits;
-                }
-            }
-            #endregion
-
             #region Barrier and Reboot
             if (timing == EffectTiming.WhenPermanentWouldBeDeleted)
             {

+ 0 - 21
Assets/CardEffect/BT17/Blue/CerberusmonWerewolfMode_BT17_025.cs

@@ -24,27 +24,6 @@ namespace DCGO.CardEffects.BT17
                 cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(
                     permanentCondition: PermanentCondition, digivolutionCost: 1, ignoreDigivolutionRequirement: true,
                     card: card, condition: null));
-
-                // Rule Trait
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Trait: Has [Dark Animal] Type", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: ChangeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> ChangeTraits(CardSource cardSource, List<string> cardTraits)
-                {
-                    if (cardSource == card)
-                    {
-                        cardTraits.Add("Dark Animal");
-                    }
-
-                    return cardTraits;
-                }
             }
 
             #endregion

+ 1 - 1
Assets/CardEffect/BT17/Purple/CrackerFang_BT17_091.cs

@@ -70,7 +70,7 @@ namespace DCGO.CardEffects.BT17
 
             #endregion
 
-            #region Rule Text
+            #region Rule Text - Name
 
             if (timing == EffectTiming.None)
             {

+ 1 - 0
Assets/CardEffect/BT17/Red/WarGreymon_BT17_015.cs

@@ -482,6 +482,7 @@ namespace DCGO.CardEffects.BT17
                 activateClass.SetUpICardEffect("Trash the top card of opponent's security", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDescription());
                 activateClass.SetIsInheritedEffect(true);
+                activateClass.SetHashString("ESS_BT17_015");
                 cardEffects.Add(activateClass);
 
                 string EffectDescription()

+ 0 - 23
Assets/CardEffect/BT17/White/ImperialdramonPaladinMode_BT17_077.cs

@@ -31,29 +31,6 @@ namespace DCGO.CardEffects.BT17
             }
             #endregion
 
-            #region Rule - Trait: Also has [Free]
-            if (timing == EffectTiming.None)
-            {
-                ChangeTraitsClass changeTraitsClass = new ChangeTraitsClass();
-                changeTraitsClass.SetUpICardEffect("Trait: Also has [Free]", CanUseCondition, card);
-                changeTraitsClass.SetUpChangeTraitsClass(changeeTraits: ChangeTraits);
-                cardEffects.Add(changeTraitsClass);
-
-                bool CanUseCondition(Hashtable hashtable)
-                {
-                    return true;
-                }
-
-                List<string> ChangeTraits(CardSource cardSource, List<string> cardTraits)
-                {
-                    if (cardSource == card)
-                        cardTraits.Add("Free");
-
-                    return cardTraits;
-                }
-            }
-            #endregion
-
             #region Blast Digivolve
             if (timing == EffectTiming.OnCounterTiming)
             {

+ 1 - 1
Assets/CardEffect/P/Black/MameTyramon_P_141.cs

@@ -10,7 +10,7 @@ namespace DCGO.CardEffects.P
         {
             List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-            #region Rule
+            #region Rule - Name
             if (timing == EffectTiming.None)
             {
                 ChangeCardNamesClass changeCardNamesClass = new ChangeCardNamesClass();

+ 1 - 0
Assets/Scripts/CardSource.cs

@@ -1132,6 +1132,7 @@ public class CardSource : MonoBehaviour
         }
 
         string replaced = name.Replace(" ", "");
+        replaced = replaced.Replace(":", "");
         string lower = name.ToLower();
 
         return CardNames.Some((cardName) =>

+ 9 - 10
Assets/Scripts/DeckData.cs

@@ -799,24 +799,23 @@ public class DeckData
             return deckName;
         }
 
-        List<string> ErrorLetters = new List<string>()
+        StringBuilder sb = new StringBuilder();
+        foreach (char c in deckName)
         {
-            ",",
-            "_",
-            "*",
-            "/",
-        };
-
-        foreach (string error in ErrorLetters)
-        {
-            deckName = deckName.Replace(error, "");
+            if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))
+            {
+                sb.Append(c);
+            }
         }
 
+        deckName = sb.ToString();
+
         var filter = new ProfanityFilter.ProfanityFilter();
         deckName = filter.CensorString(deckName);
 
         return deckName;
     }
+
     #endregion
 }
 

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:763b920a8e99526654d67456ed3d31ba7892d26d440e1181d39d674a6bf01677
+oid sha256:9a1a66ccca663afba50e1ae9223869fc89a00e58920ad7b9380d33a517a2db9b
 size 20167