Skip to content

Commit baa579d

Browse files
committed
Run format
1 parent 121681e commit baa579d

43 files changed

Lines changed: 86 additions & 81 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Compat/StructureHelper/RegisterData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ public override void OnModLoad()
1818
}
1919
}
2020
}
21-
}
21+
}

Content/Abilities/InfusionItem.ModItemMethods.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using Terraria.ID;
23
using static Terraria.ModLoader.ModContent;
34

45
namespace StarlightRiver.Content.Abilities
@@ -52,7 +53,7 @@ public override void Update(ref float gravity, ref float maxFallSpeed)
5253
}
5354

5455
float rot = Main.rand.NextFloat((float)Math.PI * 2);
55-
var d = Dust.NewDustPerfect(Item.Center + Vector2.One.RotatedBy(rot) * 16, 264, Vector2.One.RotatedBy(rot) * -1.25f, 0, color, 0.8f);
56+
var d = Dust.NewDustPerfect(Item.Center + Vector2.One.RotatedBy(rot) * 16, DustID.PortalBoltTrail, Vector2.One.RotatedBy(rot) * -1.25f, 0, color, 0.8f);
5657
d.noGravity = true;
5758
d.noLight = true;
5859
}

Content/Bosses/GlassMiniboss/Projectiles.GlassBubble.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ private void DrawBloom()
312312
for (int i = 0; i < shardCount; i++)
313313
{
314314
float rotation = MathHelper.TwoPi / shardCount * i;
315-
Asset<Texture2D> tell = TextureAssets.Extra[98];
315+
Asset<Texture2D> tell = TextureAssets.Extra[ExtrasID.SharpTears];
316316
float tellLength = Helpers.Eases.BezierEase((Timer - CRACK_TIME) / 130f) * 12f;
317317
Color tellFade = Color.OrangeRed * ((Timer - CRACK_TIME) / 130f) * 0.5f;
318318
tellFade.A = 0;

Content/Bosses/GlassMiniboss/Projectiles.GlassJavelin.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using ReLogic.Content;
22
using Terraria.DataStructures;
33
using Terraria.GameContent;
4+
using Terraria.ID;
45
using static Terraria.ModLoader.ModContent;
56

67
namespace StarlightRiver.Content.Bosses.GlassMiniboss
@@ -103,7 +104,7 @@ public override bool PreDraw(ref Color lightColor)
103104
Main.EntitySpriteDraw(bloom.Value, Projectile.Center - Main.screenPosition, null, bloomColor, Projectile.rotation * 0.2f, bloom.Size() * 0.5f, bloomScale * 0.75f, SpriteEffects.None, 0);
104105

105106
//tell
106-
Asset<Texture2D> tell = TextureAssets.Extra[98];
107+
Asset<Texture2D> tell = TextureAssets.Extra[ExtrasID.SharpTears];
107108
float tellLength = Helpers.Eases.BezierEase(Utils.GetLerpValue(120, 70, Projectile.timeLeft, true)) * 8f;
108109
Color tellFade = Color.OrangeRed * Utils.GetLerpValue(40, 110, Projectile.timeLeft, true);
109110
tellFade.A = 0;

Content/Bosses/GlassMiniboss/Projectiles.GlassSpear.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ public override bool PreDraw(ref Color lightColor)
370370
}
371371
else //Draw tell before firing
372372
{
373-
Texture2D line = TextureAssets.Extra[60].Value;
373+
Texture2D line = TextureAssets.Extra[ExtrasID.PortalGateHalo2].Value;
374374
Color color = Color.OrangeRed;
375375
color.A = 0;
376376

Content/Bosses/SquidBoss/NPCs.ArenaBlocker.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using Terraria.GameContent.Bestiary;
3+
using Terraria.ID;
34
using static Terraria.ModLoader.ModContent;
45

56
namespace StarlightRiver.Content.Bosses.SquidBoss
@@ -56,7 +57,7 @@ public override void AI()
5657
for (int k = 0; k < Main.maxProjectiles; k++)
5758
{
5859
Projectile proj = Main.projectile[k];
59-
if (proj.active && proj.Hitbox.Intersects(NPC.Hitbox) && proj.aiStyle == 7) //Hooks
60+
if (proj.active && proj.Hitbox.Intersects(NPC.Hitbox) && proj.aiStyle == ProjAIStyleID.Hook) //Hooks
6061
Main.projectile[k].active = false;
6162
}
6263
}

Content/Bosses/SquidBoss/Projectiles.DoorBomb.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override void AI()
3737
var color = new Color(0.5f + cos * 0.2f, 0.8f, 0.5f + sin * 0.2f);
3838
Lighting.AddLight(Projectile.Center, color.ToVector3() * 0.6f);
3939

40-
var d = Dust.NewDustPerfect(Projectile.Center, 264, -Projectile.velocity * 0.5f, 0, color, 1.4f);
40+
var d = Dust.NewDustPerfect(Projectile.Center, DustID.PortalBoltTrail, -Projectile.velocity * 0.5f, 0, color, 1.4f);
4141
d.noGravity = true;
4242
d.rotation = Main.rand.NextFloat(6.28f);
4343
}
@@ -46,7 +46,7 @@ public override void SafeKill(int timeLeft)
4646
{
4747
for (int k = 0; k < 20; k++)
4848
{
49-
var d = Dust.NewDustPerfect(Projectile.Center, 264, Vector2.One.RotatedByRandom(6.28f) * Main.rand.NextFloat(), 0, Color.White, 1.4f);
49+
var d = Dust.NewDustPerfect(Projectile.Center, DustID.PortalBoltTrail, Vector2.One.RotatedByRandom(6.28f) * Main.rand.NextFloat(), 0, Color.White, 1.4f);
5050
d.noGravity = true;
5151
d.rotation = Main.rand.NextFloat(6.28f);
5252
}

Content/Bosses/SquidBoss/Projectiles.SpewBlob.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public override void AI()
4747

4848
if (Main.rand.NextBool(10))
4949
{
50-
var d = Dust.NewDustPerfect(Projectile.Center, 264, -Projectile.velocity.RotatedByRandom(0.25f) * 0.75f, 0, color, 1);
50+
var d = Dust.NewDustPerfect(Projectile.Center, DustID.PortalBoltTrail, -Projectile.velocity.RotatedByRandom(0.25f) * 0.75f, 0, color, 1);
5151
d.noGravity = true;
5252
d.rotation = Main.rand.NextFloat(6.28f);
5353
}
@@ -93,7 +93,7 @@ public override void OnKill(int timeLeft)
9393
float cos = 1 + (float)Math.Cos(Projectile.ai[1] + n * 0.1f);
9494
var color = new Color(0.5f + cos * 0.2f, 0.8f, 0.5f + sin * 0.2f);
9595

96-
var d = Dust.NewDustPerfect(Projectile.Center, 264, Vector2.One.RotatedByRandom(6.28f) * Main.rand.NextFloat(3), 0, color, 2.2f);
96+
var d = Dust.NewDustPerfect(Projectile.Center, DustID.PortalBoltTrail, Vector2.One.RotatedByRandom(6.28f) * Main.rand.NextFloat(3), 0, color, 2.2f);
9797
d.noGravity = true;
9898
d.rotation = Main.rand.NextFloat(6.28f);
9999
}

Content/Bosses/VitricBoss/Misc.BodyHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private void DrawSegment(SpriteBatch sb, int index, Vector2 pos)
127127

128128
Tile tile = Framing.GetTileSafely((int)pos.X / 16, (int)pos.Y / 16);
129129

130-
if (!tile.HasTile && tile.WallType == 0)
130+
if (!tile.HasTile && tile.WallType == WallID.None)
131131
Lighting.AddLight(pos, new Vector3(1, 0.8f, 0.2f) * brightness * 0.4f);
132132
}
133133

Content/CustomHooks/Mechanics.NoBuild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ private void FailFX(Point16 pos)
325325
{
326326
public override bool AppliesToEntity(Projectile entity, bool lateInstantiation)
327327
{
328-
return entity.aiStyle == 17;
328+
return entity.aiStyle == ProjAIStyleID.GraveMarker;
329329
}
330330

331331
public override void PostAI(Projectile Projectile)

0 commit comments

Comments
 (0)