From e14436efd7b5fd3584976585a40330b8951fe02f Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 9 Jul 2020 19:49:02 -0400 Subject: [PATCH] Updated the Sling. --- Content/Items/Weapons/Sling.cs | 20 ++++++++++++++++---- Content/Items/Weapons/Sling.png | Bin 408 -> 450 bytes 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Content/Items/Weapons/Sling.cs b/Content/Items/Weapons/Sling.cs index abb61e8..0505fa8 100644 --- a/Content/Items/Weapons/Sling.cs +++ b/Content/Items/Weapons/Sling.cs @@ -1,9 +1,10 @@ using Decimation.Content.Items.Ammo; using Decimation.Lib.Items; using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; +using Terraria; using Terraria.ID; using Terraria.ModLoader; -using Terraria.ModLoader.Config; namespace Decimation.Content.Items.Weapons { @@ -13,12 +14,12 @@ namespace Decimation.Content.Items.Weapons protected override string ItemTooltip => "Uses pebbles and marbles as ammo"; protected override DamageType DamagesType => DamageType.Throw; protected override int Damages => 9; - protected override string AmmoName => "Pebble"; + protected override int AmmoId => ModContent.ItemType(); protected override void InitWeapon() { - item.width = 30; - item.height = 22; + item.width = 28; + item.height = 26; item.useTime = 25; item.useAnimation = 25; item.rare = Rarity.Orange.GetRarityValue(); @@ -26,6 +27,17 @@ namespace Decimation.Content.Items.Weapons item.crit = 10; item.shoot = 1; item.useTurn = false; + item.value = Item.sellPrice(copper: 12); + } + + protected override ModRecipe GetRecipe() + { + return new RecipeBuilder(this) + .WithIngredient(ItemID.Leather) + .WithIngredient(ItemID.Cobweb, 5) + .WithStation(TileID.Tables) + .WithStation(TileID.Chairs) + .Build(); } } } \ No newline at end of file diff --git a/Content/Items/Weapons/Sling.png b/Content/Items/Weapons/Sling.png index c36078b2f8f3fedca1876e0a8170642d8f8f1edb..1032f4961bc5c619197c5e6987a3b14a04833b0e 100644 GIT binary patch delta 409 zcmV;K0cQS~1HuC#iBL{Q4GJ0x0000DNk~Le0000S0000Q2nGNE0HjnriIE{Re*srX zL_t(YOVyRVN&`U@Mn|#G6p|1mCWRudK@kjyn!>dD2-YGh_y#uizJY}z+S=M_rNkme z0ue-6S3(+N{DH0PMB&SPg%>Bg)y{gFGj{`lvoo3WsE{~A$#1<3h4<$F`Q5$Rkr7zP zvP?38c_cjur&0s3r0%uhw*Lvsf719An#!tAFR+Q_xiP)!aCXyxSsK5>`SD@QEHj-x zBHv8G$-peNUs%j%fBoM2)far>zIH8>nBI`RLYD1rtzdreJeVAv*WilV3RN1PLY5ux zY~lfFz5DR#Wd$ZzcTG5`RGwDeJoXA#muB&RJU)NuRfmaO8V=e^mMxS@Z(Xyy?0@j*}qG{mu!$g%M?Awp?;;S9-3?+Kw<+id1z6T*$# z#Te6ogrtHSrxPj{VlxEyZTZ7te>t`Imk?}GD4}v8Hlwgpv4nymA6a4oJ?BE~ySh3d zsX$`IzBDvXiphRm8XpQNppc^2MVW*C&K;}MySSW9jBwqpEbrUV!kRf3X%s}VC~_n4 z9cwopK&+ou3)x2ut~Z&gs*G?tUo5PL7bDbSV4w4$AIcAc$Ma?R3dvw%MV^jAK*-vE zWGUJcvJWO0;o{6x