big-duckie/FabusMod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Spectral Illusion. Cleaned up associated code.

Browse Source
This commit is contained in:
Big Duckie
2022-07-05 12:22:39 -06:00
parent 790b2ca177
commit 671f8f1d9a
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Items/Weapons/Magic/SpectralIllusion.cs
+10 -11
View File
@@ -1,4 +1,3 @@
using FabusMod.Projectiles.IllusoryMirror;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Terraria; using Terraria;
using Terraria.ID; using Terraria.ID;
@@ -32,7 +31,7 @@ public class SpectralIllusion : ModItem
Item.expert = true; Item.expert = true;
Item.reuseDelay = 20; Item.reuseDelay = 20;
Item.UseSound = SoundID.Item72; Item.UseSound = SoundID.Item72;
Item.shoot = ModContent.ProjectileType<SpectralIllusionProj>(); Item.shoot = ModContent.ProjectileType<Projectiles.IllusoryMirror.SpectralIllusionProj>();
} }
public override Vector2? HoldoutOffset() public override Vector2? HoldoutOffset()
@@ -56,7 +55,7 @@ public class SpectralIllusion : ModItem
Item.shootSpeed = 0f; Item.shootSpeed = 0f;
Item.mana = 50; Item.mana = 50;
player.AddBuff(ModContent.BuffType<Buffs.IllusoryMirror.SpectralBlossomActive>(), 1200, true); player.AddBuff(ModContent.BuffType<Buffs.IllusoryMirror.SpectralBlossomActive>(), 1200, true);
Item.shoot = ModContent.ProjectileType<SpectralIllusionRMB>(); Item.shoot = ModContent.ProjectileType<Projectiles.IllusoryMirror.SpectralIllusionRMB>();
Item.UseSound = SoundID.Item76; Item.UseSound = SoundID.Item76;
Item.reuseDelay = 20; Item.reuseDelay = 20;
} }
@@ -67,7 +66,7 @@ public class SpectralIllusion : ModItem
Item.useAnimation = 16; Item.useAnimation = 16;
Item.shootSpeed = 7f; Item.shootSpeed = 7f;
Item.mana = 6; Item.mana = 6;
Item.shoot = ModContent.ProjectileType<SpectralIllusionProj>(); Item.shoot = ModContent.ProjectileType<Projectiles.IllusoryMirror.SpectralIllusionProj>();
Item.UseSound = SoundID.Item72; Item.UseSound = SoundID.Item72;
Item.reuseDelay = 18; Item.reuseDelay = 18;
} }
@@ -77,19 +76,19 @@ public class SpectralIllusion : ModItem
Item.useTime = 4; Item.useTime = 4;
Item.shootSpeed = 7f; Item.shootSpeed = 7f;
Item.mana = 6; Item.mana = 6;
Item.shoot = ModContent.ProjectileType<SpectralIllusionProj>(); Item.shoot = ModContent.ProjectileType<Projectiles.IllusoryMirror.SpectralIllusionProj>();
Item.UseSound = SoundID.Item72; Item.UseSound = SoundID.Item72;
Item.reuseDelay = 20; Item.reuseDelay = 20;
} }
return this.CanUseItem(player); return base.CanUseItem(player);
} }
public override void AddRecipes() public override void AddRecipes()
{ {
Recipe val = CreateRecipe(); Recipe recipe = CreateRecipe();
val.AddIngredient(ModContent.ItemType<IllusoryMirror>()); recipe.AddIngredient(ModContent.ItemType<IllusoryMirror>());
val.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 14); recipe.AddIngredient(ModContent.ItemType<Bars.RainbowChunk>(), 14);
val.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>()); recipe.AddTile(ModContent.TileType<global::FabusMod.Tiles.RainbowStation>());
val.Register(); recipe.Register();
} }
} }
Projectiles/IllusoryMirror/SpectralIllusionProj.cs
+20 -23
View File
@@ -5,9 +5,7 @@ namespace FabusMod.Projectiles.IllusoryMirror;
public class SpectralIllusionProj : ModProjectile public class SpectralIllusionProj : ModProjectile
{ {
private const int alphaReducation = 50; public override void SetDefaults()
public override void SetDefaults()
{ {
Projectile.width = 2; Projectile.width = 2;
Projectile.height = 20; Projectile.height = 20;
@@ -25,25 +23,24 @@ public class SpectralIllusionProj : ModProjectile
public override void AI() public override void AI()
{ {
int num1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust>(), 0f, 0f, 0, default, 1f); int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust>());
Dust obj = Main.dust[num1]; Main.dust[dust1].velocity *= 0f;
obj.velocity *= 0f; Main.dust[dust1].noGravity = true;
Main.dust[num1].noGravity = true;
int num2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust2>(), 0f, 0f, 0, default, 1f); int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust2>());
Dust obj2 = Main.dust[num2]; Main.dust[dust2].velocity *= 0f;
obj2.velocity *= 0f; Main.dust[dust2].noGravity = true;
Main.dust[num2].noGravity = true;
int num3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust3>(), 0f, 0f, 0, default, 1f); int dust3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust3>());
Dust obj3 = Main.dust[num3]; Main.dust[dust3].velocity *= 0f;
obj3.velocity *= 0f; Main.dust[dust3].noGravity = true;
Main.dust[num3].noGravity = true;
int num4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust4>(), 0f, 0f, 0, default, 1f); int dust4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust4>());
Dust obj4 = Main.dust[num4]; Main.dust[dust4].velocity *= 0f;
obj4.velocity *= 0f; Main.dust[dust4].noGravity = true;
Main.dust[num4].noGravity = true;
int num5 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust4>(), 0f, 0f, 0, default, 1f); int dust5 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SpectralIllusionDust4>());
Dust obj5 = Main.dust[num5]; Main.dust[dust5].velocity *= 0f;
obj5.velocity *= 0f; Main.dust[dust5].noGravity = true;
Main.dust[num5].noGravity = true;
} }
} }
Projectiles/IllusoryMirror/SpectralIllusionRMB.cs
+23 -20
View File
@@ -31,26 +31,29 @@ public class SpectralIllusionRMB : ModProjectile
AnimateProjectile(); AnimateProjectile();
if (Main.rand.NextBool(2)) if (Main.rand.NextBool(2))
{ {
int num1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowHealingDust>(), 0f, 0f, 0, default, 1f); int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowHealingDust>(), 0f, 0f, 0, default, 1f);
Main.dust[num1].scale = 2f; Main.dust[dust1].scale = 2f;
Main.dust[num1].velocity.Y -= 0.5f; Main.dust[dust1].velocity.Y -= 0.5f;
Main.dust[num1].velocity.X = 0f; Main.dust[dust1].velocity.X = 0f;
Main.dust[num1].noGravity = true; Main.dust[dust1].noGravity = true;
int num2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust>(), 0f, 0f, 0, default, 1f);
int num3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust2>(), 0f, 0f, 0, default, 1f); int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust>(), 0f, 0f, 0, default, 1f);
int num4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust3>(), 0f, 0f, 0, default, 1f); Main.dust[dust2].scale = 2f;
Main.dust[num2].scale = 2f; Main.dust[dust2].velocity.Y += 0.5f;
Main.dust[num2].velocity.Y += 0.5f; Main.dust[dust2].velocity.X = 0f;
Main.dust[num2].velocity.X = 0f; Main.dust[dust2].noGravity = true;
Main.dust[num2].noGravity = true;
Main.dust[num3].scale = 2f; int dust3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust2>(), 0f, 0f, 0, default, 1f);
Main.dust[num3].velocity.Y += 0.5f; Main.dust[dust3].scale = 2f;
Main.dust[num3].velocity.X = 0f; Main.dust[dust3].velocity.Y += 0.5f;
Main.dust[num3].noGravity = true; Main.dust[dust3].velocity.X = 0f;
Main.dust[num4].scale = 2f; Main.dust[dust3].noGravity = true;
Main.dust[num4].velocity.Y += 0.5f;
Main.dust[num4].velocity.X = 0f; int dust4 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust3>(), 0f, 0f, 0, default, 1f);
Main.dust[num4].noGravity = true; 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++) for (int i = 0; i < 255; i++)
{ {