From 0b92ab5281fc7090ddbab07ec86f137ddc482df8 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 26 Jun 2022 19:36:48 +1000 Subject: [PATCH] Adds Linguist and Polyglot traits --- .../preference_setup/general/02_language.dm | 24 ++++++++++++------- .../client/preference_setup/vore/07_traits.dm | 17 +++++++++++-- .../species/station/traits_vr/positive.dm | 16 ++++++++++++- .../human/species/station/traits_vr/trait.dm | 17 +++++++++++++ 4 files changed, 63 insertions(+), 11 deletions(-) diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 28e599a2cd0..08777970437 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,11 +8,13 @@ /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 /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 @@ -22,10 +27,10 @@ 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") return - - if(pref.alternate_languages.len > S.num_alternate_languages) + + 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 // Truncate to allowed length + 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) @@ -43,18 +48,21 @@ /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(S.num_alternate_languages) + 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 < S.num_alternate_languages) - . += "- add ([S.num_alternate_languages - pref.alternate_languages.len] remaining)
" + 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.
" @@ -68,7 +76,7 @@ return TOPIC_REFRESH else if(href_list["add_language"]) var/datum/species/S = GLOB.all_species[pref.species] - if(pref.alternate_languages.len >= S.num_alternate_languages) + 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() @@ -86,7 +94,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 < S.num_alternate_languages) + 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 8538dba867c..179c64905a5 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 @@ -148,8 +151,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: " @@ -251,6 +252,8 @@ var/choice = tgui_alert(usr, "Remove [initial(trait.name)] and regain [initial(trait.cost)] points?","Remove Trait",list("Remove","Cancel")) if(choice == "Remove") 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"]) @@ -258,6 +261,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"]) @@ -265,6 +270,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"]) @@ -417,10 +424,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 + instance.apply_pref(pref) mylist += path return TOPIC_REFRESH 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 b024c9291b9..3c409db5c44 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 @@ -175,4 +175,18 @@ /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 + +/datum/trait/positive/linguist + name = "Linguist" + desc = "Allows you to have more languages." + cost = 1 + var_changes = list("num_alternate_languages" = 5) + var_changes_pref = list("extra_languages" = 2) + +/datum/trait/positive/polyglot + name = "Polyglot" + desc = "Allows you to have a lot more languages." + cost = 2 + var_changes = list("num_alternate_languages" = 7) + var_changes_pref = list("extra_languages" = 4) \ No newline at end of file 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 91bf5fafeae..806f17510f7 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