Merge pull request #828 from ProjectStarlight/shader-test

New aurora water

Author: ScalarVector1

Assets/Masks/RingGlow.png

@@ -16,8 +16,6 @@ public class AbilityHandler : ModPlayer, IOrderedLoadable
 
 		private InfusionItem[] infusions = new InfusionItem[Infusion.InfusionSlots];
 		public Dictionary<Type, Ability> unlockedAbilities = new();
-
-		private float stamina;
 		private float staminaMaxBonus;
 		private int staminaRegenCD;
 
@@ -99,9 +97,9 @@ public float StaminaMaxBonus
 		/// </summary>
 		public float Stamina
 		{
-			get => stamina;
+			get;
 			// Can't have less than 0 or more than max stamina.
-			set => stamina = MathHelper.Clamp(value, 0, StaminaMax);
+			set => field = MathHelper.Clamp(value, 0, StaminaMax);
 		}
 
 		//for some reason without specifically setting these values to zero with cloneNewInstances => false and contructor,
@@ -400,8 +398,7 @@ public override void PreUpdate()
 			// To ensure fusions always have their owner set to a valid Player.
 			for (int i = 0; i < infusions.Length; i++)
 			{
-				if (infusions[i] != null)
-					infusions[i].Item.playerIndexTheItemIsReservedFor = Player.whoAmI;
+				infusions[i]?.Item.playerIndexTheItemIsReservedFor = Player.whoAmI;
 			}
 		}
 

Assets/Masks/RingGlowInner.png

@@ -153,8 +153,7 @@ public override void UpdateActive()
 				int i = Projectile.NewProjectile(Player.GetSource_FromThis(), Main.MouseWorld + Vector2.UnitY * -32, Vector2.Zero, ModContent.ProjectileType<HintText>(), 0, 0, Main.myPlayer);
 				var proj = Main.projectile[i].ModProjectile as HintText;
 
-				if (proj != null)
-					proj.text = hintToDisplay;
+				proj?.text = hintToDisplay;
 			}
 
 			Deactivate();

Assets/Masks/RingGlowInnerTwo.png

@@ -33,8 +33,7 @@ public void Draw(SpriteBatch spriteBatch, Vector2 position, float opacity, float
 
 		public override void UpdateInventory(Player player)
 		{
-			if (ability != null)
-				ability.User = player.GetHandler();
+			ability?.User = player.GetHandler();
 		}
 
 		public override void Update(ref float gravity, ref float maxFallSpeed)