Browse Source

Updated EX6 cards

cchmc-burkewm 2 years ago
parent
commit
8e4c8b2861

+ 6 - 2
.idea/.idea.DCGO/.idea/workspace.xml

@@ -6,8 +6,11 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="">
     <list default="true" id="1f770e58-b781-4cb0-ad93-4c50994f611d" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.DCGO/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Black/Infermon_EX6_041.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Black/Infermon_EX6_041.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Black/Kurisarimon_EX6_039.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Black/Kurisarimon_EX6_039.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Green/Antylamon_EX6_034.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Green/Antylamon_EX6_034.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Belphemon_Rage_Mode_EX6_060.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Belphemon_Rage_Mode_EX6_060.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Gate_of_Deadly_Sins_EX6_006.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Gate_of_Deadly_Sins_EX6_006.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Lucemon_Chaos_Mode_EX6_054.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Lucemon_Chaos_Mode_EX6_054.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Ogudomon_EX6_073.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX6/Purple/Ogudomon_EX6_073.cs" afterDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -105,6 +108,7 @@
       <workItem from="1707092728240" duration="644000" />
       <workItem from="1707092728240" duration="644000" />
       <workItem from="1715820047500" duration="30965000" />
       <workItem from="1715820047500" duration="30965000" />
       <workItem from="1719540359999" duration="395000" />
       <workItem from="1719540359999" duration="395000" />
+      <workItem from="1720456596917" duration="698000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>

+ 1 - 1
Assets/CardEffect/EX6/Green/Antylamon_EX6_034.cs

@@ -143,7 +143,7 @@ namespace DCGO.CardEffects.EX6
                 {                  
                 {                  
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                     if (CardEffectCommons.IsPermanentExistsOnOwnerBattleArea(permanent, card))
                     {
                     {
-                        if (permanent.IsSuspended)
+                        if (permanent.IsDigimon && permanent.IsSuspended)
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 6 - 3
Assets/CardEffect/EX6/Purple/Belphemon_Rage_Mode_EX6_060.cs

@@ -43,11 +43,14 @@ namespace DCGO.CardEffects.EX6
                 bool OpponentsSuspendableTargets(Permanent permanent)
                 bool OpponentsSuspendableTargets(Permanent permanent)
                 {
                 {
 
 
-                    if (permanent.TopCard.HasLevel && permanent.Level <= 5)
+                    if (CardEffectCommons.IsPermanentExistsOnOpponentBattleArea(permanent, card))
                     {
                     {
-                        return true;
+                        if (permanent.TopCard.HasLevel && permanent.Level <= 5)
+                        {
+                            return true;
+                        }
                     }
                     }
-                   
+
 
 
                     return false;
                     return false;
                 }
                 }

+ 1 - 2
Assets/CardEffect/EX6/Purple/Gate_of_Deadly_Sins_EX6_006.cs

@@ -549,12 +549,11 @@ namespace DCGO.CardEffects.EX6
                             int maxCount = 1;
                             int maxCount = 1;
 
 
                             SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                             SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
-
                             selectCardEffect.SetUp(
                             selectCardEffect.SetUp(
                                 canTargetCondition: CanSelectCardCondition,
                                 canTargetCondition: CanSelectCardCondition,
                                 canTargetCondition_ByPreSelecetedList: null,
                                 canTargetCondition_ByPreSelecetedList: null,
                                 canEndSelectCondition: null,
                                 canEndSelectCondition: null,
-                                canNoSelect: () => true,
+                                canNoSelect: () => false,
                                 selectCardCoroutine: SelectCardCoroutine,
                                 selectCardCoroutine: SelectCardCoroutine,
                                 afterSelectCardCoroutine: null,
                                 afterSelectCardCoroutine: null,
                                 message: "Select 1 card to place on bottom of digivolution cards.",
                                 message: "Select 1 card to place on bottom of digivolution cards.",

+ 1 - 1
Assets/CardEffect/EX6/Purple/Lucemon_Chaos_Mode_EX6_054.cs

@@ -272,7 +272,7 @@ namespace DCGO.CardEffects.EX6
 
 
                 bool CanSelectLucemon(CardSource cardSource)
                 bool CanSelectLucemon(CardSource cardSource)
                 {
                 {
-                    if(cardSource.CardNames.Contains("Lucemon"))
+                    if(cardSource.CardNames.Contains("Lucemon: Satan Mode"))
                     {
                     {
                         return true;
                         return true;
                     }
                     }

+ 5 - 5
Assets/CardEffect/EX6/Purple/Ogudomon_EX6_073.cs

@@ -45,9 +45,9 @@ namespace DCGO.CardEffects.EX6
                 return true;
                 return true;
             }
             }
 
 
-            bool HasSevelGreatDemonLordsTrait(CardSource cardSource)
+            bool HasSevenGreatDemonLordsTrait(CardSource cardSource)
             {
             {
-                if (cardSource.IsDigimon)
+                if (cardSource.IsDigimon || cardSource.IsOption)
                 {
                 {
                     return cardSource.ContainsTraits("Seven Great Demon Lords");
                     return cardSource.ContainsTraits("Seven Great Demon Lords");
                 }
                 }
@@ -68,7 +68,7 @@ namespace DCGO.CardEffects.EX6
 
 
             bool CanSelectTrashCardCondition(CardSource cardSource)
             bool CanSelectTrashCardCondition(CardSource cardSource)
             {
             {
-                if (HasSevelGreatDemonLordsTrait(cardSource))
+                if (HasSevenGreatDemonLordsTrait(cardSource))
                 {
                 {
                     if (digivolutionCards.Count((filteredCard) => filteredCard.CardNames.Concat(cardSource.CardNames).Distinct().ToList().Count > 0) == 0)
                     if (digivolutionCards.Count((filteredCard) => filteredCard.CardNames.Concat(cardSource.CardNames).Distinct().ToList().Count > 0) == 0)
                     {
                     {
@@ -343,7 +343,7 @@ namespace DCGO.CardEffects.EX6
                 {
                 {
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     if (CardEffectCommons.IsExistOnBattleAreaDigimon(card))
                     {
                     {
-                        if(card.PermanentOfThisCard().cardSources.Count(HasSevelGreatDemonLordsTrait) >= 7)
+                        if(card.PermanentOfThisCard().cardSources.Count(HasSevenGreatDemonLordsTrait) >= 7)
                         {
                         {
                             return true;
                             return true;
                         }
                         }
@@ -362,7 +362,7 @@ namespace DCGO.CardEffects.EX6
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
                     SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
 
                     selectCardEffect.SetUp(
                     selectCardEffect.SetUp(
-                                canTargetCondition: HasSevelGreatDemonLordsTrait,
+                                canTargetCondition: HasSevenGreatDemonLordsTrait,
                                 canTargetCondition_ByPreSelecetedList: null,
                                 canTargetCondition_ByPreSelecetedList: null,
                                 canEndSelectCondition: null,
                                 canEndSelectCondition: null,
                                 canNoSelect: () => true,
                                 canNoSelect: () => true,