Reorganized ScreenShakeSystem, fixed many shakes being global in MP.

Author: Mirsario

CHANGELOG.md

@@ -42,6 +42,7 @@
 - Fixed blood spawning in place of cloudy dust when Blood & Gore is disabled in vanilla settings.
 - Prevented a seemingly impossible concurrency error in decal code from ever happening. This game has no concurrency, and yet this was reported.
 - Fixed a rare `IndexOutOfRangeException` that could occur when dodgerolling while on a grappling hook.
+- Fixed many screenshakes being global (positionless) in multiplayer.
 
 ### Configuration
 - Added `Melee.EnableSwingVelocity` option.

Common/Camera/ItemUseScreenShake.cs

@@ -14,11 +14,7 @@ public sealed class ItemUseScreenShake : ItemComponent
 		if (Enabled) {
 			var screenShake = ScreenShake;
 
-			if (screenShake.Power > 0f && screenShake.Length > 0f) {
-				screenShake.Position = player.Center;
-
-				ScreenShakeSystem.New(screenShake);
-			}
+			ScreenShakeSystem.New(screenShake, player.Center);
 		}
 
 		return base.UseItem(item, player);

Common/Camera/ScreenShake.cs

@@ -1,6 +1,4 @@
-using System;
-using Microsoft.Xna.Framework;
-using TerrariaOverhaul.Core.Time;
+using Microsoft.Xna.Framework;
 using TerrariaOverhaul.Utilities;
 
 namespace TerrariaOverhaul.Common.Camera;
@@ -9,32 +7,21 @@ public struct ScreenShake
 {
 	public const float DefaultRange = 512f;
 
-	internal float startTime = 0f;
-	internal float endTime = 0f;
-
-	public float Power;
-	public float Length;
-	public float Range;
-	public string? UniqueId;
-	public Vector2? Position;
+	public float Power = 0.5f;
 	public Gradient<float>? PowerGradient;
+	public float LengthInSeconds = 0.5f;
+	public float Range = DefaultRange;
+	public string? UniqueId;
 
-	public float TimeLeft => MathF.Max(0f, endTime - TimeSystem.RenderTime);
-	public float Progress => Length > 0f ? MathHelper.Clamp((TimeSystem.RenderTime - startTime) / Length, 0f, 1f) : 1f;
-
-	public ScreenShake(Gradient<float> powerGradient, float lengthInSeconds, Vector2? position = null, float range = DefaultRange, string? uniqueId = null) : this(0f, lengthInSeconds, position, range, uniqueId)
+	public ScreenShake(Gradient<float> powerGradient, float lengthInSeconds) : this()
 	{
 		PowerGradient = powerGradient;
+		LengthInSeconds = lengthInSeconds;
 	}
 
-	public ScreenShake(float power, float lengthInSeconds, Vector2? position = null, float range = DefaultRange, string? uniqueId = null)
+	public ScreenShake(float power, float lengthInSeconds) : this()
 	{
 		Power = power;
-		Length = lengthInSeconds;
-		Position = position;
-		Range = range;
-		UniqueId = uniqueId;
-
-		PowerGradient = null;
+		LengthInSeconds = lengthInSeconds;
 	}
 }

Common/Camera/ScreenShakeSystem.cs

@@ -14,9 +14,20 @@ namespace TerrariaOverhaul.Common.Camera;
 [Autoload(Side = ModSide.Client)]
 public sealed class ScreenShakeSystem : ModSystem
 {
+	private struct ScreenShakeInstance
+	{
+		public float StartTime;
+		public float EndTime;
+		public Vector2? Position;
+		public ScreenShake Style;
+
+		public float TimeLeft => MathF.Max(0f, EndTime - TimeSystem.RenderTime);
+		public float Progress => Style.LengthInSeconds > 0f ? MathHelper.Clamp((TimeSystem.RenderTime - StartTime) / Style.LengthInSeconds, 0f, 1f) : 1f;
+	}
+
 	public static readonly RangeConfigEntry<float> ScreenShakeStrength = new(ConfigSide.ClientOnly, "Camera", nameof(ScreenShakeStrength), 0f, 1f, () => 1f);
 
-	private static readonly List<ScreenShake> screenShakes = new();
+	private static readonly List<ScreenShakeInstance> screenShakes = new();
 
 	private static FastNoiseLite? noise;
 
@@ -138,21 +149,22 @@ public static float GetPowerAtPoint(Vector2 point)
 
 		float power = 0f;
 
-		foreach (var shake in EnumerateScreenShakes()) {
-			float progress = shake.Progress;
+		foreach (ref var instance in EnumerateScreenShakes()) {
+			ref readonly var style = ref instance.Style;
+			float progress = instance.Progress;
 
 			float intensity;
 
-			if (shake.PowerGradient != null) {
-				intensity = MathHelper.Clamp(shake.PowerGradient.GetValue(progress), 0f, 1f);
+			if (style.PowerGradient != null) {
+				intensity = MathHelper.Clamp(style.PowerGradient.GetValue(progress), 0f, 1f);
 			} else {
-				intensity = MathHelper.Clamp(shake.Power, 0f, 1f);
+				intensity = MathHelper.Clamp(style.Power, 0f, 1f);
 				intensity *= MathF.Pow(1f - progress, 2f);
 			}
 
-			if (shake.Position.HasValue) {
-				float distance = Vector2.Distance(shake.Position.Value, point);
-				float distanceFactor = 1f - Math.Min(1f, distance / shake.Range);
+			if (instance.Position.HasValue) {
+				float distance = Vector2.Distance(instance.Position.Value, point);
+				float distanceFactor = 1f - Math.Min(1f, distance / style.Range);
 
 				intensity *= MathF.Pow(distanceFactor, 2f); // Exponential 
 			}
@@ -164,38 +176,32 @@ public static float GetPowerAtPoint(Vector2 point)
 		return MathHelper.Clamp(power * ScreenShakeStrength.Value, 0f, 1f);
 	}
 
-	public static void New(float power, float time, Vector2? position = null, float range = ScreenShake.DefaultRange, string? uniqueId = null)
-		=> New(new ScreenShake(power, time, position, range, uniqueId));
-
-	public static void New(Gradient<float> powerGradient, float time, Vector2? position = null, float range = ScreenShake.DefaultRange, string? uniqueId = null)
-		=> New(new ScreenShake(powerGradient, time, position, range, uniqueId));
-
-	public static void New(ScreenShake screenShake)
+	public static void New(ScreenShake style, Vector2? position)
 	{
 		if (Main.dedServ) {
 			return;
 		}
 
-		screenShake.Power = Math.Min(screenShake.Power, 1f);
-		//screenShake.Length = MathF.Pow(screenShake.Power * 0.6f, 2f);
-		screenShake.startTime = TimeSystem.RenderTime;
-		screenShake.endTime = screenShake.startTime + screenShake.Length;
+		style.Power = MathUtils.Clamp01(style.Power);
 
-		if (screenShake.UniqueId == null) {
-			screenShakes.Add(screenShake);
-			return;
-		}
+		ScreenShakeInstance instance;
+
+		instance.Style = style;
+		instance.Position = position;
+		instance.StartTime = TimeSystem.RenderTime;
+		instance.EndTime = instance.StartTime + style.LengthInSeconds;
 
-		int index = screenShakes.FindIndex(s => s.UniqueId == screenShake.UniqueId);
+		string? uniqueId = style.UniqueId;
 
-		if (index >= 0) {
-			screenShakes[index] = screenShake;
-		} else {
-			screenShakes.Add(screenShake);
+		if (uniqueId != null && screenShakes.FindIndex(i => i.Style.UniqueId == uniqueId) is (>= 0 and int index)) {
+			screenShakes[index] = instance;
+			return;
 		}
+
+		screenShakes.Add(instance);
 	}
 
-	private static Span<ScreenShake> EnumerateScreenShakes()
+	private static Span<ScreenShakeInstance> EnumerateScreenShakes()
 	{
 		screenShakes.RemoveAll(s => s.TimeLeft <= 0f);
 

Common/Damage/NPCHitScreenShake.cs

@@ -18,14 +18,26 @@ public class NPCHitScreenShake : GlobalNPC
 
 	public override void SetDefaults(NPC npc)
 	{
-		const float BaseShakeRange = 256f * 5;
+		const float BaseShakeRange = 256f * 5f;
 
 		if (npc.boss || NPCID.Sets.ShouldBeCountedAsBoss[npc.type]) {
-			OnHitShake = new(0.25f, 0.30f, range: BaseShakeRange, uniqueId: "BossHit");
-			OnDeathShake = new(1.00f, 1.00f, range: BaseShakeRange * 3f, uniqueId: "BossDeath");
+			OnHitShake = new(0.25f, 0.30f) {
+				Range = BaseShakeRange,
+				UniqueId = "BossHit",
+			};
+			OnDeathShake = new(1.00f, 1.00f) {
+				Range = BaseShakeRange * 3f,
+				UniqueId = "BossDeath",
+			};
 		} else {
-			OnHitShake = new(0.17f, 0.15f, range: BaseShakeRange, uniqueId: "NpcHit");
-			OnDeathShake = new(0.30f, 0.30f, range: BaseShakeRange, uniqueId: "NpcDeath");
+			OnHitShake = new(0.17f, 0.15f) {
+				Range = BaseShakeRange,
+				UniqueId = "NpcHit",
+			};
+			OnDeathShake = new(0.30f, 0.30f) {
+				Range = BaseShakeRange,
+				UniqueId = "NpcDeath",
+			};
 		}
 	}
 
@@ -40,11 +52,10 @@ private void OnHit(NPC npc, int damage, float knockback, bool crit)
 		bool isDead = npc.life <= 0;
 
 		if ((isDead ? OnDeathShake : OnHitShake) is ScreenShake shake) {
-			shake.Position = npc.Center;
 			shake.Power *= MathUtils.Clamp01(damage / 10f);
 			shake.UniqueId ??= isDead ? "CustomNpcDeath" : "CustomNpcHit";
 
-			ScreenShakeSystem.New(shake);
+			ScreenShakeSystem.New(shake, npc.Center);
 		}
 	}
 }

Common/Magic/MagicWeapon.cs

@@ -59,24 +59,26 @@ public override void SetDefaults(Item item)
 			item.UseSound = MagicBlastSound;
 		}
 
+		var chargeScreenShakePowerGradient = new Gradient<float>(
+			(0.0f, 0.0f),
+			(0.25f, 0.025f),
+			(1.0f, 0.2f)
+		);
+
 		item.EnableComponent<ItemPowerAttacks>(c => {
 			c.ChargeLengthMultiplier = 2f;
 			c.CommonStatMultipliers.ProjectileDamageMultiplier = 1.75f;
 			c.CommonStatMultipliers.ProjectileKnockbackMultiplier = 1.5f;
 			c.CommonStatMultipliers.ProjectileSpeedMultiplier = 2f;
 
 			c.OnChargeStart += (item, player, chargeLength) => {
-				if (Main.dedServ) {
+				if (Main.dedServ || !player.IsLocal()) {
 					return;
 				}
 
 				ScreenShakeSystem.New(
-					new Gradient<float>(
-						(0.0f, 0.0f),
-						(0.25f, 0.025f),
-						(1.0f, 0.2f)
-					),
-					chargeLength / TimeSystem.LogicFramerate
+					new ScreenShake(chargeScreenShakePowerGradient, chargeLength * TimeSystem.LogicDeltaTime),
+					null
 				);
 			};
 		});

Common/Melee/_Overhauls/Broadsword.cs

@@ -116,16 +116,15 @@ public override void SetDefaults(Item item)
 	public override void UseAnimation(Item item, Player player)
 	{
 		// Slight screenshake for the swing.
-		if (!Main.dedServ) {
-			float intensity = 0.3f;
-			float time = 0.15f;
+		if (!Main.dedServ && player.IsLocal()) {
+			var screenShake = new ScreenShake(0.30f, 0.15f);
 
 			if (item.TryGetGlobalItem(out ItemPowerAttacks powerAttacks) && powerAttacks.PowerAttack) {
-				intensity = 0.75f;
-				time = 0.25f;
+				screenShake.Power = 0.75f;
+				screenShake.LengthInSeconds = 0.25f;
 			}
 
-			ScreenShakeSystem.New(intensity, time);
+			ScreenShakeSystem.New(screenShake, null);
 		}
 	}
 

Common/ProjectileEffects/ProjectileScreenShake.cs

@@ -15,16 +15,16 @@ public sealed class ProjectileScreenShake : GlobalProjectile
 	public override void SetDefaults(Projectile projectile)
 	{
 		if (OverhaulProjectileTags.Explosive.Has(projectile.type)) {
-			ScreenShake = new ScreenShake(0.8f, 1.0f, range: 2048f);
+			ScreenShake = new ScreenShake(0.8f, 1.0f) {
+				Range = 2048f,
+			};
 		}
 	}
 
 	public override void Kill(Projectile projectile, int timeLeft)
 	{
 		if (ScreenShake is ScreenShake shake) {
-			shake.Position = projectile.Center;
-
-			ScreenShakeSystem.New(shake);
+			ScreenShakeSystem.New(shake, projectile.Center);
 		}
 	}
 }