Admin/wwdpublic
1
0
Fork 0
mirror of https://github.com/WWhiteDreamProject/wwdpublic.git synced 2026-04-17 13:37:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

No spead merge (#475)

Browse Source 
* Revert "[GoobPort] WIZ REAL (#465)"

This reverts commit 091a8ff433.

* fix local
This commit is contained in:
Spatison
2025-04-26 10:50:32 +03:00
committed by GitHub
parent 41606db2c5
commit 2a10c02eb5
949 changed files with 1467 additions and 42235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs
View File

@@ -1,25 +1,4 @@
// SPDX-FileCopyrightText: 2021 Moony <moonheart08@users.noreply.github.com>
// SPDX-FileCopyrightText: 2021 Vera Aguilera Puerto <gradientvera@outlook.com>
// SPDX-FileCopyrightText: 2021 metalgearsloth <comedian_vs_clown@hotmail.com>
// SPDX-FileCopyrightText: 2022 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
// SPDX-FileCopyrightText: 2022 Rane <60792108+Elijahrane@users.noreply.github.com>
// SPDX-FileCopyrightText: 2022 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
// SPDX-FileCopyrightText: 2022 mirrorcult <lunarautomaton6@gmail.com>
// SPDX-FileCopyrightText: 2022 wrexbe <81056464+wrexbe@users.noreply.github.com>
// SPDX-FileCopyrightText: 2023 Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
// SPDX-FileCopyrightText: 2023 Slava0135 <40753025+Slava0135@users.noreply.github.com>
// SPDX-FileCopyrightText: 2024 Ed <96445749+TheShuEd@users.noreply.github.com>
// SPDX-FileCopyrightText: 2024 Piras314 <p1r4s@proton.me>
// SPDX-FileCopyrightText: 2024 Plykiya <58439124+Plykiya@users.noreply.github.com>
// SPDX-FileCopyrightText: 2024 SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
// SPDX-FileCopyrightText: 2024 Tayrtahn <tayrtahn@gmail.com>
// SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
//
// SPDX-License-Identifier: AGPL-3.0-or-later
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Events;
using Content.Shared.Slippery;
using Content.Shared.Whitelist;
using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Events;
@@ -106,37 +85,16 @@ public sealed class SpeedModifierContactsSystem : EntitySystem
var entries = 0;
foreach (var ent in _physics.GetContactingEntities(uid, physicsComponent))
{
bool speedModified = false;
if (!TryComp<SpeedModifierContactsComponent>(ent, out var slowContactsComponent))
continue;
if (TryComp<SpeedModifierContactsComponent>(ent, out var slowContactsComponent))
{
if (_whitelistSystem.IsWhitelistPass(slowContactsComponent.IgnoreWhitelist, uid))
continue;
if (_whitelistSystem.IsWhitelistPass(slowContactsComponent.IgnoreWhitelist, uid))
continue;
walkSpeed += slowContactsComponent.WalkSpeedModifier;
sprintSpeed += slowContactsComponent.SprintSpeedModifier;
speedModified = true;
}
// SpeedModifierContactsComponent takes priority over SlowedOverSlipperyComponent, effectively overriding the slippery slow.
if (TryComp<SlipperyComponent>(ent, out var slipperyComponent) && speedModified == false)
{
var evSlippery = new GetSlowedOverSlipperyModifierEvent();
RaiseLocalEvent(uid, ref evSlippery);
if (evSlippery.SlowdownModifier != 1)
{
walkSpeed += evSlippery.SlowdownModifier;
sprintSpeed += evSlippery.SlowdownModifier;
speedModified = true;
}
}
if (speedModified)
{
remove = false;
entries++;
}
walkSpeed += slowContactsComponent.WalkSpeedModifier;
sprintSpeed += slowContactsComponent.SprintSpeedModifier;
remove = false;
entries++;
}
if (entries > 0)
@@ -144,11 +102,15 @@ public sealed class SpeedModifierContactsSystem : EntitySystem
walkSpeed /= entries;
sprintSpeed /= entries;
var evMax = new GetSpeedModifierContactCapEvent();
RaiseLocalEvent(uid, ref evMax);
if (TryComp<SpeedModifiedByContactModifierComponent>(uid, out var modifier))
{
walkSpeed = Math.Max(Math.Min(modifier.MinWalkMultiplier, walkSpeed),
// Similar to the formula for movement slow resist in Deadlock
1 - (1 - walkSpeed) * modifier.WalkModifierEffectiveness);
walkSpeed = MathF.Max(walkSpeed, evMax.MaxWalkSlowdown);
sprintSpeed = MathF.Max(sprintSpeed, evMax.MaxSprintSlowdown);
sprintSpeed = Math.Max(Math.Min(modifier.MinSprintMultiplier, sprintSpeed),
1 - (1 - sprintSpeed) * modifier.SprintModifierEffectiveness);
}
args.ModifySpeed(walkSpeed, sprintSpeed);
}
@@ -166,19 +128,11 @@ public sealed class SpeedModifierContactsSystem : EntitySystem
private void OnEntityEnter(EntityUid uid, SpeedModifierContactsComponent component, ref StartCollideEvent args)
{
AddModifiedEntity(args.OtherEntity);
}
/// <summary>
/// Add an entity to be checked for speed modification from contact with another entity.
/// </summary>
/// <param name="uid">The entity to be added.</param>
public void AddModifiedEntity(EntityUid uid)
{
if (!HasComp<MovementSpeedModifierComponent>(uid))
var otherUid = args.OtherEntity;
if (!HasComp<MovementSpeedModifierComponent>(otherUid))
return;
EnsureComp<SpeedModifiedByContactComponent>(uid);
_toUpdate.Add(uid);
EnsureComp<SpeedModifiedByContactComponent>(otherUid);
_toUpdate.Add(otherUid);
}
}