From 0ea22f005c602a1e9799c0dc490ba030189ee5d4 Mon Sep 17 00:00:00 2001 From: Big Duckie Date: Tue, 5 Jul 2022 20:08:41 -0600 Subject: [PATCH] Fixed typing for thrown weapons. Cleaned up code. --- .../Thrown/Daggers/ColorfulSolution.cs | 12 ++++----- .../Weapons/Thrown/Shuriken/CarbonShuriken.cs | 24 +++++++++--------- .../Thrown/Shuriken/CarbonShurikenNihon.cs | 13 +++++----- .../Shuriken/{OniSlayer.cs => DemonSlayer.cs} | 20 +++++++-------- .../{OniSlayer.png => DemonSlayer.png} | Bin .../Weapons/Thrown/Shuriken/HerosShuriken.cs | 15 ++++++----- .../Weapons/Thrown/Shuriken/SparklingDemon.cs | 2 +- .../Thrown/Shuriken/StonePlatedShuriken.cs | 15 ++++++----- .../Thrown/Shuriken/TheSpinningRainbow.cs | 14 +++++----- 9 files changed, 59 insertions(+), 56 deletions(-) rename Items/Weapons/Thrown/Shuriken/{OniSlayer.cs => DemonSlayer.cs} (71%) rename Items/Weapons/Thrown/Shuriken/{OniSlayer.png => DemonSlayer.png} (100%) diff --git a/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs b/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs index 699049a..ac1b136 100644 --- a/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs +++ b/Items/Weapons/Thrown/Daggers/ColorfulSolution.cs @@ -8,13 +8,13 @@ public class ColorfulSolution : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("Colorful Solution"); Tooltip.SetDefault("Doesn't consume on use \n[c/B6FF00:Autothrows] \nInflicts [c/401440:Venom] for 12 seconds on hit"); } public override void SetDefaults() { Item.maxStack = 1; + Item.DamageType = DamageClass.Throwing; Item.damage = 195; Item.knockBack = 3f; Item.useStyle = ItemUseStyleID.Swing; @@ -35,10 +35,10 @@ public class ColorfulSolution : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.MagicDagger, 1); - val.AddIngredient(ModContent.ItemType(), 14); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ItemID.MagicDagger) + .AddIngredient(ModContent.ItemType(), 14) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Thrown/Shuriken/CarbonShuriken.cs b/Items/Weapons/Thrown/Shuriken/CarbonShuriken.cs index 8eeb224..8789b5f 100644 --- a/Items/Weapons/Thrown/Shuriken/CarbonShuriken.cs +++ b/Items/Weapons/Thrown/Shuriken/CarbonShuriken.cs @@ -8,13 +8,13 @@ public class CarbonShuriken : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("Carbon Shuriken"); Tooltip.SetDefault("[c/B6FF00:Autothrows, dyeable]\nThrows 3 fast-flying Shurikens at once"); } public override void SetDefaults() { Item.maxStack = 1; + Item.DamageType = DamageClass.Throwing; Item.damage = 19; Item.knockBack = 0f; Item.useStyle = ItemUseStyleID.Swing; @@ -36,17 +36,17 @@ public class CarbonShuriken : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("FabusMod:DemoniteBar", 3); - val.AddIngredient(ItemID.Sapphire, 1); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("FabusMod:DemoniteBar", 3) + .AddIngredient(ItemID.Sapphire) + .AddTile(TileID.Anvils) + .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/Thrown/Shuriken/CarbonShurikenNihon.cs b/Items/Weapons/Thrown/Shuriken/CarbonShurikenNihon.cs index fee4b33..f425c8e 100644 --- a/Items/Weapons/Thrown/Shuriken/CarbonShurikenNihon.cs +++ b/Items/Weapons/Thrown/Shuriken/CarbonShurikenNihon.cs @@ -14,8 +14,9 @@ public class CarbonShurikenNihon : ModItem public override void SetDefaults() { - Item.maxStack = 1; Item.damage = 19; + Item.DamageType = DamageClass.Throwing; + Item.maxStack = 1; Item.knockBack = 0f; Item.useStyle = ItemUseStyleID.Swing; Item.UseSound = SoundID.Item1; @@ -36,10 +37,10 @@ public class CarbonShurikenNihon : 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, 1) + .AddTile(TileID.DyeVat) + .Register(); } } diff --git a/Items/Weapons/Thrown/Shuriken/OniSlayer.cs b/Items/Weapons/Thrown/Shuriken/DemonSlayer.cs similarity index 71% rename from Items/Weapons/Thrown/Shuriken/OniSlayer.cs rename to Items/Weapons/Thrown/Shuriken/DemonSlayer.cs index c92a5f8..d4eefb8 100644 --- a/Items/Weapons/Thrown/Shuriken/OniSlayer.cs +++ b/Items/Weapons/Thrown/Shuriken/DemonSlayer.cs @@ -4,18 +4,18 @@ using Terraria.ModLoader; namespace FabusMod.Items.Weapons.Thrown.Shuriken; -public class OniSlayer : ModItem +public class DemonSlayer : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("Demon Slayer"); Tooltip.SetDefault("[c/B6FF00:Autothrows]\nThrows 4 fast-flying Shurikens at once"); } public override void SetDefaults() { - Item.maxStack = 1; Item.damage = 48; + Item.DamageType = DamageClass.Throwing; + Item.maxStack = 1; Item.knockBack = 0f; Item.useStyle = ItemUseStyleID.Swing; Item.UseSound = SoundID.Item1; @@ -36,12 +36,12 @@ public class OniSlayer : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddRecipeGroup("FabusMod:CarbonShuriken", 1); - val.AddRecipeGroup("FabusMod:AdamantiteBar", 6); - val.AddIngredient(ItemID.Ruby, 3); - val.AddIngredient(ItemID.SoulofNight, 3); - val.AddTile(TileID.DemonAltar); - val.Register(); + CreateRecipe() + .AddRecipeGroup("FabusMod:CarbonShuriken") + .AddRecipeGroup("FabusMod:AdamantiteBar", 6) + .AddIngredient(ItemID.Ruby, 3) + .AddIngredient(ItemID.SoulofNight, 3) + .AddTile(TileID.DemonAltar) + .Register(); } } diff --git a/Items/Weapons/Thrown/Shuriken/OniSlayer.png b/Items/Weapons/Thrown/Shuriken/DemonSlayer.png similarity index 100% rename from Items/Weapons/Thrown/Shuriken/OniSlayer.png rename to Items/Weapons/Thrown/Shuriken/DemonSlayer.png diff --git a/Items/Weapons/Thrown/Shuriken/HerosShuriken.cs b/Items/Weapons/Thrown/Shuriken/HerosShuriken.cs index 8d1c921..098fbc7 100644 --- a/Items/Weapons/Thrown/Shuriken/HerosShuriken.cs +++ b/Items/Weapons/Thrown/Shuriken/HerosShuriken.cs @@ -14,8 +14,9 @@ public class HerosShuriken : ModItem public override void SetDefaults() { - Item.maxStack = 1; Item.damage = 10; + Item.DamageType = DamageClass.Throwing; + Item.maxStack = 1; Item.knockBack = 0f; Item.useStyle = ItemUseStyleID.Swing; Item.UseSound = SoundID.Item1; @@ -36,11 +37,11 @@ public class HerosShuriken : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddRecipeGroup("IronBar", 3); - val.AddIngredient(ItemID.Emerald, 1); - val.AddTile(TileID.Anvils); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddRecipeGroup("IronBar", 3) + .AddIngredient(ItemID.Emerald) + .AddTile(TileID.Anvils) + .Register(); } } diff --git a/Items/Weapons/Thrown/Shuriken/SparklingDemon.cs b/Items/Weapons/Thrown/Shuriken/SparklingDemon.cs index 95798b6..78b6ec6 100644 --- a/Items/Weapons/Thrown/Shuriken/SparklingDemon.cs +++ b/Items/Weapons/Thrown/Shuriken/SparklingDemon.cs @@ -37,7 +37,7 @@ public class SparklingDemon : ModItem public override void AddRecipes() { Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); + val.AddIngredient(ModContent.ItemType()); val.AddIngredient(ModContent.ItemType(), 6); val.AddIngredient(ModContent.ItemType(), 6); val.AddTile(TileID.AdamantiteForge); diff --git a/Items/Weapons/Thrown/Shuriken/StonePlatedShuriken.cs b/Items/Weapons/Thrown/Shuriken/StonePlatedShuriken.cs index b3f3eb3..b04dfb9 100644 --- a/Items/Weapons/Thrown/Shuriken/StonePlatedShuriken.cs +++ b/Items/Weapons/Thrown/Shuriken/StonePlatedShuriken.cs @@ -15,8 +15,9 @@ public class StonePlatedShuriken : ModItem public override void SetDefaults() { - Item.maxStack = 1; Item.damage = 9; + Item.DamageType = DamageClass.Throwing; + Item.maxStack = 1; Item.knockBack = 0f; Item.useStyle = ItemUseStyleID.Swing; Item.UseSound = SoundID.Item1; @@ -36,11 +37,11 @@ public class StonePlatedShuriken : ModItem public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ItemID.StoneBlock, 3); - val.AddIngredient(ItemID.FallenStar, 1); - val.AddTile(ModContent.TileType()); - val.Register(); + CreateRecipe() + .AddIngredient(ModContent.ItemType()) + .AddIngredient(ItemID.StoneBlock, 3) + .AddIngredient(ItemID.FallenStar) + .AddTile(ModContent.TileType()) + .Register(); } } diff --git a/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs b/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs index 46268a6..0c75d73 100644 --- a/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs +++ b/Items/Weapons/Thrown/Shuriken/TheSpinningRainbow.cs @@ -8,14 +8,14 @@ public class TheSpinningRainbow : ModItem { public override void SetStaticDefaults() { - DisplayName.SetDefault("The Spinning Rainbow"); Tooltip.SetDefault("[c/B6FF00:Autothrows]\nThrows 6 Shurikens at once"); } public override void SetDefaults() { - Item.maxStack = 1; Item.damage = 230; + Item.DamageType = DamageClass.Throwing; + Item.maxStack = 1; Item.knockBack = 0f; Item.useStyle = ItemUseStyleID.Swing; Item.UseSound = SoundID.Item1; @@ -36,10 +36,10 @@ public class TheSpinningRainbow : ModItem 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(); } }