Dedicated bosses folder

Changelogs/v1.3.2.5.txt

@@ -5,6 +5,7 @@ Note:
 
 Bosses:
 - Fixed Paradox Titan (Titan Soul) and Wall of Shadows not registering as kill
+- Fixed bosses being seen as defeated for new worlds
 
 Worldgen:
 - Removed many (read: at least a dozen) redundant loops iterating world chests (should speed up WorldGen)
@@ -18,5 +19,8 @@ WorldGen Chests:
 - Fixed Ruin Chest generation and having content replaced
 - Fixed Ice Chest generation and having content replaced
 
+Other:
+- Fixed silently Caught Exception: Index was outside the bounds of the array.   at Tremor.NPCs.Bosses.CogLord.CogLordProbe.AI()
+
 Code:
 - Flags hideCode, hideResources and includeSource are no longer blocking unpacking. Unpack now to get the Tremor.dll

NPCs/AndasBoss/Andas.cs → NPCs/Bosses/AndasBoss/Andas.cs

@@ -5,7 +5,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	[AutoloadBossHead]
 	public class Andas : ModNPC
@@ -48,6 +48,8 @@ public override void SetDefaults()
 		const float Acceleration = 0.1f;
 		int Timer;
 		#endregion
+
+		//@todo
 		public override void AI()
 		{
 			npc.TargetClosest(true);

NPCs/AndasBoss/InfernoSkull.cs → NPCs/Bosses/AndasBoss/InfernoSkull.cs

@@ -4,7 +4,7 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	public class InfernoSkull : ModProjectile
 	{

NPCs/AndasBoss/MoltenSpirit.cs → NPCs/Bosses/AndasBoss/MoltenSpirit.cs

@@ -5,7 +5,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	public class MoltenSpirit : ModNPC
 	{

NPCs/AndasBoss/SpiritFire.cs → NPCs/Bosses/AndasBoss/SpiritFire.cs

@@ -2,7 +2,7 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	public class SpiritFire : ModProjectile
 	{

NPCs/AndasBoss/TrueAndas.cs → NPCs/Bosses/AndasBoss/TrueAndas.cs

@@ -5,12 +5,11 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	[AutoloadBossHead]
 	public class TrueAndas : ModNPC
 	{
-
 		public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("True Andas");
@@ -48,6 +47,8 @@ public override void SetDefaults()
 		const float Acceleration = 0.15f;
 		int Timer;
 		#endregion
+
+		//@todo
 		public override void AI()
 		{
 			npc.TargetClosest(true);

NPCs/AndasBoss/UndeadWyrmBody.cs → NPCs/Bosses/AndasBoss/UndeadWyrmBody.cs

@@ -4,15 +4,15 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	public class UndeadWyrmBody : ModNPC
 	{
-
 		public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Undead Wyrm");
 		}
+
 		public override void SetDefaults()
 		{
 			npc.lifeMax = 1;
@@ -31,6 +31,7 @@ public override void SetDefaults()
 			npc.buffImmune[67] = true;
 			npc.lavaImmune = true;
 		}
+
 		public override void AI()
 		{
 			if (!Main.npc[(int)npc.ai[1]].active)
@@ -41,14 +42,17 @@ public override void AI()
 				npc.active = false;
 			}
 		}
+
 		public override bool CheckActive()
 		{
 			return false;
 		}
+
 		public override bool? DrawHealthBar(byte hbPosition, ref float scale, ref Vector2 position)
 		{
 			return false;
 		}
+
 		public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor)
 		{
 			Texture2D drawTexture = Main.npcTexture[npc.type];

NPCs/AndasBoss/UndeadWyrmHead.cs → NPCs/Bosses/AndasBoss/UndeadWyrmHead.cs

@@ -5,7 +5,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	public class UndeadWyrmHead : ModNPC
 	{
@@ -89,6 +89,7 @@ public override void AI()
 				npc.netUpdate = true;
 			}
 		}
+
 		public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor)
 		{
 			Texture2D drawTexture = Main.npcTexture[npc.type];

NPCs/AndasBoss/UndeadWyrmTail.cs → NPCs/Bosses/AndasBoss/UndeadWyrmTail.cs

@@ -4,11 +4,10 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.NPCs.AndasBoss
+namespace Tremor.NPCs.Bosses.AndasBoss
 {
 	public class UndeadWyrmTail : ModNPC
 	{
-
 		public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Undead Wyrm");
@@ -32,10 +31,12 @@ public override void SetDefaults()
 			npc.buffImmune[67] = true;
 			npc.lavaImmune = true;
 		}
+
 		public override bool? DrawHealthBar(byte hbPosition, ref float scale, ref Vector2 position)
 		{
 			return false;
 		}
+
 		public override void AI()
 		{
 			if (!Main.npc[(int)npc.ai[1]].active)
@@ -45,6 +46,7 @@ public override void AI()
 				npc.active = false;
 			}
 		}
+
 		public override bool PreDraw(SpriteBatch spriteBatch, Color lightColor)
 		{
 			Texture2D drawTexture = Main.npcTexture[npc.type];

CogLord/NPCs/CogLord.cs → NPCs/Bosses/CogLord/CogLord.cs

@@ -5,7 +5,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	// todo: redo
 	[AutoloadBossHead]
@@ -83,7 +83,7 @@ public override void ScaleExpertStats(int numPlayers, float bossLifeScale)
 
 		public override bool PreDraw(SpriteBatch spriteBatch, Color drawColor)
 		{
-			spriteBatch.Draw(mod.GetTexture("CogLord/NPCs/CogLordBody"), npc.Center - Main.screenPosition, null, Color.White, 0f, new Vector2(44, -18), 1f, SpriteEffects.None, 0f);
+			spriteBatch.Draw(mod.GetTexture("NPCs/Bosses/CogLord/CogLordBody"), npc.Center - Main.screenPosition, null, Color.White, 0f, new Vector2(44, -18), 1f, SpriteEffects.None, 0f);
 			Texture2D drawTexture = Main.npcTexture[npc.type];
 			Vector2 origin = new Vector2((drawTexture.Width / 2) * 0.5F, (drawTexture.Height / Main.npcFrameCount[npc.type]) * 0.5F);
 			Vector2 drawPos = new Vector2(

CogLord/NPCs/CogLordArm.cs → NPCs/Bosses/CogLord/CogLordArm.cs

@@ -4,7 +4,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	public class CogLordArm : ModNPC
 	{

CogLord/NPCs/CogLordArmSecond.cs → NPCs/Bosses/CogLord/CogLordArmSecond.cs

@@ -4,7 +4,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	public class CogLordArmSecond : ModNPC
 	{

CogLord/NPCs/CogLordCog.cs → NPCs/Bosses/CogLord/CogLordCog.cs

@@ -1,10 +1,9 @@
-using Terraria;
+using Microsoft.Xna.Framework;
+using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-using Microsoft.Xna.Framework;
-
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	public class CogLordCog : ModNPC
 	{

CogLord/NPCs/CogLordGun.cs → NPCs/Bosses/CogLord/CogLordGun.cs

@@ -1,11 +1,10 @@
-
-using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	/*
 	 * npc.ai[0] = Index of the Cog Lord boss in the Main.npc array.

CogLord/NPCs/CogLordHand.cs → NPCs/Bosses/CogLord/CogLordHand.cs

@@ -1,10 +1,10 @@
-using Terraria;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
-using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	/*
 	 * npc.ai[0] = Index of the Cog Lord boss in the Main.npc array.

CogLord/NPCs/CogLordProbe.cs → NPCs/Bosses/CogLord/CogLordProbe.cs

@@ -4,7 +4,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	public class CogLordProbe : ModNPC
 	{
@@ -34,6 +34,12 @@ public override void SetDefaults()
 
 		public override void AI()
 		{
+			if (!NPC.AnyNPCs(mod.NPCType("CogLord")))
+			{
+				npc.active = false;
+				return;
+			}
+
 			npc.position += npc.velocity * 1.7f;
 			npc.rotation = Helper.rotateBetween2Points(npc.Center, Main.npc[(int)npc.ai[0]].Center);
 			while (npc.Distance(Main.npc[(int)npc.ai[0]].position) > 1000)

CogLord/NPCs/GogLordGog.cs → NPCs/Bosses/CogLord/GogLordGog.cs

@@ -3,7 +3,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.CogLord.NPCs
+namespace Tremor.NPCs.Bosses.CogLord
 {
 	public class GogLordGog : ModNPC
 	{

Items/CogLordBag.cs → NPCs/Bosses/CogLord/Items/CogLordBag.cs

@@ -1,13 +1,12 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.NPCs.Bosses.CogLord.Items
 {
 	public class CogLordBag : ModItem
 	{
 		public override void SetDefaults()
 		{
-
 			item.maxStack = 999;
 			item.consumable = true;
 			item.width = 24;

Items/CogLordMask.cs → NPCs/Bosses/CogLord/Items/CogLordMask.cs

@@ -1,6 +1,6 @@
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.NPCs.Bosses.CogLord.Items
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class CogLordMask : ModItem

Items/CogLordMusicBox.cs → NPCs/Bosses/CogLord/Items/CogLordMusicBox.cs

@@ -1,6 +1,6 @@
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.NPCs.Bosses.CogLord.Items
 {
 	public class CogLordMusicBox : ModItem
 	{

Items/CogLordTrophy.cs → NPCs/Bosses/CogLord/Items/CogLordTrophy.cs

@@ -1,6 +1,6 @@
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.NPCs.Bosses.CogLord.Items
 {
 	public class CogLordTrophy : ModItem
 	{

NPCs/Clamper.cs → NPCs/Bosses/Motherboard/Clamper.cs

@@ -1,11 +1,10 @@
 using System;
+using Microsoft.Xna.Framework;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-using Microsoft.Xna.Framework;
-
-namespace Tremor.NPCs
+namespace Tremor.NPCs.Bosses.Motherboard
 {
 	public class Clamper : ModNPC
 	{

NPCs/Clamper2.cs → NPCs/Bosses/Motherboard/Clamper2.cs

@@ -1,10 +1,9 @@
-using Terraria;
+using Microsoft.Xna.Framework;
+using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-using Microsoft.Xna.Framework;
-
-namespace Tremor.NPCs
+namespace Tremor.NPCs.Bosses.Motherboard
 {
 	public class Clamper2 : ModNPC
 	{