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

StunnableComponent cleanup, proper prediction for stuns and slips. (#3552)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-03-08 05:00:50 +01:00
committed by GitHub
parent 0ad70d62ec
commit 6c77801d90
13 changed files with 243 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
View File

@@ -3,8 +3,10 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Client.GameObjects.Components.Clothing;
using Content.Client.GameObjects.Components.Items;
using Content.Shared.GameObjects.Components.Inventory;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
using Content.Shared.Preferences.Appearance;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
@@ -20,7 +22,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
/// </summary>
[RegisterComponent]
[ComponentReference(typeof(SharedInventoryComponent))]
public class ClientInventoryComponent : SharedInventoryComponent
public class ClientInventoryComponent : SharedInventoryComponent, IEffectBlocker
{
private readonly Dictionary<Slots, IEntity> _slots = new();
@@ -286,5 +288,10 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
return false;
}
bool IEffectBlocker.CanSlip()
{
return !TryGetSlot(Slots.SHOES, out var shoes) || shoes == null || EffectBlockerSystem.CanSlip(shoes);
}
}
}

10
Content.Client/GameObjects/Components/Movement/SlipperyComponent.cs
View File

@@ -14,11 +14,11 @@ namespace Content.Client.GameObjects.Components.Movement
if (curState is not SlipperyComponentState state) return;
Slippery = state.Slippery;
IntersectPercentage = state.IntersectPercentage;
ParalyzeTime = state.ParalyzeTime;
RequiredSlipSpeed = state.RequiredSlipSpeed;
LaunchForwardsMultiplier = state.LaunchForwardsMultiplier;
_slippery = state.Slippery;
_intersectPercentage = state.IntersectPercentage;
_paralyzeTime = state.ParalyzeTime;
_requiredSlipSpeed = state.RequiredSlipSpeed;
_launchForwardsMultiplier = state.LaunchForwardsMultiplier;
}
}
}