refactor: simplify interface

Removed the stats box for time and space complexity to allow for future
average-of-five scoring system.

Author: danielzting

scenes/levels_redesign.tscn

@@ -61,96 +61,95 @@ margin_right = 1240.0
 margin_bottom = 680.0
 size_flags_vertical = 3
 
-[node name="CodeContainer" type="MarginContainer" parent="Levels/Level"]
+[node name="Left" type="MarginContainer" parent="Levels/Level"]
 margin_right = 616.0
 margin_bottom = 613.0
 size_flags_horizontal = 3
 script = ExtResource( 3 )
 
-[node name="Code" type="Label" parent="Levels/Level/CodeContainer"]
+[node name="Code" type="Label" parent="Levels/Level/Left"]
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 596.0
 margin_bottom = 593.0
 size_flags_vertical = 3
+text = "\"\"\"
+This is a description for the level in the form of psuedocode.
+\"\"\"
 
-[node name="Info" type="VBoxContainer" parent="Levels/Level"]
+def algorithm(parameter):
+    return result"
+autowrap = true
+
+[node name="Right" type="VBoxContainer" parent="Levels/Level"]
 margin_left = 624.0
 margin_right = 1240.0
 margin_bottom = 613.0
 size_flags_horizontal = 3
 
-[node name="Display" type="MarginContainer" parent="Levels/Level/Info"]
+[node name="Display" type="MarginContainer" parent="Levels/Level/Right"]
 margin_right = 616.0
-margin_bottom = 276.0
+margin_bottom = 431.0
 size_flags_vertical = 3
 script = ExtResource( 3 )
 
-[node name="Footer" type="HBoxContainer" parent="Levels/Level/Info"]
-margin_top = 284.0
+[node name="Info" type="HBoxContainer" parent="Levels/Level/Right"]
+margin_top = 439.0
 margin_right = 616.0
 margin_bottom = 613.0
-size_flags_vertical = 3
 
-[node name="Meta" type="VBoxContainer" parent="Levels/Level/Info/Footer"]
-margin_right = 304.0
-margin_bottom = 329.0
+[node name="ControlsContainer" type="MarginContainer" parent="Levels/Level/Right/Info"]
+margin_right = 405.0
+margin_bottom = 174.0
 size_flags_horizontal = 3
-
-[node name="StatsContainer" type="MarginContainer" parent="Levels/Level/Info/Footer/Meta"]
-margin_right = 304.0
-margin_bottom = 125.0
+size_flags_stretch_ratio = 2.0
 script = ExtResource( 3 )
 
-[node name="Stats" type="Label" parent="Levels/Level/Info/Footer/Meta/StatsContainer"]
+[node name="Controls" type="Label" parent="Levels/Level/Right/Info/ControlsContainer"]
 margin_left = 20.0
 margin_top = 20.0
-margin_right = 284.0
-margin_bottom = 105.0
+margin_right = 385.0
+margin_bottom = 154.0
+size_flags_vertical = 1
+text = "These are the controls for the level."
+autowrap = true
+
+[node name="ScoresContainer" type="MarginContainer" parent="Levels/Level/Right/Info"]
+margin_left = 413.0
+margin_right = 616.0
+margin_bottom = 174.0
 size_flags_horizontal = 3
-text = "Best-case time:
-Average-case time:
-Worst-case time:
-Worst-case space:"
-
-[node name="ScoresContainer" type="MarginContainer" parent="Levels/Level/Info/Footer/Meta"]
-margin_top = 133.0
-margin_right = 304.0
-margin_bottom = 329.0
-size_flags_vertical = 3
 script = ExtResource( 3 )
 
-[node name="Scores" type="VBoxContainer" parent="Levels/Level/Info/Footer/Meta/ScoresContainer"]
+[node name="Scores" type="VBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer"]
 margin_left = 20.0
 margin_top = 20.0
-margin_right = 284.0
-margin_bottom = 176.0
+margin_right = 183.0
+margin_bottom = 154.0
 
-[node name="Header" type="HBoxContainer" parent="Levels/Level/Info/Footer/Meta/ScoresContainer/Scores"]
-margin_right = 264.0
-margin_bottom = 41.0
+[node name="Header" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
+margin_right = 163.0
+margin_bottom = 19.0
 
-[node name="Size" type="Label" parent="Levels/Level/Info/Footer/Meta/ScoresContainer/Scores/Header"]
+[node name="Size" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Header"]
 margin_right = 40.0
-margin_bottom = 41.0
-text = "SIZE
-----"
+margin_bottom = 19.0
+text = "SIZE"
 
-[node name="Time" type="Label" parent="Levels/Level/Info/Footer/Meta/ScoresContainer/Scores/Header"]
+[node name="Time" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Header"]
 margin_left = 48.0
-margin_right = 264.0
-margin_bottom = 41.0
+margin_right = 163.0
+margin_bottom = 19.0
 size_flags_horizontal = 3
-text = "HIGH SCORE
-----------"
+text = "HIGH SCORE"
 align = 2
 
-[node name="Data" type="HBoxContainer" parent="Levels/Level/Info/Footer/Meta/ScoresContainer/Scores"]
-margin_top = 49.0
-margin_right = 264.0
-margin_bottom = 156.0
+[node name="Data" type="HBoxContainer" parent="Levels/Level/Right/Info/ScoresContainer/Scores"]
+margin_top = 27.0
+margin_right = 163.0
+margin_bottom = 134.0
 
-[node name="Sizes" type="Label" parent="Levels/Level/Info/Footer/Meta/ScoresContainer/Scores/Data"]
+[node name="Sizes" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Data"]
 margin_right = 30.0
 margin_bottom = 107.0
 text = "8
@@ -159,9 +158,9 @@ text = "8
 64
 128"
 
-[node name="Times" type="Label" parent="Levels/Level/Info/Footer/Meta/ScoresContainer/Scores/Data"]
+[node name="Times" type="Label" parent="Levels/Level/Right/Info/ScoresContainer/Scores/Data"]
 margin_left = 38.0
-margin_right = 264.0
+margin_right = 163.0
 margin_bottom = 107.0
 size_flags_horizontal = 3
 text = "INF
@@ -172,19 +171,5 @@ INF"
 align = 2
 uppercase = true
 
-[node name="ControlsContainer" type="MarginContainer" parent="Levels/Level/Info/Footer"]
-margin_left = 312.0
-margin_right = 616.0
-margin_bottom = 329.0
-size_flags_horizontal = 3
-script = ExtResource( 3 )
-
-[node name="Controls" type="Label" parent="Levels/Level/Info/Footer/ControlsContainer"]
-margin_left = 20.0
-margin_top = 155.0
-margin_right = 284.0
-margin_bottom = 174.0
-size_flags_horizontal = 3
-
 [node name="Timer" type="Timer" parent="Levels"]
 [connection signal="timeout" from="Levels/Timer" to="Levels" method="_on_Timer_timeout"]

scenes/menu.tscn

@@ -21,68 +21,86 @@ __meta__ = {
 [node name="MainMenu" type="VBoxContainer" parent="."]
 margin_left = 40.0
 margin_top = 30.0
-margin_right = 1240.0
+margin_right = 1239.0
 margin_bottom = 690.0
 script = ExtResource( 1 )
 
 [node name="Title" type="Label" parent="MainMenu"]
-margin_right = 1200.0
+margin_right = 1199.0
 margin_bottom = 19.0
 text = "Human Computer Simulator"
 uppercase = true
 
 [node name="Display" type="MarginContainer" parent="MainMenu"]
 margin_top = 27.0
-margin_right = 1200.0
+margin_right = 1199.0
 margin_bottom = 625.0
 size_flags_vertical = 3
 script = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Instructions" type="MarginContainer" parent="MainMenu/Display"]
+[node name="InstructionsContainer" type="MarginContainer" parent="MainMenu/Display"]
 visible = false
-margin_left = 480.0
-margin_top = 201.0
-margin_right = 720.0
-margin_bottom = 397.0
+margin_left = 504.0
+margin_top = 197.0
+margin_right = 694.0
+margin_bottom = 401.0
 size_flags_horizontal = 4
 size_flags_vertical = 4
 script = ExtResource( 3 )
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MainMenu/Display/Instructions"]
+[node name="Instructions" type="VBoxContainer" parent="MainMenu/Display/InstructionsContainer"]
 margin_left = 20.0
 margin_top = 20.0
-margin_right = 220.0
-margin_bottom = 176.0
+margin_right = 170.0
+margin_bottom = 184.0
+custom_constants/separation = 16
 
-[node name="Label" type="Label" parent="MainMenu/Display/Instructions/VBoxContainer"]
-margin_right = 200.0
+[node name="Controls" type="HBoxContainer" parent="MainMenu/Display/InstructionsContainer/Instructions"]
+margin_right = 150.0
+margin_bottom = 129.0
+custom_constants/separation = 20
+
+[node name="Keys" type="Label" parent="MainMenu/Display/InstructionsContainer/Instructions/Controls"]
+margin_right = 10.0
 margin_bottom = 129.0
 size_flags_horizontal = 4
-text = "W - bigger
-A - slower
-S - smaller
-D - faster
-M - toggle sound
-F - big preview mode"
-
-[node name="Button" type="Button" parent="MainMenu/Display/Instructions/VBoxContainer"]
-margin_top = 137.0
-margin_right = 200.0
-margin_bottom = 156.0
+text = "W
+A
+S
+D
+M
+F"
+
+[node name="Actions" type="Label" parent="MainMenu/Display/InstructionsContainer/Instructions/Controls"]
+margin_left = 30.0
+margin_right = 150.0
+margin_bottom = 129.0
+text = "bigger
+slower
+smaller
+faster
+sound
+big preview "
+align = 2
+
+[node name="Button" type="Button" parent="MainMenu/Display/InstructionsContainer/Instructions"]
+margin_top = 141.0
+margin_right = 150.0
+margin_bottom = 160.0
 text = "OK"
 
 [node name="Spacing" type="Control" parent="MainMenu"]
 margin_top = 633.0
-margin_right = 1200.0
+margin_right = 1199.0
 margin_bottom = 633.0
 
 [node name="Buttons" type="HBoxContainer" parent="MainMenu"]
-margin_left = 20.0
+margin_left = 19.0
 margin_top = 641.0
-margin_right = 1180.0
+margin_right = 1179.0
 margin_bottom = 660.0
 size_flags_horizontal = 4
 custom_constants/separation = 500
@@ -109,7 +127,7 @@ text = "CREDITS"
 [node name="Timer" type="Timer" parent="."]
 wait_time = 0.25
 autostart = true
-[connection signal="pressed" from="MainMenu/Display/Instructions/VBoxContainer/Button" to="MainMenu" method="_on_Button_pressed"]
+[connection signal="pressed" from="MainMenu/Display/InstructionsContainer/Instructions/Button" to="MainMenu" method="_on_Button_pressed"]
 [connection signal="pressed" from="MainMenu/Buttons/Help" to="MainMenu" method="_on_Help_pressed"]
 [connection signal="pressed" from="MainMenu/Buttons/Start" to="MainMenu" method="_on_Start_pressed"]
 [connection signal="pressed" from="MainMenu/Buttons/Credits" to="MainMenu" method="_on_Credits_pressed"]

scripts/levels_redesign.gd

@@ -26,14 +26,14 @@ func _ready():
     _level = LEVELS[_index].new(ArrayModel.new(_size))
     _level.connect("done", self, "_on_ComparisonSort_done")
     $NamesContainer/Names/Current.text = _level.NAME
-    for child in $Level/Info/Display.get_children():
+    for child in $Level/Right/Display.get_children():
         child.queue_free()
-    $Level/Info/Display.add_child(ArrayView.new(_level))
+    $Level/Right/Display.add_child(ArrayView.new(_level))
     $Timer.start()
     _load_scores(_level)
 
 func _load_scores(level):
-    var data = $Level/Info/Footer/Meta/ScoresContainer/Scores/Data
+    var data = $Level/Right/Info/ScoresContainer/Scores/Data
     data.get_node("Times").text = ""
     for i in data.get_node("Sizes").text.split("\n"):
         var time = str(GlobalScore.get_time(level.NAME, int(i)))

scripts/menu.gd

@@ -14,9 +14,9 @@ func _on_Credits_pressed():
     GlobalScene.change_scene("res://scenes/credits.tscn")
 
 func _on_Help_pressed():
-    $Display/Instructions.show()
+    $Display/InstructionsContainer.show()
     $Display/HBoxContainer.hide()
-    $Display/Instructions/VBoxContainer/Button.grab_focus()
+    $Display/InstructionsContainer/Instructions/Button.grab_focus()
 
 func _on_Timer_timeout():
     _level.next(null)
@@ -27,6 +27,6 @@ func _input(event):
         get_tree().quit()
 
 func _on_Button_pressed():
-    $Display/Instructions.hide()
+    $Display/InstructionsContainer.hide()
     $Display/HBoxContainer.show()
     $Buttons/Start.grab_focus()