style: add underscore to private variables

Also locked aspect ratio to 16:9 for a consistent experience across
screens without unfair advantages/disadvantages.

Author: danielzting

levels/bubble_sort.gd

@@ -14,8 +14,8 @@ If the two highlighted elements are out of order, hit LEFT ARROW to swap
 them. Otherwise, hit RIGHT ARROW to continue.
 """
 
-var _index = 0
-var _end = array.size
+var _index = 0 # First of two elements being compared
+var _end = array.size # Beginning of sorted subarray
 var _swapped = false
 
 func _init(array).(array):
@@ -30,6 +30,7 @@ func next(action):
     elif action != null and action != ACTIONS.NO_SWAP:
         return emit_signal("mistake")
     _index += 1
+    # Prevent player from having to spam tap through the end
     if _index + 1 == _end:
         if not _swapped:
             emit_signal("done")

levels/selection_sort.gd

@@ -11,8 +11,8 @@ slower than insertion sort.
 """
 const CONTROLS = """
 Keep on hitting RIGHT ARROW until you encounter an element that is
-smaller than the left highlighted element, then hit LEFT ARROW to swap
-the new smallest into place and keep going.
+smaller than the left highlighted element, then hit LEFT ARROW and
+repeat.
 """
 
 var _base = 0 # Size of sorted subarray

project.godot

@@ -84,8 +84,10 @@ GlobalTheme="*res://scripts/theme.gd"
 window/size/width=1920
 window/size/height=1080
 window/size/fullscreen=true
+window/size/always_on_top=true
 window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
+window/stretch/aspect="keep"
 
 [editor_plugins]
 

scripts/levels.gd

@@ -1,17 +1,17 @@
 extends HBoxContainer
 
-var levels = [
+const LEVELS = [
     BubbleSort,
     InsertionSort,
     SelectionSort,
     MergeSort,
     QuickSort,
 ]
-var level: ComparisonSort
+var _level: ComparisonSort
 
 func _ready():
     """Dynamically load level data."""
-    for level in levels:
+    for level in LEVELS:
         var button = Button.new()
         button.text = level.NAME
         button.align = Button.ALIGN_LEFT
@@ -28,31 +28,31 @@ func _ready():
     bottom_button.focus_neighbour_bottom = top_button.get_path()
     # If no last played level, autofocus first level
     if GlobalScene.get_param("level") == null:
-        bottom_button.grab_focus()
+        top_button.grab_focus()
 
 func _on_Button_focus_changed():
     """Initialize the preview section."""
-    level = get_level(get_focus_owner().text).new(ArrayModel.new())
-    level.active = false
-    $Preview/InfoBorder/Info/About.text = _cleanup(level.ABOUT)
-    $Preview/InfoBorder/Info/Controls.text = _cleanup(level.CONTROLS)
+    _level = get_level(get_focus_owner().text).new(ArrayModel.new())
+    _level.active = false
+    $Preview/InfoBorder/Info/About.text = _cleanup(_level.ABOUT)
+    $Preview/InfoBorder/Info/Controls.text = _cleanup(_level.CONTROLS)
     # Start over when simulation is finished
-    level.connect("done", self, "_on_Button_focus_changed")
+    _level.connect("done", self, "_on_Button_focus_changed")
     # Replace old display with new
     for child in $Preview/Display.get_children():
         child.queue_free()
-    $Preview/Display.add_child(ArrayView.new(level))
+    $Preview/Display.add_child(ArrayView.new(_level))
 
 func _on_Button_pressed(name):
     GlobalScene.change_scene("res://scenes/play.tscn", {"level": get_level(name)})
 
 func get_level(name):
-    for level in levels:
+    for level in LEVELS:
         if level.NAME == name:
             return level
 
 func _on_Timer_timeout():
-    level.next(null)
+    _level.next(null)
 
 func _cleanup(string):
     return string.strip_edges().replace("\n", " ")

scripts/menu.gd

@@ -1,12 +1,12 @@
 extends VBoxContainer
 
-var level = BogoSort.new(ArrayModel.new())
+var _level = BogoSort.new(ArrayModel.new())
 
 func _ready():
     $Buttons/Start.grab_focus()
     randomize()
-    level.active = false
-    $Display.add_child(ArrayView.new(level))
+    _level.active = false
+    $Display.add_child(ArrayView.new(_level))
 
 func _on_Start_pressed():
     GlobalScene.change_scene("res://scenes/levels.tscn")
@@ -15,4 +15,4 @@ func _on_Credits_pressed():
     GlobalScene.change_scene("res://scenes/credits.tscn")
 
 func _on_Timer_timeout():
-    level.next(null)
+    _level.next(null)

scripts/play.gd

@@ -1,23 +1,23 @@
 extends VBoxContainer
 
-var start_time = -1
+var _start_time = -1
 
 func _ready():
     $HUDBorder/HUD/Level.text = GlobalScene.get_param("level").NAME
 
 func _process(delta):
-    if start_time >= 0:
+    if _start_time >= 0:
         $HUDBorder/HUD/Score.text = "%.3f" % get_score()
 
 func _on_Timer_timeout():
-    start_time = OS.get_ticks_msec()
+    _start_time = OS.get_ticks_msec()
     $DisplayBorder/Label.queue_free() # Delete ready text
     var level = GlobalScene.get_param("level").new(ArrayModel.new())
     level.connect("done", self, "_on_Level_done")
     $DisplayBorder.add_child(ArrayView.new(level))
 
 func get_score():
-    return stepify((OS.get_ticks_msec() - start_time) / 1000.0, 0.001)
+    return stepify((OS.get_ticks_msec() - _start_time) / 1000.0, 0.001)
 
 func _on_Level_done():
     GlobalScene.change_scene("res://scenes/end.tscn",

views/array_view.gd

@@ -5,27 +5,27 @@ Visualization of an array as rectangles of varying heights.
 class_name ArrayView
 extends HBoxContainer
 
-var level: ComparisonSort
-var rects = []
+var _level: ComparisonSort
+var _rects = []
 
 func _init(level):
     """Add colored rectangles."""
-    level.connect("mistake", self, "_on_Level_mistake")
-    self.level = level
-    add_child(level) # NOTE: This is necessary for it to read input
+    _level = level
+    _level.connect("mistake", self, "_on_Level_mistake")
+    add_child(_level) # NOTE: This is necessary for it to read input
     for i in range(level.array.size):
         var rect = ColorRect.new()
         rect.size_flags_horizontal = Control.SIZE_EXPAND_FILL
         rect.size_flags_vertical = Control.SIZE_SHRINK_END
-        rects.append(rect)
+        _rects.append(rect)
         add_child(rect)
 
 func _process(delta):
     """Update heights of rectangles based on array values."""
-    for i in range(level.array.size):
-        rects[i].rect_scale.y = -1 # HACK: Override scale to bypass weird behavior
-        rects[i].color = level.get_effect(i)
-        rects[i].rect_size.y = rect_size.y * level.array.at(i) / level.array.size
+    for i in range(_level.array.size):
+        _rects[i].rect_scale.y = -1 # HACK: Override scale to bypass weird behavior
+        _rects[i].color = _level.get_effect(i)
+        _rects[i].rect_size.y = rect_size.y * _level.array.at(i) / _level.array.size
 
 func _on_Level_mistake():
     """Flash the border red on mistakes."""