From 3852419581ca6bd91b570b1d2b7373f95f7e84ab Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 9 Jul 2020 19:34:11 -0400 Subject: [PATCH] Updated Multigrain Sword. --- Content/Items/Weapons/MultigrainSword.cs | 27 +++++++++++----------- Content/Items/Weapons/MultigrainSword.png | Bin 648 -> 864 bytes 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Content/Items/Weapons/MultigrainSword.cs b/Content/Items/Weapons/MultigrainSword.cs index 6f9b296..38f3dbb 100644 --- a/Content/Items/Weapons/MultigrainSword.cs +++ b/Content/Items/Weapons/MultigrainSword.cs @@ -1,5 +1,7 @@ +using Decimation.Content.Projectiles; using Decimation.Lib.Items; using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; using Terraria; using Terraria.ID; using Terraria.ModLoader; @@ -11,16 +13,16 @@ namespace Decimation.Content.Items.Weapons protected override string ItemName => "Multigrain Sword"; protected override string ItemTooltip => "Smells like honeysuckle"; protected override int Damages => 30; - protected override string ProjectileName => "Stinger"; + protected override int ProjectileId => ModContent.ProjectileType(); protected override void InitWeapon() { - item.width = 36; - item.height = 37; + item.width = 58; + item.height = 58; item.useTime = 26; item.useAnimation = 26; item.knockBack = 5; - item.value = Item.sellPrice(0, 0, 40); + item.value = Item.sellPrice(silver: 88); item.rare = Rarity.Green.GetRarityValue(); item.crit = 4; item.autoReuse = true; @@ -30,15 +32,14 @@ namespace Decimation.Content.Items.Weapons protected override ModRecipe GetRecipe() { - ModRecipe recipe = GetNewModRecipe(this, 1, TileID.Anvils, true); - - recipe.AddIngredient(ItemID.CactusSword); - recipe.AddIngredient(ItemID.Pumpkin, 15); - recipe.AddIngredient(ItemID.Acorn, 5); - recipe.AddIngredient(ItemID.Hay, 15); - recipe.AddIngredient(ModContent.ItemType()); - - return recipe; + return new RecipeBuilder(this) + .WithIngredient(ItemID.CactusSword) + .WithIngredient(ItemID.Pumpkin, 15) + .WithIngredient(ItemID.Acorn, 5) + .WithIngredient(ItemID.Hay, 15) + .WithIngredient(ModContent.ItemType()) + .WithStation(TileID.Loom) + .Build(); } } } \ No newline at end of file diff --git a/Content/Items/Weapons/MultigrainSword.png b/Content/Items/Weapons/MultigrainSword.png index 7db78bb65ef3a7632d51634dec4c83425cd5d7e3..e4d0f4a5654c43b239c0aabb010fce74e561069e 100644 GIT binary patch literal 864 zcmV-m1E2hfP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0`*BmK~!i%?U-Fi zQ(+j#mq_J}6%pv@N?oPWMMRDWya*}`qUghmqLx&oQ4&-X7>q8Ah=Phhqe52Lg+&-a zQb89+kVTi-hbdjeCS}lsqAx7Y|J`5kfx~fjcD8n&AH4jxgLCfv`8@BlGcAy(gcp?l zNj(Gwsmy!w#;7#dabXX#q4_dWjpjOb1_@2}y-naVs?l79CZ)kEmmVN@?_G^lqq&YW zNrS}BBvGTef}P1wa4vEn{u!x8Q{=2snruB-kLULu_94?XNz`bzurs+m^ago-U?Fm{ zCW#vL8fo(Cwfo4};RNznXC-p&sxY$UTo=;GBvGSY;bby$rWCnr#~Nh1CW#t#i;8)( zVT`={^abz9>+L5ZR*ai^eDWL8Et5ozx&_Tu?Kf}Lf6)k*CfhfBM>clPM6zc8)g)1) zZbP&4HyfkJ7w<&U7;)PqQKRW1yQ^ebc}eP#f!$Qn7>yy>o!vr>rVEX>-Ztl7=c8fd zww1*MIPMxvz3wT-b29cmiL7cezv58+3S_9d0vRlug(Um#oJTfo4I*1Mn%b2A5k!qn z5!+qk4)?d2jZS_vGiYzm#M-N^Gkdi>`UA5aN^yRYx zEX$;|$|`?jt&9A`l32#9Wp!O^#fOquyl$PVJX^iQH%1+6^k&1vAKB7jYKvW%-S=*6 zI`Zh#Ur54ke75TeQld5LGLE|`&C)1m+QQQ#NY*R6GhsLO%A6f)R6?`zoMZ>xRP+@o zYnG-tL1oLV8YR*sXVtbFaU{P-64vt2t3u@ZXc2Nz-6&FxW|&DEWtWvEfBhOh~Dlad_eprj}qw^B6ZHpYPi;lPyb zBCU3C(5UD4ey87Wd$+yQ>{oVppPuLUzVGjOK7F6({Y_CM`{iUSpZ2h-_WA&4g-98DD9qYD`opk1s6-j{zEh>tF2`tVT zv72zeXywxo$k^Kalx)6*&oM_;j>lb2>mUR&Ac9KMC4=Yr-4V^Ajs2FP$5b*7RYM*( z%MxTJdRr*qI`fjPEiELAZ&Rw8VQ>Ap%10>dyCD`n1Dij#)@Mo=T3R2zC4YHnKrMr5 z>EZQ_e2{?;Lh8-BjdX-!rf-i$fr_ZQLw5z)zCqT7&7B?Oi)7$$9$nEozTV{MxJXAR zw#(FNKqm4O;_3qlXa@do$zT)d2*qd!nLD?0@=*qLvrGE*GgH??mif9I5)5*%HLPYGI(RH(gc|F`N=`pVk>1>snSiLebuUmXNtf0&y)X i{-4u3q48en2z>(xjoIE__?I960000