diff --git a/Content/Items/Materials/RGBass.cs b/Content/Items/Materials/RGBass.cs new file mode 100644 index 0000000..9c87f49 --- /dev/null +++ b/Content/Items/Materials/RGBass.cs @@ -0,0 +1,17 @@ +using Terraria.ID; +using Terraria.ModLoader; + +namespace ForgottenWawiTech.Content.Items.Materials +{ + public class RGBass : ModItem + { + + public override void SetDefaults() + { + Item.width = 20; + Item.height = 20; + Item.maxStack = 9999; + Item.rare = ItemRarityID.White; + } + } +} \ No newline at end of file diff --git a/Content/Items/Materials/RGBass.png b/Content/Items/Materials/RGBass.png new file mode 100644 index 0000000..9e0cf81 Binary files /dev/null and b/Content/Items/Materials/RGBass.png differ diff --git a/Content/Items/SummonItems/LexySummon.cs b/Content/Items/SummonItems/LexySummon.cs index 0a38a8d..cf50c9c 100644 --- a/Content/Items/SummonItems/LexySummon.cs +++ b/Content/Items/SummonItems/LexySummon.cs @@ -47,11 +47,12 @@ namespace ForgottenWawiTech.Content.Items.SummonItems if (ModLoader.TryGetMod("CalamityMod", out Mod calamityMod)) { Recipe recipe = CreateRecipe(); + recipe.AddIngredient(30); recipe.AddIngredient(ItemID.RainbowBrick, 100); // Exo Prism recipe.AddIngredient(calamityMod.Find("ExoPrism").Type, 5); recipe.AddIngredient(calamityMod.Find("MysteriousCircuitry").Type, 10); - recipe.AddTile(TileID.LunarCraftingStation); + recipe.AddTile(); recipe.Register(); } } diff --git a/Content/Items/SummonItems/LyykaSummon.cs b/Content/Items/SummonItems/LyykaSummon.cs index 850746b..99b832a 100644 --- a/Content/Items/SummonItems/LyykaSummon.cs +++ b/Content/Items/SummonItems/LyykaSummon.cs @@ -40,5 +40,15 @@ namespace ForgottenWawiTech.Content.Items.SummonItems return true; } + + public override void AddRecipes() + { + Recipe recipe = CreateRecipe(); + recipe.AddIngredient(30); + recipe.AddIngredient(ItemID.FallenStar, 50); + recipe.AddIngredient(ItemID.SparkleGuitar, 1); + recipe.AddTile(); + recipe.Register(); + } } } \ No newline at end of file diff --git a/Content/Items/SummonItems/NikoSummon.cs b/Content/Items/SummonItems/NikoSummon.cs index fb13a6e..9440f6f 100644 --- a/Content/Items/SummonItems/NikoSummon.cs +++ b/Content/Items/SummonItems/NikoSummon.cs @@ -36,7 +36,6 @@ namespace ForgottenWawiTech.Content.Items.SummonItems if (Main.netMode != NetmodeID.MultiplayerClient) { NPC.SpawnOnPlayer(player.whoAmI, ModContent.NPCType()); - Main.NewText(summonText, 175, 75, 255); } return true; @@ -44,10 +43,11 @@ namespace ForgottenWawiTech.Content.Items.SummonItems public override void AddRecipes() { Recipe recipe = CreateRecipe(); + recipe.AddIngredient(30); recipe.AddIngredient(ItemID.RatCage, 1); recipe.AddIngredient(ItemID.Feather, 100); recipe.AddIngredient(ItemID.HoneyBucket, 1); - recipe.AddTile(TileID.LunarCraftingStation); + recipe.AddTile(); recipe.Register(); } } diff --git a/Content/Items/Tiles/HighTechMarvelItem.cs b/Content/Items/Tiles/HighTechMarvelItem.cs new file mode 100644 index 0000000..446ab93 --- /dev/null +++ b/Content/Items/Tiles/HighTechMarvelItem.cs @@ -0,0 +1,14 @@ +using Terraria; +using Terraria.ModLoader; +using ForgottenWawiTech.Content.Tiles.CraftingStations; + +namespace ForgottenWawiTech.Content.Items.Tiles +{ + public class HighTechMarvelItem : ModItem + { + public override void SetDefaults() + { + Item.DefaultToPlaceableTile(ModContent.TileType(), 0); + } + } +} \ No newline at end of file diff --git a/Content/Items/Tiles/HighTechMarvelItem.png b/Content/Items/Tiles/HighTechMarvelItem.png new file mode 100644 index 0000000..9e0cf81 Binary files /dev/null and b/Content/Items/Tiles/HighTechMarvelItem.png differ diff --git a/Content/Tiles/CraftingStations/HighTechMarvel.cs b/Content/Tiles/CraftingStations/HighTechMarvel.cs new file mode 100644 index 0000000..9fc3f81 --- /dev/null +++ b/Content/Tiles/CraftingStations/HighTechMarvel.cs @@ -0,0 +1,29 @@ +using Terraria; +using Terraria.ModLoader; +using Terraria.ID; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Terraria.Localization; + +namespace ForgottenWawiTech.Content.Tiles.CraftingStations +{ + public class HighTechMarvel : ModTile + { + public override void SetStaticDefaults() + { + Main.tileSolid[Type] = false; + Main.tileNoAttach[Type] = true; + AddMapEntry(new Color(150, 50, 250), Language.GetText("HighTechMarvelItem.DisplayName")); + //TileObjectData.newTile.CopyFrom(TileObjectData.Style3x2); + } + + + public override void NearbyEffects(int i, int j, bool closer) + { + if (closer) + { + Main.LocalPlayer.AddBuff(BuffID.WellFed, 60); + } + } + } +} \ No newline at end of file diff --git a/Content/Tiles/CraftingStations/HighTechMarvel.png b/Content/Tiles/CraftingStations/HighTechMarvel.png new file mode 100644 index 0000000..9e0cf81 Binary files /dev/null and b/Content/Tiles/CraftingStations/HighTechMarvel.png differ diff --git a/Localization/en-US_Mods.ForgottenWawiTech.hjson b/Localization/en-US_Mods.ForgottenWawiTech.hjson index 543aab8..ec9ed5a 100644 --- a/Localization/en-US_Mods.ForgottenWawiTech.hjson +++ b/Localization/en-US_Mods.ForgottenWawiTech.hjson @@ -69,6 +69,16 @@ Items: { Not edible.... I think. ''' } + + RGBass: { + DisplayName: RG-Bass + Tooltip: A gamer fish. It radiates with caffeine. + } + + HighTechMarvelItem: { + DisplayName: High Tech Marvel + Tooltip: A high-tech crafting station. + } } NPCs: {