Added more animal sound effects needed for pettable animals and gibbed head fix (#7532)

This commit is contained in:
CrzyPotato
2022-04-15 15:56:04 -07:00
committed by GitHub
parent c7856327a8
commit 67b2bfad57
15 changed files with 50 additions and 2 deletions

View File

@@ -21,6 +21,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Content.Shared.MobState.Components;
namespace Content.Shared.Interaction namespace Content.Shared.Interaction
{ {
@@ -45,7 +46,7 @@ namespace Content.Shared.Interaction
public bool TryFaceAngle(EntityUid user, Angle diffAngle) public bool TryFaceAngle(EntityUid user, Angle diffAngle)
{ {
if (_actionBlockerSystem.CanChangeDirection(user)) if (_actionBlockerSystem.CanChangeDirection(user) && TryComp(user, out MobStateComponent? mob) && !mob.IsIncapacitated())
{ {
EntityManager.GetComponent<TransformComponent>(user).WorldRotation = diffAngle; EntityManager.GetComponent<TransformComponent>(user).WorldRotation = diffAngle;
return true; return true;

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -13,3 +13,26 @@ chicken_cluck_happy.ogg: modified from "Chicken Single Alarm Call" by freesound
ferret_happy.ogg: modified from "Ferret" by freesound user "J.Zazvurek" (https://freesound.org/people/J.Zazvurek/sounds/155115/) licensed under CC BY 3.0. The original audio was trimmed and converted from WAV to OGG format. ferret_happy.ogg: modified from "Ferret" by freesound user "J.Zazvurek" (https://freesound.org/people/J.Zazvurek/sounds/155115/) licensed under CC BY 3.0. The original audio was trimmed and converted from WAV to OGG format.
mouse_squeak.ogg: modified from "Cartoon - Bat / Mouse Squeak" by freesound user "Breviceps" (https://freesound.org/people/Breviceps/sounds/445958/) licensed under CC0 1.0 (public domain). The original audio was converted from WAV to OGG format. mouse_squeak.ogg: modified from "Cartoon - Bat / Mouse Squeak" by freesound user "Breviceps" (https://freesound.org/people/Breviceps/sounds/445958/) licensed under CC0 1.0 (public domain). The original audio was converted from WAV to OGG format.
sloth_squeak.ogg: modified from "squeakfinal.wav" by freesound user "Higgs01" (https://freesound.org/people/Higgs01/sounds/428114/) licensed under CC0 1.0 (Public domain dedication). The original audio was converted from WAV to OFF format AND converted from stereo to mono.
parrot_raught.ogg: modified and used from "Parrot 1 raught 2.wav" by freesound user "Coral_Island_Studios" (https://freesound.org/people/Coral_Island_Studios/sounds/432588/) licensed under CC BY 3.0. The original audio was converted from WAV to OGG format.
fox_squeak.ogg: modified from "Video Game Squeak" by freesound user "Breviceps" (https://freesound.org/people/Breviceps/sounds/468442/) licensed under CC0 1.0. The original audio was converted from WAV to OGG format
frog_ribbit.ogg: original audio created by freesound user "egomassive" (https://freesound.org/people/egomassive/sounds/536759/). licensed under licensed under CC0 1.0
goose_honk.ogg: modified from " Bird Honk - 1" by freesound user "SpaceJoe" (https://freesound.org/people/SpaceJoe/sounds/510940/) licensed under CC0 1.0. The originial audio was converted from WAV to OGG format.
snake_hiss.ogg: modified from "hissing snake sound effect" by freesound user "Garuda1982" (https://freesound.org/people/Garuda1982/sounds/541656/) licensed under CC BY 4.0. The original audio was convertred from WAV to OGG format.
The following sounds were used from youtube:
penguin_squawk.ogg: audio is recorded/created by youtube user "ProSounds" (https://youtu.be/Anr35RbBL3Y) licensed under CC BY 3.0. The original audio was trimmed and converted from MP3 to OGG format.
raccoon_squeak.ogg: audio is recorded by youtube user "jnargus" (https://youtu.be/BGjFP1CP7E0) licensed under CC by 3.0
goat_bah.ogg: audio is created by youtube user "Winry Marini" (https://youtu.be/QIhwzsk5bww) licensed under CC BY 3.0
lizard_happy.ogg: audio created by youtube user "Nagaty Studio" (https://youtu.be/I7CX0AS8RNI) licensed under CC by 3.0.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -43,6 +43,8 @@
successChance: 0.2 successChance: 0.2
interactSuccessString: petting-success-soft-floofy interactSuccessString: petting-success-soft-floofy
interactFailureString: petting-failure-bat interactFailureString: petting-failure-bat
interactSuccessSound:
path: /Audio/Animals/fox_squeak.ogg
- type: SentienceTarget - type: SentienceTarget
flavorKind: organic flavorKind: organic
- type: Bloodstream - type: Bloodstream
@@ -350,8 +352,11 @@
gender: female # Here because of UdderComponent gender: female # Here because of UdderComponent
- type: InteractionPopup - type: InteractionPopup
successChance: 0.7 successChance: 0.7
interactDelay: 2 # Avoids overlapping SFX due to spam - these SFX are a little longer than the typical 1 second.
interactSuccessString: petting-success-soft-floofy interactSuccessString: petting-success-soft-floofy
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/cow_moo.ogg
- type: entity - type: entity
@@ -438,6 +443,8 @@
successChance: 0.2 successChance: 0.2
interactSuccessString: petting-success-goat interactSuccessString: petting-success-goat
interactFailureString: petting-failure-goat interactFailureString: petting-failure-goat
interactSuccessSound:
path: /Audio/Animals/goat_bah.ogg
# Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked. # Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
- type: entity - type: entity
@@ -466,6 +473,8 @@
successChance: 0.1 # Yeah, good luck with that. successChance: 0.1 # Yeah, good luck with that.
interactSuccessString: petting-success-goose interactSuccessString: petting-success-goose
interactFailureString: petting-failure-goose interactFailureString: petting-failure-goose
interactSuccessSound:
path: /Audio/Animals/goose_honk.ogg
- type: Bloodstream - type: Bloodstream
bloodMaxVolume: 100 bloodMaxVolume: 100
@@ -810,6 +819,8 @@
successChance: 0.3 successChance: 0.3
interactSuccessString: petting-success-reptile interactSuccessString: petting-success-reptile
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/lizard_happy.ogg
- type: Bloodstream - type: Bloodstream
bloodMaxVolume: 50 bloodMaxVolume: 50
- type: Damageable - type: Damageable
@@ -858,6 +869,8 @@
successChance: 0.6 successChance: 0.6
interactSuccessString: petting-success-frog interactSuccessString: petting-success-frog
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/frog_ribbit.ogg
- type: Bloodstream - type: Bloodstream
bloodMaxVolume: 50 bloodMaxVolume: 50
@@ -904,6 +917,8 @@
successChance: 0.6 successChance: 0.6
interactSuccessString: petting-success-bird interactSuccessString: petting-success-bird
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/parrot_raught.ogg
- type: Bloodstream - type: Bloodstream
bloodMaxVolume: 50 bloodMaxVolume: 50
@@ -946,6 +961,8 @@
successChance: 0.5 successChance: 0.5
interactSuccessString: petting-success-bird interactSuccessString: petting-success-bird
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/penguin_squawk.ogg
- type: entity - type: entity
name: grenade penguin name: grenade penguin
@@ -1013,6 +1030,7 @@
totalIntensity: 120 totalIntensity: 120
- type: ExplodeOnTrigger - type: ExplodeOnTrigger
# I have included a snake_hiss.ogg sound file so if you want to use that be my guest
- type: entity - type: entity
name: snake name: snake
parent: SimpleMobBase parent: SimpleMobBase
@@ -1216,6 +1234,8 @@
successChance: 0.2 # Low when undomesticated. successChance: 0.2 # Low when undomesticated.
interactSuccessString: petting-success-soft-floofy interactSuccessString: petting-success-soft-floofy
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/raccoon_chatter.ogg
- type: Grammar - type: Grammar
attributes: attributes:
gender: epicene gender: epicene
@@ -1273,6 +1293,8 @@
successChance: 0.5 successChance: 0.5
interactSuccessString: petting-success-soft-floofy interactSuccessString: petting-success-soft-floofy
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound:
path: /Audio/Animals/fox_squeak.ogg
- type: Grammar - type: Grammar
attributes: attributes:
gender: epicene gender: epicene

View File

@@ -371,6 +371,8 @@
successChance: 0.9 successChance: 0.9
interactSuccessString: petting-success-sloth interactSuccessString: petting-success-sloth
interactFailureString: petting-failure-sloth interactFailureString: petting-failure-sloth
interactSuccessSound:
path: /Audio/Animals/sloth_squeak.ogg
- type: Grammar - type: Grammar
attributes: attributes:
gender: epicene gender: epicene