Completely rewrote the DamageIndicator system since the old system wa…

…s flawed. Damage Indicators now work perfectly

Player/Player.cs

@@ -228,15 +228,10 @@ public void ApplyDamage(float Damage, int AttackerId)
 		Health = Clamp(Health - Damage, 0, MaxHealth);
 		// Calculate DamageIndicator angles
 		Player Attacker = Net.Players[AttackerId];
-		// Convert our coordinates, and our attacker's coordinates to 2D to make this easier
+		// Convert the attacker's coordinates to 2D to make this easier
 		// aka remove height
-		Vector2 OurPoint = new Vector2(Game.PossessedPlayer.Translation.x, Game.PossessedPlayer.Translation.z);
 		Vector2 AttackerPoint = new Vector2(Attacker.Translation.x, Attacker.Translation.z);
-		// Get Angle from us to them
-		// which is also the angle we've been shot from
-		float AngleRads = OurPoint.AngleToPoint(AttackerPoint);
-		// Tell the Angle to the HUD
-		HUDInstance.ShowDamageIndicator(Rad2Deg(AngleRads)); // Convert to degrees
+		HUDInstance.ShowDamageIndicator(AttackerPoint); // Convert to degrees
 	}
 
 

UI/DamageIndicator.cs

@@ -4,9 +4,8 @@
 public class DamageIndicator : TextureRect
 {
     // Angle the bullet came from
-    float Angle = 90;
-    // Starting rotation of the character
-    float OriginalRotation;
+    Vector2 ShotFirePosition;
+    float OriginalAngle;
     public override void _Ready()
     {
         // Start transparency Tween in _Ready so we know the Tween has been created
@@ -17,20 +16,23 @@ public override void _Ready()
     }
 
 
-    public void SetTargetAngle(float Angle)
+    public void SetTargetAngle(Vector2 ShotFirePosition)
     {
-        this.Angle = Angle;
         // The rotation we're looking at is the Y rotation
-        OriginalRotation = Game.PossessedPlayer.RotationDegrees.y;
+        this.ShotFirePosition = ShotFirePosition;
+        // Original angle
+        OriginalAngle = Game.PossessedPlayer.Rotation.y;
     }
 
 
     // Called every frame. 'delta' is the elapsed time since the previous frame.
     public override void _Process(float delta)
     {
         // Calculate rotation
-        // TextureRect rotation is always in degrees, so we must work in degrees :)
-        RectRotation = Angle- (Game.PossessedPlayer.RotationDegrees.y);
+        // Calculate our position on a 2D plane
+        Vector2 OurPoint = new Vector2(Game.PossessedPlayer.Translation.x, Game.PossessedPlayer.Translation.z);
+        // Get our rotation by getting the angle from where we we're shot from, and adding where we we're looking before
+        RectRotation = Mathf.Rad2Deg(OurPoint.AngleToPoint(ShotFirePosition)+OriginalAngle);
     }
 
 

UI/HUD.cs

@@ -161,10 +161,10 @@ public void RemoveNickLabel(int Id)
 	}
 
 
-	public void ShowDamageIndicator(float HitAngleDegrees) {
+	public void ShowDamageIndicator(Vector2 ShotFirePosition) {
 		// Angle must be in degrees for the DamageIndicator
 		DamageIndicator Indicator = DamageIndicatorScene.Instance() as DamageIndicator;
-		Indicator.SetTargetAngle(HitAngleDegrees);
+		Indicator.SetTargetAngle(ShotFirePosition);
 		// Add it to its container
 		DamageIndicatorContainer.AddChild(Indicator);
 	}