diff --git a/Items/Weapons/Magic/IllusoryMirror.cs b/Items/Weapons/Magic/IllusoryMirror.cs index b5ade3b..6bfd219 100644 --- a/Items/Weapons/Magic/IllusoryMirror.cs +++ b/Items/Weapons/Magic/IllusoryMirror.cs @@ -1,4 +1,3 @@ -using FabusMod.Projectiles.IllusoryMirror; using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; @@ -19,6 +18,7 @@ public class IllusoryMirror : ModItem Item.CloneDefaults(ItemID.ShadowbeamStaff); Item.damage = 175; Item.noMelee = true; + Item.DamageType = DamageClass.Magic; Item.mana = 7; Item.width = 29; Item.height = 21; @@ -32,12 +32,12 @@ public class IllusoryMirror : ModItem Item.expert = true; Item.reuseDelay = 20; Item.UseSound = SoundID.Item72; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); } public override Vector2? HoldoutOffset() { - return new Vector2(4f, 0f); + return new Vector2(4f, 0f); } public override bool AltFunctionUse(Player player) @@ -56,7 +56,7 @@ public class IllusoryMirror : 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; } } @@ -66,7 +66,7 @@ public class IllusoryMirror : ModItem Item.useAnimation = 20; Item.shootSpeed = 7f; Item.mana = 7; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.UseSound = SoundID.Item72; } else @@ -75,19 +75,19 @@ public class IllusoryMirror : ModItem Item.useTime = 5; Item.shootSpeed = 7f; Item.mana = 7; - Item.shoot = ModContent.ProjectileType(); + Item.shoot = ModContent.ProjectileType(); Item.UseSound = SoundID.Item72; } - return this.CanUseItem(player); + return base.CanUseItem(player); } public override void AddRecipes() { - Recipe val = CreateRecipe(); - val.AddIngredient(ItemID.LifeFruit, 5); - val.AddIngredient(ItemID.LifeCrystal, 5); - val.AddIngredient(ItemID.FragmentNebula, 14); - val.AddTile(TileID.LunarCraftingStation); - val.Register(); + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(ItemID.LifeFruit, 5); + recipe.AddIngredient(ItemID.LifeCrystal, 5); + recipe.AddIngredient(ItemID.FragmentNebula, 14); + recipe.AddTile(TileID.LunarCraftingStation); + recipe.Register(); } } diff --git a/Projectiles/IllusoryMirror/IllusoryMirrorProj.cs b/Projectiles/IllusoryMirror/IllusoryMirrorProj.cs index 61e94a9..5f23fed 100644 --- a/Projectiles/IllusoryMirror/IllusoryMirrorProj.cs +++ b/Projectiles/IllusoryMirror/IllusoryMirrorProj.cs @@ -5,16 +5,14 @@ namespace FabusMod.Projectiles.IllusoryMirror; public class IllusoryMirrorProj : ModProjectile { - private const int alphaReducation = 50; - - public override void SetDefaults() + public override void SetDefaults() { Projectile.width = 2; Projectile.height = 20; Projectile.aiStyle = -1; Projectile.friendly = true; Projectile.hostile = false; - Projectile.penetrate = 1; + Projectile.penetrate += 1; Projectile.timeLeft = 600; Projectile.alpha = 255; Projectile.light = 0.5f; @@ -25,25 +23,24 @@ public class IllusoryMirrorProj : 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/IllusoryMirrorRMB.cs b/Projectiles/IllusoryMirror/IllusoryMirrorRMB.cs index 2b27977..4e08d8d 100644 --- a/Projectiles/IllusoryMirror/IllusoryMirrorRMB.cs +++ b/Projectiles/IllusoryMirror/IllusoryMirrorRMB.cs @@ -31,16 +31,17 @@ public class IllusoryMirrorRMB : 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); - Main.dust[num2].scale = 2f; - Main.dust[num2].velocity.Y += 0.5f; - Main.dust[num2].velocity.X = 0f; - Main.dust[num2].noGravity = true; + int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType()); + 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()); + Main.dust[dust2].scale = 2f; + Main.dust[dust2].velocity.Y += 0.5f; + Main.dust[dust2].velocity.X = 0f; + Main.dust[dust2].noGravity = true; } for (int i = 0; i < 255; i++) {