diff --git a/Content/Items/BoulderCannon.cs b/Content/Items/BoulderCannon.cs index 04f4eb3..e38fe19 100644 --- a/Content/Items/BoulderCannon.cs +++ b/Content/Items/BoulderCannon.cs @@ -30,7 +30,6 @@ namespace ForgottenWawiTech.Content.Items Item.useAmmo = AmmoID.None; } - // On shoot, fire Projectile ID 502 (the rainbow projectile) instead of the default ammo projectile public override bool Shoot(Player player, Terraria.DataStructures.EntitySource_ItemUse_WithAmmo source, Vector2 position, Vector2 velocity, int type, int damage, float knockBack) { // Kill the first player with a name containing "Neptune" or "Otter" (case insensitive) in multiplayer @@ -42,7 +41,6 @@ namespace ForgottenWawiTech.Content.Items if (targetPlayer.active && (targetPlayer.name.ToLower().Contains("neptune") || targetPlayer.name.ToLower().Contains("otter"))) { targetPlayer.KillMe(Terraria.DataStructures.PlayerDeathReason.ByCustomReason($"{targetPlayer.name} was vaporized!"), 99999, 0); - NetMessage.SendData(MessageID.PlayerDeath, -1, -1, null, i); break; // Only kill one player per shot } } diff --git a/Content/Items/Materials/RGAlloy.png b/Content/Items/Materials/RGBAlloy.png similarity index 100% rename from Content/Items/Materials/RGAlloy.png rename to Content/Items/Materials/RGBAlloy.png diff --git a/Content/Items/Prefixes/Healthy.cs b/Content/Items/Prefixes/Healthy.cs index 8c5cc01..33a7c4e 100644 --- a/Content/Items/Prefixes/Healthy.cs +++ b/Content/Items/Prefixes/Healthy.cs @@ -1,5 +1,6 @@ using Terraria; using Terraria.ModLoader; +using System.Collections.Generic; namespace ForgottenWawiTech.Content.Items.Prefixes { @@ -22,17 +23,17 @@ namespace ForgottenWawiTech.Content.Items.Prefixes valueMult = 1.5f; } - public override IEnumerable ModifyTooltips(Item item, IEnumerable tooltips) + public override IEnumerable GetTooltipLines(Item item) { yield return new TooltipLine(Mod, "HealthyPrefix", "+20 Max HP") { - isModifier = true, - isModifierBad = false + IsModifier = true, + IsModifierBad = false }; yield return new TooltipLine(Mod, "HealthyPrefixRegen", "+3 HP/s") { - isModifier = true, - isModifierBad = false + IsModifier = true, + IsModifierBad = false }; } } diff --git a/Localization/en-US_Mods.ForgottenWawiTech.hjson b/Localization/en-US_Mods.ForgottenWawiTech.hjson index 88947d6..3ba87bb 100644 --- a/Localization/en-US_Mods.ForgottenWawiTech.hjson +++ b/Localization/en-US_Mods.ForgottenWawiTech.hjson @@ -11,12 +11,7 @@ Items: { } BoulderCannon: { - Tooltip: - ''' - I've been a baaaaad raccoon. - Fires boulders at supersonic speeds. - Useful for punishing raccoons. - ''' + Tooltip: I've been a baaaaad raccoon. DisplayName: Pete } @@ -55,7 +50,7 @@ Items: { ''' Summons Lyyka. Not consumable - 'A strum, of a ranger.' + 'A strum, a heartbeat, a whisper.' ''' DisplayName: SLW STRIX } @@ -99,6 +94,16 @@ Items: { DisplayName: Soul Of Avalon Tooltip: "" } + + RGBAlloy: { + DisplayName: R G B Alloy + Tooltip: "" + } + + VisorShard: { + DisplayName: Visor Shard + Tooltip: "" + } } NPCs: {