1.0.18.5

Ilysen · Aug 11, 2019 · 6fcdc69 · 6fcdc69
1 parent 4c847c8
commit 6fcdc69
Show file tree

Hide file tree

Showing 17 changed files with 226 additions and 19 deletions.
diff --git a/Items/Armor/AuromechanicalSet.cs b/Items/Armor/AuromechanicalSet.cs
@@ -1,6 +1,4 @@
-using Microsoft.Xna.Framework;
 using Terraria;
-using Terraria.ID;
 using Terraria.ModLoader;
 
 namespace Thaumaturgy.Items.Armor
@@ -53,10 +51,14 @@ public override void UpdateEquip(Player player)
 
         public override void AddRecipes()
         {
+            // NOTE FOR CODE READERS.
+            // IT'S "GogglesofRevealing", NOT "GogglesOfRevealing"
+            // THIS TOOK ME AN HOUR TO FIND OUT WHY THE RECIPE WASN'T WORKING AND I WAS TEARING MY HAIR OUT.
+            // I HOPE IT WAS WORTH IT.
             ModRecipe recipe = new ModRecipe(mod);
-            recipe.AddIngredient(mod.ItemType("GogglesOfRevealing"));
+            recipe.AddIngredient(mod.ItemType("GogglesofRevealing"));
             recipe.AddIngredient(mod.ItemType("StarbrassMask"));
-            recipe.AddIngredient(ItemID.Meteorite, 10);
+            recipe.AddIngredient(mod.ItemType("AuricSteel"), 3);
             recipe.AddIngredient(mod.ItemType("AuricShard"), 5);
             recipe.SetResult(this);
             recipe.AddTile(mod.TileType("Thaumatrestle"));
@@ -93,7 +95,7 @@ public override void AddRecipes()
         {
             ModRecipe recipe = new ModRecipe(mod);
             recipe.AddIngredient(mod.ItemType("StarbrassBreastplate"));
-            recipe.AddIngredient(ItemID.Meteorite, 20);
+            recipe.AddIngredient(mod.ItemType("AuricSteel"), 9);
             recipe.AddIngredient(mod.ItemType("AuricCore"));
             recipe.SetResult(this);
             recipe.AddTile(mod.TileType("Thaumatrestle"));
@@ -130,7 +132,7 @@ public override void AddRecipes()
         {
             ModRecipe recipe = new ModRecipe(mod);
             recipe.AddIngredient(mod.ItemType("StarbrassGreaves"));
-            recipe.AddIngredient(ItemID.Meteorite, 15);
+            recipe.AddIngredient(mod.ItemType("AuricSteel"), 6);
             recipe.AddIngredient(mod.ItemType("AuricShard"), 5);
             recipe.SetResult(this);
             recipe.AddTile(mod.TileType("Thaumatrestle"));

diff --git a/Items/Armor/StarbrassSet.cs b/Items/Armor/StarbrassSet.cs
@@ -8,7 +8,7 @@ public class StarbrassMask : ModItem
     {
         public override void SetStaticDefaults()
         {
-            DisplayName.SetDefault("Starbrass Helmet");
+            DisplayName.SetDefault("Starbrass Mask");
             Tooltip.SetDefault("Mana usage reduced by 10%");
         }
 

diff --git a/Items/AuraAegis.cs b/Items/AuraAegis.cs
@@ -18,7 +18,7 @@ public override void SetDefaults()
 		{
 			item.width = 24;
 			item.height = 28;
-            item.value = Item.sellPrice(0, 25, 0, 0);
+            item.value = Item.sellPrice(0, 5, 0, 0);
             item.rare = 9;
 			item.accessory = true;
 			item.defense = 6;

diff --git a/Items/AuralTether.cs b/Items/AuralTether.cs
@@ -7,7 +7,6 @@ namespace Thaumaturgy.Items
 {
 	public class AuralTether : ModItem
 	{
-        private Vector2 pseudoNull = new Vector2(0, 0);
         private Vector2 markedPoint;
 
         public override void SetStaticDefaults()
@@ -31,19 +30,19 @@ public override void SetDefaults()
             item.maxStack = 1;
             item.consumable = false;
 			item.noMelee = true;
-            markedPoint = pseudoNull;
+            markedPoint = default;
         }
 
         public override bool UseItem(Player player)
         {
             if(player.altFunctionUse == 2)
             {
-                markedPoint = pseudoNull;
+                markedPoint = default;
                 Main.NewText("Tether point reset.", 135, 115, 255);
                 Main.PlaySound(SoundID.Item73.WithVolume(0.5f), player.Center);
                 return true;
             }
-            if (markedPoint == pseudoNull)
+            if (markedPoint == default)
             {
                 Main.NewText("Tether point marked.", 135, 115, 255);
                 markedPoint = player.position;
@@ -54,7 +53,7 @@ public override bool UseItem(Player player)
                 Main.NewText("The tether yanks you through space and time.", 135, 115, 255);
                 player.Teleport(markedPoint);
                 Main.PlaySound(SoundID.Item74.WithVolume(0.5f), player.Center);
-                markedPoint = pseudoNull;
+                markedPoint = default;
             }
             return true;
         }

diff --git a/Items/AurelianHarness.cs b/Items/AurelianHarness.cs
@@ -20,7 +20,7 @@ public override void SetDefaults()
         {
             item.width = 22;
             item.height = 20;
-            item.value = Item.sellPrice(0, 10, 0, 0);
+            item.value = Item.sellPrice(0, 1, 0, 0);
             item.rare = 3;
             item.accessory = true;
             item.defense = 1;

diff --git a/Items/AuricSteel.png b/Items/AuricSteel.png
diff --git a/Items/AuricSteelWaraxe.cs b/Items/AuricSteelWaraxe.cs
@@ -0,0 +1,50 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+	public class AuricSteelWaraxe : ModItem
+	{
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Auric Steel Waraxe");
+            Tooltip.SetDefault("Deals magic damage");
+        }
+
+		public override void SetDefaults()
+        {
+            item.damage = 28;
+            item.magic = true;
+            item.autoReuse = true;
+            item.useTurn = true;
+            item.knockBack = 7;
+            item.width = 38;
+			item.height = 34;
+            item.useTime = 15;
+			item.useAnimation = 24;
+			item.useStyle = 1;
+            item.axe = 10;
+            item.scale = 1.3f;
+            item.value = Item.sellPrice(0, 0, 40, 0);
+			item.rare = 1;
+            item.crit = 20;
+            item.maxStack = 1;
+            item.UseSound = SoundID.Item1;
+        }
+
+        public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 15);
+            recipe.AddRecipeGroup("Wood", 5);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 5);
+            recipe.AddIngredient(ItemID.MeteorHamaxe);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+			recipe.AddRecipe();
+        }
+	}
+}
diff --git a/Items/AuricSteelWaraxe.png b/Items/AuricSteelWaraxe.png
diff --git a/Items/StabilizedHarness.cs b/Items/StabilizedHarness.cs
@@ -20,7 +20,7 @@ public override void SetDefaults()
         {
             item.width = 22;
             item.height = 20;
-            item.value = Item.sellPrice(0, 50, 0, 0);
+            item.value = Item.sellPrice(0, 5, 0, 0);
             item.rare = 6;
             item.accessory = true;
             item.defense = 1;

diff --git a/Items/StarbrassHamaxe.cs b/Items/StarbrassHamaxe.cs
@@ -0,0 +1,49 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+	public class StarbrassHamaxe : ModItem
+	{
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Starbrass Hamaxe");
+            Tooltip.SetDefault("Deals magic damage");
+        }
+
+		public override void SetDefaults()
+        {
+            item.damage = 20;
+            item.magic = true;
+            item.autoReuse = true;
+            item.useTurn = true;
+            item.knockBack = 7;
+            item.width = 38;
+			item.height = 34;
+            item.useTime = 15;
+			item.useAnimation = 30;
+			item.useStyle = 1;
+            item.hammer = 70;
+            item.axe = 40;
+            item.value = Item.sellPrice(0, 0, 10, 0);
+			item.rare = 2;
+            item.maxStack = 1;
+            item.UseSound = SoundID.Item1;
+        }
+
+        public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 15);
+            recipe.AddRecipeGroup("Wood", 5);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 5);
+            recipe.AddIngredient(ItemID.MeteorHamaxe);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+			recipe.AddRecipe();
+        }
+	}
+}
diff --git a/Items/StarbrassHamaxe.png b/Items/StarbrassHamaxe.png
diff --git a/Items/StarbrassPickaxe.cs b/Items/StarbrassPickaxe.cs
@@ -0,0 +1,67 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+	public class StarbrassPickaxe : ModItem
+	{
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Starbrass Pickaxe");
+            Tooltip.SetDefault("Deals magic damage\nDispels creatures made of earth");
+        }
+
+		public override void SetDefaults()
+        {
+            item.damage = 11;
+            item.magic = true;
+            item.autoReuse = true;
+            item.useTurn = true;
+            item.knockBack = 3;
+            item.width = 32;
+			item.height = 32;
+            item.useTime = 10;
+			item.useAnimation = 30;
+			item.useStyle = 1;
+            item.pick = 80;
+            item.value = Item.sellPrice(0, 0, 10, 0);
+			item.rare = 2;
+            item.maxStack = 1;
+            item.UseSound = SoundID.Item1;
+        }
+
+        public override void ModifyHitNPC(Player player, NPC target, ref int damage, ref float knockBack, ref bool crit)
+        {
+            if (target.type == NPCID.MeteorHead || target.type == NPCID.GraniteFlyer || target.type == NPCID.GraniteGolem)
+            {
+                damage += target.lifeMax * 10; // overkill? what's that?
+            }
+        }
+
+        public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 10);
+            recipe.AddRecipeGroup("Wood", 5);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 5);
+            recipe.AddIngredient(ItemID.NightmarePickaxe);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+			recipe.AddRecipe();
+
+            recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("Starbrass"), 10);
+            recipe.AddRecipeGroup("Wood", 5);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 5);
+            recipe.AddIngredient(ItemID.DeathbringerPickaxe);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+	}
+}
diff --git a/Items/StarbrassPickaxe.png b/Items/StarbrassPickaxe.png
diff --git a/Items/Weapons/AuricGunshell.cs b/Items/Weapons/AuricGunshell.cs
@@ -9,7 +9,7 @@ public class AuricGunshell : ModItem
 		public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Auric Gunshell");
-            Tooltip.SetDefault("An infinite source of ethereal bullets\nNo knockback, but can pierce");
+            Tooltip.SetDefault("An infinite source of ethereal bullets\nVery low knockback, but can pierce");
 		}
 
 		public override void SetDefaults()

diff --git a/Items/_Ingredients.cs b/Items/_Ingredients.cs
@@ -75,7 +75,7 @@ public class Starbrass : ModItem
         public override void SetStaticDefaults()
         {
             DisplayName.SetDefault("Starbrass");
-            Tooltip.SetDefault("A strong, mana-conductive alloy\nPioneered by a thaumaturge from an ancient land");
+            Tooltip.SetDefault("A strong, mana-conductive metal\nPioneered by a thaumaturge from an ancient land");
         }
 
         public override void SetDefaults()
@@ -88,6 +88,36 @@ public override void SetDefaults()
         }
     }
 
+    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");
+        }
+
+        public override void SetDefaults()
+        {
+            item.width = 30;
+            item.height = 24;
+            item.maxStack = 999;
+            item.value = Item.sellPrice(0, 0, 10, 0);
+            item.rare = 1;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(ItemID.Meteorite);
+            recipe.AddIngredient(mod.ItemType("Starbrass"));
+            recipe.AddRecipeGroup("IronBar");
+            recipe.SetResult(this);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.AddRecipe();
+        }
+    }
+
     public class TreatedFlask : ModItem
     {
         public override void SetStaticDefaults()

diff --git a/README.md b/README.md
@@ -15,11 +15,21 @@ You are free to decompile, modify etc. this mod under the MIT License. The mod i
 
 * **Xhuis** - Code, sprites.
 * **Ilysen** - Code, sprites, and writing after 1.0.15.0.
-* **Flaqzar** - Sprites for the Starbrass armor set.
+* **Flaqzar** - Sprites for the starbrass armor set, starbrass tools, auric steel, and auric steel tools.
 * **Re-Logic** - Terraria, and the sprites I used as reference/basis for Thaumaturgy's!
 
 # Changelog
 
+### Aug. 11, 2019
+
+#### 1.0.18.5
+
+* Rebalanced the value of tools and accessories to not make reforging wholly unfeasible.
+* Added the Starbrass Pickaxe and Starbrass Hamaxe. Both deal magic damage instead of melee damage!
+* Corrected the Auric Gunshell's tooltip stating that it had no knockback; guns would add knockback to it in spite of it having no innate knockback.
+* Added Auric Steel. Make it with starbrass, meteorite, and iron or lead bars. It's included in the recipe for auromechanical armor, and can be used to make the Auric Steel Waraxe.
+* Added the Auric Steel Waraxe, which is a pre-Hardmode melee weapon with high critical chance and deals magic damage.
+
 ### Aug. 10, 2019
 
 #### 1.0.18.4

diff --git a/build.txt b/build.txt
@@ -1,4 +1,4 @@
 author = Ilysen
-version = 1.0.18.4
+version = 1.0.18.5
 displayName = Thaumaturgy
 homepage = https://forums.terraria.org/index.php?threads/avas-mods-thaumaturgy-challenge-runes-yabssm.81892/