Cleaned up recipe code for all magic weapons. Renamed certain staffs to match in-game name.

Items/Weapons/Magic/Coalescence/Coalescence.cs

@@ -8,7 +8,6 @@ public class Coalescence : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Coalescence");
 		Tooltip.SetDefault("Enemies are invulnerable for 8 frames after getting hit \nBeam your foes out of existence with a powerful laser beam!");
 	}
 
@@ -33,16 +32,16 @@ public class Coalescence : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.OminousBook>());
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.OminousBook>())
-		recipe.AddIngredient(ItemID.Diamond, 5);
+			.AddIngredient(ItemID.Diamond, 5)
-		recipe.AddIngredient(ItemID.Emerald, 5);
+			.AddIngredient(ItemID.Emerald, 5)
-		recipe.AddIngredient(ItemID.Sapphire, 5);
+			.AddIngredient(ItemID.Sapphire, 5)
-		recipe.AddIngredient(ItemID.Ruby, 5);
+			.AddIngredient(ItemID.Ruby, 5)
-		recipe.AddIngredient(ItemID.Topaz, 5);
+			.AddIngredient(ItemID.Topaz, 5)
-		recipe.AddIngredient(ItemID.Amethyst, 5);
+			.AddIngredient(ItemID.Amethyst, 5)
-		recipe.AddRecipeGroup("FabusMod:DemoniteBar", 10);
+			.AddRecipeGroup("FabusMod:DemoniteBar", 10)
-		recipe.AddTile(TileID.Books);
+			.AddTile(TileID.Books)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs

@@ -8,7 +8,6 @@ public class DelightfulDevastation : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Delightful Devastation");
 		Tooltip.SetDefault("Enemies are invulnerable for 3 frames after getting hit \nVaporize your foes out of existence with the power of rainbows! \nInflicts the [c/AB2C2C:R][c/F3821B:a][c/E6AF31:i][c/63B465:n][c/82E8E8:b][c/9EF3EF:o][c/2BA0B5:w][c/734679:'s ][c/AB2C2C:W][c/F3821B:r][c/E6AF31:a][c/63B465:t][c/82E8E8:h] debuff for 2 seconds, and the [c/DAD45E:Midas] debuff for 3 seconds on hit\n[c/AB2C2C:R][c/F3821B:a][c/E6AF31:i][c/63B465:n][c/82E8E8:b][c/9EF3EF:o][c/2BA0B5:w][c/734679:'s ][c/AB2C2C:W][c/F3821B:r][c/E6AF31:a][c/63B465:t][c/82E8E8:h] causes enemies to lose life rapidly \n[c/DAD45E:Midas] causes enemies to drop more money on death ");
 	}
 
@@ -33,10 +32,10 @@ public class DelightfulDevastation : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<GoldenVengeance>());
+			.AddIngredient(ModContent.ItemType<GoldenVengeance>())
-		recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 10);
+			.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 10)
-		recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
+			.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Coalescence/GoldenVengeance.cs

@@ -8,7 +8,6 @@ public class GoldenVengeance : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Golden Vengeance");
 		Tooltip.SetDefault("Enemies are invulnerable for 4 frames after getting hit \nPurify your foes out of existence with a powerful laser beam! \nInflicts the [c/FFFB62:Holy Smite] debuff for 4 seconds, and the [c/DAD45E:Midas] debuff for 3 seconds on hit\n[c/FFFB62:Holy Smite] causes enemies to lose life quickly \n[c/DAD45E:Midas] causes enemies to drop more money on death");
 	}
 
@@ -33,10 +32,10 @@ public class GoldenVengeance : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<HeavensVengeance>());
+			.AddIngredient(ModContent.ItemType<HeavensVengeance>())
-		recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12);
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 12)
-		recipe.AddTile(TileID.MythrilAnvil);
+			.AddTile(TileID.MythrilAnvil)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Coalescence/HeavensVengeance.cs

@@ -33,10 +33,10 @@ public class HeavensVengeance : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<HellfireBeam>(), 1);
+			.AddIngredient(ModContent.ItemType<HellfireBeam>(), 1)
-		recipe.AddIngredient(ItemID.HallowedBar, 14);
+			.AddIngredient(ItemID.HallowedBar, 14)
-		recipe.AddTile(TileID.MythrilAnvil);
+			.AddTile(TileID.MythrilAnvil)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Coalescence/HellfireBeam.cs

@@ -8,7 +8,6 @@ public class HellfireBeam : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Hellfire Beam");
 		Tooltip.SetDefault("Enemies are invulnerable for 5 frames after getting hit \nBurn your foes out of existence with a powerful laser beam! \nInflicts the [c/DA0205:On Fire!] debuff for 2 seconds on hit");
 	}
 
@@ -33,10 +32,10 @@ public class HellfireBeam : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<Coalescence>());
+			.AddIngredient(ModContent.ItemType<Coalescence>())
-		recipe.AddIngredient(ItemID.HellstoneBar, 16);
+			.AddIngredient(ItemID.HellstoneBar, 16)
-		recipe.AddTile(TileID.Hellforge);
+			.AddTile(TileID.Hellforge)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/FusionNeedlers/FusedWish.cs

@@ -9,7 +9,6 @@ public class FusedWish : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Fused Wish");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots] \nShoots homing rainbow needles\n[c/FF0000:Watch your mana!]");
 	}
 
@@ -40,10 +39,10 @@ public class FusedWish : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<FusedXmas>());
+			.AddIngredient(ModContent.ItemType<FusedXmas>())
-		recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 12);
+			.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 12)
-		recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
+			.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs

@@ -9,7 +9,6 @@ public class FusedXmas : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Fused Xmas");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots]\n[c/FF0000:Watch your mana!]");
 	}
 
@@ -40,10 +39,10 @@ public class FusedXmas : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<FusionNeedler>());
+			.AddIngredient(ModContent.ItemType<FusionNeedler>())
-		recipe.AddIngredient(ItemID.FragmentVortex, 12);
+			.AddIngredient(ItemID.FragmentVortex, 12)
-		recipe.AddTile(TileID.LunarCraftingStation);
+			.AddTile(TileID.LunarCraftingStation)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs

@@ -9,7 +9,6 @@ public class FusionNeedler : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Fusion Needler");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots]\n[c/FF0000:Watch your mana!]");
 	}
 
@@ -40,10 +39,10 @@ public class FusionNeedler : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<Ranged.FusionDrivers.FusionDriver>());
+			.AddIngredient(ModContent.ItemType<Ranged.FusionDrivers.FusionDriver>())
-		recipe.AddIngredient(ItemID.Razorpine);
+			.AddIngredient(ItemID.Razorpine)
-		recipe.AddTile(TileID.AdamantiteForge);
+			.AddTile(TileID.AdamantiteForge)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/IllusoryMirror.cs

@@ -9,7 +9,6 @@ public class IllusoryMirror : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Illusory Mirror");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots]\nShoots 5 instant beams in quick succession\nUsing <right> uses 50 Mana to summon a [c/E6A6CF:Blossom] at the player's position for 20 seconds:\n - Being around the [c/E6A6CF:Blossom] buffs HP regeneration, increases attack speed, and increases magic damage by 15%\n - [c/E6A6CF:Blossom] has a cooldown of [c/CA4646:50 seconds] once it disappears\nBest used on 'High' video quality!");
 	}
 
@@ -83,11 +82,11 @@ public class IllusoryMirror : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ItemID.LifeFruit, 5);
+			.AddIngredient(ItemID.LifeFruit, 5)
-		recipe.AddIngredient(ItemID.LifeCrystal, 5);
+			.AddIngredient(ItemID.LifeCrystal, 5)
-		recipe.AddIngredient(ItemID.FragmentNebula, 14);
+			.AddIngredient(ItemID.FragmentNebula, 14)
-		recipe.AddTile(TileID.LunarCraftingStation);
+			.AddTile(TileID.LunarCraftingStation)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/SpectralIllusion.cs

@@ -9,7 +9,6 @@ public class SpectralIllusion : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Spectral Illusion");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots]\nShoots 6 instant beams in quick succession\nUsing <right> uses 50 Mana to summon a [c/82E8E8:Spectral Blossom] at the player's position for 20 seconds:\n - Being around the [c/82E8E8:Spectral Blossom] buffs HP regeneration, increases attack speed, and increases magic damage by 18%\n - Being around the [c/82E8E8:Spectral Blossom] also increases invincibility time after being hit, and has a cooldown of [c/BF5E3B:50 seconds] once it disappears\nBest used on 'High' video quality!");
 	}
 
@@ -86,10 +85,10 @@ public class SpectralIllusion : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<IllusoryMirror>());
+			.AddIngredient(ModContent.ItemType<IllusoryMirror>())
-		recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 14);
+			.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 14)
-		recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
+			.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/GoldenStaff.cs

@@ -10,9 +10,8 @@ public class GoldenStaff : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Golden Staff");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots] \nShoots four oval-shaped magic projectiles twice in quick succession \nHas a high critical hit chance");
-		Item.staff[Item.type] = true;
+		Item.staff[Type] = true;
 	}
 
 	public override void SetDefaults()
@@ -38,23 +37,23 @@ public class GoldenStaff : ModItem
 		Item.shootSpeed = 40f;
 	}
 
-    public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
+	public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
-    {
+	{
 		int numberProjectiles = 4;
 		for (int i = 0; i < numberProjectiles; i++)
 		{
-			Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
+			Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
-			Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback);
+			Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
 		}
 		return false;
-    }
+	}
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<NatureStaff>());
+			.AddIngredient(ModContent.ItemType<NatureStaff>())
-		recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 6);
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.GoddessGold>(), 6)
-		recipe.AddTile(TileID.MythrilAnvil);
+			.AddTile(TileID.MythrilAnvil)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/NatureStaff.cs

@@ -10,7 +10,6 @@ public class NatureStaff : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Nature Staff");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots] \nShoots three oval-shaped magic projectiles twice in quick succession \nHas a 25% chance of inflicting the [c/0E3517:Poisoned] debuff for 3 seconds \nHas a high critical hit chance");
 		Item.staff[Item.type] = true;
 	}
@@ -38,24 +37,24 @@ public class NatureStaff : ModItem
 		Item.shootSpeed = 40f;
 	}
 
-    public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
+	public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback)
-    {
+	{
 		int numberProjectiles = 3;
 		for (int i = 0; i < numberProjectiles; i++)
 		{
-			Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
+			Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
-			Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f);
+			Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
 		}
 		return false;
 	}
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddRecipeGroup("FabusMod:SorcerousHellstaff");
+			.AddRecipeGroup("FabusMod:SorcerousHellstaff")
-		recipe.AddIngredient(ItemID.HallowedBar, 6);
+			.AddIngredient(ItemID.HallowedBar, 6)
-		recipe.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.NatureToken>());
+			.AddIngredient(ModContent.ItemType<Items.CraftingIngredients.NatureToken>())
-		recipe.AddTile(TileID.MythrilAnvil);
+			.AddTile(TileID.MythrilAnvil)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/PiercingStaff.cs

@@ -36,10 +36,10 @@ public class PiercingStaff : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ItemID.WandofSparking, 1);
+			.AddIngredient(ItemID.WandofSparking)
-		recipe.AddRecipeGroup("IronBar", 3);
+			.AddRecipeGroup("IronBar", 3)
-		recipe.AddTile(TileID.Anvils);
+			.AddTile(TileID.Anvils)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/SorcerersHellstaff.cs

@@ -4,7 +4,7 @@ using Terraria.ModLoader;
 
 namespace FabusMod.Items.Weapons.Magic.Staffs;
 
-public class SorcerousHellstaff : ModItem
+public class SorcerersHellstaff : ModItem
 {
 	public override void SetStaticDefaults()
 	{
@@ -38,18 +38,18 @@ public class SorcerousHellstaff : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe1 = CreateRecipe();
+		CreateRecipe()
-		recipe1.AddIngredient(ModContent.ItemType<SorcerousStaff>());
+			.AddIngredient(ModContent.ItemType<SorcerersStaff>())
-		recipe1.AddIngredient(ItemID.HellstoneBar, 6);
+			.AddIngredient(ItemID.HellstoneBar, 6)
-		recipe1.AddIngredient(ItemID.Obsidian, 4);
+			.AddIngredient(ItemID.Obsidian, 4)
-		recipe1.AddTile(TileID.Anvils);
+			.AddTile(TileID.Anvils)
-		recipe1.Register();
+			.Register();
 
-		Recipe recipe2 = CreateRecipe();
+		CreateRecipe()
-		recipe2.AddIngredient(ModContent.ItemType<SorcerousHellstaffWhite>());
+			.AddIngredient(ModContent.ItemType<SorcerersHellstaffWhite>())
-		recipe2.AddIngredient(ItemID.BlueDye);
+			.AddIngredient(ItemID.BlueDye)
-		recipe2.AddIngredient(ItemID.RedDye);
+			.AddIngredient(ItemID.RedDye)
-		recipe2.AddTile(TileID.DyeVat);
+			.AddTile(TileID.DyeVat)
-		recipe2.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/SorcerersHellstaffWhite.cs

@@ -4,7 +4,7 @@ using Terraria.ModLoader;
 
 namespace FabusMod.Items.Weapons.Magic.Staffs;
 
-public class SorcerousHellstaffWhite : ModItem
+public class SorcerersHellstaffWhite : ModItem
 {
 	public override void SetStaticDefaults()
 	{
@@ -38,10 +38,10 @@ public class SorcerousHellstaffWhite : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<SorcerousHellstaff>());
+			.AddIngredient(ModContent.ItemType<SorcerersHellstaff>())
-		recipe.AddIngredient(ItemID.PinkandSilverDye, 1);
+			.AddIngredient(ItemID.PinkandSilverDye, 1)
-		recipe.AddTile(TileID.DyeVat);
+			.AddTile(TileID.DyeVat)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/SorcerersStaff.cs

@@ -4,7 +4,7 @@ using Terraria.ModLoader;
 
 namespace FabusMod.Items.Weapons.Magic.Staffs;
 
-public class SorcerousStaff : ModItem
+public class SorcerersStaff : ModItem
 {
 	public override void SetStaticDefaults()
 	{
@@ -38,11 +38,11 @@ public class SorcerousStaff : ModItem
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddRecipeGroup("FabusMod:GoldBar", 8);
+			.AddRecipeGroup("FabusMod:GoldBar", 8)
-		recipe.AddIngredient(ItemID.Sapphire, 6);
+			.AddIngredient(ItemID.Sapphire, 6)
-		recipe.AddIngredient(ItemID.Emerald, 4);
+			.AddIngredient(ItemID.Emerald, 4)
-		recipe.AddTile(TileID.Anvils);
+			.AddTile(TileID.Anvils)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs

@@ -41,18 +41,18 @@ public class TheWhisperingIceDonator : ModItem
 		int numberProjectiles = 3;
 		for (int i = 0; i < numberProjectiles; i++)
 		{
-			Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(5f));
+			Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(5f));
-			Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f);
+			Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
 		}
 		return false;
 	}
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ItemID.FrostCore, 2);
+			.AddIngredient(ItemID.FrostCore, 2)
-		recipe.AddRecipeGroup("FabusMod:AdamantiteBar", 6);
+			.AddRecipeGroup("FabusMod:AdamantiteBar", 6)
-		recipe.AddTile(TileID.MythrilAnvil);
+			.AddTile(TileID.MythrilAnvil)
-		recipe.Register();
+			.Register();
 	}
 }

Items/Weapons/Magic/Staffs/Tranquility.cs

@@ -10,7 +10,6 @@ public class Tranquility : ModItem
 {
 	public override void SetStaticDefaults()
 	{
-		DisplayName.SetDefault("Tranquility");
 		Tooltip.SetDefault("[c/B6FF00:Autoshoots] \nShoots six oval-shaped rainbow projectiles three times in quick succession \nHas a high critical hit chance");
 		Item.staff[Item.type] = true;
 	}
@@ -43,18 +42,18 @@ public class Tranquility : ModItem
 		int numberProjectiles = 6;
 		for (int i = 0; i < numberProjectiles; i++)
 		{
-			Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(10f));
+			Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f));
-			Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f);
+			Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI);
 		}
 		return false;
 	}
 
 	public override void AddRecipes()
 	{
-		Recipe recipe = CreateRecipe();
+		CreateRecipe()
-		recipe.AddIngredient(ModContent.ItemType<GoldenStaff>());
+			.AddIngredient(ModContent.ItemType<GoldenStaff>())
-		recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 6);
+			.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 6)
-		recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
+			.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>())
-		recipe.Register();
+			.Register();
 	}
 }