Big ol cleanup for 1.0.19.0

Ilysen · Feb 4, 2020 · 8a01131 · 8a01131
1 parent 5266015
commit 8a01131
Show file tree

Hide file tree

Showing 142 changed files with 4,280 additions and 4,001 deletions.
diff --git a/Buffs/Avarice.cs b/Buffs/Avarice.cs
@@ -9,7 +9,7 @@ public override void SetDefaults()
         {
             DisplayName.SetDefault("Avarice");
             Description.SetDefault("Fortune and coin pickup range are increased");
-            Main.buffNoSave[Type] = true;
+            Main.buffNoSave[Type] = false;
             Main.debuff[Type] = false;
             canBeCleared = true;
         }

diff --git a/Buffs/Daredevilry.cs b/Buffs/Daredevilry.cs
@@ -9,7 +9,7 @@ public class Daredevilry : ModBuff
 		public override void SetDefaults()
         {
             DisplayName.SetDefault("Daredevilry");
-            Description.SetDefault("Grants all vanilla potion benefits");
+            Description.SetDefault("Grants most vanilla potion benefits");
             Main.buffNoSave[Type] = false;
             Main.debuff[Type] = false;
             canBeCleared = true;

diff --git a/Buffs/Evasion.cs b/Buffs/Evasion.cs
@@ -11,7 +11,7 @@ public override void SetDefaults()
         {
             DisplayName.SetDefault("Evasion");
             Description.SetDefault("Dash by double-tapping left or right");
-            Main.buffNoSave[Type] = true;
+            Main.buffNoSave[Type] = false;
             Main.debuff[Type] = false;
             canBeCleared = true;
         }

diff --git a/Buffs/FallingFlame.cs b/Buffs/FallingFlame.cs
diff --git a/Buffs/FallingFlame.png b/Buffs/FallingFlame.png
diff --git a/Buffs/SoothingEmbers.cs b/Buffs/SoothingEmbers.cs
@@ -9,7 +9,7 @@ public override void SetDefaults()
         {
             DisplayName.SetDefault("Soothing Embers");
             Description.SetDefault("Enemy spawn rate tremendously reduced");
-            Main.buffNoSave[Type] = true;
+            Main.buffNoSave[Type] = false;
             Main.debuff[Type] = false;
             canBeCleared = true;
         }

diff --git a/Buffs/Stasis.cs b/Buffs/Stasis.cs
@@ -0,0 +1,37 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Buffs
+{
+	public class Stasis : ModBuff
+	{
+		private bool targetTimeSet, targetTime;
+		public override void SetDefaults()
+        {
+            DisplayName.SetDefault("Stasis");
+            Description.SetDefault("Frozen in time...");
+            Main.buffNoSave[Type] = true;
+            Main.debuff[Type] = true;
+            canBeCleared = false;
+        }
+
+        public override void Update(Player player, ref int buffIndex)
+        {
+			if (!targetTimeSet)
+			{
+				targetTime = !Main.dayTime;
+				targetTimeSet = true;
+			}
+			player.frozen = true;
+			Main.fastForwardTime = true;
+			if (targetTime == Main.dayTime)
+			{
+				Main.fastForwardTime = false;
+				player.ClearBuff(mod.BuffType("Stasis"));
+				targetTime = false;
+				targetTimeSet = false;
+			}
+        }
+    }
+}
diff --git a/Buffs/Stasis.png b/Buffs/Stasis.png
diff --git a/Buffs/Void.cs b/Buffs/Void.cs
@@ -11,7 +11,7 @@ public override void SetDefaults()
         {
             DisplayName.SetDefault("Void");
             Description.SetDefault("Life will be drained to preserve mana");
-            Main.buffNoSave[Type] = true;
+            Main.buffNoSave[Type] = false;
             Main.debuff[Type] = false;
             canBeCleared = true;
         }

diff --git a/Buffs/WateryEmbers.cs b/Buffs/WateryEmbers.cs
@@ -11,7 +11,7 @@ public override void SetDefaults()
         {
             DisplayName.SetDefault("Watery Embers");
             Description.SetDefault("Enemy spawn rate tremendously increased");
-            Main.buffNoSave[Type] = true;
+            Main.buffNoSave[Type] = false;
             Main.debuff[Type] = false;
             canBeCleared = true;
         }

diff --git a/Items/Armor/AuromechanicalSet.cs b/Items/Armor/AuromechanicalSet.cs
@@ -5,8 +5,9 @@ namespace Thaumaturgy.Items.Armor
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class AuromechanicalHelmet : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/AuromechanicalHelmet";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Auromechanical Helmet");
             Tooltip.SetDefault("Grants true sight\nMana usage reduced by 20%");
@@ -69,8 +70,9 @@ public override void AddRecipes()
 
     [AutoloadEquip(EquipType.Body)]
     public class AuromechanicalPlate : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/AuromechanicalPlate";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Auromechanical Plate");
             Tooltip.SetDefault("Magic damage increased by 20%\nDamage taken reduced by 5%");
@@ -106,8 +108,9 @@ public override void AddRecipes()
 
     [AutoloadEquip(EquipType.Legs)]
     public class AuromechanicalGreaves : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/AuromechanicalGreaves";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Auromechanical Greaves");
             Tooltip.SetDefault("Maximum mana increased by 50\nProtects from fall damage");

diff --git a/Items/Armor/GogglesofRevealing.cs b/Items/Armor/GogglesofRevealing.cs
@@ -6,8 +6,9 @@ namespace Thaumaturgy.Items.Armor
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class GogglesofRevealing : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/GogglesofRevealing";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Goggles of Revealing");
             Tooltip.SetDefault("Grants true sight");

diff --git a/Items/Armor/StarbrassSet.cs b/Items/Armor/StarbrassSet.cs
@@ -5,8 +5,9 @@ namespace Thaumaturgy.Items.Armor
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class StarbrassMask : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/StarbrassMask";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Starbrass Mask");
             Tooltip.SetDefault("Mana usage reduced by 10%");
@@ -57,8 +58,9 @@ public override void AddRecipes()
 
     [AutoloadEquip(EquipType.Body)]
     public class StarbrassBreastplate : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/StarbrassBreastplate";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Starbrass Breatplate");
             Tooltip.SetDefault("Damage taken reduced by 10%");
@@ -93,8 +95,9 @@ public override void AddRecipes()
 
     [AutoloadEquip(EquipType.Legs)]
     public class StarbrassGreaves : ModItem
-    {
-        public override void SetStaticDefaults()
+	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/StarbrassGreaves";
+		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Starbrass Greaves");
             Tooltip.SetDefault("Maximum mana increased by 25\nMovement speed increased by 20%");

diff --git a/Items/AuraAegis.cs b/Items/AuraAegis.cs
@@ -7,26 +7,32 @@ namespace Thaumaturgy.Items
 	[AutoloadEquip(EquipType.Shield)]
 	public class AuraAegis : ModItem
 	{
+		public override string Texture => "Thaumaturgy/Textures/Wearable/AuraAegis";
 		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Aura Aegis");
-            Tooltip.SetDefault("Double tap a direction to dash into enemies\nGrants immunity to knockback and fire blocks" +
-                "\nGrants immunity to almost all debuffs");
+            Tooltip.SetDefault("Grants immunity to knockback and fire blocks" +
+                "\nGrants immunity to most standard debuffs" +
+				"\nProtects from Stoned, Chilled, and Frozen" +
+				"\nDouble tap a direction to dash into enemies" +
+				"\nHide this accessory to disable its dash effect");
 		}
 
 		public override void SetDefaults()
 		{
 			item.width = 24;
 			item.height = 28;
             item.value = Item.sellPrice(0, 5, 0, 0);
-            item.rare = 9;
+            item.rare = ItemRarityID.Expert;
 			item.accessory = true;
 			item.defense = 6;
+			item.expert = true;
 		}
 
 		public override void UpdateAccessory(Player player, bool hideVisual)
 		{
-            player.dash = 2;
+			if (!hideVisual)
+				player.dash = 2;
             player.noKnockback = true;
             player.fireWalk = true;
             player.buffImmune[BuffID.Bleeding] = true;
@@ -44,16 +50,16 @@ public override void UpdateAccessory(Player player, bool hideVisual)
             player.buffImmune[BuffID.Blackout] = true;
             player.buffImmune[BuffID.Stoned] = true;
             player.buffImmune[BuffID.Frozen] = true;
-            player.buffImmune[BuffID.Electrified] = true;
-            player.buffImmune[BuffID.Gravitation] = true;
         }
 
 		public override void AddRecipes()
         {
             ModRecipe recipe = new ModRecipe(mod);
             recipe.AddIngredient(ItemID.EoCShield);
             recipe.AddIngredient(ItemID.AnkhShield);
-            recipe.AddIngredient(mod.ItemType("Starbrass"), 5);
+			recipe.AddIngredient(ItemID.SoulofMight, 15);
+			recipe.AddIngredient(mod.ItemType("AuricSteel"), 5);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 3);
             recipe.AddIngredient(mod.ItemType("AuricCore"));
             recipe.AddTile(mod.TileType("Thaumatrestle"));
             recipe.AddTile(mod.TileType("SynthesisFocus"));

diff --git a/Items/AuraAegis.png b/Items/AuraAegis.png