Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Felinid (DeltaV Update) #1307

Merged
merged 4 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using Robust.Shared.GameStates;

namespace Content.Shared.StepTrigger.Components;


[RegisterComponent, NetworkedComponent]
public sealed partial class NoShoesSilentFootstepsComponent : Component
{
}
10 changes: 10 additions & 0 deletions Content.Shared/Movement/Systems/SharedMoverController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using PullableComponent = Content.Shared.Movement.Pulling.Components.PullableComponent;
using Content.Shared.StepTrigger.Components; // Delta V-NoShoesSilentFootstepsComponent

namespace Content.Shared.Movement.Systems
{
Expand All @@ -46,6 +47,7 @@ public abstract partial class SharedMoverController : VirtualController
[Dependency] protected readonly SharedPhysicsSystem Physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly TagSystem _tags = default!;
[Dependency] private readonly IEntityManager _entities = default!; // Delta V-NoShoesSilentFootstepsComponent

protected EntityQuery<InputMoverComponent> MoverQuery;
protected EntityQuery<MobMoverComponent> MobMoverQuery;
Expand Down Expand Up @@ -438,6 +440,14 @@ private bool TryGetSound(
sound = moverModifier.FootstepSoundCollection;
return true;
}

// If got the component in yml and no shoes = no sound. Delta V
if (_entities.TryGetComponent(uid, out NoShoesSilentFootstepsComponent? _) &
!_inventory.TryGetSlotEntity(uid, "shoes", out var _))
{
return false;
}
// Delta V NoShoesSilentFootsteps till here.

if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) &&
TryComp<FootstepModifierComponent>(shoes, out var modifier))
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/typing_indicator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
- type: typingIndicator
id: felinid
spritePath: /Textures/DeltaV/Effects/speech.rsi
typingState: felinid0
offset: 0, 0.2 # 0625
33 changes: 28 additions & 5 deletions Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,30 @@
prototype: Felinid
- type: Damageable
damageModifierSet: Felinid
- type: SlowOnDamage
speedModifierThresholds:
60: 0.85 # 0.7 is base speed.
80: 0.75 # 0.5 is base speed.
- type: MeleeWeapon
soundHit:
collection: Punch
animation: WeaponArcClaw
damage:
types:
Blunt: 3
Slash: 2
Slash: 4
Piercing: 1
# - type: DiseaseCarrier
# naturalImmunities:
# - OwOnavirus
- type: Speech
speechSounds: Alto
- type: DamageOnHighSpeedImpact
- type: DamageOnHighSpeedImpact # Landing on all fours!
damage:
types:
Blunt: 1
- type: Stamina
- type: TypingIndicator
proto: felinid
- type: PseudoItem
- type: Vocal
wilhelm: "/Audio/Nyanotrasen/Voice/Felinid/cat_wilhelm.ogg"
Expand All @@ -54,6 +63,22 @@
- type: SizeAttributeWhitelist # Frontier
tall: true
tallscale: 1
- type: Reactive
groups:
Flammable: [ Touch ]
Extinguish: [ Touch ]
reactions:
- reagents: [ Water, SpaceCleaner ]
methods: [ Touch ]
effects:
- !type:WashCreamPieReaction
- reagents: [ Water ]
methods: [ Touch ]
effects:
- !type:Emote
emote: Scream
probability: 0.2
- type: NoShoesSilentFootsteps

- type: entity
save: false
Expand All @@ -65,5 +90,3 @@
components:
- type: HumanoidAppearance
species: Felinid

#Nya~~
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions Resources/Textures/DeltaV/Effects/speech.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Felinid sprites made by Adrian16199 (Github)",
"states": [
{
"name": "felinid0",
"delays": [
[
0.2,
0.3,
0.3,
0.5
]
]
},
{
"name": "felinid1"
},
{
"name": "felinid2"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading