Fix loading problems

This commit is contained in:
2025-11-10 00:35:53 +00:00
parent bc2c06337b
commit 6353f76455
4 changed files with 18 additions and 14 deletions
-2
View File
@@ -30,7 +30,6 @@ namespace ForgottenWawiTech.Content.Items
Item.useAmmo = AmmoID.None; 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) 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 // 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"))) 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); 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 break; // Only kill one player per shot
} }
} }

Before

Width:  |  Height:  |  Size: 504 B

After

Width:  |  Height:  |  Size: 504 B

+6 -5
View File
@@ -1,5 +1,6 @@
using Terraria; using Terraria;
using Terraria.ModLoader; using Terraria.ModLoader;
using System.Collections.Generic;
namespace ForgottenWawiTech.Content.Items.Prefixes namespace ForgottenWawiTech.Content.Items.Prefixes
{ {
@@ -22,17 +23,17 @@ namespace ForgottenWawiTech.Content.Items.Prefixes
valueMult = 1.5f; valueMult = 1.5f;
} }
public override IEnumerable<TooltipLine> ModifyTooltips(Item item, IEnumerable<TooltipLine> tooltips) public override IEnumerable<TooltipLine> GetTooltipLines(Item item)
{ {
yield return new TooltipLine(Mod, "HealthyPrefix", "+20 Max HP") yield return new TooltipLine(Mod, "HealthyPrefix", "+20 Max HP")
{ {
isModifier = true, IsModifier = true,
isModifierBad = false IsModifierBad = false
}; };
yield return new TooltipLine(Mod, "HealthyPrefixRegen", "+3 HP/s") yield return new TooltipLine(Mod, "HealthyPrefixRegen", "+3 HP/s")
{ {
isModifier = true, IsModifier = true,
isModifierBad = false IsModifierBad = false
}; };
} }
} }
@@ -11,12 +11,7 @@ Items: {
} }
BoulderCannon: { BoulderCannon: {
Tooltip: Tooltip: I've been a baaaaad raccoon.
'''
I've been a baaaaad raccoon.
Fires boulders at supersonic speeds.
Useful for punishing raccoons.
'''
DisplayName: Pete DisplayName: Pete
} }
@@ -55,7 +50,7 @@ Items: {
''' '''
Summons Lyyka. Summons Lyyka.
Not consumable Not consumable
'A strum, of a ranger.' 'A strum, a heartbeat, a whisper.'
''' '''
DisplayName: SLW STRIX DisplayName: SLW STRIX
} }
@@ -99,6 +94,16 @@ Items: {
DisplayName: Soul Of Avalon DisplayName: Soul Of Avalon
Tooltip: "" Tooltip: ""
} }
RGBAlloy: {
DisplayName: R G B Alloy
Tooltip: ""
}
VisorShard: {
DisplayName: Visor Shard
Tooltip: ""
}
} }
NPCs: { NPCs: {