Felinid changes. (new-frontiers-14#666)

* 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]>
dvir001 · Apr 29, 2024 · 7311b97 · 7311b97
1 parent 43fa11d
commit 7311b97
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs b/Content.Shared/DeltaV/StepTrigger/Component/NoShoesSilentFootstepsComponent.cs
@@ -0,0 +1,9 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.StepTrigger.Components;
+
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class NoShoesSilentFootstepsComponent : Component
+{
+}
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -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
 {
@@ -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;
@@ -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))

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -24,17 +24,24 @@
     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
@@ -54,6 +61,7 @@
   - type: SizeAttributeWhitelist # Frontier
     tall: true
     tallscale: 1
+  - type: NoShoesSilentFootsteps
 
 - type: entity
   save: false
@@ -65,5 +73,3 @@
   components:
   - type: HumanoidAppearance
     species: Felinid
-
-#Nya~~