rename harvester, folders/namespace, add tell before bombing

Ouroel · Apr 17, 2022 · 1ec3bea · 1ec3bea
1 parent 3e6298e
commit 1ec3bea
Show file tree

Hide file tree

Showing 45 changed files with 131 additions and 65 deletions.
diff --git a/AssWorld.cs b/AssWorld.cs
@@ -1,5 +1,5 @@
 using AssortedCrazyThings.NPCs;
-using AssortedCrazyThings.NPCs.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using System.IO;

diff --git a/AssortedCrazyThings.cs b/AssortedCrazyThings.cs
@@ -2,7 +2,7 @@
 using AssortedCrazyThings.Effects;
 using AssortedCrazyThings.Items.Pets.CuteSlimes;
 using AssortedCrazyThings.Items.Weapons;
-using AssortedCrazyThings.NPCs.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
 using AssortedCrazyThings.Projectiles.Pets;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -122,7 +122,7 @@ private void LoadHarvesterTypes()
 				return;
 			}
 
-			harvester = ModContent.NPCType<Harvester>();
+			harvester = ModContent.NPCType<HarvesterBoss>();
 			harvesterTalonLeft = ModContent.NPCType<HarvesterTalonLeft>();
 			harvesterTalonRight = ModContent.NPCType<HarvesterTalonRight>();
 		}

diff --git a/Base/ModSupport/OtherModCalls.cs b/Base/ModSupport/OtherModCalls.cs
@@ -4,7 +4,7 @@
 using AssortedCrazyThings.Items.Placeable;
 using AssortedCrazyThings.Items.VanityArmor;
 using AssortedCrazyThings.Items.Weapons;
-using AssortedCrazyThings.NPCs.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
 using AssortedCrazyThings.Projectiles.Minions;
 using AssortedCrazyThings.Projectiles.Minions.CompanionDungeonSouls;
 using System;
@@ -36,8 +36,6 @@ public override void PostSetupContent()
 
 						int summonItem = ModContent.ItemType<IdolOfDecay>();
 
-						//TODO harvester, include 15 x ModContent.ItemType<CaughtDungeonSoulFreed>() in loot but dont spawn it
-
 						/*
 						 * "AddBoss",
 							args[1] as Mod, // Mod
@@ -55,7 +53,7 @@ args[11] as Action<SpriteBatch, Rectangle, Color> // Custom Drawing
 						bossChecklist.Call(
 							"AddBoss",
 							Mod,
-							Harvester.name,
+							HarvesterBoss.name,
 							AssortedCrazyThings.harvester,
 							5.1f,
 							(Func<bool>)(() => AssWorld.downedHarvester),

diff --git a/BossBars/HarvesterBossBar.cs b/BossBars/HarvesterBossBar.cs
@@ -1,4 +1,4 @@
-using AssortedCrazyThings.NPCs.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using ReLogic.Content;
@@ -35,7 +35,7 @@ public override Asset<Texture2D> GetIconTexture(ref Rectangle? iconFrame)
 			lifePercent = Utils.Clamp(npc.life / (float)npc.lifeMax, 0f, 1f);
 			shieldPercent = 0f;
 
-			if (npc.ModNPC is Harvester harvester)
+			if (npc.ModNPC is HarvesterBoss harvester)
 			{
 				if (!harvester.IsReviving)
 				{
@@ -45,8 +45,8 @@ public override Asset<Texture2D> GetIconTexture(ref Rectangle? iconFrame)
 				lifePercent = 0f;
 
 				var stats = harvester.GetAIStats();
-				shieldPercent = Utils.Clamp(harvester.ReviveProgress / Harvester.Revive_Duration, 0f, 1f);
-				shieldPercent = Utils.Remap(shieldPercent, 0f, 1f, Harvester.Revive_MinHP, stats.MaxHP);
+				shieldPercent = Utils.Clamp(harvester.ReviveProgress / HarvesterBoss.Revive_Duration, 0f, 1f);
+				shieldPercent = Utils.Remap(shieldPercent, 0f, 1f, HarvesterBoss.Revive_MinHP, stats.MaxHP);
 			}
 
 			return true;

diff --git a/...s/Bosses/DungeonBird/BabyHarvesterBuff.cs → ...PCs/Bosses/Harvester/BabyHarvesterBuff.cs b/...s/Bosses/DungeonBird/BabyHarvesterBuff.cs → ...PCs/Bosses/Harvester/BabyHarvesterBuff.cs
@@ -1,4 +1,4 @@
-using AssortedCrazyThings.Projectiles.NPCs.Bosses.DungeonBird;
+using AssortedCrazyThings.Projectiles.NPCs.Bosses.Harvester;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using ReLogic.Content;
@@ -7,7 +7,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace AssortedCrazyThings.Buffs.NPCs.Bosses.DungeonBird
+namespace AssortedCrazyThings.Buffs.NPCs.Bosses.Harvester
 {
 	[Content(ContentType.Bosses)]
 	public class BabyHarvesterBuff : AssBuff

diff --git a/.../Bosses/DungeonBird/BabyHarvesterBuff.png → ...Cs/Bosses/Harvester/BabyHarvesterBuff.png b/.../Bosses/DungeonBird/BabyHarvesterBuff.png → ...Cs/Bosses/Harvester/BabyHarvesterBuff.png
diff --git a/...s/DungeonBird/BabyHarvesterBuff_Sheet.png → ...ses/Harvester/BabyHarvesterBuff_Sheet.png b/...s/DungeonBird/BabyHarvesterBuff_Sheet.png → ...ses/Harvester/BabyHarvesterBuff_Sheet.png
diff --git a/Items/CaughtDungeonSoul.cs b/Items/CaughtDungeonSoul.cs
@@ -1,5 +1,5 @@
-using AssortedCrazyThings.NPCs.DungeonBird;
-using AssortedCrazyThings.Projectiles.NPCs.Bosses.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
+using AssortedCrazyThings.Projectiles.NPCs.Bosses.Harvester;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
 using Terraria;
@@ -15,7 +15,7 @@ public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Loose Dungeon Soul");
 			Tooltip.SetDefault("'An inert soul caught by a net'"
-				+ "\nAwakened in your inventory when " + Harvester.name + " is defeated");
+				+ "\nAwakened in your inventory when " + HarvesterBoss.name + " is defeated");
 			// ticksperframe, frameCount
 			//Main.RegisterItemAnimation(Item.type, new DrawAnimationVertical(5, 4));
 			//ItemID.Sets.AnimatesAsSoul[Item.type] = true;

diff --git a/Items/CaughtDungeonSoulFreed.cs b/Items/CaughtDungeonSoulFreed.cs
@@ -1,4 +1,4 @@
-using AssortedCrazyThings.NPCs.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
 using Terraria;
 using Terraria.ID;
 
@@ -11,7 +11,7 @@ public class CaughtDungeonSoulFreed : CaughtDungeonSoulBase
 		public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Freed Dungeon Soul");
-			Tooltip.SetDefault("Awakened by defeating the " + Harvester.name);
+			Tooltip.SetDefault("Awakened by defeating the " + HarvesterBoss.name);
 			ItemID.Sets.ItemIconPulse[Item.type] = true;
 			ItemID.Sets.ItemNoGravity[Item.type] = true;
 

diff --git a/Items/IdolOfDecay.cs b/Items/IdolOfDecay.cs
@@ -1,5 +1,5 @@
-using AssortedCrazyThings.NPCs.DungeonBird;
-using AssortedCrazyThings.Projectiles.NPCs.Bosses.DungeonBird;
+using AssortedCrazyThings.NPCs.Harvester;
+using AssortedCrazyThings.Projectiles.NPCs.Bosses.Harvester;
 using Terraria;
 using Terraria.ID;
 
@@ -11,7 +11,7 @@ public class IdolOfDecay : AssItem
 		public override void SetStaticDefaults()
 		{
 			DisplayName.SetDefault("Idol Of Decay");
-			Tooltip.SetDefault("Summons " + Harvester.name + "'s final form in the dungeon"
+			Tooltip.SetDefault("Summons " + HarvesterBoss.name + "'s final form in the dungeon"
 				+ "\nUnlimited uses!");
 
 			Terraria.GameContent.Creative.CreativeItemSacrificesCatalog.Instance.SacrificeCountNeededByItemId[Type] = 1;

diff --git a/NPCs/DungeonBird/HarvesterTalon.png b/NPCs/DungeonBird/HarvesterTalon.png
diff --git a/NPCs/DungeonBird/DungeonSoul.png → NPCs/Harvester/DungeonSoul.png b/NPCs/DungeonBird/DungeonSoul.png → NPCs/Harvester/DungeonSoul.png
diff --git a/NPCs/DungeonBird/DungeonSoulBase.cs → NPCs/Harvester/DungeonSoulBase.cs b/NPCs/DungeonBird/DungeonSoulBase.cs → NPCs/Harvester/DungeonSoulBase.cs
@@ -7,7 +7,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace AssortedCrazyThings.NPCs.DungeonBird
+namespace AssortedCrazyThings.NPCs.Harvester
 {
 	//this class also contains the NPC classes at the very bottom
 	[Content(ContentType.Bosses)]

diff --git a/NPCs/DungeonBird/DungeonSoulFreed.png → NPCs/Harvester/DungeonSoulFreed.png b/NPCs/DungeonBird/DungeonSoulFreed.png → NPCs/Harvester/DungeonSoulFreed.png
diff --git a/NPCs/DungeonBird/Harvester.cs → NPCs/Harvester/HarvesterBoss.cs b/NPCs/DungeonBird/Harvester.cs → NPCs/Harvester/HarvesterBoss.cs
@@ -8,7 +8,7 @@
 using AssortedCrazyThings.Items.VanityArmor;
 using AssortedCrazyThings.NPCs.DropConditions;
 using AssortedCrazyThings.NPCs.DropRules;
-using AssortedCrazyThings.Projectiles.NPCs.Bosses.DungeonBird;
+using AssortedCrazyThings.Projectiles.NPCs.Bosses.Harvester;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using ReLogic.Content;
@@ -25,11 +25,12 @@
 using Terraria.ModLoader;
 using Terraria.ModLoader.IO;
 
-namespace AssortedCrazyThings.NPCs.DungeonBird
+namespace AssortedCrazyThings.NPCs.Harvester
 {
 	[AutoloadBossHead]
 	[Content(ContentType.Bosses)]
-	public class Harvester : AssNPC
+	[LegacyName("Harvester")]
+	public class HarvesterBoss : AssNPC
 	{
 		public class AIStats
 		{
@@ -145,7 +146,7 @@ public override void SetStaticDefaults()
 
 			NPCID.Sets.NPCBestiaryDrawModifiers value = new NPCID.Sets.NPCBestiaryDrawModifiers(0)
 			{
-				CustomTexturePath = "AssortedCrazyThings/NPCs/DungeonBird/Harvester_Bestiary",
+				CustomTexturePath = "AssortedCrazyThings/NPCs/Harvester/Harvester_Bestiary",
 				Position = new Vector2(-9, 18), //Position on the icon
 				PortraitPositionXOverride = 0, //Position on the portrait when clicked on
 				PortraitPositionYOverride = 20,
@@ -1191,6 +1192,13 @@ private void HandleAI(Player target, List<HarvesterTalon> talons)
 					if (AI_Timer < 0)
 					{
 						AI_Timer--;
+
+						if (!keepSwooping)
+						{
+							//Last seek stage before bombing: put talons out
+							AI_Animation = Animation_Bombing;
+						}
+
 						float swoopPostTime = aiStats.SwoopWaitTime * lifeRatioClamped;
 						if (AI_Timer < -swoopPostTime)
 						{

diff --git a/NPCs/DungeonBird/Harvester.png → NPCs/Harvester/HarvesterBoss.png b/NPCs/DungeonBird/Harvester.png → NPCs/Harvester/HarvesterBoss.png
diff --git a/NPCs/DungeonBird/HarvesterChain.png → NPCs/Harvester/HarvesterBossChain.png b/NPCs/DungeonBird/HarvesterChain.png → NPCs/Harvester/HarvesterBossChain.png
diff --git a/NPCs/DungeonBird/Harvester_Bestiary.png → NPCs/Harvester/HarvesterBoss_Bestiary.png b/NPCs/DungeonBird/Harvester_Bestiary.png → NPCs/Harvester/HarvesterBoss_Bestiary.png
diff --git a/NPCs/DungeonBird/Harvester_Head_Boss.png → NPCs/Harvester/HarvesterBoss_Head_Boss.png b/NPCs/DungeonBird/Harvester_Head_Boss.png → NPCs/Harvester/HarvesterBoss_Head_Boss.png
diff --git a/NPCs/DungeonBird/Harvester_Sheet.png → NPCs/Harvester/HarvesterBoss_Sheet.png b/NPCs/DungeonBird/Harvester_Sheet.png → NPCs/Harvester/HarvesterBoss_Sheet.png
diff --git a/NPCs/DungeonBird/Harvester_Wings.png → NPCs/Harvester/HarvesterBoss_Wings.png b/NPCs/DungeonBird/Harvester_Wings.png → NPCs/Harvester/HarvesterBoss_Wings.png