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/RainbowDemon/RainbowDemonArrow.cs
+18 -23
View File
@@ -7,8 +7,6 @@ namespace FabusMod.Projectiles.RainbowDemon;
public class RainbowDemonArrow : ModProjectile
{
private const int alphaReducation = 25;
public override void SetDefaults()
{
Projectile.width = 18;
@@ -28,8 +26,7 @@ public class RainbowDemonArrow : ModProjectile
{
if (Projectile.alpha > 30)
{
Projectile projectile = Projectile;
projectile.alpha -= 15;
Projectile.alpha -= 15;
if (Projectile.alpha < 30)
{
Projectile.alpha = 30;
@@ -37,20 +34,19 @@ public class RainbowDemonArrow : 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);
Main.dust[dust1].scale = 0.9f;
Dust obj = Main.dust[dust1];
obj.velocity *= 0.1f;
int dust1 = Dust.NewDust(Projectile.position, Projectile.width, Projectile.height, ModContent.DustType<Dusts.RainbowDust>());
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[dust1].scale = 0.9f;
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;
}
}
@@ -61,20 +57,19 @@ public class RainbowDemonArrow : 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;
}
}
Projectiles/RainbowDemon/RainbowDemonClaymoreProj.cs
+12 -17
View File
@@ -29,8 +29,7 @@ public class RainbowDemonClaymoreProj : ModProjectile
{
if (Projectile.alpha > 70)
{
Projectile projectile = Projectile;
projectile.alpha -= 15;
Projectile.alpha -= 15;
if (Projectile.alpha < 70)
{
Projectile.alpha = 70;
@@ -66,20 +65,19 @@ public class RainbowDemonClaymoreProj : 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;
}
AnimateProjectile();
@@ -96,14 +94,11 @@ public class RainbowDemonClaymoreProj : ModProjectile
public void AnimateProjectile()
{
Projectile projectile = Projectile;
projectile.frameCounter++;
Projectile.frameCounter++;
if (Projectile.frameCounter >= 5)
{
Projectile projectile2 = Projectile;
projectile2.frame++;
Projectile projectile3 = Projectile;
projectile3.frame %= 3;
Projectile.frame++;
Projectile.frame %= 3;
Projectile.frameCounter = 0;
}
}
Projectiles/RainbowDemon/RainbowDemonKnife.cs
+11 -18
View File
@@ -7,10 +7,6 @@ namespace FabusMod.Projectiles.RainbowDemon;
public class RainbowDemonKnife : ModProjectile
{
private const int alphaReducation = 25;
private const float maxTicks = 70f;
public override void SetDefaults()
{
Projectile.width = 16;
@@ -35,11 +31,10 @@ public class RainbowDemonKnife : ModProjectile
{
Vector2 position = Projectile.position;
Vector2 rotVector = Utils.ToRotationVector2(Projectile.rotation - MathHelper.ToRadians(90f));
_ = position + rotVector * 16f;
int item = 0;
if (Main.netMode == NetmodeID.MultiplayerClient && item >= 0)
{
NetMessage.SendData(MessageID.KillProjectile, -1, -1, null, 0, 0f, 0f, 0f, 0, 0, 0);
NetMessage.SendData(MessageID.KillProjectile);
}
}
@@ -47,8 +42,7 @@ public class RainbowDemonKnife : ModProjectile
{
if (Projectile.alpha > 30)
{
Projectile projectile = Projectile;
projectile.alpha -= 15;
Projectile.alpha -= 15;
if (Projectile.alpha < 30)
{
Projectile.alpha = 30;
@@ -56,20 +50,19 @@ public class RainbowDemonKnife : 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;
}
}
@@ -78,7 +71,7 @@ public class RainbowDemonKnife : ModProjectile
{
if (Main.rand.NextBool(1))
{
target.AddBuff(70, 720, false);
target.AddBuff(BuffID.Venom, 720, false);
}
}
}
Projectiles/RainbowDemon/RainbowDemonMagicBall.cs
+10 -15
View File
@@ -8,8 +8,6 @@ namespace FabusMod.Projectiles.RainbowDemon;
public class RainbowDemonMagicBall : ModProjectile
{
private const int alphaReducation = 25;
public override void SetDefaults()
{
Projectile.width = 10;
@@ -27,28 +25,26 @@ public class RainbowDemonMagicBall : 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();
@@ -64,8 +60,7 @@ public class RainbowDemonMagicBall : 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;
Projectiles/RainbowDemon/RainbowDemonMelee.cs
+10 -15
View File
@@ -9,8 +9,6 @@ public class RainbowDemonMelee : ModProjectile
{
private const float maxTicks = 300f;
private const int alphaReducation = 25;
public override void SetDefaults()
{
Projectile.width = 80;
@@ -36,11 +34,10 @@ public class RainbowDemonMelee : ModProjectile
{
Vector2 position = Projectile.position;
Vector2 rotVector = Utils.ToRotationVector2(Projectile.rotation - MathHelper.ToRadians(90f));
_ = position + rotVector * 16f;
int item = 0;
if (Main.netMode == NetmodeID.MultiplayerClient && item >= 0)
{
NetMessage.SendData(MessageID.KillProjectile, -1, -1, null, 0, 0f, 0f, 0f, 0, 0, 0);
NetMessage.SendData(MessageID.KillProjectile);
}
}
@@ -48,8 +45,7 @@ public class RainbowDemonMelee : ModProjectile
{
if (Projectile.alpha > 30)
{
Projectile projectile = Projectile;
projectile.alpha -= 15;
Projectile.alpha -= 15;
if (Projectile.alpha < 30)
{
Projectile.alpha = 30;
@@ -70,20 +66,19 @@ public class RainbowDemonMelee : 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;
}
}
Projectiles/RainbowDemon/RainbowDemonShredderProj.cs
+9 -11
View File
@@ -24,8 +24,7 @@ public class RainbowDemonShredderProj : ModProjectile
{
if (Projectile.alpha > 30)
{
Projectile projectile = Projectile;
projectile.alpha -= 15;
Projectile.alpha -= 15;
if (Projectile.alpha < 30)
{
Projectile.alpha = 30;
@@ -33,20 +32,19 @@ public class RainbowDemonShredderProj : 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;
}
}