Merge branch 'UpdatedLeaderboardLogic' of https://github.com/Gamify-I…

…T/overworld into UpdatedLeaderboardLogic
Gamify-IT · Nov 19, 2024 · 1b3bfb9 · 1b3bfb9
2 parents 0db248d + 9c3db19
commit 1b3bfb9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 46 deletions.
diff --git a/Assets/Scripts/GameManager/DataManager.cs b/Assets/Scripts/GameManager/DataManager.cs
@@ -42,7 +42,7 @@ public class DataManager : MonoBehaviour
     [SerializeField] private List<RuntimeAnimatorController> characterAnimators;
     [SerializeField] private List<Sprite> characterHeads;
     private PlayerAnimation animationScript;
-    private Image minimapHead;
+    private CharacterSelection characterSelectionScript;
 
     void Start()
     {
@@ -365,29 +365,8 @@ public void SetupCharacter()
         string selectedBody = playerData.GetCurrentCharacter();
         string selectedHead = playerData.GetCurrentAccessory();
         animationScript.SetOutfitAnimator(selectedBody, selectedHead);
-
-        minimapHead = GameObject.FindGameObjectsWithTag("MinimapFace")[0].GetComponent<Image>();
-        switch (characterIndex)
-        {
-            case 1:
-                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character1_face");
-                break;
-            case 2:
-                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character2_face");
-                break;
-            case 6:
-                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character6_face");
-                break;
-            case 7:
-                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character7_face");
-                break;
-            case 8:
-                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character8_face");
-                break;
-            default:
-                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character0345_face");
-                break;
-        }
+        characterSelectionScript = GameObject.FindObjectOfType<CharacterSelection>();
+        characterSelectionScript.ChangeMinimapFace();
     }
 
     /// <summary>

diff --git a/Assets/Scripts/HUD/CharacterSelection.cs b/Assets/Scripts/HUD/CharacterSelection.cs
@@ -508,28 +508,7 @@ public void ConfirmButton()
         }
         else
         {
-            switch(currentIndex)
-            {
-                case 1:
-                    minimapHead.sprite = Resources.Load<Sprite>("Minimap/character1_face");
-                    break;
-                case 2:
-                    minimapHead.sprite = Resources.Load<Sprite>("Minimap/character2_face");
-                    break;
-                case 6:
-                    minimapHead.sprite = Resources.Load<Sprite>("Minimap/character6_face");
-                    break;
-                case 7:
-                    minimapHead.sprite = Resources.Load<Sprite>("Minimap/character7_face");
-                    break;
-                case 8:
-                    minimapHead.sprite = Resources.Load<Sprite>("Minimap/character8_face");
-                    break;
-                default:
-                    minimapHead.sprite = Resources.Load<Sprite>("Minimap/character0345_face");
-                    break;
-            }
-
+            ChangeMinimapFace();
 
             animationScript.SetOutfitAnimator(selectedBody, selectedHead);
             ownData.SetCurrentCharacter(selectedBody);
@@ -542,6 +521,30 @@ public void ConfirmButton()
         }
     }
 
+    public void ChangeMinimapFace() {
+        switch (currentIndex)
+        {
+            case 1:
+                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character1_face");
+                break;
+            case 2:
+                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character2_face");
+                break;
+            case 6:
+                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character6_face");
+                break;
+            case 7:
+                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character7_face");
+                break;
+            case 8:
+                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character8_face");
+                break;
+            default:
+                minimapHead.sprite = Resources.Load<Sprite>("Minimap/character0345_face");
+                break;
+        }
+    }
+
     public void CloseWarningPanel()
     {
         warningPanel.SetActive(false);