diff --git a/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.cs b/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.cs index 6c7fbf0..9d6aa3e 100644 --- a/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.cs +++ b/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.cs @@ -10,8 +10,9 @@ namespace Decimation.Content.Items.Placeable.ShrineoftheMoltenOne protected override void InitPlaceable() { - item.width = 12; - item.height = 12; + item.width = 14; + item.height = 16; + item.maxStack = 99; } } } \ No newline at end of file diff --git a/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.png b/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.png index 52105d7..d26e3d7 100644 Binary files a/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.png and b/Content/Items/Placeable/ShrineoftheMoltenOne/RedHotSpike.png differ diff --git a/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.cs b/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.cs index fe43174..0edfe14 100644 --- a/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.cs +++ b/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.cs @@ -1,5 +1,7 @@ using Decimation.Content.Buffs.Buffs; using Decimation.Content.Buffs.Debuffs; +using Decimation.Lib.Tiles; +using Decimation.Lib.Util; using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; @@ -8,31 +10,30 @@ using Terraria.DataStructures; namespace Decimation.Content.Tiles.ShrineoftheMoltenOne { - class RedHotSpike : ModTile + class RedHotSpike : DecimationFramedTile { + public override Color MapColor => new Color(196, 35, 0); + public override int TileItem => ModContent.ItemType(); + public override int DustType => DustID.Stone; + public override bool MergeDirt => true; + public override bool HasLight => true; + + private readonly Vector3 _lightColor = LightingUtils.Rgb255ToRgb1(255, 155, 48); - public override void SetDefaults() + protected override void InitFramedTile() { - Main.tileSolid[Type] = true; - Main.tileMergeDirt[Type] = true; - Main.tileBlockLight[Type] = true; - Main.tileLighted[Type] = true; TileID.Sets.DrawsWalls[Type] = true; TileID.Sets.NotReallySolid[Type] = true; - dustType = DustID.Stone; - drop = ModContent.ItemType(); - AddMapEntry(new Color(196, 35, 0)); } - public override void NumDust(int i, int j, bool fail, ref int num) + public override void ModifyLight(int i, int j, ref float r, ref float g, ref float b) { - num = fail ? 1 : 3; + r = _lightColor.X; + g = _lightColor.Y; + b = _lightColor.Z; } - public override bool Dangersense(int i, int j, Player player) - { - return true; - } + public override bool Dangersense(int i, int j, Player player) => true; public override void NearbyEffects(int i, int j, bool closer) { diff --git a/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.png b/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.png index 4ef8254..2ec53e5 100644 Binary files a/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.png and b/Content/Tiles/ShrineoftheMoltenOne/RedHotSpike.png differ