Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Новые аспекты (#495)

Browse Source 
* Add ReflectAspect

* Add SlipperyAspect

* Add TraitorRichAspect

* Add WhisperAspect

* Add DarknessAspect & StolenFloorAspect

* Add WindowLeakAspect

* Add CatEarsAspect

* Add NothingAspect

* Fix fast and furious clone

* Add SkeletonAspect

* Add cvar ceanup
This commit is contained in:
Aviu00
2023-10-19 02:32:18 +09:00
committed by Aviu00
parent d7f4a21b05
commit ecf3ecad81
48 changed files with 751 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Slippery/SlipperySystem.cs
View File

@@ -4,10 +4,12 @@ using Content.Shared.Inventory;
using Content.Shared.StatusEffect;
using Content.Shared.StepTrigger.Systems;
using Content.Shared.Stunnable;
using Content.Shared.White;
using Content.Shared.White.Mood;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Configuration;
using Robust.Shared.Containers;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Systems;
@@ -23,6 +25,11 @@ public sealed class SlipperySystem : EntitySystem
[Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
[Dependency] private readonly SharedContainerSystem _container = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
// WD START
[Dependency] private readonly IConfigurationManager _cfg = default!;
private float SlipPowerModifier { get; set; }
// WD END
public override void Initialize()
{
@@ -33,6 +40,8 @@ public sealed class SlipperySystem : EntitySystem
SubscribeLocalEvent<NoSlipComponent, SlipAttemptEvent>(OnNoSlipAttempt);
// as long as slip-resistant mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
SubscribeLocalEvent<NoSlipComponent, InventoryRelayedEvent<SlipAttemptEvent>>((e, c, ev) => OnNoSlipAttempt(e, c, ev.Args));
_cfg.OnValueChanged(WhiteCVars.SlipPowerModifier, x => SlipPowerModifier = x, true); // WD
}
private void HandleStepTrigger(EntityUid uid, SlipperyComponent component, ref StepTriggeredEvent args)
@@ -73,11 +82,11 @@ public sealed class SlipperySystem : EntitySystem
RaiseLocalEvent(uid, ref ev);
if (TryComp(other, out PhysicsComponent? physics))
_physics.SetLinearVelocity(other, physics.LinearVelocity * component.LaunchForwardsMultiplier, body: physics);
_physics.SetLinearVelocity(other, physics.LinearVelocity * component.LaunchForwardsMultiplier * SlipPowerModifier, body: physics); // WD EDIT
var playSound = !_statusEffects.HasStatusEffect(other, "KnockedDown");
_stun.TryParalyze(other, TimeSpan.FromSeconds(component.ParalyzeTime), true);
_stun.TryParalyze(other, TimeSpan.FromSeconds(component.ParalyzeTime * SlipPowerModifier), true); // WD EDIT
RaiseLocalEvent(other, new MoodEffectEvent("MobSlipped")); // WD edit