diff --git a/Content/Items/Accessories/Trinity/TrinityAccessory.cs b/Content/Items/Accessories/Trinity/TrinityAccessory.cs index 92ea381..071ff53 100644 --- a/Content/Items/Accessories/Trinity/TrinityAccessory.cs +++ b/Content/Items/Accessories/Trinity/TrinityAccessory.cs @@ -1,7 +1,9 @@ using Decimation.Lib.Items; using Decimation.Lib.Util; using Terraria; +using Terraria.ID; using Terraria.ModLoader; +using Terraria.Utilities; namespace Decimation.Content.Items.Accessories.Trinity { @@ -10,7 +12,35 @@ namespace Decimation.Content.Items.Accessories.Trinity public override bool CanEquipAccessory(Player player, int slot) { return !player.HasEquippedAccessory(ModContent.ItemType()) && - !player.HasEquippedAccessory(ModContent.ItemType()); + !player.HasEquippedAccessory(ModContent.ItemType()) && + !player.HasEquippedAccessory(ModContent.ItemType()); + } + + public override bool? PrefixChance(int pre, UnifiedRandom rand) + { + return false; + } + } + + class TrinityBossBagEffects : GlobalItem + { + public override void OpenVanillaBag(string context, Player player, int arg) + { + if (context == "bossBag") + { + switch (arg) + { + case ItemID.TwinsBossBag: + player.QuickSpawnItem(ModContent.ItemType()); + break; + case ItemID.DestroyerBossBag: + player.QuickSpawnItem(ModContent.ItemType()); + break; + case ItemID.SkeletronPrimeBossBag: + player.QuickSpawnItem(ModContent.ItemType()); + break; + } + } } } } \ No newline at end of file diff --git a/Lib/Tiles/DecimationMultiTile.cs b/Lib/Tiles/DecimationMultiTile.cs index a7eb097..1e9af32 100644 --- a/Lib/Tiles/DecimationMultiTile.cs +++ b/Lib/Tiles/DecimationMultiTile.cs @@ -61,7 +61,6 @@ namespace Decimation.Lib.Tiles public override void KillMultiTile(int i, int j, int frameX, int frameY) { - Main.NewText(1); Item.NewItem(i * 16, j * 16, _width, _height, TileItem); } diff --git a/Lib/Util/PlayerUtils.cs b/Lib/Util/PlayerUtils.cs index dbd933d..9d3df3e 100644 --- a/Lib/Util/PlayerUtils.cs +++ b/Lib/Util/PlayerUtils.cs @@ -36,7 +36,6 @@ namespace Decimation.Lib.Util { int manaAmount = Main.rand.Next(minMana, maxMana + 1); player.ManaEffect(manaAmount); - Main.NewText(manaAmount); if (target.GetType() == typeof(Player)) {