Skip to content

Commit

Permalink
Merge branch 'master' into destisch
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkiich authored Jul 14, 2024
2 parents e986f17 + c7df884 commit 345a0c1
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 32 deletions.
50 changes: 19 additions & 31 deletions Content.Server/Speech/EntitySystems/MothAccentSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,38 +21,26 @@ private void OnAccent(EntityUid uid, MothAccentComponent component, AccentGetEve
{
var message = args.Message;

// buzzz
message = RegexLowerBuzz.Replace(message, "zzz");
// buZZZ
message = RegexUpperBuzz.Replace(message, "ZZZ");

// Corvax-Localization-Start
// ж => жжж
message = Regex.Replace(
message,
"ж+",
_random.Pick(new List<string>() { "жж", "жжж" })
);
// Ж => ЖЖЖ
message = Regex.Replace(
message,
"Ж+",
_random.Pick(new List<string>() { "ЖЖ", "ЖЖЖ" })
);
// з => ссс
message = Regex.Replace(
message,
"з+",
_random.Pick(new List<string>() { "зз", "ззз" })
);
// З => CCC
message = Regex.Replace(
message,
"З+",
_random.Pick(new List<string>() { "ЗЗ", "ЗЗЗ" })
);
// Corvax-Localization-End
// Changed By 1Stepka1 Moth_speech_ADT start

message = Regex.Replace(message, "з{1,3}", "ззз");

message = Regex.Replace(message, "с{1,3}", "зз");

message = Regex.Replace(message, "ц{1,3}", "зз");

message = Regex.Replace(message, "ж{1,3}", "жзж");

message = Regex.Replace(message, "З{1,3}", "ЗЗЗ");

message = Regex.Replace(message, "С{1,3}", "ЗЗ");

message = Regex.Replace(message, "Ц{1,3}", "ЗЗ");

message = Regex.Replace(message, "Ж{1,3}", "ЖЗЖ");

// Changed By 1Stepka1 Moth_speech_ADT end

args.Message = message;
}
}
11 changes: 11 additions & 0 deletions Resources/Locale/ru-RU/ADT/traits/neutral.ftl
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@


## trait-deutsch-accent-name = Немецкий акцент
## trait-deutsch-accent-desc = Неизвестно, как вы получили этот акцент. Может быть, вы пересмотрели слишком много фильмов о Второй мировой войне?

trait-tall-name = Высокий
trait-tall-desc = Вы слегка выше других представителей своего вида.
trait-short-name = Низкий
trait-short-desc = Вы слегка ниже других представителей своего вида.
trait-moth-accent-name = Жужжащий акцент
trait-moth-accent-desc = Вам либо нравятся моли, либо вы ботаник
11 changes: 10 additions & 1 deletion Resources/Prototypes/ADT/Traits/neutral.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@

#- type: trait
# id: ADTGermanAccent
# name: trait-deutsch-name
# description: trait-deutsch-desc
# components:
# - type: DeutschAccent
# - type: DeutschAccent

- type: trait
id: ADTMothAccent
name: trait-moth-accent-name
description: trait-moth-accent-desc
components:
- type: MothAccent

0 comments on commit 345a0c1

Please sign in to comment.