"IDK" -> "Swap" for swapping characters in battle

Lamby777 · May 12, 2024 · 68853d6 · 68853d6
1 parent 4634648
commit 68853d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/pets-gd/scenes/battle.tscn b/pets-gd/scenes/battle.tscn
@@ -206,54 +206,39 @@ layout_mode = 2
 
 [node name="ChoiceAgent" type="ChoiceAgent" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
 
-[node name="IDK" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
+[node name="Skills" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
 clip_contents = false
 layout_mode = 2
 offset_right = 432.0
 offset_bottom = 94.0
-focus_neighbor_top = NodePath("../Run")
-focus_neighbor_bottom = NodePath("../Skills")
-focus_next = NodePath("../Skills")
-focus_previous = NodePath("../Run")
-focus_mode = 2
 theme_override_colors/default_color = Color(0.803922, 0.839216, 0.956863, 1)
 theme_override_font_sizes/normal_font_size = 80
 bbcode_enabled = true
-text = "IDK"
+text = "Skills"
 fit_content = true
 
-[node name="Skills" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
+[node name="Items" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
 clip_contents = false
 layout_mode = 2
 offset_top = 104.0
 offset_right = 432.0
 offset_bottom = 198.0
-focus_neighbor_top = NodePath("../IDK")
-focus_neighbor_bottom = NodePath("../Items")
-focus_next = NodePath("../Items")
-focus_previous = NodePath("../IDK")
-focus_mode = 2
 theme_override_colors/default_color = Color(0.803922, 0.839216, 0.956863, 1)
 theme_override_font_sizes/normal_font_size = 80
 bbcode_enabled = true
-text = "Skills"
+text = "Items"
 fit_content = true
 
-[node name="Items" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
+[node name="Swap" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
 clip_contents = false
 layout_mode = 2
 offset_top = 208.0
 offset_right = 432.0
 offset_bottom = 302.0
-focus_neighbor_top = NodePath("../Skills")
-focus_neighbor_bottom = NodePath("../Run")
-focus_next = NodePath("../Run")
-focus_previous = NodePath("../Skills")
-focus_mode = 2
 theme_override_colors/default_color = Color(0.803922, 0.839216, 0.956863, 1)
 theme_override_font_sizes/normal_font_size = 80
 bbcode_enabled = true
-text = "Items"
+text = "Swap"
 fit_content = true
 
 [node name="Run" type="RichTextLabel" parent="Menu/DualMenu/LeftPanel/Margins/VBox/BattleChoices"]
@@ -262,11 +247,6 @@ layout_mode = 2
 offset_top = 312.0
 offset_right = 432.0
 offset_bottom = 406.0
-focus_neighbor_top = NodePath("../Items")
-focus_neighbor_bottom = NodePath("../IDK")
-focus_next = NodePath("../IDK")
-focus_previous = NodePath("../Items")
-focus_mode = 2
 theme_override_colors/default_color = Color(0.803922, 0.839216, 0.956863, 1)
 theme_override_font_sizes/normal_font_size = 80
 bbcode_enabled = true

diff --git a/pets-lib/src/battle/mod.rs b/pets-lib/src/battle/mod.rs
@@ -120,12 +120,9 @@ impl BattleEngine {
     #[func]
     pub fn on_choice_picked(&self, choice: Gd<Control>) {
         match choice.get_name().to_string().as_str() {
-            // no longer a reason for "Attack" to exist because
-            // the menu is toggleable so closing it = attack
-            "IDK" => todo!(),
-
             "Skills" => todo!(),
             "Items" => todo!(),
+            "Swap" => todo!(),
 
             "Run" => {
                 // TODO roll, don't always succeed