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

Clean up all projectile code.

Browse Source
This commit is contained in:
Big Duckie
2022-07-05 22:32:27 -06:00
parent 2b34d060c5
commit 099f0a2e50
73 changed files with 651 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projectiles/SorcerousStaff/GoldenStaffProj.cs
+10 -14
View File
@@ -24,18 +24,16 @@ public class GoldenStaffProj : ModProjectile
{
if (Main.rand.NextBool(4))
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.MeatDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.MeatDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
}
public override bool OnTileCollide(Vector2 oldVelocity)
{
Projectile projectile = Projectile;
projectile.penetrate--;
Projectile.penetrate--;
if (Projectile.penetrate <= 0)
{
Projectile.Kill();
@@ -51,8 +49,7 @@ public class GoldenStaffProj : ModProjectile
{
Projectile.velocity.Y = 0f - oldVelocity.Y;
}
Projectile projectile2 = Projectile;
projectile2.velocity = projectile2.velocity * 0.75f;
Projectile.velocity *= 0.75f;
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
return false;
@@ -62,11 +59,10 @@ public class GoldenStaffProj : ModProjectile
{
for (int i = 0; i < 5; i++)
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.MeatDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.MeatDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
Projectiles/SorcerousStaff/NatureStaffProj.cs
+15 -20
View File
@@ -24,26 +24,23 @@ public class NatureStaffProj : ModProjectile
{
if (Main.rand.NextBool(5))
{
int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.NatureStaffDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust2].scale = 0.9f;
Dust obj = Main.dust[dust2];
obj.velocity *= 0.1f;
Main.dust[dust2].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.NatureStaffDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
if (Main.rand.NextBool(4))
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.NatureStaffDust2>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj2 = Main.dust[dust1];
obj2.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.NatureStaffDust2>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
}
public override bool OnTileCollide(Vector2 oldVelocity)
{
Projectile projectile = Projectile;
projectile.penetrate--;
Projectile.penetrate--;
if (Projectile.penetrate <= 0)
{
Projectile.Kill();
@@ -59,8 +56,7 @@ public class NatureStaffProj : ModProjectile
{
Projectile.velocity.Y = 0f - oldVelocity.Y;
}
Projectile projectile2 = Projectile;
projectile2.velocity *= 0.75f;
Projectile.velocity *= 0.75f;
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
return false;
@@ -70,11 +66,10 @@ public class NatureStaffProj : ModProjectile
{
for (int i = 0; i < 5; i++)
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.NatureStaffDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.NatureStaffDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
@@ -83,7 +78,7 @@ public class NatureStaffProj : ModProjectile
{
if (Main.rand.NextBool(4))
{
target.AddBuff(20, 180, false);
target.AddBuff(BuffID.Poisoned, 180, false);
}
}
}
Projectiles/SorcerousStaff/SorcerousHellstaffProj.cs
+15 -20
View File
@@ -24,26 +24,23 @@ public class SorcerousHellstaffProj : ModProjectile
{
if (Main.rand.NextBool(3))
{
int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust2].scale = 0.9f;
Dust obj = Main.dust[dust2];
obj.velocity *= 0.1f;
Main.dust[dust2].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
if (Main.rand.NextBool(4))
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDust2>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj2 = Main.dust[dust1];
obj2.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDust2>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
}
public override bool OnTileCollide(Vector2 oldVelocity)
{
Projectile projectile = Projectile;
projectile.penetrate--;
Projectile.penetrate--;
if (Projectile.penetrate <= 0)
{
Projectile.Kill();
@@ -59,8 +56,7 @@ public class SorcerousHellstaffProj : ModProjectile
{
Projectile.velocity.Y = 0f - oldVelocity.Y;
}
Projectile projectile2 = Projectile;
projectile2.velocity *= 0.75f;
Projectile.velocity *= 0.75f;
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
return false;
@@ -70,11 +66,10 @@ public class SorcerousHellstaffProj : ModProjectile
{
for (int i = 0; i < 5; i++)
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
@@ -83,7 +78,7 @@ public class SorcerousHellstaffProj : ModProjectile
{
if (Main.rand.NextBool(6))
{
target.AddBuff(24, 180, false);
target.AddBuff(BuffID.OnFire, 180, false);
}
}
}
Projectiles/SorcerousStaff/SorcerousHellstaffProjWhite.cs
+15 -20
View File
@@ -24,26 +24,23 @@ public class SorcerousHellstaffProjWhite : ModProjectile
{
if (Main.rand.NextBool(3))
{
int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDustWhite>(), 0f, 0f, 0, default, 1f);
Main.dust[dust2].scale = 0.9f;
Dust obj = Main.dust[dust2];
obj.velocity *= 0.1f;
Main.dust[dust2].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDustWhite>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
if (Main.rand.NextBool(4))
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDustPurple>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj2 = Main.dust[dust1];
obj2.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDustPurple>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
}
public override bool OnTileCollide(Vector2 oldVelocity)
{
Projectile projectile = Projectile;
projectile.penetrate--;
Projectile.penetrate--;
if (Projectile.penetrate <= 0)
{
Projectile.Kill();
@@ -59,8 +56,7 @@ public class SorcerousHellstaffProjWhite : ModProjectile
{
Projectile.velocity.Y = 0f - oldVelocity.Y;
}
Projectile projectile2 = Projectile;
projectile2.velocity *= 0.75f;
Projectile.velocity *= 0.75f;
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
return false;
@@ -70,11 +66,10 @@ public class SorcerousHellstaffProjWhite : ModProjectile
{
for (int i = 0; i < 5; i++)
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDustWhite>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousHellDustWhite>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
@@ -83,7 +78,7 @@ public class SorcerousHellstaffProjWhite : ModProjectile
{
if (Main.rand.NextBool(6))
{
target.AddBuff(24, 180, false);
target.AddBuff(BuffID.OnFire, 180, false);
}
}
}
Projectiles/SorcerousStaff/SorcerousStaffProj.cs
+6 -9
View File
@@ -42,8 +42,7 @@ public class SorcerousStaffProj : ModProjectile
public override bool OnTileCollide(Vector2 oldVelocity)
{
Projectile projectile = Projectile;
projectile.penetrate--;
Projectile.penetrate--;
if (Projectile.penetrate <= 0)
{
Projectile.Kill();
@@ -59,8 +58,7 @@ public class SorcerousStaffProj : ModProjectile
{
Projectile.velocity.Y = 0f - oldVelocity.Y;
}
Projectile projectile2 = Projectile;
projectile2.velocity *= 0.75f;
Projectile.velocity *= 0.75f;
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
return false;
@@ -70,11 +68,10 @@ public class SorcerousStaffProj : ModProjectile
{
for (int i = 0; i < 5; i++)
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousDust>(), 0f, 0f, 0, default, 1f);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.SorcerousDust>());
Main.dust[dust].scale = 0.9f;
Main.dust[dust].velocity *= 0.1f;
Main.dust[dust].noGravity = true;
}
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
Projectiles/SorcerousStaff/TranquilityProj.cs
+10 -13
View File
@@ -24,28 +24,26 @@ public class TranquilityProj : ModProjectile
{
if (Utils.NextFloat(Main.rand) < 0.1f && Projectile.alpha <= 100)
{
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust>(), 0f, 0f, 0, default, 1f);
int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust2>(), 0f, 0f, 0, default, 1f);
int dust3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust3>(), 0f, 0f, 0, default, 1f);
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust>());
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
Main.dust[dust1].velocity *= 0.1f;
Main.dust[dust1].noGravity = true;
int dust2 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust2>());
Main.dust[dust2].scale = 0.9f;
Dust obj2 = Main.dust[dust2];
obj2.velocity *= 0.1f;
Main.dust[dust2].velocity *= 0.1f;
Main.dust[dust2].noGravity = true;
int dust3 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust3>());
Main.dust[dust3].scale = 0.9f;
Dust obj3 = Main.dust[dust3];
obj3.velocity *= 0.1f;
Main.dust[dust3].velocity *= 0.1f;
Main.dust[dust3].noGravity = true;
}
}
public override bool OnTileCollide(Vector2 oldVelocity)
{
Projectile projectile = Projectile;
projectile.penetrate--;
Projectile.penetrate--;
if (Projectile.penetrate <= 0)
{
Projectile.Kill();
@@ -61,8 +59,7 @@ public class TranquilityProj : ModProjectile
{
Projectile.velocity.Y = 0f - oldVelocity.Y;
}
Projectile projectile2 = Projectile;
projectile2.velocity = projectile2.velocity * 0.75f;
Projectile.velocity *= 0.75f;
SoundEngine.PlaySound(SoundID.Item27, Projectile.position);
}
return false;