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

Events all over melee (#16997)

Browse Source
This commit is contained in:
Nemanja
2023-06-07 16:26:45 -04:00
committed by GitHub
parent 937aae14ff
commit 37d3056809
9 changed files with 170 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Weapons/Melee/MeleeWindupOverlay.cs
View File

@@ -104,7 +104,7 @@ public sealed class MeleeWindupOverlay : Overlay
const float endX = 22f;
// Area marking where to release
var releaseWidth = 2f * SharedMeleeWeaponSystem.GracePeriod / (float) comp.WindupTime.TotalSeconds * EyeManager.PixelsPerMeter;
var releaseWidth = 2f * SharedMeleeWeaponSystem.GracePeriod / (float) _melee.GetWindupTime(meleeUid, owner.Value, comp).TotalSeconds * EyeManager.PixelsPerMeter;
const float releaseMiddle = (endX - startX) / 2f + startX;
var releaseBox = new Box2(new Vector2(releaseMiddle - releaseWidth / 2f, 3f) / EyeManager.PixelsPerMeter,
@@ -114,7 +114,7 @@ public sealed class MeleeWindupOverlay : Overlay
handle.DrawRect(releaseBox, Color.LimeGreen);
// Wraps around back to 0
var totalDuration = comp.WindupTime.TotalSeconds * 2;
var totalDuration = _melee.GetWindupTime(meleeUid, owner.Value, comp).TotalSeconds * 2;
var elapsed = (currentTime - comp.WindUpStart.Value).TotalSeconds % (2 * totalDuration);
var value = elapsed / totalDuration;