From eeabb41dd6381550982fc7fbe1fe2896f21bf391 Mon Sep 17 00:00:00 2001
From: FyloZ <fylozdev@gmail.com>
Date: Thu, 9 Jul 2020 19:19:13 -0400
Subject: [PATCH] Updated Glided Sickle.

---
 Content/Items/Misc/Souls/SoulofTime.cs |   6 ++--
 Content/Items/Tools/GildedSickle.cs    |  37 +++++++++++++++----------
 Content/Items/Tools/GildedSickle.png   | Bin 610 -> 647 bytes
 3 files changed, 24 insertions(+), 19 deletions(-)

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<ModRecipe> GetRecipes() => new List<ModRecipe>
         {
-            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<SoulofTime>(), 10)
+                .Build(),
+            new RecipeBuilder(this)
+                .WithIngredient(ItemID.Sickle)
+                .WithIngredient(ItemID.PlatinumBar, 5)
+                .WithIngredient(ModContent.ItemType<SoulofTime>(), 10)
+                .Build()
+        };
     }
 }
\ No newline at end of file
diff --git a/Content/Items/Tools/GildedSickle.png b/Content/Items/Tools/GildedSickle.png
index d473ce4a01b846b36bb3f7cecacc78affc0ba9bb..3273186e3b9e03e0483d5602a82643f762e75023 100644
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940vt(1K~z{r?U*@8
z15p%36VX0kB^b4J!vzZ=AjGB7!cr6zMXW3Y#RzH{EZoq-#)XI$lG4IPP*KpzeFZy-
zOW}g87>Rf@7xm$n$;2g-$%Sy{H#3tnFE8(p-S$gqO-Tu9hq^NJ{H*I<k~EqoKW11O
z9S`(tN8jgaZ3`T1S_K)EaqAhTS!tB!CXY+O61NLfrTBIPJUKW6mqu<tY1%r5Rc1S!
zUeMv`1yxZQ-(K4UT`xXRnzpWCnhjJ{gZV{;;L+YbczP73Ds@fGAkEYC<KO^j9m6zR
z)0KvGZb3H4KFZpaW-kL5-(D--nThkNO#A0%LF*Xy%#~v;`zC8xuUQ$D>F$;`F#Zh}
zCnv*z-s}d05ntmiG(F^-!rFR<>rxA_uFZ3R%;NDQ=)XSz6NWWL99hfKc*FWS7_DJ;
z3+wb@8JaG#hfmdARt82>%c0Qw!*gb2eR`4!!~6#fO$R|EwfxbrOiUWKYhV7W7&gpb
zaZY}C?ycCl1kWE1LDsU-ZlSUqvo-u?`QwL)*swG!cNTZcOCV#k533TtT|$~|>1+pm
zqZ6Rf`8U$Uk6}40xO@6Q?g0MUEMtDdG`lcgfi?GRPnFZ4+{ONtStfoAb2i|co#n9^
z&^vq${&auU8}k}g&9y@t8z85!`o<M7VOVGEG%NRHG`lCJrvEa_nBOoH?R$maiut<)
h6KiG}lNq+zUIE#y3T2XKnrHw3002ovPDHLkV1ksk8pr?u

literal 610
zcmV-o0-gPdP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0006hNkl<ZSPA8q
zy-UMT6vba{Cly=-rHV^usVP|S13w0rB7zh*HyxcsK?GeK1qZ3%($!7>1{H%^p;4r6
zMGz|;)TJ#rR4bg9BO2S9Sg|kKAt(2}o0ofky?MFuh#&ezhnh;?S!(yN;3;=qL%Bf}
z#(cE~K~kIB3uTwOOD8by4}_t#PZBBmgS3^Lvc$^%zf7f?lGM`T5ZqSd&Cu4a0JOU&
zRPAzcd7i|4xMc^rfA9b$Ic14Ct}&8gP0cP}AyX@<jg@(fS31nEZD1;KE<HwuB{?Ak
zYED^Vwrh-}D%I5eO&X~iXUEWN=C<nE?H!#UqxJT|Khk{)WvwYo%yErz|7m=bPtm=I
zI3fjSAq0sU;@Es+NODG65_dnbYyAnyUh5eqZR#G>Z(3Q)>~~G~6JzGF!9kvW(7B_d
z54K(7bFIlM{|+(Z;sPmY!61~jT|$-oNRIQ$605p9Gy3-$@_OZt-5_(C>F>uh$;ERy
z*vaQ-$7{d8kNb)7-8L4TMq;V0b*N^NW46Z23r_zpF_K~zFgh^>BJ4m(j>Kvu#dX|Q
zV<DdpPhZ>kB$8l<>a_170jKI7Vk8wC7(kM9x(+2dyB(@iLRNqEiCIZ8gSQ<$pT|(L
zSgdJB=el31vc!BOHPbA=q?t**Nb&ya5@UqPLIJ0mIS~KlnqnMO^@%Z3))wu0Y2^>z
wlKCB4r^w#+BzC6OIDV>Iu&(=+t!$0G0+ye>?x@NQ)Bpeg07*qoM6N<$f>vf5nE(I)