diff --git a/Content/Items/Weapons/TheGreatwoodSword.cs b/Content/Items/Weapons/GreatwoodSword.cs similarity index 54% rename from Content/Items/Weapons/TheGreatwoodSword.cs rename to Content/Items/Weapons/GreatwoodSword.cs index b453f4a..5014074 100644 --- a/Content/Items/Weapons/TheGreatwoodSword.cs +++ b/Content/Items/Weapons/GreatwoodSword.cs @@ -1,12 +1,13 @@ using Decimation.Lib.Items; using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; using Terraria; using Terraria.ID; using Terraria.ModLoader; namespace Decimation.Content.Items.Weapons { - internal class TheGreatwoodSword : DecimationWeapon + internal class GreatwoodSword : DecimationWeapon { protected override string ItemName => "The Greatwood Sword"; protected override string ItemTooltip => "Who needs metal?"; @@ -14,27 +15,26 @@ namespace Decimation.Content.Items.Weapons protected override void InitWeapon() { - item.width = 44; - item.height = 44; + item.width = 48; + item.height = 48; item.useTime = 25; item.useAnimation = 25; item.knockBack = 5; - this.item.value = Item.sellPrice(silver: 40); + item.value = Item.sellPrice(silver: 80); item.rare = Rarity.Green.GetRarityValue(); item.autoReuse = true; - this.item.expert = false; + item.expert = false; } protected override ModRecipe GetRecipe() { - ModRecipe recipe = GetNewModRecipe(this, 1, TileID.Anvils, true); - - recipe.AddIngredient(ItemID.WoodenSword); - recipe.AddIngredient(ItemID.BorealWoodSword); - recipe.AddIngredient(ItemID.ShadewoodSword); - recipe.AddIngredient(ItemID.PalmWoodSword); - - return recipe; + return new RecipeBuilder(this) + .WithIngredient(ItemID.WoodenSword) + .WithIngredient(ItemID.BorealWoodSword) + .WithIngredient(ItemID.ShadewoodSword) + .WithIngredient(ItemID.PalmWoodSword) + .WithStation(TileID.WorkBenches) + .Build(); } } } \ No newline at end of file diff --git a/Content/Items/Weapons/GreatwoodSword.png b/Content/Items/Weapons/GreatwoodSword.png new file mode 100644 index 0000000..a112c65 Binary files /dev/null and b/Content/Items/Weapons/GreatwoodSword.png differ diff --git a/Content/Items/Weapons/TheGreatwoodSword.png b/Content/Items/Weapons/TheGreatwoodSword.png deleted file mode 100644 index ba21a49..0000000 Binary files a/Content/Items/Weapons/TheGreatwoodSword.png and /dev/null differ