Skip to content

Commit 9fa52ed

Browse files
Improve lying trait grammar (space-wizards#39370)
* Improvements * Forgot Sure
1 parent 52a9f9b commit 9fa52ed

File tree

3 files changed

+87
-88
lines changed

3 files changed

+87
-88
lines changed

‎Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public string ApplyReplacements(string message, string accent)
128128
var firstLoc = _loc.GetString(first);
129129
var replaceLoc = _loc.GetString(replace);
130130

131-
var regex = new Regex($@"(?<!\w){firstLoc}(?!\w)", RegexOptions.IgnoreCase);
131+
var regex = new Regex($@"(?<![\w']){firstLoc}(?![\w'])", RegexOptions.IgnoreCase);
132132

133133
return (regex, replaceLoc);
134134

‎Resources/Locale/en-US/speech/speech-liar.ftl‎

Lines changed: 75 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -11,122 +11,115 @@ liar-word-4 = nah
1111
liar-word-replacement-4 = yeah
1212
1313
liar-word-5 = yep
14+
liar-word-5-2 = yeap
1415
liar-word-replacement-5 = nope
1516
1617
liar-word-6 = nope
1718
liar-word-replacement-6 = yep
1819
19-
liar-word-7 = sure
20-
liar-word-replacement-7 = nah
20+
liar-word-7 = ye
21+
liar-word-7-2 = ya
22+
liar-word-7-3 = yis
23+
liar-word-replacement-7 = na
2124
22-
liar-word-8 = was
23-
liar-word-replacement-8 = wasnt
25+
liar-word-8 = na
26+
liar-word-replacement-8 = ye
2427
25-
liar-word-9 = wasnt
26-
liar-word-replacement-9 = was
28+
liar-word-9 = yuh
29+
liar-word-replacement-9 = nuh
2730
28-
liar-word-10 = was
29-
liar-word-replacement-10 = wasnt
31+
liar-word-10 = nuh
32+
liar-word-replacement-10 = yuh
3033
31-
liar-word-11 = is
32-
liar-word-replacement-11 = isnt
34+
liar-word-11 = nay
35+
liar-word-replacement-11 = ya
3336
34-
liar-word-12 = will
35-
liar-word-replacement-12 = wont
37+
liar-word-12 = sure
38+
liar-word-replacement-12 = nah
3639
37-
liar-word-13 = dont
38-
liar-word-replacement-13 = ""
40+
liar-word-13 = was
41+
liar-word-replacement-13 = wasn't
3942
40-
liar-word-14 = can
41-
liar-word-replacement-14 = cant
43+
liar-word-14 = wasnt
44+
liar-word-14-2 = wasn't
45+
liar-word-replacement-14 = was
4246
43-
liar-word-15 = cant
44-
liar-word-replacement-15 = can
47+
liar-word-15 = is
48+
liar-word-replacement-15 = isn't
4549
46-
liar-word-16 = should
47-
liar-word-replacement-16 = shouldnt
50+
liar-word-16 = isnt
51+
liar-word-16-2 = isn't
52+
liar-word-replacement-16 = is
4853
49-
liar-word-17 = dead
50-
liar-word-replacement-17 = alive
54+
liar-word-17 = will
55+
liar-word-replacement-17 = won't
5156
52-
liar-word-18 = alive
53-
liar-word-replacement-18 = dead
57+
liar-word-18 = wont
58+
liar-word-18-2 = won't
59+
liar-word-replacement-18 = will
5460
55-
liar-word-19 = does
56-
liar-word-replacement-19 = doesnt
61+
liar-word-19 = can
62+
liar-word-replacement-19 = can't
5763
58-
liar-word-20 = did
59-
liar-word-replacement-20 = didnt
64+
liar-word-20 = cant
65+
liar-word-20-2 = can't
66+
liar-word-replacement-20 = can
6067
61-
liar-word-21 = didnt
62-
liar-word-replacement-21 = ""
68+
liar-word-21 = should
69+
liar-word-replacement-21 = shouldn't
6370
64-
liar-word-22 = nothing
65-
liar-word-replacement-22 = something
71+
liar-word-22 = shouldnt
72+
liar-word-22-2 = shouldn't
73+
liar-word-replacement-22 = should
6674
67-
liar-word-23 = something
68-
liar-word-replacement-23 = nothing
75+
liar-word-23 = dead
76+
liar-word-replacement-23 = alive
6977
70-
liar-word-24 = somebody
71-
liar-word-replacement-24 = nobody
78+
liar-word-24 = alive
79+
liar-word-replacement-24 = dead
7280
73-
liar-word-25 = nobody
74-
liar-word-replacement-25 = somebody
81+
liar-word-25 = nothing
82+
liar-word-replacement-25 = something
7583
76-
liar-word-26 = can
77-
liar-word-replacement-26 = "can't"
84+
liar-word-26 = something
85+
liar-word-replacement-26 = nothing
7886
79-
liar-word-27 = "can't"
80-
liar-word-replacement-27 = can
87+
liar-word-27 = somebody
88+
liar-word-replacement-27 = nobody
8189
82-
liar-word-28 = should
83-
liar-word-replacement-28 = "shouldn't"
90+
liar-word-28 = nobody
91+
liar-word-replacement-28 = somebody
8492
85-
liar-word-29 = do
86-
liar-word-replacement-29 = "don't"
93+
liar-word-29 = love
94+
liar-word-replacement-29 = hate
8795
88-
liar-word-30 = "don't"
89-
liar-word-replacement-30 = ""
96+
liar-word-30 = hate
97+
liar-word-replacement-30 = love
9098
91-
liar-word-31 = does
92-
liar-word-replacement-31 = "doesn't"
99+
liar-word-31 = good
100+
liar-word-replacement-31 = bad
93101
94-
liar-word-32 = did
95-
liar-word-replacement-32 = "didn't"
102+
liar-word-32 = bad
103+
liar-word-replacement-32 = good
96104
97-
liar-word-33 = "didn't"
98-
liar-word-replacement-33 = did
105+
liar-word-33 = not
106+
liar-word-replacement-33 = uhh
99107
100-
liar-word-34 = ye
101-
liar-word-34-2 = ya
102-
liar-word-replacement-34 = na
108+
liar-word-34 = true
109+
liar-word-replacement-34 = false
103110
104-
liar-word-35 = na
105-
liar-word-replacement-35 = ye
111+
liar-word-35 = false
112+
liar-word-replacement-35 = true
106113
107-
liar-word-36 = yuh
108-
liar-word-replacement-36 = nuh
114+
liar-word-36 = are
115+
liar-word-replacement-36 = aren't
109116
110-
liar-word-37 = nuh
111-
liar-word-replacement-37 = yuh
117+
liar-word-37 = arent
118+
liar-word-37-2 = aren't
119+
liar-word-replacement-37 = are
112120
113-
liar-word-38 = love
114-
liar-word-replacement-38 = hate
121+
liar-word-38 = guilty
122+
liar-word-replacement-38 = innocent
115123
116-
liar-word-39 = hate
117-
liar-word-replacement-39 = love
118-
119-
liar-word-40 = like
120-
liar-word-replacement-40 = don't like
121-
122-
liar-word-41 = good
123-
liar-word-replacement-41 = bad
124-
125-
liar-word-42 = bad
126-
liar-word-replacement-42 = good
127-
128-
liar-word-43 = want
129-
liar-word-replacement-43 = "don't want"
130-
131-
liar-word-44 = not
132-
liar-word-replacement-44 = ""
124+
liar-word-39 = innocent
125+
liar-word-replacement-39 = guilty

‎Resources/Prototypes/Accents/word_replacements.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -459,23 +459,32 @@
459459
liar-word-3: liar-word-replacement-3
460460
liar-word-4: liar-word-replacement-4
461461
liar-word-5: liar-word-replacement-5
462+
liar-word-5-2: liar-word-replacement-5
462463
liar-word-6: liar-word-replacement-6
463464
liar-word-7: liar-word-replacement-7
465+
liar-word-7-2: liar-word-replacement-7
466+
liar-word-7-3: liar-word-replacement-7
464467
liar-word-8: liar-word-replacement-8
465468
liar-word-9: liar-word-replacement-9
466469
liar-word-10: liar-word-replacement-10
467470
liar-word-11: liar-word-replacement-11
468-
liar-word-12: liar-word-replacement-12
471+
# liar-word-12: liar-word-replacement-12 sure -> nah is too confusing.
469472
liar-word-13: liar-word-replacement-13
470473
liar-word-14: liar-word-replacement-14
474+
liar-word-14-2: liar-word-replacement-14
471475
liar-word-15: liar-word-replacement-15
476+
liar-word-15-2: liar-word-replacement-15
472477
liar-word-16: liar-word-replacement-16
478+
liar-word-16-2: liar-word-replacement-16
473479
liar-word-17: liar-word-replacement-17
474480
liar-word-18: liar-word-replacement-18
481+
liar-word-18-2: liar-word-replacement-18
475482
liar-word-19: liar-word-replacement-19
476483
liar-word-20: liar-word-replacement-20
484+
liar-word-20-2: liar-word-replacement-20
477485
liar-word-21: liar-word-replacement-21
478486
liar-word-22: liar-word-replacement-22
487+
liar-word-22-2: liar-word-replacement-22
479488
liar-word-23: liar-word-replacement-23
480489
liar-word-24: liar-word-replacement-24
481490
liar-word-25: liar-word-replacement-25
@@ -488,15 +497,12 @@
488497
liar-word-32: liar-word-replacement-32
489498
liar-word-33: liar-word-replacement-33
490499
liar-word-34: liar-word-replacement-34
491-
liar-word-34-2: liar-word-replacement-34
492500
liar-word-35: liar-word-replacement-35
493501
liar-word-36: liar-word-replacement-36
494502
liar-word-37: liar-word-replacement-37
503+
liar-word-37-2: liar-word-replacement-37
495504
liar-word-38: liar-word-replacement-38
496505
liar-word-39: liar-word-replacement-39
497-
liar-word-40: liar-word-replacement-40
498-
liar-word-41: liar-word-replacement-41
499-
liar-word-42: liar-word-replacement-42
500506

501507
- type: accent
502508
id: german

0 commit comments

Comments
 (0)