diff --git a/Items/Weapons/Ranged/Bows/LunarBow.cs b/Items/Weapons/Ranged/Bows/LunarBow.cs index 1fbc049..346128c 100644 --- a/Items/Weapons/Ranged/Bows/LunarBow.cs +++ b/Items/Weapons/Ranged/Bows/LunarBow.cs @@ -18,6 +18,7 @@ public class LunarBow : ModItem public override void SetDefaults() { Item.damage = 240; + Item.DamageType = DamageClass.Ranged; Item.width = 27; Item.height = 69; Item.useTime = 9; @@ -33,8 +34,8 @@ public class LunarBow : ModItem Item.shoot = ModContent.ProjectileType(); } - 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) + { if (player.altFunctionUse == 2) { if (!player.HasBuff(ModContent.BuffType()) && player.statLife < player.statLifeMax2) @@ -62,11 +63,11 @@ public class LunarBow : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.LifeFruit, 5); - val.AddIngredient(ItemID.LifeCrystal, 5); - val.AddIngredient(ItemID.FragmentVortex, 14); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + CreateRecipe() + .AddIngredient(ItemID.LifeFruit, 5) + .AddIngredient(ItemID.LifeCrystal, 5) + .AddIngredient(ItemID.FragmentVortex, 14) + .AddTile(TileID.LunarCraftingStation) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/LunarRainBow.cs b/Items/Weapons/Ranged/Bows/LunarRainBow.cs index 6bf11df..fcb26aa 100644 --- a/Items/Weapons/Ranged/Bows/LunarRainBow.cs +++ b/Items/Weapons/Ranged/Bows/LunarRainBow.cs @@ -18,6 +18,7 @@ public class LunarRainBow : ModItem public override void SetDefaults() { Item.damage = 320; + Item.DamageType = DamageClass.Ranged; Item.width = 27; Item.height = 69; Item.useTime = 7; @@ -33,8 +34,8 @@ public class LunarRainBow : ModItem Item.shoot = ModContent.ProjectileType(); } - 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) + { if (player.altFunctionUse == 2) { if (!player.HasBuff(ModContent.BuffType()) && player.statLife < player.statLifeMax2) @@ -62,10 +63,10 @@ public class LunarRainBow : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 14); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 14) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/PiercingBow.cs b/Items/Weapons/Ranged/Bows/PiercingBow.cs index 984da0e..dc386e8 100644 --- a/Items/Weapons/Ranged/Bows/PiercingBow.cs +++ b/Items/Weapons/Ranged/Bows/PiercingBow.cs @@ -18,6 +18,7 @@ public class PiercingBow : ModItem public override void SetDefaults() { Item.damage = 10; + Item.DamageType = DamageClass.Ranged; Item.width = 18; Item.height = 32; Item.useTime = 27; @@ -34,7 +35,7 @@ public class PiercingBow : ModItem Item.useAmmo = AmmoID.Arrow; } - 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) { if (type == 1) { @@ -45,16 +46,16 @@ public class PiercingBow : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.WoodenBow, 1); - val.AddIngredient(ItemID.IronBow, 1); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ItemID.WoodenBow) + .AddIngredient(ItemID.IronBow) + .AddTile(TileID.Anvils) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ItemID.WoodenBow, 1); - val2.AddIngredient(ItemID.LeadBow, 1); - val2.AddTile(TileID.Anvils); - val2.Register(); + CreateRecipe() + .AddIngredient(ItemID.WoodenBow) + .AddIngredient(ItemID.LeadBow) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs b/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs index 1d15673..f715e72 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/DemonsBow.cs @@ -16,6 +16,7 @@ public class DemonsBow : ModItem public override void SetDefaults() { Item.damage = 34; + Item.DamageType = DamageClass.Ranged; Item.width = 18; Item.height = 38; Item.useTime = 16; @@ -55,16 +56,16 @@ public class DemonsBow : ModItem Item.damage = 34; Item.shoot = ProjectileID.HellfireArrow; } - return CanUseItem(player); + return base.CanUseItem(player); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HellstoneBar, 6); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HellstoneBar, 6) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs b/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs index a514f6b..049377a 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/GoldenKabuki.cs @@ -16,6 +16,7 @@ public class GoldenKabuki : ModItem public override void SetDefaults() { Item.damage = 58; + Item.DamageType = DamageClass.Ranged; Item.width = 18; Item.height = 38; Item.useTime = 12; @@ -55,15 +56,15 @@ public class GoldenKabuki : ModItem Item.damage = 58; Item.shoot = ProjectileID.HolyArrow; } - return CanUseItem(player); + return base.CanUseItem(player); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs b/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs index 36314ef..651084f 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/Kabuki.cs @@ -16,6 +16,7 @@ public class Kabuki : ModItem public override void SetDefaults() { Item.damage = 42; + Item.DamageType = DamageClass.Ranged; Item.width = 18; Item.height = 38; Item.useTime = 14; @@ -55,15 +56,15 @@ public class Kabuki : ModItem Item.damage = 42; Item.shoot = ProjectileID.HellfireArrow; } - return CanUseItem(player); + return base.CanUseItem(player); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HallowedBar, 6); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HallowedBar, 6) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs b/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs index b572e4d..71c2534 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/RainBow.cs @@ -16,6 +16,7 @@ public class RainBow : ModItem public override void SetDefaults() { Item.damage = 90; + Item.DamageType = DamageClass.Ranged; Item.width = 30; Item.height = 50; Item.useTime = 3; @@ -55,15 +56,15 @@ public class RainBow : ModItem Item.damage = 90; Item.shoot = ModContent.ProjectileType(); } - return CanUseItem(player); + return base.CanUseItem(player); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/StormBows/StonePlatedBow.cs b/Items/Weapons/Ranged/Bows/StormBows/StonePlatedBow.cs index dd866b6..bcf16d1 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/StonePlatedBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/StonePlatedBow.cs @@ -15,6 +15,7 @@ public class StonePlatedBow : ModItem public override void SetDefaults() { Item.damage = 5; + Item.DamageType = DamageClass.Ranged; Item.width = 18; Item.height = 38; Item.useTime = 32; @@ -31,11 +32,11 @@ public class StonePlatedBow : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType(), 2); - val.AddIngredient(ItemID.StoneBlock, 4); - val.AddIngredient(ItemID.FallenStar, 1); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType(), 2) + .AddIngredient(ItemID.StoneBlock, 4) + .AddIngredient(ItemID.FallenStar) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs b/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs index cd314f5..8cdacb7 100644 --- a/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs +++ b/Items/Weapons/Ranged/Bows/StormBows/StormBow.cs @@ -16,6 +16,7 @@ public class StormBow : ModItem public override void SetDefaults() { Item.damage = 24; + Item.DamageType = DamageClass.Ranged; Item.width = 18; Item.height = 38; Item.useTime = 18; @@ -43,7 +44,7 @@ public class StormBow : ModItem Item.useTime = 4; Item.useAnimation = 24; Item.damage = 24; - Item.reuseDelay = 90; + Item.reuseDelay = 90; Item.shoot = ModContent.ProjectileType(); } else @@ -55,6 +56,6 @@ public class StormBow : ModItem Item.damage = 28; Item.shoot = ProjectileID.WoodenArrowFriendly; } - return CanUseItem(player); + return base.CanUseItem(player); } } diff --git a/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs b/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs index 621b074..5b89649 100644 --- a/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs +++ b/Items/Weapons/Ranged/FoxPistols/FoxPistol.cs @@ -18,6 +18,7 @@ public class FoxPistol : ModItem public override void SetDefaults() { Item.damage = 22; + Item.DamageType = DamageClass.Ranged; Item.width = 36; Item.height = 21; Item.useTime = 12; @@ -38,9 +39,9 @@ public class FoxPistol : ModItem return new Vector2(0f, -2f); } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -54,9 +55,7 @@ public class FoxPistol : ModItem { player.AddBuff(ModContent.BuffType(), 300, true); } - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(3f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(3f)); return true; } @@ -88,16 +87,16 @@ public class FoxPistol : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("FabusMod:GoldBar", 10); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("FabusMod:GoldBar", 10) + .AddTile(TileID.Anvils) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.OrangeDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.OrangeDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs b/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs index b68d954..48190df 100644 --- a/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs +++ b/Items/Weapons/Ranged/FoxPistols/FoxPistolBlue.cs @@ -18,6 +18,7 @@ public class FoxPistolBlue : ModItem public override void SetDefaults() { Item.damage = 22; + Item.DamageType = DamageClass.Ranged; Item.width = 36; Item.height = 21; Item.useTime = 12; @@ -38,9 +39,9 @@ public class FoxPistolBlue : ModItem return new Vector2(0f, -2f); } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -54,9 +55,7 @@ public class FoxPistolBlue : ModItem { player.AddBuff(ModContent.BuffType(), 300, true); } - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(3f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(3f)); return true; } @@ -88,16 +87,16 @@ public class FoxPistolBlue : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("FabusMod:GoldBar", 10); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("FabusMod:GoldBar", 10) + .AddTile(TileID.Anvils) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType(), 1); - val2.AddIngredient(ItemID.BlueDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs b/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs index 42b5eac..de07f63 100644 --- a/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs +++ b/Items/Weapons/Ranged/FoxPistols/SpectralHowler.cs @@ -18,6 +18,7 @@ public class SpectralHowler : ModItem public override void SetDefaults() { Item.damage = 260; + Item.DamageType = DamageClass.Ranged; Item.width = 36; Item.height = 21; Item.useTime = 6; @@ -38,9 +39,9 @@ public class SpectralHowler : ModItem return new Vector2(-6f, -2f); } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -53,9 +54,7 @@ public class SpectralHowler : ModItem { player.AddBuff(ModContent.BuffType(), 420, true); } - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(3f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(3f)); return true; } @@ -87,11 +86,11 @@ public class SpectralHowler : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:FoxPistol", 1); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 4); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:FoxPistol") + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 4) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/FusionDrivers/DynasticFuser.cs b/Items/Weapons/Ranged/FusionDrivers/DynasticFuser.cs index ba6ba89..3c05427 100644 --- a/Items/Weapons/Ranged/FusionDrivers/DynasticFuser.cs +++ b/Items/Weapons/Ranged/FusionDrivers/DynasticFuser.cs @@ -16,6 +16,7 @@ public class DynasticFuser : ModItem public override void SetDefaults() { Item.damage = 14; + Item.DamageType = DamageClass.Ranged; Item.width = 72; Item.height = 32; Item.useTime = 7; @@ -37,18 +38,18 @@ public class DynasticFuser : ModItem return new Vector2(-2f, 2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.3f; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HellstoneBar, 12); - val.AddIngredient(ItemID.Sapphire, 8); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HellstoneBar, 12) + .AddIngredient(ItemID.Sapphire, 8) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Ranged/FusionDrivers/DynasticFuserGolden.cs b/Items/Weapons/Ranged/FusionDrivers/DynasticFuserGolden.cs index 89bdc08..d56582b 100644 --- a/Items/Weapons/Ranged/FusionDrivers/DynasticFuserGolden.cs +++ b/Items/Weapons/Ranged/FusionDrivers/DynasticFuserGolden.cs @@ -16,6 +16,7 @@ public class DynasticFuserGolden : ModItem public override void SetDefaults() { Item.damage = 72; + Item.DamageType = DamageClass.Ranged; Item.width = 70; Item.height = 32; Item.useTime = 4; @@ -37,17 +38,17 @@ public class DynasticFuserGolden : ModItem return new Vector2(-2f, 2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.55f; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:ProtectionFuser", 1); - val.AddIngredient(ModContent.ItemType(), 8); - val.AddTile(TileID.AdamantiteForge); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:ProtectionFuser") + .AddIngredient(ModContent.ItemType(), 8) + .AddTile(TileID.AdamantiteForge) + .Register(); } } diff --git a/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs b/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs index 789ef43..bf012cc 100644 --- a/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs +++ b/Items/Weapons/Ranged/FusionDrivers/FusedRainbow.cs @@ -18,6 +18,7 @@ public class FusedRainbow : ModItem public override void SetDefaults() { Item.damage = 85; + Item.DamageType = DamageClass.Ranged; Item.width = 70; Item.height = 32; Item.useTime = 2; @@ -39,13 +40,13 @@ public class FusedRainbow : ModItem return new Vector2(-2f, 2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) - { + public override bool CanConsumeAmmo(Item ammo, Player player) + { return Utils.NextFloat(Main.rand) >= 0.8f; } - 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) + { if (type == 14) { type = ModContent.ProjectileType(); @@ -55,10 +56,10 @@ public class FusedRainbow : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 12); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 12) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/FusionDrivers/FusionDriver.cs b/Items/Weapons/Ranged/FusionDrivers/FusionDriver.cs index 68e5c90..4f89ec6 100644 --- a/Items/Weapons/Ranged/FusionDrivers/FusionDriver.cs +++ b/Items/Weapons/Ranged/FusionDrivers/FusionDriver.cs @@ -16,6 +16,7 @@ public class FusionDriver : ModItem public override void SetDefaults() { Item.damage = 5; + Item.DamageType = DamageClass.Ranged; Item.width = 72; Item.height = 32; Item.useTime = 8; @@ -39,10 +40,10 @@ public class FusionDriver : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("IronBar", 12); - val.AddIngredient(ItemID.Emerald, 4); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddRecipeGroup("IronBar", 12) + .AddIngredient(ItemID.Emerald, 4) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Ranged/FusionDrivers/ProtectionFuser.cs b/Items/Weapons/Ranged/FusionDrivers/ProtectionFuser.cs index e5d9caf..df684b3 100644 --- a/Items/Weapons/Ranged/FusionDrivers/ProtectionFuser.cs +++ b/Items/Weapons/Ranged/FusionDrivers/ProtectionFuser.cs @@ -16,6 +16,7 @@ public class ProtectionFuser : ModItem public override void SetDefaults() { Item.damage = 36; + Item.DamageType = DamageClass.Ranged; Item.width = 72; Item.height = 32; Item.useTime = 5; @@ -37,23 +38,23 @@ public class ProtectionFuser : ModItem return new Vector2(-2f, 2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.42f; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("FabusMod:AdamantiteBar", 12); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("FabusMod:AdamantiteBar", 12) + .AddTile(TileID.MythrilAnvil) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.SilverDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.SilverDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/FusionDrivers/ProtectionFuserCarbonFiber.cs b/Items/Weapons/Ranged/FusionDrivers/ProtectionFuserCarbonFiber.cs index 2a98a0a..32e9887 100644 --- a/Items/Weapons/Ranged/FusionDrivers/ProtectionFuserCarbonFiber.cs +++ b/Items/Weapons/Ranged/FusionDrivers/ProtectionFuserCarbonFiber.cs @@ -16,6 +16,7 @@ public class ProtectionFuserCarbonFiber : ModItem public override void SetDefaults() { Item.damage = 36; + Item.DamageType = DamageClass.Ranged; Item.width = 72; Item.height = 32; Item.useTime = 5; @@ -37,17 +38,17 @@ public class ProtectionFuserCarbonFiber : ModItem return new Vector2(-2f, 2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) - { + public override bool CanConsumeAmmo(Item ammo, Player player) + { return Utils.NextFloat(Main.rand) >= 0.42f; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.BlackDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlackDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs b/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs index 2f385cd..b551fe4 100644 --- a/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs +++ b/Items/Weapons/Ranged/LightGuns/GoldenStinger.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.LightBlasts; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class GoldenStinger : ModItem public override void SetDefaults() { Item.damage = 68; + Item.DamageType = DamageClass.Ranged; Item.width = 32; Item.height = 38; Item.useTime = 3; @@ -28,14 +28,14 @@ public class GoldenStinger : ModItem Item.value = Item.sellPrice(0, 30, 35, 0); Item.UseSound = SoundID.Item11; Item.autoReuse = true; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 10f; Item.rare = 12; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -45,10 +45,10 @@ public class GoldenStinger : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:TheStinger", 1); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:TheStinger") + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(TileID.LunarCraftingStation) + .Register(); } } diff --git a/Items/Weapons/Ranged/LightGuns/LightGun.cs b/Items/Weapons/Ranged/LightGuns/LightGun.cs index bee2831..a5a2e0a 100644 --- a/Items/Weapons/Ranged/LightGuns/LightGun.cs +++ b/Items/Weapons/Ranged/LightGuns/LightGun.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.LightBlasts; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class LightGun : ModItem public override void SetDefaults() { Item.damage = 14; + Item.DamageType = DamageClass.Ranged; Item.width = 32; Item.height = 38; Item.useTime = 7; @@ -28,14 +28,14 @@ public class LightGun : ModItem Item.value = Item.sellPrice(0, 5, 0, 0); Item.UseSound = SoundID.Item11; Item.autoReuse = true; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 7f; Item.rare = ItemRarityID.Green; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -45,11 +45,11 @@ public class LightGun : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:GoldBar", 20); - val.AddIngredient(ItemID.Diamond, 4); - val.AddIngredient(ItemID.Amethyst, 6); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:GoldBar", 20) + .AddIngredient(ItemID.Diamond, 4) + .AddIngredient(ItemID.Amethyst, 6) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs b/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs index 48e879a..9efc860 100644 --- a/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs +++ b/Items/Weapons/Ranged/LightGuns/SpectralBlaster.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.LightBlasts; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class SpectralBlaster : ModItem public override void SetDefaults() { Item.damage = 100; + Item.DamageType = DamageClass.Ranged; Item.width = 32; Item.height = 38; Item.useTime = 2; @@ -28,14 +28,14 @@ public class SpectralBlaster : ModItem Item.value = Item.sellPrice(1, 55, 0, 0); Item.UseSound = SoundID.Item11; Item.autoReuse = true; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 10f; Item.expert = true; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -45,10 +45,10 @@ public class SpectralBlaster : 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() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/LightGuns/Taegeukgi.cs b/Items/Weapons/Ranged/LightGuns/Taegeukgi.cs index 299a381..b7d3d41 100644 --- a/Items/Weapons/Ranged/LightGuns/Taegeukgi.cs +++ b/Items/Weapons/Ranged/LightGuns/Taegeukgi.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.LightBlasts; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class Taegeukgi : ModItem public override void SetDefaults() { Item.damage = 40; + Item.DamageType = DamageClass.Ranged; Item.width = 32; Item.height = 38; Item.useTime = 5; @@ -28,14 +28,14 @@ public class Taegeukgi : ModItem Item.value = Item.sellPrice(0, 8, 25, 0); Item.UseSound = SoundID.Item11; Item.autoReuse = true; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 6f; Item.rare = ItemRarityID.LightRed; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -45,11 +45,11 @@ public class Taegeukgi : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("FabusMod:OrichalcumBar", 6); - val.AddIngredient(ItemID.Sapphire, 6); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("FabusMod:OrichalcumBar", 6) + .AddIngredient(ItemID.Sapphire, 6) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Ranged/LightGuns/TheStinger.cs b/Items/Weapons/Ranged/LightGuns/TheStinger.cs index 6670880..d36f335 100644 --- a/Items/Weapons/Ranged/LightGuns/TheStinger.cs +++ b/Items/Weapons/Ranged/LightGuns/TheStinger.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.LightBlasts; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class TheStinger : ModItem public override void SetDefaults() { Item.damage = 66; + Item.DamageType = DamageClass.Ranged; Item.width = 32; Item.height = 38; Item.useTime = 4; @@ -28,14 +28,14 @@ public class TheStinger : ModItem Item.value = Item.sellPrice(0, 13, 85, 0); Item.UseSound = SoundID.Item11; Item.autoReuse = true; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 5f; Item.rare = ItemRarityID.Pink; } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -45,16 +45,16 @@ public class TheStinger : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HallowedBar, 14); - val.AddTile(TileID.AdamantiteForge); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HallowedBar, 14) + .AddTile(TileID.AdamantiteForge) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.BlueDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/LightGuns/TheStingerBlackCat.cs b/Items/Weapons/Ranged/LightGuns/TheStingerBlackCat.cs index b0f7a73..bd15f5c 100644 --- a/Items/Weapons/Ranged/LightGuns/TheStingerBlackCat.cs +++ b/Items/Weapons/Ranged/LightGuns/TheStingerBlackCat.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.LightBlasts; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class TheStingerBlackCat : ModItem public override void SetDefaults() { Item.damage = 66; + Item.DamageType = DamageClass.Ranged; Item.width = 32; Item.height = 38; Item.useTime = 4; @@ -28,14 +28,14 @@ public class TheStingerBlackCat : ModItem Item.value = Item.sellPrice(0, 13, 85, 0); Item.UseSound = SoundID.Item11; Item.autoReuse = true; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.shootSpeed = 5f; Item.rare = ItemRarityID.Pink; } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 32f; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 32f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -45,10 +45,10 @@ public class TheStingerBlackCat : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(null, "TheStinger", 1); - val.AddIngredient(ItemID.BlackDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(null, "TheStinger") + .AddIngredient(ItemID.BlackDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/MachinePistols/AugmentedUzi.cs b/Items/Weapons/Ranged/MachinePistols/AugmentedUzi.cs index 2908d56..5059237 100644 --- a/Items/Weapons/Ranged/MachinePistols/AugmentedUzi.cs +++ b/Items/Weapons/Ranged/MachinePistols/AugmentedUzi.cs @@ -17,6 +17,7 @@ public class AugmentedUzi : ModItem public override void SetDefaults() { Item.damage = 32; + Item.DamageType = DamageClass.Ranged; Item.width = 48; Item.height = 38; Item.useTime = 2; @@ -38,25 +39,23 @@ public class AugmentedUzi : ModItem return new Vector2(-12f, -8f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.7f; } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(6f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(6f)); return true; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.Uzi, 1); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.Uzi) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs b/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs index 701c483..6c9d0d9 100644 --- a/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs +++ b/Items/Weapons/Ranged/MachinePistols/CosmicHacker.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles; using Microsoft.Xna.Framework; using Terraria; using Terraria.DataStructures; @@ -18,6 +17,7 @@ public class CosmicHacker : ModItem public override void SetDefaults() { Item.damage = 82; + Item.DamageType = DamageClass.Ranged; Item.width = 48; Item.height = 36; Item.useTime = 2; @@ -39,29 +39,27 @@ public class CosmicHacker : ModItem return new Vector2(-8f, -8f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.9f; } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(5f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(5f)); if (type == 14) { - type = ModContent.ProjectileType(); + type = ModContent.ProjectileType(); } return true; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 10); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 10) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/MachinePistols/MachinePistol.cs b/Items/Weapons/Ranged/MachinePistols/MachinePistol.cs index 494e5fc..e71d187 100644 --- a/Items/Weapons/Ranged/MachinePistols/MachinePistol.cs +++ b/Items/Weapons/Ranged/MachinePistols/MachinePistol.cs @@ -17,6 +17,7 @@ public class MachinePistol : ModItem public override void SetDefaults() { Item.damage = 10; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 38; Item.useTime = 2; @@ -33,7 +34,7 @@ public class MachinePistol : ModItem Item.rare = ItemRarityID.LightRed; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.8f; } @@ -43,20 +44,18 @@ public class MachinePistol : ModItem return new Vector2(-12f, -8f); } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(6f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(6f)); return true; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:OrichalcumBar", 16); - val.AddIngredient(ItemID.Amethyst, 5); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:OrichalcumBar", 16) + .AddIngredient(ItemID.Amethyst, 5) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs b/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs index a4c159e..3759577 100644 --- a/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs +++ b/Items/Weapons/Ranged/MachinePistols/MachinePistolGolden.cs @@ -17,6 +17,7 @@ public class MachinePistolGolden : ModItem public override void SetDefaults() { Item.damage = 66; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 38; Item.useTime = 2; @@ -38,25 +39,23 @@ public class MachinePistolGolden : ModItem return new Vector2(-12f, -8f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.8f; } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(5f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(5f)); return true; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:Verano", 1); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:Verano") + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(TileID.LunarCraftingStation) + .Register(); } } diff --git a/Items/Weapons/Ranged/MachinePistols/Verano.cs b/Items/Weapons/Ranged/MachinePistols/Verano.cs index 780e6d4..4574f3d 100644 --- a/Items/Weapons/Ranged/MachinePistols/Verano.cs +++ b/Items/Weapons/Ranged/MachinePistols/Verano.cs @@ -17,6 +17,7 @@ public class Verano : ModItem public override void SetDefaults() { Item.damage = 60; + Item.DamageType = DamageClass.Ranged; Item.width = 48; Item.height = 36; Item.useTime = 2; @@ -38,31 +39,29 @@ public class Verano : ModItem return new Vector2(-12f, -8f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.8f; } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(5f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(5f)); return true; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.FragmentVortex, 12); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.FragmentVortex, 12) + .AddTile(TileID.LunarCraftingStation) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.GreenDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.GreenDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs b/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs index d5080d0..2396a82 100644 --- a/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs +++ b/Items/Weapons/Ranged/MachinePistols/VeranoRime.cs @@ -17,6 +17,7 @@ public class VeranoRime : ModItem public override void SetDefaults() { Item.damage = 60; + Item.DamageType = DamageClass.Ranged; Item.width = 56; Item.height = 36; Item.useTime = 2; @@ -38,25 +39,23 @@ public class VeranoRime : ModItem return new Vector2(-16f, 0f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.8f; } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(5f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(5f)); return true; } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.BlueDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/Peacekeeper/GoddessRevolver.cs b/Items/Weapons/Ranged/Peacekeeper/GoddessRevolver.cs index a43dd8d..964374e 100644 --- a/Items/Weapons/Ranged/Peacekeeper/GoddessRevolver.cs +++ b/Items/Weapons/Ranged/Peacekeeper/GoddessRevolver.cs @@ -17,6 +17,7 @@ public class GoddessRevolver : ModItem public override void SetDefaults() { Item.damage = 86; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 28; Item.useTime = 2; @@ -39,14 +40,14 @@ public class GoddessRevolver : ModItem return new Vector2(-2f, -2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.5f; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -60,11 +61,11 @@ public class GoddessRevolver : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:Peaceforcer", 1); - val.AddIngredient(ModContent.ItemType(), 8); - val.AddIngredient(ModContent.ItemType(), 6); - val.AddTile(TileID.AdamantiteForge); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:Peaceforcer") + .AddIngredient(ModContent.ItemType(), 8) + .AddIngredient(ModContent.ItemType(), 6) + .AddTile(TileID.AdamantiteForge) + .Register(); } } diff --git a/Items/Weapons/Ranged/Peacekeeper/Peaceforcer.cs b/Items/Weapons/Ranged/Peacekeeper/Peaceforcer.cs index a1765b4..f3f1da7 100644 --- a/Items/Weapons/Ranged/Peacekeeper/Peaceforcer.cs +++ b/Items/Weapons/Ranged/Peacekeeper/Peaceforcer.cs @@ -17,6 +17,7 @@ public class Peaceforcer : ModItem public override void SetDefaults() { Item.damage = 48; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 30; Item.useTime = 2; @@ -39,14 +40,14 @@ public class Peaceforcer : ModItem return new Vector2(-2f, -2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.5f; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -60,18 +61,18 @@ public class Peaceforcer : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:Peacegunner", 1); - val.AddRecipeGroup("FabusMod:AdamantiteBar", 8); - val.AddIngredient(ItemID.SoulofNight, 6); - val.AddIngredient(ModContent.ItemType(), 4); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:Peacegunner") + .AddRecipeGroup("FabusMod:AdamantiteBar", 8) + .AddIngredient(ItemID.SoulofNight, 6) + .AddIngredient(ModContent.ItemType(), 4) + .AddTile(TileID.MythrilAnvil) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType(), 1); - val2.AddIngredient(ItemID.SilverDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.SilverDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/Peacekeeper/PeaceforcerVanHelsing.cs b/Items/Weapons/Ranged/Peacekeeper/PeaceforcerVanHelsing.cs index 2f760bb..fa6483f 100644 --- a/Items/Weapons/Ranged/Peacekeeper/PeaceforcerVanHelsing.cs +++ b/Items/Weapons/Ranged/Peacekeeper/PeaceforcerVanHelsing.cs @@ -17,6 +17,7 @@ public class PeaceforcerVanHelsing : ModItem public override void SetDefaults() { Item.damage = 48; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 28; Item.useTime = 2; @@ -39,14 +40,14 @@ public class PeaceforcerVanHelsing : ModItem return new Vector2(-2f, -2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.5f; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -62,7 +63,7 @@ public class PeaceforcerVanHelsing : ModItem { Recipe val = CreateRecipe(); val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.BrownDye, 1); + val.AddIngredient(ItemID.BrownDye); val.AddTile(TileID.DyeVat); val.Register(); } diff --git a/Items/Weapons/Ranged/Peacekeeper/Peacegunner.cs b/Items/Weapons/Ranged/Peacekeeper/Peacegunner.cs index 259c248..d6d8d9c 100644 --- a/Items/Weapons/Ranged/Peacekeeper/Peacegunner.cs +++ b/Items/Weapons/Ranged/Peacekeeper/Peacegunner.cs @@ -17,6 +17,7 @@ public class Peacegunner : ModItem public override void SetDefaults() { Item.damage = 32; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 28; Item.useTime = 12; @@ -38,9 +39,9 @@ public class Peacegunner : ModItem return new Vector2(-2f, -2f); } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -50,16 +51,16 @@ public class Peacegunner : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HellstoneBar, 10); - val.AddTile(TileID.Anvils); - val.Register(); + Recipe recipe1 = CreateRecipe(); + recipe1.AddIngredient(ModContent.ItemType()); + recipe1.AddIngredient(ItemID.HellstoneBar, 10); + recipe1.AddTile(TileID.Anvils); + recipe1.Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.SilverDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + Recipe recipe2 = CreateRecipe(); + recipe2.AddIngredient(ModContent.ItemType()); + recipe2.AddIngredient(ItemID.SilverDye); + recipe2.AddTile(TileID.DyeVat); + recipe2.Register(); } } diff --git a/Items/Weapons/Ranged/Peacekeeper/PeacegunnerAmerican.cs b/Items/Weapons/Ranged/Peacekeeper/PeacegunnerAmerican.cs index 6503947..622f71d 100644 --- a/Items/Weapons/Ranged/Peacekeeper/PeacegunnerAmerican.cs +++ b/Items/Weapons/Ranged/Peacekeeper/PeacegunnerAmerican.cs @@ -17,6 +17,7 @@ public class PeacegunnerAmerican : ModItem public override void SetDefaults() { Item.damage = 32; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 28; Item.useTime = 12; @@ -38,9 +39,9 @@ public class PeacegunnerAmerican : ModItem return new Vector2(-2f, -2f); } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -50,11 +51,11 @@ public class PeacegunnerAmerican : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.BlueDye, 1); - val.AddIngredient(ItemID.RedDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ItemID.BlueDye); + recipe.AddIngredient(ItemID.RedDye); + recipe.AddTile(TileID.DyeVat); + recipe.Register(); } } diff --git a/Items/Weapons/Ranged/Peacekeeper/Peacekeeper.cs b/Items/Weapons/Ranged/Peacekeeper/Peacekeeper.cs index d037b3e..1eb2409 100644 --- a/Items/Weapons/Ranged/Peacekeeper/Peacekeeper.cs +++ b/Items/Weapons/Ranged/Peacekeeper/Peacekeeper.cs @@ -17,6 +17,7 @@ public class Peacekeeper : ModItem public override void SetDefaults() { Item.damage = 12; + Item.DamageType = DamageClass.Ranged; Item.width = 50; Item.height = 26; Item.useTime = 15; @@ -38,9 +39,9 @@ public class Peacekeeper : ModItem return new Vector2(-2f, -2f); } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -50,10 +51,10 @@ public class Peacekeeper : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("IronBar", 10); - val.AddIngredient(ItemID.Sapphire, 2); - val.AddTile(TileID.Anvils); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddRecipeGroup("IronBar", 10); + recipe.AddIngredient(ItemID.Sapphire, 2); + recipe.AddTile(TileID.Anvils); + recipe.Register(); } } diff --git a/Items/Weapons/Ranged/Peacekeeper/Unity.cs b/Items/Weapons/Ranged/Peacekeeper/Unity.cs index 19753b9..ad57466 100644 --- a/Items/Weapons/Ranged/Peacekeeper/Unity.cs +++ b/Items/Weapons/Ranged/Peacekeeper/Unity.cs @@ -18,6 +18,7 @@ public class Unity : ModItem public override void SetDefaults() { Item.damage = 150; + Item.DamageType = DamageClass.Ranged; Item.width = 38; Item.height = 24; Item.useTime = 2; @@ -40,14 +41,14 @@ public class Unity : ModItem return new Vector2(-2f, -2f); } - public override bool CanConsumeAmmo(Item ammo, Player player) - { + public override bool CanConsumeAmmo(Item ammo, Player player) + { return Utils.NextFloat(Main.rand) >= 0.6f; } - 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) { - Vector2 muzzleOffset = Vector2.Normalize(new Vector2(velocity.X, velocity.Y)) * 35f; + Vector2 muzzleOffset = Vector2.Normalize(velocity) * 35f; if (Collision.CanHit(position, 0, 0, position + muzzleOffset, 0, 0)) { position += muzzleOffset; @@ -61,10 +62,10 @@ public class Unity : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 8); - val.AddTile(ModContent.TileType()); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 8); + recipe.AddTile(ModContent.TileType()); + recipe.Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs b/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs index 07ef9be..a8ed829 100644 --- a/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs +++ b/Items/Weapons/Ranged/PulsePistols/GoldenPulse.cs @@ -18,6 +18,7 @@ public class GoldenPulse : ModItem public override void SetDefaults() { Item.damage = 66; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,7 +35,7 @@ public class GoldenPulse : ModItem Item.rare = 12; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.9f; } @@ -44,11 +45,9 @@ public class GoldenPulse : ModItem return new Vector2(1f, -2f); } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,10 +57,10 @@ public class GoldenPulse : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:PulseSprayer", 1); - val.AddIngredient(ModContent.ItemType(), 2); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:PulseSprayer") + .AddIngredient(ModContent.ItemType(), 2) + .AddTile(TileID.LunarCraftingStation) + .Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/Graffiti.cs b/Items/Weapons/Ranged/PulsePistols/Graffiti.cs index 3d19c0c..3868e01 100644 --- a/Items/Weapons/Ranged/PulsePistols/Graffiti.cs +++ b/Items/Weapons/Ranged/PulsePistols/Graffiti.cs @@ -18,6 +18,7 @@ public class Graffiti : ModItem public override void SetDefaults() { Item.damage = 80; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,7 +35,7 @@ public class Graffiti : ModItem Item.expert = true; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.9f; } @@ -44,11 +45,9 @@ public class Graffiti : ModItem return new Vector2(1f, -2f); } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,10 +57,10 @@ public class Graffiti : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 10); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 10) + .AddTile(ModContent.TileType()); + .Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/PulsePistol.cs b/Items/Weapons/Ranged/PulsePistols/PulsePistol.cs index 4c8a576..10ab213 100644 --- a/Items/Weapons/Ranged/PulsePistols/PulsePistol.cs +++ b/Items/Weapons/Ranged/PulsePistols/PulsePistol.cs @@ -18,6 +18,7 @@ public class PulsePistol : ModItem public override void SetDefaults() { Item.damage = 10; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,16 +35,14 @@ public class PulsePistol : ModItem Item.rare = ItemRarityID.LightRed; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.7f; } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,11 +57,11 @@ public class PulsePistol : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:AdamantiteBar", 6); - val.AddIngredient(ItemID.Diamond, 2); - val.AddIngredient(ItemID.Sapphire, 2); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:AdamantiteBar", 6) + .AddIngredient(ItemID.Diamond, 2) + .AddIngredient(ItemID.Sapphire, 2) + .AddTile(TileID.MythrilAnvil) + .Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs b/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs index cee60a0..8e90d4e 100644 --- a/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs +++ b/Items/Weapons/Ranged/PulsePistols/PulseSprayer.cs @@ -18,6 +18,7 @@ public class PulseSprayer : ModItem public override void SetDefaults() { Item.damage = 54; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,7 +35,7 @@ public class PulseSprayer : ModItem Item.rare = ItemRarityID.Red; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.8f; } @@ -44,11 +45,9 @@ public class PulseSprayer : ModItem return new Vector2(1f, -2f); } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,16 +57,16 @@ public class PulseSprayer : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:PunksPulse", 1); - val.AddIngredient(ItemID.FragmentVortex, 8); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:PunksPulse") + .AddIngredient(ItemID.FragmentVortex, 8) + .AddTile(TileID.LunarCraftingStation) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.BlueDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/PulseSprayerCadet.cs b/Items/Weapons/Ranged/PulsePistols/PulseSprayerCadet.cs index 944d952..ecbfb3c 100644 --- a/Items/Weapons/Ranged/PulsePistols/PulseSprayerCadet.cs +++ b/Items/Weapons/Ranged/PulsePistols/PulseSprayerCadet.cs @@ -18,6 +18,7 @@ public class PulseSprayerCadet : ModItem public override void SetDefaults() { Item.damage = 54; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,7 +35,7 @@ public class PulseSprayerCadet : ModItem Item.rare = ItemRarityID.Red; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.8f; } @@ -44,11 +45,9 @@ public class PulseSprayerCadet : ModItem return new Vector2(1f, -2f); } - public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) - { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + public override bool Shoot(Player player, EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockback) + { + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,10 +57,10 @@ public class PulseSprayerCadet : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.SilverDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.SilverDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/PunksPulse.cs b/Items/Weapons/Ranged/PulsePistols/PunksPulse.cs index 2e9b77b..57d84aa 100644 --- a/Items/Weapons/Ranged/PulsePistols/PunksPulse.cs +++ b/Items/Weapons/Ranged/PulsePistols/PunksPulse.cs @@ -18,6 +18,7 @@ public class PunksPulse : ModItem public override void SetDefaults() { Item.damage = 25; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,7 +35,7 @@ public class PunksPulse : ModItem Item.rare = ItemRarityID.Pink; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.7f; } @@ -44,11 +45,9 @@ public class PunksPulse : ModItem return new Vector2(1f, -2f); } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,17 +57,17 @@ public class PunksPulse : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.HallowedBar, 8); - val.AddIngredient(ItemID.SoulofNight, 6); - val.AddTile(TileID.AdamantiteForge); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.HallowedBar, 8) + .AddIngredient(ItemID.SoulofNight, 6) + .AddTile(TileID.AdamantiteForge) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.BlueDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/PulsePistols/PunksPulseUltraviolet.cs b/Items/Weapons/Ranged/PulsePistols/PunksPulseUltraviolet.cs index 17715c1..297b612 100644 --- a/Items/Weapons/Ranged/PulsePistols/PunksPulseUltraviolet.cs +++ b/Items/Weapons/Ranged/PulsePistols/PunksPulseUltraviolet.cs @@ -18,6 +18,7 @@ public class PunksPulseUltraviolet : ModItem public override void SetDefaults() { Item.damage = 25; + Item.DamageType = DamageClass.Ranged; Item.width = 40; Item.height = 28; Item.useTime = 2; @@ -34,7 +35,7 @@ public class PunksPulseUltraviolet : ModItem Item.rare = ItemRarityID.Pink; } - public override bool CanConsumeAmmo(Item ammo, Player player) + public override bool CanConsumeAmmo(Item ammo, Player player) { return Utils.NextFloat(Main.rand) >= 0.7f; } @@ -44,11 +45,9 @@ public class PunksPulseUltraviolet : ModItem return new Vector2(1f, -2f); } - 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) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - velocity.X = perturbedSpeed.X; - velocity.Y = perturbedSpeed.Y; + velocity = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); if (type == 14) { type = ModContent.ProjectileType(); @@ -58,10 +57,10 @@ public class PunksPulseUltraviolet : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.PinkDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.PinkDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/Depriver.cs b/Items/Weapons/Ranged/Shotguns/Depriver.cs index cae7db6..0127912 100644 --- a/Items/Weapons/Ranged/Shotguns/Depriver.cs +++ b/Items/Weapons/Ranged/Shotguns/Depriver.cs @@ -18,6 +18,7 @@ public class Depriver : ModItem public override void SetDefaults() { Item.damage = 120; + Item.DamageType = DamageClass.Ranged; Item.width = 70; Item.height = 36; Item.useTime = 18; @@ -34,7 +35,7 @@ public class Depriver : ModItem Item.useAmmo = AmmoID.Bullet; } - 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) { if (type == 14) { @@ -43,8 +44,8 @@ public class Depriver : ModItem int numberProjectiles = 8; 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); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } @@ -75,7 +76,7 @@ public class Depriver : ModItem Item.useTime = 20; Item.useAnimation = 20; } - return CanUseItem(player); + return base.CanUseItem(player); } public override Vector2? HoldoutOffset() @@ -85,10 +86,10 @@ public class Depriver : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 8); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ModContent.ItemType(), 8) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/GoldenShotgun.cs b/Items/Weapons/Ranged/Shotguns/GoldenShotgun.cs index 45d5258..7d0bfbf 100644 --- a/Items/Weapons/Ranged/Shotguns/GoldenShotgun.cs +++ b/Items/Weapons/Ranged/Shotguns/GoldenShotgun.cs @@ -17,6 +17,7 @@ public class GoldenShotgun : ModItem public override void SetDefaults() { Item.damage = 52; + Item.DamageType = DamageClass.Ranged; Item.width = 80; Item.height = 34; Item.useTime = 25; @@ -33,13 +34,13 @@ public class GoldenShotgun : ModItem Item.useAmmo = AmmoID.Bullet; } - 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 = 7; 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); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return true; } @@ -70,7 +71,7 @@ public class GoldenShotgun : ModItem Item.useTime = 25; Item.useAnimation = 25; } - return CanUseItem(player); + return base.CanUseItem(player); } public override Vector2? HoldoutOffset() @@ -80,11 +81,11 @@ public class GoldenShotgun : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:HellkinShotgun", 1); - val.AddIngredient(ModContent.ItemType(), 8); - val.AddIngredient(ModContent.ItemType(), 4); - val.AddTile(TileID.AdamantiteForge); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:HellkinShotgun") + .AddIngredient(ModContent.ItemType(), 8) + .AddIngredient(ModContent.ItemType(), 4) + .AddTile(TileID.AdamantiteForge) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/HellfireShotgun.cs b/Items/Weapons/Ranged/Shotguns/HellfireShotgun.cs index e68700f..e1bb5c0 100644 --- a/Items/Weapons/Ranged/Shotguns/HellfireShotgun.cs +++ b/Items/Weapons/Ranged/Shotguns/HellfireShotgun.cs @@ -17,6 +17,7 @@ public class HellfireShotgun : ModItem public override void SetDefaults() { Item.damage = 21; + Item.DamageType = DamageClass.Ranged; Item.width = 78; Item.height = 28; Item.useTime = 45; @@ -33,13 +34,13 @@ public class HellfireShotgun : ModItem Item.useAmmo = AmmoID.Bullet; } - 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 = 5; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(12f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(12f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } @@ -51,10 +52,10 @@ public class HellfireShotgun : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.Obsidian, 16); - val.AddIngredient(ItemID.HellstoneBar, 4); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ItemID.Obsidian, 16) + .AddIngredient(ItemID.HellstoneBar, 4) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/HellkinShotgun.cs b/Items/Weapons/Ranged/Shotguns/HellkinShotgun.cs index 0bb9c66..bedbe82 100644 --- a/Items/Weapons/Ranged/Shotguns/HellkinShotgun.cs +++ b/Items/Weapons/Ranged/Shotguns/HellkinShotgun.cs @@ -17,6 +17,7 @@ public class HellkinShotgun : ModItem public override void SetDefaults() { Item.damage = 46; + Item.DamageType = DamageClass.Ranged; Item.width = 80; Item.height = 34; Item.useTime = 28; @@ -33,13 +34,13 @@ public class HellkinShotgun : ModItem Item.useAmmo = AmmoID.Bullet; } - 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 = 6; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return true; } @@ -70,7 +71,7 @@ public class HellkinShotgun : ModItem Item.useTime = 28; Item.useAnimation = 28; } - return CanUseItem(player); + return base.CanUseItem(player); } public override Vector2? HoldoutOffset() @@ -80,17 +81,17 @@ public class HellkinShotgun : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:HellshiverGun"); - val.AddIngredient(ItemID.HallowedBar, 6); - val.AddIngredient(ModContent.ItemType(), 4); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:HellshiverGun") + .AddIngredient(ItemID.HallowedBar, 6) + .AddIngredient(ModContent.ItemType(), 4) + .AddTile(TileID.MythrilAnvil) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.OrangeDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.OrangeDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/HellkinShotgunDracula.cs b/Items/Weapons/Ranged/Shotguns/HellkinShotgunDracula.cs index efee80d..3975c7d 100644 --- a/Items/Weapons/Ranged/Shotguns/HellkinShotgunDracula.cs +++ b/Items/Weapons/Ranged/Shotguns/HellkinShotgunDracula.cs @@ -17,6 +17,7 @@ public class HellkinShotgunDracula : ModItem public override void SetDefaults() { Item.damage = 46; + Item.DamageType = DamageClass.Ranged; Item.width = 78; Item.height = 30; Item.useTime = 28; @@ -33,13 +34,13 @@ public class HellkinShotgunDracula : ModItem Item.useAmmo = AmmoID.Bullet; } - 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 = 6; for (int i = 0; i < numberProjectiles; i++) { - Vector2 perturbedSpeed = Utils.RotatedByRandom(new Vector2(velocity.X, velocity.Y), (double)MathHelper.ToRadians(8f)); - Projectile.NewProjectile(source, position.X, position.Y, perturbedSpeed.X, perturbedSpeed.Y, type, damage, knockback, player.whoAmI); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(8f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return true; } @@ -70,7 +71,7 @@ public class HellkinShotgunDracula : ModItem Item.useTime = 28; Item.useAnimation = 28; } - return this.CanUseItem(player); + return base.CanUseItem(player); } public override Vector2? HoldoutOffset() @@ -80,10 +81,10 @@ public class HellkinShotgunDracula : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.RedDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.RedDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/HellshiverGun.cs b/Items/Weapons/Ranged/Shotguns/HellshiverGun.cs index c2c9c97..960348f 100644 --- a/Items/Weapons/Ranged/Shotguns/HellshiverGun.cs +++ b/Items/Weapons/Ranged/Shotguns/HellshiverGun.cs @@ -17,6 +17,7 @@ public class HellshiverGun : ModItem public override void SetDefaults() { Item.damage = 30; + Item.DamageType = DamageClass.Ranged; Item.width = 78; Item.height = 28; Item.useTime = 35; @@ -33,13 +34,13 @@ public class HellshiverGun : ModItem Item.useAmmo = AmmoID.Bullet; } - 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 = 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, 0f, 0f); } return false; } @@ -51,17 +52,17 @@ public class HellshiverGun : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("FabusMod:OrichalcumBar", 6); - val.AddIngredient(ItemID.IceBlock, 20); - val.AddTile(TileID.MythrilAnvil); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("FabusMod:OrichalcumBar", 6) + .AddIngredient(ItemID.IceBlock, 20) + .AddTile(TileID.MythrilAnvil) + .Register(); - Recipe val2 = CreateRecipe(); - val2.AddIngredient(ModContent.ItemType()); - val2.AddIngredient(ItemID.BlueFlameDye, 1); - val2.AddTile(TileID.DyeVat); - val2.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.BlueFlameDye) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Ranged/Shotguns/HellshiverGunHellfire.cs b/Items/Weapons/Ranged/Shotguns/HellshiverGunHellfire.cs index c97ab3b..2055815 100644 --- a/Items/Weapons/Ranged/Shotguns/HellshiverGunHellfire.cs +++ b/Items/Weapons/Ranged/Shotguns/HellshiverGunHellfire.cs @@ -17,6 +17,7 @@ public class HellshiverGunHellfire : ModItem public override void SetDefaults() { Item.damage = 30; + Item.DamageType = DamageClass.Ranged; Item.width = 78; Item.height = 28; Item.useTime = 35; @@ -33,13 +34,13 @@ public class HellshiverGunHellfire : ModItem Item.useAmmo = AmmoID.Bullet; } - 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 = 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); + Vector2 perturbedSpeed = Utils.RotatedByRandom(velocity, (double)MathHelper.ToRadians(10f)); + Projectile.NewProjectile(source, position, perturbedSpeed, type, damage, knockback, player.whoAmI); } return false; } @@ -51,10 +52,10 @@ public class HellshiverGunHellfire : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.FlameDye, 1); - val.AddTile(TileID.DyeVat); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.FlameDye) + .AddTile(TileID.DyeVat) + .Register(); } }