Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Port] ohio accent port fixes" #105

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Content.Server._CorvaxNext.Speech.EntitySystems;
using Content.Server.Speech.EntitySystems;

namespace Content.Server._CorvaxNext.Speech.Components;
namespace Content.Server.Speech.Components;

[RegisterComponent]
[Access(typeof(OhioAccentSystem))]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using Content.Server._CorvaxNext.Speech.Components;
using Content.Server.Speech;
using Content.Server.Speech.EntitySystems;
using System.Text.RegularExpressions;
using Content.Server.Speech.Components;
using Robust.Shared.Random;

namespace Content.Server._CorvaxNext.Speech.EntitySystems;
namespace Content.Server.Speech.EntitySystems;

public sealed class OhioAccentSystem : EntitySystem
{
Expand All @@ -16,15 +15,11 @@ public override void Initialize()
SubscribeLocalEvent<OhioAccentComponent, AccentGetEvent>(OnAccent);
}

private void OnAccent(EntityUid uid, OhioAccentComponent component, ref AccentGetEvent args)
private void OnAccent(EntityUid uid, OhioAccentComponent component, AccentGetEvent args)
{
args.Message = Accentuate("ohio", "accent-ohio-prefix-", "accent-ohio-suffix-", args);
}

private string Accentuate(string accentName, string prefix, string suffix, AccentGetEvent args) {
var message = args.Message;

message = _replacement.ApplyReplacements(message, accentName);
message = _replacement.ApplyReplacements(message, "ohio");

// Prefix
if (_random.Prob(0.15f))
Expand All @@ -33,7 +28,7 @@ private string Accentuate(string accentName, string prefix, string suffix, Accen

// Reverse sanitize capital
message = message[0].ToString().ToLower() + message.Remove(0, 1);
message = Loc.GetString(prefix + pick) + " " + message;
message = Loc.GetString($"accent-ohio-prefix-{pick}") + " " + message;
}

// Sanitize capital again, in case we substituted a word that should be capitalized
Expand All @@ -43,9 +38,9 @@ private string Accentuate(string accentName, string prefix, string suffix, Accen
if (_random.Prob(0.3f))
{
var pick = _random.Next(1, 13);
message += Loc.GetString(suffix + pick);
message += Loc.GetString($"accent-ohio-suffix-{pick}");
}

return message;
args.Message = message;
}
};
269 changes: 121 additions & 148 deletions Resources/Prototypes/_CorvaxNext/Accents/word_replacements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,151 +17,124 @@
accent-ohio-words-14: accent-ohio-words-replace-14
accent-ohio-words-15: accent-ohio-words-replace-15
accent-ohio-words-16: accent-ohio-words-replace-16

- type: accent
id: ohioBrainrot
wordReplacements:
accent-ohio-brainrot-words-1: accent-ohio-brainrot-words-replace-1
accent-ohio-brainrot-words-2: accent-ohio-brainrot-words-replace-2
accent-ohio-brainrot-words-3: accent-ohio-brainrot-words-replace-3
accent-ohio-brainrot-words-4: accent-ohio-brainrot-words-replace-4
accent-ohio-brainrot-words-5: accent-ohio-brainrot-words-replace-5
accent-ohio-brainrot-words-6: accent-ohio-brainrot-words-replace-6
accent-ohio-brainrot-words-7: accent-ohio-brainrot-words-replace-7
accent-ohio-brainrot-words-8: accent-ohio-brainrot-words-replace-8
accent-ohio-brainrot-words-9: accent-ohio-brainrot-words-replace-9
accent-ohio-brainrot-words-10: accent-ohio-brainrot-words-replace-10
accent-ohio-brainrot-words-11: accent-ohio-brainrot-words-replace-11
accent-ohio-brainrot-words-12: accent-ohio-brainrot-words-replace-12
accent-ohio-brainrot-words-13: accent-ohio-brainrot-words-replace-13
accent-ohio-brainrot-words-14: accent-ohio-brainrot-words-replace-14
accent-ohio-brainrot-words-15: accent-ohio-brainrot-words-replace-15
accent-ohio-brainrot-words-16: accent-ohio-brainrot-words-replace-16
accent-ohio-brainrot-words-17: accent-ohio-brainrot-words-replace-17
accent-ohio-brainrot-words-18: accent-ohio-brainrot-words-replace-18
accent-ohio-brainrot-words-19: accent-ohio-brainrot-words-replace-19
accent-ohio-brainrot-words-20: accent-ohio-brainrot-words-replace-20
accent-ohio-brainrot-words-21: accent-ohio-brainrot-words-replace-21
accent-ohio-brainrot-words-22: accent-ohio-brainrot-words-replace-22
accent-ohio-brainrot-words-23: accent-ohio-brainrot-words-replace-23
accent-ohio-brainrot-words-24: accent-ohio-brainrot-words-replace-24
accent-ohio-brainrot-words-25: accent-ohio-brainrot-words-replace-25
accent-ohio-brainrot-words-26: accent-ohio-brainrot-words-replace-26
accent-ohio-brainrot-words-27: accent-ohio-brainrot-words-replace-27
accent-ohio-brainrot-words-28: accent-ohio-brainrot-words-replace-28
accent-ohio-brainrot-words-29: accent-ohio-brainrot-words-replace-29
accent-ohio-brainrot-words-30: accent-ohio-brainrot-words-replace-30
accent-ohio-brainrot-words-31: accent-ohio-brainrot-words-replace-31
accent-ohio-brainrot-words-32: accent-ohio-brainrot-words-replace-32
accent-ohio-brainrot-words-33: accent-ohio-brainrot-words-replace-33
accent-ohio-brainrot-words-34: accent-ohio-brainrot-words-replace-34
accent-ohio-brainrot-words-35: accent-ohio-brainrot-words-replace-35
accent-ohio-brainrot-words-36: accent-ohio-brainrot-words-replace-36
accent-ohio-brainrot-words-37: accent-ohio-brainrot-words-replace-37
accent-ohio-brainrot-words-38: accent-ohio-brainrot-words-replace-38
accent-ohio-brainrot-words-39: accent-ohio-brainrot-words-replace-39
accent-ohio-brainrot-words-40: accent-ohio-brainrot-words-replace-40
accent-ohio-brainrot-words-41: accent-ohio-brainrot-words-replace-41
accent-ohio-brainrot-words-42: accent-ohio-brainrot-words-replace-42
accent-ohio-brainrot-words-43: accent-ohio-brainrot-words-replace-43
accent-ohio-brainrot-words-44: accent-ohio-brainrot-words-replace-44
accent-ohio-brainrot-words-45: accent-ohio-brainrot-words-replace-45
accent-ohio-brainrot-words-46: accent-ohio-brainrot-words-replace-46
accent-ohio-brainrot-words-47: accent-ohio-brainrot-words-replace-47
accent-ohio-brainrot-words-48: accent-ohio-brainrot-words-replace-48
accent-ohio-brainrot-words-49: accent-ohio-brainrot-words-replace-49
accent-ohio-brainrot-words-50: accent-ohio-brainrot-words-replace-50
accent-ohio-brainrot-words-51: accent-ohio-brainrot-words-replace-51
accent-ohio-brainrot-words-52: accent-ohio-brainrot-words-replace-52
accent-ohio-brainrot-words-53: accent-ohio-brainrot-words-replace-53
accent-ohio-brainrot-words-54: accent-ohio-brainrot-words-replace-54
accent-ohio-brainrot-words-55: accent-ohio-brainrot-words-replace-55
accent-ohio-brainrot-words-56: accent-ohio-brainrot-words-replace-56
accent-ohio-brainrot-words-57: accent-ohio-brainrot-words-replace-57
accent-ohio-brainrot-words-58: accent-ohio-brainrot-words-replace-58
accent-ohio-brainrot-words-59: accent-ohio-brainrot-words-replace-59
accent-ohio-brainrot-words-60: accent-ohio-brainrot-words-replace-60
accent-ohio-brainrot-words-61: accent-ohio-brainrot-words-replace-61
accent-ohio-brainrot-words-62: accent-ohio-brainrot-words-replace-62
accent-ohio-brainrot-words-63: accent-ohio-brainrot-words-replace-63
accent-ohio-brainrot-words-64: accent-ohio-brainrot-words-replace-64
accent-ohio-brainrot-words-65: accent-ohio-brainrot-words-replace-65
accent-ohio-brainrot-words-66: accent-ohio-brainrot-words-replace-66
accent-ohio-brainrot-words-67: accent-ohio-brainrot-words-replace-67
accent-ohio-brainrot-words-68: accent-ohio-brainrot-words-replace-68
accent-ohio-brainrot-words-69: accent-ohio-brainrot-words-replace-69
accent-ohio-brainrot-words-70: accent-ohio-brainrot-words-replace-70
accent-ohio-brainrot-words-71: accent-ohio-brainrot-words-replace-71
accent-ohio-brainrot-words-72: accent-ohio-brainrot-words-replace-72
accent-ohio-brainrot-words-73: accent-ohio-brainrot-words-replace-73
accent-ohio-brainrot-words-74: accent-ohio-brainrot-words-replace-74
accent-ohio-brainrot-words-75: accent-ohio-brainrot-words-replace-75
accent-ohio-brainrot-words-76: accent-ohio-brainrot-words-replace-76
accent-ohio-brainrot-words-77: accent-ohio-brainrot-words-replace-77
accent-ohio-brainrot-words-78: accent-ohio-brainrot-words-replace-78
accent-ohio-brainrot-words-79: accent-ohio-brainrot-words-replace-79
accent-ohio-brainrot-words-80: accent-ohio-brainrot-words-replace-80
accent-ohio-brainrot-words-81: accent-ohio-brainrot-words-replace-81
accent-ohio-brainrot-words-82: accent-ohio-brainrot-words-replace-82
accent-ohio-brainrot-words-83: accent-ohio-brainrot-words-replace-83
accent-ohio-brainrot-words-84: accent-ohio-brainrot-words-replace-84
accent-ohio-brainrot-words-85: accent-ohio-brainrot-words-replace-85
accent-ohio-brainrot-words-86: accent-ohio-brainrot-words-replace-86
accent-ohio-brainrot-words-87: accent-ohio-brainrot-words-replace-87
accent-ohio-brainrot-words-88: accent-ohio-brainrot-words-replace-88
accent-ohio-brainrot-words-89: accent-ohio-brainrot-words-replace-89
accent-ohio-brainrot-words-90: accent-ohio-brainrot-words-replace-90
accent-ohio-brainrot-words-91: accent-ohio-brainrot-words-replace-91
accent-ohio-brainrot-words-92: accent-ohio-brainrot-words-replace-92
accent-ohio-brainrot-words-93: accent-ohio-brainrot-words-replace-93
accent-ohio-brainrot-words-94: accent-ohio-brainrot-words-replace-94
accent-ohio-brainrot-words-95: accent-ohio-brainrot-words-replace-95
accent-ohio-brainrot-words-96: accent-ohio-brainrot-words-replace-96
accent-ohio-brainrot-words-97: accent-ohio-brainrot-words-replace-97
accent-ohio-brainrot-words-98: accent-ohio-brainrot-words-replace-98
accent-ohio-brainrot-words-99: accent-ohio-brainrot-words-replace-99
accent-ohio-brainrot-words-100: accent-ohio-brainrot-words-replace-100
accent-ohio-brainrot-words-101: accent-ohio-brainrot-words-replace-101
accent-ohio-brainrot-words-102: accent-ohio-brainrot-words-replace-102
accent-ohio-brainrot-words-103: accent-ohio-brainrot-words-replace-103
accent-ohio-brainrot-words-104: accent-ohio-brainrot-words-replace-104
accent-ohio-brainrot-words-105: accent-ohio-brainrot-words-replace-105
accent-ohio-brainrot-words-106: accent-ohio-brainrot-words-replace-106
accent-ohio-brainrot-words-107: accent-ohio-brainrot-words-replace-107
accent-ohio-brainrot-words-108: accent-ohio-brainrot-words-replace-108
accent-ohio-brainrot-words-109: accent-ohio-brainrot-words-replace-109
accent-ohio-brainrot-words-110: accent-ohio-brainrot-words-replace-110
accent-ohio-brainrot-words-111: accent-ohio-brainrot-words-replace-111
accent-ohio-brainrot-words-112: accent-ohio-brainrot-words-replace-112
accent-ohio-brainrot-words-113: accent-ohio-brainrot-words-replace-113
accent-ohio-brainrot-words-114: accent-ohio-brainrot-words-replace-114
accent-ohio-brainrot-words-115: accent-ohio-brainrot-words-replace-115
accent-ohio-brainrot-words-116: accent-ohio-brainrot-words-replace-116
accent-ohio-brainrot-words-117: accent-ohio-brainrot-words-replace-117
accent-ohio-brainrot-words-118: accent-ohio-brainrot-words-replace-118
accent-ohio-brainrot-words-119: accent-ohio-brainrot-words-replace-119
accent-ohio-brainrot-words-120: accent-ohio-brainrot-words-replace-120
accent-ohio-brainrot-words-121: accent-ohio-brainrot-words-replace-121
accent-ohio-brainrot-words-122: accent-ohio-brainrot-words-replace-122
accent-ohio-brainrot-words-123: accent-ohio-brainrot-words-replace-123
accent-ohio-brainrot-words-124: accent-ohio-brainrot-words-replace-124
accent-ohio-brainrot-words-125: accent-ohio-brainrot-words-replace-125
accent-ohio-brainrot-words-126: accent-ohio-brainrot-words-replace-126
accent-ohio-brainrot-words-127: accent-ohio-brainrot-words-replace-127
accent-ohio-brainrot-words-128: accent-ohio-brainrot-words-replace-128
accent-ohio-brainrot-words-129: accent-ohio-brainrot-words-replace-129
accent-ohio-brainrot-words-130: accent-ohio-brainrot-words-replace-130
accent-ohio-brainrot-words-131: accent-ohio-brainrot-words-replace-131
accent-ohio-brainrot-words-132: accent-ohio-brainrot-words-replace-132
accent-ohio-brainrot-words-133: accent-ohio-brainrot-words-replace-133
accent-ohio-brainrot-words-134: accent-ohio-brainrot-words-replace-134
accent-ohio-brainrot-words-135: accent-ohio-brainrot-words-replace-135
accent-ohio-brainrot-words-136: accent-ohio-brainrot-words-replace-136
accent-ohio-brainrot-words-137: accent-ohio-brainrot-words-replace-137
accent-ohio-brainrot-words-138: accent-ohio-brainrot-words-replace-138
accent-ohio-brainrot-words-139: accent-ohio-brainrot-words-replace-139
accent-ohio-brainrot-words-140: accent-ohio-brainrot-words-replace-140
accent-ohio-brainrot-words-141: accent-ohio-brainrot-words-replace-141
accent-ohio-brainrot-words-142: accent-ohio-brainrot-words-replace-142
accent-ohio-brainrot-words-143: accent-ohio-brainrot-words-replace-143
accent-ohio-brainrot-words-144: accent-ohio-brainrot-words-replace-144
accent-ohio-words-17: accent-ohio-words-replace-17
accent-ohio-words-18: accent-ohio-words-replace-18
accent-ohio-words-19: accent-ohio-words-replace-19
accent-ohio-words-20: accent-ohio-words-replace-20
accent-ohio-words-21: accent-ohio-words-replace-21
accent-ohio-words-22: accent-ohio-words-replace-22
accent-ohio-words-23: accent-ohio-words-replace-23
accent-ohio-words-24: accent-ohio-words-replace-24
accent-ohio-words-25: accent-ohio-words-replace-25
accent-ohio-words-26: accent-ohio-words-replace-26
accent-ohio-words-27: accent-ohio-words-replace-27
accent-ohio-words-28: accent-ohio-words-replace-28
accent-ohio-words-29: accent-ohio-words-replace-29
accent-ohio-words-30: accent-ohio-words-replace-30
accent-ohio-words-31: accent-ohio-words-replace-31
accent-ohio-words-32: accent-ohio-words-replace-32
accent-ohio-words-33: accent-ohio-words-replace-33
accent-ohio-words-34: accent-ohio-words-replace-34
accent-ohio-words-35: accent-ohio-words-replace-35
accent-ohio-words-36: accent-ohio-words-replace-36
accent-ohio-words-37: accent-ohio-words-replace-37
accent-ohio-words-38: accent-ohio-words-replace-38
accent-ohio-words-39: accent-ohio-words-replace-39
accent-ohio-words-40: accent-ohio-words-replace-40
accent-ohio-words-41: accent-ohio-words-replace-41
accent-ohio-words-42: accent-ohio-words-replace-42
accent-ohio-words-43: accent-ohio-words-replace-43
accent-ohio-words-44: accent-ohio-words-replace-44
accent-ohio-words-45: accent-ohio-words-replace-45
accent-ohio-words-46: accent-ohio-words-replace-46
accent-ohio-words-47: accent-ohio-words-replace-47
accent-ohio-words-48: accent-ohio-words-replace-48
accent-ohio-words-49: accent-ohio-words-replace-49
accent-ohio-words-50: accent-ohio-words-replace-50
accent-ohio-words-51: accent-ohio-words-replace-51
accent-ohio-words-52: accent-ohio-words-replace-52
accent-ohio-words-53: accent-ohio-words-replace-53
accent-ohio-words-54: accent-ohio-words-replace-54
accent-ohio-words-55: accent-ohio-words-replace-55
accent-ohio-words-56: accent-ohio-words-replace-56
accent-ohio-words-57: accent-ohio-words-replace-57
accent-ohio-words-58: accent-ohio-words-replace-58
accent-ohio-words-59: accent-ohio-words-replace-59
accent-ohio-words-60: accent-ohio-words-replace-60
accent-ohio-words-61: accent-ohio-words-replace-61
accent-ohio-words-62: accent-ohio-words-replace-62
accent-ohio-words-63: accent-ohio-words-replace-63
accent-ohio-words-64: accent-ohio-words-replace-64
accent-ohio-words-65: accent-ohio-words-replace-65
accent-ohio-words-66: accent-ohio-words-replace-66
accent-ohio-words-67: accent-ohio-words-replace-67
accent-ohio-words-68: accent-ohio-words-replace-68
accent-ohio-words-69: accent-ohio-words-replace-69
accent-ohio-words-70: accent-ohio-words-replace-70
accent-ohio-words-71: accent-ohio-words-replace-71
accent-ohio-words-72: accent-ohio-words-replace-72
accent-ohio-words-73: accent-ohio-words-replace-73
accent-ohio-words-74: accent-ohio-words-replace-74
accent-ohio-words-75: accent-ohio-words-replace-75
accent-ohio-words-76: accent-ohio-words-replace-76
accent-ohio-words-77: accent-ohio-words-replace-77
accent-ohio-words-78: accent-ohio-words-replace-78
accent-ohio-words-79: accent-ohio-words-replace-79
accent-ohio-words-80: accent-ohio-words-replace-80
accent-ohio-words-81: accent-ohio-words-replace-81
accent-ohio-words-82: accent-ohio-words-replace-82
accent-ohio-words-83: accent-ohio-words-replace-83
accent-ohio-words-84: accent-ohio-words-replace-84
accent-ohio-words-85: accent-ohio-words-replace-85
accent-ohio-words-86: accent-ohio-words-replace-86
accent-ohio-words-87: accent-ohio-words-replace-87
accent-ohio-words-88: accent-ohio-words-replace-88
accent-ohio-words-89: accent-ohio-words-replace-89
accent-ohio-words-90: accent-ohio-words-replace-90
accent-ohio-words-91: accent-ohio-words-replace-91
accent-ohio-words-92: accent-ohio-words-replace-92
accent-ohio-words-93: accent-ohio-words-replace-93
accent-ohio-words-94: accent-ohio-words-replace-94
accent-ohio-words-95: accent-ohio-words-replace-95
accent-ohio-words-96: accent-ohio-words-replace-96
accent-ohio-words-97: accent-ohio-words-replace-97
accent-ohio-words-98: accent-ohio-words-replace-98
accent-ohio-words-99: accent-ohio-words-replace-99
accent-ohio-words-100: accent-ohio-words-replace-100
accent-ohio-words-101: accent-ohio-words-replace-101
accent-ohio-words-102: accent-ohio-words-replace-102
accent-ohio-words-103: accent-ohio-words-replace-103
accent-ohio-words-104: accent-ohio-words-replace-104
accent-ohio-words-105: accent-ohio-words-replace-105
accent-ohio-words-106: accent-ohio-words-replace-106
accent-ohio-words-107: accent-ohio-words-replace-107
accent-ohio-words-108: accent-ohio-words-replace-108
accent-ohio-words-109: accent-ohio-words-replace-109
accent-ohio-words-110: accent-ohio-words-replace-110
accent-ohio-words-111: accent-ohio-words-replace-111
accent-ohio-words-112: accent-ohio-words-replace-112
accent-ohio-words-113: accent-ohio-words-replace-113
accent-ohio-words-114: accent-ohio-words-replace-114
accent-ohio-words-115: accent-ohio-words-replace-115
accent-ohio-words-116: accent-ohio-words-replace-116
accent-ohio-words-117: accent-ohio-words-replace-117
accent-ohio-words-118: accent-ohio-words-replace-118
accent-ohio-words-119: accent-ohio-words-replace-119
accent-ohio-words-120: accent-ohio-words-replace-120
accent-ohio-words-121: accent-ohio-words-replace-121
accent-ohio-words-122: accent-ohio-words-replace-122
accent-ohio-words-123: accent-ohio-words-replace-123
accent-ohio-words-124: accent-ohio-words-replace-124
accent-ohio-words-125: accent-ohio-words-replace-125
accent-ohio-words-126: accent-ohio-words-replace-126
accent-ohio-words-127: accent-ohio-words-replace-127
accent-ohio-words-128: accent-ohio-words-replace-128
accent-ohio-words-129: accent-ohio-words-replace-129
accent-ohio-words-130: accent-ohio-words-replace-130
accent-ohio-words-131: accent-ohio-words-replace-131
accent-ohio-words-132: accent-ohio-words-replace-132
accent-ohio-words-133: accent-ohio-words-replace-133
accent-ohio-words-134: accent-ohio-words-replace-134
accent-ohio-words-135: accent-ohio-words-replace-135
accent-ohio-words-136: accent-ohio-words-replace-136
accent-ohio-words-137: accent-ohio-words-replace-137
Loading