fix: Change how Selection Managers turns on/off outline as well as reduce some dependencies

Author: KironStylo

Assets/Scripts/Activities/Activity1/Act1GameController.cs

@@ -303,8 +303,16 @@ public void UpdateGameQuest()
     //Check if the completed levels are two
     public void CheckLevelsCompleted()
     {
+        int passedLevels = 0;
+
+        for (int i = 0; i < levelsCompleted.Count; i++)
+        {
+            if (levelsCompleted[i])
+              passedLevels++;
+        }
+
         // Look in the list of level completed if the two levels are completed
-        if (levelsCompleted[0] && levelsCompleted[1])
+        if (passedLevels >= 2)
         {
             // Call the game manager to complete the questionnaire
             UpdateGameQuest();
@@ -315,6 +323,8 @@ public void QuitActivityOne()
     {
         AudioManager.Instance.PlaySound(SoundType.ActivityBtnSfx);
         Activity.Instance.activityOne.SetActive(false);
+        SelectionManager.instance.isInteracting = false;
+        SelectionManager.instance.canHighlight = true;
         EnableWorldMap();
     }
 

Assets/Scripts/Activities/Activity2/Act2GameController.cs

@@ -266,8 +266,9 @@ public void CheckLevelsCompleted()
     public void QuitActivityTwo()
     {
         AudioManager.Instance.PlaySound(SoundType.ActivityBtnSfx);
-
         Activity.Instance.activityThree.SetActive(false);
+        SelectionManager.instance.isInteracting = false;
+        SelectionManager.instance.canHighlight = true;
         EnableWorldMap();
     }
 

Assets/Scripts/Activities/Activity3/Act3GameController.cs

@@ -57,7 +57,9 @@ public void UpdateGameQuest()
     public void QuitActivityThree()
     {
         AudioManager.Instance.PlaySound(SoundType.ActivityBtnSfx);
-        Activity.Instance.activityTwo.SetActive(false);   
+        Activity.Instance.activityTwo.SetActive(false);
+        SelectionManager.instance.isInteracting = false;
+        SelectionManager.instance.canHighlight = true;
         EnableWorldMap();
     }
 

Assets/Scripts/Dialogue/DialogueManager.cs

@@ -78,6 +78,7 @@ void Update()
     public void StartConversation(TextAsset inkJSON)
     {
         SelectionManager.instance.isInteracting = true;
+        SelectionManager.instance.canHighlight = false;
         DisableObjects.Instance.ToggleSelectionCursor();
         DisableObjects.Instance.ToggleTooltip();
         DisableObjects.Instance.disableCharacterController();
@@ -103,6 +104,7 @@ private void EndDialogue()
         isTalking = false;
         dialogueUI.dialogueUI.SetActive(false);
         SelectionManager.instance.isInteracting = false;
+        SelectionManager.instance.canHighlight = true;
         EventManager.Photograph.OnActiveCamera(true);
         DisableObjects.Instance.ToggleSelectionCursor();
         DisableObjects.Instance.ToggleTooltip();

Assets/Scripts/Interactable Objects/Activity/Activity.cs

@@ -42,6 +42,8 @@ public override void Interact()
         DisableObjects.Instance.disableCharacterController();
         DisableObjects.Instance.disableCameras();
         DisableObjects.Instance.disableSwitchCamera();
+        SelectionManager.instance.canHighlight = false;
+        SelectionManager.instance.isInteracting = true;
 
         if(itemName == "Activity1"){
             activityOne.SetActive(true);

Assets/Scripts/Interactable Objects/Characters/Character.cs

@@ -44,14 +44,7 @@ public void Update()
 
     public override void Interact()
     {
-
-        if (!DialogueManager.instance.isTalking)
-        {
-            DialogueManager.instance.StartConversation(inkJSON);
-
-            //CameraUtilityManager.Instance.SetCameraOnCharacter(transform);
-        }
-
+        DialogueManager.instance.StartConversation(inkJSON);
     }
 
     protected override void handleCollision(Collider other)

Assets/Scripts/Interactable Objects/Letter/Letter.cs

@@ -34,7 +34,6 @@ public class Letter : InteractableObject
 
     public override void Interact()
     {
-        base.Interact(); // Do not remove - child calls parent method
 
         DisableObjects.Instance.disableSwitchCamera();
         DisableObjects.Instance.disableCameras();
@@ -44,13 +43,17 @@ public override void Interact()
 
         if (toggle)
         {
+            SelectionManager.instance.canHighlight = false;
+            SelectionManager.instance.oneTimeInteraction = true;
             turnOn();
             EventManager.Photograph.OnActiveCamera(false);
             EventManager.QuestUI.OnLockQuestUI();
             EventManager.Minimap.OnLockMiniMap();
         }
         else
         {
+            SelectionManager.instance.canHighlight = true;
+            SelectionManager.instance.oneTimeInteraction = false;
             turnOff();
             EventManager.Photograph.OnActiveCamera(true);
             EventManager.QuestUI.OnUnlockQuestUI();

Assets/Scripts/Interactable Objects/TV/TV.cs

@@ -47,8 +47,6 @@ public class TV : InteractableObject
     // Interact with the TV
     public override void Interact()
     {
-        base.Interact(); // Do not remove - child calls parent method
-
         disableObjects.TogglePlayer();
         disableObjects.ToggleSelectionCursor();
 
@@ -65,13 +63,17 @@ public override void Interact()
 
         if (isOn)
         {
+            SelectionManager.instance.oneTimeInteraction = true;
+            SelectionManager.instance.canHighlight = false;
             EventManager.Minimap.OnLockMiniMap.Invoke();
             EventManager.Photograph.OnActiveCamera(false);
             AudioManager.Instance.PlaySound(SoundType.TVOn);
             ActiveTV();
         }
         else
         {
+            SelectionManager.instance.oneTimeInteraction = false;
+            SelectionManager.instance.canHighlight = true;
             EventManager.Minimap.OnUnlockMiniMap.Invoke();
             EventManager.Photograph.OnActiveCamera(true);
             AudioManager.Instance.PlaySound(SoundType.TvOff);

Assets/Scripts/Interaction System/SelectionManager.cs

@@ -12,6 +12,8 @@ public class SelectionManager : MonoBehaviour
     public static SelectionManager instance;
     public bool isInteracting;
     public bool onTarget;
+    public bool canHighlight;
+    public bool oneTimeInteraction;
 
     [SerializeField]
     private GameObject textBox;
@@ -36,6 +38,7 @@ private void Awake()
     private void Start()
     {
         onTarget = false;
+        canHighlight = true;
         interaction_text = textBox.GetComponentInChildren<Image>().GetComponentInChildren<TextMeshProUGUI>();
     }
 
@@ -58,23 +61,21 @@ void Update()
 
             interactable = selectionTransform.GetComponent<InteractableObject>();
 
-            if (interactable != null && interactable.playerInRange && !WallAlertUI.state)
+            if (interactable != null && (interactable.playerInRange || oneTimeInteraction) && !isInteracting)
             {
                 if (interactable != lastInteractable)
                 {
                     lastInteractable = interactable;
                 }
 
 
-                interactable.GetComponent<Outline>().enabled = !isInteracting;
+                interactable.GetComponent<Outline>().enabled = canHighlight;
                 SetText(interactable.GetSelectionPrompt());
 
                 if (Input.GetKeyDown(KeyCode.E))
                 {
-                    if (!DialogueManager.instance.isTalking)
-                    {
-                        interactable.Interact();
-                    }
+                    Debug.Log("Interacting with " + interactable.name);
+                    interactable.Interact();
                 }
             }
             else

Assets/Scripts/UI/Alert/Wall/WallAlertUI.cs

@@ -8,7 +8,6 @@ public class WallAlertUI : MonoBehaviour
 {
     public GameObject alertWall;
     private TextMeshProUGUI alertWallText;
-    public static bool state;
 
     void OnEnable()
     {
@@ -28,9 +27,9 @@ public void Start()
 
     public void setActiveAlertWall(int module, bool state)
     {
-        WallAlertUI.state = state;
-        Debug.Log("Current wall state is " + WallAlertUI.state);
-        alertWall.SetActive(WallAlertUI.state);
+        SelectionManager.instance.isInteracting = state;
+        Debug.Log("Current wall state is " + state);
+        alertWall.SetActive(state);
         alertWallText.text = "No puedes pasar sin antes completar todas las tareas del módulo " + module;
     }  
 }