Motherboard refactor and improvements

IAmBatby · Aug 23, 2017 · 7ee09f8 · 7ee09f8
1 parent 7688b02
commit 7ee09f8
Show file tree

Hide file tree

Showing 42 changed files with 907 additions and 571 deletions.
diff --git a/Helper.cs b/Helper.cs
@@ -56,21 +56,6 @@ public static bool NoBiomeNormalSpawn(NPCSpawnInfo spawnInfo)
 		}
 		#endregion
 
-		public static void Downed(this TremorWorld.Boss boss, bool state)
-			=> TremorWorld.downedBoss[boss] = state;
-
-		public static bool Downed(this TremorWorld.Boss boss)
-			=> TremorWorld.downedBoss[boss];
-
-		public static Item SpawnItem(this ModNPC npc, short type, int stack = 1)
-			=> SpawnItem(npc.npc, type, stack);
-
-		public static Item SpawnItem(this NPC npc, short type, int stack = 1)
-			=> Main.item[Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, type, stack)];
-
-		public static Item SpawnItem(Vector2 position, Vector2 size, short type, int stack = 1)
-			=> Main.item[Item.NewItem((int)position.X, (int)position.Y, (int)size.X, (int)size.Y, type, stack)];
-
 		public static Vector2 RandomPosition(Vector2 pos1, Vector2 pos2)
 		{
 			Random rnd = new Random();
@@ -369,7 +354,6 @@ public static void DropItems(Vector2 position, Vector2 randomBox, params Drop[]
 				}
 			}
 		}
-
 	}
 
 	public struct Drop

diff --git a/Items/InfernoSkull.cs b/Items/InfernoSkull.cs
@@ -38,7 +38,7 @@ public override void ModifyTooltips(List<TooltipLine> tooltips)
 
 		public override bool CanUseItem(Player player)
 		{
-			return player.position.Y / 16f > Main.maxTilesY - 200 && TremorWorld.Boss.Trinity.Downed() && !NPC.AnyNPCs(mod.NPCType("Andas"));
+			return player.position.Y / 16f > Main.maxTilesY - 200 && TremorWorld.Boss.Trinity.IsDowned() && !NPC.AnyNPCs(mod.NPCType("Andas"));
 		}
 
 		public override void AddRecipes()

diff --git a/Motherboard_CreeperSpawning.cs b/Motherboard_CreeperSpawning.cs
diff --git a/NPCs/Alchemaster.cs b/NPCs/Alchemaster.cs
@@ -271,7 +271,7 @@ public override void NPCLoot()
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("BadApple"));
 				}
-				TremorWorld.Boss.Alchemaster.Downed(true);
+				TremorWorld.Boss.Alchemaster.Downed();
 
 			}
 		}

diff --git a/NPCs/Alchemist.cs b/NPCs/Alchemist.cs
@@ -127,7 +127,7 @@ public override void SetupShop(Chest shop, ref int nextSlot)
 				shop.item[nextSlot].SetDefaults(mod.ItemType("Nitro"));
 				nextSlot++;
 			}
-			if (TremorWorld.Boss.Alchemaster.Downed())
+			if (TremorWorld.Boss.Alchemaster.IsDowned())
 			{
 				shop.item[nextSlot].SetDefaults(mod.ItemType("Pyro"));
 				nextSlot++;

diff --git a/NPCs/ArabianMerchant.cs b/NPCs/ArabianMerchant.cs
@@ -49,7 +49,7 @@ public override void SetDefaults()
 
 		public override bool CanTownNPCSpawn(int numTownNPCs, int money)
 		{
-			if (TremorWorld.Boss.Rukh.Downed())
+			if (TremorWorld.Boss.Rukh.IsDowned())
 			{
 				return true;
 			}

diff --git a/NPCs/Barmadillo.cs b/NPCs/Barmadillo.cs
@@ -97,7 +97,7 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo)
 			int x = spawnInfo.spawnTileX;
 			int y = spawnInfo.spawnTileY;
 			int tile = Main.tile[x, y].type;
-			return Main.hardMode && TremorWorld.Boss.Trinity.Downed() && !spawnInfo.player.ZoneDungeon && y > Main.rockLayer ? 0.002f : 0f;
+			return Main.hardMode && TremorWorld.Boss.Trinity.IsDowned() && !spawnInfo.player.ZoneDungeon && y > Main.rockLayer ? 0.002f : 0f;
 		}
 	}
 }
diff --git a/NPCs/Brutallisk.cs b/NPCs/Brutallisk.cs
@@ -557,7 +557,7 @@ public override void NPCLoot()
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("BrutalliskMask"));
 				}
-				TremorWorld.Boss.Brutallisk.Downed(true);
+				TremorWorld.Boss.Brutallisk.Downed();
 			}
 		}
 

diff --git a/NPCs/CogLord.cs b/NPCs/CogLord.cs
@@ -330,7 +330,7 @@ public void CogMessage(string Message)
 		}
 		public override void NPCLoot()
 		{
-			TremorWorld.Boss.CogLord.Downed(true);
+			TremorWorld.Boss.CogLord.Downed();
 			if (Main.netMode != 1)
 			{
 				if (Main.expertMode)

diff --git a/NPCs/CyberKing.cs b/NPCs/CyberKing.cs
@@ -415,7 +415,7 @@ public override void NPCLoot()
 			{
 				Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("CyberKingMask"));
 			}
-			TremorWorld.Boss.CyberKing.Downed(true);
+			TremorWorld.Boss.CyberKing.Downed();
 	}
 	}
 }
diff --git a/NPCs/DevourerofPlanets.cs b/NPCs/DevourerofPlanets.cs
@@ -69,7 +69,7 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo)
 			int x = spawnInfo.spawnTileX;
 			int y = spawnInfo.spawnTileY;
 			int tile = Main.tile[x, y].type;
-			return Main.hardMode && TremorWorld.Boss.Trinity.Downed() && !spawnInfo.player.ZoneDungeon && y > Main.rockLayer ? 0.005f : 0f;
+			return Main.hardMode && TremorWorld.Boss.Trinity.IsDowned() && !spawnInfo.player.ZoneDungeon && y > Main.rockLayer ? 0.005f : 0f;
 		}
 
 		public override void HitEffect(int hitDirection, double damage)

diff --git a/NPCs/Dragon_HeadB.cs b/NPCs/Dragon_HeadB.cs
@@ -75,7 +75,7 @@ public override void NPCLoot()
 				Item.NewItem(npc.position, npc.Size, mod.ItemType<AncientDragonTrophy>());
 			}
 
-			TremorWorld.Boss.AncientDragon.Downed(true);
+			TremorWorld.Boss.AncientDragon.Downed();
 		}
 
 

diff --git a/NPCs/EvilCorn.cs b/NPCs/EvilCorn.cs
@@ -676,7 +676,7 @@ public override void NPCLoot()
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("CornJavelin"), Main.rand.Next(15, 45));
 				}
-				TremorWorld.Boss.EvilCorn.Downed(true);
+				TremorWorld.Boss.EvilCorn.Downed();
 
 			}
 		}

diff --git a/NPCs/FrostKing.cs b/NPCs/FrostKing.cs
@@ -310,7 +310,7 @@ public override void NPCLoot()
 				{
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("FrostoneOre"), Main.rand.Next(24, 42));
 				}
-				TremorWorld.Boss.FrostKing.Downed(true);
+				TremorWorld.Boss.FrostKing.Downed();
 			}
 		}
 	}

diff --git a/NPCs/FungusBeetle.cs b/NPCs/FungusBeetle.cs
@@ -60,7 +60,7 @@ public override void NPCLoot()
 					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("FungusElement"), Main.rand.Next(10, 23));
 				}
 				Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, 28, Main.rand.Next(9, 22));
-				TremorWorld.Boss.FungusBeetle.Downed(true);
+				TremorWorld.Boss.FungusBeetle.Downed();
 			}
 		}
 

diff --git a/NPCs/GhostWarrior.cs b/NPCs/GhostWarrior.cs
@@ -73,7 +73,7 @@ public override float SpawnChance(NPCSpawnInfo spawnInfo)
 			int x = spawnInfo.spawnTileX;
 			int y = spawnInfo.spawnTileY;
 			int tile = Main.tile[x, y].type;
-			return (Helper.NormalSpawn(spawnInfo) && Helper.NoZoneAllowWater(spawnInfo)) && TremorWorld.Boss.Trinity.Downed() && NPC.downedMoonlord && Main.hardMode && !Main.dayTime && y < Main.worldSurface ? 0.005f : 0f;
+			return (Helper.NormalSpawn(spawnInfo) && Helper.NoZoneAllowWater(spawnInfo)) && TremorWorld.Boss.Trinity.IsDowned() && NPC.downedMoonlord && Main.hardMode && !Main.dayTime && y < Main.worldSurface ? 0.005f : 0f;
 		}
 	}
 }
diff --git a/NPCs/HeaterOfWorldsHead.cs b/NPCs/HeaterOfWorldsHead.cs
@@ -251,7 +251,7 @@ private void DropLoot()
 			if (Main.rand.NextBool(10))
 				npc.SpawnItem((short)mod.ItemType<HeaterOfWorldsTrophy>());
 
-			TremorWorld.Boss.HeaterofWorlds.Downed(true);
+			TremorWorld.Boss.HeaterofWorlds.Downed();
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -271,7 +271,7 @@ public override void NPCLoot() @@
     				{
     					Item.NewItem((int)npc.position.X, (int)npc.position.Y, npc.width, npc.height, mod.ItemType("BadApple"));
     				}
-    				TremorWorld.Boss.Alchemaster.Downed(true);
+    				TremorWorld.Boss.Alchemaster.Downed();
     			}
     		}
@@ Expand Down @@