refactor: move end.tscn's function into play.tscn

There was no need for a separate end scene with nothing but a score and
a button.

Author: danielzting

levels/comparison_sort.gd

@@ -14,6 +14,7 @@ const DISABLE_TIME = 1.0
 
 var array: ArrayModel
 var active = true
+var _done = false
 
 var _timer = Timer.new()
 
@@ -24,10 +25,11 @@ func _init(array):
     _timer.connect("timeout", self, "_on_Timer_timeout")
     add_child(_timer)
     self.connect("mistake", self, "_on_ComparisonSort_mistake")
+    self.connect("done", self, "_on_ComparisonSort_done")
 
 func _input(event):
     """Pass input events for checking and take appropriate action."""
-    if not active or array.is_sorted():
+    if _done or not active:
         return
     if event.is_pressed():
         return next(event.as_text())
@@ -37,13 +39,16 @@ func next(action):
     push_error("NotImplementedError")
 
 func get_effect(i):
-    if array.is_sorted():
+    if _done:
         return EFFECTS.NONE
     return _get_effect(i)
 
 func _get_effect(i):
     push_error("NotImplementedError")
 
+func _on_ComparisonSort_done():
+    _done = true
+
 func _on_ComparisonSort_mistake():
     """Disable the controls for one second."""
     active = false

scenes/end.tscn

@@ -58,14 +58,14 @@ custom_constants/separation = 500
 margin_right = 50.0
 margin_bottom = 19.0
 size_flags_horizontal = 4
-text = "start"
+text = "START"
 flat = true
 
 [node name="Credits" type="Button" parent="MainMenu/Buttons"]
 margin_left = 550.0
 margin_right = 620.0
 margin_bottom = 19.0
-text = "credits"
+text = "CREDITS"
 
 [node name="Timer" type="Timer" parent="."]
 wait_time = 0.25

scenes/menu.tscn

@@ -19,51 +19,51 @@ __meta__ = {
 [node name="GameDisplay" type="VBoxContainer" parent="."]
 margin_left = 30.0
 margin_top = 30.0
-margin_right = 1890.0
-margin_bottom = 1050.0
+margin_right = 1250.0
+margin_bottom = 690.0
 script = ExtResource( 1 )
 
 [node name="HUDBorder" type="MarginContainer" parent="GameDisplay"]
-margin_right = 1860.0
-margin_bottom = 78.0
+margin_right = 1220.0
+margin_bottom = 59.0
 script = ExtResource( 3 )
 
 [node name="HUD" type="HBoxContainer" parent="GameDisplay/HUDBorder"]
 margin_left = 20.0
 margin_top = 20.0
-margin_right = 1840.0
-margin_bottom = 58.0
+margin_right = 1200.0
+margin_bottom = 39.0
 
 [node name="Level" type="Label" parent="GameDisplay/HUDBorder/HUD"]
-margin_right = 906.0
-margin_bottom = 38.0
+margin_right = 586.0
+margin_bottom = 19.0
 size_flags_horizontal = 3
 text = "LEVEL"
 
 [node name="Score" type="Label" parent="GameDisplay/HUDBorder/HUD"]
-margin_left = 914.0
-margin_right = 1820.0
-margin_bottom = 38.0
+margin_left = 594.0
+margin_right = 1180.0
+margin_bottom = 19.0
 size_flags_horizontal = 3
 text = "0.000"
 align = 2
 
 [node name="DisplayBorder" type="MarginContainer" parent="GameDisplay"]
-margin_top = 86.0
-margin_right = 1860.0
-margin_bottom = 1020.0
+margin_top = 67.0
+margin_right = 1220.0
+margin_bottom = 660.0
 size_flags_vertical = 3
 script = ExtResource( 3 )
 
 [node name="Label" type="Label" parent="GameDisplay/DisplayBorder"]
 margin_left = 20.0
-margin_top = 448.0
-margin_right = 1840.0
-margin_bottom = 486.0
+margin_top = 287.0
+margin_right = 1200.0
+margin_bottom = 306.0
 text = "ready..."
 align = 1
 
-[node name="Timer" type="Timer" parent="."]
+[node name="Timer" type="Timer" parent="GameDisplay"]
 one_shot = true
 autostart = true
-[connection signal="timeout" from="Timer" to="GameDisplay" method="_on_Timer_timeout"]
+[connection signal="timeout" from="GameDisplay/Timer" to="GameDisplay" method="_on_Timer_timeout"]

scenes/play.tscn

@@ -20,5 +20,27 @@ func get_score():
     return stepify((OS.get_ticks_msec() - _start_time) / 1000.0, 0.001)
 
 func _on_Level_done():
-    GlobalScene.change_scene("res://scenes/end.tscn",
-        {"level": GlobalScene.get_param("level"), "score": get_score()})
+    var restart = Button.new()
+    restart.text = "RESTART LEVEL"
+    restart.connect("pressed", self, "_on_Button_pressed", ["play"])
+    var separator = Label.new()
+    separator.text = " / "
+    var back = Button.new()
+    back.text = "BACK TO LEVEL SELECT"
+    back.connect("pressed", self, "_on_Button_pressed", ["levels"])
+    var result = Label.new()
+    result.text = "%.3f" % get_score()
+    result.size_flags_horizontal = Control.SIZE_EXPAND_FILL
+    result.align = Label.ALIGN_RIGHT
+    _start_time = -1
+    $HUDBorder/HUD/Level.queue_free()
+    $HUDBorder/HUD/Score.queue_free()
+    $HUDBorder/HUD.add_child(restart)
+    $HUDBorder/HUD.add_child(separator)
+    $HUDBorder/HUD.add_child(back)
+    $HUDBorder/HUD.add_child(result)
+    restart.grab_focus()
+
+func _on_Button_pressed(scene):
+    GlobalScene.change_scene("res://scenes/" + scene + ".tscn",
+        {"level": GlobalScene.get_param("level")})