Refactor of record system code and migrate all record UI to TGUI

code/__DEFINES/human.dm

@@ -215,3 +215,92 @@
 #define RELIGION_AGNOSTICISM "Agnostic"
 
 #define MAXIMUM_DROPPED_OBJECTS_REMEMBERED 2
+
+// DEFINES FOR RECORD SYSTEM STAT TYPES, arguably pointless to create defines for these, could of just renamed the string but eh, who cares.
+// --------------------------------------------------------------------------------------------------------------- //
+
+// general records
+#define MOB_NAME "name"
+#define RECORD_UNIQUE_ID "id"
+#define MOB_SHOWN_RANK "rank"
+#define MOB_REAL_RANK "real_rank"
+#define MOB_SEX "sex"
+#define MOB_AGE "age"
+#define MOB_ETHNICITY "ethnicity"
+#define MOB_HEALTH_STATUS "p_stat"
+#define MOB_MENTAL_STATUS "m_stat"
+#define MOB_SPECIES "species"
+#define MOB_ORIGIN "origin"
+#define MOB_SHOWN_FACTION "faction"
+#define MOB_REAL_FACTION "mob_faction"
+#define MOB_RELIGION "religion"
+#define MOB_SQUAD "squad"
+#define MOB_GENERAL_NOTES "g_notes"
+#define MOB_EXPLOIT_RECORD "mob_exploit_record"
+#define MOB_WEAKREF "ref"
+
+#define GENERAL_RECORD_LIST list(MOB_NAME, RECORD_UNIQUE_ID, MOB_SHOWN_RANK, MOB_REAL_RANK, MOB_SEX, MOB_AGE, MOB_ETHNICITY, MOB_HEALTH_STATUS, MOB_MENTAL_STATUS, MOB_SPECIES, MOB_ORIGIN, MOB_SHOWN_FACTION, MOB_REAL_FACTION, MOB_RELIGION, MOB_SQUAD, MOB_GENERAL_NOTES, MOB_EXPLOIT_RECORD, MOB_WEAKREF)
+
+// security record stat types
+#define MOB_INCIDENTS "incidents"
+#define MOB_CRIMINAL_STATUS "criminal"
+#define MOB_SECURITY_COMMENT_LOG "comments"
+#define MOB_SECURITY_NOTES "s_notes"
+
+#define SECURITY_RECORD_LIST list(MOB_INCIDENTS, MOB_CRIMINAL_STATUS, MOB_SECURITY_COMMENT_LOG, MOB_SECURITY_NOTES)
+
+// medical record stat types
+#define MOB_BLOOD_TYPE "b_type"
+#define MOB_DISABILITIES "mi_dis"
+#define MOB_AUTOPSY_NOTES "a_stat"
+#define MOB_MEDICAL_NOTES "m_notes"
+#define MOB_DISEASES "cdi"
+#define MOB_CAUSE_OF_DEATH "d_stat"
+#define MOB_AUTOPSY_SUBMISSION "aut_sub"
+#define MOB_LAST_SCAN_TIME "last_scan_time"
+#define MOB_LAST_SCAN_RESULT "last_scan_result"
+#define MOB_AUTODOC_DATA "autodoc_data"
+#define MOB_AUTODOC_MANUAL "autodoc_manual"
+
+#define MEDICAL_RECORD_LIST list(MOB_BLOOD, MOB_DISABILITIES, MOB_AUTOPSY_NOTES, MOB_MEDICAL_NOTES, MOB_DISEASES, MOB_CAUSE_OF_DEATH, MOB_AUTOPSY_SUBMISSION, MOB_LAST_SCAN_TIME, MOB_LAST_SCAN_RESULT, MOB_AUTODOC_DATA, MOB_AUTODOC_MANUAL)
+
+// --------------------------------------------------------------------------------------------------------------- //
+
+// The actual stat that is set, for now we reduce the useless bullshit no one cares about and keep it minimal.
+// --------------------------------------------------------------------------------------------------------------- //
+
+// gender/sex stats
+#define MOB_STAT_SEX_MALE "Male"
+#define MOB_STAT_SEX_FEMALE "Female"
+
+#define MOB_STAT_GENDER_LIST list(MOB_STAT_SEX_MALE, MOB_STAT_SEX_FEMALE)
+
+// health stats
+#define MOB_STAT_HEALTH_DECEASED "Deceased"
+#define MOB_STAT_HEALTH_ACTIVE "Active"
+#define MOB_STAT_HEALTH_UNFIT "Unfit"
+
+#define MOB_STAT_HEALTH_LIST list(MOB_STAT_SEX_MALE, MOB_STAT_SEX_FEMALE)
+
+// Mental stats
+#define MOB_STAT_MENTAL_STATUS_STABLE "Stable"
+#define MOB_STAT_MENTAL_STATUS_ON_WATCH "Watch"  // i.e. potentailly unstable
+#define MOB_STAT_MENTAL_STATUS_UNSTABLE "Insane"
+
+#define MOB_STAT_MENTAL_STATUS_LIST list(MOB_STAT_MENTAL_STATUS_STABLE, MOB_STAT_MENTAL_STATUS_ON_WATCH, MOB_STAT_MENTAL_STATUS_UNSTABLE)
+
+// crime stats
+#define MOB_STAT_CRIME_NONE "None"
+#define MOB_STAT_CRIME_ARREST "Arrest"
+#define MOB_STAT_CRIME_INCARCERATED "Incarcerated"
+
+#define MOB_STAT_CRIME_STATUS_LIST list(MOB_STAT_CRIME_NONE, MOB_STAT_CRIME_ARREST, MOB_STAT_CRIME_INCARCERATED)
+// ------------------------------------------------------------------------------------------------------------------ //
+
+// types of records
+#define RECORD_TYPE_GENERAL "general"
+#define RECORD_TYPE_SECURITY "security"
+#define RECORD_TYPE_MEDICAL "medical"
+#define RECORD_TYPE_STATIC "locked" // immutable records, keeping it for now I guess.
+
+#define RECORD_TYPE_LIST list(RECORD_TYPE_GENERAL, RECORD_TYPE_SECURITY,  RECORD_TYPE_MEDICAL, RECORD_TYPE_STATIC )

code/__HELPERS/unsorted.dm

@@ -254,13 +254,9 @@
 
 	if(oldname)
 		//update the datacore records! This is goig to be a bit costly.
-		var/mob_ref = WEAKREF(src)
-		for(var/list/L in list(GLOB.data_core.general, GLOB.data_core.medical, GLOB.data_core.security, GLOB.data_core.locked))
-			for(var/datum/data/record/record_entry in L)
-				if(record_entry.fields["ref"] == mob_ref)
-					record_entry.fields["name"] = newname
-					record_entry.name = newname
-					break
+		for(var/record_type in RECORD_TYPE_LIST)
+			insert_record_stat(mob_name = oldname, record_type = record_type, stat_type = MOB_WEAKREF, new_stat = WEAKREF(src))
+			insert_record_stat(mob_name = oldname, record_type = record_type, stat_type = MOB_NAME, new_stat = newname)
 
 		//update our pda and id if we have them on our person
 		var/list/searching = GetAllContents(searchDepth = 3)

code/datums/datacore.dm

@@ -32,12 +32,13 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 		)
 		departments += marines_by_squad
 		var/list/manifest_out = list()
-		for(var/datum/data/record/record_entry in GLOB.data_core.general)
-			if(record_entry.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
+		for(var/record in GLOB.data_core.general)
+			var/datum/data/record/record_entry =  GLOB.data_core.general[record] // I regret using associated lists for this.
+			if(record_entry.fields[MOB_REAL_FACTION] != FACTION_MARINE) //we process only USCM humans
 				continue
-			var/name = record_entry.fields["name"]
-			var/rank = record_entry.fields["rank"]
-			var/squad = record_entry.fields["squad"]
+			var/name = record_entry.fields[MOB_NAME]
+			var/rank = record_entry.fields[MOB_REAL_RANK]
+			var/squad = record_entry.fields[MOB_SQUAD]
 			if(isnull(name) || isnull(rank))
 				continue
 			var/has_department = FALSE
@@ -51,17 +52,17 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 					if(!manifest_out[department])
 						manifest_out[department] = list()
 					manifest_out[department] += list(list(
-						"name" = name,
-						"rank" = rank
+						MOB_NAME = name,
+						MOB_SHOWN_RANK = rank
 					))
 					has_department = TRUE
 					break
 			if(!has_department)
 				if(!manifest_out["Miscellaneous"])
 					manifest_out["Miscellaneous"] = list()
 				manifest_out["Miscellaneous"] += list(list(
-					"name" = name,
-					"rank" = rank
+					MOB_NAME = name,
+					MOB_SHOWN_RANK = rank
 				))
 		return manifest_out
 
@@ -85,14 +86,15 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	var/dept_flags = NO_FLAGS //Is there anybody in the department?.
 	var/list/squad_sublists = GLOB.ROLES_SQUAD_ALL.Copy() //Are there any marines in the squad?
 
-	for(var/datum/data/record/record_entry in GLOB.data_core.general)
-		if(record_entry.fields["mob_faction"] != FACTION_MARINE) //we process only USCM humans
+	for(var/entry in GLOB.data_core.general)
+		var/datum/data/record/record_entry = GLOB.data_core.general[entry]
+		if(record_entry.fields[MOB_REAL_FACTION] != FACTION_MARINE) //we process only USCM humans
 			continue
 
-		var/name = record_entry.fields["name"]
-		var/rank = record_entry.fields["rank"]
-		var/real_rank = record_entry.fields["real_rank"]
-		var/squad_name = record_entry.fields["squad"]
+		var/name = record_entry.fields[MOB_NAME]
+		var/rank = record_entry.fields[MOB_SHOWN_RANK]
+		var/real_rank = record_entry.fields[MOB_REAL_RANK]
+		var/squad_name = record_entry.fields[MOB_SQUAD]
 		if(isnull(name) || isnull(rank) || isnull(real_rank))
 			continue
 
@@ -104,7 +106,7 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 					break
 			isactive[name] = active ? "Active" : "Inactive"
 		else
-			isactive[name] = record_entry.fields["p_stat"]
+			isactive[name] = record_entry.fields[MOB_HEALTH_STATUS]
 			//cael - to prevent multiple appearances of a player/job combination, add a continue after each line
 
 		if(real_rank in GLOB.ROLES_CIC)
@@ -212,142 +214,45 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 			if(H.job in jobs_to_check)
 				manifest_inject(H)
 
-/datum/datacore/proc/manifest_modify(name, ref, assignment, rank, p_stat)
-	var/datum/data/record/foundrecord
+/datum/datacore/proc/manifest_modify(name, ref, assignment, rank, health_status, record_id_ref = null)
+	var/datum/data/record/found_record = null
+	found_record = retrieve_record(mob_ref = ref, mob_name = name, record_type =RECORD_TYPE_GENERAL, record_id_ref = record_id_ref)
 
-	var/use_name = isnull(ref)
-	for(var/datum/data/record/record_entry in GLOB.data_core.general)
-		if(use_name)
-			if(record_entry.fields["name"] == name)
-				foundrecord = record_entry
-				break
-		else
-			if(record_entry.fields["ref"] == ref)
-				foundrecord = record_entry
-				break
-
-	if(foundrecord)
+	if(found_record)
 		if(assignment)
-			foundrecord.fields["rank"] = assignment
+			found_record.fields[MOB_SHOWN_RANK] = assignment
 		if(rank)
-			foundrecord.fields["real_rank"] = rank
-		if(p_stat)
-			foundrecord.fields["p_stat"] = p_stat
-		if(!use_name)
-			if(name)
-				foundrecord.fields["name"] = name
+			found_record.fields[MOB_SHOWN_RANK] = rank
+		if(health_status)
+			found_record.fields[MOB_HEALTH_STATUS] = health_status
+		if(name)
+			found_record.fields[MOB_NAME] = name
 		return TRUE
 	return FALSE
 
 /datum/datacore/proc/manifest_inject(mob/living/carbon/human/target)
-	var/assignment
-	if(target.job)
-		assignment = target.job
-	else
-		assignment = "Unassigned"
-
-	var/id = add_zero(num2hex(target.gid), 6) //this was the best they could come up with? A large random number? *sigh*
-	//var/icon/front = new(get_id_photo(H), dir = SOUTH)
-	//var/icon/side = new(get_id_photo(H), dir = WEST)
-
-	//General Record
-	var/datum/data/record/record_general = new()
-	record_general.fields["id"] = id
-	record_general.fields["name"] = target.real_name
-	record_general.name = target.real_name
-	record_general.fields["real_rank"] = target.job
-	record_general.fields["rank"] = assignment
-	record_general.fields["squad"] = target.assigned_squad ? target.assigned_squad.name : null
-	record_general.fields["age"] = target.age
-	record_general.fields["p_stat"] = "Active"
-	record_general.fields["m_stat"] = "Stable"
-	record_general.fields["sex"] = target.gender
-	record_general.fields["species"] = target.get_species()
-	record_general.fields["origin"] = target.origin
-	record_general.fields["faction"] = target.personal_faction
-	record_general.fields["mob_faction"] = target.faction
-	record_general.fields["religion"] = target.religion
-	record_general.fields["ref"] = WEAKREF(target)
-	//record_general.fields["photo_front"] = front
-	//record_general.fields["photo_side"] = side
-
-	if(target.gen_record && !jobban_isbanned(target, "Records"))
-		record_general.fields["notes"] = target.gen_record
-	else
-		record_general.fields["notes"] = "No notes found."
-	general += record_general
-
-	//Medical Record
-	var/datum/data/record/record_medical = new()
-	record_medical.fields["id"] = id
-	record_medical.fields["name"] = target.real_name
-	record_medical.name = target.name
-	record_medical.fields["b_type"] = target.blood_type
-	record_medical.fields["mi_dis"] = "None"
-	record_medical.fields["mi_dis_d"] = "No minor disabilities have been declared."
-	record_medical.fields["ma_dis"] = "None"
-	record_medical.fields["ma_dis_d"] = "No major disabilities have been diagnosed."
-	record_medical.fields["alg"] = "None"
-	record_medical.fields["alg_d"] = "No allergies have been detected in this patient."
-	record_medical.fields["cdi"] = "None"
-	record_medical.fields["cdi_d"] = "No diseases have been diagnosed at the moment."
-	record_medical.fields["last_scan_time"] = null
-	record_medical.fields["last_scan_result"] = "No scan data on record" // body scanner results
-	record_medical.fields["autodoc_data"] = list()
-	record_medical.fields["autodoc_manual"] = list()
-	record_medical.fields["ref"] = WEAKREF(target)
-
-	if(target.med_record && !jobban_isbanned(target, "Records"))
-		record_medical.fields["notes"] = target.med_record
-	else
-		record_medical.fields["notes"] = "No notes found."
-	medical += record_medical
-
-	//Security Record
-	var/datum/data/record/record_security = new()
-	record_security.fields["id"] = id
-	record_security.fields["name"] = target.real_name
-	record_security.name = target.real_name
-	record_security.fields["criminal"] = "None"
-	record_security.fields["incident"] = ""
-	record_security.fields["ref"] = WEAKREF(target)
-
-	if(target.sec_record && !jobban_isbanned(target, "Records"))
-		var/new_comment = list("entry" = target.sec_record, "created_by" = list("name" = "\[REDACTED\]", "rank" = "Military Police"), "deleted_by" = null, "deleted_at" = null, "created_at" = "Pre-Deployment")
-		record_security.fields["comments"] = list("1" = new_comment)
-		record_security.fields["notes"] = target.sec_record
-	security += record_security
-
-
-	//Locked Record
-	var/datum/data/record/record_locked = new()
-	record_locked.fields["id"] = md5("[target.real_name][target.job]")
-	record_locked.fields["name"] = target.real_name
-	record_locked.name = target.real_name
-	record_locked.fields["rank"] = target.job
-	record_locked.fields["age"] = target.age
-	record_locked.fields["sex"] = target.gender
-	record_locked.fields["b_type"] = target.b_type
-	record_locked.fields["species"] = target.get_species()
-	record_locked.fields["origin"] = target.origin
-	record_locked.fields["faction"] = target.personal_faction
-	record_locked.fields["religion"] = target.religion
-	record_locked.fields["ref"] = WEAKREF(target)
-
-	if(target.exploit_record && !jobban_isbanned(target, "Records"))
-		record_locked.fields["exploit_record"] = target.exploit_record
-	else
-		record_locked.fields["exploit_record"] = "No additional information acquired."
-	locked += record_locked
 
+	if(!(target)) // big problemo.
+		return
+
+	// they already have a record.
+	if(target.record_id_ref)
+		return
+
+	var/id_ref = null
+	if(target.ckey)
+		id_ref = "[target.ckey]" // should be unique right?
+	else
+		id_ref = text("[]", add_zero(num2hex(rand(1, 1.6777215E7)), 6)) // not a player controlled mob.
+	target.record_id_ref = id_ref
+	create_general_record(target)
+	create_medical_record(target)
+	create_security_record(target)
+	create_static_character_record(target)
 
 /proc/get_id_photo(mob/living/carbon/human/H)
 	var/icon/preview_icon = null
 
-	//var/g = "m"
-	//if (H.gender == FEMALE)
-	// g = "f"
-
 	var/icon/icobase = H.species.icobase
 	var/icon/temp
 

code/datums/medal_awards.dm

@@ -45,9 +45,10 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME
 	// Pick a marine
 	var/list/possible_recipients = list()
 	var/list/recipient_ranks = list()
-	for(var/datum/data/record/record in GLOB.data_core.general)
-		var/recipient_name = record.fields["name"]
-		recipient_ranks[recipient_name] = record.fields["rank"]
+	for(var/record_name in GLOB.data_core.general)
+		var/datum/data/record/record = GLOB.data_core.general[record_name]
+		var/recipient_name = record.fields[MOB_NAME]
+		recipient_ranks[recipient_name] = record.fields[MOB_REAL_RANK]
 		possible_recipients += recipient_name
 	var/chosen_recipient = tgui_input_list(usr, "Who do you want to award a medal to?", "Medal Recipient", possible_recipients)
 	if(!chosen_recipient)
@@ -164,9 +165,10 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_ME
 
 /proc/give_medal_award_prefilled(medal_location, mob/giving_mob, chosen_recipient, recipient_rank, recipient_ckey, reason, _medal_type)
 	var/list/recipient_ranks = list()
-	for(var/datum/data/record/record in GLOB.data_core.general)
-		var/recipient_name = record.fields["name"]
-		recipient_ranks[recipient_name] = record.fields["rank"]
+	for(var/record_name in GLOB.data_core.general)
+		var/datum/data/record/record = GLOB.data_core.general[record_name]
+		var/recipient_name = record.fields[MOB_NAME]
+		recipient_ranks[recipient_name] = record.fields[MOB_SHOWN_RANK]
 
 	if(!chosen_recipient)
 		return FALSE
@@ -473,7 +475,8 @@ GLOBAL_LIST_INIT(xeno_medals, list(XENO_SLAUGHTER_MEDAL, XENO_RESILIENCE_MEDAL,
 	// Pick a marine
 	var/list/possible_recipients = list()
 	var/list/recipient_ranks = list()
-	for(var/datum/data/record/record in GLOB.data_core.general)
+	for(var/record_name in GLOB.data_core.general)
+		var/datum/data/record/record = GLOB.data_core.general[record_name]
 		var/recipient_name = record.fields["name"]
 		if(recipient_name == recommendation_giver.real_name)
 			continue