Skip to content

Commit

Permalink
Felinid changes. (#666)
Browse files Browse the repository at this point in the history
* Felinid changes.

A plan

* Just slappin it together

for a friend to see and help

* Somethin somethin

Cos I could be at yours on friday
Tonight's at the place we started
It's a long way back from sorry
But here I go ....
How does it feel, how does it feel
Just tell me something

I don't know what to tell you
I don't know what to say
I got into my head, i'm sorry i threw it away
But i'm so glad you came back, even through all the pain
Let me try and mend it, i can promise that i have changed
Oh, let me give you all of me
Can we just sort it out for real

* just makin this less messy.... I guess

* Just tell me somethin.

How does it feel, how does it feel.

* .

* cleaning....

* Makes it work. Yey.

* just a small change tbh.

* okay maybe just a bit.

* Hm, maybe....

* This feels bit better.

* hopefully fixes yaml linter

* Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml

Co-authored-by: Debug <[email protected]>
Signed-off-by: Adrian16199 <[email protected]>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>
  • Loading branch information
Adrian16199 and DebugOk authored Feb 12, 2024
1 parent 9611962 commit 49d3c45
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
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.Physics.Systems;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
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 @@ -443,6 +445,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
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,9 @@
guides:
- MinorAntagonists
- type: FelinidFood # Nyanotrasen - Felinid, ability to eat rat, see Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
- type: Food
- type: Item
size: Tiny # Delta V - Make them eatable and pickable.

- type: weightedRandomEntity
id: RatKingLoot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
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
Expand All @@ -36,12 +40,9 @@
# - type: DiseaseCarrier
# naturalImmunities:
# - OwOnavirus
- type: Thieving
stealthy: true
stripTimeReduction: 1
- type: Speech
speechSounds: Alto
- type: DamageOnHighSpeedImpact
- type: DamageOnHighSpeedImpact # Landing on all fours!
damage:
types:
Blunt: 1
Expand All @@ -62,6 +63,7 @@
Female: FemaleFelinid
Unsexed: MaleFelinid
- type: Felinid
- type: NoShoesSilentFootsteps

- type: entity
save: false
Expand Down

0 comments on commit 49d3c45

Please sign in to comment.