Procházet zdrojové kódy

Fix Select X and Y effects taking 1 card as both

hooperk před 4 měsíci
rodič
revize
efb44e0390
48 změnil soubory, kde provedl 126 přidání a 58 odebrání
  1. 2 1
      Assets/Scripts/CardEffect/BT10/Green/BT10_046.cs
  2. 2 1
      Assets/Scripts/CardEffect/BT10/Purple/BT10_073.cs
  3. 2 1
      Assets/Scripts/CardEffect/BT10/Red/BT10_008.cs
  4. 2 1
      Assets/Scripts/CardEffect/BT10/Yellow/BT10_032.cs
  5. 2 1
      Assets/Scripts/CardEffect/BT11/Black/BT11_062.cs
  6. 2 1
      Assets/Scripts/CardEffect/BT11/Blue/BT11_020.cs
  7. 2 1
      Assets/Scripts/CardEffect/BT11/Blue/BT11_023.cs
  8. 2 1
      Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs
  9. 2 1
      Assets/Scripts/CardEffect/BT12/Black/BT12_059.cs
  10. 2 1
      Assets/Scripts/CardEffect/BT12/Blue/BT12_021.cs
  11. 2 1
      Assets/Scripts/CardEffect/BT12/Green/BT12_047.cs
  12. 2 1
      Assets/Scripts/CardEffect/BT12/White/BT12_098.cs
  13. 2 1
      Assets/Scripts/CardEffect/BT12/Yellow/BT12_034.cs
  14. 3 2
      Assets/Scripts/CardEffect/BT13/Yellow/BT13_034.cs
  15. 2 1
      Assets/Scripts/CardEffect/BT3/Blue/BT3_093.cs
  16. 2 1
      Assets/Scripts/CardEffect/BT3/Green/BT3_051.cs
  17. 5 4
      Assets/Scripts/CardEffect/BT3/Red/BT3_008.cs
  18. 2 1
      Assets/Scripts/CardEffect/BT5/Black/BT5_059.cs
  19. 2 1
      Assets/Scripts/CardEffect/BT5/Blue/BT5_020.cs
  20. 2 1
      Assets/Scripts/CardEffect/BT5/Red/BT5_007.cs
  21. 2 1
      Assets/Scripts/CardEffect/BT6/Green/BT6_047.cs
  22. 2 1
      Assets/Scripts/CardEffect/BT7/Green/BT7_046.cs
  23. 2 1
      Assets/Scripts/CardEffect/BT8/Black/BT8_058.cs
  24. 2 1
      Assets/Scripts/CardEffect/BT8/Black/BT8_060.cs
  25. 2 1
      Assets/Scripts/CardEffect/BT9/Black/BT9_090.cs
  26. 2 1
      Assets/Scripts/CardEffect/BT9/Blue/BT9_020.cs
  27. 2 1
      Assets/Scripts/CardEffect/BT9/Green/BT9_046.cs
  28. 2 1
      Assets/Scripts/CardEffect/BT9/Red/BT9_008.cs
  29. 2 1
      Assets/Scripts/CardEffect/BT9/White/BT9_092.cs
  30. 2 1
      Assets/Scripts/CardEffect/EX2/Purple/EX2_039.cs
  31. 2 1
      Assets/Scripts/CardEffect/EX2/Red/EX2_008.cs
  32. 2 1
      Assets/Scripts/CardEffect/EX2/White/EX2_047.cs
  33. 2 1
      Assets/Scripts/CardEffect/EX2/Yellow/EX2_019.cs
  34. 2 1
      Assets/Scripts/CardEffect/EX3/Black/EX3_048.cs
  35. 2 1
      Assets/Scripts/CardEffect/EX3/Green/EX3_037.cs
  36. 2 1
      Assets/Scripts/CardEffect/EX3/Red/EX3_007.cs
  37. 2 1
      Assets/Scripts/CardEffect/EX3/Yellow/EX3_028.cs
  38. 2 1
      Assets/Scripts/CardEffect/EX3/Yellow/EX3_030.cs
  39. 2 1
      Assets/Scripts/CardEffect/EX3/Yellow/EX3_031.cs
  40. 2 1
      Assets/Scripts/CardEffect/EX4/Black/EX4_038.cs
  41. 2 1
      Assets/Scripts/CardEffect/EX4/Black/EX4_039.cs
  42. 2 1
      Assets/Scripts/CardEffect/EX4/Blue/EX4_016.cs
  43. 2 1
      Assets/Scripts/CardEffect/EX4/Green/EX4_032.cs
  44. 2 1
      Assets/Scripts/CardEffect/EX4/Green/EX4_034.cs
  45. 2 1
      Assets/Scripts/CardEffect/EX4/Purple/EX4_053.cs
  46. 2 1
      Assets/Scripts/CardEffect/ST10/Purple/ST10_12.cs
  47. 2 1
      Assets/Scripts/CardEffect/ST10/Yellow/ST10_04.cs
  48. 28 7
      Assets/Scripts/Script/CardEffectCommons/RevealLibrary.cs

+ 2 - 1
Assets/Scripts/CardEffect/BT10/Green/BT10_046.cs

@@ -75,7 +75,8 @@ namespace DCGO.CardEffects.BT10
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT10/Purple/BT10_073.cs

@@ -98,7 +98,8 @@ namespace DCGO.CardEffects.BT10
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT10/Red/BT10_008.cs

@@ -101,7 +101,8 @@ namespace DCGO.CardEffects.BT10
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT10/Yellow/BT10_032.cs

@@ -91,7 +91,8 @@ namespace DCGO.CardEffects.BT10
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT11/Black/BT11_062.cs

@@ -99,7 +99,8 @@ namespace DCGO.CardEffects.BT11
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT11/Blue/BT11_020.cs

@@ -87,7 +87,8 @@ namespace DCGO.CardEffects.BT11
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.Trash,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT11/Blue/BT11_023.cs

@@ -86,7 +86,8 @@ namespace DCGO.CardEffects.BT11
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT11/Red/BT11_007.cs

@@ -89,7 +89,8 @@ namespace DCGO.CardEffects.BT11
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT12/Black/BT12_059.cs

@@ -101,7 +101,8 @@ namespace DCGO.CardEffects.BT12
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT12/Blue/BT12_021.cs

@@ -95,7 +95,8 @@ namespace DCGO.CardEffects.BT12
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT12/Green/BT12_047.cs

@@ -95,7 +95,8 @@ namespace DCGO.CardEffects.BT12
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT12/White/BT12_098.cs

@@ -80,7 +80,8 @@ namespace DCGO.CardEffects.BT12
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/BT12/Yellow/BT12_034.cs

@@ -99,7 +99,8 @@ namespace DCGO.CardEffects.BT12
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 3 - 2
Assets/Scripts/CardEffect/BT13/Yellow/BT13_034.cs

@@ -90,7 +90,8 @@ namespace DCGO.CardEffects.BT13
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }
@@ -106,7 +107,7 @@ namespace DCGO.CardEffects.BT13
 
                 string EffectDiscription()
                 {
-                    return "[When Attacking][Once per Turn] If there're 6 or fewer total cards in both players' security stacks, 1 of your opponentf Digimon gets -2000 DP for the turn.";
+                    return "[When Attacking][Once per Turn] If there're 6 or fewer total cards in both players' security stacks, 1 of your opponent�f Digimon gets -2000 DP for the turn.";
                 }
 
                 bool CanSelectPermanentCondition(Permanent permanent)

+ 2 - 1
Assets/Scripts/CardEffect/BT3/Blue/BT3_093.cs

@@ -94,7 +94,8 @@ public class BT3_093 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT3/Green/BT3_051.cs

@@ -96,7 +96,8 @@ public class BT3_051 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.Trash,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 5 - 4
Assets/Scripts/CardEffect/BT3/Red/BT3_008.cs

@@ -99,7 +99,8 @@ public class BT3_008 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
 
                 #region old
@@ -114,7 +115,7 @@ public class BT3_008 : CEntity_Effect
 
                                             int maxCount = 2;
 
-                                            #region 最大枚数
+                                            #region �スナ大枚�ス�ス
                                             List<CardSource[]> cardsList = ParameterComparer.Enumerate(revealLibrary.revealedCards, maxCount).ToList();
 
                                             List<int> maxCounts = new List<int>() { 0 };
@@ -212,7 +213,7 @@ public class BT3_008 : CEntity_Effect
 
                                             yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
 
-                                            #region リストによる選択条件
+                                            #region �ス�ス�スX�スg�スノゑソス�スI�ス�ス�ス�ス�ス�ス
                                             bool CanTargetCondition_ByPreSelecetedList(List<CardSource> cardSources, CardSource cardSource)
                                             {
                                                 List<CardSource> _cardSources = new List<CardSource>();
@@ -264,7 +265,7 @@ public class BT3_008 : CEntity_Effect
                                             }
                                             #endregion
 
-                                            #region 選択条件
+                                            #region �スI�ス�ス�ス�ス�ス�ス
                                             bool CanEndSelectCondition(List<CardSource> cardSources)
                                             {
                                                 List<CardSource[]> cardsList = ParameterComparer.Enumerate(cardSources, cardSources.Count).ToList();

+ 2 - 1
Assets/Scripts/CardEffect/BT5/Black/BT5_059.cs

@@ -92,7 +92,8 @@ public class BT5_059 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT5/Blue/BT5_020.cs

@@ -89,7 +89,8 @@ public class BT5_020 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT5/Red/BT5_007.cs

@@ -88,7 +88,8 @@ public class BT5_007 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT6/Green/BT6_047.cs

@@ -81,7 +81,8 @@ public class BT6_047 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT7/Green/BT7_046.cs

@@ -98,7 +98,8 @@ public class BT7_046 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT8/Black/BT8_058.cs

@@ -73,7 +73,8 @@ public class BT8_058 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT8/Black/BT8_060.cs

@@ -83,7 +83,8 @@ public class BT8_060 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT9/Black/BT9_090.cs

@@ -81,7 +81,8 @@ public class BT9_090 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT9/Blue/BT9_020.cs

@@ -103,7 +103,8 @@ public class BT9_020 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT9/Green/BT9_046.cs

@@ -102,7 +102,8 @@ public class BT9_046 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT9/Red/BT9_008.cs

@@ -103,7 +103,8 @@ public class BT9_008 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/BT9/White/BT9_092.cs

@@ -89,7 +89,8 @@ public class BT9_092 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 2 - 1
Assets/Scripts/CardEffect/EX2/Purple/EX2_039.cs

@@ -172,7 +172,8 @@ namespace DCGO.CardEffects.EX2
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX2/Red/EX2_008.cs

@@ -91,7 +91,8 @@ namespace DCGO.CardEffects.EX2
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX2/White/EX2_047.cs

@@ -80,7 +80,8 @@ namespace DCGO.CardEffects.EX2
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX2/Yellow/EX2_019.cs

@@ -95,7 +95,8 @@ namespace DCGO.CardEffects.EX2
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX3/Black/EX3_048.cs

@@ -133,7 +133,8 @@ namespace DCGO.CardEffects.EX3
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX3/Green/EX3_037.cs

@@ -93,7 +93,8 @@ namespace DCGO.CardEffects.EX3
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX3/Red/EX3_007.cs

@@ -134,7 +134,8 @@ namespace DCGO.CardEffects.EX3
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX3/Yellow/EX3_028.cs

@@ -88,7 +88,8 @@ namespace DCGO.CardEffects.EX3
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX3/Yellow/EX3_030.cs

@@ -89,7 +89,8 @@ namespace DCGO.CardEffects.EX3
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX3/Yellow/EX3_031.cs

@@ -89,7 +89,8 @@ namespace DCGO.CardEffects.EX3
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX4/Black/EX4_038.cs

@@ -96,7 +96,8 @@ namespace DCGO.CardEffects.EX4
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckTop,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX4/Black/EX4_039.cs

@@ -96,7 +96,8 @@ namespace DCGO.CardEffects.EX4
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckTop,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX4/Blue/EX4_016.cs

@@ -93,7 +93,8 @@ namespace DCGO.CardEffects.EX4
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.Trash,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX4/Green/EX4_032.cs

@@ -87,7 +87,8 @@ namespace DCGO.CardEffects.EX4
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX4/Green/EX4_034.cs

@@ -87,7 +87,8 @@ namespace DCGO.CardEffects.EX4
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/EX4/Purple/EX4_053.cs

@@ -97,7 +97,8 @@ namespace DCGO.CardEffects.EX4
                             selectCardCoroutine: null),
                         },
                         remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                        activateClass: activateClass
+                        activateClass: activateClass,
+                        mutualConditions: true
                     ));
                 }
             }

+ 2 - 1
Assets/Scripts/CardEffect/ST10/Purple/ST10_12.cs

@@ -155,7 +155,8 @@ public class ST10_12 : CEntity_Effect
                                     selectCardCoroutine: null),
                             },
                             remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                            activateClass: activateClass
+                            activateClass: activateClass,
+                            mutualConditions: true
                             ));
                     }
                 }

+ 2 - 1
Assets/Scripts/CardEffect/ST10/Yellow/ST10_04.cs

@@ -88,7 +88,8 @@ public class ST10_04 : CEntity_Effect
                             selectCardCoroutine: null),
                     },
                     remainingCardsPlace: RemainingCardsPlace.DeckBottom,
-                    activateClass: activateClass
+                    activateClass: activateClass,
+                    mutualConditions: true
                 ));
             }
         }

+ 28 - 7
Assets/Scripts/Script/CardEffectCommons/RevealLibrary.cs

@@ -187,7 +187,8 @@ public partial class CardEffectCommons
         bool canEndNotMax = false,
         bool isSendAllCardsToSamePlace = false,
         bool isOpponentDeck = false,
-        Func<List<CardSource>, IEnumerator> revealedCardsCoroutine = null)
+        Func<List<CardSource>, IEnumerator> revealedCardsCoroutine = null,
+        bool mutualConditions = false)
     {
         if (revealCount <= 0) yield break;
         if (activateClass == null) yield break;
@@ -220,7 +221,8 @@ public partial class CardEffectCommons
             activateClass: activateClass,
             isSendAllCardsToSamePlace: isSendAllCardsToSamePlace,
             isOpponentDeck: isOpponentDeck,
-            revealedCardsCoroutine: revealedCardsCoroutine
+            revealedCardsCoroutine: revealedCardsCoroutine,
+            mutualConditions: mutualConditions
         ));
     }
 
@@ -232,7 +234,8 @@ public partial class CardEffectCommons
         bool canNoAction = false,
         bool isSendAllCardsToSamePlace = false,
         bool isOpponentDeck = false,
-        Func<List<CardSource>, IEnumerator> revealedCardsCoroutine = null)
+        Func<List<CardSource>, IEnumerator> revealedCardsCoroutine = null,
+        bool mutualConditions = false)
     {
         if (revealCount <= 0) yield break;
         if (activateClass == null) yield break;
@@ -253,10 +256,12 @@ public partial class CardEffectCommons
 
         List<CardSource> remainingCards = revealedCards.Clone();
 
+        List<CardSource> chosenCards = new List<CardSource>();
+
         bool doAction = true;
 
-        // バーニングスタークラッシャー(BT10-096)
-        // ブレイジング・メモリーブースト
+        // �スo�ス[�スj�ス�ス�スO�スX�ス^�ス[�スN�ス�ス�スb�スV�ス�ス�ス[(BT10-096)
+        // �スu�ス�ス�スC�スW�ス�ス�スO�スE�ス�ス�ス�ス�ス�ス�ス[�スu�ス[�スX�スg
         if (selectCardConditions.Length >= 2)
         {
             if (canNoAction)
@@ -282,17 +287,32 @@ public partial class CardEffectCommons
         {
             SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
+            bool firstSelection = true;
+
             foreach(SelectCardConditionClass selectCondition in selectCardConditions)
             {
                 int maxCount = Math.Min(selectCondition.MaxCount, revealedCards.Count(selectCondition.CanTargetCondition));
 
                 if (maxCount >= 1)
                 {
+                    bool canNoSelect = selectCondition.CanNoSelect;
+                    if (firstSelection)
+                    {
+                        firstSelection = false;
+                    }
+                    else if (mutualConditions //If both conditions are chosen at once (per card game rules)
+                          && chosenCards.Count == 1 //And first condition lets you select 1
+                          && selectCondition.CanTargetCondition(chosenCards[0]) //If that one also fulfills the second condition
+                          && !revealedCards.Any(selectCardConditions[0].CanTargetCondition)) //And was the only card that could fulfill the first condition
+                    {
+                        canNoSelect = true; // Can no select on the basis of choosing it as the second condition, leaving no valid targets for the first
+                    }
+
                     selectCardEffect.SetUp(
                         canTargetCondition: selectCondition.CanTargetCondition,
                         canTargetCondition_ByPreSelecetedList: selectCondition.CanTargetCondition_ByPreSelecetedList,
                         canEndSelectCondition: selectCondition.CanEndSelectCondition,
-                        canNoSelect: () => selectCondition.CanNoSelect,
+                        canNoSelect: () => canNoSelect,
                         selectCardCoroutine: selectCondition.SelectCardCoroutine,
                         afterSelectCardCoroutine: AfterSelectCardCoroutine,
                         message: selectCondition.Message,
@@ -313,6 +333,7 @@ public partial class CardEffectCommons
                 {
                     foreach (CardSource cardSource in cardSources)
                     {
+                        chosenCards.Add(cardSource);
                         revealedCards.Remove(cardSource);
                     }
 
@@ -743,7 +764,7 @@ public class RevealLibraryClass
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect(RevealedCards, "Revealed Cards", true, true));
         }
 
-        #region ログ追加
+        #region �ス�ス�スO�スヌ会ソス
         if (RevealedCards.Count >= 1)
         {
             string log = "";