Accent trait limit (#28046)

(cherry picked from commit a4d16017589e82822c9880b146b8d3dab9621093)
2026-04-16 21:17:39 +03:00 · 2024-06-03 21:47:06 +03:00
parent 7b4840ec28
commit dcb33fec59
6 changed files with 349 additions and 332 deletions
--- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
+++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
@@ -49,7 +49,15 @@ humanoid-profile-editor-department-jobs-label = {$departmentName} jobs
 humanoid-profile-editor-antags-tab = Antags
 humanoid-profile-editor-antag-preference-yes-button = Yes
 humanoid-profile-editor-antag-preference-no-button = No
+humanoid-profile-editor-job-priority-high-button = High
+humanoid-profile-editor-job-priority-medium-button = Medium
+humanoid-profile-editor-job-priority-low-button = Low
+humanoid-profile-editor-job-priority-never-button = Never
+humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
+humanoid-profile-editor-markings-tab = Markings
+humanoid-profile-editor-flavortext-tab = Description

+# Traits
 humanoid-profile-editor-traits-tab = Traits
 humanoid-profile-editor-traits-header = You have {$points ->
    [1] 1 point
@@ -72,13 +80,7 @@ humanoid-profile-editor-traits-remove-unusable-button-tooltip =
    You will be asked for confirmation before the traits are removed.
 humanoid-profile-editor-traits-no-traits = No traits found

-humanoid-profile-editor-job-priority-high-button = High
-humanoid-profile-editor-job-priority-medium-button = Medium
-humanoid-profile-editor-job-priority-low-button = Low
-humanoid-profile-editor-job-priority-never-button = Never
-
-humanoid-profile-editor-naming-rules-warning = Warning: Offensive or LRP IC names and descriptions will lead to admin intervention on this server. Read our \[Rules\] for more.
-
+# Loadouts
 humanoid-profile-editor-loadouts-tab = Loadout
 humanoid-profile-editor-loadouts-points-label = You have {$points}/{$max} points
 humanoid-profile-editor-loadouts-show-unusable-button = Show Unusable Loadouts
@@ -104,9 +106,6 @@ humanoid-profile-editor-loadouts-guidebook-button-tooltip = Click for more info
 humanoid-profile-editor-loadouts-heirloom = Heirloom
 humanoid-profile-editor-loadouts-heirloom-tooltip = Whichever loadouts you choose to be your potential heirloom will be randomly picked from on spawn.

-humanoid-profile-editor-markings-tab = Markings
-humanoid-profile-editor-flavortext-tab = Description
-
 humanoid-profile-editor-clown-name-label = Clown Nickname:

 humanoid-profile-editor-mime-name-label = Mime Nickname:
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -91,6 +91,9 @@ trait-description-RussianAccent = You speak with a Russian accent.
 trait-name-FrenchAccent = French accent
 trait-description-FrenchAccent = You speak with a French accent.

+trait-name-СowboyAccent = Cowboy accent
+trait-description-СowboyAccent = You speak with a distinct cowboy accent!
+
 trait-name-ItalianAccent = Italian accent
 trait-description-ItalianAccent = You speak with a Italian accent.

--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -84,18 +84,27 @@
        - type: Pacified

 - type: trait
-  id: Paracusia
-  category: Auditory
+  id: Uncloneable
+  category: Physical
  points: 1
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterLifepathRequirement
+    inverted: true
+    lifepaths:
+    - Clone
+  - !type:CharacterSpeciesRequirement
+    inverted: true
+    species:
+    - IPC
  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: Paracusia
-          minTimeBetweenIncidents: 0.1
-          maxTimeBetweenIncidents: 300
-          maxSoundDistance: 7
-          sounds:
-            collection: Paracusia
+  - !type:TraitAddComponent
+    components:
+    - type: Uncloneable

 - type: trait
  id: Muted
@@ -119,49 +128,43 @@
        - Sign

 - type: trait
-  id: Uncloneable
+  id: LightweightDrunk
  category: Physical
-  points: 1
  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
-    - !type:CharacterLifepathRequirement
-      inverted: true
-      lifepaths:
-        - Clone
-    - !type:CharacterSpeciesRequirement
-      inverted: true
-      species:
-        - IPC
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterTraitRequirement
+    inverted: true
+    traits:
+    - HeavyweightDrunk
+    - LiquorLifeline
+  - !type:CharacterSpeciesRequirement
+    inverted: true
+    species:
+    - Dwarf
+    - IPC
  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: Uncloneable
+  - !type:TraitAddComponent
+    components:
+    - type: LightweightDrunk
+      boozeStrengthMultiplier: 2

 - type: trait
-  id: FrontalLisp
-  # slots: 0
-  # itemGroupSlots: 0
-  category: TraitsSpeechAccents
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
-    - !type:CharacterSpeciesRequirement
-      inverted: true
-      species:
-        - IPC
-    - !type:CharacterItemGroupRequirement
-      group: TraitsAccents
+  id: Paracusia
+  category: Auditory
+  points: 1
  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: FrontalLisp
+  - !type:TraitAddComponent
+    components:
+    - type: Paracusia
+      minTimeBetweenIncidents: 0.1
+      maxTimeBetweenIncidents: 300
+      maxSoundDistance: 7
+      sounds:
+        collection: Paracusia

 - type: trait
  id: Snoring
@@ -353,3 +356,126 @@
              Piercing: 4
            groups:
              Burn: 3
+
+- type: trait
+  id: NormalVision
+  category: Visual
+  requirements:
+  - !type:CharacterSpeciesRequirement
+    species:
+    - Harpy
+    - Vulpkanin
+  functions:
+  - !type:TraitRemoveComponent
+    components:
+    - type: UltraVision
+    - type: DogVision
+
+- type: trait
+  id: Saturnine
+  category: Mental
+  points: 2
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterTraitRequirement
+    inverted: true
+    traits:
+    - Sanguine
+  functions:
+  - !type:TraitAddMoodlets
+    moodEffects:
+    - TraitSaturnine
+
+- type: trait
+  id: Sanguine
+  category: Mental
+  points: -2
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterTraitRequirement
+    inverted: true
+    traits:
+    - Saturnine
+  functions:
+  - !type:TraitAddMoodlets
+    moodEffects:
+    - TraitSanguine
+
+- type: trait
+  id: AddictionNicotine
+  category: Mental
+  points: 1
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterSpeciesRequirement
+    inverted: true
+    species:
+    - IPC
+  functions:
+  - !type:TraitAddMoodlets
+    moodEffects:
+    - NicotineWithdrawal
+
+- type: trait
+  id: Manic
+  category: Mental
+  points: 0
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - StationAi
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: Manic
+
+- type: trait
+  id: Mercurial
+  category: Mental
+  points: 0
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - StationAi
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: Mercurial
+
+- type: trait
+  id: DeadEmotions
+  category: Mental
+  points: -5
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - StationAi
+  - !type:CharacterTraitRequirement
+    inverted: true
+    traits:
+    - Sanguine
+    - Saturnine
+    - Manic
+    - Mercurial
+  functions:
+  - !type:TraitRemoveComponent
+    components:
+    - type: Mood
--- a/Resources/Prototypes/Traits/inconveniences.yml
+++ b/Resources/Prototypes/Traits/inconveniences.yml
@@ -1,87 +0,0 @@
- type: trait
-  id: LightweightDrunk
-  category: Physical
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
-    - !type:CharacterTraitRequirement
-      inverted: true
-      traits:
-        - HeavyweightDrunk
-        - LiquorLifeline
-    - !type:CharacterSpeciesRequirement
-      inverted: true
-      species:
-        - Dwarf
-        - IPC
-  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: LightweightDrunk
-          boozeStrengthMultiplier: 2
-
- type: trait
-  id: Stutter
-  # slots: 0
-  # itemGroupSlots: 0
-  category: TraitsSpeechAccents
-  requirements:
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Borg
-        - MedicalBorg
-    - !type:CharacterItemGroupRequirement
-      group: TraitsAccents
-  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: StutteringAccent
-          matchRandomProb: 0.1
-          fourRandomProb: 0
-          threeRandomProb: 0
-          cutRandomProb: 0
-
- type: trait
-  id: ForeignerLight
-  category: TraitsSpeechLanguages
-  points: 2
-  requirements:
-    - !type:CharacterTraitRequirement
-      inverted: true
-      traits:
-        - Foreigner
-        - Muted
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Mime
-  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: ForeignerTrait
-          cantUnderstand: false
-          baseTranslator: TranslatorForeigner
-
- type: trait
-  id: Foreigner
-  category: TraitsSpeechLanguages
-  points: 4
-  requirements: # TODO: Add a requirement to know at least 1 non-gc language
-    - !type:CharacterTraitRequirement
-      inverted: true
-      traits:
-        - ForeignerLight
-        - Muted
-    - !type:CharacterJobRequirement
-      inverted: true
-      jobs:
-        - Mime
-  functions:
-    - !type:TraitAddComponent
-      components:
-        - type: ForeignerTrait
-          baseTranslator: TranslatorForeigner
--- a/Resources/Prototypes/Traits/languages.yml
+++ b/Resources/Prototypes/Traits/languages.yml
@@ -160,3 +160,44 @@
        - Azaziba
      languagesUnderstood:
        - Azaziba
+
+- type: trait
+  id: ForeignerLight
+  category: TraitsSpeechLanguages
+  points: 2
+  requirements:
+  - !type:CharacterTraitRequirement
+    inverted: true
+    traits:
+    - Foreigner
+    - Muted
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Mime
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: ForeignerTrait
+      cantUnderstand: false
+      baseTranslator: TranslatorForeigner
+
+- type: trait
+  id: Foreigner
+  category: TraitsSpeechLanguages
+  points: 4
+  requirements: # TODO: Add a requirement to know at least 1 non-gc language
+  - !type:CharacterTraitRequirement
+    inverted: true
+    traits:
+    - ForeignerLight
+    - Muted
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Mime
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: ForeignerTrait
+      baseTranslator: TranslatorForeigner
--- a/Resources/Prototypes/Traits/neutral.yml
+++ b/Resources/Prototypes/Traits/neutral.yml
@@ -1,16 +1,3 @@
- type: trait
-  id: PirateAccent
-  # slots: 0
-  # itemGroupSlots: 0
-  category: TraitsSpeechAccents
-  requirements:
-  - !type:CharacterItemGroupRequirement
-    group: TraitsAccents
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: PirateAccent
-
 - type: trait
  id: Accentless
  category: TraitsSpeechAccents
@@ -35,7 +22,7 @@
        accent: dwarf

 - type: trait
-  id: Southern
+  id: SouthernAccent
  # slots: 0
  # itemGroupSlots: 0
  category: TraitsSpeechAccents
@@ -47,6 +34,128 @@
    components:
    - type: SouthernAccent

+- type: trait
+  id: PirateAccent
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: PirateAccent
+
+- type: trait
+  id: CowboyAccent
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: ReplacementAccent
+      accent: cowboy
+
+- type: trait
+  id: ItalianAccent
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: MobsterAccent
+
+- type: trait
+  id: Liar
+  category: Mental
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: ReplacementAccent
+      accent: liar
+
+- type: trait
+  id: Stutter
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: StutteringAccent
+      matchRandomProb: 0.1
+      fourRandomProb: 0
+      threeRandomProb: 0
+      cutRandomProb: 0
+
+- type: trait
+  id: FrontalLisp
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterJobRequirement
+    inverted: true
+    jobs:
+    - Borg
+    - MedicalBorg
+  - !type:CharacterSpeciesRequirement
+    inverted: true
+    species:
+    - IPC
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: FrontalLisp
+
+- type: trait
+  id: SpanishAccent
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: SpanishAccent
+
+- type: trait
+  id: SkeletonAccent
+  # slots: 0
+  # itemGroupSlots: 0
+  category: TraitsSpeechAccents
+  requirements:
+  - !type:CharacterItemGroupRequirement
+    group: TraitsAccents
+  - !type:CharacterSpeciesRequirement
+    species:
+    - Plasmaman
+  functions:
+  - !type:TraitAddComponent
+    components:
+    - type: SkeletonAccent
+
 - type: trait
  id: GermanAccent
  # slots: 0
@@ -85,177 +194,3 @@
  - !type:TraitAddComponent
    components:
    - type: FrenchAccent
-
- type: trait
-  id: ItalianAccent
-  # slots: 0
-  # itemGroupSlots: 0
-  category: TraitsSpeechAccents
-  requirements:
-  - !type:CharacterItemGroupRequirement
-    group: TraitsAccents
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: MobsterAccent
-
- type: trait
-  id: SpanishAccent
-  # slots: 0
-  # itemGroupSlots: 0
-  category: TraitsSpeechAccents
-  requirements:
-  - !type:CharacterItemGroupRequirement
-    group: TraitsAccents
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: SpanishAccent
-
- type: trait
-  id: SkeletonAccent
-  # slots: 0
-  # itemGroupSlots: 0
-  category: TraitsSpeechAccents
-  requirements:
-  - !type:CharacterItemGroupRequirement
-    group: TraitsAccents
-  - !type:CharacterSpeciesRequirement
-    species:
-    - Plasmaman
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: SkeletonAccent
-
- type: trait
-  id: NormalVision
-  category: Visual
-  requirements:
-  - !type:CharacterSpeciesRequirement
-    species:
-    - Harpy
-    - Vulpkanin
-  functions:
-  - !type:TraitRemoveComponent
-    components:
-    - type: UltraVision
-    - type: DogVision
-
- type: trait
-  id: Saturnine
-  category: Mental
-  points: 2
-  requirements:
-  - !type:CharacterJobRequirement
-    inverted: true
-    jobs:
-    - Borg
-    - MedicalBorg
-  - !type:CharacterTraitRequirement
-    inverted: true
-    traits:
-    - Sanguine
-  functions:
-  - !type:TraitAddMoodlets
-    moodEffects:
-    - TraitSaturnine
-
- type: trait
-  id: Sanguine
-  category: Mental
-  points: -2
-  requirements:
-  - !type:CharacterJobRequirement
-    inverted: true
-    jobs:
-    - Borg
-    - MedicalBorg
-  - !type:CharacterTraitRequirement
-    inverted: true
-    traits:
-    - Saturnine
-  functions:
-  - !type:TraitAddMoodlets
-    moodEffects:
-    - TraitSanguine
-
- type: trait
-  id: AddictionNicotine
-  category: Mental
-  points: 1
-  requirements:
-  - !type:CharacterJobRequirement
-    inverted: true
-    jobs:
-    - Borg
-    - MedicalBorg
-  - !type:CharacterSpeciesRequirement
-    inverted: true
-    species:
-    - IPC
-  functions:
-  - !type:TraitAddMoodlets
-    moodEffects:
-    - NicotineWithdrawal
-
- type: trait
-  id: Liar
-  category: Mental
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: ReplacementAccent
-      accent: liar
-
- type: trait
-  id: Manic
-  category: Mental
-  points: 0
-  requirements:
-  - !type:CharacterJobRequirement
-    inverted: true
-    jobs:
-    - Borg
-    - StationAi
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: Manic
-
- type: trait
-  id: Mercurial
-  category: Mental
-  points: 0
-  requirements:
-  - !type:CharacterJobRequirement
-    inverted: true
-    jobs:
-    - Borg
-    - StationAi
-  functions:
-  - !type:TraitAddComponent
-    components:
-    - type: Mercurial
-
- type: trait
-  id: DeadEmotions
-  category: Mental
-  points: -5
-  requirements:
-  - !type:CharacterJobRequirement
-    inverted: true
-    jobs:
-    - Borg
-    - StationAi
-  - !type:CharacterTraitRequirement
-    inverted: true
-    traits:
-    - Sanguine
-    - Saturnine
-    - Manic
-    - Mercurial
-  functions:
-  - !type:TraitRemoveComponent
-    components:
-    - type: Mood