1.0.17.0

Ilysen · Aug 6, 2019 · 4b8f613 · 4b8f613
1 parent b3ac654
commit 4b8f613
Show file tree

Hide file tree

Showing 43 changed files with 524 additions and 84 deletions.
diff --git a/Buffs/Daredevilry.cs b/Buffs/Daredevilry.cs
@@ -0,0 +1,115 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Buffs
+{
+	public class Daredevilry : ModBuff
+    {
+		public override void SetDefaults()
+        {
+            DisplayName.SetDefault("Daredevilry");
+            Description.SetDefault("Grants all vanilla potion benefits");
+            Main.buffNoSave[Type] = false;
+            Main.debuff[Type] = false;
+            canBeCleared = true;
+        }
+
+        public override void Update(Player player, ref int buffIndex)
+        {
+            //Spelunker, Hunter, and Dangersense
+            player.findTreasure = true;
+            player.detectCreature = true;
+            player.dangerSense = true;
+
+            //Night Owl
+            player.nightVision = true;
+
+            //Obsidian Skin
+            player.lavaImmune = true;
+
+            //Gills, Flipper, and Water Walking
+            player.gills = true;
+            player.ignoreWater = true;
+            player.accFlipper = true;
+            player.waterWalk = true;
+            player.fireWalk = true;
+
+            //Mining
+            player.pickSpeed -= 0.25f;
+
+            //Avarice
+            player.goldRing = true;
+
+            //Ironskin
+            player.statDefense += 8;
+
+            //Endurance
+            player.endurance += 0.1f;
+
+            //Regeneration
+            player.lifeRegen += 4;
+
+            //Lifeforce
+            player.lifeForce = true;
+            player.statLifeMax2 += player.statLifeMax / 5 / 20 * 20;
+
+            //Swiftness
+            player.moveSpeed += 0.25f;
+
+            //Wrath
+            player.thrownDamage += 0.1f;
+            player.meleeDamage += 0.1f;
+            player.rangedDamage += 0.1f;
+            player.magicDamage += 0.1f;
+            player.minionDamage += 0.1f;
+
+            //Rage
+            player.meleeCrit += 10;
+            player.rangedCrit += 10;
+            player.magicCrit += 10;
+            player.thrownCrit += 10;
+
+            //Archery
+            player.archery = true;
+
+            //Ammo Reservation
+            player.ammoPotion = true;
+
+            //Magic Power
+            player.magicDamage += 0.2f;
+
+            //Mana Regeneration
+            player.manaRegenBuff = true;
+
+            //Summoning
+            player.maxMinions++;
+
+            //And prevent duplicates from vanilla buffs
+            player.buffImmune[BuffID.Spelunker] = true;
+            player.buffImmune[BuffID.Hunter] = true;
+            player.buffImmune[BuffID.Dangersense] = true;
+            player.buffImmune[BuffID.NightOwl] = true;
+            player.buffImmune[BuffID.ObsidianSkin] = true;
+            player.buffImmune[BuffID.Gills] = true;
+            player.buffImmune[BuffID.Flipper] = true;
+            player.buffImmune[BuffID.WaterWalking] = true;
+            player.buffImmune[BuffID.Mining] = true;
+            player.buffImmune[BuffID.Ironskin] = true;
+            player.buffImmune[BuffID.Endurance] = true;
+            player.buffImmune[BuffID.Regeneration] = true;
+            player.buffImmune[BuffID.Lifeforce] = true;
+            player.buffImmune[BuffID.Swiftness] = true;
+            player.buffImmune[BuffID.Wrath] = true;
+            player.buffImmune[BuffID.Rage] = true;
+            player.buffImmune[BuffID.Archery] = true;
+            player.buffImmune[BuffID.AmmoReservation] = true;
+            player.buffImmune[BuffID.MagicPower] = true;
+            player.buffImmune[BuffID.ManaRegeneration] = true;
+            player.buffImmune[BuffID.Summoning] = true;
+            player.buffImmune[mod.BuffType("Avarice")] = true;
+            player.buffImmune[mod.BuffType("Daring")] = true;
+            player.buffImmune[mod.BuffType("Determination")] = true;
+        }
+    }
+}
diff --git a/Buffs/Daredevilry.png b/Buffs/Daredevilry.png
diff --git a/Items/AuricCore.cs b/Items/AuricCore.cs
diff --git a/Items/AuricShard.cs b/Items/AuricShard.cs
diff --git a/Items/BindShackle.cs b/Items/BindShackle.cs
@@ -0,0 +1,42 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+    public class BindShackle : ModItem
+    {
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Bind-Shackle");
+            Tooltip.SetDefault("Increases mining speed by 40%\n'We're all adrift together, together'");
+        }
+
+        public override void SetDefaults()
+        {
+            item.width = 24;
+            item.height = 24;
+            item.value = Item.sellPrice(0, 0, 10, 0);
+            item.rare = 1;
+            item.accessory = true;
+            item.defense = 1;
+        }
+
+        public override void UpdateEquip(Player player)
+        {
+            player.pickSpeed *= 0.6f;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(ItemID.Shackle, 1);
+            recipe.AddIngredient(mod.ItemType("AuricCore"), 1);
+            recipe.AddIngredient(mod.ItemType("AuricShard"), 3);
+            recipe.SetResult(this);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.AddRecipe();
+        }
+    }
+}
diff --git a/Items/BindShackle.png b/Items/BindShackle.png
diff --git a/Items/CrystalPhial.png b/Items/CrystalPhial.png
diff --git a/Items/DraughtDaredevilry.png b/Items/DraughtDaredevilry.png
diff --git a/Items/DraughtDaring.png b/Items/DraughtDaring.png
diff --git a/Items/DraughtDetermination.png b/Items/DraughtDetermination.png
diff --git a/Items/ElixirAlacrity.png b/Items/ElixirAlacrity.png
diff --git a/Items/ElixirAvarice.png b/Items/ElixirAvarice.png
diff --git a/Items/ElixirDeadlyFocus.png b/Items/ElixirDeadlyFocus.png
diff --git a/Items/ElixirDelving.png b/Items/ElixirDelving.png
diff --git a/Items/ElixirEvasion.png b/Items/ElixirEvasion.png
diff --git a/Items/ElixirFloes.png b/Items/ElixirFloes.png
diff --git a/Items/ElixirFortitude.png b/Items/ElixirFortitude.png
diff --git a/Items/ElixirGeneralsRally.png b/Items/ElixirGeneralsRally.png
diff --git a/Items/ElixirHealing.png b/Items/ElixirHealing.png
diff --git a/Items/ElixirHealingGreater.png b/Items/ElixirHealingGreater.png
diff --git a/Items/ElixirHealingSuper.png b/Items/ElixirHealingSuper.png
diff --git a/Items/ElixirHuntersPrecision.png b/Items/ElixirHuntersPrecision.png
diff --git a/Items/ElixirSorcerersAusterity.png b/Items/ElixirSorcerersAusterity.png
diff --git a/Items/ElixirSubmersion.png b/Items/ElixirSubmersion.png
diff --git a/Items/ElixirTradewinds.png b/Items/ElixirTradewinds.png
diff --git a/Items/ElixirTrawling.png b/Items/ElixirTrawling.png
diff --git a/Items/ElixirTruesight.png b/Items/ElixirTruesight.png
diff --git a/Items/ElixirVigor.png b/Items/ElixirVigor.png
diff --git a/Items/ElixirVoid.png b/Items/ElixirVoid.png
diff --git a/Items/PathfindersLamp.cs b/Items/PathfindersLamp.cs
@@ -0,0 +1,42 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items
+{
+    public class PathfindersLamp : ModItem
+    {
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Pathfinder's Lamp");
+            Tooltip.SetDefault("Provides light while worn");
+        }
+
+        public override void SetDefaults()
+        {
+            item.width = 24;
+            item.height = 24;
+            item.value = Item.sellPrice(0, 0, 10, 0);
+            item.rare = 1;
+            item.accessory = true;
+            item.defense = 2;
+        }
+
+        public override void UpdateEquip(Player player)
+        {
+            Lighting.AddLight(player.Center, 1f, 0.75f, 1f);
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(ItemID.Shackle);
+            recipe.AddIngredient(ItemID.Chain, 3);
+            recipe.AddIngredient(mod.ItemType("ConjurersLamp"));
+            recipe.SetResult(this);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.AddRecipe();
+        }
+    }
+}
diff --git a/Items/PathfindersLamp.png b/Items/PathfindersLamp.png
diff --git a/Items/TreatedFlask.png b/Items/TreatedFlask.png
diff --git a/Items/Weapons/AuricGunshell.cs b/Items/Weapons/AuricGunshell.cs
@@ -0,0 +1,41 @@
+using Terraria;
+using Terraria.ID;
+using Terraria.ModLoader;
+
+namespace Thaumaturgy.Items.Weapons
+{
+	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");
+		}
+
+		public override void SetDefaults()
+		{
+			item.damage = 9;
+			item.ranged = true;
+			item.width = 8;
+			item.height = 8;
+			item.maxStack = 999;
+			item.consumable = false;
+            item.value = Item.sellPrice(0, 0, 25, 0);
+            item.rare = 2;
+			item.shoot = mod.ProjectileType("EtherealBullet");
+			item.shootSpeed = 16f;
+			item.ammo = AmmoID.Bullet;
+		}
+
+		public override void AddRecipes()
+		{
+			ModRecipe recipe = new ModRecipe(mod);
+			recipe.AddIngredient(ItemID.EndlessMusketPouch);
+            recipe.AddIngredient(mod.ItemType("AuricCore"), 3);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+			recipe.AddRecipe();
+		}
+	}
+}
diff --git a/Items/Weapons/AuricGunshell.png b/Items/Weapons/AuricGunshell.png
diff --git a/Items/_Draughts.cs b/Items/_Draughts.cs
@@ -32,6 +32,7 @@ public override void SetDefaults()
         public override void AddRecipes()
         {
             ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("CrystalPhial"));
             recipe.AddIngredient(mod.ItemType("ElixirFortitude"));
             recipe.AddIngredient(mod.ItemType("ElixirVigor"));
             recipe.AddIngredient(mod.ItemType("ElixirAlacrity"));
@@ -75,6 +76,7 @@ public override void SetDefaults()
         public override void AddRecipes()
         {
             ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("CrystalPhial"));
             recipe.AddIngredient(mod.ItemType("ElixirSubmersion"));
             recipe.AddIngredient(mod.ItemType("ElixirDelving"));
             recipe.AddIngredient(mod.ItemType("ElixirTruesight"));
@@ -87,4 +89,42 @@ public override void AddRecipes()
             recipe.AddRecipe();
         }
     }
+
+    public class DraughtDaredevilry : ModItem
+    {
+        public override void SetStaticDefaults()
+        {
+            DisplayName.SetDefault("Draught of Daredevilry");
+            Tooltip.SetDefault("Grants all vanilla potion benefits\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 = 1;
+            item.width = 20;
+            item.height = 20;
+            item.value = Item.sellPrice(2, 50, 0, 0);
+            item.rare = 11;
+            item.buffType = mod.BuffType("Daredevilry");
+            item.buffTime = 216000;
+        }
+
+        public override void AddRecipes()
+        {
+            ModRecipe recipe = new ModRecipe(mod);
+            recipe.AddIngredient(mod.ItemType("CrystalPhial"));
+            recipe.AddIngredient(mod.ItemType("DraughtDaring"));
+            recipe.AddIngredient(mod.ItemType("DraughtDetermination"));
+            recipe.AddIngredient(mod.ItemType("AuricCore"), 5);
+            recipe.AddTile(mod.TileType("Thaumatrestle"));
+            recipe.AddTile(mod.TileType("SynthesisFocus"));
+            recipe.SetResult(this);
+            recipe.AddRecipe();
+        }
+    }
 }