mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +01:00
Allows blocking language speech and comprehension separately (#91884)
## About The Pull Request There was a PR I wanted to make, but one of the features I wanted the addition to have was for an affected mob to only speak aphasic, but understand whatever languages they'd normally be able to understand. This, in turn, required refactoring language holders to separately block language speech and comprehension. This change, I decided, would be good to split into its own PR. ## Why It's Good For The Game Allows more fine-grained control over what languages an atom is blocked from speaking or understanding. This will be useful for future PRs or admin events. ## Changelog no player-facing changes
This commit is contained in:
Y0SH1M4S73R
@@ -41,9 +41,10 @@ Key procs
|
||||
/// Lazyassoclist of languages that can be spoken.
|
||||
/// Tongue organ may also set limits beyond this list.
|
||||
var/list/spoken_languages
|
||||
/// Lazyassoclist of blocked languages.
|
||||
/// Used to prevent understanding and speaking certain languages, ie for certain mobs, mutations etc.
|
||||
var/list/blocked_languages
|
||||
/// Lazyassoclist of languages we are blocked from understanding, used for certain mobs, mutations, quirks, etc.
|
||||
var/list/blocked_understanding
|
||||
/// Lazyassoclist of languages we are blocked from speaking, used for certain mobs, mutations, quirks, etc.
|
||||
var/list/blocked_speaking
|
||||
/// If true, overrides tongue aforementioned limitations.
|
||||
var/omnitongue = FALSE
|
||||
/// Handles displaying the language menu UI.
|
||||
@@ -104,7 +105,7 @@ Key procs
|
||||
for(var/language in mutual_understanding)
|
||||
for(var/source in mutual_understanding[language])
|
||||
// if this mutual understanding comes from a language, and that language is blocked, skip it
|
||||
if(LAZYACCESS(blocked_languages, source))
|
||||
if(LAZYACCESS(blocked_understanding, source))
|
||||
continue
|
||||
if(!best_mutual_languages[language] || best_mutual_languages[language] < mutual_understanding[language][source])
|
||||
best_mutual_languages[language] = mutual_understanding[language][source]
|
||||
@@ -190,37 +191,43 @@ Key procs
|
||||
return TRUE
|
||||
|
||||
/// Adds a single language or list of languages to the blocked language list.
|
||||
/datum/language_holder/proc/add_blocked_language(languages, source = LANGUAGE_MIND)
|
||||
/datum/language_holder/proc/add_blocked_language(languages, language_flags = ALL, source = LANGUAGE_MIND)
|
||||
if(!islist(languages))
|
||||
languages = list(languages)
|
||||
|
||||
for(var/language in languages)
|
||||
LAZYORASSOCLIST(blocked_languages, language, source)
|
||||
if(language_flags & SPOKEN_LANGUAGE)
|
||||
LAZYORASSOCLIST(blocked_speaking, language, source)
|
||||
if(language_flags & UNDERSTOOD_LANGUAGE)
|
||||
LAZYORASSOCLIST(blocked_understanding, language, source)
|
||||
calculate_best_mutual_language()
|
||||
return TRUE
|
||||
|
||||
/// Removes a single language or list of languages from the blocked language list.
|
||||
/datum/language_holder/proc/remove_blocked_language(languages, source = LANGUAGE_MIND)
|
||||
/datum/language_holder/proc/remove_blocked_language(languages, language_flags = ALL, source = LANGUAGE_MIND)
|
||||
if(!islist(languages))
|
||||
languages = list(languages)
|
||||
|
||||
for(var/language in languages)
|
||||
if(source == LANGUAGE_ALL)
|
||||
LAZYREMOVE(blocked_languages, language)
|
||||
if(language_flags & SPOKEN_LANGUAGE)
|
||||
LAZYREMOVE(blocked_speaking, language)
|
||||
if(language_flags & UNDERSTOOD_LANGUAGE)
|
||||
LAZYREMOVE(blocked_understanding, language)
|
||||
else
|
||||
LAZYREMOVEASSOC(blocked_languages, language, source)
|
||||
if(language_flags & SPOKEN_LANGUAGE)
|
||||
LAZYREMOVEASSOC(blocked_speaking, language, source)
|
||||
if(language_flags & UNDERSTOOD_LANGUAGE)
|
||||
LAZYREMOVEASSOC(blocked_understanding, language, source)
|
||||
calculate_best_mutual_language()
|
||||
return TRUE
|
||||
|
||||
/// Checks if you have the language passed.
|
||||
/datum/language_holder/proc/has_language(language, flag_to_check = UNDERSTOOD_LANGUAGE)
|
||||
if(language in blocked_languages)
|
||||
return FALSE
|
||||
|
||||
var/list/langs_to_check = list()
|
||||
if(flag_to_check & SPOKEN_LANGUAGE)
|
||||
if(flag_to_check & SPOKEN_LANGUAGE && !LAZYACCESS(blocked_speaking, language))
|
||||
langs_to_check |= spoken_languages
|
||||
if(flag_to_check & UNDERSTOOD_LANGUAGE)
|
||||
if(flag_to_check & UNDERSTOOD_LANGUAGE && !LAZYACCESS(blocked_understanding, language))
|
||||
langs_to_check |= understood_languages
|
||||
|
||||
return language in langs_to_check
|
||||
@@ -239,7 +246,7 @@ Key procs
|
||||
for(var/lang in spoken_languages)
|
||||
var/datum/language/language = lang
|
||||
var/priority = initial(language.default_priority)
|
||||
if((!highest_priority || (priority > highest_priority)) && !(language in blocked_languages))
|
||||
if((!highest_priority || (priority > highest_priority)) && !(language in blocked_speaking))
|
||||
if(can_speak_language(language))
|
||||
selected_language = language
|
||||
highest_priority = priority
|
||||
@@ -284,8 +291,10 @@ Key procs
|
||||
grant_language(language, UNDERSTOOD_LANGUAGE, from_holder.understood_languages[language])
|
||||
for(var/language in from_holder.spoken_languages)
|
||||
grant_language(language, SPOKEN_LANGUAGE, from_holder.spoken_languages[language])
|
||||
for(var/language in from_holder.blocked_languages)
|
||||
add_blocked_language(language, from_holder.blocked_languages[language])
|
||||
for(var/language in from_holder.blocked_speaking)
|
||||
add_blocked_language(language, SPOKEN_LANGUAGE, from_holder.blocked_speaking[language])
|
||||
for(var/language in from_holder.blocked_understanding)
|
||||
add_blocked_language(language, UNDERSTOOD_LANGUAGE, from_holder.blocked_understanding[language])
|
||||
return TRUE
|
||||
|
||||
/// Transfers all mind languages to the supplied language holder.
|
||||
@@ -298,10 +307,14 @@ Key procs
|
||||
if(LANGUAGE_MIND in spoken_languages[language])
|
||||
remove_language(language, SPOKEN_LANGUAGE, LANGUAGE_MIND)
|
||||
to_holder.grant_language(language, SPOKEN_LANGUAGE, LANGUAGE_MIND)
|
||||
for(var/language in blocked_languages)
|
||||
if(LANGUAGE_MIND in blocked_languages[language])
|
||||
remove_blocked_language(language, LANGUAGE_MIND)
|
||||
to_holder.add_blocked_language(language, LANGUAGE_MIND)
|
||||
for(var/language in blocked_speaking)
|
||||
if(LANGUAGE_MIND in blocked_speaking[language])
|
||||
remove_blocked_language(language, SPOKEN_LANGUAGE, LANGUAGE_MIND)
|
||||
to_holder.add_blocked_language(language, SPOKEN_LANGUAGE, LANGUAGE_MIND)
|
||||
for(var/language in blocked_understanding)
|
||||
if(LANGUAGE_MIND in blocked_understanding[language])
|
||||
remove_blocked_language(language, UNDERSTOOD_LANGUAGE, LANGUAGE_MIND)
|
||||
to_holder.add_blocked_language(language, UNDERSTOOD_LANGUAGE, LANGUAGE_MIND)
|
||||
for(var/language in mutual_understanding)
|
||||
var/mind_understanding = mutual_understanding[language][LANGUAGE_MIND]
|
||||
if(mind_understanding > 0)
|
||||
@@ -335,7 +348,8 @@ GLOBAL_LIST_INIT(prototype_language_holders, init_language_holder_prototypes())
|
||||
/datum/language_holder/alien
|
||||
understood_languages = list(/datum/language/xenocommon = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/xenocommon = list(LANGUAGE_ATOM))
|
||||
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_speaking = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_understanding = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
|
||||
/datum/language_holder/construct
|
||||
understood_languages = list(
|
||||
@@ -350,10 +364,12 @@ GLOBAL_LIST_INIT(prototype_language_holders, init_language_holder_prototypes())
|
||||
/datum/language_holder/drone
|
||||
understood_languages = list(/datum/language/drone = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/drone = list(LANGUAGE_ATOM))
|
||||
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_speaking = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_understanding = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
|
||||
/datum/language_holder/drone/syndicate
|
||||
blocked_languages = null
|
||||
blocked_speaking = null
|
||||
blocked_understanding = null
|
||||
|
||||
/datum/language_holder/human_basic
|
||||
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
@@ -372,7 +388,8 @@ GLOBAL_LIST_INIT(prototype_language_holders, init_language_holder_prototypes())
|
||||
/datum/language_holder/lightbringer
|
||||
understood_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
|
||||
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_speaking = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_understanding = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
|
||||
/datum/language_holder/lizard
|
||||
understood_languages = list(
|
||||
@@ -438,12 +455,14 @@ GLOBAL_LIST_INIT(prototype_language_holders, init_language_holder_prototypes())
|
||||
/datum/language_holder/venus
|
||||
understood_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))
|
||||
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_speaking = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_understanding = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
|
||||
/datum/language_holder/spider
|
||||
understood_languages = list(/datum/language/buzzwords = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/buzzwords = list(LANGUAGE_ATOM))
|
||||
blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_speaking = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
blocked_understanding = list(/datum/language/common = list(LANGUAGE_ATOM))
|
||||
|
||||
/datum/language_holder/synthetic
|
||||
understood_languages = list(
|
||||
|
||||
@@ -83,10 +83,16 @@
|
||||
if("Both")
|
||||
adding_flags |= ALL
|
||||
|
||||
if(LAZYACCESS(language_holder.blocked_languages, language_datum))
|
||||
choice = tgui_alert(user, "Do you want to lift the blockage that's also preventing the language to be spoken or understood?", "[language_datum]", list("Yes", "No"))
|
||||
var/ask_to_remove_block
|
||||
var/list/block_being_removed_on = list()
|
||||
if(adding_flags & SPOKEN_LANGUAGE && LAZYACCESS(language_holder.blocked_speaking, language_datum))
|
||||
ask_to_remove_block = TRUE
|
||||
block_being_removed_on += "spoken"
|
||||
|
||||
if(ask_to_remove_block)
|
||||
choice = tgui_alert(user, "Do you want to lift the blockage that's also preventing the language to be [block_being_removed_on.Join(" or ")]?", "[language_datum]", list("Yes", "No"))
|
||||
if(choice == "Yes")
|
||||
language_holder.remove_blocked_language(language_datum, LANGUAGE_ALL)
|
||||
language_holder.remove_blocked_language(language_datum, adding_flags, LANGUAGE_ALL)
|
||||
language_holder.grant_language(language_datum, adding_flags)
|
||||
if(is_admin)
|
||||
message_admins("[key_name_admin(user)] granted the [language_name] language to [key_name_admin(speaker)].")
|
||||
|
||||
Reference in New Issue
Block a user