Updated reward selection to use display buttons

Author: LifeHckr

scenes/BattleDirector/test_battle_scene.tscn

@@ -19,9 +19,6 @@ metadata/_edit_lock_ = true
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("8_caqms")
 
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
-stream = ExtResource("8_caqms")
-
 [node name="UILayer" type="CanvasLayer" parent="."]
 
 [node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]

scenes/UI/RewardSelectionUI.tscn

@@ -2,10 +2,13 @@
 
 [ext_resource type="Script" path="res://scenes/UI/scripts/RewardSelect.cs" id="1_1m6an"]
 
-[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("ButtonContainer")]
+[node name="CanvasLayer" type="CanvasLayer" node_paths=PackedStringArray("ButtonContainer", "_description", "_acceptButton", "_skipButton")]
 process_mode = 2
 script = ExtResource("1_1m6an")
-ButtonContainer = NodePath("MarginContainer/PanelContainer/VBoxContainer")
+ButtonContainer = NodePath("MarginContainer/PanelContainer/VBoxContainer/ScrollContainer/CenterContainer/HBoxContainer")
+_description = NodePath("MarginContainer/PanelContainer/VBoxContainer/DescBox/Description")
+_acceptButton = NodePath("MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer/AcceptButton")
+_skipButton = NodePath("MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer/SkipButton")
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
 anchors_preset = 15
@@ -25,3 +28,57 @@ layout_mode = 2
 
 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/PanelContainer"]
 layout_mode = 2
+
+[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="CenterContainer" type="CenterContainer" parent="MarginContainer/PanelContainer/VBoxContainer/ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PanelContainer/VBoxContainer/ScrollContainer/CenterContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="DescBox" type="MarginContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="ColorRect" type="ColorRect" parent="MarginContainer/PanelContainer/VBoxContainer/DescBox"]
+layout_mode = 2
+color = Color(0, 0, 0, 0.552941)
+
+[node name="Description" type="Label" parent="MarginContainer/PanelContainer/VBoxContainer/DescBox"]
+layout_mode = 2
+size_flags_vertical = 1
+autowrap_mode = 2
+clip_text = true
+text_overrun_behavior = 1
+
+[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/PanelContainer/VBoxContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 5
+theme_override_constants/margin_top = 5
+theme_override_constants/margin_right = 5
+theme_override_constants/margin_bottom = 5
+
+[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/PanelContainer/VBoxContainer/MarginContainer"]
+layout_mode = 2
+size_flags_vertical = 3
+
+[node name="AcceptButton" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Accept"
+
+[node name="SkipButton" type="Button" parent="MarginContainer/PanelContainer/VBoxContainer/MarginContainer/HBoxContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Skip
+"

scenes/UI/scripts/DisplayButton.cs

@@ -3,6 +3,7 @@
 
 public partial class DisplayButton : Button
 {
+    //TODO: Make various menus change descriptions when focus changes, instead of on click.
     [Export]
     public Texture2D Texture;
 

scenes/UI/scripts/RewardSelect.cs

@@ -5,15 +5,28 @@
 public partial class RewardSelect : CanvasLayer
 {
     [Export]
-    public VBoxContainer ButtonContainer;
+    public HBoxContainer ButtonContainer;
+
+    [Export]
+    private Label _description;
+
+    [Export]
+    private Button _acceptButton;
+
+    [Export]
+    private Button _skipButton;
 
     private PlayerStats _player;
     private RelicTemplate[] _choices;
+    private RelicTemplate _selection;
 
     public void Initialize(PlayerStats player, int amount)
     {
         _player = player;
         GenerateRelicChoices(amount);
+
+        _acceptButton.Pressed += OnSelect;
+        _skipButton.Pressed += OnSkip;
     }
 
     private void GenerateRelicChoices(int amount = 1)
@@ -24,17 +37,33 @@ private void GenerateRelicChoices(int amount = 1)
 
         foreach (var relic in _choices)
         {
-            var button = new Button();
-            button.Text = relic.Name;
+            var button = new DisplayButton();
+            button.Display(relic.Texture, relic.Tooltip, relic.Name);
             button.Pressed += () => OnRelicSelected(relic);
             ButtonContainer.AddChild(button);
+            button.GrabFocus();
         }
     }
 
     private void OnRelicSelected(RelicTemplate choiceRelic)
     {
-        _player.AddRelic(choiceRelic);
-        GD.Print("Relic selected: " + choiceRelic.Name);
+        _selection = choiceRelic;
+        _description.Text = $"{choiceRelic.Name}: {choiceRelic.Tooltip}";
+    }
+
+    private void OnSelect()
+    {
+        if (_selection == null)
+            return;
+        GD.Print("Relic selected: " + _selection.Name);
+        _player.AddRelic(_selection);
+        GetTree().Paused = false;
+        QueueFree();
+    }
+
+    private void OnSkip()
+    {
+        GD.Print("Relic skipped.");
         GetTree().Paused = false;
         QueueFree();
     }