Browse Source

1.6.6 build

mbunch_kascope 1 year ago
parent
commit
d07d248f41

+ 2 - 2
Assets/CardEffect/BT19/Purple/BT19_088.cs

@@ -115,7 +115,7 @@ namespace DCGO.CardEffects.BT19
                         {
                             bool CanSelectCardCondition(CardSource cardSource)
                             {
-                                return cardSource.EqualsCardName("Beelzemon") && cardSource.CanPlayCardTargetFrame(selectedPermanent.PermanentFrame, false, activateClass, ignore:CardEffectCommons.IgnoreRequirement.All);
+                                return cardSource.EqualsCardName("Beelzemon");
                             }
 
                             bool canSelectHand = CardEffectCommons.HasMatchConditionOwnersHand(card, CanSelectCardCondition);
@@ -152,7 +152,7 @@ namespace DCGO.CardEffects.BT19
                                 yield return ContinuousController.instance.StartCoroutine(CardEffectCommons.DigivolveIntoHandOrTrashCard(
                                     targetPermanent: selectedPermanent,
                                     cardCondition: CanSelectCardCondition,
-                                    payCost: false,
+                                    payCost: true,
                                     reduceCostTuple: null,
                                     fixedCostTuple: null,
                                     ignoreDigivolutionRequirementFixedCost: 4,

+ 2 - 2
Assets/CardEffect/BT19/Red/BT19_090.cs

@@ -48,7 +48,7 @@ namespace DCGO.CardEffects.BT19
                     return CardEffectCommons.IsOwnerPermanent(permanent, card) &&
                            permanent.TopCard.EqualsCardName("Shoutmon EX6") &&
                            !permanent.TopCard.CanNotBeAffected(activateClass) &&
-                           !permanent.IsSuspended && permanent.CanSuspend;
+                           permanent.IsSuspended;
                 }
 
                 bool IsUnsuspendedStarmonCondition(Permanent permanent)
@@ -56,7 +56,7 @@ namespace DCGO.CardEffects.BT19
                     return CardEffectCommons.IsOwnerPermanent(permanent, card) &&
                            permanent.TopCard.EqualsCardName("ShootingStarmon") &&
                            !permanent.TopCard.CanNotBeAffected(activateClass) &&
-                           !permanent.IsSuspended && permanent.CanSuspend;
+                           permanent.IsSuspended;
                 }
 
                 bool IsYourDigimon(Permanent permanent)

+ 53 - 47
Assets/CardEffect/BT19/Yellow/BT19_031.cs

@@ -104,7 +104,7 @@ namespace DCGO.CardEffects.BT19
 
                 bool IsPickmonsCardCondition(CardSource cardSource)
                 {
-                    return cardSource.IsDigimon && cardSource.EqualsCardName("Pickmons");
+                    return cardSource.IsDigiEgg && cardSource.EqualsCardName("Pickmons");
                 }
 
                 bool CanActivateCondition(Hashtable hashtable)
@@ -209,53 +209,59 @@ namespace DCGO.CardEffects.BT19
 
                         SelectCardEffect selectCardEffect = GManager.instance.GetComponent<SelectCardEffect>();
 
-                        selectCardEffect.SetUp(
-                            canTargetCondition: IsStarmonsCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            canNoSelect: () => true,
-                            selectCardCoroutine: SelectCardCoroutine,
-                            afterSelectCardCoroutine: null,
-                            message: "Select 1 [Starmons] to place on bottom of digivolution cards.",
-                            maxCount: 1,
-                            canEndNotMax: true,
-                            isShowOpponent: true,
-                            mode: SelectCardEffect.Mode.Custom,
-                            root: SelectCardEffect.Root.Trash,
-                            customRootCardList: null,
-                            canLookReverseCard: true,
-                            selectPlayer: card.Owner,
-                            cardEffect: activateClass);
-
-                        selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
-                        selectCardEffect.SetUpCustomMessage("Select 1 [Starmons] to place on bottom of digivolution cards.",
-                            "The opponent is selecting 1 [Starmons] to place on bottom of digivolution cards.");
-
-                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
-
-                        selectCardEffect.SetUp(
-                            canTargetCondition: IsPickmonsCardCondition,
-                            canTargetCondition_ByPreSelecetedList: null,
-                            canEndSelectCondition: null,
-                            canNoSelect: () => true,
-                            selectCardCoroutine: SelectCardCoroutine,
-                            afterSelectCardCoroutine: null,
-                            message: "Select 1 [Pickmons] to place on bottom of digivolution cards.",
-                            maxCount: 1,
-                            canEndNotMax: true,
-                            isShowOpponent: true,
-                            mode: SelectCardEffect.Mode.Custom,
-                            root: SelectCardEffect.Root.Trash,
-                            customRootCardList: null,
-                            canLookReverseCard: true,
-                            selectPlayer: card.Owner,
-                            cardEffect: activateClass);
-
-                        selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
-                        selectCardEffect.SetUpCustomMessage("Select 1 [Pickmons] to place on bottom of digivolution cards.",
-                            "The opponent is selecting 1 [Pickmons] to place on bottom of digivolution cards.");
+                        if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsStarmonsCardCondition))
+                        {
+                            selectCardEffect.SetUp(
+                                canTargetCondition: IsStarmonsCardCondition,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                canNoSelect: () => true,
+                                selectCardCoroutine: SelectCardCoroutine,
+                                afterSelectCardCoroutine: null,
+                                message: "Select 1 [Starmons] to place on bottom of digivolution cards.",
+                                maxCount: 1,
+                                canEndNotMax: true,
+                                isShowOpponent: true,
+                                mode: SelectCardEffect.Mode.Custom,
+                                root: SelectCardEffect.Root.Trash,
+                                customRootCardList: null,
+                                canLookReverseCard: true,
+                                selectPlayer: card.Owner,
+                                cardEffect: activateClass);
+
+                            selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
+                            selectCardEffect.SetUpCustomMessage("Select 1 [Starmons] to place on bottom of digivolution cards.",
+                                "The opponent is selecting 1 [Starmons] to place on bottom of digivolution cards.");
+
+                            yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+                        }
 
-                        yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+                        if (CardEffectCommons.HasMatchConditionOwnersCardInTrash(card, IsPickmonsCardCondition))
+                        {
+                            selectCardEffect.SetUp(
+                                canTargetCondition: IsPickmonsCardCondition,
+                                canTargetCondition_ByPreSelecetedList: null,
+                                canEndSelectCondition: null,
+                                canNoSelect: () => true,
+                                selectCardCoroutine: SelectCardCoroutine,
+                                afterSelectCardCoroutine: null,
+                                message: "Select 1 [Pickmons] to place on bottom of digivolution cards.",
+                                maxCount: 1,
+                                canEndNotMax: true,
+                                isShowOpponent: true,
+                                mode: SelectCardEffect.Mode.Custom,
+                                root: SelectCardEffect.Root.Trash,
+                                customRootCardList: null,
+                                canLookReverseCard: true,
+                                selectPlayer: card.Owner,
+                                cardEffect: activateClass);
+
+                            selectCardEffect.SetUpCustomMessage_ShowCard("Digivolution Card");
+                            selectCardEffect.SetUpCustomMessage("Select 1 [Pickmons] to place on bottom of digivolution cards.",
+                                "The opponent is selecting 1 [Pickmons] to place on bottom of digivolution cards.");
+
+                            yield return ContinuousController.instance.StartCoroutine(selectCardEffect.Activate());
+                        }
 
                         yield return ContinuousController.instance.StartCoroutine(playedPermanent[0]
                             .AddDigivolutionCardsBottom(selectedSourceCards, activateClass));

+ 2 - 2
Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7b334d52fdf83e98215fbe8719c62f376a9728fb4c9ab8ac46effd7f20317c16
-size 2501
+oid sha256:8a194ad4aedcc1c90d10912af25c086c0216d7bd54aceeee43e6e7c6f568979f
+size 2543

+ 30 - 15
Assets/Scripts/GManager.cs

@@ -488,7 +488,6 @@ public class GManager : MonoBehaviourPun
             photonView.RPC("DrawCardRPC", RpcTarget.Others);
             StartCoroutine(DrawCard(You));
         }
-           
 
         //Trash a card
         if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.T))
@@ -496,28 +495,32 @@ public class GManager : MonoBehaviourPun
             photonView.RPC("TrashCardRPC", RpcTarget.Others);
             StartCoroutine(TrashCard(You));
         }
-            
 
         //Top deck a card
         if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.L))
-            StartCoroutine(TopDeckCard());
+        {
+            photonView.RPC("TopDeckCardRPC", RpcTarget.Others);
+            StartCoroutine(TopDeckCard(You));
+        }
 
         //Place Top Security
         if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.R))
-            StartCoroutine(PlaceInSecurity());
+        {
+            photonView.RPC("PlaceInSecurityRPC", RpcTarget.Others);
+            StartCoroutine(PlaceInSecurity(You));
+        }
 
         //Gain Memory
         if(Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Equals))
         {
-            photonView.RPC("AlterMemoryRPC", RpcTarget.Others, 1);
+            photonView.RPC("AlterMemoryRPC", RpcTarget.Others, -1);
             StartCoroutine(AlterMemory(You, 1));
         }
-            
 
         //Lose Memory
         if (Input.GetKey(KeyCode.LeftControl) && Input.GetKeyDown(KeyCode.Minus))
         {
-            photonView.RPC("AlterMemoryRPC", RpcTarget.Others, -1);
+            photonView.RPC("AlterMemoryRPC", RpcTarget.Others, 1);
             StartCoroutine(AlterMemory(You, -1));
         }
             
@@ -535,6 +538,18 @@ public class GManager : MonoBehaviourPun
         StartCoroutine(TrashCard(Opponent));
     }
 
+    [PunRPC]
+    public void TopDeckCardRPC()
+    {
+        StartCoroutine(TopDeckCard(Opponent));
+    }
+
+    [PunRPC]
+    public void PlaceInSecurityRPC()
+    {
+        StartCoroutine(PlaceInSecurity(Opponent));
+    }
+
     [PunRPC]
     public void AlterMemoryRPC(int value)
     {
@@ -567,9 +582,9 @@ public class GManager : MonoBehaviourPun
             canTargetCondition: (CardSource) => true,
             canTargetCondition_ByPreSelecetedList: null,
             canEndSelectCondition: null,
-            maxCount: 1,
+            maxCount: _player.HandCards.Count,
             canNoSelect: true,
-            canEndNotMax: false,
+            canEndNotMax: true,
             isShowOpponent: true,
             selectCardCoroutine: null,
             afterSelectCardCoroutine: null,
@@ -581,18 +596,18 @@ public class GManager : MonoBehaviourPun
         yield return StartCoroutine(turnStateMachine.SetMainPhase());
     }
 
-    IEnumerator TopDeckCard()
+    IEnumerator TopDeckCard(Player _player)
     {
         SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
         selectHandEffect.SetUp(
-            selectPlayer: You,
+            selectPlayer: _player,
             canTargetCondition: (CardSource) => true,
             canTargetCondition_ByPreSelecetedList: null,
             canEndSelectCondition: null,
-            maxCount: 1,
+            maxCount: _player.HandCards.Count,
             canNoSelect: true,
-            canEndNotMax: false,
+            canEndNotMax: true,
             isShowOpponent: true,
             selectCardCoroutine: null,
             afterSelectCardCoroutine: null,
@@ -604,14 +619,14 @@ public class GManager : MonoBehaviourPun
         yield return StartCoroutine(turnStateMachine.SetMainPhase());
     }
 
-    IEnumerator PlaceInSecurity()
+    IEnumerator PlaceInSecurity(Player _player)
     {
         CardSource selectedSource = null;
 
         SelectHandEffect selectHandEffect = GManager.instance.GetComponent<SelectHandEffect>();
 
         selectHandEffect.SetUp(
-            selectPlayer: You,
+            selectPlayer: _player,
             canTargetCondition: (CardSource) => true,
             canTargetCondition_ByPreSelecetedList: null,
             canEndSelectCondition: null,

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79f7a9d5489afcddea31bbc4d75d64460f27499de3fc1bd1930647b51941e2c1
+oid sha256:ca3ddbaf32c10f52856f44f7d3c68354b0bc2f115d3c0061efcb9bfb69d42704
 size 20168