fix: Minor Bugs

christiankyle-ching · Nov 16, 2021 · 5541c61 · 5541c61
1 parent 85789f3
commit 5541c61
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/Assets/Prefabs/SP/SPCardInfo.cs b/Assets/Prefabs/SP/SPCardInfo.cs
@@ -60,4 +60,10 @@ public static Sprite GetColoredSprite(CARDCOLOR color)
                 return Resources.Load<Sprite>("Cards/Templates/Orange");
         }
     }
+
+    public void RevealCard()
+    {
+        isRevealed = true;
+        GetComponent<Animator>().SetTrigger("Correct");
+    }
 }
diff --git a/Assets/Prefabs/SP/SPCardZoom.cs b/Assets/Prefabs/SP/SPCardZoom.cs
@@ -59,10 +59,17 @@ void ZoomCard()
         zoomCard = Instantiate(zoomCardPrefab);
         zoomCard.transform.SetParent(canvas, false);
         zoomCard.transform.localPosition = new Vector2(0f, 0f);
-        
+
         CardData data = GetComponent<SPCardInfo>().cardData;
         zoomCard.GetComponent<SPCardInfo>().InitCardData(data);
-        zoomCard.GetComponent<Animator>().SetTrigger("Zoom");
+        if (GetComponent<SPCardInfo>().isRevealed)
+        {
+            zoomCard.GetComponent<Animator>().SetTrigger("ZoomWithYear");
+        }
+        else
+        {
+            zoomCard.GetComponent<Animator>().SetTrigger("Zoom");
+        }
     }
 
     public void UnzoomCard()

diff --git a/Assets/Prefabs/SP/SPDragDrop.cs b/Assets/Prefabs/SP/SPDragDrop.cs
@@ -148,7 +148,6 @@ public void OnDiscard()
 
     public void OnPlaceCorrect()
     {
-        GetComponent<Animator>().SetTrigger("Correct");
         DisableDrag();
     }
 

diff --git a/Assets/Scripts/Game & Assessment/MP/MPGameManager.cs b/Assets/Scripts/Game & Assessment/MP/MPGameManager.cs
@@ -598,7 +598,7 @@ public void OnPlayerQuit(string playerName, bool isHost = false)
 
     // TODO: Set in Prod
     [Range(0f, 1f)]
-    private float specialActionRate = 0.15f; // 0.0 to 1.0 = Percentage of special action
+    private float specialActionRate = 0.3f; // 0.0 to 1.0 = Percentage of special action
 
     public SPECIALACTION GetRandomSpecialAction()
     {

diff --git a/Assets/Scripts/Game & Assessment/MP/PlayerManager.cs b/Assets/Scripts/Game & Assessment/MP/PlayerManager.cs
@@ -488,7 +488,7 @@ public void TargetPeekCard(NetworkConnection conn)
 
         if (cardCount > 0)
         {
-            int randIndex = UnityEngine.Random.Range(0, cardCount);
+            int randIndex = UnityEngine.Random.Range(0, cardCount - 1);
             playerArea.transform.GetChild(randIndex).GetComponent<MPCardInfo>().RevealCard();
         }
     }

diff --git a/Assets/Scripts/Game & Assessment/SP/SPGameController.cs b/Assets/Scripts/Game & Assessment/SP/SPGameController.cs
@@ -264,6 +264,8 @@ public void HandleDropInTimeline(GameObject droppedCard, int dropPos)
             {
                 droppedCard.GetComponent<SPDragDrop>().ReplacePlaceholder();
                 droppedCard.GetComponent<SPDragDrop>().OnPlaceCorrect();
+                droppedCard.GetComponent<SPCardInfo>().RevealCard();
+
                 playerStats.CorrectDrop();
 
                 messenger.ShowMessage("Good Job! That's correct.", MPGameMessageType.CORRECT);
@@ -446,7 +448,11 @@ private void SpawnCard(CardData data, Transform container, bool showYear = false
         card.GetComponent<SPCardInfo>().cardData = data;
         card.GetComponent<SPCardInfo>().InitCardData(data);
 
-        if (showYear) card.GetComponent<SPDragDrop>().OnPlaceCorrect();
+        if (showYear)
+        {
+            card.GetComponent<SPDragDrop>().OnPlaceCorrect();
+            card.GetComponent<SPCardInfo>().RevealCard();
+        }
 
         card.transform.SetParent(container, false);
     }