From 266a82b74a487c972c0ec1df69d27a0d7f106362 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 9 Jul 2020 19:30:05 -0400 Subject: [PATCH] Updated Greatwood Sword. --- ...TheGreatwoodSword.cs => GreatwoodSword.cs} | 26 +++++++++--------- Content/Items/Weapons/GreatwoodSword.png | Bin 0 -> 626 bytes Content/Items/Weapons/TheGreatwoodSword.png | Bin 514 -> 0 bytes 3 files changed, 13 insertions(+), 13 deletions(-) rename Content/Items/Weapons/{TheGreatwoodSword.cs => GreatwoodSword.cs} (54%) create mode 100644 Content/Items/Weapons/GreatwoodSword.png delete mode 100644 Content/Items/Weapons/TheGreatwoodSword.png 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 0000000000000000000000000000000000000000..a112c658d6643418c2ba483358cab552d313e26b GIT binary patch literal 626 zcmV-&0*(ENP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940tZP%K~!i%?U%hv zLQx!swXIFDqTAA-hS1gr28PfOO*J&wSW7~4OG{G_EzN;bjyW{c6b*qSBz^GLhqiEiMxIBlNj2CR_Hr;f~N6Q2wsX?`&tMQ$BrkXGi2Za{^V`Rr{O znOrgVyj}A|Hy|UMr`fgn38YizN$)m5(=saahv#=l`TbVS6WsuBla;qBlF%@5+C1sq z210{AG%y_;#>QQbbe;-2SxKe;R* z<>{ijrT!P)-+;<|@#UjwmXoOyaZdw;d;X`hp%YOyAU-r#=i>2v0_2Jh#`p>;XFFKvDM^XX}6Eh*?vuhsZYTiRLLWRd4;MOmDR-rsa>X>T82R%g%eR>KLO zA4^z8`<+W$%GE{PDzc2j3g@0-WHqBms_fHbVdC@GPg`r1VegtyS+={q?%A&|%cWJ7 zW;<#);mkAa$+nx#KeCL+)49#l707N_;mrClvV(`aR7o<6EMp|ST4i`wS^BS+UBt^P ztg>9~+GjPh|CKGTFtR*tA)$9HPx^5q`?N+zIWw+e=IIJ#(vxQYO?NQ1+f+|4!+iHjl7+pAp)2rog{(?5-nAQe((#4K zD6-u9lhwCZWO)Xl&mv7$sbt?1+jc&_FlUS)!ep0B>VH7rA8?#Q*KopXeV7a*qms-c z&G^t+<+xho3v)(Db4Q~akZHD~Yg8FVMC$L;8lrrTEd7+)U%e4W99j0uy2i~g!Ya$v z&*v)0=Q^L&IG!+aDvMCwg8W^t#ues_iYCgssNsZv0Bf%UF5Y)kh5!Hn07*qoM6N<$ Ef?NmvHUIzs