Updated souls.

Added all Concentrated Souls.

Content/Items/Accessories/Wings/ScarabWings.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Decimation.Content.Items.Misc.CondensedSouls;
+using Decimation.Content.Items.Misc.ConcentratedSouls;
 using Decimation.Content.Items.Ores;
 using Decimation.Content.Projectiles.Item.Accessory;
 using Decimation.Content.Tiles;
@@ -30,10 +30,10 @@ namespace Decimation.Content.Items.Accessories.Wings
         public override void UpdateAccessory(Player player, bool hideVisual)
         {
             player.wingTimeMax = 240;
-            Lighting.AddLight((int)(player.position.X + player.width / 2f) / 16,
+            Lighting.AddLight((int) (player.position.X + player.width / 2f) / 16,
-                (int)(player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f);
+                (int) (player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f);
 
-            if ((int)player.wingTime % 2 == 1)
+            if ((int) player.wingTime % 2 == 1)
                 Projectile.NewProjectile(player.Center, new Vector2(0, 0), ModContent.ProjectileType<Ember>(), 25, 5,
                     player.whoAmI);
         }
@@ -56,14 +56,14 @@ namespace Decimation.Content.Items.Accessories.Wings
 
         protected override List<ModRecipe> GetRecipes()
         {
-            ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> { ModContent.TileType<TitanForge>() });
+            ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<TitanForge>()});
 
             recipe.AddIngredient(ItemID.BeetleWings);
             recipe.AddIngredient(ItemID.WingsSolar);
-            recipe.AddIngredient(ModContent.ItemType<CondensedSpite>(), 2);
+            recipe.AddIngredient(ModContent.ItemType<ConcentratedSpite>(), 2);
             recipe.AddIngredient(ModContent.ItemType<DenziumBar>(), 5);
 
-            return new List<ModRecipe> { recipe };
+            return new List<ModRecipe> {recipe};
         }
     }
 }

Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs

@@ -0,0 +1,10 @@
+using Terraria.ID;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedFlight : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Flight";
+        public override int Soul => ItemID.SoulofFlight;
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedFright.cs

@@ -0,0 +1,10 @@
+using Terraria.ID;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedFright : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Fright";
+        public override int Soul => ItemID.SoulofFright;
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs

@@ -0,0 +1,11 @@
+using Decimation.Content.Items.Misc.Souls;
+using Terraria.ModLoader;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedLife : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Life";
+        public override int Soul => ModContent.ItemType<SoulofLife>();
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedLight.cs

@@ -0,0 +1,10 @@
+using Terraria.ID;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedLight : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Light";
+        public override int Soul => ItemID.SoulofLight;
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedMight.cs

@@ -0,0 +1,10 @@
+using Terraria.ID;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedMight : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Might";
+        public override int Soul => ItemID.SoulofMight;
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedNight.cs

@@ -0,0 +1,10 @@
+using Terraria.ID;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedNight : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Night";
+        public override int Soul => ItemID.SoulofNight;
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs

@@ -0,0 +1,10 @@
+using Terraria.ID;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedSight : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Sight";
+        public override int Soul => ItemID.SoulofSight;
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs

@@ -0,0 +1,31 @@
+using Decimation.Lib.Items;
+using Decimation.Lib.Util;
+using Decimation.Lib.Util.Builder;
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public abstract class ConcentratedSoul : DecimationItem
+    {
+        public abstract int Soul { get; }
+
+        protected override void Init()
+        {
+            item.width = 38;
+            item.height = 50;
+            item.value = Item.sellPrice(gold: 1, silver: 50);
+            item.rare = Rarity.Pink.GetRarityValue();
+            item.maxStack = 99;
+        }
+
+        protected override ModRecipe GetRecipe()
+        {
+            return new RecipeBuilder(this)
+                .WithIngredient(Soul, 50)
+                .WithStation(TileID.AlchemyTable)
+                .Build();
+        }
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs

@@ -0,0 +1,12 @@
+using Decimation.Content.Items.Misc.Souls;
+using Terraria.ModLoader;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    internal class ConcentratedSpite : ConcentratedSoul
+    {
+        protected override string ItemName => "Condensed Spite";
+        protected override string ItemTooltip => "His soul emanates a primal sense of hatred";
+        public override int Soul => ModContent.ItemType<SoulofSpite>();
+    }
+}

Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs

@@ -0,0 +1,11 @@
+using Decimation.Content.Items.Misc.Souls;
+using Terraria.ModLoader;
+
+namespace Decimation.Content.Items.Misc.ConcentratedSouls
+{
+    public class ConcentratedTime : ConcentratedSoul
+    {
+        protected override string ItemName => "Concentrated Time";
+        public override int Soul => ModContent.ItemType<SoulofTime>();
+    }
+}

Content/Items/Misc/CondensedSouls/CondensedSpite.cs

@@ -1,41 +0,0 @@
-using Decimation.Content.Items.Misc.Souls;
-using Decimation.Content.Tiles;
-using Decimation.Lib.Items;
-using Decimation.Lib.Util;
-using Terraria;
-using Terraria.DataStructures;
-using Terraria.ID;
-using Terraria.ModLoader;
-
-namespace Decimation.Content.Items.Misc.CondensedSouls
-{
-    internal class CondensedSpite : DecimationItem
-    {
-        protected override string ItemName => "Condensed Spite";
-        protected override string ItemTooltip => "his soul emanates a primal sense of hatred";
-        protected override DrawAnimation Animation => new DrawAnimationVertical(5, 4);
-
-        protected override void Init()
-        {
-            this.item.CloneDefaults(ItemID.SoulofSight);
-
-            item.width = 44;
-            item.height = 44;
-            item.value = Item.sellPrice(0, 50);
-            item.rare = Rarity.Red.GetRarityValue();
-
-            ItemID.Sets.AnimatesAsSoul[this.item.type] = true;
-            ItemID.Sets.ItemIconPulse[this.item.type] = true;
-            ItemID.Sets.ItemNoGravity[this.item.type] = true;
-        }
-
-        protected override ModRecipe GetRecipe()
-        {
-            ModRecipe recipe = GetNewModRecipe(this, 1, ModContent.TileType<ChlorophyteAnvil>());
-
-            recipe.AddIngredient(ModContent.ItemType<SoulofSpite>(), 50);
-
-            return recipe;
-        }
-    }
-}

Content/Items/Misc/Souls/SoulofLife.cs

@@ -1,4 +1,5 @@
 using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.DataStructures;
 using Terraria.ID;
@@ -14,20 +15,15 @@ namespace Decimation.Content.Items.Misc.Souls
 
         protected override void Init()
         {
-            Item refItem = new Item();
+            item.width = 22;
-            refItem.SetDefaults(ItemID.SoulofSight);
+            item.height = 22;
+            item.maxStack = 999;
+            item.value = Item.sellPrice(silver: 3);
+            item.rare = Rarity.Pink.GetRarityValue();
 
-            item.width = refItem.width;
+            ItemID.Sets.AnimatesAsSoul[item.type] = true;
-            item.height = refItem.height;
+            ItemID.Sets.ItemIconPulse[item.type] = true;
-            item.width = 20;
+            ItemID.Sets.ItemNoGravity[item.type] = true;
-            item.height = 20;
-            item.value = Item.sellPrice(silver: 2);
-
-            this.item.maxStack = 999;
-
-            ItemID.Sets.AnimatesAsSoul[this.item.type] = true;
-            ItemID.Sets.ItemIconPulse[this.item.type] = true;
-            ItemID.Sets.ItemNoGravity[this.item.type] = true;
         }
 
         public class SoulGlobalNPC : GlobalNPC

Content/Items/Misc/Souls/SoulofSpite.cs

@@ -1,4 +1,5 @@
 using Decimation.Lib.Items;
+using Decimation.Lib.Util;
 using Terraria;
 using Terraria.DataStructures;
 using Terraria.ID;
@@ -13,17 +14,15 @@ namespace Decimation.Content.Items.Misc.Souls
 
         protected override void Init()
         {
-            Item refItem = new Item();
+            item.width = 22;
-            refItem.SetDefaults(ItemID.SoulofSight);
+            item.height = 22;
-
-            item.width = refItem.width;
-            item.height = refItem.height;
             item.maxStack = 999;
             item.value = Item.sellPrice(silver: 3);
+            item.rare = Rarity.Pink.GetRarityValue();
 
-            ItemID.Sets.AnimatesAsSoul[this.item.type] = true;
+            ItemID.Sets.AnimatesAsSoul[item.type] = true;
-            ItemID.Sets.ItemIconPulse[this.item.type] = true;
+            ItemID.Sets.ItemIconPulse[item.type] = true;
-            ItemID.Sets.ItemNoGravity[this.item.type] = true;
+            ItemID.Sets.ItemNoGravity[item.type] = true;
         }
 
         // Uncomment when Slime Prince will be done

Content/Items/Misc/Souls/SoulofTime.cs

@@ -15,10 +15,13 @@ namespace Decimation.Content.Items.Misc.Souls
         protected override void Init()
         {
             item.width = 22;
-            item.height = 24;
+            item.height = 22;
-            item.value = Item.sellPrice(0, 0, 3);
+            item.maxStack = 999;
-            item.rare = Rarity.Orange.GetRarityValue();
+            item.value = Item.sellPrice(silver: 3);
+            item.rare = Rarity.Pink.GetRarityValue();
 
+            ItemID.Sets.AnimatesAsSoul[item.type] = true;
+            ItemID.Sets.ItemIconPulse[item.type] = true;
             ItemID.Sets.ItemNoGravity[item.type] = true;
         }
     }

Lib/Items/DecimationItem.cs

@@ -28,7 +28,7 @@ namespace Decimation.Lib.Items
             this.item.width = 16;
             this.item.useAnimation = 20;
             this.item.useTime = 20;
-            this.item.useStyle = 1;
+            this.item.useStyle = 0;
             this.item.maxStack = 999;
             this.item.noMelee = true;
             this.item.UseSound = SoundID.Item1;