diff --git a/Content/Items/Accessories/AvaliScoutPack.cs b/Content/Items/Accessories/AvaliScoutPack.cs index 5c88bd3..85a105b 100644 --- a/Content/Items/Accessories/AvaliScoutPack.cs +++ b/Content/Items/Accessories/AvaliScoutPack.cs @@ -1,6 +1,8 @@ using Terraria; using Terraria.ModLoader; +using Terraria.ID; using ForgottenWawiTech.Content.Rarities; +using ForgottenWawiTech.Content.Items.Materials; namespace ForgottenWawiTech.Content.Items.Accessories { @@ -21,5 +23,13 @@ namespace ForgottenWawiTech.Content.Items.Accessories player.GetDamage(DamageClass.Generic) -= 0.10f; player.moveSpeed += 0.15f; } + + public override void AddRecipes() + { + CreateRecipe() + .AddIngredient(ModContent.ItemType(), 3) + .AddIngredient(ItemID.Silk, 20) + .Register(); + } } } \ No newline at end of file diff --git a/Content/Items/Materials/AvaliFeather.cs b/Content/Items/Materials/AvaliFeather.cs index 575932a..ae1f178 100644 --- a/Content/Items/Materials/AvaliFeather.cs +++ b/Content/Items/Materials/AvaliFeather.cs @@ -14,7 +14,20 @@ namespace ForgottenWawiTech.Content.Items.Materials Item.height = 20; Item.maxStack = 9999; Item.rare = ModContent.RarityType(); - Item.value = Item.buyPrice(gold: 50); + Item.value = Item.buyPrice(silver: 5); + } + + public override void OnStack(Item source, int numTransfered) + { + // Reuse the logic for marking RGBass as obtained when picked up + ForgottenWawiTechSystem.hasObtainedRGBass = true; + } + + public override bool OnPickup(Player player) + { + // Reuse the logic for marking RGBass as obtained when picked up + ForgottenWawiTechSystem.hasObtainedRGBass = true; + return true; } } diff --git a/Content/Items/Materials/RGBass.cs b/Content/Items/Materials/RGBass.cs index c7de6dc..9e19479 100644 --- a/Content/Items/Materials/RGBass.cs +++ b/Content/Items/Materials/RGBass.cs @@ -17,19 +17,6 @@ namespace ForgottenWawiTech.Content.Items.Materials Item.rare = ItemRarityID.Expert; // temp rarity until custom rarity is added Item.value = Item.buyPrice(gold: 10); } - - public override void OnStack(Item source, int numTransfered) - { - // Mark that RGBass has been obtained in this world - ForgottenWawiTechSystem.hasObtainedRGBass = true; - } - - public override bool OnPickup(Player player) - { - // Mark that RGBass has been obtained in this world - ForgottenWawiTechSystem.hasObtainedRGBass = true; - return true; - } } public class RGBassFishingPlayer : ModPlayer { diff --git a/Content/NPCs/TownNPCs/AvalianTrader.cs b/Content/NPCs/TownNPCs/AvalianTrader.cs index d6795b6..27fd53f 100644 --- a/Content/NPCs/TownNPCs/AvalianTrader.cs +++ b/Content/NPCs/TownNPCs/AvalianTrader.cs @@ -93,9 +93,9 @@ namespace ForgottenWawiTech.Content.NPCs.TownNPCs public override void AddShops() { new NPCShop(Type) - .Add() - .Add() - .Add(ItemID.RainbowBrick) // TODO: Force Rainbow Brick to not have No Value. + .Add(Condition.DownedMoonLord) + .Add(Condition.Hardmode) + .Add(ItemID.RainbowBrick, Condition.Hardmode) // TODO: Force Rainbow Brick to not have No Value. .Add() .Register(); } diff --git a/Localization/en-US_Mods.ForgottenWawiTech.hjson b/Localization/en-US_Mods.ForgottenWawiTech.hjson index 616ca8f..f71c9d3 100644 --- a/Localization/en-US_Mods.ForgottenWawiTech.hjson +++ b/Localization/en-US_Mods.ForgottenWawiTech.hjson @@ -252,6 +252,11 @@ Items: { ''' DisplayName: Essence Of Clutches } + + AvaliScoutPack: { + DisplayName: Avali Scout Pack + Tooltip: "" + } } NPCs: {