From 70f3ccf4452581fab1bcb1ef944ec4ab1ec42c14 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 9 Jul 2020 19:46:40 -0400 Subject: [PATCH] Updated Titan Forge's item. --- Content/Items/Misc/Souls/SoulofSpite.cs | 4 ++-- Content/Items/Placeable/TitanForge.cs | 8 +++++--- Content/Items/Placeable/TitanForge.png | Bin 768 -> 528 bytes Content/Items/Weapons/SlingshotWood.cs | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Content/Items/Misc/Souls/SoulofSpite.cs b/Content/Items/Misc/Souls/SoulofSpite.cs index b488d52..ae366d5 100644 --- a/Content/Items/Misc/Souls/SoulofSpite.cs +++ b/Content/Items/Misc/Souls/SoulofSpite.cs @@ -18,8 +18,8 @@ namespace Decimation.Content.Items.Misc.Souls item.width = refItem.width; item.height = refItem.height; - this.item.maxStack = 999; - item.value = 50000; + item.maxStack = 999; + item.value = Item.sellPrice(silver: 3); ItemID.Sets.AnimatesAsSoul[this.item.type] = true; ItemID.Sets.ItemIconPulse[this.item.type] = true; diff --git a/Content/Items/Placeable/TitanForge.cs b/Content/Items/Placeable/TitanForge.cs index d9c8a65..692f79d 100644 --- a/Content/Items/Placeable/TitanForge.cs +++ b/Content/Items/Placeable/TitanForge.cs @@ -1,5 +1,6 @@ using Decimation.Content.Items.Misc.Souls; using Decimation.Lib.Items; +using Terraria; using Terraria.ID; using Terraria.ModLoader; @@ -13,9 +14,10 @@ namespace Decimation.Content.Items.Placeable protected override void InitPlaceable() { - item.width = 20; - item.height = 20; - this.item.maxStack = 1; + item.width = 32; + item.height = 32; + item.value = Item.sellPrice(gold: 42, silver: 25); + item.maxStack = 1; } protected override ModRecipe GetRecipe() diff --git a/Content/Items/Placeable/TitanForge.png b/Content/Items/Placeable/TitanForge.png index d7a8ec3d52dfb167dd91a88de6ea801972cfe903..86ae48a54b913f70a3763c289df65aec0c9b47eb 100644 GIT binary patch literal 528 zcmV+r0`L8aP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0i{VqK~z{r-ImWQ z1YsP;hg|GY%1(CKlii$TO}Qwg+>{~*NuemM1Io!?pm6Y`98lCAlv4JjlyXsHC8u4d z&C*hGaNtPu%sf;3Y8u1V`|`PbW~R4kzR&yPJ5^dhqLJ8#b6H05z7Y6b7S)cW@#6&g zhsJSFjt+L8cfY;m-R>pCiUA>kxqoWNjK0L!glTa@KRu{fK+e3>7t zAeV+*GR}Jl$BE?4ZLB}}yMSvzoYVbDd;h9<=c<8qKhjJ_V8maA0bifh3NrFTemkfC7vY z$2A(UuQIOh;eQmPPu`&aZta)-BrkLoC>;P0s}iaJ%rjr_3j_(D%@ghT|HHR~|8)<| z$X*4K2cS`ds5Gn$s&`@ap{(}}uL8*ez;v{#q?*Jh^2TvhP<_Z(jq3ZnQK)nP0E9`Y z5*p`y%C#0|^NMEc^uE!TiG2r27J!;k2#D4^C;e7J0VqGDeZQk^l0WC4T#VT&lBwF`Gn`|=x diff --git a/Content/Items/Weapons/SlingshotWood.cs b/Content/Items/Weapons/SlingshotWood.cs index 5ec6275..46911a0 100644 --- a/Content/Items/Weapons/SlingshotWood.cs +++ b/Content/Items/Weapons/SlingshotWood.cs @@ -14,7 +14,6 @@ namespace Decimation.Content.Items.Weapons protected override string ItemTooltip => "Uses pebbles and marbles as ammo"; protected override DamageType DamagesType => DamageType.Ranged; protected override int Damages => 7; - protected override string AmmoName => "Pebble"; protected override int AmmoId => ModContent.ItemType(); protected override void InitWeapon()