Skip to content

Commit

Permalink
Фикс сохранения языков (#3221)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lexanx authored Feb 15, 2025
1 parent 90f7ddb commit d5e0ad0
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
10 changes: 5 additions & 5 deletions code/modules/client/preference_setup/background/02_language.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
else if(href_list["add_language"])

// if(length(pref.alternate_languages) >= MAX_LANGUAGES) // SIERRA-EDIT - ORIGINAL
if(length(pref.alternate_languages) >= total_languages())
if(length(pref.alternate_languages) >= pref.total_languages())
// [SIERRA-EDIT] - EXPANDED_CULTURE_DESCRIPTOR - Перевод
// alert(user, "You have already selected the maximum number of languages!") // SIERRA-EDIT - ORIGINAL
alert(user, "Вы уже выбрали максимальное количество языков!")
Expand Down Expand Up @@ -120,8 +120,8 @@
if(length(pref.alternate_languages) > MAX_LANGUAGES)
pref.alternate_languages.Cut(MAX_LANGUAGES + 1) // SIERRA-EDIT - ORIGINAL
*/
if(length(pref.alternate_languages) > total_languages())
pref.alternate_languages.Cut(total_languages() + 1)
if(length(pref.alternate_languages) > pref.total_languages())
pref.alternate_languages.Cut(pref.total_languages() + 1)

/datum/category_item/player_setup_item/background/languages/proc/get_language_text()
sanitize_alt_languages()
Expand All @@ -142,8 +142,8 @@
if(length(pref.alternate_languages) < MAX_LANGUAGES)
var/remaining_langs = MAX_LANGUAGES - length(pref.alternate_languages) // SIERRA-EDIT - ORIGINAL
*/
if(length(pref.alternate_languages) < total_languages())
var/remaining_langs = total_languages() - length(pref.alternate_languages)
if(length(pref.alternate_languages) < pref.total_languages())
var/remaining_langs = pref.total_languages() - length(pref.alternate_languages)
// [SIERRA-EDIT] - EXPANDED_CULTURE_DESCRIPTOR - Перевод
// LAZYADD(., "- <a href='?src=\ref[src];add_language=1'>add</a> ([remaining_langs] remaining)<br>") // SIERRA-EDIT - ORIGINAL
LAZYADD(., "- <a href='?src=\ref[src];add_language=1'>Добавить</a> ([remaining_langs] осталось)<br>")
Expand Down
14 changes: 0 additions & 14 deletions mods/diona/code/station.dm
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@

/datum/category_item/player_setup_item/background/languages/proc/total_languages()
return MAX_LANGUAGES + pref.additional_languages

/datum/preferences
var/additional_languages

/datum/preferences/copy_to(mob/living/carbon/human/character, is_preview_copy = FALSE)
. = ..()
additional_languages = character.species.additional_languages

/datum/species
var/additional_languages = 0

/datum/species/diona
slowdown = 2
thirst_factor = 0.06
Expand Down
1 change: 1 addition & 0 deletions mods/utility_items/_utility_items_includes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "code/tag_recipe.dm"
#include "code/dodge_animation.dm"
#include "code/advanced_landing.dm"
#include "code/languages.dm"
#include "code/chemistry.dm"
#include "code/jobs.dm"
#include "code/ma21.dm"
Expand Down
20 changes: 20 additions & 0 deletions mods/utility_items/code/languages.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/datum/preferences/proc/total_languages()
return MAX_LANGUAGES + additional_languages

/datum/preferences
var/additional_languages

/datum/category_item/player_setup_item/load_character(datum/pref_record_reader/R)
. = ..()
pref.additional_languages = R.read("additional_languages")

/datum/category_item/player_setup_item/save_character(datum/pref_record_writer/W)
. = ..()
W.write("additional_languages", pref.additional_languages)

/datum/preferences/copy_to(mob/living/carbon/human/character, is_preview_copy = FALSE)
. = ..()
additional_languages = character.species.additional_languages

/datum/species
var/additional_languages = 0

0 comments on commit d5e0ad0

Please sign in to comment.