translations, added unblockable as permanent detail, few card fixes

Assets/CardEffect/BT15/Yellow/Gatomon_BT15_037.cs

@@ -26,7 +26,7 @@ public class Gatomon_BT15_037 : CEntity_Effect
         {
             ActivateClass activateClass = new ActivateClass();
             activateClass.SetUpICardEffect("Gain 1 memory.", CanUseCondition, card);
-            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, true, EffectDiscription());
+            activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, 1, false, EffectDiscription());
             cardEffects.Add(activateClass);
 
             string EffectDiscription()

Assets/CardEffect/BT15/Yellow/Revelation_of_Light_BT15_092.cs

@@ -134,7 +134,7 @@ public class Revelation_of_Light_BT15_092 : CEntity_Effect
                         canNoSelect: () => true,
                         selectCardCoroutine: SelectCardCoroutine,
                         afterSelectCardCoroutine: AfterSelectCardCoroutine,
-                        message: "Select 1 Tamer to play.",
+                        message: "Select 1 Digimon to play.",
                         maxCount: maxCount,
                         canEndNotMax: false,
                         isShowOpponent: true,
@@ -164,17 +164,17 @@ public class Revelation_of_Light_BT15_092 : CEntity_Effect
                         }
 
                         yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.PlayPermanentCards(cardSources: selectedCards, activateClass: activateClass, payCost: false, isTapped: false, root: SelectCardEffect.Root.Security, activateETB: true));
+                    }
+                }
 
-                        if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentCondition))
-                        {
-                                yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(card, toTop: true));
+                if (CardEffectCommons.HasMatchConditionOwnersPermanent(card, PermanentCondition))
+                {
+                    yield return ContinuousController.instance.StartCoroutine(CardObjectController.AddSecurityCard(card, toTop: true));
 
-                                yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(card.Owner));
+                    yield return ContinuousController.instance.StartCoroutine(GManager.instance.GetComponent<Effects>().CreateRecoveryEffect(card.Owner));
+
+                    yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(card.Owner).AddSecurity());
 
-                                yield return ContinuousController.instance.StartCoroutine(new IAddSecurity(card.Owner).AddSecurity());
-                            
-                        }
-                    }
                 }
             }
         }

Assets/CardEffect/P/Purple/PrismGallet_P_096.cs

@@ -253,7 +253,7 @@ public class PrismGallet_P_096 : CEntity_Effect
                                         selectCardCoroutine: SelectCardCoroutine,
                                         afterSelectCardCoroutine: null,
                                         message: "Select cards from trash to place in Digivolution cards.",
-                                        maxCount: _maxCount,
+                                        maxCount: 1,
                                         canEndNotMax: true,
                                         isShowOpponent: true,
                                         mode: SelectCardEffect.Mode.Custom,
@@ -295,7 +295,7 @@ public class PrismGallet_P_096 : CEntity_Effect
                                         canTargetCondition: CanSelectTamerCondition,
                                         canTargetCondition_ByPreSelecetedList: null,
                                         canEndSelectCondition: null,
-                                        maxCount: _maxCount,
+                                        maxCount: 1,
                                         canNoSelect: true,
                                         canEndNotMax: true,
                                         selectPermanentCoroutine: SelectPermanentCoroutine,
@@ -334,7 +334,7 @@ public class PrismGallet_P_096 : CEntity_Effect
                                                         selectCardCoroutine: SelectCardCoroutine,
                                                         afterSelectCardCoroutine: null,
                                                         message: "Select digivolution cards.",
-                                                        maxCount: _maxCount,
+                                                        maxCount: 1,
                                                         canEndNotMax: true,
                                                         isShowOpponent: true,
                                                         mode: SelectCardEffect.Mode.Custom,
@@ -459,7 +459,6 @@ public class PrismGallet_P_096 : CEntity_Effect
             }
         }
 
-
         if (timing == EffectTiming.SecuritySkill)
         {
             ActivateClass activateClass = new ActivateClass();

Assets/CardEffect/ST17/Blue/Magnamon_ST17_13.cs

@@ -45,17 +45,29 @@ namespace DCGO.CardEffects.ST17
             #region Security Effect
             if (timing == EffectTiming.SecuritySkill)
             {
+
+                #region De-Digivolve
                 ActivateClass activateClass = new ActivateClass();
-                activateClass.SetUpICardEffect("De-Digivolve 1 to 1 Digimon at the end of the battle", CanUseCondition, card);
+                activateClass.SetUpICardEffect("De-Digivolve 1 to 1 Digimon", CanUseCondition, card);
                 activateClass.SetUpActivateClass(CanActivateCondition, ActivateCoroutine, -1, false, EffectDiscription());
                 activateClass.SetIsSecurityEffect(true);
                 cardEffects.Add(activateClass);
 
                 string EffectDiscription()
                 {
-                    return "[Security] <De-Digivolve 1> on 1 of your opponent's Digimon. At the end of the battle, 1 of your Digimon may Digivolve into this card without paying the cost.";
+                    return "[Security] <De-Digivolve 1> 1 Digimon. At the end of the battle, 1 of your Digimon may digivolve into this card without paying the digivolution cost.";
                 }
 
+                bool CanSelectPermanentCondition(Permanent permanent)
+                {
+                    if (CardEffectCommons.IsPermanentExistsOnBattleArea(permanent))
+                    {
+                        if (permanent.IsDigimon)
+                            return true;
+                    }
+
+                    return false;
+                }
 
                 bool CanUseCondition(Hashtable hashtable)
                 {
@@ -64,176 +76,167 @@ namespace DCGO.CardEffects.ST17
 
                 bool CanActivateCondition(Hashtable hashtable)
                 {
-                    if (CardEffectCommons.IsExistOnExecutingArea(card))
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return CardEffectCommons.IsExistOnExecutingArea(card);
                 }
 
-                bool CanSelectPermanentCondition1(Permanent permanent)
+                IEnumerator ActivateCoroutine(Hashtable _hashtable1)
                 {
-                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
+                    yield return null;
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
                     {
-                        if ((permanent.IsDigimon && permanent.Level == 3 && card.CardColors.Contains(CardColor.Blue) || card.CardColors.Contains(CardColor.Black)) || (card.CardNames.Contains("Veemon") && permanent.Level == 3))
+                        int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
+
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: CanSelectPermanentCondition,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: maxCount,
+                            canNoSelect: false,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: SelectPermanentCoroutine,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Custom,
+                            cardEffect: activateClass);
+
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to De-Digivolve.", "The opponent is selecting 1 Digimon to De-Digivolve.");
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+
+                        IEnumerator SelectPermanentCoroutine(Permanent permanent)
                         {
-                            return true;
+                            Permanent selectedPermanent = permanent;
+
+                            yield return ContinuousController.instance.StartCoroutine(new IDegeneration(selectedPermanent, 1, activateClass).Degeneration());
                         }
                     }
-                    return false;
                 }
+                #endregion
 
-                bool CanSelectCardCondition(CardSource cardSource)
-                {
-                        if (cardSource.IsDigimon)
-                        {
-                            if (CardEffectCommons.IsExistOnBattleArea(card))
-                            {
-                                if (cardSource.CanPlayCardTargetFrame(card.PermanentOfThisCard().PermanentFrame, true, activateClass, root: SelectCardEffect.Root.Execution))
-                                {
-                                    return true;
-                                }
-                            }
-                        }
+                #region Digivolve into this card
+                ContinuousController.instance.PlaySE(GManager.instance.GetComponent<Effects>().BuffSE);
 
-                    return false;
-                }
+                ActivateClass activateClassDigivolve = new ActivateClass();
+                activateClassDigivolve.SetUpICardEffect("Digivolve intto this Digimon", CanUseConditionAfterBattle, card);
+                activateClassDigivolve.SetUpActivateClass(CanActivateConditionAfterBattle, ActivateCoroutineAfterBattle, -1, true, EffectDiscriptionAfterBattle());
+                card.Owner.UntilEndBattleEffects.Add(GetCardEffectAfterBattle);
 
-                IEnumerator ActivateCoroutine(Hashtable _hashtable)
+                string EffectDiscriptionAfterBattle()
                 {
-                    yield return null;
-
-                    ContinuousController.instance.PlaySE(GManager.instance.GetComponent<Effects>().BuffSE);
-
-                    ActivateClass activateClass1 = new ActivateClass();
-                    activateClass1.SetUpICardEffect("De-Digivolve 1 to 1 Digimon", CanUseCondition1, card);
-                    activateClass1.SetUpActivateClass(CanActivateCondition1, ActivateCoroutine1, -1, false, EffectDiscription1());
-                    card.Owner.UntilEndBattleEffects.Add(GetCardEffect1);
+                    return "[Security] At the end of the battle, 1 of your Digimon may digivolve into this card without paying the digivolution cost.";
+                }
 
-                    string EffectDiscription1()
-                    {
-                        return "Trigger <De-Digivolve 1> 1 Digimon. (Trash a card from the top of one of your opponent's Digimon. If it has no digivolution cards, or becomes a level 3 Digimon, you can't trash any more cards.)";
-                    }
+                bool CanSelectCardConditionAferBattle(CardSource cardSource)
+                {
+                    return cardSource == card;
+                }
 
-                    bool CanSelectPermanentCondition(Permanent permanent)
+                bool CanSelectPermanentConditionAfterBattle(Permanent permanent)
+                {
+                    if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
                     {
-                        if (CardEffectCommons.IsPermanentExistsOnOpponentBattleAreaDigimon(permanent, card))
+                        if (card.CanPlayCardTargetFrame(permanent.PermanentFrame, false, activateClassDigivolve, root: SelectCardEffect.Root.Execution))
                         {
                             return true;
                         }
-                        if (CardEffectCommons.IsPermanentExistsOnOwnerBattleAreaDigimon(permanent, card))
+                        /*if ((permanent.IsDigimon && permanent.Level == 3 && card.CardColors.Contains(CardColor.Blue) || card.CardColors.Contains(CardColor.Black)) || (card.CardNames.Contains("Veemon") && permanent.Level == 3))
                         {
                             return true;
-                        }
-                        return false;
+                        }*/
                     }
+                    return false;
+                }
 
-                    bool CanUseCondition1(Hashtable hashtable)
+                bool CanUseConditionAfterBattle(Hashtable hashtable)
+                {
+                    return true;
+                }
+
+                bool CanActivateConditionAfterBattle(Hashtable hashtable)
+                {
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentConditionAfterBattle))
                     {
                         return true;
                     }
 
-                    bool CanActivateCondition1(Hashtable hashtable)
-                    {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            return true;
-                        }
-
-                        return false;
-                    }
+                    return false;
+                }
 
-                    IEnumerator ActivateCoroutine1(Hashtable _hashtable1)
+                IEnumerator ActivateCoroutineAfterBattle(Hashtable _hashtable)
+                {
+                    yield return null;
+                    if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentConditionAfterBattle))
                     {
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition))
-                        {
-                            int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition));
-
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
-
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: false,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: SelectPermanentCoroutine,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Custom,
-                                cardEffect: activateClass);
-
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon to De-Digivolve.", "The opponent is selecting 1 Digimon to De-Digivolve.");
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
-
-                            IEnumerator SelectPermanentCoroutine(Permanent permanent)
-                            {
-                                Permanent selectedPermanent = permanent;
+                        Permanent selectedPermanent = null;
 
-                                yield return ContinuousController.instance.StartCoroutine(new IDegeneration(selectedPermanent, 1, activateClass1).Degeneration());
-                            }
-                        }
-
-                        if (CardEffectCommons.HasMatchConditionPermanent(CanSelectPermanentCondition1))
-                        {
-                            Permanent selectedPermanent = null;
+                        int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentConditionAfterBattle));
 
-                            int maxCount = Math.Min(1, CardEffectCommons.MatchConditionPermanentCount(CanSelectPermanentCondition1));
+                        SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
 
-                            SelectPermanentEffect selectPermanentEffect = GManager.instance.GetComponent<SelectPermanentEffect>();
+                        selectPermanentEffect.SetUp(
+                            selectPlayer: card.Owner,
+                            canTargetCondition: CanSelectPermanentConditionAfterBattle,
+                            canTargetCondition_ByPreSelecetedList: null,
+                            canEndSelectCondition: null,
+                            maxCount: maxCount,
+                            canNoSelect: true,
+                            canEndNotMax: false,
+                            selectPermanentCoroutine: SelectPermanentCoroutine,
+                            afterSelectPermanentCoroutine: null,
+                            mode: SelectPermanentEffect.Mode.Custom,
+                            cardEffect: activateClass);
 
-                            selectPermanentEffect.SetUp(
-                                selectPlayer: card.Owner,
-                                canTargetCondition: CanSelectPermanentCondition1,
-                                canTargetCondition_ByPreSelecetedList: null,
-                                canEndSelectCondition: null,
-                                maxCount: maxCount,
-                                canNoSelect: true,
-                                canEndNotMax: false,
-                                selectPermanentCoroutine: SelectPermanentCoroutine,
-                                afterSelectPermanentCoroutine: null,
-                                mode: SelectPermanentEffect.Mode.Custom,
-                                cardEffect: activateClass);
+                        selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will digivolve.", "The opponent is selecting 1 Digimon that will digivolve.");
 
-                            selectPermanentEffect.SetUpCustomMessage("Select 1 Digimon that will digivolve.", "The opponent is selecting 1 Digimon that will digivolve.");
+                        yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
 
-                            yield return ContinuousController.instance.StartCoroutine(selectPermanentEffect.Activate());
+                        IEnumerator SelectPermanentCoroutine(Permanent permanent)
+                        {
+                            selectedPermanent = permanent;
 
-                            IEnumerator SelectPermanentCoroutine(Permanent permanent)
-                            {
-                                selectedPermanent = permanent;
+                            yield return null;
+                        }
 
-                                yield return null;
-                            }
 
-                            if (selectedPermanent != null)
+                        if (selectedPermanent != null)
+                        {
+                            if (card.CanPlayCardTargetFrame(selectedPermanent.PermanentFrame, false, activateClassDigivolve))
                             {
-                                yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoExcecutingAreaCard(
-                                    targetPermanent: selectedPermanent,
-                                    cardCondition: CanSelectCardCondition,
+                                PlayCardClass playCardClass = new PlayCardClass(
+                                    cardSources: new List<CardSource>() { card },
+                                    hashtable: CardEffectCommons.CardEffectHashtable(activateClassDigivolve),
                                     payCost: false,
-                                    reduceCostTuple: null,
-                                    fixedCostTuple: null,
-                                    ignoreDigivolutionRequirementFixedCost: -1,
-                                    activateClass: activateClass,
-                                    successProcess: null));
+                                    targetPermanent: selectedPermanent,
+                                    isTapped: false,
+                                    root: SelectCardEffect.Root.Execution,
+                                    activateETB: true);
+
+                                yield return ContinuousController.instance.StartCoroutine(playCardClass.PlayCard());
                             }
+                            /*yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoExcecutingAreaCard(
+                                targetPermanent: selectedPermanent,
+                                cardCondition: CanSelectCardConditionAferBattle,
+                                payCost: false,
+                                reduceCostTuple: null,
+                                fixedCostTuple: null,
+                                ignoreDigivolutionRequirementFixedCost: -1,
+                                activateClass: activateClass,
+                                successProcess: null));*/
                         }
-
                     }
+                }
 
-                    ICardEffect GetCardEffect1(EffectTiming _timing)
+                ICardEffect GetCardEffectAfterBattle(EffectTiming _timing)
+                {
+                    if (_timing == EffectTiming.OnEndBattle)
                     {
-                        if (_timing == EffectTiming.OnEndBattle)
-                        {
-                            return activateClass1;
-                        }
-
-                        return null;
+                        return activateClassDigivolve;
                     }
+
+                    return null;
                 }
+                #endregion
             }
             #endregion
 

Assets/Scripts/AutoProcessing.cs

@@ -451,10 +451,10 @@ public class AutoProcessing : MonoBehaviourPunCallbacks
 
             GManager.instance.turnStateMachine.Passed = true;
 
-            //ターン終了時の効果
+            //Effect at end of turn
             yield return ContinuousController.instance.StartCoroutine(StackSkillInfos(null, EffectTiming.OnEndTurn));
 
-            //自動処理チェックタイミング
+            //Automatic processing check timing
             yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
 
             if (GManager.instance.turnStateMachine.gameContext.NonTurnPlayer.MemoryForPlayer >= TurnEndMinMemory)

Assets/Scripts/Permanent.cs

@@ -748,7 +748,7 @@ public class Permanent
     }
     #endregion
 
-    #region パーマネントの効果リスト
+    #region Permanent effect list
 
     #region このパーマネントの効果リスト
     public List<ICardEffect> EffectList(EffectTiming timing)
@@ -1633,7 +1633,28 @@ public class Permanent
     }
     #endregion
 
-    #region ブロッカーを持つか
+    #region Is Unblockable
+    public bool IsUnblockable
+    {
+        get
+        {
+            foreach (ICardEffect cardEffect in this.EffectList(EffectTiming.None))
+            {
+                if (cardEffect is CannotBlockClass)
+                {
+                    if (cardEffect.EffectName == "Can't Block")
+                    {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+    }
+    #endregion
+
+    #region Has Blocker
     public bool HasBlocker
     {
         get
@@ -1681,7 +1702,7 @@ public class Permanent
     }
     #endregion
 
-    #region ジャミングを持つか
+    #region Has Jamming
     public bool HasJamming
     {
         get
@@ -1949,7 +1970,7 @@ public class Permanent
     }
     #endregion
 
-    #region 進撃を持つか
+    #region Has Blitz
     public bool HasBlitz
     {
         get

Assets/Scripts/PermanentDetail.cs

@@ -7,6 +7,8 @@ using DG.Tweening;
 using System.Threading.Tasks;
 using TMPro;
 using System.Linq;
+using static UnityEditor.VersionControl.Message;
+
 public class PermanentDetail : MonoBehaviour
 {
     [Header("パネル")]
@@ -88,7 +90,7 @@ public class PermanentDetail : MonoBehaviour
 
         string effectString = "";
 
-        #region セキュリティアタック
+        #region security attack
         if (permanent.IsDigimon)
         {
             if (permanent.Strike_AllowMinus >= 0)
@@ -105,56 +107,63 @@ public class PermanentDetail : MonoBehaviour
         }
         #endregion
 
-        #region ブロッカー
+        #region unblockable
+        if (permanent.IsUnblockable)
+        {
+            effectString += $"- Unblockable\n";
+        }
+        #endregion
+
+        #region blocker
         if (permanent.HasBlocker)
         {
             effectString += $"- Blocker\n";
         }
         #endregion
 
-        #region 貫通
+        #region Pierce
         if (permanent.HasPierce)
         {
             effectString += $"- Pierce\n";
         }
         #endregion
 
-        #region 再起動
+        #region Reboot
         if (permanent.HasReboot)
         {
             effectString += $"- Reboot\n";
         }
         #endregion
 
-        #region 回避
+        #region Evade
         if (permanent.HasEvade)
         {
             effectString += $"- Evade\n";
         }
         #endregion
 
-        #region 速攻
+        #region Rush
         if (permanent.HasRush)
         {
             effectString += $"- Rush\n";
         }
         #endregion
 
-        #region 連携
+        #region Alliance
         if (permanent.HasAlliance)
         {
             effectString += $"- Alliance\n";
         }
         #endregion
 
-        #region 防壁
+        #region Barrier
         if (permanent.HasBarrier)
         {
             effectString += $"- Barrier\n";
         }
         #endregion
 
-        #region 道連れ
+        #region Retaliation
         if (permanent.HasRetaliation)
         {
             for (int i = 0; i < permanent.RetaliationCount; i++)
@@ -164,42 +173,56 @@ public class PermanentDetail : MonoBehaviour
         }
         #endregion
 
-        #region ジャミング
+        #region Jamming
         if (permanent.HasJamming)
         {
             effectString += $"- Jamming\n";
         }
         #endregion
 
-        #region 突進
+        #region Raid
         if (permanent.HasRaid)
         {
             effectString += $"- Raid\n";
         }
         #endregion
 
-        #region マインドリンク
+        #region Mind Link
         if (permanent.HasMindLink)
         {
             effectString += $"- Mind Link\n";
         }
         #endregion
 
-        #region 不屈
+        #region Fortitude
         if (permanent.HasFortitude)
         {
             effectString += $"- Fortitude\n";
         }
         #endregion
 
-        #region 進撃
+        #region Blitz
         if (permanent.HasBlitz)
         {
             effectString += $"- Blitz\n";
         }
         #endregion
 
-        #region セキュリティアタック変更
+        #region Collision
+        /*if (permanent.hascCollision)
+        {
+            effectString += $"- Collision\n";
+        }*/
+        #endregion
+
+        #region Partition
+        /*if (permanent.HasPartition)
+        {
+            effectString += $"- Partition\n";
+        }*/
+        #endregion
+
+        #region Security Attack Changes
         if (permanent.HasSecurityAttackChanges)
         {
             for (int i = 0; i < permanent.SecurityAttackChanges.Count; i++)
@@ -211,7 +234,7 @@ public class PermanentDetail : MonoBehaviour
         }
         #endregion
 
-        #region 効果
+        #region effect
         foreach (ICardEffect cardEffect in cardEffects)
         {
             if (cardEffect is IChangeSAttackEffect)

Assets/Scripts/TurnStateMachine.cs

@@ -495,7 +495,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         }
         #endregion
 
-        #region セキュリティを設置
+        #region set up security
         foreach (Player player in gameContext.Players_ForNonTurnPlayer)
         {
             yield return StartCoroutine(new IAddSecurityFromLibrary(player, 5).AddSecurity());
@@ -522,7 +522,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region アクティブフェイズ
+    #region Active Phase
     IEnumerator ActivePhase()
     {
         foreach (Permanent permanent in gameContext.TurnPlayer.GetFieldPermanents())
@@ -605,7 +605,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region ドローフェイズ
+    #region Draw Phase
     IEnumerator DrawPhase()
     {
         //ターン終了チェック
@@ -650,7 +650,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region 育成フェイズ
+    #region Breeding Phase
     IEnumerator BreedingPhase()
     {
         //ターン終了チェック
@@ -797,7 +797,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region メインフェイズ
+    #region main phase
     CardSource PlayCard { get; set; } = null;
     int TargetFrameID { get; set; } = 0;
     int[] JogressEvoRootsFrameIDs { get; set; } = new int[0];
@@ -1299,7 +1299,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         #endregion
     }
 
-    #region メインフェイズの操作を追加
+    #region Added main phase operations
     public IEnumerator SetMainPhase()
     {
         if (isSync)
@@ -1316,12 +1316,12 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
         IsSelecting = false;
 
-        #region リセット
+        #region reset
 
         OffFieldCardTarget(gameContext.TurnPlayer);
         OffHandCardTarget(gameContext.TurnPlayer);
 
-        #region 手札のカードを再配置
+        #region rearrange cards in hand
         GManager.instance.You.HandTransform.GetComponent<GridLayoutGroup>().enabled = false;
 
         foreach (HandCard handCard in GManager.instance.You.HandCards.Map(cardSource => cardSource.ShowingHandCard).Filter(handCard => handCard != null)
@@ -1339,7 +1339,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
         foreach (Player player in gameContext.Players)
         {
-            #region 場のパーマネントをリセット
+            #region Reset permanents in play
             foreach (FieldPermanentCard fieldPermanentCard in player.FieldPermanentObjects)
             {
                 fieldPermanentCard.RemoveSelectEffect();
@@ -1349,7 +1349,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             }
             #endregion
 
-            #region 手札のカードをリセット
+            #region Reset cards in hand
             foreach (HandCard handCard in player.HandCardObjects)
             {
                 handCard.RemoveSelectEffect();
@@ -1379,17 +1379,17 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         // added
         yield return new WaitWhile(() => isSync);
 
-        #region クリック・ドラッグ操作
+        #region Click/drag operation
         if (gameContext.TurnPlayer.isYou)
         {
-            #region 場のパーマネント
+            #region permanent of the place
             foreach (FieldPermanentCard fieldPermanentCard in gameContext.TurnPlayer.FieldPermanentObjects)
             {
                 if (fieldPermanentCard.gameObject.activeSelf && fieldPermanentCard.ThisPermanent.CanDeclareSkill() || fieldPermanentCard.ThisPermanent.CanAttack(null))
                 {
                     fieldPermanentCard.OnSelectEffect(1.1f);
 
-                    #region クリック操作を追加
+                    #region Add click operation
                     fieldPermanentCard.AddClickTarget((_fieldUnitCard) => StartCoroutine(OnClick_Select()));
 
                     IEnumerator OnClick_Select()
@@ -1401,7 +1401,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                         IsSelecting = true;
 
-                        #region 他の場のカードをリセット
+                        #region Reset cards in other places
                         foreach (FieldPermanentCard _fieldPermanentCard in gameContext.TurnPlayer.FieldPermanentObjects)
                         {
                             if (_fieldPermanentCard != fieldPermanentCard)
@@ -1416,7 +1416,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                         }
                         #endregion
 
-                        #region 手札のカードをリセット
+                        #region Reset cards in hand
                         foreach (HandCard handCard in gameContext.TurnPlayer.HandCardObjects)
                         {
                             handCard.RemoveSelectEffect();
@@ -1427,7 +1427,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                         List<CardCommand> FieldUnitCommands = new List<CardCommand>();
 
-                        #region 起動型効果
+                        #region activated effect
                         if (fieldPermanentCard.ThisPermanent.CanDeclareSkill())
                         {
                             List<ICardEffect> cardEffects = new List<ICardEffect>();
@@ -1450,7 +1450,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                     void OnClick_SetUseSkillPermanent_RPC()
                                     {
-                                        #region 場のカードをリセット
+                                        #region Reset cards on the field
                                         foreach (Player player in gameContext.Players)
                                         {
                                             foreach (FieldPermanentCard _fieldUnitCard in player.FieldPermanentObjects)
@@ -1470,7 +1470,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                         }
                         #endregion
 
-                        #region 攻撃
+                        #region attack
                         if (fieldPermanentCard.ThisPermanent.IsDigimon)
                         {
                             CardCommand SkillCommand = new CardCommand("Attack", () => StartCoroutine(OnClick_SetAttack_RPC()), fieldPermanentCard.ThisPermanent.CanAttack(null), DataBase.CommandColor_Attack);
@@ -1480,7 +1480,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                             {
                                 if (fieldPermanentCard.ThisPermanent.CanAttack(null))
                                 {
-                                    #region 場のカードをリセット
+                                    #region Reset cards on the field
                                     foreach (Player player in gameContext.Players)
                                     {
                                         foreach (FieldPermanentCard _fieldUnitCard in player.FieldPermanentObjects)
@@ -1497,7 +1497,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                     }
                                     #endregion
 
-                                    #region 直接攻撃のみ選択可能な場合
+                                    #region When only direct attack is available
                                     if (fieldPermanentCard.ThisPermanent.CanAttackTargetDigimon(null, null) && gameContext.NonTurnPlayer.GetBattleAreaDigimons().Count((permanent) => fieldPermanentCard.ThisPermanent.CanAttackTargetDigimon(permanent, null)) == 0)
                                     {
                                         if (fieldPermanentCard.ThisPermanent.CanAttackTargetDigimon(null, null))
@@ -1572,7 +1572,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                     }
                                     #endregion
 
-                                    #region 場のキャラを攻撃可能な場合
+                                    #region When it is possible to attack characters on the field
                                     else if (gameContext.NonTurnPlayer.GetBattleAreaDigimons().Count((permanent) => fieldPermanentCard.ThisPermanent.CanAttackTargetDigimon(permanent, null)) >= 1)
                                     {
                                         bool doAttack = false;
@@ -1954,17 +1954,17 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
             }
             #endregion
 
-            #region 手札のカード
+            #region cards in hand
             foreach (HandCard handCard in gameContext.TurnPlayer.HandCardObjects)
             {
-                #region ドラッグしてプレイ
+                #region drag and play
                 if (handCard.cardSource.CanPlayFromHandDuringMainPhase)
                 {
                     handCard.SetBlueOutline();
 
                     handCard.AddDragTarget(BeginDrag, OnDropCard, OnDragCard);
 
-                    #region ドラッグ開始時
+                    #region At the start of drag
                     void BeginDrag(HandCard handCard1)
                     {
                         if (isSync)
@@ -2473,7 +2473,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                     }
                     #endregion
 
-                    #region ドラッグ中
+                    #region While dragging
                     void OnDragCard(List<DropArea> dropAreas)
                     {
                         if (isSync)
@@ -2648,7 +2648,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                 }
                 #endregion
 
-                #region クリックして起動効果宣言
+                #region Click to declare activation effect
                 if (handCard.cardSource.CanDeclareSkill)
                 {
                     handCard.SetOrangeOutline();
@@ -2668,7 +2668,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                         IsSelecting = true;
 
-                        #region 場のカードをリセット
+                        #region Reset cards on the field
                         foreach (FieldPermanentCard fieldPermanentCard in gameContext.TurnPlayer.FieldPermanentObjects)
                         {
                             fieldPermanentCard.RemoveSelectEffect();
@@ -2684,7 +2684,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                         }
                         #endregion
 
-                        #region 手札のカードをリセット
+                        #region Reset cards in hand
                         foreach (HandCard handCard1 in gameContext.TurnPlayer.HandCardObjects)
                         {
                             handCard.Outline_Select.gameObject.SetActive(false);
@@ -2696,7 +2696,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                         List<CardCommand> FieldUnitCommands = new List<CardCommand>();
 
-                        #region 起動効果コマンドを開く
+                        #region Open launch effect command
                         if (handCard.cardSource.CanDeclareSkill)
                         {
                             List<ICardEffect> cardEffects = new List<ICardEffect>();
@@ -2719,7 +2719,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
                                     void OnClick_SetUseSkillUnit_RPC()
                                     {
-                                        #region 場のカードをリセット
+                                        #region Reset cards on the field
                                         foreach (Player player in gameContext.Players)
                                         {
                                             foreach (FieldPermanentCard fieldPermanentCard in player.FieldPermanentObjects)
@@ -2733,7 +2733,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
                                         }
                                         #endregion
 
-                                        #region 手札のカードをリセット
+                                        #region Reset cards in hand
                                         foreach (HandCard handCard1 in gameContext.TurnPlayer.HandCardObjects)
                                         {
                                             handCard.Outline_Select.gameObject.SetActive(false);
@@ -2907,7 +2907,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     }
     #endregion
 
-    #region UI表示・クリック・ドラッグ操作をリセット
+    #region Reset UI display/click/drag operations
     void ResetUI()
     {
         foreach (Player player in gameContext.Players)
@@ -3027,15 +3027,15 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
     #endregion
 
-    #region 終了フェイズ
+    #region end phase
     public bool Passed { get; set; } = true;
     IEnumerator EndPhase()
     {
-        #region ログ追加
+        #region Add log
         GManager.instance.playLog.AddLogString($"\nEnd Turn:\n{gameContext.TurnPlayer.PlayerName}\n");
         #endregion
 
-        #region 選択状態を解除
+        #region Deselect
         OffHandCardTarget(gameContext.TurnPlayer);
         OffFieldCardTarget(gameContext.TurnPlayer);
         #endregion
@@ -3048,10 +3048,10 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
 
         isFirstPlayerFirstTurn = false;
 
-        //自動処理チェックタイミング
+        //Automatic processing check timing
         yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing.AutoProcessCheck());
 
-        #region ターン終了時までの状態をリセット
+        #region Reset status until end of turn
         GManager.instance.attackProcess.AttackCount = 0;
 
         foreach (Player player in gameContext.Players)
@@ -3083,7 +3083,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
         }
         #endregion
 
-        #region 効果の使用回数をリセット
+        #region Reset the number of times the effect is used
         foreach (CardSource cardSource in gameContext.ActiveCardList)
         {
             cardSource.cEntity_EffectController.InitUseCountThisTurn();
@@ -3123,7 +3123,7 @@ public class TurnStateMachine : MonoBehaviourPunCallbacks
     #endregion
     #endregion
 
-    #region ゲーム終了
+    #region Game over
     public bool endGame { get; set; } = false;
     public void OnClickSurrenderButton()
     {