Skip to content
Merged
Binary file added Assets/Masks/RingGlow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Masks/RingGlowInner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Masks/RingGlowInnerTwo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Misc/AuroraWater.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 3 additions & 6 deletions Content/Abilities/AbilityHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
}
}

Expand Down
3 changes: 1 addition & 2 deletions Content/Abilities/Hint/HintAbility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions Content/Abilities/InfusionItem.ModItemMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
134 changes: 0 additions & 134 deletions Content/Alchemy/AlchemyIngredient.cs

This file was deleted.

6 changes: 0 additions & 6 deletions Content/Alchemy/AlchemyModifier.cs

This file was deleted.

171 changes: 0 additions & 171 deletions Content/Alchemy/AlchemyRecipe.cs

This file was deleted.

Loading