- Added a separate slider for helper token scale - Added the screensh…

…ot button to the Widow - Various bug fixes
ddbrown30 · Jun 23, 2020 · 201f2c4 · 201f2c4
1 parent ccf569f
commit 201f2c4
Show file tree

Hide file tree

Showing 6 changed files with 255 additions and 25 deletions.
diff --git a/Assets/GrimoireManager.cs b/Assets/GrimoireManager.cs
@@ -30,7 +30,8 @@ public class GrimoireManager : MonoBehaviour
 
     public float MinTokenScale = 0.5f;
     public float MaxTokenScale = 2f;
-    public Slider ScaleSlider;
+    public Slider RoleScaleSlider;
+    public Slider HelperScaleSlider;
 
     private float TownRadius;
     public float MinTokenRadius = 300f;
@@ -92,7 +93,8 @@ public void AddToken(RoleData roleData)
             grimoireToken.AddHelperToken(helperToken);
         }
 
-        grimoireToken.SetScale(Mathf.Lerp(MinTokenScale, MaxTokenScale, ScaleSlider.value));
+        grimoireToken.SetRoleTokenScale(Mathf.Lerp(MinTokenScale, MaxTokenScale, RoleScaleSlider.value));
+        grimoireToken.SetHelperTokenScale(Mathf.Lerp(MinTokenScale, MaxTokenScale, HelperScaleSlider.value));
 
         UpdateGrimoire();
         UpdateRoleCounts();
@@ -304,13 +306,23 @@ public void OnClickRandomize()
         ModalPanel.MessageBox("Randomize player positions?", RandomizeGrimoire, null, null, null, "YesNo");
     }
 
-    public void ScaleSliderChanged(float value)
+    public void RoleScaleSliderChanged(float value)
     {
         Vector2 scale = Vector3.one * Mathf.Lerp(MinTokenScale, MaxTokenScale, value);
 
         foreach (var token in RoleTokens)
         {
-            token.SetScale(Mathf.Lerp(MinTokenScale, MaxTokenScale, ScaleSlider.value));
+            token.SetRoleTokenScale(Mathf.Lerp(MinTokenScale, MaxTokenScale, RoleScaleSlider.value));
+        }
+    }
+
+    public void HelperScaleSliderChanged(float value)
+    {
+        Vector2 scale = Vector3.one * Mathf.Lerp(MinTokenScale, MaxTokenScale, value);
+
+        foreach (var token in RoleTokens)
+        {
+            token.SetHelperTokenScale(Mathf.Lerp(MinTokenScale, MaxTokenScale, HelperScaleSlider.value));
         }
 
         foreach (var token in AlignmentTokens)
@@ -346,7 +358,7 @@ public void AddAlignmentToken()
         GameObject tokenObj = Instantiate(AlignmentTokenPrefab);
         tokenObj.GetComponent<RectTransform>().anchoredPosition = gameObject.GetComponent<RectTransform>().anchoredPosition;
         tokenObj.transform.SetParent(AlignmentTokenAttach.transform);
-        tokenObj.transform.localScale = Vector3.one * Mathf.Lerp(MinTokenScale, MaxTokenScale, ScaleSlider.value);
+        tokenObj.transform.localScale = Vector3.one * Mathf.Lerp(MinTokenScale, MaxTokenScale, HelperScaleSlider.value);
         tokenObj.transform.localPosition = Vector3.zero;
         AlignmentTokens.Add(tokenObj);
     }

diff --git a/Assets/GrimoireToken.cs b/Assets/GrimoireToken.cs
@@ -113,9 +113,13 @@ public void SetIsBluffToken()
         GetComponentInChildren<Button>().enabled = false;
     }
 
-    public void SetScale(float scale)
+    public void SetRoleTokenScale(float scale)
     {
         transform.localScale = Vector3.one * scale;
+    }
+
+    public void SetHelperTokenScale(float scale)
+    {
         foreach (var token in HelperTokens)
         {
             token.transform.localScale = Vector3.one * scale;

diff --git a/Assets/HelperTokenPrefab.prefab b/Assets/HelperTokenPrefab.prefab
@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 80, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2645495215630745708
 CanvasRenderer:

diff --git a/Assets/NightEntry.cs b/Assets/NightEntry.cs
@@ -13,7 +13,7 @@ public class NightEntry : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl
     public void SetRoleData(RoleData roleData)
     {
         RoleData = roleData;
-        if (RoleData && RoleData.RoleName == "Spy")
+        if (RoleData && (RoleData.RoleName == "Spy" || RoleData.RoleName == "Widow"))
             TakeScreenshotButton.SetActive(true);
     }
 

diff --git a/Assets/RoleData/Unreleased/Townsfolk/FishermanData.asset b/Assets/RoleData/Unreleased/Townsfolk/FishermanData.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
   RoleName: Fisherman
   RoleType: 0
   FirstNightOrder: -1
-  OtherNightOrder: 29
+  OtherNightOrder: -1
   IsNightOrderAfterDawn: 0
   RoleTokenSprite: {fileID: 21300000, guid: e9074df03c8171e4f980c5638c82b509, type: 3}
   HelperTokenSprites: