1.0.18.6

Ilysen · Aug 14, 2019 · e9b0163 · e9b0163
1 parent 6fcdc69
commit e9b0163
Show file tree

Hide file tree

Showing 21 changed files with 276 additions and 27 deletions.
diff --git a/Buffs/Avarice.cs b/Buffs/Avarice.cs
@@ -1,6 +1,4 @@
 using Terraria;
-using Terraria.DataStructures;
-using Terraria.ID;
 using Terraria.ModLoader;
 
 namespace Thaumaturgy.Buffs
@@ -10,7 +8,7 @@ public class Avarice : ModBuff
 		public override void SetDefaults()
         {
             DisplayName.SetDefault("Avarice");
-            Description.SetDefault("Coin pickup range is increased");
+            Description.SetDefault("Fortune and coin pickup range are increased");
             Main.buffNoSave[Type] = true;
             Main.debuff[Type] = false;
             canBeCleared = true;

diff --git a/Items/AuricSteelWaraxe.cs b/Items/AuricSteelWaraxe.cs
@@ -28,15 +28,15 @@ public override void SetDefaults()
             item.scale = 1.3f;
             item.value = Item.sellPrice(0, 0, 40, 0);
 			item.rare = 1;
-            item.crit = 20;
+            item.crit = 25;
             item.maxStack = 1;
             item.UseSound = SoundID.Item1;
         }
 
         public override void AddRecipes()
 		{
 			ModRecipe recipe = new ModRecipe(mod);
-            recipe.AddIngredient(mod.ItemType("Starbrass"), 15);
+            recipe.AddIngredient(mod.ItemType("AuricSteel"), 15);
             recipe.AddRecipeGroup("Wood", 5);
             recipe.AddIngredient(mod.ItemType("AuricCore"));
             recipe.AddIngredient(mod.ItemType("AuricShard"), 5);

diff --git a/Items/EternalOrdeal.cs b/Items/EternalOrdeal.cs
@@ -0,0 +1,61 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+	public class EternalOrdeal : ModItem
+	{
+		public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Eternal Ordeal");
+            Tooltip.SetDefault("Prevents invasions from ending while worn\n" +
+                "May fail if you kill huge amounts of enemies extremely fast\n" +
+                "'Truth, beauty, and hatred'");
+        }
+
+		public override void SetDefaults()
+		{
+			item.width = 32;
+			item.height = 32;
+			item.rare = 9;
+            item.value = Item.sellPrice(0, 0, 10, 0);
+            item.maxStack = 1;
+            item.accessory = true;
+        }
+
+        public override void UpdateEquip(Player player)
+        {
+            if (Main.invasionType != 0)
+            {
+                if (Main.invasionSize < 25)
+                {
+                    Main.invasionSize = 25;
+                }
+            }
+        }
+
+        public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 5);
+            recipe.AddIngredient(ItemID.FlintlockPistol);
+            recipe.AddIngredient(ItemID.EbonwoodSword);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+			recipe.AddRecipe();
+
+            recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 5);
+            recipe.AddIngredient(ItemID.FlintlockPistol);
+            recipe.AddIngredient(ItemID.ShadewoodSword);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+	}
+}
diff --git a/Items/EternalOrdeal.png b/Items/EternalOrdeal.png
diff --git a/Items/Placeable/KaleidoscopicFocus.cs b/Items/Placeable/KaleidoscopicFocus.cs
@@ -24,9 +24,9 @@ public override void AddRecipes()
             recipe.AddIngredient(ItemID.Marble);
             recipe.AddIngredient(ItemID.Meteorite);
             recipe.AddIngredient(ItemID.Hellstone);
-            recipe.AddIngredient(ItemID.Cloud);
-            recipe.AddIngredient(ItemID.PearlstoneBlock);
-            recipe.AddRecipeGroup("Thaumaturgy:EvilStone");
+            recipe.AddIngredient(ItemID.SoulofFlight);
+            recipe.AddIngredient(ItemID.SoulofLight);
+            recipe.AddIngredient(ItemID.SoulofNight);
             recipe.AddIngredient(mod.ItemType("AuricCore"));
             recipe.AddTile(mod.TileType("Thaumatrestle"));
             recipe.SetResult(this);

diff --git a/Items/PurityTablet.cs b/Items/PurityTablet.cs
@@ -0,0 +1,58 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+	public class PurityTablet : ModItem
+	{
+		public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Purity Tablet");
+            Tooltip.SetDefault("A tablet etched with words of harmony\n" +
+                "Prematurely ends events relating to the sun or moon");
+        }
+
+		public override void SetDefaults()
+		{
+			item.width = 20;
+			item.height = 30;
+			item.useTime = 20;
+			item.useAnimation = 20;
+			item.useStyle = 4;
+			item.value = Item.sellPrice(0, 0, 25, 0);
+			item.rare = 2;
+            item.maxStack = 99;
+            item.consumable = true;
+			item.noMelee = true;
+        }
+
+        public override bool CanUseItem(Player player)
+        {
+            return Main.bloodMoon || Main.eclipse || Main.pumpkinMoon || Main.snowMoon;
+        }
+
+        public override bool UseItem(Player player)
+        {
+            Main.bloodMoon = false;
+            Main.eclipse = false;
+            Main.pumpkinMoon = false;
+            Main.snowMoon = false;
+            Main.PlaySound(SoundID.Item60.WithVolume(0.5f), player.Center);
+            return true;
+        }
+
+        public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(ItemID.Boulder);
+            recipe.AddIngredient(ItemID.GrassSeeds, 3);
+            recipe.AddIngredient(ItemID.Acorn);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+			recipe.AddRecipe();
+		}
+	}
+}
diff --git a/Items/PurityTablet.png b/Items/PurityTablet.png
diff --git a/Items/SlateTablet.cs b/Items/SlateTablet.cs
@@ -19,7 +19,7 @@ public override void SetDefaults()
 			item.useTime = 20;
 			item.useAnimation = 20;
 			item.useStyle = 4;
-			item.value = Item.sellPrice(0, 0, 75, 0);
+			item.value = Item.sellPrice(0, 0, 25, 0);
 			item.rare = 3;
             item.maxStack = 99;
             item.consumable = true;

diff --git a/Items/TerraTreads.cs b/Items/TerraTreads.cs
@@ -0,0 +1,52 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+    [AutoloadEquip(EquipType.Shoes)]
+    public class TerraTreads : ModItem
+    {
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Terra Treads");
+            Tooltip.SetDefault("Allows flight, super fast running, and extra mobility on ice and liquids\n" +
+                "Protects from fire blocks, lava, and falls\n" +
+                "10% increased movement speed");
+        }
+
+        public override void SetDefaults()
+        {
+            item.width = 32;
+            item.height = 32;
+            item.value = Item.sellPrice(0, 15, 0, 0);
+            item.rare = 8;
+            item.accessory = true;
+        }
+
+        public override void UpdateEquip(Player player)
+        {
+            player.accRunSpeed = 6.75f;
+            player.rocketBoots = 2;
+            player.moveSpeed += 0.10f;
+            player.noFallDmg = true;
+            player.iceSkate = true;
+            player.waterWalk = true;
+            player.fireWalk = true;
+            player.lavaMax += 600;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(ItemID.FrostsparkBoots, 1);
+            recipe.AddIngredient(ItemID.LavaWaders, 1);
+            recipe.AddIngredient(ItemID.ChlorophyteBar, 5);
+            recipe.AddIngredient(mod.ItemType("AuricCore"), 2);
+            recipe.SetResult(this);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.AddRecipe();
+        }
+    }
+}
diff --git a/Items/TerraTreads.png b/Items/TerraTreads.png
diff --git a/Items/TerraTreads_Shoes.png b/Items/TerraTreads_Shoes.png
diff --git a/Items/TreatedFlask.png b/Items/TreatedFlask.png
diff --git a/Items/_Elixirs.cs b/Items/_Elixirs.cs
@@ -766,7 +766,9 @@ public class ElixirAvarice : ModItem
         public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Auric Elixir of the Baron's Hoard");
-            Tooltip.SetDefault("Increases coin pickup range\nNot consumed upon use");
+            Tooltip.SetDefault("Increases coin pickup range\n" +
+                "Some ores may give more yield\n" +
+                "Not consumed upon use");
         }
 
         public override void SetDefaults()

diff --git a/Items/_Flasks.cs b/Items/_Flasks.cs
@@ -20,11 +20,11 @@ public override void SetDefaults()
             item.useTurn = true;
             item.useAnimation = 17;
             item.useTime = 17;
-            item.maxStack = 99;
+            item.maxStack = 1;
             item.width = 20;
             item.height = 20;
             item.value = Item.sellPrice(0, 10, 0, 0);
-            item.consumable = true;
+            item.consumable = false;
             item.rare = 4;
         }
 
@@ -69,11 +69,11 @@ public override void SetDefaults()
                 item.useTurn = true;
                 item.useAnimation = 17;
                 item.useTime = 17;
-                item.maxStack = 99;
+                item.maxStack = 1;
                 item.width = 20;
                 item.height = 20;
                 item.value = Item.sellPrice(0, 10, 0, 0);
-                item.consumable = true;
+                item.consumable = false;
                 item.rare = 4;
             }
 
@@ -119,11 +119,11 @@ public override void SetDefaults()
                 item.useTurn = true;
                 item.useAnimation = 17;
                 item.useTime = 17;
-                item.maxStack = 99;
+                item.maxStack = 1;
                 item.width = 20;
                 item.height = 20;
                 item.value = Item.sellPrice(0, 10, 0, 0);
-                item.consumable = true;
+                item.consumable = false;
                 item.rare = 4;
             }
 
@@ -168,11 +168,11 @@ public override void SetDefaults()
                 item.useTurn = true;
                 item.useAnimation = 17;
                 item.useTime = 17;
-                item.maxStack = 99;
+                item.maxStack = 1;
                 item.width = 20;
                 item.height = 20;
                 item.value = Item.sellPrice(0, 10, 0, 0);
-                item.consumable = true;
+                item.consumable = false;
                 item.rare = 4;
             }
 

diff --git a/Items/_Ingredients.cs b/Items/_Ingredients.cs
@@ -93,7 +93,7 @@ public class AuricSteel : ModItem
         public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Auric Steel");
-            Tooltip.SetDefault("Starbrass melded with other materials\nStronger, but less conductive to mana");
+            Tooltip.SetDefault("Starbrass melded with other materials\nStronger, and more conductive to mana");
         }
 
         public override void SetDefaults()

diff --git a/Items/_Potions.cs b/Items/_Potions.cs
@@ -9,7 +9,8 @@ public class PotionAvarice : ModItem
         public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Avarice Potion");
-            Tooltip.SetDefault("Increases coin pickup range");
+            Tooltip.SetDefault("Increases coin pickup range\n" +
+                "Some ores may give more yield");
         }
 
         public override void SetDefaults()

diff --git a/Projectiles/EtherealBullet.cs b/Projectiles/EtherealBullet.cs
@@ -27,14 +27,14 @@ public override bool OnTileCollide(Vector2 oldVelocity)
             Main.PlaySound(SoundID.Item10, projectile.position);
             for (var i = 0; i < 3; i++)
             {
-                Dust.NewDust(projectile.Center, 30, 30, 15, 0, 0, 0, default(Color), 1.5f);
+                Dust.NewDust(projectile.Center, 30, 30, 15, 0, 0, 0, default, 1.5f);
             }
             return true;
         }
 
         public override void AI()
         {
-            Dust.NewDust(projectile.Center, 5, 5, 15, 0, 0, 0, default(Color), 0.5f);
+            Dust.NewDust(projectile.Center, 5, 5, 15, 0, 0, 0, default, 0.5f);
             Lighting.AddLight(projectile.Center, 1f, 0.75f, 1f);
             base.AI();
         }

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ A mod for Terraria including magic and a doomed scholar.
 
 Thaumaturgy adds an upgraded work bench, the Thaumatrestle, which is sold by a new town NPC, the Thaumaturge, a haunted academic who wants to put his skills to use. The Thaumatrestle can be used to break down fallen stars and mana crystals into power sources - auric shards and auric cores - which can then be used to craft, shape, transform, brew, and change objects in any way you can imagine.
 
-The Thaumaturge will move in after defeating the Eye of Cthulhu. They are also eligibile from the get-go if the world is in Expert mode. They sell the Thaumatrestle for 1 gold, and pale stars for 10 silver. Pale stars can be used to ineffeciently make auric shards and auric cores, but have none of the other uses that fallen stars do. Once hardmode starts, the Thaumaturge will sell actual fallen stars for 25 silver instead.
+The Thaumaturge will move in after defeating the Eye of Cthulhu. They are also eligibile from the get-go if the world is in Expert mode. They sell the Thaumatrestle for 1 gold, and pale stars for 10 silver. Pale stars can be used to ineffeciently make auric shards and auric cores, but have none of the other uses that fallen stars do.
 
 Examples of recipes added by Thaumaturgy use include transmuting 25 crimstone into 25 ebonstone with an auric shard, creating a cloud in a bottle with 1 bottle, 20 clouds, and 3 auric shards, or replicating a piece of wood into 75 wood with an auric shard. All recipes are made at a Thaumatrestle, and most require a specialized focus nearby, which you can also purchase from the Thaumaturge.
 
@@ -20,6 +20,22 @@ You are free to decompile, modify etc. this mod under the MIT License. The mod i
 
 # Changelog
 
+### Aug. 13, 2019
+
+#### 1.0.18.6
+
+* Added the Eternal Ordeal accessory, which prevents invasions from ending while worn. Farm away!
+* Added the Purity Tablet, which prematurely ends Blood Moons and Solar Eclipses.
+* Flasks can now be reused infinitely.
+* Fixed the Auric Steel Waraxe using starbrass in its recipe instead of actual auric steel.
+* Avarice now causes gem ores to drop extra gems!
+* Slightly tweaked the Kaleidoscopic's Focus recipe (again) by adding souls of light, night, and flight to it.
+* Removed crystal shards and the radar from the fish finder alternate recipe. (what the heck why were those there)
+* Added the Terra Treads, a combination of frostspark boots and lava waders.
+* Also added late-PH recipes for water walking boots and the lava charm to compensate for their rarity.
+
+There are currently no safeguards in place preventing use of Eternal Ordeal and Purity Tablet in multiplayer. If someone wants to grief, they can; I can't easily fix that. Please be aware of that.
+
 ### Aug. 11, 2019
 
 #### 1.0.18.5