feat: remove tier system

It added a lot of complexity and is imperfect and possibly confusing for
little benefit.

Author: danielzting

levels/comparison_sort.gd

@@ -16,8 +16,6 @@ var DESCRIPTION = _get_header().split("  ")[1]
 var CONTROLS = _get_header().split("  ")[2]
 
 var array: ArrayModel
-var moves = 0
-var test = _get_header().split("  ")[0]
 
 var _timer = Timer.new()
 
@@ -39,7 +37,6 @@ func _ready():
 func _input(event):
     """Pass input events for checking and take appropriate action."""
     if event.is_pressed():
-        moves += 1
         return next(event.as_text())
 
 func next(action):

scripts/levels.gd

@@ -30,13 +30,9 @@ func _ready():
         button.connect("focus_entered", self, "_on_Button_focus_entered")
         button.connect("pressed", self, "_on_Button_pressed", [level])
         buttons.add_child(button)
-        var score = HBoxContainer.new()
-        var time = Label.new()
-        time.align = Label.ALIGN_RIGHT
-        time.size_flags_horizontal = Control.SIZE_EXPAND_FILL
-        var tier = Label.new()
-        score.add_child(time)
-        score.add_child(tier)
+        var score = Label.new()
+        score.align = Label.ALIGN_RIGHT
+        score.size_flags_horizontal = Control.SIZE_EXPAND_FILL
         scores.add_child(score)
     # Autofocus last played level
     for button in buttons.get_children():
@@ -50,21 +46,11 @@ func _ready():
 
 func _on_Button_focus_entered(size=_level.array.size):
     # Update high scores
-    var buttons = $LevelsBorder/Levels/LevelsContainer/Buttons
+    var container = $LevelsBorder/Levels/LevelsContainer
     for i in range(LEVELS.size()):
-        var score = $LevelsBorder/Levels/LevelsContainer/Scores.get_child(i)
-        var name = buttons.get_child(i).text
+        var name = container.get_node("Buttons").get_child(i).text
         var time = GlobalScore.get_time(name, size)
-        if time == INF:
-            score.get_child(0).text = ""
-            score.get_child(1).text = "INF"
-            score.get_child(1).add_color_override(
-                "font_color", GlobalTheme.GREEN)
-        else:
-            score.get_child(0).text = "%.3f" % time
-            score.get_child(1).text = GlobalScore.get_tier(name, size)
-            score.get_child(1).add_color_override(
-                "font_color", GlobalScore.get_color(name, size))
+        container.get_node("Scores").get_child(i).text = "INF" if time == INF else "%.3f" % time
     # Pause a bit to show completely sorted array
     if _level.array.is_sorted():
         # Prevent race condition caused by keyboard input during pause

scripts/play.gd

@@ -30,9 +30,7 @@ func _input(event):
 
 func _on_Level_done(level):
     set_process(false)
-    var name = level.NAME
-    var size = level.array.size
-    var score = get_score()
+    var time = get_score()
     var moves = level.moves
     var restart = Button.new()
     restart.text = "RESTART LEVEL"
@@ -42,24 +40,18 @@ func _on_Level_done(level):
     var back = Button.new()
     back.text = "BACK TO LEVEL SELECT"
     back.connect("pressed", self, "_on_Button_pressed", ["levels"])
-    var time = Label.new()
-    time.text = "%.3f" % score
-    time.align = Label.ALIGN_RIGHT
-    time.size_flags_horizontal = Control.SIZE_EXPAND_FILL
-    var tier = Label.new()
-    tier.text = GlobalScore.calculate_tier(score, moves)
-    tier.align = Label.ALIGN_RIGHT
-    tier.add_color_override(
-        "font_color", GlobalScore.calculate_color(score, moves))
+    var score = Label.new()
+    score.text = "%.3f" % time
+    score.align = Label.ALIGN_RIGHT
+    score.size_flags_horizontal = Control.SIZE_EXPAND_FILL
     $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(time)
-    $HUDBorder/HUD.add_child(tier)
+    $HUDBorder/HUD.add_child(score)
     restart.grab_focus()
-    GlobalScore.save_score(name, size, score, moves)
+    GlobalScore.save_score(level.NAME, level.array.size, time)
 
 func _on_Button_pressed(scene):
     GlobalScene.change_scene("res://scenes/" + scene + ".tscn",

scripts/score.gd

@@ -4,15 +4,7 @@ Common helper library for scoring functions.
 
 extends Node
 
-const TIERS = ["F", "D", "C", "B", "A", "S"]
-const COLORS = [
-    Color("f44336"),
-    Color("ff9800"),
-    Color("ffeb3b"),
-    Color("4caf50"),
-    Color("03a9f4"),
-    Color("e040fb"),
-]
+const VERSION = 0 # Increment when changing save file format
 
 var _save: Dictionary
 
@@ -24,39 +16,19 @@ func _init():
 
 func get_time(name, size):
     if name in _save and str(size) in _save[name]:
-        return _save[name][str(size)][0]
+        return _save[name][str(size)]
     return INF
 
-func get_tier(name, size):
-    if name in _save and str(size) in _save[name]:
-        return _save[name][str(size)][1]
-    return ""
-
-func get_color(name, size):
-    var tier = get_tier(name, size)
-    return Color.black if tier.empty() else COLORS[TIERS.find(tier)]
-
-func calculate_tier(time, moves):
-    return TIERS[min(int(moves / time), TIERS.size() - 1)]
-
-func calculate_color(time, moves):
-    return COLORS[TIERS.find(calculate_tier(time, moves))]
-
-func save_score(name, size, time, moves):
+func save_score(name, size, time):
     if not name in _save:
         _save[name] = {}
     if not str(size) in _save[name]:
-        _save[name][str(size)] = [INF, ""]
-    var prev_time = get_time(name, size)
-    var prev_tier = get_tier(name, size)
-    var tier = calculate_tier(time, moves)
-    var tier_index = TIERS.find(tier)
-    if (prev_tier.empty() or tier_index > TIERS.find(prev_tier)
-        or tier_index == TIERS.find(prev_tier) and time < prev_time):
-        _save[name][str(size)] = [time, tier]
+        _save[name][str(size)] = INF
+    _save[name][str(size)] = min(time, get_time(name, size))
     _save()
 
 func _save():
+    _save["VERSION"] = VERSION
     var file = File.new()
     file.open("user://save.json", File.WRITE)
     file.store_line(to_json(_save))