diff --git a/Content/Items/Accessories/Wings/ScarabWings.cs b/Content/Items/Accessories/Wings/ScarabWings.cs index 27df6cf..24f8ae4 100644 --- a/Content/Items/Accessories/Wings/ScarabWings.cs +++ b/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, - (int)(player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f); + Lighting.AddLight((int) (player.position.X + player.width / 2f) / 16, + (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(), 25, 5, player.whoAmI); } @@ -56,14 +56,14 @@ namespace Decimation.Content.Items.Accessories.Wings protected override List GetRecipes() { - ModRecipe recipe = GetNewModRecipe(this, 1, new List { ModContent.TileType() }); + ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); recipe.AddIngredient(ItemID.BeetleWings); recipe.AddIngredient(ItemID.WingsSolar); - recipe.AddIngredient(ModContent.ItemType(), 2); + recipe.AddIngredient(ModContent.ItemType(), 2); recipe.AddIngredient(ModContent.ItemType(), 5); - return new List { recipe }; + return new List {recipe}; } } } \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.cs new file mode 100644 index 0000000..efc7b0e --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.png new file mode 100644 index 0000000..35e6469 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedFlight.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.cs new file mode 100644 index 0000000..bce2daf --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.png new file mode 100644 index 0000000..973b552 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedFright.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.cs new file mode 100644 index 0000000..1ffc57f --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.png new file mode 100644 index 0000000..349f893 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedLife.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.cs new file mode 100644 index 0000000..9a3c106 --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.png new file mode 100644 index 0000000..76998e0 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedLight.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.cs new file mode 100644 index 0000000..8f865ec --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.png new file mode 100644 index 0000000..cb8f629 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedMight.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.cs new file mode 100644 index 0000000..3393787 --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.png new file mode 100644 index 0000000..fc808de Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedNight.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.cs new file mode 100644 index 0000000..384b047 --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.png new file mode 100644 index 0000000..a8f4475 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedSight.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedSoul.cs new file mode 100644 index 0000000..19cccd3 --- /dev/null +++ b/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(); + } + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.cs new file mode 100644 index 0000000..e3082d0 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.png new file mode 100644 index 0000000..118dc75 Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedSpite.png differ diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs b/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.cs new file mode 100644 index 0000000..0c6b483 --- /dev/null +++ b/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(); + } +} \ No newline at end of file diff --git a/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.png b/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.png new file mode 100644 index 0000000..f00b87c Binary files /dev/null and b/Content/Items/Misc/ConcentratedSouls/ConcentratedTime.png differ diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpite.cs b/Content/Items/Misc/CondensedSouls/CondensedSpite.cs deleted file mode 100644 index e18afea..0000000 --- a/Content/Items/Misc/CondensedSouls/CondensedSpite.cs +++ /dev/null @@ -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()); - - recipe.AddIngredient(ModContent.ItemType(), 50); - - return recipe; - } - } -} \ No newline at end of file diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpite.gif b/Content/Items/Misc/CondensedSouls/CondensedSpite.gif deleted file mode 100644 index 5e1f1b1..0000000 Binary files a/Content/Items/Misc/CondensedSouls/CondensedSpite.gif and /dev/null differ diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpite.png b/Content/Items/Misc/CondensedSouls/CondensedSpite.png deleted file mode 100644 index 6f30b94..0000000 Binary files a/Content/Items/Misc/CondensedSouls/CondensedSpite.png and /dev/null differ diff --git a/Content/Items/Misc/CondensedSouls/CondensedSpiteWiki.png b/Content/Items/Misc/CondensedSouls/CondensedSpiteWiki.png deleted file mode 100644 index 25031df..0000000 Binary files a/Content/Items/Misc/CondensedSouls/CondensedSpiteWiki.png and /dev/null differ diff --git a/Content/Items/Misc/Souls/SoulofLife.cs b/Content/Items/Misc/Souls/SoulofLife.cs index c874573..c169db2 100644 --- a/Content/Items/Misc/Souls/SoulofLife.cs +++ b/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(); - refItem.SetDefaults(ItemID.SoulofSight); + item.width = 22; + item.height = 22; + item.maxStack = 999; + item.value = Item.sellPrice(silver: 3); + item.rare = Rarity.Pink.GetRarityValue(); - item.width = refItem.width; - item.height = refItem.height; - item.width = 20; - 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; + ItemID.Sets.AnimatesAsSoul[item.type] = true; + ItemID.Sets.ItemIconPulse[item.type] = true; + ItemID.Sets.ItemNoGravity[item.type] = true; } public class SoulGlobalNPC : GlobalNPC diff --git a/Content/Items/Misc/Souls/SoulofSpite.cs b/Content/Items/Misc/Souls/SoulofSpite.cs index ae366d5..34d0d6d 100644 --- a/Content/Items/Misc/Souls/SoulofSpite.cs +++ b/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(); - refItem.SetDefaults(ItemID.SoulofSight); - - item.width = refItem.width; - item.height = refItem.height; + item.width = 22; + item.height = 22; item.maxStack = 999; item.value = Item.sellPrice(silver: 3); + item.rare = Rarity.Pink.GetRarityValue(); - ItemID.Sets.AnimatesAsSoul[this.item.type] = true; - ItemID.Sets.ItemIconPulse[this.item.type] = true; - ItemID.Sets.ItemNoGravity[this.item.type] = true; + ItemID.Sets.AnimatesAsSoul[item.type] = true; + ItemID.Sets.ItemIconPulse[item.type] = true; + ItemID.Sets.ItemNoGravity[item.type] = true; } // Uncomment when Slime Prince will be done diff --git a/Content/Items/Misc/Souls/SoulofTime.cs b/Content/Items/Misc/Souls/SoulofTime.cs index cfe9f2f..a3f5ec4 100644 --- a/Content/Items/Misc/Souls/SoulofTime.cs +++ b/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.value = Item.sellPrice(0, 0, 3); - item.rare = Rarity.Orange.GetRarityValue(); + item.height = 22; + item.maxStack = 999; + 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; } } diff --git a/Lib/Items/DecimationItem.cs b/Lib/Items/DecimationItem.cs index 8ddfa3c..061d435 100644 --- a/Lib/Items/DecimationItem.cs +++ b/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;