Improve lying trait grammar (#39370)

* Improvements

* Forgot Sure

diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
index c285063d2d91fcc165b4ac47a19d8f04f66347d5..60b531caa50889a29eab4d48050a416649e6278b 100644 (file)
--- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -128,7 +128,7 @@ namespace Content.Server.Speech.EntitySystems
                     var firstLoc = _loc.GetString(first);
                     var replaceLoc = _loc.GetString(replace);
 
-                    var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
+                    var regex = new Regex($@"(?<![\w']){firstLoc}(?![\w'])", RegexOptions.IgnoreCase);
 
                     return (regex, replaceLoc);
 

diff --git a/Resources/Locale/en-US/speech/speech-liar.ftl b/Resources/Locale/en-US/speech/speech-liar.ftl
index 4f157d2e236fa8622f5097b9762d5f2e83338b9b..93c583015167967adf171e1566d4acd6f1d84b94 100644 (file)
--- a/Resources/Locale/en-US/speech/speech-liar.ftl
+++ b/Resources/Locale/en-US/speech/speech-liar.ftl
@@ -11,122 +11,115 @@ liar-word-4 = nah
 liar-word-replacement-4 = yeah
 
 liar-word-5 = yep
+liar-word-5-2 = yeap
 liar-word-replacement-5 = nope
 
 liar-word-6 = nope
 liar-word-replacement-6 = yep
 
-liar-word-7 = sure
-liar-word-replacement-7 = nah
+liar-word-7 = ye
+liar-word-7-2 = ya
+liar-word-7-3 = yis
+liar-word-replacement-7 = na
 
-liar-word-8 = was
-liar-word-replacement-8 = wasnt
+liar-word-8 = na
+liar-word-replacement-8 = ye
 
-liar-word-9 = wasnt
-liar-word-replacement-9 = was
+liar-word-9 = yuh
+liar-word-replacement-9 = nuh
 
-liar-word-10 = was
-liar-word-replacement-10 = wasnt
+liar-word-10 = nuh
+liar-word-replacement-10 = yuh
 
-liar-word-11 = is
-liar-word-replacement-11 = isnt
+liar-word-11 = nay
+liar-word-replacement-11 = ya
 
-liar-word-12 = will
-liar-word-replacement-12 = wont
+liar-word-12 = sure
+liar-word-replacement-12 = nah
 
-liar-word-13 = dont
-liar-word-replacement-13 = ""
+liar-word-13 = was
+liar-word-replacement-13 = wasn't
 
-liar-word-14 = can
-liar-word-replacement-14 = cant
+liar-word-14 = wasnt
+liar-word-14-2 = wasn't
+liar-word-replacement-14 = was
 
-liar-word-15 = cant
-liar-word-replacement-15 = can
+liar-word-15 = is
+liar-word-replacement-15 = isn't
 
-liar-word-16 = should
-liar-word-replacement-16 = shouldnt
+liar-word-16 = isnt
+liar-word-16-2 = isn't
+liar-word-replacement-16 = is
 
-liar-word-17 = dead
-liar-word-replacement-17 = alive
+liar-word-17 = will
+liar-word-replacement-17 = won't
 
-liar-word-18 = alive
-liar-word-replacement-18 = dead
+liar-word-18 = wont
+liar-word-18-2 = won't
+liar-word-replacement-18 = will
 
-liar-word-19 = does
-liar-word-replacement-19 = doesnt
+liar-word-19 = can
+liar-word-replacement-19 = can't
 
-liar-word-20 = did
-liar-word-replacement-20 = didnt
+liar-word-20 = cant
+liar-word-20-2 = can't
+liar-word-replacement-20 = can
 
-liar-word-21 = didnt
-liar-word-replacement-21 = ""
+liar-word-21 = should
+liar-word-replacement-21 = shouldn't
 
-liar-word-22 = nothing
-liar-word-replacement-22 = something
+liar-word-22 = shouldnt
+liar-word-22-2 = shouldn't
+liar-word-replacement-22 = should
 
-liar-word-23 = something
-liar-word-replacement-23 = nothing
+liar-word-23 = dead
+liar-word-replacement-23 = alive
 
-liar-word-24 = somebody
-liar-word-replacement-24 = nobody
+liar-word-24 = alive
+liar-word-replacement-24 = dead
 
-liar-word-25 = nobody
-liar-word-replacement-25 = somebody
+liar-word-25 = nothing
+liar-word-replacement-25 = something
 
-liar-word-26 = can
-liar-word-replacement-26 = "can't"
+liar-word-26 = something
+liar-word-replacement-26 = nothing
 
-liar-word-27 = "can't"
-liar-word-replacement-27 = can
+liar-word-27 = somebody
+liar-word-replacement-27 = nobody
 
-liar-word-28 = should
-liar-word-replacement-28 = "shouldn't"
+liar-word-28 = nobody
+liar-word-replacement-28 = somebody
 
-liar-word-29 = do
-liar-word-replacement-29 = "don't"
+liar-word-29 = love
+liar-word-replacement-29 = hate
 
-liar-word-30 = "don't"
-liar-word-replacement-30 = ""
+liar-word-30 = hate
+liar-word-replacement-30 = love
 
-liar-word-31 = does
-liar-word-replacement-31 = "doesn't"
+liar-word-31 = good
+liar-word-replacement-31 = bad
 
-liar-word-32 = did
-liar-word-replacement-32 = "didn't"
+liar-word-32 = bad
+liar-word-replacement-32 = good
 
-liar-word-33 = "didn't"
-liar-word-replacement-33 = did
+liar-word-33 = not
+liar-word-replacement-33 = uhh
 
-liar-word-34 = ye
-liar-word-34-2 = ya
-liar-word-replacement-34 = na
+liar-word-34 = true
+liar-word-replacement-34 = false
 
-liar-word-35 = na
-liar-word-replacement-35 = ye
+liar-word-35 = false
+liar-word-replacement-35 = true
 
-liar-word-36 = yuh
-liar-word-replacement-36 = nuh
+liar-word-36 = are
+liar-word-replacement-36 = aren't
 
-liar-word-37 = nuh
-liar-word-replacement-37 = yuh
+liar-word-37 = arent
+liar-word-37-2 = aren't
+liar-word-replacement-37 = are
 
-liar-word-38 = love
-liar-word-replacement-38 = hate
+liar-word-38 = guilty
+liar-word-replacement-38 = innocent
 
-liar-word-39 = hate
-liar-word-replacement-39 = love
-
-liar-word-40 = like
-liar-word-replacement-40 = don't like
-
-liar-word-41 = good
-liar-word-replacement-41 = bad
-
-liar-word-42 = bad
-liar-word-replacement-42 = good
-
-liar-word-43 = want
-liar-word-replacement-43 = "don't want"
-
-liar-word-44 = not
-liar-word-replacement-44 = ""
+liar-word-39 = innocent
+liar-word-replacement-39 = guilty

diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml
index 9220abcac45eabab750334f78242a5871588b1ef..d81cf026f9861860bb4060e93565f79e1aad0603 100644 (file)
--- a/Resources/Prototypes/Accents/word_replacements.yml
+++ b/Resources/Prototypes/Accents/word_replacements.yml
@@ -459,23 +459,32 @@
     liar-word-3: liar-word-replacement-3
     liar-word-4: liar-word-replacement-4
     liar-word-5: liar-word-replacement-5
+    liar-word-5-2: liar-word-replacement-5
     liar-word-6: liar-word-replacement-6
     liar-word-7: liar-word-replacement-7
+    liar-word-7-2: liar-word-replacement-7
+    liar-word-7-3: liar-word-replacement-7
     liar-word-8: liar-word-replacement-8
     liar-word-9: liar-word-replacement-9
     liar-word-10: liar-word-replacement-10
     liar-word-11: liar-word-replacement-11
-    liar-word-12: liar-word-replacement-12
+    # liar-word-12: liar-word-replacement-12 sure -> nah is too confusing.
     liar-word-13: liar-word-replacement-13
     liar-word-14: liar-word-replacement-14
+    liar-word-14-2: liar-word-replacement-14
     liar-word-15: liar-word-replacement-15
+    liar-word-15-2: liar-word-replacement-15
     liar-word-16: liar-word-replacement-16
+    liar-word-16-2: liar-word-replacement-16
     liar-word-17: liar-word-replacement-17
     liar-word-18: liar-word-replacement-18
+    liar-word-18-2: liar-word-replacement-18
     liar-word-19: liar-word-replacement-19
     liar-word-20: liar-word-replacement-20
+    liar-word-20-2: liar-word-replacement-20
     liar-word-21: liar-word-replacement-21
     liar-word-22: liar-word-replacement-22
+    liar-word-22-2: liar-word-replacement-22
     liar-word-23: liar-word-replacement-23
     liar-word-24: liar-word-replacement-24
     liar-word-25: liar-word-replacement-25
@@ -488,15 +497,12 @@
     liar-word-32: liar-word-replacement-32
     liar-word-33: liar-word-replacement-33
     liar-word-34: liar-word-replacement-34
-    liar-word-34-2: liar-word-replacement-34
     liar-word-35: liar-word-replacement-35
     liar-word-36: liar-word-replacement-36
     liar-word-37: liar-word-replacement-37
+    liar-word-37-2: liar-word-replacement-37
     liar-word-38: liar-word-replacement-38
     liar-word-39: liar-word-replacement-39
-    liar-word-40: liar-word-replacement-40
-    liar-word-41: liar-word-replacement-41
-    liar-word-42: liar-word-replacement-42
 
 - type: accent
   id: german