diff --git a/Items/Weapons/Magic/Coalescence/Coalescence.cs b/Items/Weapons/Magic/Coalescence/Coalescence.cs index 7aa32a3..99ac6cc 100644 --- a/Items/Weapons/Magic/Coalescence/Coalescence.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ItemID.Diamond, 5); - recipe.AddIngredient(ItemID.Emerald, 5); - recipe.AddIngredient(ItemID.Sapphire, 5); - recipe.AddIngredient(ItemID.Ruby, 5); - recipe.AddIngredient(ItemID.Topaz, 5); - recipe.AddIngredient(ItemID.Amethyst, 5); - recipe.AddRecipeGroup("FabusMod:DemoniteBar", 10); - recipe.AddTile(TileID.Books); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.Diamond, 5) + .AddIngredient(ItemID.Emerald, 5) + .AddIngredient(ItemID.Sapphire, 5) + .AddIngredient(ItemID.Ruby, 5) + .AddIngredient(ItemID.Topaz, 5) + .AddIngredient(ItemID.Amethyst, 5) + .AddRecipeGroup("FabusMod:DemoniteBar", 10) + .AddTile(TileID.Books) + .Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs b/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs index b7e9af3..bbc51e1 100644 --- a/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 10); - recipe.AddTile(ModContent.TileType()); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 10) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs b/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs index 655a5c8..458891b 100644 --- a/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 12); - recipe.AddTile(TileID.MythrilAnvil); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 12) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs b/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs index f9332cc..f2adf2f 100644 --- a/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs +++ b/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs @@ -33,10 +33,10 @@ public class HeavensVengeance : ModItem public override void AddRecipes() { - Recipe recipe = CreateRecipe(); - recipe.AddIngredient(ModContent.ItemType(), 1); - recipe.AddIngredient(ItemID.HallowedBar, 14); - recipe.AddTile(TileID.MythrilAnvil); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType(), 1) + .AddIngredient(ItemID.HallowedBar, 14) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/HellfireBeam.cs b/Items/Weapons/Magic/Coalescence/HellfireBeam.cs index 422d8c3..ec56619 100644 --- a/Items/Weapons/Magic/Coalescence/HellfireBeam.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ItemID.HellstoneBar, 16); - recipe.AddTile(TileID.Hellforge); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HellstoneBar, 16) + .AddTile(TileID.Hellforge) + .Register(); } } diff --git a/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs b/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs index d573292..cb593db 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 12); - recipe.AddTile(ModContent.TileType()); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 12) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs b/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs index a271e79..df8e803 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ItemID.FragmentVortex, 12); - recipe.AddTile(TileID.LunarCraftingStation); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.FragmentVortex, 12) + .AddTile(TileID.LunarCraftingStation) + .Register(); } } diff --git a/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs b/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs index bcbd5fc..7d4bbac 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ItemID.Razorpine); - recipe.AddTile(TileID.AdamantiteForge); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.Razorpine) + .AddTile(TileID.AdamantiteForge) + .Register(); } } diff --git a/Items/Weapons/Magic/IllusoryMirror.cs b/Items/Weapons/Magic/IllusoryMirror.cs index fd291ae..3b0c9ff 100644 --- a/Items/Weapons/Magic/IllusoryMirror.cs +++ b/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 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(); - recipe.AddIngredient(ItemID.LifeFruit, 5); - recipe.AddIngredient(ItemID.LifeCrystal, 5); - recipe.AddIngredient(ItemID.FragmentNebula, 14); - recipe.AddTile(TileID.LunarCraftingStation); - recipe.Register(); + CreateRecipe() + .AddIngredient(ItemID.LifeFruit, 5) + .AddIngredient(ItemID.LifeCrystal, 5) + .AddIngredient(ItemID.FragmentNebula, 14) + .AddTile(TileID.LunarCraftingStation) + .Register(); } } diff --git a/Items/Weapons/Magic/SpectralIllusion.cs b/Items/Weapons/Magic/SpectralIllusion.cs index 760878d..d7f0151 100644 --- a/Items/Weapons/Magic/SpectralIllusion.cs +++ b/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 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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 14); - recipe.AddTile(ModContent.TileType()); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 14) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/GoldenStaff.cs b/Items/Weapons/Magic/Staffs/GoldenStaff.cs index 90da4a7..644dffa 100644 --- a/Items/Weapons/Magic/Staffs/GoldenStaff.cs +++ b/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)); - Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; - } + } public override void AddRecipes() { - Recipe recipe = CreateRecipe(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 6); - recipe.AddTile(TileID.MythrilAnvil); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/NatureStaff.cs b/Items/Weapons/Magic/Staffs/NatureStaff.cs index b6474a6..34a6937 100644 --- a/Items/Weapons/Magic/Staffs/NatureStaff.cs +++ b/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)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe recipe = CreateRecipe(); - recipe.AddRecipeGroup("FabusMod:SorcerousHellstaff"); - recipe.AddIngredient(ItemID.HallowedBar, 6); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddTile(TileID.MythrilAnvil); - recipe.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:SorcerousHellstaff") + .AddIngredient(ItemID.HallowedBar, 6) + .AddIngredient(ModContent.ItemType()) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/PiercingStaff.cs b/Items/Weapons/Magic/Staffs/PiercingStaff.cs index 634b984..a02d9e4 100644 --- a/Items/Weapons/Magic/Staffs/PiercingStaff.cs +++ b/Items/Weapons/Magic/Staffs/PiercingStaff.cs @@ -36,10 +36,10 @@ public class PiercingStaff : ModItem public override void AddRecipes() { - Recipe recipe = CreateRecipe(); - recipe.AddIngredient(ItemID.WandofSparking, 1); - recipe.AddRecipeGroup("IronBar", 3); - recipe.AddTile(TileID.Anvils); - recipe.Register(); + CreateRecipe() + .AddIngredient(ItemID.WandofSparking) + .AddRecipeGroup("IronBar", 3) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs b/Items/Weapons/Magic/Staffs/SorcerersHellstaff.cs similarity index 67% rename from Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs rename to Items/Weapons/Magic/Staffs/SorcerersHellstaff.cs index 137b0f0..3c36c86 100644 --- a/Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs +++ b/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(); - recipe1.AddIngredient(ModContent.ItemType()); - recipe1.AddIngredient(ItemID.HellstoneBar, 6); - recipe1.AddIngredient(ItemID.Obsidian, 4); - recipe1.AddTile(TileID.Anvils); - recipe1.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HellstoneBar, 6) + .AddIngredient(ItemID.Obsidian, 4) + .AddTile(TileID.Anvils) + .Register(); - Recipe recipe2 = CreateRecipe(); - recipe2.AddIngredient(ModContent.ItemType()); - recipe2.AddIngredient(ItemID.BlueDye); - recipe2.AddIngredient(ItemID.RedDye); - recipe2.AddTile(TileID.DyeVat); - recipe2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueDye) + .AddIngredient(ItemID.RedDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousHellstaff.png b/Items/Weapons/Magic/Staffs/SorcerersHellstaff.png similarity index 100% rename from Items/Weapons/Magic/Staffs/SorcerousHellstaff.png rename to Items/Weapons/Magic/Staffs/SorcerersHellstaff.png diff --git a/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs b/Items/Weapons/Magic/Staffs/SorcerersHellstaffWhite.cs similarity index 81% rename from Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs rename to Items/Weapons/Magic/Staffs/SorcerersHellstaffWhite.cs index a2e2cd5..6d2728c 100644 --- a/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs +++ b/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(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ItemID.PinkandSilverDye, 1); - recipe.AddTile(TileID.DyeVat); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.PinkandSilverDye, 1) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.png b/Items/Weapons/Magic/Staffs/SorcerersHellstaffWhite.png similarity index 100% rename from Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.png rename to Items/Weapons/Magic/Staffs/SorcerersHellstaffWhite.png diff --git a/Items/Weapons/Magic/Staffs/SorcerousStaff.cs b/Items/Weapons/Magic/Staffs/SorcerersStaff.cs similarity index 79% rename from Items/Weapons/Magic/Staffs/SorcerousStaff.cs rename to Items/Weapons/Magic/Staffs/SorcerersStaff.cs index 3708b1c..1943fcd 100644 --- a/Items/Weapons/Magic/Staffs/SorcerousStaff.cs +++ b/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(); - recipe.AddRecipeGroup("FabusMod:GoldBar", 8); - recipe.AddIngredient(ItemID.Sapphire, 6); - recipe.AddIngredient(ItemID.Emerald, 4); - recipe.AddTile(TileID.Anvils); - recipe.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:GoldBar", 8) + .AddIngredient(ItemID.Sapphire, 6) + .AddIngredient(ItemID.Emerald, 4) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousStaff.png b/Items/Weapons/Magic/Staffs/SorcerersStaff.png similarity index 100% rename from Items/Weapons/Magic/Staffs/SorcerousStaff.png rename to Items/Weapons/Magic/Staffs/SorcerersStaff.png diff --git a/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs b/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs index cb3f618..6deecd5 100644 --- a/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs +++ b/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)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(5f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe recipe = CreateRecipe(); - recipe.AddIngredient(ItemID.FrostCore, 2); - recipe.AddRecipeGroup("FabusMod:AdamantiteBar", 6); - recipe.AddTile(TileID.MythrilAnvil); - recipe.Register(); + CreateRecipe() + .AddIngredient(ItemID.FrostCore, 2) + .AddRecipeGroup("FabusMod:AdamantiteBar", 6) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Magic/Staffs/Tranquility.cs b/Items/Weapons/Magic/Staffs/Tranquility.cs index c18b2b6..9fec075 100644 --- a/Items/Weapons/Magic/Staffs/Tranquility.cs +++ b/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)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI, 0f, 0f); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } public override void AddRecipes() { - Recipe recipe = CreateRecipe(); - recipe.AddIngredient(ModContent.ItemType()); - recipe.AddIngredient(ModContent.ItemType(), 6); - recipe.AddTile(ModContent.TileType()); - recipe.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(ModContent.TileType()) + .Register(); } }