refactor: move actions into individual classes

It didn't make any sense for sorts with different action semantics to
share a global actions dictionary.

Author: danielzting

levels/bubble_sort.gd

@@ -14,6 +14,10 @@ If the two highlighted elements are out of order, hit LEFT ARROW to swap
 them. Otherwise, hit RIGHT ARROW to continue.
 """
 
+const ACTIONS = {
+    "SWAP": "Left",
+    "CONTINUE": "Right",
+}
 var _index = 0 # First of two elements being compared
 var _end = array.size # Beginning of sorted subarray
 var _swapped = false
@@ -27,7 +31,7 @@ func next(action):
             return emit_signal("mistake")
         array.swap(_index, _index + 1)
         _swapped = true
-    elif action != null and action != ACTIONS.NO_SWAP:
+    elif action != null and action != ACTIONS.CONTINUE:
         return emit_signal("mistake")
     _index += 1
     # Prevent player from having to spam tap through the end

levels/comparison_sort.gd

@@ -4,14 +4,6 @@ extends Node
 signal done
 signal mistake
 
-const ACTIONS = {
-    "SWAP": "ui_left",
-    "NO_SWAP": "ui_right",
-
-    "LEFT": "ui_left",
-    "RIGHT": "ui_right",
-}
-
 const EFFECTS = {
     "NONE": GlobalTheme.GREEN,
     "HIGHLIGHTED": GlobalTheme.ORANGE,
@@ -37,9 +29,8 @@ func _input(event):
     """Pass input events for checking and take appropriate action."""
     if not active:
         return
-    for action in ACTIONS.values():
-        if event.is_action_pressed(action):
-            return next(action)
+    if event.is_pressed():
+        return next(event.as_text())
 
 func next(action):
     """Check the action and advance state or emit signal as needed."""

levels/insertion_sort.gd

@@ -15,6 +15,10 @@ out of order. When this is no longer the case, hit RIGHT ARROW to
 advance.
 """
 
+const ACTIONS = {
+    "SWAP": "Left",
+    "CONTINUE": "Right",
+}
 var _end = 1 # Size of the sorted subarray
 var _index = 1 # Position of element currently being inserted
 
@@ -30,7 +34,7 @@ func next(action):
         if _index == 0:
             _grow()
     else:
-        if action != null and action != ACTIONS.NO_SWAP:
+        if action != null and action != ACTIONS.CONTINUE:
             return emit_signal("mistake")
         _grow()
 

levels/merge_sort.gd

@@ -15,6 +15,10 @@ highlighted element is on. If you've reached the end of one side, press
 the other side's ARROW KEY.
 """
 
+const ACTIONS = {
+    "LEFT": "Left",
+    "RIGHT": "Right",
+}
 var _left = 0 # Index of left subarray pointer
 var _right = 1 # Index of right subarray pointer
 var _sub_size = 2 # Combined size of left and right subarrays

levels/selection_sort.gd

@@ -15,6 +15,10 @@ smaller than the left highlighted element, then hit LEFT ARROW and
 repeat.
 """
 
+const ACTIONS = {
+    "SWAP": "Left",
+    "CONTINUE": "Right",
+}
 var _base = 0 # Size of sorted subarray
 var _min = 0 # Index of smallest known element
 var _index = 1 # Element currently being compared
@@ -27,7 +31,7 @@ func next(action):
         if action != null and action != ACTIONS.SWAP:
             return emit_signal("mistake")
         _min = _index
-    elif action != null and action != ACTIONS.NO_SWAP:
+    elif action != null and action != ACTIONS.CONTINUE:
         return emit_signal("mistake")
     _index += 1
     if _index == array.size:

project.godot

@@ -125,26 +125,6 @@ ui_down={
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
-SWAP={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
- ]
-}
-NO_SWAP={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
- ]
-}
-LEFT={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
- ]
-}
-RIGHT={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
- ]
-}
 
 [rendering]