Conversion of realname and nickname from bay (#19120)

* Automatic changelog compile [ci skip]

* replace all bay instances for realname and nickname with tg

* add comments where uncertain of sanitisation needed

* Fix issue from git conflict..

* Fix issue causing setup menu not opening

* Attempt to clean up how name datums are handled

* Remove redundant check

* Fix number issues with character names

---------

Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>

code/modules/client/preference_setup/general/01_basic.dm

@@ -18,16 +18,12 @@
 	sort_order = 1
 
 /datum/category_item/player_setup_item/general/basic/load_character(list/save_data)
-	pref.real_name			= save_data["real_name"]
-	pref.nickname			= save_data["nickname"]
 	pref.biological_gender	= save_data["gender"]
 	pref.identifying_gender	= save_data["id_gender"]
 	pref.vore_egg_type		= save_data["vore_egg_type"]
 	pref.autohiss			= save_data["autohiss"]
 
 /datum/category_item/player_setup_item/general/basic/save_character(list/save_data)
-	save_data["real_name"]				= pref.real_name
-	save_data["nickname"]				= pref.nickname
 	save_data["gender"]					= pref.biological_gender
 	save_data["id_gender"]				= pref.identifying_gender
 	save_data["vore_egg_type"]			= pref.vore_egg_type
@@ -36,29 +32,31 @@
 /datum/category_item/player_setup_item/general/basic/sanitize_character()
 	pref.biological_gender  = sanitize_inlist(pref.biological_gender, get_genders(), pick(get_genders()))
 	pref.identifying_gender = (pref.identifying_gender in all_genders_define_list) ? pref.identifying_gender : pref.biological_gender
-	pref.real_name		= sanitize_name(pref.real_name, pref.species, is_FBP())
-	if(!pref.real_name)
-		pref.real_name      = random_name(pref.identifying_gender, pref.species)
-	pref.nickname		= sanitize_name(pref.nickname)
 	pref.vore_egg_type	 = sanitize_inlist(pref.vore_egg_type, GLOB.global_vore_egg_types, initial(pref.vore_egg_type))
 	pref.autohiss = sanitize_inlist(pref.autohiss, list("Off", "Basic", "Full"), initial(pref.autohiss))
 
 // Moved from /datum/preferences/proc/copy_to()
 /datum/category_item/player_setup_item/general/basic/copy_to_mob(var/mob/living/carbon/human/character)
+	var/char_real_name = pref.read_preference(/datum/preference/name/real_name)
+	// Re-sanitize name on join.
+	// Fixes being able to swap from FBP to organic before round join to be organic with numbers in name.
+	char_real_name = sanitize_name(char_real_name, pref.species, is_FBP())
+	if(!char_real_name)
+		char_real_name = random_name(pref.identifying_gender, pref.species)
 	if(CONFIG_GET(flag/humans_need_surnames))
-		var/firstspace = findtext(pref.real_name, " ")
-		var/name_length = length(pref.real_name)
+		var/firstspace = findtext(char_real_name, " ")
+		var/name_length = length(char_real_name)
 		if(!firstspace)	//we need a surname
-			pref.real_name += " [pick(GLOB.last_names)]"
+			char_real_name += " [pick(GLOB.last_names)]"
 		else if(firstspace == name_length)
-			pref.real_name += "[pick(GLOB.last_names)]"
+			char_real_name += "[pick(GLOB.last_names)]"
 
-	character.real_name = pref.real_name
+	character.real_name = char_real_name
 	character.name = character.real_name
 	if(character.dna)
 		character.dna.real_name = character.real_name
 
-	character.nickname = pref.nickname
+	character.nickname = pref.read_preference(/datum/preference/name/nickname)
 
 	character.gender = pref.biological_gender
 	character.identifying_gender = pref.identifying_gender
@@ -80,9 +78,9 @@
 /datum/category_item/player_setup_item/general/basic/tgui_data(mob/user)
 	var/list/data = ..()
 
-	data["real_name"] = pref.real_name
+	data["real_name"] = pref.read_preference(/datum/preference/name/real_name)
 	data["be_random_name"] = pref.read_preference(/datum/preference/toggle/human/name_is_always_random)
-	data["nickname"] = pref.nickname
+	data["nickname"] = pref.read_preference(/datum/preference/name/nickname)
 	data["biological_sex"] = gender2text(pref.biological_gender)
 	data["identifying_gender"] = gender2text(pref.identifying_gender)
 	data["age"] = pref.read_preference(/datum/preference/numeric/human/age)
@@ -201,18 +199,19 @@
 
 	switch(action)
 		if("rename")
-			var/raw_name = tgui_input_text(user, "Choose your character's name:", "Character Name", pref.real_name, encode = FALSE)
+			var/current_name = pref.read_preference(/datum/preference/name/real_name)
+			var/raw_name = tgui_input_text(user, "Choose your character's name:", "Character Name", current_name, encode = FALSE)
 			if(!isnull(raw_name))
 				var/new_name = sanitize_name(raw_name, pref.species, is_FBP())
 				if(new_name)
-					pref.real_name = new_name
+					pref.update_preference_by_type(/datum/preference/name/real_name, new_name)
 					return TOPIC_REFRESH
 				else
 					to_chat(user, span_warning("Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ."))
 					return TOPIC_NOACTION
 
 		if("random_name")
-			pref.real_name = random_name(pref.identifying_gender, pref.species)
+			pref.update_preference_by_type(/datum/preference/name/real_name, random_name(pref.identifying_gender, pref.species))
 			return TOPIC_REFRESH
 
 		if("always_random_name")
@@ -220,11 +219,12 @@
 			return TOPIC_REFRESH
 
 		if("nickname")
-			var/raw_nickname = tgui_input_text(user, "Choose your character's nickname:", "Character Nickname", pref.nickname, encode = FALSE)
+			var/current_nickname = pref.read_preference(/datum/preference/name/nickname)
+			var/raw_nickname = tgui_input_text(user, "Choose your character's nickname:", "Character Nickname", current_nickname, encode = FALSE)
 			if(!isnull(raw_nickname))
 				var/new_nickname = sanitize_name(raw_nickname, pref.species, is_FBP())
 				if(new_nickname)
-					pref.nickname = new_nickname
+					pref.update_preference_by_type(/datum/preference/name/nickname, new_nickname)
 					return TOPIC_REFRESH
 				else
 					to_chat(user, span_warning("Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ."))
@@ -233,7 +233,7 @@
 		if("reset_nickname")
 			var/nick_choice = tgui_alert(user, "Wipe your Nickname? This will completely remove any chosen nickname(s).","Wipe Nickname",list("Yes","No"))
 			if(nick_choice == "Yes")
-				pref.nickname = null
+				pref.update_preference_by_type(/datum/preference/name/nickname, null)
 			return TOPIC_REFRESH
 
 		if("bio_gender")

code/modules/client/preference_setup/general/02_language.dm

@@ -26,17 +26,18 @@
 	save_data["runechat_color"]			= pref.runechat_color
 
 /datum/category_item/player_setup_item/general/language/sanitize_character()
+	var/char_name = pref.read_preference(/datum/preference/name/real_name) || "-name not yet loaded-"
 	if(!islist(pref.alternate_languages))
-		testing("LANGSANI: Sanitizing languages on [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because their character has no languages list")
+		testing("LANGSANI: Sanitizing languages on [pref.client]'s character [char_name] because their character has no languages list")
 		pref.alternate_languages = list()
 	if(pref.species)
 		var/datum/species/S = GLOB.all_species[pref.species]
 		if(!istype(S))
-			testing("LANGSANI: Failed sani on [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because their species ([pref.species]) isn't in the global list")
+			testing("LANGSANI: Failed sani on [pref.client]'s character [char_name] because their species ([pref.species]) isn't in the global list")
 			return
 
 		if(pref.alternate_languages.len > (S.num_alternate_languages + pref.extra_languages))
-			testing("LANGSANI: Truncated [pref.client]'s character [pref.real_name || "-name not yet loaded-"] language list because it was too long (len: [pref.alternate_languages.len], allowed: [S.num_alternate_languages])")
+			testing("LANGSANI: Truncated [pref.client]'s character [char_name] language list because it was too long (len: [pref.alternate_languages.len], allowed: [S.num_alternate_languages])")
 			pref.alternate_languages.len = (S.num_alternate_languages + pref.extra_languages) // Truncate to allowed length
 
 		// VOREStation Edit Start
@@ -48,7 +49,7 @@
 		for(var/language in pref.alternate_languages)
 			var/datum/language/L = GLOB.all_languages[language]
 			if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L)))
-				testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks")
+				testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [char_name] because it failed allowed checks")
 				pref.alternate_languages -= language
 
 	if(isnull(pref.language_prefixes) || !pref.language_prefixes.len)

code/modules/client/preference_setup/general/03_body.dm

@@ -267,9 +267,12 @@
 		pref.rlimb_data -= null
 
 	// Sanitize the name so that there aren't any numbers sticking around.
-	pref.real_name          = sanitize_name(pref.real_name, pref.species)
-	if(!pref.real_name)
-		pref.real_name      = random_name(pref.identifying_gender, pref.species)
+	// Is this still necessary with TG conversation?
+	var/current_name = pref.read_preference(/datum/preference/name/real_name)
+	current_name = sanitize_name(current_name, pref.species)
+	if(!current_name)
+		current_name = random_name(pref.identifying_gender, pref.species)
+	pref.update_preference_by_type(/datum/preference/name/real_name, current_name)
 
 /datum/category_item/player_setup_item/general/body/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
 	var/list/data = ..()

code/modules/client/preference_setup/general/11_misc.dm

@@ -252,22 +252,26 @@
 				pref.vantag_preference = names_list[selection]
 			return TOPIC_REFRESH
 		if("custom_say")
-			var/say_choice = tgui_input_text(user, "This word or phrase will appear instead of 'says': [pref.real_name] says, \"Hi.\"", "Custom Say", pref.custom_say, 12)
+			var/char_name = pref.read_preference(/datum/preference/name/real_name)
+			var/say_choice = tgui_input_text(user, "This word or phrase will appear instead of 'says': [char_name] says, \"Hi.\"", "Custom Say", pref.custom_say, 12)
 			if(say_choice)
 				pref.custom_say = say_choice
 			return TOPIC_REFRESH
 		if("custom_whisper")
-			var/whisper_choice = tgui_input_text(user, "This word or phrase will appear instead of 'whispers': [pref.real_name] whispers, \"Hi...\"", "Custom Whisper", pref.custom_whisper, 12)
+			var/char_name = pref.read_preference(/datum/preference/name/real_name)
+			var/whisper_choice = tgui_input_text(user, "This word or phrase will appear instead of 'whispers': [char_name] whispers, \"Hi...\"", "Custom Whisper", pref.custom_whisper, 12)
 			if(whisper_choice)
 				pref.custom_whisper = whisper_choice
 			return TOPIC_REFRESH
 		if("custom_ask")
-			var/ask_choice = tgui_input_text(user, "This word or phrase will appear instead of 'asks': [pref.real_name] asks, \"Hi?\"", "Custom Ask", pref.custom_ask, 12)
+			var/char_name = pref.read_preference(/datum/preference/name/real_name)
+			var/ask_choice = tgui_input_text(user, "This word or phrase will appear instead of 'asks': [char_name] asks, \"Hi?\"", "Custom Ask", pref.custom_ask, 12)
 			if(ask_choice)
 				pref.custom_ask = ask_choice
 			return TOPIC_REFRESH
 		if("custom_exclaim")
-			var/exclaim_choice = tgui_input_text(user, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [pref.real_name] exclaims, \"Hi!\"", "Custom Exclaim", pref.custom_exclaim, 12)
+			var/char_name = pref.read_preference(/datum/preference/name/real_name)
+			var/exclaim_choice = tgui_input_text(user, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [char_name] exclaims, \"Hi!\"", "Custom Exclaim", pref.custom_exclaim, 12)
 			if(exclaim_choice)
 				pref.custom_exclaim = exclaim_choice
 			return TOPIC_REFRESH

code/modules/client/preference_setup/general/13_nif.dm

@@ -35,18 +35,19 @@
 	savefile.save()
 
 /datum/category_item/player_setup_item/general/nif/sanitize_character()
+	var/char_name = pref.read_preference(/datum/preference/name/real_name) || "-name not yet loaded-"
 	if(pref.nif_path && !ispath(pref.nif_path))		//We have at least a text string that should be a path.
 		pref.nif_path = text2path(pref.nif_path) 	//Try to convert it to a hard path.
 		if(!pref.nif_path)							//If we couldn't, kill it.
 			pref.nif_path = null					//Kill!
-			WARNING("Loaded a NIF but it was an invalid path, [pref.real_name]")
+			WARNING("Loaded a NIF but it was an invalid path, [char_name]")
 
 	if (ispath(pref.nif_path, /obj/item/nif/protean) && pref.species != SPECIES_PROTEAN) //no free nifs
 		pref.nif_path = null
 
 	if(ispath(pref.nif_path) && isnull(pref.nif_durability))		//How'd you lose this?
 		pref.nif_durability = initial(pref.nif_path.durability)		//Well, have a new one, my bad.
-		WARNING("Loaded a NIF but with no durability, [pref.real_name]")
+		WARNING("Loaded a NIF but with no durability, [char_name]")
 
 	if(!islist(pref.nif_savedata))
 		pref.nif_savedata = list()

code/modules/client/preference_setup/loadout/02_loadout.dm

@@ -80,7 +80,7 @@ var/list/gear_datums = list()
 	if(pref.client)
 		if(G.ckeywhitelist && !(pref.client_ckey in G.ckeywhitelist))
 			return FALSE
-		if(G.character_name && !(pref.real_name in G.character_name))
+		if(G.character_name && !(pref.read_preference(/datum/preference/name/real_name) in G.character_name))
 			return FALSE
 	return TRUE