Merge pull request #4425 from CHOMPStation2/upstream-merge-13178

[MIRROR] Adds Linguist and Polyglot traits

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

@@ -1,3 +1,6 @@
+/datum/preferences
+	var/extra_languages = 0
+
 /datum/category_item/player_setup_item/general/language
 	name = "Language"
 	sort_order = 2
@@ -5,19 +8,17 @@
 
 /datum/category_item/player_setup_item/general/language/load_character(var/savefile/S)
 	S["language"]			>> pref.alternate_languages
+	S["extra_languages"]	>> pref.extra_languages
+	testing("LANGSANI: Loaded from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
 	S["language_prefixes"]	>> pref.language_prefixes
 	//CHOMPEdit Begin
 	S["species"]			>> pref.species
-	S["pos_traits"]		>> pref.pos_traits
-	var/morelang = 0
-	for(var/trait in pref.pos_traits)
-		if(trait==/datum/trait/positive/linguist)
-			morelang = 1
-	pref.num_languages = morelang * 12
 	//CHOMPEdit End
 
 /datum/category_item/player_setup_item/general/language/save_character(var/savefile/S)
 	S["language"]			<< pref.alternate_languages
+	S["extra_languages"]	<< pref.extra_languages
+	testing("LANGSANI: Saved to [pref.client]'s character [pref.real_name || "-name not yet loaded-"] savefile: [english_list(pref.alternate_languages || list())]")
 	S["language_prefixes"]	<< pref.language_prefixes
 
 /datum/category_item/player_setup_item/general/language/sanitize_character()
@@ -26,9 +27,9 @@
 		var/datum/species/S = GLOB.all_species[pref.species]
 		if(!istype(S))
 			return
-			
-		if(pref.alternate_languages.len > pref.numlanguage()) //CHOMPEdit
-			pref.alternate_languages.len = pref.numlanguage() // Truncate to allowed length CHOMPEdit
+		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])")
+			pref.alternate_languages.len = (S.num_alternate_languages + pref.extra_languages) // Truncate to allowed length
 
 		// Sanitize illegal languages
 		for(var/language in pref.alternate_languages)
@@ -46,18 +47,20 @@
 /datum/category_item/player_setup_item/general/language/content()
 	. += "<b>Languages</b><br>"
 	var/datum/species/S = GLOB.all_species[pref.species]
+	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])")
+		pref.alternate_languages.len = (S.num_alternate_languages + pref.extra_languages) // Truncate to allowed length
 	if(S.language)
 		. += "- [S.language]<br>"
 	if(S.default_language && S.default_language != S.language)
 		. += "- [S.default_language]<br>"
-	if(pref.numlanguage()) //CHOMPEdit
+	if(S.num_alternate_languages + pref.extra_languages)
 		if(pref.alternate_languages.len)
 			for(var/i = 1 to pref.alternate_languages.len)
 				var/lang = pref.alternate_languages[i]
 				. += "- [lang] - <a href='?src=\ref[src];remove_language=[i]'>remove</a><br>"
-
-		if(pref.alternate_languages.len < pref.numlanguage()) //CHOMPEdit
-			. += "- <a href='?src=\ref[src];add_language=1'>add</a> ([pref.numlanguage() - pref.alternate_languages.len] remaining)<br>"	//CHOMPEdit
+		if(pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
+			. += "- <a href='?src=\ref[src];add_language=1'>add</a> ([(S.num_alternate_languages + pref.extra_languages) - pref.alternate_languages.len] remaining)<br>"
 	else
 		. += "- [pref.species] cannot choose secondary languages.<br>"
 
@@ -71,7 +74,7 @@
 		return TOPIC_REFRESH
 	else if(href_list["add_language"])
 		var/datum/species/S = GLOB.all_species[pref.species]
-		if(pref.alternate_languages.len >= pref.numlanguage()) //CHOMPEdit
+		if(pref.alternate_languages.len >= (S.num_alternate_languages + pref.extra_languages))
 			tgui_alert_async(user, "You have already selected the maximum number of alternate languages for this species!")
 		else
 			var/list/available_languages = S.secondary_langs.Copy()
@@ -89,7 +92,7 @@
 				tgui_alert_async(user, "There are no additional languages available to select.")
 			else
 				var/new_lang = tgui_input_list(user, "Select an additional language", "Character Generation", available_languages)
-				if(new_lang && pref.alternate_languages.len < pref.numlanguage()) //CHOMPEdit
+				if(new_lang && pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages))
 					pref.alternate_languages |= new_lang
 					return TOPIC_REFRESH
 

code/modules/client/preference_setup/vore/07_traits.dm

@@ -141,6 +141,9 @@
 	var/datum/species/S = character.species
 	var/datum/species/new_S = S.produceCopy(pref.pos_traits + pref.neu_traits + pref.neg_traits, character, pref.custom_base)
 
+	for(var/datum/trait/T in new_S.traits)
+		T.apply_pref(src)
+
 	//Any additional non-trait settings can be applied here
 	new_S.blood_color = pref.blood_color
 
@@ -151,8 +154,6 @@
 		//Statistics for this would be nice
 		var/english_traits = english_list(new_S.traits, and_text = ";", comma_text = ";")
 		log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet
-	else
-
 
 /datum/category_item/player_setup_item/vore/traits/content(var/mob/user)
 	. += "<b>Custom Species Name:</b> "
@@ -255,9 +256,9 @@
 		var/datum/trait/trait = text2path(href_list["clicked_pos_trait"])
 		var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel"))
 		if(choice == "Remove")
-			if(traitpath == /datum/trait/positive/linguist)					//CHOMPEdit
-				pref.num_languages = null								//CHOMPEdit
 			pref.pos_traits -= trait
+			var/datum/trait/instance = all_traits[trait]
+			instance.remove_pref(pref)
 		return TOPIC_REFRESH
 
 	else if(href_list["clicked_neu_trait"])
@@ -265,6 +266,8 @@
 		var/choice = tgui_alert(usr, "Remove [initial(trait.name)]?","Remove Trait",list("Remove","Cancel"))
 		if(choice == "Remove")
 			pref.neu_traits -= trait
+			var/datum/trait/instance = all_traits[trait]
+			instance.remove_pref(pref)
 		return TOPIC_REFRESH
 
 	else if(href_list["clicked_neg_trait"])
@@ -272,6 +275,8 @@
 		var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and lose [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel"))
 		if(choice == "Remove")
 			pref.neg_traits -= trait
+			var/datum/trait/instance = all_traits[trait]
+			instance.remove_pref(pref)
 		return TOPIC_REFRESH
 
 	else if(href_list["custom_say"])
@@ -424,11 +429,16 @@
 							conflict = instance_test.name
 							break varconflict
 
+					for(var/V in instance.var_changes_pref)
+						if(V in instance_test.var_changes_pref)
+							conflict = instance_test.name
+							break varconflict
+
 			if(conflict)
 				tgui_alert_async(usr, "You cannot take this trait and [conflict] at the same time. Please remove that trait, or pick another trait to add.", "Error")
 				return TOPIC_REFRESH
-			if(path==/datum/trait/positive/linguist)	//CHOMPEdit
-				pref.num_languages = 12		//CHOMPEdit
+
+			instance.apply_pref(pref)
 			mylist += path
 			return TOPIC_REFRESH