|
|
@@ -1237,6 +1237,11 @@ public class PlayPermanentClass
|
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateFieldPermanentCardEffect(permanent.ShowingPermanentCard, isDigiXros: false, jogressEvoRoots: evoRootTops.ToArray()));
|
|
|
|
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().ShowCardEffect(evoRootTops, "DNA Digivolution Cards", true, true));
|
|
|
+
|
|
|
+ foreach (CardSource evolutionCard in permanent.DigivolutionCards)
|
|
|
+ {
|
|
|
+ evolutionCard.cEntity_EffectController.InitUseCountThisTurn();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2498,14 +2503,12 @@ public class IPutSecurityPermanent
|
|
|
bool _toTop = false;
|
|
|
public IEnumerator PutSecurity()
|
|
|
{
|
|
|
- Debug.Log("PutSecurity");
|
|
|
if (_permanent == null) yield break;
|
|
|
if (_permanent.TopCard == null) yield break;
|
|
|
- Debug.Log("PutSecurity 1");
|
|
|
ICardEffect cardEffect = CardEffectCommons.GetCardEffectFromHashtable(_hashtable);
|
|
|
|
|
|
if (_permanent.TopCard.CanNotBeAffected(cardEffect) || !_permanent.TopCard.Owner.CanAddSecurity(cardEffect)) yield break;
|
|
|
- Debug.Log("PutSecurity 2");
|
|
|
+
|
|
|
#region "When permanents would remove field" effect
|
|
|
|
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(
|
|
|
@@ -2529,10 +2532,9 @@ public class IPutSecurityPermanent
|
|
|
_permanent.HideWillRemoveFieldEffect();
|
|
|
}
|
|
|
#endregion
|
|
|
- Debug.Log("PutSecurity 3");
|
|
|
+
|
|
|
CardSource topCard = _permanent.TopCard;
|
|
|
if (topCard == null) yield break;
|
|
|
- Debug.Log("PutSecurity 4");
|
|
|
#region add log
|
|
|
string log = "";
|
|
|
|
|
|
@@ -2559,37 +2561,31 @@ public class IPutSecurityPermanent
|
|
|
}
|
|
|
}
|
|
|
#endregion
|
|
|
- Debug.Log("PutSecurity 5");
|
|
|
+
|
|
|
#region place permanent to security
|
|
|
yield return ContinuousController.instance.StartCoroutine(_permanent.DiscardEvoRoots());
|
|
|
- Debug.Log("PutSecurity 6");
|
|
|
yield return ContinuousController.instance.StartCoroutine(CardObjectController.RemoveField(_permanent));
|
|
|
- Debug.Log("PutSecurity 7");
|
|
|
+
|
|
|
if (!topCard.IsToken)
|
|
|
{
|
|
|
- Debug.Log("PutSecurity 8");
|
|
|
if (!topCard.IsDigiEgg)
|
|
|
{
|
|
|
- Debug.Log("PutSecurity 9");
|
|
|
yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(topCard));
|
|
|
- Debug.Log("PutSecurity 10");
|
|
|
+
|
|
|
if (!_toTop)
|
|
|
{
|
|
|
topCard.Owner.SecurityCards.Remove(topCard);
|
|
|
topCard.Owner.SecurityCards.Add(topCard);
|
|
|
}
|
|
|
- Debug.Log("PutSecurity 11");
|
|
|
+
|
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(topCard.Owner));
|
|
|
- Debug.Log("PutSecurity 12");
|
|
|
yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(topCard.Owner).AddSecurity());
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddLibraryBottomCards(new List<CardSource>() { topCard }));
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
- Debug.Log("PutSecurity 13");
|
|
|
#endregion
|
|
|
}
|
|
|
}
|
|
|
@@ -3541,8 +3537,6 @@ public class IBattle
|
|
|
hashtable["LoserPermanents_real"] = LoserPermanents;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
// "At the end of battle" effect
|
|
|
yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.StackSkillInfos(hashtable, EffectTiming.OnEndBattle));
|
|
|
|