feat: remember data type between plays

Author: danielzting

scenes/levels.tscn

@@ -91,19 +91,19 @@ script = ExtResource( 3 )
 
 [node name="TypesContainer" type="MarginContainer" parent="Levels/Level/Right/Display"]
 visible = false
-margin_left = 218.0
-margin_top = 105.0
-margin_right = 398.0
-margin_bottom = 326.0
+margin_left = 288.0
+margin_top = 195.0
+margin_right = 328.0
+margin_bottom = 235.0
 size_flags_horizontal = 4
 size_flags_vertical = 4
 script = ExtResource( 3 )
 
 [node name="Types" type="VBoxContainer" parent="Levels/Level/Right/Display/TypesContainer"]
 margin_left = 20.0
 margin_top = 20.0
-margin_right = 160.0
-margin_bottom = 201.0
+margin_right = 20.0
+margin_bottom = 20.0
 size_flags_horizontal = 4
 size_flags_vertical = 4
 

scripts/levels.gd

@@ -21,7 +21,8 @@ const MAX_SIZE = 128
 var _index = LEVELS.find(GlobalScene.get_param("level"))
 var _level: ComparisonSort
 var _size = GlobalScene.get_param("size", ArrayModel.DEFAULT_SIZE)
-var _data_type = ArrayModel.DATA_TYPES.RANDOM_UNIQUE
+var _data_type = GlobalScene.get_param(
+    "data_type", ArrayModel.DATA_TYPES.RANDOM_UNIQUE)
 
 func _ready():
     var types = $Level/Right/Display/TypesContainer/Types
@@ -108,7 +109,7 @@ func _on_Timer_timeout():
 
 func _on_Current_pressed():
     GlobalScene.change_scene("res://scenes/play.tscn",
-        {"level": LEVELS[_index], "size": _size})
+        {"level": LEVELS[_index], "size": _size, "data_type": _data_type})
 
 func _on_Button_pressed(data_type):
     AudioServer.set_bus_mute(AudioServer.get_bus_index("Master"), false)

scripts/play.gd

@@ -1,12 +1,13 @@
 extends VBoxContainer
 
 var _start_time = -1
-var _level = GlobalScene.get_param(
-    "level", preload("res://scripts/levels.gd").LEVELS[0])
+var _level = GlobalScene.get_param("level").new(ArrayModel.new(
+    GlobalScene.get_param("size"), GlobalScene.get_param("data_type")))
 
 func _ready():
     set_process(false)
-    $HUDBorder/HUD/Level.text = _level.new(ArrayModel.new()).NAME
+    $HUDBorder/HUD/Level.text = _level.NAME
+    _level.connect("done", self, "_on_Level_done")
 
 func _process(delta):
     $HUDBorder/HUD/Score.text = "%.3f" % get_score()
@@ -15,11 +16,8 @@ func _on_Timer_timeout():
     set_process(true)
     _start_time = OS.get_ticks_msec()
     $Display/Label.queue_free() # Delete ready text
-    var level = _level.new(ArrayModel.new(
-        GlobalScene.get_param("size", ArrayModel.DEFAULT_SIZE)))
-    level.connect("done", self, "_on_Level_done", [level])
-    $Display.add_child(ArrayView.new(level))
-    level.set_process_input(true)
+    $Display.add_child(ArrayView.new(_level))
+    _level.set_process_input(true)
 
 func get_score():
     return stepify((OS.get_ticks_msec() - _start_time) / 1000.0, 0.001)
@@ -28,7 +26,7 @@ func _input(event):
     if event.is_action_pressed("ui_cancel"):
         _on_Button_pressed("levels")
 
-func _on_Level_done(level):
+func _on_Level_done():
     set_process(false)
     var time = get_score()
     var restart = Button.new()
@@ -41,6 +39,10 @@ func _on_Level_done(level):
     back.connect("pressed", self, "_on_Button_pressed", ["levels"])
     var score = Label.new()
     score.text = "%.3f" % time
+    if GlobalScene.get_param("data_type") != ArrayModel.DATA_TYPES.RANDOM_UNIQUE:
+        score.text += " (only random unique data counts toward a high score!)"
+    else:
+        GlobalScore.save_score(_level.NAME, _level.array.size, time)
     score.align = Label.ALIGN_RIGHT
     score.size_flags_horizontal = Control.SIZE_EXPAND_FILL
     $HUDBorder/HUD/Level.queue_free()
@@ -50,8 +52,9 @@ func _on_Level_done(level):
     $HUDBorder/HUD.add_child(back)
     $HUDBorder/HUD.add_child(score)
     restart.grab_focus()
-    GlobalScore.save_score(level.NAME, level.array.size, time)
 
 func _on_Button_pressed(scene):
     GlobalScene.change_scene("res://scenes/" + scene + ".tscn",
-        {"level": _level, "size": GlobalScene.get_param("size")})
+        {"level": GlobalScene.get_param("level"),
+         "size": GlobalScene.get_param("size"),
+         "data_type": GlobalScene.get_param("data_type")})