1.5.4 build

Assets/CardEffect/BT18/Black/Snatchmon_BT18_065.cs

@@ -154,18 +154,7 @@ namespace DCGO.CardEffects.BT18
 
                 bool CanSelectCardCondition(CardSource cardSource)
                 {
-                    if (cardSource.HasText("Vemmon"))
-                    {
-                        if (cardSource.IsDigimon)
-                        {
-                            if (cardSource.HasLevel && cardSource.Level == 5)
-                            {
-                                return true;
-                            }
-                        }
-                    }
-
-                    return false;
+                    return (cardSource.IsDigimon && cardSource.HasText("Vemmon"));
                 }
 
                 IEnumerator ActivateCoroutine(Hashtable _hashtable)

Assets/CardEffect/BT18/Red/Millenniummon_BT18_019.cs

@@ -186,7 +186,7 @@ namespace DCGO.CardEffects.BT18
                                     isShowOpponent: true,
                                     mode: SelectCardEffect.Mode.Custom,
                                     root: SelectCardEffect.Root.Custom,
-                                    customRootCardList: card.Owner.Enemy.TrashCards,
+                                    customRootCardList: card.Owner.Enemy.TrashCards.Filter(level),
                                     canLookReverseCard: true,
                                     selectPlayer: card.Owner,
                                     cardEffect: activateClass);
@@ -216,7 +216,7 @@ namespace DCGO.CardEffects.BT18
                                 selectCardCoroutine: null,
                                 afterSelectCardCoroutine: AfterSelection,
                                 message: "Select order of cards to add to the top your deck\n(cards will be placed back to the top of the deck so that cards with lower numbers are on top).",
-                                maxCount: 1,
+                                maxCount: selectedCards.Count,
                                 canEndNotMax: false,
                                 isShowOpponent: true,
                                 mode: SelectCardEffect.Mode.Custom,

Assets/CardEffect/BT18/Red/WindtoFlameIcetoSword_BT18_095.cs

@@ -16,6 +16,8 @@ namespace DCGO.CardEffects.BT18
 
             if (timing == EffectTiming.OptionSkill)
             {
+                List<string> selectedNames = new List<string>();
+
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect(card.BaseENGCardNameFromEntity, CanUseCondition, card);
                 activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDescription());
@@ -42,20 +44,18 @@ namespace DCGO.CardEffects.BT18
 
                 List<string> GetNamesList(List<CardSource> cardSources)
                 {
-                    List<string> cardNames = new List<string>();
-
                     foreach (CardSource cardName in cardSources)
                     {
                         foreach (string name in cardName.CardNames)
                         {
-                            if (!cardNames.Contains(name))
+                            if (!selectedNames.Contains(name))
                             {
-                                cardNames.Add(name);
+                                selectedNames.Add(name);
                             }
                         }
                     }
 
-                    return cardNames;
+                    return selectedNames;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -314,8 +314,7 @@ namespace DCGO.CardEffects.BT18
                                         ignoreDigivolutionRequirementFixedCost: 0,
                                         isHand: fromHand,
                                         activateClass: activateClass,
-                                        successProcess: null,
-                                        ignoreRequirements:CardEffectCommons.IgnoreRequirement.All));
+                                        successProcess: null));
                             }
                         }
                     }

Assets/CardEffect/BT18/Yellow/DarktoLightThundertoGunfire_BT18_097.cs

@@ -15,6 +15,8 @@ namespace DCGO.CardEffects.BT18
 
             if (timing == EffectTiming.OptionSkill)
             {
+                List<string> selectedNames = new List<string>();
+
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect(card.BaseENGCardNameFromEntity, CanUseCondition, card);
                 activateClass.SetUpActivateClass(null, ActivateCoroutine, -1, false, EffectDescription());
@@ -41,20 +43,18 @@ namespace DCGO.CardEffects.BT18
 
                 List<string> GetNamesList(List<CardSource> cardSources)
                 {
-                    List<string> cardNames = new List<string>();
-
                     foreach (CardSource cardName in cardSources)
                     {
                         foreach (string name in cardName.CardNames)
                         {
-                            if (!cardNames.Contains(name))
+                            if (!selectedNames.Contains(name))
                             {
-                                cardNames.Add(name);
+                                selectedNames.Add(name);
                             }
                         }
                     }
 
-                    return cardNames;
+                    return selectedNames;
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -313,8 +313,7 @@ namespace DCGO.CardEffects.BT18
                                         ignoreDigivolutionRequirementFixedCost: 0,
                                         isHand: fromHand,
                                         activateClass: activateClass,
-                                        successProcess: null,
-                                        ignoreRequirements: CardEffectCommons.IgnoreRequirement.All));
+                                        successProcess: null));
                             }
                         }
                     }

Assets/CardEffect/BT19/Yellow/SeventhDivineCruz_BT19_094.cs

@@ -65,35 +65,39 @@ namespace DCGO.CardEffects.BT19
 
                         yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect2(cardSources, "Deck Bottom Card", true, true));
 
-                        if (!card.Owner.isYou)
+                        if (card.Owner.Enemy.SecurityCards.Count > 0)
                         {
-                            GManager.instance.commandText.OpenCommandText("Will you discard the top card of your security?");
+                            if (!card.Owner.isYou)
+                            {
+                                GManager.instance.commandText.OpenCommandText("Will you discard the top card of your security?");
 
-                            List<Command_SelectCommand> command_SelectCommands = new List<Command_SelectCommand>()
+                                List<Command_SelectCommand> command_SelectCommands = new List<Command_SelectCommand>()
                     {
                         new Command_SelectCommand($"Discard", () => photonView.RPC("SetDoDiscard", RpcTarget.All, true), 0),
                         new Command_SelectCommand($"Not Discard", () => photonView.RPC("SetDoDiscard", RpcTarget.All, false), 1),
                     };
 
-                            GManager.instance.selectCommandPanel.SetUpCommandButton(command_SelectCommands);
-                        }
-                        else
-                        {
-                            GManager.instance.commandText.OpenCommandText("The opponent is choosing whether to discard security.");
-
-                            #region AI
-                            if (GManager.instance.IsAI)
+                                GManager.instance.selectCommandPanel.SetUpCommandButton(command_SelectCommands);
+                            }
+                            else
                             {
-                                SetDoDiscard(RandomUtility.IsSucceedProbability(0.5f));
+                                GManager.instance.commandText.OpenCommandText("The opponent is choosing whether to discard security.");
+
+                                #region AI
+                                if (GManager.instance.IsAI)
+                                {
+                                    SetDoDiscard(RandomUtility.IsSucceedProbability(0.5f));
+                                }
+                                #endregion
                             }
-                            #endregion
-                        }
 
-                        yield return new WaitWhile(() => !endSelect);
-                        endSelect = false;
+                            yield return new WaitWhile(() => !endSelect);
+                            endSelect = false;
 
-                        GManager.instance.commandText.CloseCommandText();
-                        yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
+                            GManager.instance.commandText.CloseCommandText();
+                            yield return new WaitWhile(() => GManager.instance.commandText.gameObject.activeSelf);
+                        }
+                            
 
                         if (!doDiscard)
                         {

Assets/CardEffect/EX6/Purple/Ogudomon_EX6_073.cs

@@ -231,7 +231,7 @@ namespace DCGO.CardEffects.EX6
 
                 string EffectDiscription()
                 {
-                    return "[When Digivolving] [When Attacking] You may place up to 7 cards with different names and the [Seven Great Demon Lords] trait from your trash as this Digimon's bottom digivolution cards. If you placed 4 or more cards with this effect, delete 1 of your opponent's Digimon or Tamers.";
+                    return "[When Attacking] You may place up to 7 cards with different names and the [Seven Great Demon Lords] trait from your trash as this Digimon's bottom digivolution cards. If you placed 4 or more cards with this effect, delete 1 of your opponent's Digimon or Tamers.";
                 }
 
                 bool CanUseCondition(Hashtable hashtable)

Assets/Scripts/Permanent.cs

@@ -1501,11 +1501,6 @@ public class Permanent
                     return false;
                 }
 
-                if (DP <= 0)
-                {
-                    return false;
-                }
-
                 if (GManager.instance.turnStateMachine.gameContext.TurnPlayer.fieldCardFrames.Count((frame) => frame.IsEmptyFrame() && frame.IsBattleAreaFrame()) == 0)
                 {
                     return false;

Assets/Scripts/TurnStateMachine.cs

@@ -722,7 +722,6 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                     }
                 }
                 #endregion
-
                 #region 移動できる場合
                 else if (!gameContext.TurnPlayer.CanHatch || gameContext.TurnPlayer.CanMove)
                 {

ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0ba8508d58e69327c952c782addc46974039816c8d25361ed43caf147a7c98c
+oid sha256:a794a73dcc81c007f03de23c39403e9a86941dfa5b61b15141fb04210ad5f978
 size 20166