Alchemist burst projs to alchemist projectile

IAmBatby · Sep 15, 2017 · 3beed16 · 3beed16
1 parent 9cb8b0e
commit 3beed16
Show file tree

Hide file tree

Showing 39 changed files with 78 additions and 312 deletions.
diff --git a/Projectiles/Alchemic/Bursts/BasicBurst.cs b/Projectiles/Alchemic/Bursts/BasicBurst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class BasicBurst : ModProjectile
+	public class BasicBurst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/BasicSkull.cs b/Projectiles/Alchemic/Bursts/BasicSkull.cs
@@ -5,7 +5,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class BasicSkull : ModProjectile
+	public class BasicSkull : AlchemistProjectile
 	{
 
 		public override void SetDefaults()
@@ -27,13 +27,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 
 		public override void AI()

diff --git a/Projectiles/Alchemic/Bursts/BasicSkullburst.cs b/Projectiles/Alchemic/Bursts/BasicSkullburst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class BasicSkullburst : ModProjectile
+	public class BasicSkullburst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/BoomBurst.cs b/Projectiles/Alchemic/Bursts/BoomBurst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class BoomBurst : ModProjectile
+	public class BoomBurst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/BoomSkull.cs b/Projectiles/Alchemic/Bursts/BoomSkull.cs
@@ -5,7 +5,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class BoomSkull : ModProjectile
+	public class BoomSkull : AlchemistProjectile
 	{
 
 		public override void SetDefaults()
@@ -28,13 +28,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void Kill(int timeLeft)
 		{

diff --git a/Projectiles/Alchemic/Bursts/BoomSkullburst.cs b/Projectiles/Alchemic/Bursts/BoomSkullburst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class BoomSkullburst : ModProjectile
+	public class BoomSkullburst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -17,13 +17,7 @@ public override void SetDefaults()
 			projectile.penetrate = -1;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 
 		public override void Kill(int timeLeft)

diff --git a/Projectiles/Alchemic/Bursts/ClusterBurst.cs b/Projectiles/Alchemic/Bursts/ClusterBurst.cs
@@ -5,7 +5,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class ClusterBurst : ModProjectile
+	public class ClusterBurst : AlchemistProjectile
 	{
 
 		public override void SetDefaults()
@@ -27,13 +27,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 
 		public override void AI()

diff --git a/Projectiles/Alchemic/Bursts/ClusterSkull.cs b/Projectiles/Alchemic/Bursts/ClusterSkull.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class ClusterSkull : ModProjectile
+	public class ClusterSkull : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/ClusterSkullburst.cs b/Projectiles/Alchemic/Bursts/ClusterSkullburst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class ClusterSkullburst : ModProjectile
+	public class ClusterSkullburst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/CrystalBurst.cs b/Projectiles/Alchemic/Bursts/CrystalBurst.cs
@@ -5,7 +5,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class CrystalBurst : ModProjectile
+	public class CrystalBurst : AlchemistProjectile
 	{
 
 		public override void SetDefaults()
@@ -27,13 +27,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 
 		public override void AI()

diff --git a/Projectiles/Alchemic/Bursts/CrystalSkull.cs b/Projectiles/Alchemic/Bursts/CrystalSkull.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class CrystalSkull : ModProjectile
+	public class CrystalSkull : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/CrystalSkullburst.cs b/Projectiles/Alchemic/Bursts/CrystalSkullburst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class CrystalSkullburst : ModProjectile
+	public class CrystalSkullburst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void AI()
 		{

diff --git a/Projectiles/Alchemic/Bursts/FieryBurst.cs b/Projectiles/Alchemic/Bursts/FieryBurst.cs
@@ -5,7 +5,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class FieryBurst : ModProjectile
+	public class FieryBurst : AlchemistProjectile
 	{
 
 		public override void SetDefaults()
@@ -27,13 +27,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 
 		public override void OnHitNPC(NPC target, int damage, float knockback, bool crit)

diff --git a/Projectiles/Alchemic/Bursts/FierySkull.cs b/Projectiles/Alchemic/Bursts/FierySkull.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class FierySkull : ModProjectile
+	public class FierySkull : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void OnHitNPC(NPC target, int damage, float knockback, bool crit)
 		{

diff --git a/Projectiles/Alchemic/Bursts/FierySkullburst.cs b/Projectiles/Alchemic/Bursts/FierySkullburst.cs
@@ -4,7 +4,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class FierySkullburst : ModProjectile
+	public class FierySkullburst : AlchemistProjectile
 	{
 		public override void SetDefaults()
 		{
@@ -22,13 +22,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 		public override void OnHitNPC(NPC target, int damage, float knockback, bool crit)
 		{

diff --git a/Projectiles/Alchemic/Bursts/FrostBurst.cs b/Projectiles/Alchemic/Bursts/FrostBurst.cs
@@ -5,7 +5,7 @@
 
 namespace Tremor.Projectiles.Alchemic.Bursts
 {
-	public class FrostBurst : ModProjectile
+	public class FrostBurst : AlchemistProjectile
 	{
 
 		public override void SetDefaults()
@@ -27,13 +27,7 @@ public override void SetDefaults()
 			return Color.White;
 		}
 
-		public override void ModifyHitNPC(NPC target, ref int damage, ref float knockback, ref bool crit, ref int hitDirection)
-		{
-			if (Main.rand.Next(1, 101) <= Main.player[projectile.owner].GetModPlayer<MPlayer>(mod).alchemicalCrit)
-			{
-				crit = true;
-			}
-		}
+
 
 
 		public override void OnHitNPC(NPC target, int damage, float knockback, bool crit)