diff --git a/Content/Items/Accessories/AlucardPendant.cs b/Content/Items/Accessories/AlucardPendant.cs index 445443a..712fc6d 100644 --- a/Content/Items/Accessories/AlucardPendant.cs +++ b/Content/Items/Accessories/AlucardPendant.cs @@ -42,7 +42,7 @@ namespace Decimation.Content.Items.Accessories player.npcTypeNoAggro[NPCID.Vampire] = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); diff --git a/Content/Items/Accessories/CelestialTransmogrifier.cs b/Content/Items/Accessories/CelestialTransmogrifier.cs index 8d511cb..d5d0cec 100644 --- a/Content/Items/Accessories/CelestialTransmogrifier.cs +++ b/Content/Items/Accessories/CelestialTransmogrifier.cs @@ -59,7 +59,7 @@ namespace Decimation.Content.Items.Accessories player.npcTypeNoAggro[NPCID.Vampire] = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); diff --git a/Content/Items/Accessories/CrystalSkull.cs b/Content/Items/Accessories/CrystalSkull.cs index b2c4855..c4b9598 100644 --- a/Content/Items/Accessories/CrystalSkull.cs +++ b/Content/Items/Accessories/CrystalSkull.cs @@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Accessories item.defense = 2; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.GlassKiln}, true); diff --git a/Content/Items/Accessories/DeadeyesQuiver.cs b/Content/Items/Accessories/DeadeyesQuiver.cs index 6ce8392..1c9a034 100644 --- a/Content/Items/Accessories/DeadeyesQuiver.cs +++ b/Content/Items/Accessories/DeadeyesQuiver.cs @@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Accessories this.item.value = Item.buyPrice(0, 15); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); recipe.AddIngredient(ModContent.ItemType()); diff --git a/Content/Items/Accessories/EnchantedFocuser.cs b/Content/Items/Accessories/EnchantedFocuser.cs index c18b7d1..92a60d0 100644 --- a/Content/Items/Accessories/EnchantedFocuser.cs +++ b/Content/Items/Accessories/EnchantedFocuser.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories this.item.value = Item.buyPrice(0, 0, 0, 10); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.Anvils}, true); diff --git a/Content/Items/Accessories/EndlessPouchofLife.cs b/Content/Items/Accessories/EndlessPouchofLife.cs index b6d93fb..65d4dcf 100644 --- a/Content/Items/Accessories/EndlessPouchofLife.cs +++ b/Content/Items/Accessories/EndlessPouchofLife.cs @@ -33,7 +33,7 @@ namespace Decimation.Content.Items.Accessories Main.LocalPlayer.GetModPlayer().endlessPouchofLifeEquipped = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); diff --git a/Content/Items/Accessories/EnergyFocuser.cs b/Content/Items/Accessories/EnergyFocuser.cs index fa6e865..956442e 100644 --- a/Content/Items/Accessories/EnergyFocuser.cs +++ b/Content/Items/Accessories/EnergyFocuser.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories this.item.value = Item.buyPrice(0, 0, 0, 10); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.MythrilAnvil}, true); diff --git a/Content/Items/Accessories/Focuser.cs b/Content/Items/Accessories/Focuser.cs index 56ba27d..5cb2efe 100644 --- a/Content/Items/Accessories/Focuser.cs +++ b/Content/Items/Accessories/Focuser.cs @@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories this.item.value = Item.buyPrice(0, 0, 0, 10); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.Anvils}, true); diff --git a/Content/Items/Accessories/GraniteLinedTunic.cs b/Content/Items/Accessories/GraniteLinedTunic.cs index b5fb755..53b90ea 100644 --- a/Content/Items/Accessories/GraniteLinedTunic.cs +++ b/Content/Items/Accessories/GraniteLinedTunic.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories player.statDefense += 2; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.Anvils}); diff --git a/Content/Items/Accessories/JestersQuiver.cs b/Content/Items/Accessories/JestersQuiver.cs index a67a194..c7ff76f 100644 --- a/Content/Items/Accessories/JestersQuiver.cs +++ b/Content/Items/Accessories/JestersQuiver.cs @@ -26,7 +26,7 @@ namespace Decimation.Content.Items.Accessories player.rangedCrit += 5; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Accessories/LightweightGlove.cs b/Content/Items/Accessories/LightweightGlove.cs index 93529f3..b4687ad 100644 --- a/Content/Items/Accessories/LightweightGlove.cs +++ b/Content/Items/Accessories/LightweightGlove.cs @@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Accessories player.thrownCrit += 3; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List() { TileID.Loom }, false); diff --git a/Content/Items/Accessories/RangersPouch.cs b/Content/Items/Accessories/RangersPouch.cs index df73f94..6189989 100644 --- a/Content/Items/Accessories/RangersPouch.cs +++ b/Content/Items/Accessories/RangersPouch.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories item.rare = Rarity.Green.GetRarityValue(); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List() { TileID.MythrilAnvil }, false); diff --git a/Content/Items/Accessories/RangersQuiver.cs b/Content/Items/Accessories/RangersQuiver.cs index d32707f..a634e05 100644 --- a/Content/Items/Accessories/RangersQuiver.cs +++ b/Content/Items/Accessories/RangersQuiver.cs @@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Accessories this.item.value = Item.buyPrice(0, 0, 0, 10); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.MythrilAnvil}, true); diff --git a/Content/Items/Accessories/RedHotShackle.cs b/Content/Items/Accessories/RedHotShackle.cs index efd6387..1044660 100644 --- a/Content/Items/Accessories/RedHotShackle.cs +++ b/Content/Items/Accessories/RedHotShackle.cs @@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Accessories player.EquipAccessory(this); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List() {TileID.Furnaces}, true); diff --git a/Content/Items/Accessories/SlimeBracelet.cs b/Content/Items/Accessories/SlimeBracelet.cs index 0ab2998..0995495 100644 --- a/Content/Items/Accessories/SlimeBracelet.cs +++ b/Content/Items/Accessories/SlimeBracelet.cs @@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories this.item.value = Item.buyPrice(0, 0, 0, 10); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.WorkBenches}, true); diff --git a/Content/Items/Accessories/TideTurner.cs b/Content/Items/Accessories/TideTurner.cs index df74597..57676a7 100644 --- a/Content/Items/Accessories/TideTurner.cs +++ b/Content/Items/Accessories/TideTurner.cs @@ -40,7 +40,7 @@ namespace Decimation.Content.Items.Accessories player.accFlipper = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}, false); diff --git a/Content/Items/Accessories/Wings/ScarabWings.cs b/Content/Items/Accessories/Wings/ScarabWings.cs index 623e770..997d15c 100644 --- a/Content/Items/Accessories/Wings/ScarabWings.cs +++ b/Content/Items/Accessories/Wings/ScarabWings.cs @@ -54,7 +54,7 @@ namespace Decimation.Content.Items.Accessories.Wings acceleration *= 2.5f; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List { ModContent.TileType() }); diff --git a/Content/Items/Ammo/MoltenStyngerBolt.cs b/Content/Items/Ammo/MoltenStyngerBolt.cs index cc7d749..b78fd29 100644 --- a/Content/Items/Ammo/MoltenStyngerBolt.cs +++ b/Content/Items/Ammo/MoltenStyngerBolt.cs @@ -40,7 +40,7 @@ namespace Decimation.Content.Items.Ammo player.AddBuff(ModContent.BuffType(), 600); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 50, new List {ModContent.TileType()}); diff --git a/Content/Items/Ammo/SiphonArrow.cs b/Content/Items/Ammo/SiphonArrow.cs index c9466dc..bb4d666 100644 --- a/Content/Items/Ammo/SiphonArrow.cs +++ b/Content/Items/Ammo/SiphonArrow.cs @@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Ammo this.item.shootSpeed = 2.5f; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.Anvils}); diff --git a/Content/Items/Ammo/TitanicStyngerBolt.cs b/Content/Items/Ammo/TitanicStyngerBolt.cs index 6fe6b67..b53570c 100644 --- a/Content/Items/Ammo/TitanicStyngerBolt.cs +++ b/Content/Items/Ammo/TitanicStyngerBolt.cs @@ -43,7 +43,7 @@ namespace Decimation.Content.Items.Ammo target.AddBuff(ModContent.BuffType(), 600); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 50, new List {ModContent.TileType()}); diff --git a/Content/Items/Amulets/BuildersAmulet.cs b/Content/Items/Amulets/BuildersAmulet.cs index 194fd38..d09a27e 100644 --- a/Content/Items/Amulets/BuildersAmulet.cs +++ b/Content/Items/Amulets/BuildersAmulet.cs @@ -26,7 +26,7 @@ namespace Decimation.Content.Items.Amulets (int) (player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}, true); diff --git a/Content/Items/Amulets/CreatorAmulet.cs b/Content/Items/Amulets/CreatorAmulet.cs index c9ffe1c..bb2ba31 100644 --- a/Content/Items/Amulets/CreatorAmulet.cs +++ b/Content/Items/Amulets/CreatorAmulet.cs @@ -28,7 +28,7 @@ namespace Decimation.Content.Items.Amulets (int) (player.position.Y + player.height / 2f) / 16, 1, 1, 1); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/CrystalAmulet.cs b/Content/Items/Amulets/CrystalAmulet.cs index 70367fc..6cf253b 100644 --- a/Content/Items/Amulets/CrystalAmulet.cs +++ b/Content/Items/Amulets/CrystalAmulet.cs @@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Amulets player.magicCrit += 3; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/FireAmulet.cs b/Content/Items/Amulets/FireAmulet.cs index 845f465..af5cfe3 100644 --- a/Content/Items/Amulets/FireAmulet.cs +++ b/Content/Items/Amulets/FireAmulet.cs @@ -34,7 +34,7 @@ namespace Decimation.Content.Items.Amulets modPlayer.amuletsBuffTime = 300; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/FrostAmulet.cs b/Content/Items/Amulets/FrostAmulet.cs index 0cd50dc..64d01a7 100644 --- a/Content/Items/Amulets/FrostAmulet.cs +++ b/Content/Items/Amulets/FrostAmulet.cs @@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Amulets player.rangedCrit += 3; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/GraniteAmulet.cs b/Content/Items/Amulets/GraniteAmulet.cs index fdf7b10..3e652a2 100644 --- a/Content/Items/Amulets/GraniteAmulet.cs +++ b/Content/Items/Amulets/GraniteAmulet.cs @@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Amulets } } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/HealtyAmulet.cs b/Content/Items/Amulets/HealtyAmulet.cs index 12769c2..74e544f 100644 --- a/Content/Items/Amulets/HealtyAmulet.cs +++ b/Content/Items/Amulets/HealtyAmulet.cs @@ -23,7 +23,7 @@ namespace Decimation.Content.Items.Amulets Item.NewItem(new Vector2(player.position.X, player.position.Y), ModContent.ItemType()); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/MarbleAmulet.cs b/Content/Items/Amulets/MarbleAmulet.cs index 651896e..b8ba4bc 100644 --- a/Content/Items/Amulets/MarbleAmulet.cs +++ b/Content/Items/Amulets/MarbleAmulet.cs @@ -28,7 +28,7 @@ namespace Decimation.Content.Items.Amulets modPlayer.amuletsBuffWhenAttacking = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}); diff --git a/Content/Items/Amulets/MinersAmulet.cs b/Content/Items/Amulets/MinersAmulet.cs index 4e6bd08..b813d43 100644 --- a/Content/Items/Amulets/MinersAmulet.cs +++ b/Content/Items/Amulets/MinersAmulet.cs @@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Amulets (int) (player.position.Y + player.height / 2f) / 16, 1, 1, 1); } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {TileID.TinkerersWorkbench}, true); diff --git a/Content/Items/Amulets/SlimeAmulet.cs b/Content/Items/Amulets/SlimeAmulet.cs index a27dde3..970e796 100644 --- a/Content/Items/Amulets/SlimeAmulet.cs +++ b/Content/Items/Amulets/SlimeAmulet.cs @@ -54,7 +54,7 @@ namespace Decimation.Content.Items.Amulets modPlayer.amuletsBuffTime = 300; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List { TileID.TinkerersWorkbench }, true); diff --git a/Content/Items/Armors/ScarabArmor/ScarabBody.cs b/Content/Items/Armors/ScarabArmor/ScarabBody.cs index a546497..54a7528 100644 --- a/Content/Items/Armors/ScarabArmor/ScarabBody.cs +++ b/Content/Items/Armors/ScarabArmor/ScarabBody.cs @@ -34,7 +34,7 @@ namespace Decimation.Content.Items.Armors.ScarabArmor player.noKnockback = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List() { ModContent.TileType() }, false); diff --git a/Content/Items/Armors/ScarabArmor/ScarabHelmet.cs b/Content/Items/Armors/ScarabArmor/ScarabHelmet.cs index 24b9ab7..0729522 100644 --- a/Content/Items/Armors/ScarabArmor/ScarabHelmet.cs +++ b/Content/Items/Armors/ScarabArmor/ScarabHelmet.cs @@ -118,7 +118,7 @@ namespace Decimation.Content.Items.Armors.ScarabArmor } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List {ModContent.TileType()}); diff --git a/Content/Items/Armors/ScarabArmor/ScarabLeggings.cs b/Content/Items/Armors/ScarabArmor/ScarabLeggings.cs index 67c102d..086a9cc 100644 --- a/Content/Items/Armors/ScarabArmor/ScarabLeggings.cs +++ b/Content/Items/Armors/ScarabArmor/ScarabLeggings.cs @@ -36,7 +36,7 @@ namespace Decimation.Content.Items.Armors.ScarabArmor player.fireWalk = true; } - protected override List GetAdditionalRecipes() + protected override List GetRecipes() { ModRecipe recipe = GetNewModRecipe(this, 1, new List() { ModContent.TileType() }); diff --git a/Content/Items/Weapons/DuneWyrm/Sundial.cs b/Content/Items/Weapons/DuneWyrm/Sundial.cs index 860cbd9..75757b2 100644 --- a/Content/Items/Weapons/DuneWyrm/Sundial.cs +++ b/Content/Items/Weapons/DuneWyrm/Sundial.cs @@ -1,5 +1,9 @@ +using System.Collections.Generic; +using Decimation.Content.Items.Misc.Souls; using Decimation.Lib.Items; using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; +using Terraria.ID; using Terraria.ModLoader; namespace Decimation.Content.Items.Weapons.DuneWyrm @@ -24,5 +28,26 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm item.crit = 15; item.rare = Rarity.LightRed.GetRarityValue(); } + + protected override List GetRecipes() + { + return new List + { + new RecipeBuilder(this) + .AnyIronBar(true) + .WithIngredient(ItemID.GoldWatch) + .WithIngredient(ItemID.AncientBattleArmorMaterial) + .WithIngredient(ModContent.ItemType(), 10) + .WithStation(TileID.MythrilAnvil) + .Build(), + new RecipeBuilder(this) + .AnyIronBar(true) + .WithIngredient(ItemID.PlatinumWatch) + .WithIngredient(ItemID.AncientBattleArmorMaterial) + .WithIngredient(ModContent.ItemType(), 10) + .WithStation(TileID.MythrilAnvil) + .Build() + }; + } } } \ No newline at end of file diff --git a/Lib/Items/DecimationItem.cs b/Lib/Items/DecimationItem.cs index 008c522..8ddfa3c 100644 --- a/Lib/Items/DecimationItem.cs +++ b/Lib/Items/DecimationItem.cs @@ -38,7 +38,7 @@ namespace Decimation.Lib.Items public sealed override void AddRecipes() { - List recipes = GetAdditionalRecipes(); + List recipes = GetRecipes(); recipes.Add(GetRecipe()); foreach (ModRecipe recipe in recipes) recipe?.AddRecipe(); @@ -51,7 +51,7 @@ namespace Decimation.Lib.Items return null; } - protected virtual List GetAdditionalRecipes() + protected virtual List GetRecipes() { return new List(); }