diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 039498c3f9..8b83e7d374 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/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() . += "Languages
" 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]
" if(S.default_language && S.default_language != S.language) . += "- [S.default_language]
" - 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] - remove
" - - if(pref.alternate_languages.len < pref.numlanguage()) //CHOMPEdit - . += "- add ([pref.numlanguage() - pref.alternate_languages.len] remaining)
" //CHOMPEdit + if(pref.alternate_languages.len < (S.num_alternate_languages + pref.extra_languages)) + . += "- add ([(S.num_alternate_languages + pref.extra_languages) - pref.alternate_languages.len] remaining)
" else . += "- [pref.species] cannot choose secondary languages.
" @@ -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 diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 62b8cefe4b..1b8f2463b7 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/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) . += "Custom Species Name: " @@ -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 diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index c06d0ab35d..b4a63bea83 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -33,7 +33,6 @@ var/list/preferences_datums = list() var/tgui_swapped_buttons = FALSE //character preferences - var/num_languages = 0 //CHOMPEdit var/real_name //our character's name var/be_random_name = 0 //whether we are a random name every round var/nickname //our character's nickname @@ -164,12 +163,6 @@ var/list/preferences_datums = list() ///If they are currently in the process of swapping slots, don't let them open 999 windows for it and get confused var/selecting_slots = FALSE -//CHOMPEdit Begin -/datum/preferences/proc/numlanguage() - var/datum/species/S = GLOB.all_species[species] - var/num = max(num_languages, S.num_alternate_languages) - return (num == 0) ? 3 : num //Don't return 0 -//CHOMPEdit End /datum/preferences/New(client/C) player_setup = new(src) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index cc65469af9..ab54b663fa 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -186,4 +186,13 @@ /datum/trait/positive/cocoon_tf/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) - H.verbs |= /mob/living/carbon/human/proc/enter_cocoon \ No newline at end of file + H.verbs |= /mob/living/carbon/human/proc/enter_cocoon + +/* //CHOMPedit: We already have our own version of this trait. +/datum/trait/positive/linguist + name = "Linguist" + desc = "Allows you to have more languages." + cost = 1 + var_changes = list("num_alternate_languages" = 6) + var_changes_pref = list("extra_languages" = 3) +*/ diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm index 0643aa75f8..342d768b97 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm @@ -2,7 +2,8 @@ name = "Master Linguist" desc = "You are a master of languages! For whatever reason you might have, you are able to learn many more languages than others. Your language cap is 12 slots." cost = 2 - var_changes = list("num_alternate_languages" = 12) + var_changes = list("num_alternate_languages" = 15) + var_changes_pref = list("extra_languages" = 12) /datum/trait/positive/darksight name = "Darksight" @@ -354,4 +355,4 @@ /datum/trait/positive/sonar/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) - H.verbs |= /mob/living/carbon/human/proc/sonar_ping \ No newline at end of file + H.verbs |= /mob/living/carbon/human/proc/sonar_ping diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm index 91bf5fafea..806f17510f 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm @@ -6,6 +6,7 @@ var/sort = TRAIT_SORT_NORMAL // Sort order, 1 before 2 before 3 etc. Alphabetical is used for same-group traits. var/category = 0 // What category this trait is. -1 is Negative, 0 is Neutral, 1 is Positive var/list/var_changes // A list to apply to the custom species vars. + var/list/var_changes_pref // A list to apply to the preference vars. var/list/excludes // Store a list of paths of traits to exclude, but done automatically if they change the same vars. var/can_take = ORGANICS|SYNTHETICS // Can freaking synths use those. var/list/banned_species // A list of species that can't take this trait @@ -20,7 +21,23 @@ S.vars[V] = var_changes[V] return +//Applying trait to preferences rather than just us. +/datum/trait/proc/apply_pref(var/datum/preferences/P) + ASSERT(P) + if(var_changes_pref) + for(var/V in var_changes_pref) + P.vars[V] = var_changes_pref[V] + return + //Similar to the above, but for removing. Probably won't be called often/ever. /datum/trait/proc/remove(var/datum/species/S) ASSERT(S) return + +//Similar to the above, but for removing. +/datum/trait/proc/remove_pref(var/datum/preferences/P) + ASSERT(P) + if(var_changes_pref) + for(var/V in var_changes_pref) + P.vars[V] = initial(P.vars[V]) + return