Fix lifeline bug

daniel-keogh · Mar 23, 2021 · f400640 · f400640
1 parent ad78599
commit f400640
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/Assets/__Scripts/UI/AnswerButton.cs b/Assets/__Scripts/UI/AnswerButton.cs
@@ -31,6 +31,9 @@ public class AnswerButton : MonoBehaviour
     private SoundController sc;
     private List<AnswerButton> answerButtons;
 
+    public Answer AnswerValue => answerValue;
+    public bool IsDisabled => isDisabled;
+
     void Start()
     {
         gc = FindObjectOfType<GameController>();

diff --git a/Assets/__Scripts/UI/LifelinesUI.cs b/Assets/__Scripts/UI/LifelinesUI.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 using OpenTDB;
@@ -121,7 +122,19 @@ private string GetLifelineAnswer()
         }
         else
         {
-            return Enum.RandomValue<Answer>().ToString();
+            // Get a random (and not disabled) answer
+            var buttons = FindObjectsOfType<AnswerButton>();
+
+            do
+            {
+                Answer value = Enum.RandomValue<Answer>();
+                AnswerButton button = buttons.First(b => b.AnswerValue == value);
+
+                if (!button.IsDisabled)
+                {
+                    return value.ToString();
+                }
+            } while (true);
         }
     }