From 671f8f1d9aacaf704c79e5d50556e2e5eb54ce2b Mon Sep 17 00:00:00 2001 From: Big Duckie Date: Tue, 5 Jul 2022 12:22:39 -0600 Subject: [PATCH] Fixed Spectral Illusion. Cleaned up associated code. --- Items/Weapons/Magic/SpectralIllusion.cs | 21 +++++---- .../IllusoryMirror/SpectralIllusionProj.cs | 43 +++++++++---------- .../IllusoryMirror/SpectralIllusionRMB.cs | 43 ++++++++++--------- 3 files changed, 53 insertions(+), 54 deletions(-) diff --git a/Items/Weapons/Magic/SpectralIllusion.cs b/Items/Weapons/Magic/SpectralIllusion.cs index 9c1673b..ec957cf 100644 --- a/Items/Weapons/Magic/SpectralIllusion.cs +++ b/Items/Weapons/Magic/SpectralIllusion.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.IllusoryMirror; using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; @@ -32,7 +31,7 @@ public class SpectralIllusion : ModItem Item.expert = true; Item.reuseDelay = 20; Item.UseSound = SoundID.Item72; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); } public override Vector2? HoldoutOffset() @@ -56,7 +55,7 @@ public class SpectralIllusion : ModItem Item.shootSpeed = 0f; Item.mana = 50; player.AddBuff(ModContent.BuffType(), 1200, true); - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.UseSound = SoundID.Item76; Item.reuseDelay = 20; } @@ -67,7 +66,7 @@ public class SpectralIllusion : ModItem Item.useAnimation = 16; Item.shootSpeed = 7f; Item.mana = 6; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.UseSound = SoundID.Item72; Item.reuseDelay = 18; } @@ -77,19 +76,19 @@ public class SpectralIllusion : ModItem Item.useTime = 4; Item.shootSpeed = 7f; Item.mana = 6; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.UseSound = SoundID.Item72; Item.reuseDelay = 20; } - return this.CanUseItem(player); + return base.CanUseItem(player); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ModContent.ItemType()); - val.AddIngredient(ModContent.ItemType(), 14); - val.AddTile(ModContent.TileType()); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ModContent.ItemType()); + recipe.AddIngredient(ModContent.ItemType(), 14); + recipe.AddTile(ModContent.TileType()); + recipe.Register(); } } diff --git a/Projectiles/IllusoryMirror/SpectralIllusionProj.cs b/Projectiles/IllusoryMirror/SpectralIllusionProj.cs index a8f364b..c15d517 100644 --- a/Projectiles/IllusoryMirror/SpectralIllusionProj.cs +++ b/Projectiles/IllusoryMirror/SpectralIllusionProj.cs @@ -5,9 +5,7 @@ namespace FabusMod.Projectiles.IllusoryMirror; public class SpectralIllusionProj : ModProjectile { - private const int alphaReducation = 50; - - public override void SetDefaults() + public override void SetDefaults() { Projectile.width = 2; Projectile.height = 20; @@ -25,25 +23,24 @@ public class SpectralIllusionProj : ModProjectile public override void AI() { - int num1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Dust obj = Main.dust[num1]; - obj.velocity *= 0f; - Main.dust[num1].noGravity = true; - int num2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Dust obj2 = Main.dust[num2]; - obj2.velocity *= 0f; - Main.dust[num2].noGravity = true; - int num3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Dust obj3 = Main.dust[num3]; - obj3.velocity *= 0f; - Main.dust[num3].noGravity = true; - int num4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Dust obj4 = Main.dust[num4]; - obj4.velocity *= 0f; - Main.dust[num4].noGravity = true; - int num5 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Dust obj5 = Main.dust[num5]; - obj5.velocity *= 0f; - Main.dust[num5].noGravity = true; + int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType()); + Main.dust[dust1].velocity *= 0f; + Main.dust[dust1].noGravity = true; + + int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType()); + Main.dust[dust2].velocity *= 0f; + Main.dust[dust2].noGravity = true; + + int dust3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType()); + Main.dust[dust3].velocity *= 0f; + Main.dust[dust3].noGravity = true; + + int dust4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType()); + Main.dust[dust4].velocity *= 0f; + Main.dust[dust4].noGravity = true; + + int dust5 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType()); + Main.dust[dust5].velocity *= 0f; + Main.dust[dust5].noGravity = true; } } diff --git a/Projectiles/IllusoryMirror/SpectralIllusionRMB.cs b/Projectiles/IllusoryMirror/SpectralIllusionRMB.cs index e0fd4e7..13983cd 100644 --- a/Projectiles/IllusoryMirror/SpectralIllusionRMB.cs +++ b/Projectiles/IllusoryMirror/SpectralIllusionRMB.cs @@ -31,26 +31,29 @@ public class SpectralIllusionRMB : ModProjectile AnimateProjectile(); if (Main.rand.NextBool(2)) { - int num1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Main.dust[num1].scale = 2f; - Main.dust[num1].velocity.Y -= 0.5f; - Main.dust[num1].velocity.X = 0f; - Main.dust[num1].noGravity = true; - int num2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - int num3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - int num4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); - Main.dust[num2].scale = 2f; - Main.dust[num2].velocity.Y += 0.5f; - Main.dust[num2].velocity.X = 0f; - Main.dust[num2].noGravity = true; - Main.dust[num3].scale = 2f; - Main.dust[num3].velocity.Y += 0.5f; - Main.dust[num3].velocity.X = 0f; - Main.dust[num3].noGravity = true; - Main.dust[num4].scale = 2f; - Main.dust[num4].velocity.Y += 0.5f; - Main.dust[num4].velocity.X = 0f; - Main.dust[num4].noGravity = true; + int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); + Main.dust[dust1].scale = 2f; + Main.dust[dust1].velocity.Y -= 0.5f; + Main.dust[dust1].velocity.X = 0f; + Main.dust[dust1].noGravity = true; + + int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); + Main.dust[dust2].scale = 2f; + Main.dust[dust2].velocity.Y += 0.5f; + Main.dust[dust2].velocity.X = 0f; + Main.dust[dust2].noGravity = true; + + int dust3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); + Main.dust[dust3].scale = 2f; + Main.dust[dust3].velocity.Y += 0.5f; + Main.dust[dust3].velocity.X = 0f; + Main.dust[dust3].noGravity = true; + + int dust4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType(), 0f, 0f, 0, default, 1f); + Main.dust[dust4].scale = 2f; + Main.dust[dust4].velocity.Y += 0.5f; + Main.dust[dust4].velocity.X = 0f; + Main.dust[dust4].noGravity = true; } for (int i = 0; i < 255; i++) {