Adjusts Void, adds some new elixirs

Ilysen · Jul 12, 2018 · 9a87373 · 9a87373
1 parent 9dc9933
commit 9a87373
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 4 deletions.
diff --git a/Buffs/Void.cs b/Buffs/Void.cs
@@ -21,7 +21,7 @@ public override void Update(Player player, ref int buffIndex)
             if(player.statMana <= player.statManaMax2 * 0.5)
             {
                 player.statLife--;
-                player.statMana = (int)(player.statManaMax * 0.5);
+                player.statMana += 3;
                 if(player.statLife <= 0)
                 {
                     PlayerDeathReason damageSource = PlayerDeathReason.ByCustomReason(player.name + " was eaten by hungry shadows.");

diff --git a/Items/ElixirAvarice.png b/Items/ElixirAvarice.png
diff --git a/Items/ElixirEvasion.png b/Items/ElixirEvasion.png
diff --git a/Items/ElixirVoid.png b/Items/ElixirVoid.png
diff --git a/Items/_Draughts.cs b/Items/_Draughts.cs
@@ -26,7 +26,7 @@ public override void SetDefaults()
             item.value = Item.sellPrice(1, 0, 0, 0);
             item.rare = 10;
             item.buffType = mod.BuffType("Determination");
-            item.buffTime = 54000;
+            item.buffTime = 108000;
         }
 
         public override void AddRecipes()
@@ -69,7 +69,7 @@ public override void SetDefaults()
             item.value = Item.sellPrice(1, 0, 0, 0);
             item.rare = 10;
             item.buffType = mod.BuffType("Daring");
-            item.buffTime = 54000;
+            item.buffTime = 108000;
         }
 
         public override void AddRecipes()

diff --git a/Items/_Elixirs.cs b/Items/_Elixirs.cs
@@ -4,6 +4,10 @@
 
 namespace Thaumaturgy.Items
 {
+    //////////////
+    // HEALING //
+    /////////////
+
     public class ElixirHealing : ModItem
     {
         public override void SetStaticDefaults()
@@ -185,6 +189,10 @@ public override void AddRecipes()
         }
     }
 
+    ///////////////////
+    // VANILLA BUFFS //
+    ///////////////////
+
     public class ElixirFortitude : ModItem
     {
         public override void SetStaticDefaults()
@@ -731,4 +739,124 @@ public override bool UseItem(Player player)
             return true;
         }
     }
+
+    ///////////////////////
+    // THAUMATURGY BUFFS //
+    ///////////////////////
+
+    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");
+        }
+
+        public override void SetDefaults()
+        {
+            item.UseSound = SoundID.Item3;
+            item.useStyle = 2;
+            item.useTurn = true;
+            item.useAnimation = 17;
+            item.useTime = 17;
+            item.maxStack = 99;
+            item.width = 20;
+            item.height = 20;
+            item.value = Item.sellPrice(0, 1, 0, 0);
+            item.rare = 3;
+            item.buffType = mod.BuffType("Avarice");
+            item.buffTime = 36000;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("PotionAvarice"), 5);
+            recipe.AddIngredient(mod.ItemType("SpellboundWater"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 3);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+    }
+
+    public class ElixirEvasion : ModItem
+    {
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Auric Elixir of Nimbleness");
+            Tooltip.SetDefault("Enables dashing\nNot consumed upon use");
+        }
+
+        public override void SetDefaults()
+        {
+            item.UseSound = SoundID.Item3;
+            item.useStyle = 2;
+            item.useTurn = true;
+            item.useAnimation = 17;
+            item.useTime = 17;
+            item.maxStack = 99;
+            item.width = 20;
+            item.height = 20;
+            item.value = Item.sellPrice(0, 1, 0, 0);
+            item.rare = 3;
+            item.buffType = mod.BuffType("Evasion");
+            item.buffTime = 36000;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("PotionEvasion"), 5);
+            recipe.AddIngredient(mod.ItemType("SpellboundWater"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 3);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+    }
+
+    public class ElixirVoid : ModItem
+    {
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Auric Elixir of Entwined Tendrils");
+            Tooltip.SetDefault("Life will be consumed to preserve mana\nNot consumed upon use");
+        }
+
+        public override void SetDefaults()
+        {
+            item.UseSound = SoundID.Item3;
+            item.useStyle = 2;
+            item.useTurn = true;
+            item.useAnimation = 17;
+            item.useTime = 17;
+            item.maxStack = 99;
+            item.width = 20;
+            item.height = 20;
+            item.value = Item.sellPrice(0, 1, 0, 0);
+            item.rare = 3;
+            item.buffType = mod.BuffType("Void");
+            item.buffTime = 36000;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("PotionVoid"), 5);
+            recipe.AddIngredient(mod.ItemType("SpellboundWater"));
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 3);
+            recipe.AddIngredient(mod.ItemType("AuricCore"));
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+    }
+
+
 }
diff --git a/README.md b/README.md
@@ -17,6 +17,12 @@ You are free to decompile, modify etc. this mod under the MIT License. The mod i
 
 # Changelog
 
+### Jul. 11, 2018
+
+#### 1.0.11.1
+* Adjusted the Void buff. Now it regenerates mana instead of setting the amount.
+* Added elixir varieties of Avarice, Evasion, and Void potions.
+
 ### Jul. 10, 2018
 
 #### 1.0.11.0

diff --git a/build.txt b/build.txt
@@ -1,5 +1,5 @@
 author = Xhuis
 
-version = 1.0.11.0
+version = 1.0.11.1
 displayName = Thaumaturgy
 homepage = https://github.com/Xhuis/Thaumaturgy