Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Balance #786

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Balance #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a58a36
Various balance tuning
ScalarVector1 Jan 13, 2025
7e5316d
Made tooltips for barrier max more consistent
ScalarVector1 Jan 13, 2025
2ca46a2
Fix NPC barrier FX, add barrier to vanilla NPCs
ScalarVector1 Jan 13, 2025
1eca0ee
Fix to make barrier buff apply
ScalarVector1 Jan 13, 2025
cdf9f58
Barrier toggle
ScalarVector1 Jan 22, 2025
b913857
Doubled rate of magnetized enemy spawns
ScalarVector1 Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 36 additions & 33 deletions Content/Bosses/SquidBoss/NPCs.SquidBoss.Attacks.cs
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 24 additions & 20 deletions Content/Bosses/VitricBoss/NPCs.VitricBoss.Attacks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ namespace StarlightRiver.Content.Bosses.VitricBoss
{
public sealed partial class VitricBoss : ModNPC
{
public static int ShardSpitDamage => Helpers.Helper.GetProjectileDamage(35, 70, 100);
public static int ConeRingDamage => Helpers.Helper.GetProjectileDamage(40, 80, 120);
public static int LaserDamage => Helpers.Helper.GetProjectileDamage(60, 120, 999999);

public int BrokenCount => crystals.Count(n => n.ai[0] == 3);

public void ResetAttack()
Expand Down Expand Up @@ -110,10 +114,10 @@ private void MakeCrystalVulnerable()

if (AttackTimer > 180 && AttackTimer % 25 == 0 && Main.netMode != NetmodeID.MultiplayerClient)
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(Main.rand.Next(-700, 700), -460), new Vector2(0, 18), ProjectileType<TelegraphedGlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(Main.rand.Next(-700, 700), -460), new Vector2(0, 18), ProjectileType<TelegraphedGlassSpike>(), ShardSpitDamage, 0);

if (Main.masterMode)
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(Main.rand.Next(-700, 700), 420), new Vector2(0, -18), ProjectileType<TelegraphedGlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(Main.rand.Next(-700, 700), 420), new Vector2(0, -18), ProjectileType<TelegraphedGlassSpike>(), ShardSpitDamage, 0);
}

if (AttackTimer >= 720)
Expand All @@ -128,7 +132,7 @@ private void FireCage()
{
float rot = (NPC.Center - Main.player[NPC.target].Center).ToRotation() + Main.rand.NextFloat(-0.5f, 0.5f);

int index = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(0, 30), Vector2.Zero, ProjectileType<FireCone>(), 25, 0, Main.myPlayer, 0, rot); //fire cone
int index = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(0, 30), Vector2.Zero, ProjectileType<FireCone>(), ConeRingDamage, 0, Main.myPlayer, 0, rot); //fire cone

(Main.projectile[index].ModProjectile as FireCone).extraShots = BrokenCount >= 1;

Expand Down Expand Up @@ -359,7 +363,7 @@ private void CrystalSmashSpaced()
fireRate -= 10;

if (AttackTimer % fireRate == 0 && Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), crystal.Center + new Vector2(0, -32), Vector2.Normalize(crystal.Center - Player.Center).RotatedByRandom(variance) * -10, ProjectileType<NPCs.Vitric.SnakeSpit>(), 26, 0, Main.myPlayer);
Projectile.NewProjectile(NPC.GetSource_FromThis(), crystal.Center + new Vector2(0, -32), Vector2.Normalize(crystal.Center - Player.Center).RotatedByRandom(variance) * -10, ProjectileType<NPCs.Vitric.SnakeSpit>(), ShardSpitDamage, 0, Main.myPlayer);

if (AttackTimer % 10 == 0)
Dust.NewDustPerfect(crystal.Center, DustType<LavaSpew>());
Expand All @@ -380,7 +384,7 @@ private void SpikeMines()
for (int k = 0; k < 1 + crystals.Count(n => n.ai[0] == 3) + (Main.expertMode ? 1 : 0); k++)
{
if (k < points.Count && Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), points[k] + Vector2.UnitY * 64, Vector2.Zero, ProjectileType<SpikeMine>(), 25, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), points[k] + Vector2.UnitY * 64, Vector2.Zero, ProjectileType<SpikeMine>(), ConeRingDamage, 0);
}

ResetAttack();
Expand Down Expand Up @@ -446,7 +450,7 @@ private void PlatformDash()
Vector2 vel = Vector2.Normalize(NPC.Center - Main.player[NPC.target].Center) * -13;
Vector2 spewPos = NPC.Center + new Vector2(0, 30) + Vector2.One.RotatedBy(vel.ToRotation() - MathHelper.PiOver4) * 40;
if (Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel.RotatedBy(sin), ProjectileType<GlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel.RotatedBy(sin), ProjectileType<GlassSpike>(), ShardSpitDamage, 0);
Dust.NewDustPerfect(spewPos, DustType<LavaSpew>(), -Vector2.UnitX.RotatedBy(vel.ToRotation()), 0, default, Main.rand.NextFloat(0.8f, 1.2f));
}
}
Expand All @@ -459,7 +463,7 @@ private void PlatformDash()
Vector2 vel = Vector2.Normalize(NPC.Center - Main.player[NPC.target].Center) * -8;
Vector2 spewPos = NPC.Center + new Vector2(0, 30) + Vector2.One.RotatedBy(vel.ToRotation() - MathHelper.PiOver4) * 40;
if (Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel, ProjectileType<GlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel, ProjectileType<GlassSpike>(), ShardSpitDamage, 0);
Dust.NewDustPerfect(spewPos, DustType<LavaSpew>(), -Vector2.UnitX.RotatedBy(vel.ToRotation()), 0, default, Main.rand.NextFloat(0.8f, 1.2f));
}
}
Expand All @@ -476,7 +480,7 @@ private void PlatformDash()
{
float rot = (NPC.Center - Main.player[NPC.target].Center).ToRotation();

int index = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(0, 30), Vector2.Zero, ProjectileType<FireCone>(), 25, 0, Main.myPlayer, 0, rot); //fire cone
int index = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(0, 30), Vector2.Zero, ProjectileType<FireCone>(), ConeRingDamage, 0, Main.myPlayer, 0, rot); //fire cone

(Main.projectile[index].ModProjectile as FireCone).extraShots = BrokenCount >= 1;

Expand Down Expand Up @@ -574,7 +578,7 @@ private void PlatformDashRain()
Vector2 spewPos = NPC.Center + new Vector2(0, 30) + Vector2.One.RotatedBy(vel.ToRotation() - MathHelper.PiOver4) * 40;

if (Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel.RotatedBy(sin), ProjectileType<GlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel.RotatedBy(sin), ProjectileType<GlassSpike>(), ShardSpitDamage, 0);

Dust.NewDustPerfect(spewPos, DustType<LavaSpew>(), -Vector2.UnitX.RotatedBy(vel.ToRotation()), 0, default, Main.rand.NextFloat(0.8f, 1.2f));
}
Expand All @@ -589,7 +593,7 @@ private void PlatformDashRain()
Vector2 spewPos = NPC.Center + new Vector2(0, 30) + Vector2.One.RotatedBy(vel.ToRotation() - MathHelper.PiOver4) * 40;

if (Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel, ProjectileType<GlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), spewPos, vel, ProjectileType<GlassSpike>(), ShardSpitDamage, 0);

Dust.NewDustPerfect(spewPos, DustType<LavaSpew>(), -Vector2.UnitX.RotatedBy(vel.ToRotation()), 0, default, Main.rand.NextFloat(0.8f, 1.2f));
}
Expand Down Expand Up @@ -743,7 +747,7 @@ private void WhirlAndSmash()
Terraria.Audio.SoundEngine.PlaySound(SoundID.DD2_WitherBeastCrystalImpact, NPC.Center);

if (Main.netMode != NetmodeID.MultiplayerClient)
Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center, Vector2.Normalize(NPC.Center - Main.player[NPC.target].Center) * -2, ProjectileType<GlassVolleyShard>(), 12, 1);
Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center, Vector2.Normalize(NPC.Center - Main.player[NPC.target].Center) * -2, ProjectileType<GlassVolleyShard>(), ShardSpitDamage, 1);
}
}

Expand Down Expand Up @@ -775,14 +779,14 @@ private void WhirlAndSmash()
{
for (int k = 1; k < 12; k++)
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + k * 120, -460), new Vector2(0, bossRand.NextFloat(7, 8)), ProjectileType<GlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + k * 120, -460), new Vector2(0, bossRand.NextFloat(7, 8)), ProjectileType<GlassSpike>(), ShardSpitDamage, 0);
}

if (Main.expertMode)
{
for (int k = 0; k < 4; k++)
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + bossRand.Next(1, 12) * 120 + 60, -460), new Vector2(0, bossRand.NextFloat(5, 6)), ProjectileType<GlassSpike>(), 15, 0);
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + bossRand.Next(1, 12) * 120 + 60, -460), new Vector2(0, bossRand.NextFloat(5, 6)), ProjectileType<GlassSpike>(), ShardSpitDamage, 0);
}
}
}
Expand All @@ -792,14 +796,14 @@ private void WhirlAndSmash()
{
for (int k = 1; k < 8; k++)
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + k * 175, -460), new Vector2(0, bossRand.NextFloat(3, 16)), ProjectileType<SpikeMine>(), 10, 1);
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + k * 175, -460), new Vector2(0, bossRand.NextFloat(3, 16)), ProjectileType<SpikeMine>(), ShardSpitDamage, 1);
}
}
else
{
for (int k = 1; k < 6; k++)
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + k * 233, -460), new Vector2(0, bossRand.NextFloat(3, 16)), ProjectileType<SpikeMine>(), 10, 1);
Projectile.NewProjectile(NPC.GetSource_FromThis(), homePos + new Vector2(-700 + k * 233, -460), new Vector2(0, bossRand.NextFloat(3, 16)), ProjectileType<SpikeMine>(), ShardSpitDamage, 1);
}
}
}
Expand All @@ -816,7 +820,7 @@ private void SpawnMine(Vector2 velocity)
{
for (int k = -1; k <= 1; k++)
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center, Vector2.Normalize(velocity).RotatedBy(k * 0.5f) * 8, ProjectileType<GlassSpike>(), 50, 1);
Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center, Vector2.Normalize(velocity).RotatedBy(k * 0.5f) * 8, ProjectileType<GlassSpike>(), ShardSpitDamage, 1);
}
}
}
Expand Down Expand Up @@ -960,7 +964,7 @@ public void SpawnDart(Vector2 start, Vector2 mid, Vector2 end, int duration)
{
LavaDart.midPointToAssign = mid;
LavaDart.endPointToAssign = end;
Projectile.NewProjectile(NPC.GetSource_FromThis(), start, Vector2.Zero, ProjectileType<LavaDart>(), 25, 0, Main.myPlayer, ai0: duration);
Projectile.NewProjectile(NPC.GetSource_FromThis(), start, Vector2.Zero, ProjectileType<LavaDart>(), ShardSpitDamage, 0, Main.myPlayer, ai0: duration);
}

private void Laser()
Expand Down Expand Up @@ -994,7 +998,7 @@ private void Laser()
{
if (Main.netMode != NetmodeID.MultiplayerClient)
{
int i2 = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(4, 0), Vector2.Zero, ProjectileType<FinalLaser>(), 45, 0, Main.myPlayer, 0, 0);
int i2 = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(4, 0), Vector2.Zero, ProjectileType<FinalLaser>(), LaserDamage, 0, Main.myPlayer, 0, 0);
Projectile laserCore = Main.projectile[i2];

if (laserCore.ModProjectile is FinalLaser)
Expand All @@ -1004,7 +1008,7 @@ private void Laser()
{
for (int k = 1; k <= 2; k++)
{
int i3 = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(4, 0), Vector2.Zero, ProjectileType<FinalLaser>(), 45, 0, Main.myPlayer, 0, 0);
int i3 = Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center + new Vector2(4, 0), Vector2.Zero, ProjectileType<FinalLaser>(), LaserDamage, 0, Main.myPlayer, 0, 0);
Projectile laserCore2 = Main.projectile[i3];

if (laserCore2.ModProjectile is FinalLaser)
Expand Down Expand Up @@ -1054,7 +1058,7 @@ private void AngerAttack()
{
for (float k = 0; k < 6.28f; k += 6.28f / 12) //ring of glass spikes
{
Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center, Vector2.One.RotatedBy(k + (i % 2 == 0 ? 6.28f / 24 : 0)) * 5.5f, ProjectileType<GlassSpike>(), 15, 0.2f);
Projectile.NewProjectile(NPC.GetSource_FromThis(), NPC.Center, Vector2.One.RotatedBy(k + (i % 2 == 0 ? 6.28f / 24 : 0)) * 5.5f, ProjectileType<GlassSpike>(), ShardSpitDamage, 0.2f);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Bosses/VitricBoss/Projectiles.FinalLaser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public override void AI()

if (Player.active && !Player.dead && Helpers.Helper.CheckLinearCollision(Projectile.Center, endpoint, Player.Hitbox, out Vector2 point))
{
Player.Hurt(Terraria.DataStructures.PlayerDeathReason.ByCustomReason(Player.name + " was reduced to ash"), Main.masterMode ? 9999999 : Main.expertMode ? 65 : 45, 0, false, false, -1, false);
Player.Hurt(Terraria.DataStructures.PlayerDeathReason.ByCustomReason(Player.name + " was reduced to ash"), Projectile.damage, 0, false, false, -1, false);
endpoint = point;
break;
}
Expand Down
2 changes: 1 addition & 1 deletion Content/Bosses/VitricBoss/Projectiles.SpikeMine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public override void AI()
}

if (Main.masterMode)
Projectile.NewProjectile(Projectile.GetSource_FromThis(), Projectile.Center, Vector2.Zero, ProjectileType<NPCs.Vitric.SnakeSpit>(), Projectile.damage, 1, Projectile.owner);
Projectile.NewProjectile(Projectile.GetSource_FromThis(), Projectile.Center, Vector2.Zero, ProjectileType<NPCs.Vitric.SnakeSpit>(), VitricBoss.ShardSpitDamage, 1, Projectile.owner);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Content/Bosses/VitricBoss/Projectiles.VitricBomb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public override void OnKill(int timeLeft)
if (Main.masterMode && Main.netMode != NetmodeID.MultiplayerClient)
{
for (int k = 0; k < 8; k++)
Projectile.NewProjectile(Projectile.GetSource_FromThis(), Projectile.Center, Vector2.UnitX.RotatedBy(k / 8f * 6.28f) * 18, ProjectileType<TelegraphedGlassSpike>(), 20, 1, Main.myPlayer);
Projectile.NewProjectile(Projectile.GetSource_FromThis(), Projectile.Center, Vector2.UnitX.RotatedBy(k / 8f * 6.28f) * 18, ProjectileType<TelegraphedGlassSpike>(), VitricBoss.ShardSpitDamage, 1, Main.myPlayer);
}
}
}
Expand Down
25 changes: 25 additions & 0 deletions Content/GUI/BarrierDyeSlot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using StarlightRiver.Helpers;
using System.Collections.Generic;
using Terraria.GameContent;
using Terraria.GameContent.UI.Elements;
using Terraria.GameInput;
using Terraria.ID;
using Terraria.UI;
Expand All @@ -16,6 +17,7 @@
private int topPos = 430;

private readonly BarrierDyeSlotElement slot = new();
private readonly UIImageButton visibility = new(Terraria.GameContent.TextureAssets.InventoryTickOn);

public override bool Visible => Main.playerInventory && Main.EquipPageSelected == 2;

Expand All @@ -29,6 +31,16 @@
slot.Left.Set(leftPos, 1);
slot.Top.Set(topPos, 0);
Append(slot);

visibility.Left.Set(leftPos + 33, 1);
visibility.Top.Set(topPos - 2, 0);
visibility.SetVisibility(0.7f, 0.7f);
visibility.OnLeftClick += (a, b) =>
{
var mp = Main.LocalPlayer.GetModPlayer<BarrierPlayer>();

Check warning on line 40 in Content/GUI/BarrierDyeSlot.cs

View workflow job for this annotation

GitHub Actions / lint 

Use explicit type instead of 'var'
mp.hideBarrierEffects = !mp.hideBarrierEffects;
};
Append(visibility);
}

public override void Draw(SpriteBatch spriteBatch)
Expand All @@ -54,6 +66,19 @@
Recalculate();
}
}

public override void SafeUpdate(GameTime gameTime)
{
if (slot.IsMouseHovering || visibility.IsMouseHovering)
Main.LocalPlayer.mouseInterface = true;

var mp = Main.LocalPlayer.GetModPlayer<BarrierPlayer>();

Check warning on line 75 in Content/GUI/BarrierDyeSlot.cs

View workflow job for this annotation

GitHub Actions / lint 

Use explicit type instead of 'var'

if (mp.hideBarrierEffects)
visibility.SetImage(TextureAssets.InventoryTickOff);
else
visibility.SetImage(TextureAssets.InventoryTickOn);
}
}

public class BarrierDyeSlotElement : SmartUIElement
Expand Down
4 changes: 2 additions & 2 deletions Content/Items/BarrierDye/BaseBarrierDye.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public override void PreDrawEffects(SpriteBatch spriteBatch, Player player)

float sin = (float)Math.Sin(Main.GameUpdateCount / 10f);

for (int k = 0; k < 8; k++)
for (int k = 0; k < 4; k++)
{
Vector2 dir = Vector2.UnitX.RotatedBy(k / 8f * 6.28f) * (5.5f + sin * 3.2f);
Vector2 dir = Vector2.UnitX.RotatedBy(k / 4f * 6.28f) * (3.5f + sin * 1f);
Color color = new Color(100, 255, 255) * (opacity - sin * 0.1f) * 0.9f;

spriteBatch.Draw(CustomHooks.PlayerTarget.Target, CustomHooks.PlayerTarget.getPlayerTargetPosition(player.whoAmI) + Vector2.UnitY * player.gfxOffY + dir, CustomHooks.PlayerTarget.getPlayerTargetSourceRectangle(player.whoAmI), color);
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Beach/Accessories.SeaglassRing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class SeaglassRing : SmartAccessory
{
public override string Texture => AssetDirectory.Assets + "Items/Beach/" + Name;

public SeaglassRing() : base("Seaglass Ring", "+30 {{barrier}}\n{{Barrier}} recharge starts slightly faster\n'The battering waves have not diminished its shine'") { }
public SeaglassRing() : base("Seaglass Ring", "+30 maximum {{barrier}}\n{{Barrier}} recharge starts slightly faster\n'The battering waves have not diminished its shine'") { }

public override void SafeSetDefaults()
{
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Desert/Accessories.DefiledAnkh.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class DefiledAnkh : CursedAccessory
public override void SetStaticDefaults()
{
Tooltip.SetDefault("Your {{Barrier}} protects against 25% less damage\n+100% {{Inoculation}} and immunity to most debuffs while {{Barrier}} is active" +
"\n+40 max {{Barrier}}");
"\n+40 maximum {{Barrier}}");
}

public override void SafeSetDefaults()
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Dungeon/Accessories.AquaSapphire.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class AquaSapphire : SmartAccessory
{
public override string Texture => AssetDirectory.DungeonItem + Name;

public AquaSapphire() : base("Aqua Sapphire", "{{Barrier}} negates 15% more damage \n+20 {{Barrier}} \n'Its depths shimmer like waves'") { }
public AquaSapphire() : base("Aqua Sapphire", "{{Barrier}} negates 15% more damage \n+20 maximum {{Barrier}} \n'Its depths shimmer like waves'") { }

public override void SafeSetDefaults()
{
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Dungeon/Accessories.StoneOfTheDrowned.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class StoneOfTheDrowned : SmartAccessory
public override string Texture => AssetDirectory.JungleItem + Name;

public StoneOfTheDrowned() : base("Stone of the Drowned",
"+30 {{barrier}}\n" +
"+30 maximum {{barrier}}\n" +
"Increases your max minions by 2 when you have no {{barrier}}\n" +
"Re-summons two slots worth of minions when you reach 0 {{barrier}}")
{ }
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Dungeon/Accessories.WardedMail.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class WardedMail : SmartAccessory
{
public override string Texture => AssetDirectory.DungeonItem + Name;

public WardedMail() : base("Warded Mail", "{{Barrier}} damage is applied to attackers as thorns \n+{{Barrier}} negates 10% more damage \n+40 {{barrier}}") { }
public WardedMail() : base("Warded Mail", "{{Barrier}} damage is applied to attackers as thorns\n+40 maximum {{barrier}}\n+{{Barrier}} negates 10% more damage") { }

public override List<int> ChildTypes => new()
{
Expand Down
2 changes: 1 addition & 1 deletion Content/Items/Geomancer/Armors.GeomancerArmor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public override void SetStaticDefaults()

Tooltip.SetDefault(
"[i/s1:" + ItemType<GeoDiamond>() + "]: Critical strikes partially ignore armor, with increased chance for missing enemy HP \n" +
"[i/s1:" + ItemType<GeoTopaz>() + "]: +100 barrier. Gain a shield that points to your cursor and blocks attacks, consuming {{barrier}} \n" +
"[i/s1:" + ItemType<GeoTopaz>() + "]: +100 maximum barrier. Gain a shield that points to your cursor and blocks attacks, consuming {{barrier}} \n" +
"[i/s1:" + ItemType<GeoEmerald>() + "]: Immediately heal 20 hp. Hits have a chance to create a 5 HP life heart \n" +
"[i/s1:" + ItemType<GeoSapphire>() + "]: Immediately refill mana. Hits have a chance to create 1 to 3 mana stars \n" +
"[i/s1:" + ItemType<GeoAmethyst>() + "]: All strikes inflict Toxic Amethyst, a stacking poison debuff \n" +
Expand Down
Loading
Loading