Updated Sundial

This commit is contained in:
FyloZ 2020-06-11 23:19:28 -04:00
parent 2bb7ef3935
commit 601b097dc2
35 changed files with 60 additions and 35 deletions

View File

@ -42,7 +42,7 @@ namespace Decimation.Content.Items.Accessories
player.npcTypeNoAggro[NPCID.Vampire] = true; player.npcTypeNoAggro[NPCID.Vampire] = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<EnchantedAnvil>()}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<EnchantedAnvil>()});

View File

@ -59,7 +59,7 @@ namespace Decimation.Content.Items.Accessories
player.npcTypeNoAggro[NPCID.Vampire] = true; player.npcTypeNoAggro[NPCID.Vampire] = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()});

View File

@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Accessories
item.defense = 2; item.defense = 2;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.GlassKiln}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.GlassKiln}, true);

View File

@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Accessories
this.item.value = Item.buyPrice(0, 15); this.item.value = Item.buyPrice(0, 15);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()});
recipe.AddIngredient(ModContent.ItemType<JestersQuiver>()); recipe.AddIngredient(ModContent.ItemType<JestersQuiver>());

View File

@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories
this.item.value = Item.buyPrice(0, 0, 0, 10); this.item.value = Item.buyPrice(0, 0, 0, 10);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils}, true);

View File

@ -33,7 +33,7 @@ namespace Decimation.Content.Items.Accessories
Main.LocalPlayer.GetModPlayer<DecimationPlayer>().endlessPouchofLifeEquipped = true; Main.LocalPlayer.GetModPlayer<DecimationPlayer>().endlessPouchofLifeEquipped = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()});

View File

@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories
this.item.value = Item.buyPrice(0, 0, 0, 10); this.item.value = Item.buyPrice(0, 0, 0, 10);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.MythrilAnvil}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.MythrilAnvil}, true);

View File

@ -20,7 +20,7 @@ namespace Decimation.Content.Items.Accessories
this.item.value = Item.buyPrice(0, 0, 0, 10); this.item.value = Item.buyPrice(0, 0, 0, 10);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils}, true);

View File

@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories
player.statDefense += 2; player.statDefense += 2;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils});

View File

@ -26,7 +26,7 @@ namespace Decimation.Content.Items.Accessories
player.rangedCrit += 5; player.rangedCrit += 5;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Accessories
player.thrownCrit += 3; player.thrownCrit += 3;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { TileID.Loom }, false); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { TileID.Loom }, false);

View File

@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories
item.rare = Rarity.Green.GetRarityValue(); item.rare = Rarity.Green.GetRarityValue();
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { TileID.MythrilAnvil }, false); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { TileID.MythrilAnvil }, false);

View File

@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Accessories
this.item.value = Item.buyPrice(0, 0, 0, 10); this.item.value = Item.buyPrice(0, 0, 0, 10);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.MythrilAnvil}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.MythrilAnvil}, true);

View File

@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Accessories
player.EquipAccessory(this); player.EquipAccessory(this);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() {TileID.Furnaces}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() {TileID.Furnaces}, true);

View File

@ -21,7 +21,7 @@ namespace Decimation.Content.Items.Accessories
this.item.value = Item.buyPrice(0, 0, 0, 10); this.item.value = Item.buyPrice(0, 0, 0, 10);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.WorkBenches}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.WorkBenches}, true);

View File

@ -40,7 +40,7 @@ namespace Decimation.Content.Items.Accessories
player.accFlipper = true; player.accFlipper = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()}, false); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<ChlorophyteAnvil>()}, false);

View File

@ -54,7 +54,7 @@ namespace Decimation.Content.Items.Accessories.Wings
acceleration *= 2.5f; acceleration *= 2.5f;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> { ModContent.TileType<TitanForge>() }); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> { ModContent.TileType<TitanForge>() });

View File

@ -40,7 +40,7 @@ namespace Decimation.Content.Items.Ammo
player.AddBuff(ModContent.BuffType<Singed>(), 600); player.AddBuff(ModContent.BuffType<Singed>(), 600);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 50, new List<int> {ModContent.TileType<TitanForge>()}); ModRecipe recipe = GetNewModRecipe(this, 50, new List<int> {ModContent.TileType<TitanForge>()});

View File

@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Ammo
this.item.shootSpeed = 2.5f; this.item.shootSpeed = 2.5f;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.Anvils});

View File

@ -43,7 +43,7 @@ namespace Decimation.Content.Items.Ammo
target.AddBuff(ModContent.BuffType<Amnesia>(), 600); target.AddBuff(ModContent.BuffType<Amnesia>(), 600);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 50, new List<int> {ModContent.TileType<TitanForge>()}); ModRecipe recipe = GetNewModRecipe(this, 50, new List<int> {ModContent.TileType<TitanForge>()});

View File

@ -26,7 +26,7 @@ namespace Decimation.Content.Items.Amulets
(int) (player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f); (int) (player.position.Y + player.height / 2f) / 16, 1.05f, 0.95f, 0.55f);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}, true);

View File

@ -28,7 +28,7 @@ namespace Decimation.Content.Items.Amulets
(int) (player.position.Y + player.height / 2f) / 16, 1, 1, 1); (int) (player.position.Y + player.height / 2f) / 16, 1, 1, 1);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Amulets
player.magicCrit += 3; player.magicCrit += 3;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -34,7 +34,7 @@ namespace Decimation.Content.Items.Amulets
modPlayer.amuletsBuffTime = 300; modPlayer.amuletsBuffTime = 300;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -22,7 +22,7 @@ namespace Decimation.Content.Items.Amulets
player.rangedCrit += 3; player.rangedCrit += 3;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -27,7 +27,7 @@ namespace Decimation.Content.Items.Amulets
} }
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -23,7 +23,7 @@ namespace Decimation.Content.Items.Amulets
Item.NewItem(new Vector2(player.position.X, player.position.Y), ModContent.ItemType<EnchantedHeart>()); Item.NewItem(new Vector2(player.position.X, player.position.Y), ModContent.ItemType<EnchantedHeart>());
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -28,7 +28,7 @@ namespace Decimation.Content.Items.Amulets
modPlayer.amuletsBuffWhenAttacking = true; modPlayer.amuletsBuffWhenAttacking = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench});

View File

@ -25,7 +25,7 @@ namespace Decimation.Content.Items.Amulets
(int) (player.position.Y + player.height / 2f) / 16, 1, 1, 1); (int) (player.position.Y + player.height / 2f) / 16, 1, 1, 1);
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {TileID.TinkerersWorkbench}, true);

View File

@ -54,7 +54,7 @@ namespace Decimation.Content.Items.Amulets
modPlayer.amuletsBuffTime = 300; modPlayer.amuletsBuffTime = 300;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> { TileID.TinkerersWorkbench }, true); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> { TileID.TinkerersWorkbench }, true);

View File

@ -34,7 +34,7 @@ namespace Decimation.Content.Items.Armors.ScarabArmor
player.noKnockback = true; player.noKnockback = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { ModContent.TileType<TitanForge>() }, false); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { ModContent.TileType<TitanForge>() }, false);

View File

@ -118,7 +118,7 @@ namespace Decimation.Content.Items.Armors.ScarabArmor
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<TitanForge>()}); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int> {ModContent.TileType<TitanForge>()});

View File

@ -36,7 +36,7 @@ namespace Decimation.Content.Items.Armors.ScarabArmor
player.fireWalk = true; player.fireWalk = true;
} }
protected override List<ModRecipe> GetAdditionalRecipes() protected override List<ModRecipe> GetRecipes()
{ {
ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { ModContent.TileType<TitanForge>() }); ModRecipe recipe = GetNewModRecipe(this, 1, new List<int>() { ModContent.TileType<TitanForge>() });

View File

@ -1,5 +1,9 @@
using System.Collections.Generic;
using Decimation.Content.Items.Misc.Souls;
using Decimation.Lib.Items; using Decimation.Lib.Items;
using Decimation.Lib.Util; using Decimation.Lib.Util;
using Decimation.Lib.Util.Builder;
using Terraria.ID;
using Terraria.ModLoader; using Terraria.ModLoader;
namespace Decimation.Content.Items.Weapons.DuneWyrm namespace Decimation.Content.Items.Weapons.DuneWyrm
@ -24,5 +28,26 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm
item.crit = 15; item.crit = 15;
item.rare = Rarity.LightRed.GetRarityValue(); item.rare = Rarity.LightRed.GetRarityValue();
} }
protected override List<ModRecipe> GetRecipes()
{
return new List<ModRecipe>
{
new RecipeBuilder(this)
.AnyIronBar(true)
.WithIngredient(ItemID.GoldWatch)
.WithIngredient(ItemID.AncientBattleArmorMaterial)
.WithIngredient(ModContent.ItemType<SoulofTime>(), 10)
.WithStation(TileID.MythrilAnvil)
.Build(),
new RecipeBuilder(this)
.AnyIronBar(true)
.WithIngredient(ItemID.PlatinumWatch)
.WithIngredient(ItemID.AncientBattleArmorMaterial)
.WithIngredient(ModContent.ItemType<SoulofTime>(), 10)
.WithStation(TileID.MythrilAnvil)
.Build()
};
}
} }
} }

View File

@ -38,7 +38,7 @@ namespace Decimation.Lib.Items
public sealed override void AddRecipes() public sealed override void AddRecipes()
{ {
List<ModRecipe> recipes = GetAdditionalRecipes(); List<ModRecipe> recipes = GetRecipes();
recipes.Add(GetRecipe()); recipes.Add(GetRecipe());
foreach (ModRecipe recipe in recipes) recipe?.AddRecipe(); foreach (ModRecipe recipe in recipes) recipe?.AddRecipe();
@ -51,7 +51,7 @@ namespace Decimation.Lib.Items
return null; return null;
} }
protected virtual List<ModRecipe> GetAdditionalRecipes() protected virtual List<ModRecipe> GetRecipes()
{ {
return new List<ModRecipe>(); return new List<ModRecipe>();
} }