diff --git a/Items/Weapons/Magic/Coalescence/Coalescence.cs b/Items/Weapons/Magic/Coalescence/Coalescence.cs index 780fc49..7aa32a3 100644 --- a/Items/Weapons/Magic/Coalescence/Coalescence.cs +++ b/Items/Weapons/Magic/Coalescence/Coalescence.cs @@ -15,6 +15,7 @@ public class Coalescence : ModItem public override void SetDefaults() { Item.damage = 6; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.channel = true; Item.mana = 5; @@ -32,16 +33,16 @@ public class Coalescence : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.Diamond, 5); - val.AddIngredient(ItemID.Emerald, 5); - val.AddIngredient(ItemID.Sapphire, 5); - val.AddIngredient(ItemID.Ruby, 5); - val.AddIngredient(ItemID.Topaz, 5); - val.AddIngredient(ItemID.Amethyst, 5); - val.AddRecipeGroup("FabusMod:DemoniteBar", 10); - val.AddTile(TileID.Books); - val.Register(); + 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(); } } diff --git a/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs b/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs index b01f010..b7e9af3 100644 --- a/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs +++ b/Items/Weapons/Magic/Coalescence/DelightfulDevastation.cs @@ -15,6 +15,7 @@ public class DelightfulDevastation : ModItem public override void SetDefaults() { Item.damage = 160; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.channel = true; Item.mana = 15; @@ -32,10 +33,10 @@ public class DelightfulDevastation : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 10); - val.AddTile(ModContent.TileType()); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 10); + recipe.AddTile(ModContent.TileType()); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs b/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs index 90773b0..655a5c8 100644 --- a/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs +++ b/Items/Weapons/Magic/Coalescence/GoldenVengeance.cs @@ -15,6 +15,7 @@ public class GoldenVengeance : ModItem public override void SetDefaults() { Item.damage = 48; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.channel = true; Item.mana = 10; @@ -32,10 +33,10 @@ public class GoldenVengeance : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 12); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 12); + recipe.AddTile(TileID.MythrilAnvil); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs b/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs index 087b850..f9332cc 100644 --- a/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs +++ b/Items/Weapons/Magic/Coalescence/HeavensVengeance.cs @@ -15,6 +15,7 @@ public class HeavensVengeance : ModItem public override void SetDefaults() { Item.damage = 28; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.channel = true; Item.mana = 8; @@ -32,10 +33,10 @@ public class HeavensVengeance : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType(), 1); - val.AddIngredient(ItemID.HallowedBar, 14); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType(), 1); + recipe.AddIngredient(ItemID.HallowedBar, 14); + recipe.AddTile(TileID.MythrilAnvil); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Coalescence/HellfireBeam.cs b/Items/Weapons/Magic/Coalescence/HellfireBeam.cs index f97f279..422d8c3 100644 --- a/Items/Weapons/Magic/Coalescence/HellfireBeam.cs +++ b/Items/Weapons/Magic/Coalescence/HellfireBeam.cs @@ -15,6 +15,7 @@ public class HellfireBeam : ModItem public override void SetDefaults() { Item.damage = 17; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.channel = true; Item.mana = 7; @@ -32,10 +33,10 @@ public class HellfireBeam : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HellstoneBar, 16); - val.AddTile(TileID.Hellforge); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ItemID.HellstoneBar, 16); + recipe.AddTile(TileID.Hellforge); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs b/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs index 51185b1..d573292 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs +++ b/Items/Weapons/Magic/FusionNeedlers/FusedWish.cs @@ -16,6 +16,7 @@ public class FusedWish : ModItem public override void SetDefaults() { Item.damage = 160; + Item.DamageType = DamageClass.Magic; Item.mana = 3; Item.width = 80; Item.height = 54; @@ -39,10 +40,10 @@ public class FusedWish : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 12); - val.AddTile(ModContent.TileType()); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 12); + recipe.AddTile(ModContent.TileType()); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs b/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs index e4539fa..a271e79 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs +++ b/Items/Weapons/Magic/FusionNeedlers/FusedXmas.cs @@ -16,6 +16,7 @@ public class FusedXmas : ModItem public override void SetDefaults() { Item.damage = 140; + Item.DamageType = DamageClass.Magic; Item.mana = 3; Item.width = 80; Item.height = 52; @@ -34,16 +35,15 @@ public class FusedXmas : ModItem public override Vector2? HoldoutOffset() { - //IL_000a: Unknown result type (might be due to invalid IL or missing references) return new Vector2(-2f, 2f); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.FragmentVortex, 12); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ItemID.FragmentVortex, 12); + recipe.AddTile(TileID.LunarCraftingStation); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs b/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs index dbd74a6..bcbd5fc 100644 --- a/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs +++ b/Items/Weapons/Magic/FusionNeedlers/FusionNeedler.cs @@ -16,6 +16,7 @@ public class FusionNeedler : ModItem public override void SetDefaults() { Item.damage = 120; + Item.DamageType = DamageClass.Magic; Item.mana = 3; Item.width = 76; Item.height = 44; @@ -39,10 +40,10 @@ public class FusionNeedler : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.Razorpine); - val.AddTile(TileID.AdamantiteForge); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ItemID.Razorpine); + recipe.AddTile(TileID.AdamantiteForge); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/IllusoryMirror.cs b/Items/Weapons/Magic/IllusoryMirror.cs index 6bfd219..fd291ae 100644 --- a/Items/Weapons/Magic/IllusoryMirror.cs +++ b/Items/Weapons/Magic/IllusoryMirror.cs @@ -17,8 +17,8 @@ public class IllusoryMirror : ModItem { Item.CloneDefaults(ItemID.ShadowbeamStaff); Item.damage = 175; - Item.noMelee = true; Item.DamageType = DamageClass.Magic; + Item.noMelee = true; Item.mana = 7; Item.width = 29; Item.height = 21; diff --git a/Items/Weapons/Magic/SpectralIllusion.cs b/Items/Weapons/Magic/SpectralIllusion.cs index ec957cf..760878d 100644 --- a/Items/Weapons/Magic/SpectralIllusion.cs +++ b/Items/Weapons/Magic/SpectralIllusion.cs @@ -17,6 +17,7 @@ public class SpectralIllusion : ModItem { Item.CloneDefaults(ItemID.ShadowbeamStaff); Item.damage = 325; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 6; Item.width = 33; diff --git a/Items/Weapons/Magic/Staffs/GoldenStaff.cs b/Items/Weapons/Magic/Staffs/GoldenStaff.cs index d1035a0..90da4a7 100644 --- a/Items/Weapons/Magic/Staffs/GoldenStaff.cs +++ b/Items/Weapons/Magic/Staffs/GoldenStaff.cs @@ -18,6 +18,7 @@ public class GoldenStaff : ModItem public override void SetDefaults() { Item.damage = 46; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 6; Item.crit = 52; @@ -50,10 +51,10 @@ public class GoldenStaff : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 6); + recipe.AddTile(TileID.MythrilAnvil); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/NatureStaff.cs b/Items/Weapons/Magic/Staffs/NatureStaff.cs index 8aaab8b..b6474a6 100644 --- a/Items/Weapons/Magic/Staffs/NatureStaff.cs +++ b/Items/Weapons/Magic/Staffs/NatureStaff.cs @@ -18,6 +18,7 @@ public class NatureStaff : ModItem public override void SetDefaults() { Item.damage = 36; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 6; Item.crit = 42; @@ -50,11 +51,11 @@ public class NatureStaff : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:SorcerousHellstaff"); - val.AddIngredient(ItemID.HallowedBar, 6); - val.AddIngredient(ModContent.ItemType()); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddRecipeGroup("FabusMod:SorcerousHellstaff"); + recipe.AddIngredient(ItemID.HallowedBar, 6); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddTile(TileID.MythrilAnvil); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/PiercingStaff.cs b/Items/Weapons/Magic/Staffs/PiercingStaff.cs index 574ce02..634b984 100644 --- a/Items/Weapons/Magic/Staffs/PiercingStaff.cs +++ b/Items/Weapons/Magic/Staffs/PiercingStaff.cs @@ -16,6 +16,7 @@ public class PiercingStaff : ModItem public override void SetDefaults() { Item.damage = 16; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 3; Item.width = 40; @@ -35,10 +36,10 @@ public class PiercingStaff : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.WandofSparking, 1); - val.AddRecipeGroup("IronBar", 3); - val.AddTile(TileID.Anvils); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ItemID.WandofSparking, 1); + recipe.AddRecipeGroup("IronBar", 3); + recipe.AddTile(TileID.Anvils); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs b/Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs index 3d0f113..137b0f0 100644 --- a/Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs +++ b/Items/Weapons/Magic/Staffs/SorcerousHellstaff.cs @@ -16,6 +16,7 @@ public class SorcerousHellstaff : ModItem public override void SetDefaults() { Item.damage = 26; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 6; Item.crit = 32; @@ -37,18 +38,18 @@ public class SorcerousHellstaff : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HellstoneBar, 6); - val.AddIngredient(ItemID.Obsidian, 4); - val.AddTile(TileID.Anvils); - val.Register(); + Recipe recipe1 = CreateRecipe(); + recipe1.AddIngredient(ModContent.ItemType()); + recipe1.AddIngredient(ItemID.HellstoneBar, 6); + recipe1.AddIngredient(ItemID.Obsidian, 4); + recipe1.AddTile(TileID.Anvils); + recipe1.Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.BlueDye); - val2.AddIngredient(ItemID.RedDye); - val2.AddTile(TileID.DyeVat); - val2.Register(); + Recipe recipe2 = CreateRecipe(); + recipe2.AddIngredient(ModContent.ItemType()); + recipe2.AddIngredient(ItemID.BlueDye); + recipe2.AddIngredient(ItemID.RedDye); + recipe2.AddTile(TileID.DyeVat); + recipe2.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs b/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs index 2f5946f..a2e2cd5 100644 --- a/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs +++ b/Items/Weapons/Magic/Staffs/SorcerousHellstaffWhite.cs @@ -16,6 +16,7 @@ public class SorcerousHellstaffWhite : ModItem public override void SetDefaults() { Item.damage = 26; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 6; Item.crit = 32; @@ -37,10 +38,10 @@ public class SorcerousHellstaffWhite : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.PinkandSilverDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ItemID.PinkandSilverDye, 1); + recipe.AddTile(TileID.DyeVat); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/SorcerousStaff.cs b/Items/Weapons/Magic/Staffs/SorcerousStaff.cs index 11de168..3708b1c 100644 --- a/Items/Weapons/Magic/Staffs/SorcerousStaff.cs +++ b/Items/Weapons/Magic/Staffs/SorcerousStaff.cs @@ -16,6 +16,7 @@ public class SorcerousStaff : ModItem public override void SetDefaults() { Item.damage = 13; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 6; Item.crit = 26; @@ -37,11 +38,11 @@ public class SorcerousStaff : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:GoldBar", 8); - val.AddIngredient(ItemID.Sapphire, 6); - val.AddIngredient(ItemID.Emerald, 4); - val.AddTile(TileID.Anvils); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddRecipeGroup("FabusMod:GoldBar", 8); + recipe.AddIngredient(ItemID.Sapphire, 6); + recipe.AddIngredient(ItemID.Emerald, 4); + recipe.AddTile(TileID.Anvils); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs b/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs index a01447f..cb3f618 100644 --- a/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs +++ b/Items/Weapons/Magic/Staffs/TheWhisperingIceDonator.cs @@ -18,6 +18,7 @@ public class TheWhisperingIceDonator : ModItem public override void SetDefaults() { Item.damage = 70; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 8; Item.width = 54; @@ -48,10 +49,10 @@ public class TheWhisperingIceDonator : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.FrostCore, 2); - val.AddRecipeGroup("FabusMod:AdamantiteBar", 6); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ItemID.FrostCore, 2); + recipe.AddRecipeGroup("FabusMod:AdamantiteBar", 6); + recipe.AddTile(TileID.MythrilAnvil); + recipe.Register(); } } diff --git a/Items/Weapons/Magic/Staffs/Tranquility.cs b/Items/Weapons/Magic/Staffs/Tranquility.cs index 15296f7..c18b2b6 100644 --- a/Items/Weapons/Magic/Staffs/Tranquility.cs +++ b/Items/Weapons/Magic/Staffs/Tranquility.cs @@ -18,6 +18,7 @@ public class Tranquility : ModItem public override void SetDefaults() { Item.damage = 58; + Item.DamageType = DamageClass.Magic; Item.noMelee = true; Item.mana = 7; Item.crit = 52; @@ -50,10 +51,10 @@ public class Tranquility : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(ModContent.TileType()); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 6); + recipe.AddTile(ModContent.TileType()); + recipe.Register(); } }