Parcourir la source

Massive bug fix update

mbunch_kascope il y a 2 ans
Parent
commit
fd54c16ece
78 fichiers modifiés avec 557 ajouts et 534 suppressions
  1. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/Hagurumon-BT15-055.asset
  2. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/Hisyaryumon-BT15-063.asset
  3. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/Megadramon-BT15-064.asset
  4. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/Megadramon-BT15-064_P1.asset
  5. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/Numemon(XAntibody)-BT15-057.asset
  6. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/Ouryumon-BT15-067.asset
  7. 2 2
      Assets/CardBaseEntity/BT15/Black/Digimon/WaruMonzaemon-BT15-065.asset
  8. 2 2
      Assets/CardBaseEntity/BT15/Black/Option/SupremeConnection!-BT15-096.asset
  9. 2 2
      Assets/CardBaseEntity/BT15/Black/Option/UltimateSlicer-BT15-097.asset
  10. 2 2
      Assets/CardBaseEntity/BT15/Black/Tamer/MarvinJackson-BT15-086.asset
  11. 2 2
      Assets/CardBaseEntity/BT15/Black/Tamer/MarvinJackson-BT15-086_P1.asset
  12. 2 2
      Assets/CardBaseEntity/BT15/Black/Tamer/ShuuYulin-BT15-087.asset
  13. 2 2
      Assets/CardBaseEntity/BT15/Black/Tamer/ShuuYulin-BT15-087_P1.asset
  14. 2 2
      Assets/CardBaseEntity/BT15/Blue/Digimon/Garurumon-BT15-024.asset
  15. 2 2
      Assets/CardBaseEntity/BT15/Blue/Digimon/Gomamon(XAntibody)-BT15-021.asset
  16. 2 2
      Assets/CardBaseEntity/BT15/Blue/Digimon/MetalGarurumon-BT15-101.asset
  17. 2 2
      Assets/CardBaseEntity/BT15/Blue/Digimon/MetalGarurumon-BT15-101_P1.asset
  18. 2 2
      Assets/CardBaseEntity/BT15/Blue/Digimon/MetalSeadramon-BT15-031.asset
  19. 2 2
      Assets/CardBaseEntity/BT15/Blue/Digimon/Scorpiomon-BT15-027.asset
  20. 2 2
      Assets/CardBaseEntity/BT15/Blue/Option/FoxFire-BT15-090.asset
  21. 2 2
      Assets/CardBaseEntity/BT15/Blue/Option/WolfofFriendship-BT15-091.asset
  22. 2 2
      Assets/CardBaseEntity/BT15/Blue/Tamer/MattIshida-BT15-083.asset
  23. 2 2
      Assets/CardBaseEntity/BT15/Blue/Tamer/MattIshida-BT15-083_P1.asset
  24. 2 2
      Assets/CardBaseEntity/BT15/Green/DigiEgg/Motimon-BT15-004.asset
  25. 2 2
      Assets/CardBaseEntity/BT15/Green/DigiEgg/Motimon-BT15-004_P1.asset
  26. 2 2
      Assets/CardBaseEntity/BT15/Green/Digimon/Cherrymon-BT15-050.asset
  27. 2 2
      Assets/CardBaseEntity/BT15/Green/Digimon/Puppetmon-BT15-052.asset
  28. 2 2
      Assets/CardBaseEntity/BT15/Green/Digimon/Tentomon-BT15-043.asset
  29. 2 2
      Assets/CardBaseEntity/BT15/Green/Digimon/Tentomon-BT15-043_P1.asset
  30. 2 2
      Assets/CardBaseEntity/BT15/Green/Option/ImpactofKnowledge-BT15-095.asset
  31. 2 2
      Assets/CardBaseEntity/BT15/Green/Option/SuperShocker-BT15-094.asset
  32. 2 2
      Assets/CardBaseEntity/BT15/Green/Tamer/IzzyIzumi-BT15-085.asset
  33. 2 2
      Assets/CardBaseEntity/BT15/Green/Tamer/IzzyIzumi-BT15-085_P1.asset
  34. 2 2
      Assets/CardBaseEntity/BT15/Purple/Digimon/DemiDevimon-BT15-070.asset
  35. 2 2
      Assets/CardBaseEntity/BT15/Purple/Digimon/LadyDevimon-BT15-077.asset
  36. 2 2
      Assets/CardBaseEntity/BT15/Purple/Digimon/Loogamon-BT15-071.asset
  37. 2 2
      Assets/CardBaseEntity/BT15/Purple/Digimon/Loogarmon-BT15-075.asset
  38. 2 2
      Assets/CardBaseEntity/BT15/Purple/Digimon/Piedmon-BT15-079.asset
  39. 2 2
      Assets/CardBaseEntity/BT15/Purple/Option/VenomInfusion-BT15-099.asset
  40. 2 2
      Assets/CardBaseEntity/BT15/Red/DigiEgg/Yokomon-BT15-001.asset
  41. 2 2
      Assets/CardBaseEntity/BT15/Red/DigiEgg/Yokomon-BT15-001_P1.asset
  42. 2 2
      Assets/CardBaseEntity/BT15/Red/Digimon/Birdramon-BT15-013.asset
  43. 2 2
      Assets/CardBaseEntity/BT15/Red/Digimon/Biyomon-BT15-007.asset
  44. 2 2
      Assets/CardBaseEntity/BT15/Red/Digimon/Biyomon-BT15-007_P1.asset
  45. 2 2
      Assets/CardBaseEntity/BT15/Red/Digimon/Tyrannomon-BT15-011.asset
  46. 2 2
      Assets/CardBaseEntity/BT15/Red/Option/WingsofLove-BT15-088.asset
  47. 2 2
      Assets/CardBaseEntity/BT15/Red/Tamer/SoraTakenouchi-BT15-082.asset
  48. 2 2
      Assets/CardBaseEntity/BT15/Red/Tamer/SoraTakenouchi-BT15-082_P1.asset
  49. 2 2
      Assets/CardBaseEntity/BT15/White/Digimon/Apocalymon-BT15-102.asset
  50. 2 2
      Assets/CardBaseEntity/BT15/White/Digimon/Apocalymon-BT15-102_P1.asset
  51. 2 2
      Assets/CardBaseEntity/BT15/White/Digimon/Apocalymon-BT15-102_P2.asset
  52. 2 2
      Assets/CardBaseEntity/BT15/Yellow/Digimon/Bombermon-BT15-039.asset
  53. 2 2
      Assets/CardBaseEntity/BT15/Yellow/Digimon/Geremon-BT15-035.asset
  54. 2 2
      Assets/CardBaseEntity/BT15/Yellow/Digimon/Monzaemon(XAntibody)-BT15-040.asset
  55. 2 2
      Assets/CardBaseEntity/BT15/Yellow/Option/RevelationofLight-BT15-092.asset
  56. 213 72
      Assets/CardEffect/BT15/Black/Numemon_X_Antibody_BT15_057.cs
  57. 1 1
      Assets/CardEffect/BT15/Black/Omekamon_BT15_060.cs
  58. 23 125
      Assets/CardEffect/BT15/Black/WaruMonzaemon_BT15_065.cs
  59. 6 3
      Assets/CardEffect/BT15/Blue/MegaSeadramon_BT15_029.cs
  60. 4 7
      Assets/CardEffect/BT15/Blue/Plesiomon_X_Antibody_BT15_032.cs
  61. 7 3
      Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs
  62. 5 19
      Assets/CardEffect/BT15/Green/HerculesKabuterimon_BT15_053.cs
  63. 7 4
      Assets/CardEffect/BT15/Purple/Bakemon_BT15_073.cs
  64. 1 1
      Assets/CardEffect/BT15/Purple/LadyDevimon_BT15_077.cs
  65. 7 1
      Assets/CardEffect/BT15/Purple/Leviamon_X_Antibody_BT15_081.cs
  66. 1 1
      Assets/CardEffect/BT15/Purple/VenomMyotismon_BT15_080.cs
  67. 19 3
      Assets/CardEffect/BT15/Purple/WaruSeadramon_BT15_078.cs
  68. 6 1
      Assets/CardEffect/BT15/Red/Sora_Takenouchi_BT15_082.cs
  69. 77 125
      Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs
  70. 40 36
      Assets/CardEffect/BT15/Yellow/Holy_Arrow_BT15_093.cs
  71. 4 5
      Assets/CardEffect/BT15/Yellow/Kari_Kamiya_BT15_084.cs
  72. 11 11
      Assets/CardEffect/BT15/Yellow/Monzaemon_X_Antibody_BT15_040.cs
  73. 1 1
      Assets/CardEffect/LM/Blue/Thetismon_LM_004.cs
  74. 6 1
      Assets/CardEffect/LM/Green/Diarbbitmon_LM_013.cs
  75. 1 1
      Assets/CardEffect/LM/Green/Lamortmon_LM_012.cs
  76. 5 1
      Assets/CardEffect/LM/Purple/Gammamon_LM_016.cs
  77. 1 1
      Assets/CardEffect/LM/White/Bokomon_LM_019.cs
  78. 1 1
      Assets/CardEffect/RB1/White/AmanokawaHokuto_RB1_035.cs

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/Hagurumon-BT15-055.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9ea2ebc15a7cc30563251fce5a74191b75fc89f50422df646d61f50e0340dea
-size 1673
+oid sha256:15f847c897a8320dac82a70b78567fb7497e055fa660284550f04512a8af0c8b
+size 1668

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/Hisyaryumon-BT15-063.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12bd06dbeb0f78e19e70c14ddf60ed69e267a9ab37bbca21384e17b109b99c56
-size 2314
+oid sha256:25d9942c7d41afe47e6c9c3e8ed76c4914b82cc4bf8fd4a5fc197b892fd95968
+size 2313

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/Megadramon-BT15-064.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df021aef768c9076f30c118cfed99dccb2eb1a9faf61b2ce6cbc995ac6bd102c
-size 1925
+oid sha256:cc9b43b3c4e10ad69ebcec39b048b4f45554295fa6d05a24808dd2612ed373d5
+size 1916

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/Megadramon-BT15-064_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e88571c05ff7dccf4734880b9608d4d4116d0d172e94dbbccc8942b6bae67468
-size 1931
+oid sha256:3f95e0c591ffec24058a5860d3463be6a404127d088db1c58588977ee949457e
+size 1922

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/Numemon(XAntibody)-BT15-057.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f8daea2bd12476258c36a5343c7a8e1551fd220140146afbbfbe98535439592
-size 1898
+oid sha256:33c615a0d041c0e03b5590e9b210e5d28587d362062be0a354c5dfe63e981ee2
+size 1888

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/Ouryumon-BT15-067.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35214a62670a3ab8ff32f47972b38e1f0f569cc5b89a0d42f9fba7597cdba281
-size 1819
+oid sha256:24ff76ae7073e17faf58373a4d077d83058a7c08f0f69b2a3e3aa4a0f5ceb1a5
+size 1814

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Digimon/WaruMonzaemon-BT15-065.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3164a8768228f7945aad7360dc78a76a3665b073922c9b062199a64246187f09
-size 2157
+oid sha256:1547fb71b82cadd464021cfd7801b72a766c5afc2cc8e3a4a5c6588a1de3f7d4
+size 2142

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Option/SupremeConnection!-BT15-096.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f275e6b762bffdc46f6c91ca41ca0c40565e5a5e6e3fd2be70afb31f167ca227
-size 3031
+oid sha256:e324108a333a41af6b014ca1a3cc1094ceca680d28494a729acd9a1c6b7e5dc5
+size 3022

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Option/UltimateSlicer-BT15-097.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a2dd3eecea3de26894f69726538adc13b0ecdca394808a3b9cce4ee22115d44
-size 1655
+oid sha256:5311753cdeeac638d03faa3779631bf6ddeec9871014b410a84efb2f634e7e1e
+size 1650

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Tamer/MarvinJackson-BT15-086.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a0d5d100ae0304a2bbeaa1a441cafc5192b04406dfcd571fe61d53f2c515ac4
-size 3299
+oid sha256:1f5f038c76648c15f61a1eca7ac5fcfddd4dad93cd94870f223f2fc1fb63140f
+size 3284

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Tamer/MarvinJackson-BT15-086_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9176f93b7fb47f4e70ed7835a219a47dff777f8bdebcfa64e6069a65b5cfe29b
-size 3305
+oid sha256:1bde7d3d3c70173c943c417a797bd61e378d53516df3790a4e415be1427ae535
+size 3290

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Tamer/ShuuYulin-BT15-087.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b06b55a52216b798835f1175d30595f413042622c526a239bb7d16882d819cf4
-size 3029
+oid sha256:dac7e506a1982e91c16597d5cbbe659818cc2817e92fdeb8161eda8e14f9fbd4
+size 3023

+ 2 - 2
Assets/CardBaseEntity/BT15/Black/Tamer/ShuuYulin-BT15-087_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4f96bef32b47187794d16a80505a71de8b3e4310c574d801ab1a6ac312c8c71
-size 3035
+oid sha256:6dacb6c07703855eb647106560d22f8542a71c7a5c3a4661ca7a43919c5495b9
+size 3029

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/Garurumon-BT15-024.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39b2e3067791f8a250195ae569de5ed23a508d314dab77a9bbe334e851c8d3e1
-size 1755
+oid sha256:2be47d193f78282fc8bea4eae46313bf2a37cd1b8e046bb2b469b8356d74695c
+size 1740

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/Gomamon(XAntibody)-BT15-021.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17aa2776d03387fc46bfb2184f8abd75a650f9f7335894e27c9e336425d8af34
-size 1999
+oid sha256:72890e886759f35d5a9a226d11bbf623eb57e501a534a9c2626099b5b7b33b0a
+size 1994

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/MetalGarurumon-BT15-101.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fa9a8904e08f0685ed0bc3712a4ade7a207492ce50f470f2161661dc13f842b3
-size 1759
+oid sha256:0fec0b0780cb26e16ff131a4dda5639a5d9cec13f57c867d53dca8fcbc1bd7e8
+size 1754

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/MetalGarurumon-BT15-101_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72293ff5208ffd9043dbb2a801af1e63683cb6dee837b549cb887db3679a9327
-size 1765
+oid sha256:722bdb1c8b3dd039c9963e3cd5a0879722582f120b51bb79f5741640ab047bb3
+size 1760

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/MetalSeadramon-BT15-031.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9705a96f41ab110e8346ae44eb64ee3e96e4d59ebe45ba1c0089758fc28708e
-size 1940
+oid sha256:a7c55111696fd9ccb0da27c8d6ca15b47f70d706f60e849199973b3ca7ffd308
+size 1935

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Digimon/Scorpiomon-BT15-027.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94ff447adf968db5dc7cdb99040a53107f2d85257a8f6a0f8fac3aec78dea6d8
-size 1858
+oid sha256:844b0fbcb2b7733e8e87da500d56f44637a41c219f38a2e99736110c498fbc1c
+size 1853

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Option/FoxFire-BT15-090.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb5790a83749451a3a5fe58d5dbe9a6c0c0a12f9f4fc5a4735c97203e794275b
-size 1676
+oid sha256:0bc836042970a85294214cae058c3d89ed6f0222476514a49dfcd30995d58ff5
+size 1671

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Option/WolfofFriendship-BT15-091.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dda226603a84936e6a4242c6484515f03632366354463dbf0812ff0f4ee5814b
-size 2283
+oid sha256:120f2b0766cc339fcf4c85a49ce1f99c06941b2c7769ced70925c2344cf1fc9d
+size 2278

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Tamer/MattIshida-BT15-083.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61ad9c22c697e11164f2f21276a8aa382440700387bbfef1084b75acd2e03edc
-size 1747
+oid sha256:2fd4468c7a61d126ad2e193e85447e5da53050a99f25650304fe5760f3b7000e
+size 1742

+ 2 - 2
Assets/CardBaseEntity/BT15/Blue/Tamer/MattIshida-BT15-083_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39187022e17e2dcfe96964cfd77e3eb6db8a27606421ed3a151c96288918abee
-size 1753
+oid sha256:f44352791ab6fe40404501fabd8e7efb512fcb443eb17aea3f3b792881600731
+size 1748

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/DigiEgg/Motimon-BT15-004.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15937d21ddfaedd8edf0118e7b51d6916ffb548923a816c0e8f520fdc2a5a103
-size 1532
+oid sha256:01dd870844793ae04e0de30d9d586afd98c927ecd4ac686cb2c0de19a790ad0b
+size 1527

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/DigiEgg/Motimon-BT15-004_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a8c3d2973f9c4c25abe0de6514abecaf07b3fe155f28aec4e15a794077ab2e3
-size 1538
+oid sha256:30f90f62f4bc67fb697efbcdc8e74fe9c674435b58f0aed055e16d014d06961d
+size 1533

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Digimon/Cherrymon-BT15-050.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db03684b5b6f46d842f8bc742779f40a01aedd3b4ab33e74de808e0e897240c7
-size 2003
+oid sha256:eed111e695bfa1314fa05456c50cae9c3682aaddfc331c9937ce74f021b5dfc6
+size 1998

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Digimon/Puppetmon-BT15-052.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:00b127f71365db65bb7467f4366873993a346112f0ff0fc332fa426a94ccbdc6
-size 2089
+oid sha256:87816f63f2efc5d6a3da740b54d67af6ad11b4253164db10db9d0ba499af5175
+size 2084

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Digimon/Tentomon-BT15-043.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:beb6259f284154e74556ccf1e106abd15358531ac11413b0474ce3301b652f0a
-size 1737
+oid sha256:d9ad6d2f59f0a5e12c4e176a24e32929b6a2c1021919d7ec8a9cbb2037ff22ce
+size 1732

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Digimon/Tentomon-BT15-043_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab1155824a8250a813b8ac3826562188bd82355258f9346c07d7e829c7ccb676
-size 1743
+oid sha256:5da87b1c4008f84b3f2089d0817306dde90176f2c69f3c557fa9be79add96e79
+size 1738

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Option/ImpactofKnowledge-BT15-095.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f951f17409601604b4d5734a8fa0317d859c49e8f9b6edce691aba6bdbbf1897
-size 1905
+oid sha256:fb759184f85301cc032a3844e35d94c5fffbe3a08ef8dc10779b0a92661065d0
+size 1900

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Option/SuperShocker-BT15-094.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f97edef86aa211a91b3c196a2286cde7c1a1fec8a523de8a3cc93b848367a4a9
-size 1824
+oid sha256:c8cda3f9f01289f3b0742f3e38274f30d8424619eb5836cfdff7faa0eb894c16
+size 1815

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Tamer/IzzyIzumi-BT15-085.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f09e5a3c2202936760351523b87154e1473ac44a5a8c4ae35c032fd8c66b9bc
-size 1702
+oid sha256:b3aff931972b9e3b0b88217a524dd93d011747f4fa0ec7d704200a8ae5891a12
+size 1697

+ 2 - 2
Assets/CardBaseEntity/BT15/Green/Tamer/IzzyIzumi-BT15-085_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6f68479cc6899bc4b9253d54d6d15cca2aa82f46acb481ee4852a7a598afb1f
-size 1708
+oid sha256:b11592b0af34d1f9f625ee12bbbe1ed1162f9fb1fbfa75670533ec1fa660eda6
+size 1703

+ 2 - 2
Assets/CardBaseEntity/BT15/Purple/Digimon/DemiDevimon-BT15-070.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3fa07204f398ab5b416ebde1de2a138c6bd4da893c508ed76f7e5ea6a2e87553
-size 1768
+oid sha256:92ce26a5e77013b56a5bd0ec2abea5642afe867a33ffde17ea3335bbe0f57163
+size 1763

+ 2 - 2
Assets/CardBaseEntity/BT15/Purple/Digimon/LadyDevimon-BT15-077.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dde31f5a1f9718533d0211276e87da943595d5b5aa6465c4e5dcf38fc6e84557
-size 1928
+oid sha256:ffafaa70517c36653b7c8ee25fe471e589fd6dac20319ae295bcab95f252d21f
+size 1923

+ 2 - 2
Assets/CardBaseEntity/BT15/Purple/Digimon/Loogamon-BT15-071.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d3d9ada55d012f707473f61a6c1a86a8afb9e95cd592cb30e1c8f11d7606e06
-size 1818
+oid sha256:9cfad877fe12b1200943932cfd5bd3847d183738d937ddc4edd780fdeb150d92
+size 1813

+ 2 - 2
Assets/CardBaseEntity/BT15/Purple/Digimon/Loogarmon-BT15-075.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:721e13a0f87449ed8e2edc3fbc68865a4c867bbd848470182f0272fef3eb12a9
-size 1830
+oid sha256:91b94f72e9e510c747670870990df9987f09a6f9484b37f76611b5aa343d6000
+size 1825

+ 2 - 2
Assets/CardBaseEntity/BT15/Purple/Digimon/Piedmon-BT15-079.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e22fe613c9f24ccb65ed164d72624932c87fed0aa1f166568fc695278e98b15
-size 1935
+oid sha256:3ec2b539d34a86675b168793d8595458a72f6ad169f88f8938cfe8710b5b3406
+size 1930

+ 2 - 2
Assets/CardBaseEntity/BT15/Purple/Option/VenomInfusion-BT15-099.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa2366924039d4d609a64d6bc2f5a6d190cb04a7c462726557eaa63d04ed55fd
-size 1731
+oid sha256:6d3e8f7fda29a2a5bbd832c942af9bcd1342052c6f96e849b11142033e201423
+size 1726

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/DigiEgg/Yokomon-BT15-001.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6487d068fc7491296320004aa55eb77a16bda798ef8004046edb963aad7f6af
-size 1535
+oid sha256:0992877c6f6fe0c5e883618ff6f1ad68e135e8d3a28523d3f072adb886497b7d
+size 1510

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/DigiEgg/Yokomon-BT15-001_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c288ad490a77afa01967ba7b77c5071337dc1a36b381beaea1349acdb174cd82
-size 1541
+oid sha256:ef9ec7c13b8e3a9cdfd7ba246e2bb57210b3a9e8c22cec91298a98eecad1c7fa
+size 1516

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Digimon/Birdramon-BT15-013.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5aa9230309def673e279b7a6f9e4c8b56cf072c55b7a45e4dee4d0aaed0b87d8
-size 1713
+oid sha256:ff9dbbcebaeb95edd7e74b7c35948e38fcc1f76b05e77aeb7081d6a6e6f5ee59
+size 1688

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Digimon/Biyomon-BT15-007.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:779ea7b06ffd94881a1d9f5458d28b92af82f3390d9ced2ad558a68e32ac44e4
-size 1818
+oid sha256:f07cd1d758afe7a3e36224d593e1d4c91cc93b51f155417f571870728608e40c
+size 1790

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Digimon/Biyomon-BT15-007_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fec476536d0c4a36a559ee2728c2b461e5ec7e9109fed36b079c60ea57977d20
-size 1824
+oid sha256:66c70f1fbc199397a9eb95c0fcbd68a4ca0dfbbbf84b454cd452d65fb30bb4af
+size 1796

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Digimon/Tyrannomon-BT15-011.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3ce17e8f1a09cf4bc778d9a2140fd46596f5e29fa979f697ffea5c02a1babfc
-size 1581
+oid sha256:c6a250b726f8bcdf66a9c784bf6b6afb41cdad67d7d64dcdb1c0863b18e19fab
+size 1576

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Option/WingsofLove-BT15-088.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f3c5faffb57a0074c3dd9eeb6e42cc28701da114ebb890ed7da8fd0e0d53788
-size 2136
+oid sha256:9075989ed42145f807a7397a8856b3b94c43a74a797e4445a1201906489df882
+size 2131

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Tamer/SoraTakenouchi-BT15-082.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cf5b9363455c2c7b94633a466bcdc90c938b3c6ebbb02e88ce3babac6aa2699
-size 1982
+oid sha256:2e864ed24301cb4f172e727c232efbfacd339c1cfbca66b9e8400a359c78ab3f
+size 1956

+ 2 - 2
Assets/CardBaseEntity/BT15/Red/Tamer/SoraTakenouchi-BT15-082_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70957558d7b1639007243066afb499571d3bf03aaac7ab50296152fc681681fd
-size 1988
+oid sha256:cdb2fa56863bc3a83083716652bb2d5c3ddd924360867f6bf7cdca1b7067ff13
+size 1962

+ 2 - 2
Assets/CardBaseEntity/BT15/White/Digimon/Apocalymon-BT15-102.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f28b00090602391892cf5746619ed8c597f8302065e9410d713fdb3f6e819c00
-size 1841
+oid sha256:61713037ad7b66866231aafe50aa61fa9da5aa1fbe29869cc89b8ff4284ad2c5
+size 1836

+ 2 - 2
Assets/CardBaseEntity/BT15/White/Digimon/Apocalymon-BT15-102_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:869e21b3c4c546ea2ddd20ed4c0be426a719d167027e42c033d235e71b4cb393
-size 1847
+oid sha256:dc6b214ac613e3ac0ead976fdfd72785f2a178f69c28b3b6f67e471aeba5a087
+size 1842

+ 2 - 2
Assets/CardBaseEntity/BT15/White/Digimon/Apocalymon-BT15-102_P2.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c8baef59d0846aa889cd66b61ae39814560ba7905e226ac8c6090c4f232c7fe
-size 1847
+oid sha256:4d306775541f4ad0612e2fa1d9fa30b189b34600c6c66ebb69ac16e4d4ce5138
+size 1842

+ 2 - 2
Assets/CardBaseEntity/BT15/Yellow/Digimon/Bombermon-BT15-039.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05afc681090fa1d803487afe4561a22d72c23d954c51322c3c83a485eef0df06
-size 1947
+oid sha256:5e39c88ee66f9d4c7d927cd09bd44c7f6db0f5a5058114d0f7aa4039fb847187
+size 1933

+ 2 - 2
Assets/CardBaseEntity/BT15/Yellow/Digimon/Geremon-BT15-035.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c260341926cdae2933efa3c638a70b996ede85152eda203551afc259d22eea05
-size 1843
+oid sha256:57dcb775c13be83d8f6189507151894ee5b856b4c2781ffd88fdd689a58c4799
+size 1838

+ 2 - 2
Assets/CardBaseEntity/BT15/Yellow/Digimon/Monzaemon(XAntibody)-BT15-040.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:acde304dede5e647531a4f6a8bf9eb311324cb135a1d127238ad475b5cad3e76
-size 1726
+oid sha256:47ff73b8e470f83dd5e52838079228b192c5859f5d53c98ffc485cdab5b73403
+size 1721

+ 2 - 2
Assets/CardBaseEntity/BT15/Yellow/Option/RevelationofLight-BT15-092.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ce54a89a158adec15a3afe9c3804a769a43419edaddf7cbeb1e3e0c5c97d017
-size 2049
+oid sha256:b337cc12271571b5d58770f8e84ab2e897ff1ef3aa84c863d5227d3c0434ac61
+size 2044

+ 213 - 72
Assets/CardEffect/BT15/Black/Numemon_X_Antibody_BT15_057.cs

@@ -13,117 +13,258 @@ public class Numemon_X_Antibody_BT15_057 : CEntity_Effect
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-        if(timing == EffectTiming.None)
+        #region Alternate Digivolution Requirement
+        if (timing == EffectTiming.None)
         {
             static bool PermanentCondition(Permanent targetPermanent)
             {
-                return targetPermanent.TopCard.CardNames.Contains("Numemon") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4 && targetPermanent.TopCard.HasXAntibodyTraits == false;
+                return targetPermanent.TopCard.ContainsCardName("Numemon") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4 && targetPermanent.TopCard.HasXAntibodyTraits == false;
             }
 
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
         }
+        #endregion
 
-        if(timing == EffectTiming.OnDestroyedAnyone)
+        #region All Turns
+        if(timing == EffectTiming.None)
         {
+            bool CardSourceCondition(CardSource cardSource)
+            {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
-                    if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.ContainsCardName("Numemon")) >= 1 || card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("XAntibody")) >= 1)
+
+                    if (card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.ContainsCardName("Numemon")) >= 1)
                     {
-                        ActivateClass activateClass = new ActivateClass();
-                        activateClass.SetUpICardEffect("Play 1 [Numemon] from trash", CanUseCondition, card);
-                        activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
-                        cardEffects.Add(activateClass);
+                        return true;
+                    }
 
-                        string EffectDiscription()
-                        {
-                            return "[On Deletion] You may play 1 Digimon with [Numemon] in it's name from your trash suspended without paying its memory cost.";
-                        }
+                    if(card.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.CardNames.Contains("XAntibody")) >= 1)
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            AddSkillClass addSkillClass = new AddSkillClass();
+            addSkillClass.SetUpICardEffect("Play 1 [Numemon] from trash", CanUseCondition, card);
+            addSkillClass.SetUpAddSkillClass(cardSourceCondition: CardSourceCondition, getEffects: GetEffects);
+            card.Owner.UntilOpponentTurnEndEffects.Add((_timing) => addSkillClass);
+
+            bool CanUseCondition(Hashtable hashtable)
+            {
+                return true;
+            }
+
+            List<ICardEffect> GetEffects(CardSource cardSource, List<ICardEffect> cardEffects, EffectTiming _timing)
+            {
+                if (_timing == EffectTiming.OnDestroyedAnyone)
+                {
+                    ActivateClass activateDeletion = new ActivateClass();
+                    activateDeletion.SetUpICardEffect("Play 1 [Numemon] from trash", CanUseOnDeletion, cardSource);
+                    activateDeletion.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+                    cardEffects.Add(activateDeletion);
+
+                    if (cardSource.PermanentOfThisCard() != null)
+                    {
+                        activateDeletion.SetEffectSourcePermanent(cardSource.PermanentOfThisCard());
+                    }
+
+                    string EffectDiscription()
+                    {
+                        return "[On Deletion] You may play 1 Digimon with [Numemon] in it's name from your trash suspended without paying its memory cost.";
+                    }
 
-                        bool CanSelectCardCondition(CardSource cardSource)
+                    bool CanSelectCardCondition(CardSource cardSource)
+                    {
+                        if (cardSource != null)
                         {
-                            if (cardSource != null)
+                            if (cardSource.Owner == card.Owner)
                             {
-                                if (cardSource.Owner == card.Owner)
+                                if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateDeletion))
                                 {
-                                    if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
+                                    if (cardSource.CardNames.Contains("Numemon"))
                                     {
-                                        if (cardSource.CardNames.Contains("Numemon"))
-                                        {
-                                            return true;
-                                        }
+                                        return true;
                                     }
                                 }
                             }
-
-                            return false;
                         }
 
-                        bool CanUseCondition(Hashtable hashtable)
+                        return false;
+                    }
+
+                    bool CanUseOnDeletion(Hashtable hashtable)
+                    {
+                        return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                    }
+
+                    bool CanActivateCondition(Hashtable hashtable)
+                    {
+                        if (CardEffectCommons.CanActivateOnDeletion(card))
                         {
-                            return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+                            if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
+                            {
+                                return true;
+                            }
                         }
 
-                        bool CanActivateCondition(Hashtable hashtable)
+                        return false;
+                    }
+
+                    IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                    {
+                        if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
                         {
-                            if (CardEffectCommons.CanActivateOnDeletion(card))
+                            int maxCount = Math.Min(1, card.Owner.TrashCards.Count((cardSource) => CanSelectCardCondition(cardSource)));
+
+                            List<CardSource> selectedCards = new List<CardSource>();
+
+                            SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
+                            selectCardEffect.SetUp(
+                                        canTargetCondition: CanSelectCardCondition,
+                                        canTargetCondition_ByPreSelecetedList: null,
+                                        canEndSelectCondition: null,
+                                        canNoSelect: () => true,
+                                        selectCardCoroutine: SelectCardCoroutine,
+                                        afterSelectCardCoroutine: null,
+                                        message: "Select 1 card to play.",
+                                        maxCount: maxCount,
+                                        canEndNotMax: false,
+                                        isShowOpponent: true,
+                                        mode: SelectCardEffect.Mode.Custom,
+                                        root: SelectCardEffect.Root.Trash,
+                                        customRootCardList: null,
+                                        canLookReverseCard: true,
+                                        selectPlayer: card.Owner,
+                                        cardEffect: activateDeletion);
+
+                            selectCardEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
+                            selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
+
+                            yield return StartCoroutine(selectCardEffect.Activate());
+
+                            IEnumerator SelectCardCoroutine(CardSource cardSource)
                             {
-                                if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
-                                {
-                                    return true;
-                                }
+                                selectedCards.Add(cardSource);
+
+                                yield return null;
                             }
 
-                            return false;
+                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateDeletion, payCost: false, isTapped: false, root: SelectCardEffect.Root.Trash, activateETB: true));
                         }
+                    }
+                }
 
-                        IEnumerator ActivateCoroutine(Hashtable _hashtable)
-                        {
-                            if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
-                            {
-                                int maxCount = Math.Min(1, card.Owner.TrashCards.Count((cardSource) => CanSelectCardCondition(cardSource)));
-
-                                List<CardSource> selectedCards = new List<CardSource>();
-
-                                SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
-                                selectCardEffect.SetUp(
-                                            canTargetCondition: CanSelectCardCondition,
-                                            canTargetCondition_ByPreSelecetedList: null,
-                                            canEndSelectCondition: null,
-                                            canNoSelect: () => true,
-                                            selectCardCoroutine: SelectCardCoroutine,
-                                            afterSelectCardCoroutine: null,
-                                            message: "Select 1 card to play.",
-                                            maxCount: maxCount,
-                                            canEndNotMax: false,
-                                            isShowOpponent: true,
-                                            mode: SelectCardEffect.Mode.Custom,
-                                            root: SelectCardEffect.Root.Trash,
-                                            customRootCardList: null,
-                                            canLookReverseCard: true,
-                                            selectPlayer: card.Owner,
-                                            cardEffect: activateClass);
-
-                                selectCardEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
-                                selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
-
-                                yield return StartCoroutine(selectCardEffect.Activate());
-
-                                IEnumerator SelectCardCoroutine(CardSource cardSource)
-                                {
-                                    selectedCards.Add(cardSource);
+                return cardEffects;
+            }
+        }
+        #endregion
 
-                                    yield return null;
-                                }
+        #region On Deletion - Inherited Effect
+        if (timing == EffectTiming.OnDestroyedAnyone)
+        {
+            ActivateClass activateDeletion = new ActivateClass();
+            activateDeletion.SetUpICardEffect("Play 1 [Numemon] from trash", CanUseOnDeletion, card);
+            activateDeletion.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
+            activateDeletion.SetIsInheritedEffect(true);
+            activateDeletion.SetHashString("Play1NumemonFromTrash_BT15_057");
+            cardEffects.Add(activateDeletion);
+
+            if (card.PermanentOfThisCard() != null)
+            {
+                activateDeletion.SetEffectSourcePermanent(card.PermanentOfThisCard());
+            }
 
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: false, isTapped: false, root: SelectCardEffect.Root.Trash, activateETB: true));
+            string EffectDiscription()
+            {
+                return "[On Deletion] You may play 1 Digimon with [Numemon] in it's name from your trash suspended without paying its memory cost.";
+            }
+
+            bool CanSelectCardCondition(CardSource cardSource)
+            {
+                if (cardSource != null)
+                {
+                    if (cardSource.Owner == card.Owner)
+                    {
+                        if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateDeletion))
+                        {
+                            if (cardSource.CardNames.Contains("Numemon"))
+                            {
+                                return true;
                             }
                         }
-                        
                     }
                 }
+
+                return false;
+            }
+
+            bool CanUseOnDeletion(Hashtable hashtable)
+            {
+                return CardEffectCommons.CanTriggerOnDeletion(hashtable, card);
+            }
+
+            bool CanActivateCondition(Hashtable hashtable)
+            {
+                if (CardEffectCommons.CanActivateOnDeletion(card))
+                {
+                    if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+
+            IEnumerator ActivateCoroutine(Hashtable _hashtable)
+            {
+                if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, (cardSource) => CanSelectCardCondition(cardSource)))
+                {
+                    int maxCount = Math.Min(1, card.Owner.TrashCards.Count((cardSource) => CanSelectCardCondition(cardSource)));
+
+                    List<CardSource> selectedCards = new List<CardSource>();
+
+                    SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
+                    selectCardEffect.SetUp(
+                                canTargetCondition: CanSelectCardCondition,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                canNoSelect: () => true,
+                                selectCardCoroutine: SelectCardCoroutine,
+                                afterSelectCardCoroutine: null,
+                                message: "Select 1 card to play.",
+                                maxCount: maxCount,
+                                canEndNotMax: false,
+                                isShowOpponent: true,
+                                mode: SelectCardEffect.Mode.Custom,
+                                root: SelectCardEffect.Root.Trash,
+                                customRootCardList: null,
+                                canLookReverseCard: true,
+                                selectPlayer: card.Owner,
+                                cardEffect: activateDeletion);
+
+                    selectCardEffect.SetUpCustomMessage("Select 1 card to play.", "The opponent is selecting 1 card to play.");
+                    selectCardEffect.SetUpCustomMessage_ShowCard("Played Card");
+
+                    yield return StartCoroutine(selectCardEffect.Activate());
+
+                    IEnumerator SelectCardCoroutine(CardSource cardSource)
+                    {
+                        selectedCards.Add(cardSource);
+
+                        yield return null;
+                    }
+
+                    yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateDeletion, payCost: false, isTapped: false, root: SelectCardEffect.Root.Trash, activateETB: true));
+                }
+            }
         }
-        
+        #endregion
 
         return cardEffects;
     }

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

@@ -14,7 +14,7 @@ public class Omekamon_BT15_060 : CEntity_Effect
 
         if(timing == EffectTiming.None)
         {
-            cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: true, card: card, condition: null));
+            cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
         }
 
         if(timing == EffectTiming.None)

+ 23 - 125
Assets/CardEffect/BT15/Black/WaruMonzaemon_BT15_065.cs

@@ -13,21 +13,25 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
-        if(timing == EffectTiming.None)
+        #region Alternate Digivolution Requirement
+        if (timing == EffectTiming.None)
         {
             static bool PermanentCondition(Permanent targetPermanent)
             {
-                return targetPermanent.TopCard.CardNames.Contains("Numemon") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
+                return targetPermanent.TopCard.ContainsCardName("Numemon") && targetPermanent.TopCard.HasLevel && targetPermanent.TopCard.Level == 4;
             }
 
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 3, ignoreDigivolutionRequirement: false, card: card, condition: null));
         }
+        #endregion
 
-        if(timing == EffectTiming.OnEnterFieldAnyone)
+        #region On Play - Place a card under this Digimon to gain effects.
+        if (timing == EffectTiming.OnEnterFieldAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Place a card under this Digimon to gain effects.", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+            activateClass.SetHashString("CantAttack_BT15_065");
             cardEffects.Add(activateClass);
 
             string EffectDiscription()
@@ -120,7 +124,7 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
                         {
                             if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(Attacker, card))
                             {
-                                if (Attacker.TopCard.GetCostItself >= 5)
+                                if (Attacker.TopCard.GetCostItself <= 5)
                                 {
                                     if (Attacker.TopCard.HasPlayCost)
                                     {
@@ -147,13 +151,15 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
                 }
             }
         }
+        #endregion
 
-        //On Play
+        #region On Play/When Digivolving - Trash 1 card from hand to DeDigivolve an opponent's Digimon.
         if (timing == EffectTiming.OnEnterFieldAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Trash 1 card from hand to DeDigivolve an opponent's Digimon.", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
+            activateClass.SetHashString("DeDigivolve_BT15_065");
             cardEffects.Add(activateClass);
 
             string EffectDiscription()
@@ -173,8 +179,8 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
 
             bool CanSelectPermanentCondition(Permanent permanent)
             {
-                if(permanent.TopCard.IsDigimon)
-                {
+                if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                { 
                     if (permanent.TopCard.HasLevel)
                     {
                         return true;
@@ -185,7 +191,7 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
 
             bool CanUseCondition(Hashtable hashtable)
             {
-                return CardEffectCommons.CanTriggerOnPlay(hashtable, card);
+                return CardEffectCommons.CanTriggerOnPlay(hashtable, card) || CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
             }
 
             bool CanActivateCondition(Hashtable hashtable)
@@ -271,140 +277,32 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
                     }
                 }
             }
-
-
         }
+        #endregion
 
-
-        //On Digivolve
-        if (timing == EffectTiming.OnEnterFieldAnyone)
+        #region Your Turn - When you have a [Monzaemon] or [Numemon] in play, this Digimon gains Security Atk +1.
+        if (timing == EffectTiming.None)
         {
-            ActivateClass activateClass = new ActivateClass();
-            activateClass.SetUpICardEffect("Trash 1 card from hand to DeDigivolve an opponent's Digimon.", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
-            cardEffects.Add(activateClass);
-
-            string EffectDiscription()
-            {
-                return "[When Digivolving] By trashing 1 card with [Numemon] in it's name in your hand or from the bottom of this Digimon's digivolution cards, [De-Digivolve 1] 1 of your opponent's Digimon.";
-            }
-
-            bool CanSelectCardCondition(CardSource cardSource)
-            {
-                if (cardSource.ContainsCardName("Numemon") || cardSource.PermanentOfThisCard().DigivolutionCards.Count((cardSource) => cardSource.ContainsCardName("Numemon")) >= 1)
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
-            bool CanSelectPermanentCondition(Permanent permanent)
-            {
-                return CardEffectCommons.IsPermanentExistsOnOpponentBattleArea(permanent, card);
-            }
-
-            bool CanUseCondition(Hashtable hashtable)
-            {
-                return CardEffectCommons.CanTriggerWhenDigivolving(hashtable, card);
-            }
-
-            bool CanActivateCondition(Hashtable hashtable)
+            bool PermanentCondition(Permanent permanent)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card))
+                if(permanent.IsDigimon)
                 {
-                    if (card.Owner.HandCards.Count >= 1)
+                    if (permanent.TopCard != card)
                     {
-                        return true;
+                        return permanent.TopCard.ContainsCardName("Monzaemon") || permanent.TopCard.ContainsCardName("Numemon");
                     }
                 }
 
                 return false;
             }
 
-            IEnumerator ActivateCoroutine(Hashtable _hashtable)
-            {
-                if (card.Owner.HandCards.Count(CanSelectCardCondition) >= 1)
-                {
-                    bool discarded = false;
-
-                    int discardCount = 1;
-
-                    SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                    selectHandEffect.SetUp(
-                        selectPlayer: card.Owner,
-                        canTargetCondition: CanSelectCardCondition,
-                        canTargetCondition_ByPreSelecetedList: null,
-                        canEndSelectCondition: null,
-                        maxCount: discardCount,
-                        canNoSelect: true,
-                        canEndNotMax: false,
-                        isShowOpponent: true,
-                        selectCardCoroutine: null,
-                        afterSelectCardCoroutine: AfterSelectCardCoroutine,
-                        mode: SelectHandEffect.Mode.Discard,
-                        cardEffect: activateClass);
-
-                    yield return StartCoroutine(selectHandEffect.Activate());
-
-                    IEnumerator AfterSelectCardCoroutine(List<CardSource> cardSources)
-                    {
-                        if (cardSources.Count >= 1)
-                        {
-                            discarded = true;
-
-                            yield return null;
-                        }
-                    }
-
-                    if (discarded)
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: SelectPermanentCoroutine,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Custom,
-                                cardEffect: activateClass);
-
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to De-Digivolve.", "The opponent is selecting 1 Digimon to De-Digivolve.");
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-
-                            IEnumerator SelectPermanentCoroutine(Permanent permanent)
-                            {
-                                Permanent selectedPermanent = permanent;
-
-                                yield return ContinuousController.instance.StartCoroutine(new IDegeneration(selectedPermanent, 1, activateClass).Degeneration());
-                            }
-                        }
-                    }
-                }
-            }
-
-            
-        }
-
-        if (timing == EffectTiming.None)
-        {
             bool Condition()
             {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
                     if (CardEffectCommons.IsOwnerTurn(card))
                     {
-                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, (permanent) => permanent.IsDigimon && permanent.TopCard.ContainsCardName("Monzaemon") || permanent.TopCard.ContainsCardName("Numemon")))
+                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentCondition))
                         {
                             return true;
                         }
@@ -416,7 +314,7 @@ public class WaruMonzaemon_BT15_065 : CEntity_Effect
 
             cardEffects.Add(CardEffectFactory.ChangeSelfSAttackStaticEffect(changeValue: 1, isInheritedEffect: true, card: card, condition: Condition));
         }
-
+        #endregion
 
         return cardEffects;
     }

+ 6 - 3
Assets/CardEffect/BT15/Blue/MegaSeadramon_BT15_029.cs

@@ -162,10 +162,13 @@ public class MegaSeadramon_BT15_029 : CEntity_Effect
             {
                 if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                 {
-                    if (permanent.TopCard.CardColors.Contains(CardColor.Blue))
+                    if(permanent != card.PermanentOfThisCard())
                     {
-                        if (!permanent.TopCard.Equals(card))
-                            return true;
+                        if (permanent.TopCard.CardColors.Contains(CardColor.Blue))
+                        {
+                            if (!permanent.TopCard.Equals(card))
+                                return true;
+                        }
                     }
                 }
 

+ 4 - 7
Assets/CardEffect/BT15/Blue/Plesiomon_X_Antibody_BT15_032.cs

@@ -39,7 +39,7 @@ public class Plesiomon_X_Antibody_BT15_032 : CEntity_Effect
 
             string EffectDiscription()
             {
-                return "[When Digivolving] Return 1 of your opponent's Digimon to the bottom of their deck. (Trash all of the digivolution cards of that Digimon.)";
+                return "[When Digivolving] [When Attacking] [Once per Turn] Return 1 of your opponent's Digimon with as many or fewer digivolution cards as this Digimon to the hand.";
             }
 
             bool CanSelectPermanentCondition(Permanent permanent)
@@ -115,14 +115,11 @@ public class Plesiomon_X_Antibody_BT15_032 : CEntity_Effect
 
             bool PermanentCondition(Permanent permanent)
             {
-                if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                if (CardEffectCommons.IsOpponentPermanent(permanent, card))
                 {
-                    if (CardEffectCommons.IsExistOnBattleArea(card))
+                    if (permanent.DigivolutionCards.Count <= card.PermanentOfThisCard().DigivolutionCards.Count)
                     {
-                        if (permanent.DigivolutionCards.Count <= card.PermanentOfThisCard().DigivolutionCards.Count)
-                        {
-                            return true;
-                        }
+                        return true;
                     }
                 }
 

+ 7 - 3
Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs

@@ -21,7 +21,7 @@ public class Pukumon_BT15_030 : CEntity_Effect
         if (timing == EffectTiming.OnEnterFieldAnyone || timing == EffectTiming.OnDestroyedAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
-            activateClass.SetUpICardEffect("Trash digivolution cards and retuen 1 Digimon without digivolution cards to the deck bottom", CanUseCondition, card);
+            activateClass.SetUpICardEffect("Trash digivolution cards and return 1 Digimon without digivolution cards to the deck bottom", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
             cardEffects.Add(activateClass);
 
@@ -73,10 +73,14 @@ public class Pukumon_BT15_030 : CEntity_Effect
                         return true;
                     }
 
-                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
+                    if (CardEffectCommons.CanActivateOnDeletion(card))
                     {
-                        return true;
+                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                        {
+                            return true;
+                        }
                     }
+                    
                 }
 
                 return false;

+ 5 - 19
Assets/CardEffect/BT15/Green/HerculesKabuterimon_BT15_053.cs

@@ -29,7 +29,7 @@ public class HerculesKabuterimon_BT15_053 : CEntity_Effect
                 return CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card);
             }
 
-            bool CanSelectPermanentCondition1(Permanent permanent)
+            bool CanSelectOwnerPermanentCondition(Permanent permanent)
             {
                 return CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
             }
@@ -54,21 +54,7 @@ public class HerculesKabuterimon_BT15_053 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card))
-                {
-                    if (timing != EffectTiming.OnEnterFieldAnyone)
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                            return true;
-                    }
-                    else
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
-                            return true;
-                    }
-                }
-
-                return false;
+                return CardEffectCommons.IsExistOnBattleArea(card);
             }
 
             IEnumerator ActivateCoroutine(Hashtable _hashtable)
@@ -95,15 +81,15 @@ public class HerculesKabuterimon_BT15_053 : CEntity_Effect
                     yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                 }
 
-                if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
+                if (CardEffectCommons.HasMatchConditionPermanent(CanSelectOwnerPermanentCondition))
                 {
-                    int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
+                    int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectOwnerPermanentCondition));
 
                     SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
                     selectPermanentEffect.SetUp(
                         selectPlayer: card.Owner,
-                        canTargetCondition: CanSelectPermanentCondition1,
+                        canTargetCondition: CanSelectOwnerPermanentCondition,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
                         maxCount: maxCount,

+ 7 - 4
Assets/CardEffect/BT15/Purple/Bakemon_BT15_073.cs

@@ -31,14 +31,17 @@ public class Bakemon_BT15_073 : CEntity_Effect
 
             bool CanActivateCondition(Hashtable hashtable)
             {
-                if (CardEffectCommons.IsExistOnBattleArea(card) || CardEffectCommons.CanActivateOnDeletion(card))
+                if (card.Owner.LibraryCards.Count >= 1 || card.Owner.HandCards.Count >= 1)
                 {
-                    if (card.Owner.LibraryCards.Count >= 1)
+                    if(CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        return true;
+                        if (card.Owner.GetBattleAreaDigimons().Contains(card.PermanentOfThisCard()))
+                        {
+                            return true;
+                        }
                     }
 
-                    if (card.Owner.HandCards.Count >= 1)
+                    if (CardEffectCommons.CanActivateOnDeletion(card))
                     {
                         return true;
                     }

+ 1 - 1
Assets/CardEffect/BT15/Purple/LadyDevimon_BT15_077.cs

@@ -230,7 +230,7 @@ public class LadyDevimon_BT15_077 : CEntity_Effect
         #endregion
 
         //Inherited Effect
-        if (timing == EffectTiming.OnDetermineDoSecurityCheck)
+        if (timing == EffectTiming.None)
         {
             cardEffects.Add(CardEffectFactory.RetaliationSelfEffect(isInheritedEffect: true, card: card, condition: null));
         }

+ 7 - 1
Assets/CardEffect/BT15/Purple/Leviamon_X_Antibody_BT15_081.cs

@@ -255,12 +255,18 @@ public class Leviamon_X_Antibody_BT15_081 : CEntity_Effect
                 return false;
             }
             #endregion
+            
+            bool PermanentCondition(Permanent permanent)
+            {
+                return (permanent.IsDigimon || permanent.IsTamer);
+            }
 
             bool CanUseCondition(Hashtable hashtable)
             {
                 if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                 {
-                    if(card.Owner.GetBattleAreaPermanents().Count <= card.Owner.Enemy.GetBattleAreaPermanents().Count)
+
+                    if(card.Owner.GetBattleAreaPermanents().Count(PermanentCondition) <= card.Owner.Enemy.GetBattleAreaPermanents().Count(PermanentCondition))
                     {
                         return true;
                     }

+ 1 - 1
Assets/CardEffect/BT15/Purple/VenomMyotismon_BT15_080.cs

@@ -17,7 +17,7 @@ public class VenomMyotismon_BT15_080 : CEntity_Effect
             cardEffects.Add(CardEffectFactory.BlockerSelfStaticEffect(isInheritedEffect: false, card: card, condition: null));
         }
 
-        if (timing == EffectTiming.OnEnterFieldAnyone)
+        if (timing == EffectTiming.OnEnterFieldAnyone || timing == EffectTiming.OnDestroyedAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Delete 1 level 5 or lower Digimon", CanUseCondition, card);

+ 19 - 3
Assets/CardEffect/BT15/Purple/WaruSeadramon_BT15_078.cs

@@ -244,7 +244,7 @@ public class WaruSeadramon_BT15_078 : CEntity_Effect
                         yield return null;
                     }
 
-                    if(selectedCards.Count > 0)
+                    if (selectedCards.Count > 0)
                     {
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(
                                                 cardSources: selectedCards,
@@ -254,10 +254,26 @@ public class WaruSeadramon_BT15_078 : CEntity_Effect
                                                 root: SelectCardEffect.Root.Trash,
                                                 activateETB: false));
 
-                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.attackProcess.SwitchDefender(
+                        List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
+                    {
+                        new SelectionElement<bool>(message: $"Redirect Attack", value : true, spriteIndex: 0),
+                        new SelectionElement<bool>(message: $"Continue Attack", value : false, spriteIndex: 1),
+                    };
+
+                        string selectPlayerMessage = "Would you like to redirect the attack?";
+                        string notSelectPlayerMessage = "The opponent is selecting whether to redirect the attack.";
+
+                        GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
+
+                        yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
+
+                        if (GManager.instance.userSelectionManager.SelectedBoolValue)
+                        {
+                            yield return ContinuousController.instance.StartCoroutine(GManager.instance.attackProcess.SwitchDefender(
                                 activateClass,
                                 false,
                                 selectedCards[0].PermanentOfThisCard()));
+                        }
                     }
                 }
             }
@@ -265,7 +281,7 @@ public class WaruSeadramon_BT15_078 : CEntity_Effect
         #endregion
 
         //Inherited Effect
-        if (timing == EffectTiming.OnDetermineDoSecurityCheck)
+        if (timing == EffectTiming.None)
         {
             cardEffects.Add(CardEffectFactory.RetaliationSelfEffect(isInheritedEffect: true, card: card, condition: null));
         }

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

@@ -36,7 +36,12 @@ public class Sora_Takenouchi_BT15_082 : CEntity_Effect
 
             bool CardReturnedCondition(CardSource cardSource)
             {
-                return cardSource.CardColors.Contains(CardColor.Red);
+                if(cardSource.Owner == card.Owner)
+                {
+                    return cardSource.CardColors.Contains(CardColor.Red);
+                }
+
+                return false;
             }
 
             bool CanUseCondition(Hashtable hashtable)

+ 77 - 125
Assets/CardEffect/BT15/White/Apocalymon_BT15_102.cs

@@ -292,7 +292,7 @@ public class Apocalymon_BT15_102 : CEntity_Effect
                 {
                     if (cardSource.HasLevel)
                     {
-                        if(cardSource.Level == 6)
+                        if(cardSource.Level <= 6)
                         {
                             return true;
                         }
@@ -332,66 +332,18 @@ public class Apocalymon_BT15_102 : CEntity_Effect
             {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
-                    bool canSelectTrash = CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition);
-
-                    if (canSelectTrash)
-                    {
-                        List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
-                        {
-                            new SelectionElement<bool>(message: $"From hand", value : true, spriteIndex: 0),
-                            new SelectionElement<bool>(message: $"From trash", value : false, spriteIndex: 1),
-                        };
-
-                        string selectPlayerMessage = "From which area do you select a card?";
-                        string notSelectPlayerMessage = "The opponent is choosing from which area to select a card.";
-
-                        GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
-                    }
-
-                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
-
-                    bool fromHand = GManager.instance.userSelectionManager.SelectedBoolValue;
-
-                    List<CardSource> selectedCards = new List<CardSource>();
-
-                    IEnumerator SelectCardCoroutine(CardSource cardSource)
-                    {
-                        selectedCards.Add(cardSource);
-
-                        yield return null;
-                    }
-
-                    if (fromHand)
+                    if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, CanSelectCardCondition))
                     {
-                        int maxCount = 1;
-
-                        SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                        selectHandEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: CanSelectCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: true,
-                            canEndNotMax: false,
-                            isShowOpponent: true,
-                            selectCardCoroutine: SelectCardCoroutine,
-                            afterSelectCardCoroutine: null,
-                            mode: SelectHandEffect.Mode.Custom,
-                            cardEffect: activateClass);
+                        int maxCount = Math.Min(1, card.Owner.TrashCards.Count((cardSource) => CanSelectCardCondition(cardSource)));
 
-                        selectHandEffect.SetUpCustomMessage(
-                            "Select 1 card to place on bottom of digivolution cards.",
-                            "The opponent is selecting 1 card to place on bottom of digivolution cards.");
-                        selectHandEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
+                        List<CardSource> selectedCards = new List<CardSource>();
 
-                        yield return StartCoroutine(selectHandEffect.Activate());
-                    }
+                        IEnumerator SelectCardCoroutine(CardSource cardSource)
+                        {
+                            selectedCards.Add(cardSource);
 
-                    else
-                    {
-                        int maxCount = 1;
+                            yield return null;
+                        }
 
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
@@ -419,96 +371,96 @@ public class Apocalymon_BT15_102 : CEntity_Effect
                         selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
 
                         yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-                    }
 
-                    CardSource selectedCard = null;
+                        CardSource selectedCard = null;
 
-                    if (selectedCards.Count >= 1)
-                    {
-                        if (CardEffectCommons.IsExistOnBattleArea(card))
+                        if (selectedCards.Count >= 1)
                         {
-                            yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(
-                                selectedCards,
-                                activateClass));
+                            if (CardEffectCommons.IsExistOnBattleArea(card))
+                            {
+                                yield return ContinuousController.instance.StartCoroutine(card.PermanentOfThisCard().AddDigivolutionCardsBottom(
+                                    selectedCards,
+                                    activateClass));
 
-                            selectedCard = selectedCards[0];
+                                selectedCard = selectedCards[0];
+                            }
                         }
-                    }
-
-                    if (selectedCard != null)
-                    {
-                        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)
+                        if (selectedCard != null)
                         {
-                            ICardEffect selectedEffect = null;
+                            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)
+                            if (candidateEffects.Count >= 1)
                             {
-                                selectedEffect = candidateEffects[0];
-                            }
+                                ICardEffect selectedEffect = null;
 
-                            else
-                            {
-                                List<SkillInfo> skillInfos = candidateEffects
-                                    .Map(cardEffect => new SkillInfo(cardEffect, null, EffectTiming.None));
-
-                                List<CardSource> cardSources = candidateEffects
-                                    .Map(cardEffect => cardEffect.EffectSourceCard);
-
-                                SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
-                                selectCardEffect.SetUp(
-                                    canTargetCondition: (cardSource) => true,
-                                    canTargetCondition_ByPreSelecetedList: null,
-                                    canEndSelectCondition: null,
-                                    canNoSelect: () => false,
-                                    selectCardCoroutine: null,
-                                    afterSelectCardCoroutine: null,
-                                    message: "Select 1 effect to activate.",
-                                    maxCount: 1,
-                                    canEndNotMax: false,
-                                    isShowOpponent: false,
-                                    mode: SelectCardEffect.Mode.Custom,
-                                    root: SelectCardEffect.Root.Custom,
-                                    customRootCardList: cardSources,
-                                    canLookReverseCard: true,
-                                    selectPlayer: card.Owner,
-                                    cardEffect: activateClass);
-
-                                selectCardEffect.SetNotShowCard();
-                                selectCardEffect.SetUpSkillInfos(skillInfos);
-                                selectCardEffect.SetUpAfterSelectIndexCoroutine(AfterSelectIndexCoroutine);
-
-                                yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-
-                                IEnumerator AfterSelectIndexCoroutine(List<int> selectedIndexes)
+                                if (candidateEffects.Count == 1)
+                                {
+                                    selectedEffect = candidateEffects[0];
+                                }
+
+                                else
                                 {
-                                    if (selectedIndexes.Count == 1)
+                                    List<SkillInfo> skillInfos = candidateEffects
+                                        .Map(cardEffect => new SkillInfo(cardEffect, null, EffectTiming.None));
+
+                                    List<CardSource> cardSources = candidateEffects
+                                        .Map(cardEffect => cardEffect.EffectSourceCard);
+
+                                    SelectCardEffect selectSourceCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
+
+                                    selectSourceCardEffect.SetUp(
+                                        canTargetCondition: (cardSource) => true,
+                                        canTargetCondition_ByPreSelecetedList: null,
+                                        canEndSelectCondition: null,
+                                        canNoSelect: () => false,
+                                        selectCardCoroutine: null,
+                                        afterSelectCardCoroutine: null,
+                                        message: "Select 1 effect to activate.",
+                                        maxCount: 1,
+                                        canEndNotMax: false,
+                                        isShowOpponent: false,
+                                        mode: SelectCardEffect.Mode.Custom,
+                                        root: SelectCardEffect.Root.Custom,
+                                        customRootCardList: cardSources,
+                                        canLookReverseCard: true,
+                                        selectPlayer: card.Owner,
+                                        cardEffect: activateClass);
+
+                                    selectSourceCardEffect.SetNotShowCard();
+                                    selectSourceCardEffect.SetUpSkillInfos(skillInfos);
+                                    selectSourceCardEffect.SetUpAfterSelectIndexCoroutine(AfterSelectIndexCoroutine);
+
+                                    yield return ContinuousController.instance.StartCoroutine(selectSourceCardEffect.Activate());
+
+                                    IEnumerator AfterSelectIndexCoroutine(List<int> selectedIndexes)
                                     {
-                                        selectedEffect = candidateEffects[selectedIndexes[0]];
-                                        yield return null;
+                                        if (selectedIndexes.Count == 1)
+                                        {
+                                            selectedEffect = candidateEffects[selectedIndexes[0]];
+                                            yield return null;
+                                        }
                                     }
                                 }
-                            }
-
-                            if (selectedEffect != null)
-                            {
-                                Hashtable effectHashtable = CardEffectCommons.OnPlayCheckHashtableOfCard(card);
 
-                                if (selectedEffect.CanUse(effectHashtable))
+                                if (selectedEffect != null)
                                 {
-                                    yield return ContinuousController.instance.StartCoroutine(
-                                        ((ActivateICardEffect)selectedEffect).Activate_Optional_Effect_Execute(effectHashtable));
+                                    Hashtable effectHashtable = CardEffectCommons.OnPlayCheckHashtableOfCard(card);
+
+                                    if (selectedEffect.CanUse(effectHashtable))
+                                    {
+                                        yield return ContinuousController.instance.StartCoroutine(
+                                            ((ActivateICardEffect)selectedEffect).Activate_Optional_Effect_Execute(effectHashtable));
+                                    }
                                 }
                             }
                         }
                     }
                 }
 
-                int trashCount = 2 * card.PermanentOfThisCard().cardSources.Count;
+                int trashCount = 2 * card.PermanentOfThisCard().cardSources.Filter(cardSource => cardSource != card && cardSource.HasLevel && cardSource.Level == 6).Count;
 
                 yield return ContinuousController.instance.StartCoroutine(new IAddTrashCardsFromLibraryTop(trashCount, card.Owner.Enemy, activateClass).AddTrashCardsFromLibraryTop());
             }

+ 40 - 36
Assets/CardEffect/BT15/Yellow/Holy_Arrow_BT15_093.cs

@@ -70,59 +70,63 @@ public class Holy_Arrow_BT15_093 : CEntity_Effect
 
                 if (card.Owner.SecurityCards.Count >= 1)
                 {
-                    List<SelectionElement<bool>> selectionElements = new List<SelectionElement<bool>>()
+                    List<SelectionElement<int>> selectionElements = new List<SelectionElement<int>>()
                     {
-                        new SelectionElement<bool>(message: $"Security Top", value : true, spriteIndex: 0),
-                        new SelectionElement<bool>(message: $"Security Bottom", value : false, spriteIndex: 1),
+                        new SelectionElement<int>(message: $"Security Top", value : 0, spriteIndex: 0),
+                        new SelectionElement<int>(message: $"Security Bottom", value : 1, spriteIndex: 0),
+                        new SelectionElement<int>(message: $"No Selection", value : 2, spriteIndex: 1),
                     };
 
                     string selectPlayerMessage = "Which will you trash the top or bottom card of the security?";
                     string notSelectPlayerMessage = "The opponent is selecting whether to trash the top or bottom card of security.";
 
-                    GManager.instance.userSelectionManager.SetBoolSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
+                    GManager.instance.userSelectionManager.SetIntSelection(selectionElements: selectionElements, selectPlayer: card.Owner, selectPlayerMessage: selectPlayerMessage, notSelectPlayerMessage: notSelectPlayerMessage);
 
                     yield return ContinuousController.instance.StartCoroutine(GManager.instance.userSelectionManager.WaitForEndSelect());
 
-                    bool fromTop = GManager.instance.userSelectionManager.SelectedBoolValue;
+                    int selectionValue = GManager.instance.userSelectionManager.SelectedIntValue;
 
-                    yield return ContinuousController.instance.StartCoroutine(new IDestroySecurity(
-                    player: card.Owner,
-                    destroySecurityCount: 1,
-                    cardEffect: activateClass,
-                    fromTop: fromTop).DestroySecurity());
-
-                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
+                    if(selectionValue != 2)
                     {
-                        int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-
-                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                        selectPermanentEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: CanSelectPermanentCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: maxCount,
-                            canNoSelect: false,
-                            canEndNotMax: false,
-                            selectPermanentCoroutine: SelectPermanentCoroutine,
-                            afterSelectPermanentCoroutine: null,
-                            mode: SelectPermanentEffect.Mode.Custom,
-                            cardEffect: activateClass);
-
-                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -6000.", "The opponent is selecting 1 Digimon that will get DP -6000.");
+                        bool fromTop = selectionValue.Equals(0);
 
-                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+                        yield return ContinuousController.instance.StartCoroutine(new IDestroySecurity(
+                            player: card.Owner,
+                            destroySecurityCount: 1,
+                            cardEffect: activateClass,
+                            fromTop: fromTop).DestroySecurity());
 
-                        IEnumerator SelectPermanentCoroutine(Permanent permanent)
+                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                         {
-                            yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: permanent, changeValue: -6000, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+                            int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
+
+                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                            selectPermanentEffect.SetUp(
+                                selectPlayer: card.Owner,
+                                canTargetCondition: CanSelectPermanentCondition,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                maxCount: maxCount,
+                                canNoSelect: false,
+                                canEndNotMax: false,
+                                selectPermanentCoroutine: SelectPermanentCoroutine,
+                                afterSelectPermanentCoroutine: null,
+                                mode: SelectPermanentEffect.Mode.Custom,
+                                cardEffect: activateClass);
+
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will get DP -6000.", "The opponent is selecting 1 Digimon that will get DP -6000.");
+
+                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+
+                            IEnumerator SelectPermanentCoroutine(Permanent permanent)
+                            {
+                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.ChangeDigimonDP(targetPermanent: permanent, changeValue: -6000, effectDuration: EffectDuration.UntilEachTurnEnd, activateClass: activateClass));
+                            }
                         }
-                    }
+                    }                 
                 }
             }
-
-
         }
 
         #endregion

+ 4 - 5
Assets/CardEffect/BT15/Yellow/Kari_Kamiya_BT15_084.cs

@@ -98,7 +98,7 @@ public class Kari_Kamiya_BT15_084 : CEntity_Effect
 
         #region All turns
 
-        if (timing == EffectTiming.OnDiscardSecurity)
+        if (timing == EffectTiming.OnLoseSecurity)
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Opponent's 1 Digimon gains Security Attack -1", CanUseCondition, card);
@@ -125,10 +125,9 @@ public class Kari_Kamiya_BT15_084 : CEntity_Effect
             {
                 if (CardEffectCommons.IsExistOnBattleArea(card))
                 {
-                        if (CardEffectCommons.CanTriggerOnTrashSecurity(hashtable, cardEffect => cardEffect != null, CardCondition))
-                        {
-                             return true;
-                        }
+                    if (CardEffectCommons.CanTriggerWhenLoseSecurity(hashtable, player => player == card.Owner)){
+                        return true;
+                    }
                 }
 
                 return false;

+ 11 - 11
Assets/CardEffect/BT15/Yellow/Monzaemon_X_Antibody_BT15_040.cs

@@ -1,10 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
-using UnityEngine;
 using System.Linq;
-using Photon;
 using System;
-using Photon.Pun;
 
 public class Monzaemon_X_Antibody_BT15_040 : CEntity_Effect
 {
@@ -12,11 +9,12 @@ public class Monzaemon_X_Antibody_BT15_040 : CEntity_Effect
     {
         List<ICardEffect> cardEffects = new List<ICardEffect>();
 
+        #region Alternate Digivolution Requirement
         if (timing == EffectTiming.None)
         {
             bool PermanentCondition(Permanent targetPermanent)
             {
-                if (targetPermanent.TopCard.CardNames.Contains("Monzaemon") && targetPermanent.Level == 5 && !targetPermanent.TopCard.HasXAntibodyTraits)
+                if (targetPermanent.TopCard.ContainsCardName("Monzaemon") && targetPermanent.Level == 5 && !targetPermanent.TopCard.HasXAntibodyTraits)
                 {
                     return true;
                 }
@@ -30,7 +28,9 @@ public class Monzaemon_X_Antibody_BT15_040 : CEntity_Effect
                 card: card,
                 condition: null));
         }
+        #endregion
 
+        #region When Digivolving
         if (timing == EffectTiming.OnEnterFieldAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
@@ -45,7 +45,7 @@ public class Monzaemon_X_Antibody_BT15_040 : CEntity_Effect
 
             bool CanSelectCardCondition(CardSource cardSource)
             {
-                if (cardSource.ContainsCardName("Numemon") || (cardSource.HasLevel && cardSource.Level <=3))
+                if (cardSource.CardNames.Contains("Numemon") || (cardSource.HasLevel && cardSource.Level <=3))
                 {
                     if (CardEffectCommons.CanPlayAsNewPermanent(cardSource: cardSource, payCost: false, cardEffect: activateClass))
                     {
@@ -117,8 +117,10 @@ public class Monzaemon_X_Antibody_BT15_040 : CEntity_Effect
                 }
             }
         }
-        
-        if(timing == EffectTiming.OnEnterFieldAnyone)
+        #endregion
+
+        #region All Turns
+        if (timing == EffectTiming.OnEnterFieldAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Give opponent's Digimon -2000 DP for each Digimon", CanUseCondition, card);
@@ -201,11 +203,9 @@ public class Monzaemon_X_Antibody_BT15_040 : CEntity_Effect
 
                 }
             }
-
         }
-        
+        #endregion
 
         return cardEffects;
     }
-
-}
+}

+ 1 - 1
Assets/CardEffect/LM/Blue/Thetismon_LM_004.cs

@@ -142,7 +142,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Unsuspend this Digimon", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
                 activateClass.SetIsInheritedEffect(true);
                 cardEffects.Add(activateClass);
 

+ 6 - 1
Assets/CardEffect/LM/Green/Diarbbitmon_LM_013.cs

@@ -38,6 +38,11 @@ namespace DCGO.CardEffects.LM
 
                 bool HasNoUnsuspendDigimon()
                 {
+                    if(card.Owner.Enemy.GetBattleAreaDigimons().Count == 0)
+                    {
+                        return true;
+                    }
+
                     foreach (Permanent permanent in card.Owner.Enemy.GetBattleAreaDigimons())
                     {
                         if (!permanent.IsSuspended)
@@ -99,7 +104,7 @@ namespace DCGO.CardEffects.LM
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("Play 1 Digimon card with [Angoramon] in its name from hand", CanUseCondition, card);
-                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+                activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
                 activateClass.SetHashString("PlayAngoramon_LM_013");
                 cardEffects.Add(activateClass);
 

+ 1 - 1
Assets/CardEffect/LM/Green/Lamortmon_LM_012.cs

@@ -139,7 +139,7 @@ namespace DCGO.CardEffects.LM
                 {
                     if (CardEffectCommons.IsExistOnBattleArea(card))
                     {
-                        bool WinnerCondition(Permanent permanent) => permanent.cardSources.Contains(card) && permanent.TopCard.HasText("Angoramon");
+                        bool WinnerCondition(Permanent permanent) => permanent.TopCard.HasText("Angoramon");
                         bool LoserCondition(Permanent permanent) => CardEffectCommons.IsOpponentPermanent(permanent, card);
 
                         if (CardEffectCommons.CanTriggerWhenDeleteOpponentDigimonByBattle(hashtable: hashtable, winnerCondition: WinnerCondition, loserCondition: LoserCondition, isOnlyWinnerSurvive: false))

+ 5 - 1
Assets/CardEffect/LM/Purple/Gammamon_LM_016.cs

@@ -59,7 +59,11 @@ namespace DCGO.CardEffects.LM
                         {
                             if (CardEffectCommons.IsOwnerTurn(card))
                             {
-                                return true;
+                                if(CardEffectCommons.IsByEffect(hashtable, null))
+                                {
+                                    return true;
+                                }
+                                
                             }
                         }
                     }

+ 1 - 1
Assets/CardEffect/LM/White/Bokomon_LM_019.cs

@@ -146,7 +146,7 @@ namespace DCGO.CardEffects.LM
                                 mode: SelectPermanentEffect.Mode.Custom,
                                 cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to delete.", "The opponent is selecting 1 Digimon to delete.");
+                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to prevent leaving field.", "The opponent is selecting 1 Digimon to prevent leaving field.");
 
                             yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 

+ 1 - 1
Assets/CardEffect/RB1/White/AmanokawaHokuto_RB1_035.cs

@@ -62,7 +62,7 @@ public class AmanokawaHokuto_RB1_035 : CEntity_Effect
         if (timing == EffectTiming.OnEnterFieldAnyone)
         {
             ActivateClass activateClass = new ActivateClass();
-            activateClass.SetUpICardEffect("Memory +1 and draw 1", CanUseCondition, card);
+            activateClass.SetUpICardEffect("Memory +1 or draw 1", CanUseCondition, card);
             activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, true, EffectDiscription());
             cardEffects.Add(activateClass);