Syakomon and Sunarizamon

Assets/CardEffect/EX8/Black/Sunarizamon_EX8_047.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.EX8
 
                 bool HasLiberator(CardSource source)
                 {
-                    return source.ContainsTraits("LIBERATOR") || source.ContainsTraits("Rock");
+                    return source.ContainsTraits("LIBERATOR");
                 }
 
                 bool CanUseCondition(Hashtable hashtable)
@@ -57,7 +57,7 @@ namespace DCGO.CardEffects.EX8
                             maxCount: 1,
                             selectCardCoroutine: null),
                         new SimplifiedSelectCardConditionClass(
-                            canTargetCondition:HasMineralOrRock,
+                            canTargetCondition:HasLiberator,
                             message: "Select 1 [LIBERATOR] card.",
                             mode: SelectCardEffect.Mode.AddHand,
                             maxCount: 1,

Assets/CardEffect/EX8/Purple/Syakomon_EX8_056.cs

@@ -130,53 +130,22 @@ namespace DCGO.CardEffects.EX8
 
                 IEnumerator ActivateCoroutine(Hashtable hashtable)
                 {
-                    bool discarded = false;
+                    SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
-                    SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
-
-                    selectHandEffect.SetUp(
+                    selectPermanentEffect.SetUp(
                         selectPlayer: card.Owner,
-                        canTargetCondition: (cardSource) => true,
+                        canTargetCondition: SelectOpponentsLevel3Digimon,
                         canTargetCondition_ByPreSelecetedList: null,
                         canEndSelectCondition: null,
                         maxCount: 1,
-                        canNoSelect: true,
+                        canNoSelect: false,
                         canEndNotMax: false,
-                        isShowOpponent: true,
-                        selectCardCoroutine: null,
-                        afterSelectCardCoroutine: AfterSelectCardCoroutine,
-                        mode: SelectHandEffect.Mode.Discard,
+                        selectPermanentCoroutine: null,
+                        afterSelectPermanentCoroutine: null,
+                        mode: SelectPermanentEffect.Mode.Destroy,
                         cardEffect: activateClass);
 
-                    yield return StartCoroutine(selectHandEffect.Activate());
-                    
-                    IEnumerator AfterSelectCardCoroutine(List<CardSource> selectedCards)
-                    {
-                        if(selectedCards.Count > 0)
-                            discarded = true;
-
-                        yield return null;
-                    }
-
-                    if (discarded)
-                    {
-                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                        selectPermanentEffect.SetUp(
-                            selectPlayer: card.Owner,
-                            canTargetCondition: SelectOpponentsLevel3Digimon,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            maxCount: 1,
-                            canNoSelect: false,
-                            canEndNotMax: false,
-                            selectPermanentCoroutine: null,
-                            afterSelectPermanentCoroutine: null,
-                            mode: SelectPermanentEffect.Mode.Destroy,
-                            cardEffect: activateClass);
-
-                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-                    }
+                    yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
                 }
             }