From 02f90f4ce978c9bbd8eaafe7292fe5cf3d6cc702 Mon Sep 17 00:00:00 2001
From: matttheficus <mickusmatthew@gmail.com>
Date: Sun, 27 Aug 2023 15:42:44 -0400
Subject: [PATCH] it begins

---
 code/game/objects/items/weapons/cards_ids.dm   | 7 +++++--
 code/modules/mining/machine_redemption.dm      | 3 ++-
 tgui/packages/tgui/interfaces/OreRedemption.js | 5 +++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index f19604af8b4..42a82956cda 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -109,7 +109,8 @@
 	desc = "A card used to provide ID and determine access across the station."
 	icon_state = "id"
 	item_state = "card-id"
-	var/mining_points = 0 //For redeeming at mining equipment lockers
+	var/mining_points = 0 // For redeeming at mining equipment lockers
+	var/total_mining_points = 0 // Total mining points for the whole round.
 	var/list/access = list()
 	var/registered_name = "Unknown" // The name registered_name on the card
 	slot_flags = SLOT_ID
@@ -174,7 +175,7 @@
 	user.visible_message("[user] shows you: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]",\
 		"You flash your ID card: [bicon(src)] [src.name]. The assignment on the card: [src.assignment]")
 	if(mining_points)
-		to_chat(user, "There's [mining_points] mining equipment redemption points loaded onto this card.")
+		to_chat(user, "There's <b>[mining_points] Mining Points</b> loaded onto this card. This card has earned <b>[total_mining_points] Mining Points</b> this Shift!")
 	src.add_fingerprint(user)
 	return
 
@@ -330,6 +331,7 @@
 	data["account"] = associated_account_number
 	data["owner"] = registered_name
 	data["mining"] = mining_points
+	data["mining_total"] = total_mining_points
 	return data
 
 /obj/item/card/id/deserialize(list/data)
@@ -343,6 +345,7 @@
 	associated_account_number = data["account"]
 	registered_name = data["owner"]
 	mining_points = data["mining"]
+	total_mining_points = data["mining_total"]
 	// We'd need to use icon serialization(b64) to save the photo, and I don't feel like i
 	UpdateName()
 	RebuildHTML()
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 8bcc8f0e615..e89acf409d9 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -252,7 +252,7 @@
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 
 	// General info
-	data["id"] = inserted_id ? list("name" = "[inserted_id.registered_name] ([inserted_id.assignment])", "points" = inserted_id.mining_points) : null
+	data["id"] = inserted_id ? list("name" = "[inserted_id.registered_name] ([inserted_id.assignment])", "points" = inserted_id.mining_points, "total_points" = inserted_id.total_mining_points) : null
 	data["points"] = points
 	data["disk"] = inserted_disk ? list(
 		"name" = inserted_disk.name,
@@ -300,6 +300,7 @@
 				return
 			if(anyone_claim || (req_access_claim in inserted_id.access))
 				inserted_id.mining_points += points
+				inserted_id.total_mining_points += points
 				to_chat(usr, "<span class='notice'>[points] points claimed.</span>")
 				points = 0
 			else
diff --git a/tgui/packages/tgui/interfaces/OreRedemption.js b/tgui/packages/tgui/interfaces/OreRedemption.js
index 4736a24dfa2..a0d6824aa10 100644
--- a/tgui/packages/tgui/interfaces/OreRedemption.js
+++ b/tgui/packages/tgui/interfaces/OreRedemption.js
@@ -72,6 +72,11 @@ const IdDisk = (properties, context) => {
             <Box bold>{formatPoints(id.points)}</Box>
           </LabeledList.Item>
         )}
+        {id && (
+          <LabeledList.Item label="Collected points">
+          <Box bold>{formatPoints(id.total_points)}</Box>
+        </LabeledList.Item>
+        )}
         <LabeledList.Item
           label="Unclaimed points"
           color={points > 0 ? 'good' : 'grey'}