More Speech Verbs (#19626)

2023-08-31 22:15:31 -05:00
parent f29c65c159
commit 44b166788b
17 changed files with 140 additions and 18 deletions
--- a/Content.Shared/Speech/SpeechComponent.cs
+++ b/Content.Shared/Speech/SpeechComponent.cs
@@ -39,6 +39,8 @@ namespace Content.Shared.Speech
            { "chat-speech-verb-suffix-exclamation-strong", "DefaultExclamationStrong" },
            { "chat-speech-verb-suffix-exclamation", "DefaultExclamation" },
            { "chat-speech-verb-suffix-question", "DefaultQuestion" },
+            { "chat-speech-verb-suffix-stutter", "DefaultStutter" },
+            { "chat-speech-verb-suffix-mumble", "DefaultMumble" },
        };

        [DataField("audioParams")]
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -52,28 +52,61 @@ chat-manager-admin-channel-name = ADMIN
 chat-speech-verb-suffix-exclamation = !
 chat-speech-verb-suffix-exclamation-strong = !!
 chat-speech-verb-suffix-question = ?
+chat-speech-verb-suffix-stutter = -
+chat-speech-verb-suffix-mumble = ..

 chat-speech-verb-default = says
 chat-speech-verb-exclamation = exclaims
 chat-speech-verb-exclamation-strong = yells
 chat-speech-verb-question = asks
+chat-speech-verb-stutter = stutters
+chat-speech-verb-mumble = mumbles

 chat-speech-verb-insect-1 = chitters
-chat-speech-verb-insect-2 = flutters
+chat-speech-verb-insect-2 = chirps
+chat-speech-verb-insect-3 = clicks

-chat-speech-verb-slime = chirps
+chat-speech-verb-winged-1 = flutters
+chat-speech-verb-winged-2 = flaps
+chat-speech-verb-winged-3 = buzzes

-chat-speech-verb-robotic = states
-chat-speech-verb-reptilian = hisses
+chat-speech-verb-slime-1 = sloshes
+chat-speech-verb-slime-2 = burbles
+chat-speech-verb-slime-3 = oozes

-chat-speech-verb-skeleton = rattles
+chat-speech-verb-plant-1 = rustles
+chat-speech-verb-plant-2 = sways
+chat-speech-verb-plant-3 = creaks

-chat-speech-verb-small-mob = squeaks
+chat-speech-verb-robotic-1 = states
+chat-speech-verb-robotic-2 = beeps

-chat-speech-verb-large-mob = roars
+chat-speech-verb-reptilian-1 = hisses
+chat-speech-verb-reptilian-2 = snorts
+chat-speech-verb-reptilian-3 = huffs

-chat-speech-verb-monkey = chimpers
+chat-speech-verb-skeleton-1 = rattles
+chat-speech-verb-skeleton-2 = clacks
+chat-speech-verb-skeleton-3 = gnashes
+
+chat-speech-verb-canine-1 = barks
+chat-speech-verb-canine-2 = woofs
+chat-speech-verb-canine-3 = howls
+
+chat-speech-verb-small-mob-1 = squeaks
+chat-speech-verb-small-mob-2 = pieps
+
+chat-speech-verb-large-mob-1 = roars
+chat-speech-verb-large-mob-2 = growls
+
+chat-speech-verb-monkey-1 = chimpers
+chat-speech-verb-monkey-2 = screeches

 chat-speech-verb-cluwne-1 = giggles
 chat-speech-verb-cluwne-2 = guffaws
 chat-speech-verb-cluwne-3 = laughs
+
+chat-speech-verb-ghost-1 = complains
+chat-speech-verb-ghost-2 = breathes
+chat-speech-verb-ghost-3 = hums
+chat-speech-verb-ghost-4 = mutters
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -112,6 +112,7 @@
  - type: TypingIndicator
    proto: robot
  - type: Speech
+    speechVerb: Robotic
    speechSounds: Pai
  - type: Construction
    graph: Cyborg
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1608,6 +1608,8 @@
  - type: Bloodstream
    bloodMaxVolume: 150
    bloodReagent: SpiderBlood
+  - type: Speech
+    speechVerb: Arachnid

 - type: entity
  name: tarantula
@@ -1674,6 +1676,8 @@
    - type: FootstepModifier
      footstepSoundCollection:
        collection: FootstepClownFast
+    - type: Speech
+      speechVerb: Cluwne

 - type: entity
  name: possum
@@ -1858,6 +1862,8 @@
    - map: ["enum.DamageStateVisualLayers.Base"]
      state: corgi
  - type: Physics
+  - type: Speech
+    speechVerb: Canine
  - type: Fixtures
    fixtures:
      fix1:
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -75,6 +75,8 @@
        - DoorBumpOpener
    - type: ReplacementAccent
      accent: genericAggressive
+    - type: Speech
+      speechVerb: LargeMob

 - type: entity
  parent: BaseMobCarp
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -110,6 +110,8 @@
      event: !type:RatKingDomainActionEvent
    hungerPerDomainUse: 50
  - type: MobsterAccent
+  - type: Speech
+    speechVerb: SmallMob
  - type: Butcherable
    spawned:
    - id: ClothingHeadHatFancyCrown #how did that get there?
@@ -282,6 +284,8 @@
    price: 500 # rat wealth
  - type: MobsterAccent
    isBoss: false
+  - type: Speech
+    speechVerb: SmallMob
  - type: GuideHelp
    guides:
    - MinorAntagonists
--- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
@@ -78,3 +78,5 @@
    - of
    - RevenantAdjective
    - RevenantTheme
+  - type: Speech
+    speechVerb: Ghost
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -144,6 +144,8 @@
  - type: Strap
    buckleOffset: "0, 0"
    maxBuckleDistance: 1
+  - type: Speech
+    speechVerb: Robotic
  - type: AmbientSound
    sound: "/Audio/Effects/Vehicle/vehicleengineidle.ogg"
    range: 10
@@ -249,6 +251,8 @@
    state: honkbot
  - type: Slippery
    launchForwardsMultiplier: 2
+  - type: Speech
+    speechVerb: Cluwne
  - type: StepTrigger
    intersectRatio: 0.2
  - type: Fixtures
--- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
@@ -117,6 +117,8 @@
    makeSentient: true
    name: ghost-role-information-slimes-name
    description: ghost-role-information-slimes-description
+  - type: Speech
+    speechVerb: Slime

 - type: entity
  name: blue slime
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -66,6 +66,8 @@
    energy: 2
    color: "#4faffb"
  - type: GhostTakeoverAvailable
+  - type: Speech
+    speechVerb: LargeMob

 - type: entity
  name: space bear
@@ -284,6 +286,8 @@
    prob: 0.30
    name: ghost-role-information-space-spider-name
    description: ghost-role-information-space-spider-description
+  - type: Speech
+    speechVerb: Arachnid

 - type: entity
  id: MobSpiderSpaceSalvage
--- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
@@ -83,6 +83,8 @@
  - type: GhostTakeoverAvailable
  - type: ReplacementAccent
    accent: genericAggressive
+  - type: Speech
+    speechVerb: SmallMob

 - type: entity
  id: MobTickSalvage
--- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -111,6 +111,8 @@
  - type: NoSlip
  - type: Perishable #Ummmm the acid kills a lot of the bacteria or something
    molsPerSecondPerUnitMass: 0.0005
+  - type: Speech
+    speechVerb: LargeMob

 - type: entity
  name: Praetorian
--- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml
@@ -176,6 +176,8 @@
    - type: FootstepModifier
      footstepSoundCollection:
        collection: FootstepClown
+    - type: Speech
+      speechVerb: Cluwne
    - type: TypingIndicator
      proto: holo
    - type: RandomSprite
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -41,7 +41,7 @@
        sprite: Mobs/Effects/brute_damage.rsi
        color: "#162581"
  - type: Speech
-    speechVerb: Insect
+    speechVerb: Arachnid
    speechSounds: Arachnid
  - type: Vocal
    sounds:
--- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -53,6 +53,8 @@
  - type: MovementSpeedModifier
    baseWalkSpeed : 1.5
    baseSprintSpeed : 3.5
+  - type: Speech
+    speechVerb: Plant
  - type: Vocal
    sounds:
      Male: UnisexDiona
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -23,7 +23,7 @@
    damageContainer: Biological
    damageModifierSet: Moth
  - type: Speech
-    speechVerb: Insect
+    speechVerb: Moth
  - type: TypingIndicator
    proto: moth
  - type: Butcherable
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -8,6 +8,16 @@
  speechVerbStrings:
  - chat-speech-verb-question

+- type: speechVerb
+  id: DefaultStutter
+  speechVerbStrings:
+  - chat-speech-verb-stutter
+
+- type: speechVerb
+  id: DefaultMumble
+  speechVerbStrings:
+  - chat-speech-verb-mumble
+
 - type: speechVerb
  id: DefaultExclamation
  speechVerbStrings:
@@ -21,45 +31,80 @@
  priority: 10

 - type: speechVerb
-  id: Insect
+  id: Arachnid
  speechVerbStrings:
  - chat-speech-verb-insect-1
  - chat-speech-verb-insect-2
+  - chat-speech-verb-insect-3
+  - chat-speech-verb-reptilian-1
+
+- type: speechVerb
+  id: Moth
+  speechVerbStrings:
+  - chat-speech-verb-winged-1
+  - chat-speech-verb-winged-2
+  - chat-speech-verb-winged-3
+  - chat-speech-verb-insect-1

 - type: speechVerb
  id: Robotic
  speechVerbStrings:
-  - chat-speech-verb-robotic
+  - chat-speech-verb-robotic-1
+  - chat-speech-verb-robotic-2

 - type: speechVerb
  id: Reptilian
  speechVerbStrings:
-  - chat-speech-verb-reptilian
+  - chat-speech-verb-reptilian-1
+  - chat-speech-verb-reptilian-2
+  - chat-speech-verb-reptilian-3
+  - chat-speech-verb-insect-2

 - type: speechVerb
  id: Skeleton
  speechVerbStrings:
-  - chat-speech-verb-skeleton
+  - chat-speech-verb-skeleton-1
+  - chat-speech-verb-skeleton-2
+  - chat-speech-verb-skeleton-3

 - type: speechVerb
  id: Slime
  speechVerbStrings:
-  - chat-speech-verb-slime
+  - chat-speech-verb-slime-1
+  - chat-speech-verb-slime-2
+  - chat-speech-verb-slime-3
+
+- type: speechVerb
+  id: Plant
+  speechVerbStrings:
+  - chat-speech-verb-plant-1
+  - chat-speech-verb-plant-2
+  - chat-speech-verb-plant-3
+
+- type: speechVerb
+  id: Canine
+  speechVerbStrings:
+  - chat-speech-verb-canine-1
+  - chat-speech-verb-canine-2
+  - chat-speech-verb-canine-3

 - type: speechVerb
  id: LargeMob
  speechVerbStrings:
-  - chat-speech-verb-large-mob
+  - chat-speech-verb-large-mob-1
+  - chat-speech-verb-large-mob-2

 - type: speechVerb
  id: SmallMob
  speechVerbStrings:
-  - chat-speech-verb-small-mob
+  - chat-speech-verb-small-mob-1
+  - chat-speech-verb-small-mob-2

 - type: speechVerb
  id: Monkey
  speechVerbStrings:
-  - chat-speech-verb-monkey
+  - chat-speech-verb-monkey-1
+  - chat-speech-verb-monkey-2

 - type: speechVerb
  id: Cluwne
@@ -67,3 +112,12 @@
  - chat-speech-verb-cluwne-1
  - chat-speech-verb-cluwne-2
  - chat-speech-verb-cluwne-3
+
+- type: speechVerb
+  id: Ghost
+  speechVerbStrings:
+  - chat-speech-verb-ghost-1
+  - chat-speech-verb-ghost-2
+  - chat-speech-verb-ghost-3
+  - chat-speech-verb-ghost-4
+  - chat-speech-verb-mumble