Skip to content

Commit

Permalink
Felinid (DeltaV Update) (#1307)
Browse files Browse the repository at this point in the history
* Felinid changes. (#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]>

* Fixes the 2 pixels in the fluffy tail. (#865)

It has bothered me and today felt like fixin it.

* Make felinids scream in agony when sprayed with water. (#556)

* Make felinids scream in agony when sprayed with water.

Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony.

* Giving probability as the best possible implementation as of now

---------

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

* "Fix felinid sprite shit"

This PR
DeltaV-Station/Delta-v@89383ab

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>
  • Loading branch information
3 people committed May 2, 2024
1 parent 896d284 commit 1c649f3
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 5 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.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.

0 comments on commit 1c649f3

Please sign in to comment.