Replaced .Next(d) == d calls to .NextBool(d) calls

IAmBatby · Oct 18, 2017 · c5ebfd1 · c5ebfd1
1 parent 19ccbd7
commit c5ebfd1
Show file tree

Hide file tree

Showing 362 changed files with 666 additions and 666 deletions.
diff --git a/Helper.cs b/Helper.cs
@@ -248,7 +248,7 @@ public static float DistortFloat(float Float, float Percent)
 				DistortNumber *= 10;
 				Counter++;
 			}
-			return Float + ((Main.rand.Next(0, (int)DistortNumber + 1) / (float)(Math.Pow(10, Counter))) * ((Main.rand.Next(2) == 0) ? -1 : 1));
+			return Float + ((Main.rand.Next(0, (int)DistortNumber + 1) / (float)(Math.Pow(10, Counter))) * ((Main.rand.NextBool(2)) ? -1 : 1));
 		}
 
 		public static void Explode(int index, int sizeX, int sizeY, ExtraAction visualAction = null)

diff --git a/Ice/Items/FrozenPaxe.cs b/Ice/Items/FrozenPaxe.cs
@@ -34,7 +34,7 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 80);
 			}

diff --git a/Invasion/CyberLaser.cs b/Invasion/CyberLaser.cs
@@ -25,7 +25,7 @@ public override void SetDefaults()
 		public override void OnHitNPC(NPC target1, int damage, float knockback, bool crit)
 		{
 			Player target = Main.player[Main.myPlayer];
-			if (Main.rand.Next(2) == 0)
+			if (Main.rand.NextBool(2))
 				target.AddBuff(mod.BuffType("Light"), 300);
 		}
 

diff --git a/Invasion/InvisibleSoul.cs b/Invasion/InvisibleSoul.cs
@@ -46,7 +46,7 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo)
 
 		public override void OnHitPlayer(Player player, int damage, bool crit)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				player.AddBuff(164, 1000, true);
 			}
@@ -62,7 +62,7 @@ public override void HitEffect(int hitDirection, double damage)
 				}
 
 				CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
-				if (InvasionWorld.CyberWrath && Main.rand.Next(3) == 1)
+				if (InvasionWorld.CyberWrath && Main.rand.NextBool(3))
 				{
 					InvasionWorld.CyberWrathPoints1 += 3;
 					//Main.NewText(("Wave 1: Complete " + TremorWorld.CyberWrathPoints + "%"), 39, 86, 134);
@@ -82,7 +82,7 @@ public override void NPCLoot()
 				int centerX = (int)(npc.position.X + npc.width / 2) / 16;
 				int centerY = (int)(npc.position.Y + npc.height / 2) / 16;
 				int halfLength = npc.width / 2 / 16 + 1;
-				if (Main.rand.Next(3) == 0)
+				if (Main.rand.NextBool(3))
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("ParadoxElement"), Main.rand.Next(5, 7));
 				}
@@ -113,7 +113,7 @@ public override void AI()
 				SecondState = true;
 			}
 
-			if (Main.rand.Next(2) == 0)
+			if (Main.rand.NextBool(2))
 			{
 				int num706 = Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 0f, 0f, 200, npc.color, 0.5f);
 				Main.dust[num706].velocity *= 0.6f;

diff --git a/Invasion/MiniSoul.cs b/Invasion/MiniSoul.cs
@@ -40,7 +40,7 @@ public override void NPCLoot()
 
 		private void SettingNumber()
 		{
-			if (Main.rand.Next(2) == 1)
+			if (Main.rand.NextBool(2))
 			{
 				num++;
 			}
@@ -61,7 +61,7 @@ public override void HitEffect(int hitDirection, double damage)
 				}
 
 				CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
-				if (InvasionWorld.CyberWrath && Main.rand.Next(4) == 1)
+				if (InvasionWorld.CyberWrath && Main.rand.NextBool(4))
 				{
 					InvasionWorld.CyberWrathPoints1 += 1;
 					//Main.NewText(("Wave 1: Complete " + TremorWorld.CyberWrathPoints + "%"), 39, 86, 134);

diff --git a/Invasion/ParadoxBat.cs b/Invasion/ParadoxBat.cs
@@ -55,7 +55,7 @@ public override void HitEffect(int hitDirection, double damage)
 				}
 
 				CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
-				if (InvasionWorld.CyberWrath && Main.rand.Next(2) == 1)
+				if (InvasionWorld.CyberWrath && Main.rand.NextBool(2))
 				{
 					InvasionWorld.CyberWrathPoints1 += 1;
 					//Main.NewText(("Wave 1: Complete " + TremorWorld.CyberWrathPoints + "%"), 39, 86, 134);
@@ -104,7 +104,7 @@ public override void NPCLoot()
 				int centerX = (int)(npc.position.X + npc.width / 2) / 16;
 				int centerY = (int)(npc.position.Y + npc.height / 2) / 16;
 				int halfLength = npc.width / 2 / 16 + 1;
-				if (Main.rand.Next(3) == 0)
+				if (Main.rand.NextBool(3))
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("ParadoxElement"), Main.rand.Next(3, 5));
 				}
@@ -163,7 +163,7 @@ public override void AI()
 					npc.position.Y = Main.player[npc.target].position.Y + (float)((250 * Math.Sin(npc.ai[3])) * -1);
 				}
 			}
-			if (Main.rand.Next(2) == 0)
+			if (Main.rand.NextBool(2))
 			{
 				int num706 = Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 0f, 0f, 200, npc.color, 0.5f);
 				Main.dust[num706].velocity *= 0.6f;
@@ -219,7 +219,7 @@ public override void AI()
 					}
 				npc.netUpdate = true;
 
-				if (Main.rand.Next(6) == 0)
+				if (Main.rand.NextBool(6))
 				{
 					int dust = Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 0f, 0f, 200, npc.color, 0.4f);
 					Main.dust[dust].velocity *= 0.4f;

diff --git a/Invasion/ParadoxSun.cs b/Invasion/ParadoxSun.cs
@@ -54,7 +54,7 @@ public override void HitEffect(int hitDirection, double damage)
 				}
 
 				CyberWrathInvasion modPlayer = Main.player[Main.myPlayer].GetModPlayer<CyberWrathInvasion>(mod);
-				if (InvasionWorld.CyberWrath && Main.rand.Next(2) == 1)
+				if (InvasionWorld.CyberWrath && Main.rand.NextBool(2))
 				{
 					InvasionWorld.CyberWrathPoints1 += 2;
 					//Main.NewText(("Wave 1: Complete " + TremorWorld.CyberWrathPoints + "%"), 39, 86, 134);
@@ -75,7 +75,7 @@ public override void ScaleExpertStats(int numPlayers, float bossLifeScale)
 
 		public override void OnHitPlayer(Player player, int damage, bool crit)
 		{
-			if (Main.rand.Next(6) == 0)
+			if (Main.rand.NextBool(6))
 			{
 				player.AddBuff(31, 1000, true);
 			}

diff --git a/Invasion/ParadoxTitanBag.cs b/Invasion/ParadoxTitanBag.cs
@@ -34,7 +34,7 @@ public override void OpenBossBag(Player player)
 			{
 				player.TryGettingDevArmor();
 			}
-			if (Main.rand.Next(7) == 0)
+			if (Main.rand.NextBool(7))
 			{
 				player.QuickSpawnItem(mod.ItemType("ParadoxTitanMask"));
 			}

diff --git a/Invasion/Relayx.cs b/Invasion/Relayx.cs
@@ -38,17 +38,17 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 59);
 			}
 		}
 
 		public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack)
 		{
-			if (Main.rand.Next(8) == 0)
+			if (Main.rand.NextBool(8))
 			{
-				if (Main.rand.Next(3) == 0)
+				if (Main.rand.NextBool(3))
 				{
 					Projectile.NewProjectile(position.X, position.Y, speedX, speedY, mod.ProjectileType("RelayxDragonBig"), item.damage + 200, 10, Main.myPlayer);
 				}

diff --git a/Invasion/RelayxDragon.cs b/Invasion/RelayxDragon.cs
@@ -26,7 +26,7 @@ public override void SetDefaults()
 		public override void AI()
 		{
 			projectile.spriteDirection = projectile.direction;
-			if (Main.rand.Next(3) == 1)
+			if (Main.rand.NextBool(3))
 			{
 				int dust2 = Dust.NewDust(new Vector2(projectile.position.X, projectile.position.Y), projectile.width, projectile.height, 59, 0f, 0f, 100, default(Color), 1f);
 				Main.dust[dust2].noGravity = true;

diff --git a/Invasion/RelayxDragonBig.cs b/Invasion/RelayxDragonBig.cs
@@ -43,7 +43,7 @@ public override bool PreAI()
 		public override void AI()
 		{
 			projectile.spriteDirection = projectile.direction;
-			if (Main.rand.Next(3) == 1)
+			if (Main.rand.NextBool(3))
 			{
 				int dust2 = Dust.NewDust(new Vector2(projectile.position.X, projectile.position.Y), projectile.width, projectile.height, 59, 0f, 0f, 100, default(Color), 1f);
 				Main.dust[dust2].noGravity = true;

diff --git a/Invasion/RelayxProj.cs b/Invasion/RelayxProj.cs
@@ -24,7 +24,7 @@ public override void SetDefaults()
 
 		public override void AI()
 		{
-			if (Main.rand.Next(3) == 1)
+			if (Main.rand.NextBool(3))
 			{
 				int dust2 = Dust.NewDust(new Vector2(projectile.position.X, projectile.position.Y), projectile.width, projectile.height, 59, 0f, 0f, 100, default(Color), 1f);
 				Main.dust[dust2].noGravity = true;

diff --git a/Invasion/Titan.cs b/Invasion/Titan.cs
@@ -174,7 +174,7 @@ public override void AI()
 				{
 					npc.TargetClosest(true);
 				}
-				if (!Main.player[npc.target].dead && Main.rand.Next(2) == 0)
+				if (!Main.player[npc.target].dead && Main.rand.NextBool(2))
 				{
 					npc.position.X = Main.player[npc.target].position.X + (float)((600 * Math.Cos(npc.ai[3])) * -1);
 					npc.position.Y = Main.player[npc.target].position.Y + (float)((600 * Math.Sin(npc.ai[3])) * -1);
@@ -203,7 +203,7 @@ public override void AI()
 					npc.TargetClosest(true);
 				}
 
-				if (!Main.player[npc.target].dead && Main.rand.Next(2) == 1)
+				if (!Main.player[npc.target].dead && Main.rand.NextBool(2))
 				{
 					npc.position.X = Main.player[npc.target].position.X + (float)((600 * Math.Cos(npc.ai[3])) * -1);
 					npc.position.Y = Main.player[npc.target].position.Y + (float)((600 * Math.Sin(npc.ai[3])) * -1);
@@ -303,7 +303,7 @@ public override void NPCLoot()
 				{
 					npc.DropBossBags();
 				}
-				if (!Main.expertMode && Main.rand.Next(7) == 0)
+				if (!Main.expertMode && Main.rand.NextBool(7))
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("ParadoxTitanMask"));
 				}

diff --git a/Invasion/TitanCrystal_.cs b/Invasion/TitanCrystal_.cs
@@ -66,7 +66,7 @@ public override void OnHitPlayer(Player target, int damage, bool crit)
 		{
 			for (int k = 0; k < Player.maxBuffs; k++)
 			{
-				if (target.buffType[k] > 0 && target.buffTime[k] > 0 && BuffLoader.CanBeCleared(target.buffType[k]) && Main.rand.Next(2) == 0)
+				if (target.buffType[k] > 0 && target.buffTime[k] > 0 && BuffLoader.CanBeCleared(target.buffType[k]) && Main.rand.NextBool(2))
 				{
 					target.DelBuff(k);
 					k--;

diff --git a/Invasion/Violeum.cs b/Invasion/Violeum.cs
@@ -46,11 +46,11 @@ public override void NPCLoot()
 				{
 					npc.DropBossBags();
 				}
-				if (!Main.expertMode && Main.rand.Next(7) == 0)
+				if (!Main.expertMode && Main.rand.NextBool(7))
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("VioleumMask"));
 				}
-				if (!Main.expertMode && Main.rand.Next(5) == 0)
+				if (!Main.expertMode && Main.rand.NextBool(5))
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("Crystyle"));
 				}
@@ -170,7 +170,7 @@ public override void AI()
 				SecondState = true;
 			}
 
-			if (Main.rand.Next(2) == 0)
+			if (Main.rand.NextBool(2))
 			{
 				int num706 = Dust.NewDust(npc.position, npc.width, npc.height, mod.DustType<CyberDust>(), 0f, 0f, 200, npc.color, 0.5f);
 				Main.dust[num706].velocity *= 0.6f;
@@ -287,7 +287,7 @@ public override void AI()
 					}
 				}
 
-				if (Main.rand.Next(2) == 0)
+				if (Main.rand.NextBool(2))
 				{
 
 					float j = 0;

diff --git a/Items/AlchemasterTreasureBag.cs b/Items/AlchemasterTreasureBag.cs
@@ -29,7 +29,7 @@ public override bool CanRightClick()
 
 		public override void OpenBossBag(Player player)
 		{
-			if (Main.rand.Next(7) == 0)
+			if (Main.rand.NextBool(7))
 			{
 				player.QuickSpawnItem(mod.ItemType("AlchemasterMask"));
 			}
@@ -45,11 +45,11 @@ public override void OpenBossBag(Player player)
 			{
 				player.QuickSpawnItem(mod.ItemType("SparkingFlask"), Main.rand.Next(30, 78));
 			}
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				player.QuickSpawnItem(mod.ItemType("TheGlorch"));
 			}
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				player.QuickSpawnItem(mod.ItemType("BadApple"));
 			}

diff --git a/Items/AncientClaymore.cs b/Items/AncientClaymore.cs
@@ -36,7 +36,7 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64);
 			}

diff --git a/Items/AncientDragonBag.cs b/Items/AncientDragonBag.cs
@@ -43,7 +43,7 @@ public override void OpenBossBag(Player player)
 					break;
 			}
 
-			if (Main.rand.Next(7) == 0)
+			if (Main.rand.NextBool(7))
 			{
 				player.QuickSpawnItem(mod.ItemType("AncientDragonMask"));
 			}

diff --git a/Items/AncientSmasher.cs b/Items/AncientSmasher.cs
@@ -36,7 +36,7 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64);
 			}

diff --git a/Items/AncientSolarWind.cs b/Items/AncientSolarWind.cs
@@ -35,7 +35,7 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64);
 			}

diff --git a/Items/AncientSunStaff.cs b/Items/AncientSunStaff.cs
@@ -38,7 +38,7 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 64);
 			}

diff --git a/Items/AndasBag.cs b/Items/AndasBag.cs
@@ -49,7 +49,7 @@ public override void OpenBossBag(Player player)
 					break;
 			}
 
-			if (Main.rand.Next(7) == 0)
+			if (Main.rand.NextBool(7))
 			{
 				player.QuickSpawnItem(mod.ItemType("AndasMask"));
 			}

diff --git a/Items/ArgiteBroadsword.cs b/Items/ArgiteBroadsword.cs
@@ -41,7 +41,7 @@ public override void AddRecipes()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 61);
 			}

diff --git a/Items/ArgiteHamaxe.cs b/Items/ArgiteHamaxe.cs
@@ -43,7 +43,7 @@ public override void AddRecipes()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 61);
 			}

diff --git a/Items/ArgitePickaxe.cs b/Items/ArgitePickaxe.cs
@@ -42,7 +42,7 @@ public override void AddRecipes()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 61);
 			}

diff --git a/Items/Awakening.cs b/Items/Awakening.cs
@@ -34,7 +34,7 @@ public override void SetStaticDefaults()
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(3) == 0)
+			if (Main.rand.NextBool(3))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 13);
 			}

diff --git a/Items/Banhammer.cs b/Items/Banhammer.cs
@@ -42,7 +42,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 
 		public override void MeleeEffects(Player player, Rectangle hitbox)
 		{
-			if (Main.rand.Next(2) == 0)
+			if (Main.rand.NextBool(2))
 			{
 				int dust = Dust.NewDust(new Vector2(hitbox.X, hitbox.Y), hitbox.Width, hitbox.Height, 226);
 			}

diff --git a/Items/Bolter.cs b/Items/Bolter.cs
@@ -37,7 +37,7 @@ public override void SetStaticDefaults()
 
 		public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack)
 		{
-			if (Main.rand.Next(2) == 0)
+			if (Main.rand.NextBool(2))
 			{
 				type = 41;
 			}

diff --git a/Items/BrassChainRepeater.cs b/Items/BrassChainRepeater.cs
@@ -50,7 +50,7 @@ public override void UpdateInventory(Player player)
 
 		public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, ref float knockBack)
 		{
-			if (Main.rand.Next(4) == 0)
+			if (Main.rand.NextBool(4))
 			{
 				type = 260;
 			}
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ public override void OpenBossBag(Player player) @@
     					break;
     			}
-    			if (Main.rand.Next(7) == 0)
+    			if (Main.rand.NextBool(7))
     			{
     				player.QuickSpawnItem(mod.ItemType("AncientDragonMask"));
     			}
@@ Expand Down @@