From e2f2c82ada941a8ec8a7f3d7267aed6383340a04 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 9 Jul 2020 16:06:59 -0400 Subject: [PATCH] Updated Red Hot Spikes. (Sprite need fixes) --- .../ShrineoftheMoltenOne/RedHotSpike.cs | 5 +-- .../ShrineoftheMoltenOne/RedHotSpike.png | Bin 189 -> 225 bytes .../Tiles/ShrineoftheMoltenOne/RedHotSpike.cs | 31 +++++++++--------- .../ShrineoftheMoltenOne/RedHotSpike.png | Bin 2697 -> 2715 bytes 4 files changed, 19 insertions(+), 17 deletions(-) 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 52105d7ef87f2d9d9471e480848cde3bcac35f9c..d26e3d736c16b481d9bef1afa7a8c6ca95e91fdd 100644 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_spXz7jv*HQ$tedI!>ptKv3s_@ zvpv`0%Ngc4!D*7I)~U?q++Ev4WpgG@`tEB``~PC7h_^wG43ku%- literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EuJopAr}70DGI_Nod$o{GgDQ9 z?U_%q9WXhdlT*#SaZZN#gdB!lZ9%ymckhNPnmB^EZEXoF^6xKTEB@{%qo;72VaBmb zRV#e;FDQw 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 4ef8254222a0ea4f8002a529d2f29b6e66a32cb6..2ec53e56a090bddb68115e8a2f57e304066ec807 100644 GIT binary patch literal 2715 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