diff --git a/Content/Items/Weapons/DuneWyrm/Sundial.cs b/Content/Items/Weapons/DuneWyrm/Sundial.cs index 75757b2..196861a 100644 --- a/Content/Items/Weapons/DuneWyrm/Sundial.cs +++ b/Content/Items/Weapons/DuneWyrm/Sundial.cs @@ -3,6 +3,7 @@ using Decimation.Content.Items.Misc.Souls; using Decimation.Lib.Items; using Decimation.Lib.Util; using Decimation.Lib.Util.Builder; +using Terraria; using Terraria.ID; using Terraria.ModLoader; @@ -27,6 +28,7 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm item.useAnimation = 24; item.crit = 15; item.rare = Rarity.LightRed.GetRarityValue(); + item.value = Item.buyPrice(gold: 1, silver: 50); } protected override List GetRecipes() diff --git a/Content/Items/Weapons/DuneWyrm/Timekeeper.cs b/Content/Items/Weapons/DuneWyrm/Timekeeper.cs index b8220d7..7bb6fac 100644 --- a/Content/Items/Weapons/DuneWyrm/Timekeeper.cs +++ b/Content/Items/Weapons/DuneWyrm/Timekeeper.cs @@ -1,4 +1,8 @@ +using System.Collections.Generic; +using Decimation.Content.Items.Misc.Souls; using Decimation.Lib.Items; +using Decimation.Lib.Util; +using Decimation.Lib.Util.Builder; using Microsoft.Xna.Framework; using Terraria; using Terraria.ID; @@ -23,6 +27,27 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm item.useAnimation = 10; item.crit = 6; item.shootSpeed = 10f; + item.rare = Rarity.LightRed.GetRarityValue(); + item.value = Item.buyPrice(gold: 2, silver: 10); + } + + protected override List GetRecipes() + { + return new List + { + new RecipeBuilder(this) + .WithIngredient(ItemID.AncientBattleArmorMaterial) + .WithIngredient(ModContent.ItemType(), 10) + .WithIngredient(ItemID.Musket) + .WithStation(TileID.MythrilAnvil) + .Build(), + new RecipeBuilder(this) + .WithIngredient(ItemID.AncientBattleArmorMaterial) + .WithIngredient(ModContent.ItemType(), 10) + .WithIngredient(ItemID.TheUndertaker) + .WithStation(TileID.MythrilAnvil) + .Build() + }; } public override bool ConsumeAmmo(Player player) @@ -30,7 +55,8 @@ namespace Decimation.Content.Items.Weapons.DuneWyrm return !Main.rand.NextBool(10); } - public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, ref int type, ref int damage, + public override bool Shoot(Player player, ref Vector2 position, ref float speedX, ref float speedY, + ref int type, ref int damage, ref float knockBack) { type = ProjectileId;