Parcourir la source

Adjusted Card Changes

cchmc-burkewm il y a 2 ans
Parent
commit
6c72d75dc3

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

@@ -6,23 +6,13 @@
   <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/CardBaseEntity/ST5/Black/Digimon/コマンドラモン-ST5-05.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardBaseEntity/ST5/Black/Digimon/コマンドラモン-ST5-05.asset" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT13/Purple/GizmonAT_BT13_083.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT13/Purple/GizmonAT_BT13_083.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT13/Yellow/Ponechessmon_BT13_035.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT13/Yellow/Ponechessmon_BT13_035.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT14/Purple/Solgarumon_BT14_079.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT15/Blue/Pukumon_BT15_030.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/BT7/Red/Ardamon_BT7_014.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/BT7/Red/Ardamon_BT7_014.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX3/Blue/Sourai_EX3_067.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX3/Blue/Sourai_EX3_067.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX4/Green/Blackcentgargomon_EX4_037.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX4/Green/Blackcentgargomon_EX4_037.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Kureshemon_EX5_020.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Kureshemon_EX5_020.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/EX5/Yellow/Fanronmon_EX5_074.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/EX5/Yellow/Fanronmon_EX5_074.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Assets/CardEffect/LM/Blue/Amphimon_LM_005.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CardEffect/LM/Blue/Amphimon_LM_005.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" />
@@ -118,7 +108,7 @@
       <workItem from="1704380154591" duration="3621000" />
       <workItem from="1704380154591" duration="3621000" />
       <workItem from="1705445110111" duration="617000" />
       <workItem from="1705445110111" duration="617000" />
       <workItem from="1707092728240" duration="644000" />
       <workItem from="1707092728240" duration="644000" />
-      <workItem from="1715820047500" duration="27171000" />
+      <workItem from="1715820047500" duration="29773000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>

+ 1 - 1
Assets/CardEffect/BT10/Black/UndeadKing_BT10_104.cs

@@ -21,7 +21,7 @@ public class UndeadKing_BT10_104 : CEntity_Effect
             bool CanUseCondition(Hashtable hashtable)
             bool CanUseCondition(Hashtable hashtable)
             {
             {
                 return card.Owner.GetBattleAreaPermanents().Some(permanet =>
                 return card.Owner.GetBattleAreaPermanents().Some(permanet =>
-                    permanet.TopCard.ContainsCardName("Nene Amano") || permanet.TopCard.ContainsCardName("NeneAmano"));
+                    permanet.TopCard.CardNames.Contains("Nene Amano") || permanet.TopCard.CardNames.Contains("NeneAmano"));
             }
             }
 
 
             bool CardCondition(CardSource cardSource)
             bool CardCondition(CardSource cardSource)

+ 1 - 1
Assets/CardEffect/BT12/Blue/ImperialdramonFighterMode_BT12_031.cs

@@ -58,7 +58,7 @@ public class ImperialdramonFighterMode_BT12_031 : CEntity_Effect
                 {
                 {
                     if (cardSource.Owner == card.Owner)
                     if (cardSource.Owner == card.Owner)
                     {
                     {
-                        if (cardSource.ContainsCardName("Imperialdramon: Dragon Mode") || cardSource.ContainsCardName("Imperialdramon:DragonMode"))
+                        if (cardSource.CardNames.Contains("Imperialdramon: Dragon Mode") || cardSource.CardNames.Contains("Imperialdramon:DragonMode"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 3 - 3
Assets/CardEffect/BT12/Purple/BaalmonXAntibody_BT12_082.cs

@@ -16,7 +16,7 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
         {
         {
             bool PermanentCondition(Permanent targetPermanent)
             bool PermanentCondition(Permanent targetPermanent)
             {
             {
-                return targetPermanent.TopCard.ContainsCardName("Baalmon");
+                return targetPermanent.TopCard.CardNames.Contains("Baalmon");
             }
             }
 
 
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
             cardEffects.Add(CardEffectFactory.AddSelfDigivolutionRequirementStaticEffect(permanentCondition: PermanentCondition, digivolutionCost: 0, ignoreDigivolutionRequirement: false, card: card, condition: null));
@@ -40,12 +40,12 @@ public class BaalmonXAntibody_BT12_082 : CEntity_Effect
                 {
                 {
                     if (cardSource.Owner == card.Owner)
                     if (cardSource.Owner == card.Owner)
                     {
                     {
-                        if (cardSource.ContainsCardName("X Antibody"))
+                        if (cardSource.CardNames.Contains("X Antibody"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }
 
 
-                        if (cardSource.ContainsCardName("XAntibody"))
+                        if (cardSource.CardNames.Contains("XAntibody"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }

+ 14 - 1
Assets/CardEffect/BT14/Purple/Fenrirugamon_BT14_081.cs

@@ -31,7 +31,20 @@ public class Fenrirugamon_BT14_081 : CEntity_Effect
                     {
                     {
                         if (cardSource.HasLevel)
                         if (cardSource.HasLevel)
                         {
                         {
-                            return true;
+                            if (cardSource.CardTraits.Contains("Dark Animal"))
+                            {
+                                return true;
+                            }
+
+                            if (cardSource.CardTraits.Contains("DarkAnimal"))
+                            {
+                                return true;
+                            }
+
+                            if (cardSource.CardTraits.Contains("SoC"))
+                            {
+                                return true;
+                            }
                         }
                         }
                     }
                     }
                 }
                 }

+ 2 - 1
Assets/CardEffect/BT15/Black/Megadramon_BT15_064.cs

@@ -120,10 +120,11 @@ public class Megadramon_BT15_064 : CEntity_Effect
                 {
                 {
                     if (permanent.TopCard.GetCostItself <= 3)
                     if (permanent.TopCard.GetCostItself <= 3)
                     {
                     {
-                        if (permanent.IsDigimon || permanent.IsTamer)
+                        if (!permanent.TopCard.IsDigiEgg || !permanent.TopCard.IsOption)
                         {
                         {
                             return true;
                             return true;
                         }
                         }
+                        
                     }
                     }
                 }
                 }
 
 

+ 1 - 1
Assets/CardEffect/EX2/Purple/AiAndMakoto_EX2_065.cs

@@ -30,7 +30,7 @@ public class AiAndMakoto_EX2_065 : CEntity_Effect
 
 
             bool CanSelectCardCondition(CardSource cardSource)
             bool CanSelectCardCondition(CardSource cardSource)
             {
             {
-                return cardSource.ContainsCardName("Beelzemon Blast Mode") || cardSource.ContainsCardName("BeelzemonBlastMode");
+                return cardSource.CardNames.Contains("Beelzemon Blast Mode") || cardSource.CardNames.Contains("BeelzemonBlastMode");
             }
             }
 
 
             bool PermanentCondition(Permanent permanent) => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);
             bool PermanentCondition(Permanent permanent) => CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card);

+ 1 - 1
Assets/CardEffect/EX5/Blue/Kureshemon_EX5_020.cs

@@ -24,7 +24,7 @@ public class Kureshemon_EX5_020 : CEntity_Effect
                         return true;
                         return true;
                     }
                     }
 
 
-                    if (targetPermanent.TopCard.CardTraits.Contains("LightFung"))
+                    if (targetPermanent.TopCard.CardTraits.Contains("LightFang"))
                     {
                     {
                         return true;
                         return true;
                     }
                     }

+ 4 - 4
Assets/CardEffect/EX5/Blue/Moonmon_EX5_002.cs

@@ -31,22 +31,22 @@ public class Moonmon_EX5_002 : CEntity_Effect
                 {
                 {
                     if (permanent.IsTamer)
                     if (permanent.IsTamer)
                     {
                     {
-                        if (permanent.TopCard.ContainsTraits("Light Fang"))
+                        if (permanent.TopCard.CardTraits.Contains("Light Fang"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }
 
 
-                        if (permanent.TopCard.ContainsTraits("LightFung"))
+                        if (permanent.TopCard.CardTraits.Contains("LightFang"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }
 
 
-                        if (permanent.TopCard.ContainsTraits("Night Claw"))
+                        if (permanent.TopCard.CardTraits.Contains("Night Claw"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }
 
 
-                        if (permanent.TopCard.ContainsTraits("NightClaw"))
+                        if (permanent.TopCard.CardTraits.Contains("NightClaw"))
                         {
                         {
                             return true;
                             return true;
                         }
                         }