Status effect refactor (#4868)

* Oops! All Changes In One Commit

* try desperately to fix prediction issues and fail

* oops

* test

* actually fixes prediction issues

* port jittering to status effect

* default merge behavior + alert cooldown stuff

* silly test issue

* zabloing

* address reviews
This commit is contained in:
mirrorcult
2021-10-15 14:45:04 -07:00
committed by GitHub
parent 51578304f1
commit ae1ce0b31c
36 changed files with 811 additions and 511 deletions

View File

@@ -14,9 +14,6 @@ namespace Content.Shared.Jittering
{
public override string Name => "Jittering";
[ViewVariables(VVAccess.ReadWrite)]
public TimeSpan EndTime { get; set; }
[ViewVariables(VVAccess.ReadWrite)]
public float Amplitude { get; set; }
@@ -30,13 +27,11 @@ namespace Content.Shared.Jittering
[Serializable, NetSerializable]
public class JitteringComponentState : ComponentState
{
public TimeSpan EndTime { get; }
public float Amplitude { get; }
public float Frequency { get; }
public JitteringComponentState(TimeSpan endTime, float amplitude, float frequency)
public JitteringComponentState(float amplitude, float frequency)
{
EndTime = endTime;
Amplitude = amplitude;
Frequency = frequency;
}