Fucking highscores

Author: ShiftyRail

code/__HELPERS/cmp.dm

@@ -29,6 +29,9 @@ var/cmp_field = "name"
 /proc/cmp_records_dsc(datum/data/record/a, datum/data/record/b)
 	return sorttext(a.fields[cmp_field], b.fields[cmp_field])
 
+/proc/cmp_records_numerically(datum/data/record/a, datum/data/record/b)
+	return b.fields[cmp_field] - a.fields[cmp_field]
+
 /proc/cmp_ckey_asc(client/a, client/b)
 	return sorttext(b.ckey, a.ckey)
 

code/__HELPERS/sorts/TimSort.dm

@@ -14,4 +14,4 @@
 
 		sortInstance.timSort(fromIndex, toIndex)
 
-	return L
+	return L

code/controllers/subsystem/init/persistence_misc.dm

@@ -232,37 +232,37 @@ var/datum/subsystem/persistence_misc/SSpersistence_misc
 		log_debug("[name] task found an empty file on [file_path]")
 		return
 	for(var/list/L in to_read)
-		var/datum/record/money/record = new(L["ckey"], L["role"], L["cash"], L["shift_duration"], L["date"])
+		var/datum/data/record/money/record = new(L["ckey"], L["role"], L["cash"], L["shift_duration"], L["date"])
 		data += record
 
 /datum/persistence_task/highscores/on_shutdown()
 	var/list/L = list()
-	for(var/datum/record/money/record in data)
+	for(var/datum/data/record/money/record in data)
 		L += list(record.vars)
 	write_file(L)
 
 /datum/persistence_task/highscores/proc/insert_records(list/records)
 	data += records
 	global.cmp_field = "cash"
-	sortTim(data, /proc/cmp_list_by_element_desc)
+	sortTim(data, /proc/cmp_records_numerically)
 	if (data.len > 5)
 		data.Cut(6) // we only store the top 5
-	for(var/datum/record/money/record in data)
+	for(var/datum/data/record/money/record in data)
 		if(record in records)
 			if(data[1] == record)
 				announce_new_highest_record(record)
 			else
 				announce_new_record(record)
 
-/datum/persistence_task/highscores/proc/announce_new_highest_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/proc/announce_new_highest_record(var/datum/data/record/money/record)
 	var/name = "Richest escape ever"
-	var/desc = "You broke the record of the richest escape! $[record.cash] chips accumulated."
-	give_award(record.ckey, /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
+	var/desc = "You broke the record of the richest escape! $[record.fields["cash"]] chips accumulated."
+	give_award(record.fields["ckey"], /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
 
-/datum/persistence_task/highscores/proc/announce_new_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/proc/announce_new_record(var/datum/data/record/money/record)
 	var/name = "Good rich escape"
-	var/desc = "You made it to the top 5! You accumulated $[record.cash]."
-	give_award(record.ckey, /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
+	var/desc = "You made it to the top 5! You accumulated $[record.fields["cash"]]."
+	give_award(record.fields["ckey"], /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
 
 /datum/persistence_task/highscores/proc/clear_records()
 	data = list()
@@ -273,15 +273,15 @@ var/datum/subsystem/persistence_misc/SSpersistence_misc
 	name = "Trader shoal highscores"
 	file_path = "data/persistence/trader_highscores.json"
 
-/datum/persistence_task/highscores/trader/announce_new_highest_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/trader/announce_new_highest_record(var/datum/data/record/money/record)
 	var/name = "Richest shoal haul ever"
-	var/desc = "You broke the record of the richest shoal haul! $[record.cash] chips accumulated."
-	give_award(record.ckey, /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
+	var/desc = "You broke the record of the richest shoal haul! $[record.fields["cash"]] chips accumulated."
+	give_award(record.fields["ckey"], /obj/item/weapon/reagent_containers/food/drinks/golden_cup, name, desc)
 
-/datum/persistence_task/highscores/trader/announce_new_record(var/datum/record/money/record)
+/datum/persistence_task/highscores/trader/announce_new_record(var/datum/data/record/money/record)
 	var/name = "Good rich shoal haul"
-	var/desc = "You made it to the top 5! You accumulated $[record.cash]."
-	give_award(record.ckey, /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
+	var/desc = "You made it to the top 5! You accumulated $[record.fields["cash"]]."
+	give_award(record.fields["ckey"], /obj/item/clothing/accessory/medal/gold, name, desc, FALSE)
 
 //stores map votes for code/modules/html_interface/voting/voting.dm
 /datum/persistence_task/vote

code/game/gamemodes/endgame/scoreboard/misc_score.dm

@@ -71,7 +71,7 @@
 			for(var/obj/item/weapon/spacecash/C2 in get_contents_in_object(player, /obj/item/weapon/spacecash))
 				cashscore += (C2.amount * C2.worth)
 
-			var/datum/record/money/record = new(player.key, player.job, cashscore)
+			var/datum/data/record/money/record = new(player.key, player.job, cashscore)
 			rich_escapes += record
 
 			if(cashscore > score.richestcash)
@@ -91,7 +91,7 @@
 				if(TR.source_name == player.real_name)
 					shoal_amount += text2num(TR.amount)
 			if(shoal_amount > 0)
-				var/datum/record/money/record = new(player.key, player.job, shoal_amount)
+				var/datum/data/record/money/record = new(player.key, player.job, shoal_amount)
 				rich_shoals += record
 				if(shoal_amount > score.biggestshoalcash)
 					score.biggestshoalcash = shoal_amount

code/game/gamemodes/endgame/scoreboard/scoreboard.dm

@@ -312,27 +312,27 @@ var/global/datum/controller/gameticker/scoreboard/score = new()
 	var/datum/persistence_task/highscores/leaderboard = score.money_leaderboard
 	dat += "<b>MONTHLY TOP 5 RICHEST ESCAPEES:</b><br>"
 	var/i = 1
-	for(var/datum/record/money/entry in leaderboard.data)
-		var/cash = num2text(entry.cash, 12)
-		var/list/split_date = splittext(entry.date, "-")
+	for(var/datum/data/record/money/entry in leaderboard.data)
+		var/cash = num2text(entry.fields["cash"], 12)
+		var/list/split_date = splittext(entry.fields["date"], "-")
 		if(text2num(split_date[2]) != text2num(time2text(world.timeofday, "MM")))
 			leaderboard.clear_records()
 			dat += "No rich escapees yet!"
 			break
 		else
-			dat += "[i++]) <b>$[cash]</b> by <b>[entry.ckey]</b> ([entry.role]). That shift lasted [entry.shift_duration]. Date: [entry.date]<br>"
+			dat += "[i++]) <b>$[cash]</b> by <b>[entry.fields["ckey"]]</b> ([entry.fields["role"]]). That shift lasted [entry.fields["shift_duration"]]. Date: [entry.fields["date"]]<br>"
 	var/datum/persistence_task/highscores/trader/leaderboard2 = score.shoal_leaderboard
 	dat += "<br><b>MONTHLY TOP 5 RICHEST TRADERS:</b><br>"
 	i = 1
-	for(var/datum/record/money/entry in leaderboard2.data)
-		var/cash = num2text(entry.cash, 12)
-		var/list/split_date = splittext(entry.date, "-")
+	for(var/datum/data/record/money/entry in leaderboard2.data)
+		var/cash = num2text(entry.fields["cash"], 12)
+		var/list/split_date = splittext(entry.fields["date"], "-")
 		if(text2num(split_date[2]) != text2num(time2text(world.timeofday, "MM")))
 			leaderboard2.clear_records()
 			dat += "No rich traders yet!"
 			break
 		else
-			dat += "[i++]) <b>$[cash]</b> by <b>[entry.ckey]</b>. That shift lasted [entry.shift_duration]. Date: [entry.date]<br>"
+			dat += "[i++]) <b>$[cash]</b> by <b>[entry.fields["ckey"]]</b>. That shift lasted [entry.fields["shift_duration"]]. Date: [entry.fields["date"]]<br>"
 	return dat
 
 /mob/proc/display_round_end_scoreboard()

code/game/gamemodes/highscores.dm

@@ -1,13 +1,15 @@
-/datum/record/money
-	var/ckey
-	var/role
-	var/cash
-	var/shift_duration
-	var/date
+/datum/data/record/money
+	fields = list(
+		"ckey" = "",
+		"role" = "",
+		"cash" = -999999,
+		"shift_duration" = -999999,
+		"date" = "0000-00-00",
+	)
 
-/datum/record/money/New(ckey, role, cash, shift_duration = worldtime2text(), date = SQLtime())
-	src.ckey = ckey
-	src.role = role
-	src.cash = cash
-	src.shift_duration = shift_duration
-	src.date = date
+/datum/data/record/money/New(ckey, role, cash, shift_duration = worldtime2text(), date = SQLtime())
+	fields["ckey"] = ckey
+	fields["role"] = role
+	fields["cash"] = cash
+	fields["shift_duration"]= shift_duration
+	fields["date"] = date

code/modules/unit_tests/highscores.dm

@@ -3,36 +3,36 @@
     task.file_path = "data/persistence/money_highscores_test.json"
     task.clear_records()
 
-    var/datum/record/money/test_record = new("somebody", "Assistant", 40000)
-    var/datum/record/money/test_record2 = new("a condom", "Captain", 35000)
-    var/datum/record/money/test_record3 = new("this should not appear", "Nobody", 10000)
-    var/datum/record/money/test_record4 = new("cuban pete", "Miner", 50000)
-    var/datum/record/money/test_record5 = new("pedro cubano", "Miner", 30000)
-    var/datum/record/money/test_record6 = new("frank sinatra", "Miner", 9999999)
+    var/datum/data/record/money/test_record = new("somebody", "Assistant", 40000)
+    var/datum/data/record/money/test_record2 = new("a condom", "Captain", 35000)
+    var/datum/data/record/money/test_record3 = new("this should not appear", "Nobody", 10000)
+    var/datum/data/record/money/test_record4 = new("cuban pete", "Miner", 50000)
+    var/datum/data/record/money/test_record5 = new("pedro cubano", "Miner", 30000)
+    var/datum/data/record/money/test_record6 = new("frank sinatra", "Miner", 9999999)
     var/list/records = list(test_record, test_record2, test_record3, test_record4, test_record5, test_record6)
 
     task.insert_records(records)
 
-    assert_eq(task.data[1].cash, 9999999)
-    assert_eq(task.data[2].cash, 50000)
-    assert_eq(task.data[3].cash, 40000)
-    assert_eq(task.data[4].cash, 35000)
-    assert_eq(task.data[5].cash, 30000)
+    assert_eq(task.data[1].fields["cash"], 9999999)
+    assert_eq(task.data[2].fields["cash"], 50000)
+    assert_eq(task.data[3].fields["cash"], 40000)
+    assert_eq(task.data[4].fields["cash"], 35000)
+    assert_eq(task.data[5].fields["cash"], 30000)
 
-    assert_eq(task.data[1].role, "Miner")
-    assert_eq(task.data[2].role, "Miner")
-    assert_eq(task.data[3].role, "Assistant")
-    assert_eq(task.data[4].role, "Captain")
-    assert_eq(task.data[5].role, "Miner")
+    assert_eq(task.data[1].fields["role"], "Miner")
+    assert_eq(task.data[2].fields["role"], "Miner")
+    assert_eq(task.data[3].fields["role"], "Assistant")
+    assert_eq(task.data[4].fields["role"], "Captain")
+    assert_eq(task.data[5].fields["role"], "Miner")
 
     if(task.data.len > 5)
         fail("[task.name] is storing more than five entries. Len: [task.data.len]")
 
     task.on_shutdown()
     task.on_init()
 
-    assert_eq(task.data[1].cash, 9999999)
-    assert_eq(task.data[2].cash, 50000)
-    assert_eq(task.data[3].cash, 40000)
-    assert_eq(task.data[4].cash, 35000)
-    assert_eq(task.data[5].cash, 30000)
+    assert_eq(task.data[1].fields["cash"], 9999999)
+    assert_eq(task.data[2].fields["cash"], 50000)
+    assert_eq(task.data[3].fields["cash"], 40000)
+    assert_eq(task.data[4].fields["cash"], 35000)
+    assert_eq(task.data[5].fields["cash"], 30000)