feat: add feedback and end scene

The controls are now disabled for one second when the user makes a
mistake and a blank end screen is triggered upon completion.

Author: danielzting

levels/bubble_sort.gd

@@ -1,15 +1,27 @@
 extends ComparisonSort
 class_name BubbleSort
 
+var swapped = false
+
 func _init(array).(array):
 	pass
 
-func next(action):
-	if action == "swap":
+func check(action):
+	if array.get(index) > array.get(index + 1):
+		return action == "swap"
+	else:
+		return action == "no_swap"
+
+func next():
+	if array.get(index) > array.get(index + 1):
 		array.swap(index, index + 1)
+		swapped = true
 	index += 1
 	if index == array.size - 1:
+		if not swapped:
+			emit_signal("done")
 		index = 0
+		swapped = false
 
 func emphasized(i):
 	return i == index or i == index + 1

levels/comparison_sort.gd

@@ -1,20 +1,43 @@
 extends Node
 class_name ComparisonSort
 
+signal done
+signal mistake
+
+const ACTIONS = ["swap", "no_swap"]
+
 var array: ArrayModel
 var index = 0
+var timer = Timer.new()
+var active = true
 
 func _init(array):
 	self.array = array
+	timer.one_shot = true
+	timer.connect("timeout", self, "_on_Timer_timeout")
+	add_child(timer)
+	self.connect("mistake", self, "_on_ComparisonSort_mistake")
 
-func next(action):
+func check(action):
 	pass
 
-func emphasized(i):
+func next():
 	pass
 
+func _on_ComparisonSort_mistake():
+	active = false
+	timer.start(1)
+
+func _on_Timer_timeout():
+	active = true
+
 func _input(event):
-	if event.is_action_pressed("swap"):
-		next("swap")
-	elif event.is_action_pressed("no_swap"):
-		next("no_swap")
+	if not active:
+		return
+
+	for action in ACTIONS:
+		if event.is_action_pressed(action):
+			if check(action):
+				next()
+			else:
+				emit_signal("mistake")

models/array_model.gd

@@ -17,6 +17,12 @@ func _init(size):
 func get(i):
 	return array[i]
 
+func is_sorted():
+	for i in range(size - 1):
+		if array[i] > array[i + 1]:
+			return false
+	return true
+
 func swap(i, j):
 	var temp = array[i]
 	array[i] = array[j]

project.godot

@@ -22,12 +22,12 @@ _global_script_classes=[ {
 "base": "ComparisonSort",
 "class": "BubbleSort",
 "language": "GDScript",
-"path": "res://algorithms/bubble_sort.gd"
+"path": "res://levels/bubble_sort.gd"
 }, {
 "base": "Node",
 "class": "ComparisonSort",
 "language": "GDScript",
-"path": "res://algorithms/comparison_sort.gd"
+"path": "res://levels/comparison_sort.gd"
 } ]
 _global_script_class_icons={
 "ArrayModel": "",

scenes/end.tscn

@@ -0,0 +1,8 @@
+[gd_scene format=2]
+
+[node name="Viewport" type="MarginContainer"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+__meta__ = {
+"_edit_use_anchors_": false
+}

scripts/play.gd

@@ -8,7 +8,6 @@ func _ready():
 	var label = Label.new()
 	label.text = "ready..."
 	label.align = Label.ALIGN_CENTER
-	label.set_anchors_preset(Control.PRESET_HCENTER_WIDE)
 	$DisplayBorder.add_child(label)
 
 func _process(delta):
@@ -22,8 +21,14 @@ func _on_Timer_timeout():
 	$DisplayBorder.get_child(0).queue_free()
 	# Load level
 	var array = ArrayModel.new(10)
-	var level
-	match scene.get_param("level"):
-		"BUBBLE SORT":
-			level = BubbleSort.new(array)
+	var level = getLevel(scene.get_param("level")).new(array)
+	level.connect("done", self, "_on_Level_done")
 	$DisplayBorder.add_child(ArrayView.new(level))
+
+func getLevel(level):
+	match level:
+		"BUBBLE SORT":
+			return BubbleSort
+
+func _on_Level_done():
+	scene.change_scene("res://scenes/end.tscn")

views/array_view.gd

@@ -8,6 +8,7 @@ var level
 var rects = []
 
 func _init(level):
+	level.connect("mistake", self, "_on_Level_mistake")
 	add_child(level)
 	self.level = level
 	for i in range(level.array.size):
@@ -22,3 +23,6 @@ func _process(delta):
 		rects[i].rect_scale.y = -1 # Override parent Control scale
 		rects[i].color = ORANGE if level.emphasized(i) else GREEN
 		rects[i].rect_size.y = rect_size.y * level.array.get(i) / level.array.size
+
+func _on_Level_mistake():
+	pass