diff --git a/Content/Items/Misc/Souls/SoulofTime.cs b/Content/Items/Misc/Souls/SoulofTime.cs index 5446da4..cfe9f2f 100644 --- a/Content/Items/Misc/Souls/SoulofTime.cs +++ b/Content/Items/Misc/Souls/SoulofTime.cs @@ -16,12 +16,10 @@ namespace Decimation.Content.Items.Misc.Souls { item.width = 22; item.height = 24; - item.value = Item.sellPrice(0, 0, 1); + item.value = Item.sellPrice(0, 0, 3); item.rare = Rarity.Orange.GetRarityValue(); - this.item.maxStack = 999; - - ItemID.Sets.ItemNoGravity[this.item.type] = true; + ItemID.Sets.ItemNoGravity[item.type] = true; } } } \ No newline at end of file diff --git a/Content/Items/Tools/GildedSickle.cs b/Content/Items/Tools/GildedSickle.cs index 73b4edc..26772a8 100644 --- a/Content/Items/Tools/GildedSickle.cs +++ b/Content/Items/Tools/GildedSickle.cs @@ -1,4 +1,8 @@ +using System.Collections.Generic; +using Decimation.Content.Items.Misc.Souls; using Decimation.Lib.Items; +using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; using Terraria; using Terraria.ID; using Terraria.ModLoader; @@ -13,25 +17,28 @@ namespace Decimation.Content.Items.Tools protected override void InitTool() { - this.item.CloneDefaults(ItemID.Sickle); - - item.width = 16; - item.height = 16; - item.value = Item.sellPrice(0, 0, 1); - this.item.knockBack = 5; + item.CloneDefaults(ItemID.Sickle); + item.width = 44; + item.height = 44; + item.value = Item.sellPrice(gold: 1); + item.knockBack = 5; item.useTime = 14; item.useAnimation = 14; + item.rare = Rarity.LightRed.GetRarityValue(); } - protected override ModRecipe GetRecipe() + protected override List GetRecipes() => new List { - ModRecipe recipe = GetNewModRecipe(this, 1, TileID.Anvils); - - recipe.AddIngredient(ItemID.Sickle); - recipe.AddIngredient(ItemID.GoldBar, 5); - recipe.AddIngredient(null, "SoulofTime", 10); - - return recipe; - } + new RecipeBuilder(this) + .WithIngredient(ItemID.Sickle) + .WithIngredient(ItemID.GoldBar, 5) + .WithIngredient(ModContent.ItemType(), 10) + .Build(), + new RecipeBuilder(this) + .WithIngredient(ItemID.Sickle) + .WithIngredient(ItemID.PlatinumBar, 5) + .WithIngredient(ModContent.ItemType(), 10) + .Build() + }; } } \ No newline at end of file diff --git a/Content/Items/Tools/GildedSickle.png b/Content/Items/Tools/GildedSickle.png index d473ce4..3273186 100644 Binary files a/Content/Items/Tools/GildedSickle.png and b/Content/Items/Tools/GildedSickle.png differ