From ad931f3848adc50c753084dd73b96f99423ec92c Mon Sep 17 00:00:00 2001 From: Niko Date: Mon, 10 Nov 2025 13:10:33 +0000 Subject: [PATCH] Refactor Book of Unholy, add Singularity Sealing Unit --- .../Items/Materials/ControlledSingularity.cs | 1 + Content/Items/Materials/EnergyCore.cs | 21 +++++++++ .../EnergyCore.png} | Bin .../Items/Tiles/SingularitySealingUnitItem.cs | 28 ++++++++++++ .../Tiles/SingularitySealingUnitItem.png | Bin 0 -> 504 bytes .../{BookOfUnholy.cs => TomeOfUnyielding.cs} | 2 +- .../Items/Weapons/Magic/TomeOfUnyielding.png | Bin 0 -> 504 bytes .../SingularitySealingUnit.cs | 43 ++++++++++++++++++ .../SingularitySealingUnit.png | Bin 0 -> 504 bytes .../en-US_Mods.ForgottenWawiTech.hjson | 14 +++++- 10 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 Content/Items/Materials/EnergyCore.cs rename Content/Items/{Weapons/Magic/BookOfUnholy.png => Materials/EnergyCore.png} (100%) create mode 100644 Content/Items/Tiles/SingularitySealingUnitItem.cs create mode 100644 Content/Items/Tiles/SingularitySealingUnitItem.png rename Content/Items/Weapons/Magic/{BookOfUnholy.cs => TomeOfUnyielding.cs} (98%) create mode 100644 Content/Items/Weapons/Magic/TomeOfUnyielding.png create mode 100644 Content/Tiles/CraftingStations/SingularitySealingUnit.cs create mode 100644 Content/Tiles/CraftingStations/SingularitySealingUnit.png diff --git a/Content/Items/Materials/ControlledSingularity.cs b/Content/Items/Materials/ControlledSingularity.cs index 5bba89a..d2aef45 100644 --- a/Content/Items/Materials/ControlledSingularity.cs +++ b/Content/Items/Materials/ControlledSingularity.cs @@ -22,6 +22,7 @@ namespace ForgottenWawiTech.Content.Items.Materials Recipe recipe = CreateRecipe(); recipe.AddIngredient(ModContent.ItemType(), 5); recipe.AddIngredient(ModContent.ItemType(), 1); + recipe.AddIngredient(ModContent.ItemType(), 2); recipe.AddTile(TileID.MythrilAnvil); recipe.Register(); } diff --git a/Content/Items/Materials/EnergyCore.cs b/Content/Items/Materials/EnergyCore.cs new file mode 100644 index 0000000..398c358 --- /dev/null +++ b/Content/Items/Materials/EnergyCore.cs @@ -0,0 +1,21 @@ +using Terraria.ID; +using Terraria; +using Terraria.ModLoader; +using ForgottenWawiTech.Content.Rarities; + +namespace ForgottenWawiTech.Content.Items.Materials +{ + public class EnergyCore : ModItem + { + + public override void SetDefaults() + { + Item.width = 20; + Item.height = 20; + Item.maxStack = 9999; + Item.rare = ModContent.RarityType(); + Item.value = Item.buyPrice(gold: 50); + } + + } +} \ No newline at end of file diff --git a/Content/Items/Weapons/Magic/BookOfUnholy.png b/Content/Items/Materials/EnergyCore.png similarity index 100% rename from Content/Items/Weapons/Magic/BookOfUnholy.png rename to Content/Items/Materials/EnergyCore.png diff --git a/Content/Items/Tiles/SingularitySealingUnitItem.cs b/Content/Items/Tiles/SingularitySealingUnitItem.cs new file mode 100644 index 0000000..ff80073 --- /dev/null +++ b/Content/Items/Tiles/SingularitySealingUnitItem.cs @@ -0,0 +1,28 @@ +using Terraria; +using Terraria.ModLoader; +using Terraria.ID; +using ForgottenWawiTech.Content.Tiles.CraftingStations; + +namespace ForgottenWawiTech.Content.Items.Tiles +{ + public class SingularitySealingUnitItem : ModItem + { + + public override void SetDefaults() + { + Item.DefaultToPlaceableTile(ModContent.TileType(), 0); + } + + public override void AddRecipes() + { + CreateRecipe() + .AddIngredient(100) + .AddIngredient(20) + .AddIngredient(20) + .AddIngredient(10) + .AddIngredient(ItemID.CoffeeCup, 1) + .AddTile(TileID.Anvils) + .Register(); + } + } +} \ No newline at end of file diff --git a/Content/Items/Tiles/SingularitySealingUnitItem.png b/Content/Items/Tiles/SingularitySealingUnitItem.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0cf81e52f4133dbe85453dd9a37993af17b5be GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBbOU@sT!FNbf{DF-NtsjE_3B;! z|NjSy0D+K@p01v+t9x8zR#D@WS?dlQ`1+YJESG!@x4dC7*`C93=UXkhhvvt!hjSLlJ~RwmnP~Bh_e#*cGOJz5H)U2RZk=*d{>S{o z|7E^K_FWXNcxrjXh&wV*Hfp0Ti%!ljhM&t`NT+&77>M@wN(xASbQfH=B6&8`PK|k& o(pT;d?|57xzrgJ7^Ax@sCjQeEzP*#>W`d&2)78&qol`;+07t#pIRF3v literal 0 HcmV?d00001 diff --git a/Content/Items/Weapons/Magic/BookOfUnholy.cs b/Content/Items/Weapons/Magic/TomeOfUnyielding.cs similarity index 98% rename from Content/Items/Weapons/Magic/BookOfUnholy.cs rename to Content/Items/Weapons/Magic/TomeOfUnyielding.cs index 3495b97..a1b9b53 100644 --- a/Content/Items/Weapons/Magic/BookOfUnholy.cs +++ b/Content/Items/Weapons/Magic/TomeOfUnyielding.cs @@ -7,7 +7,7 @@ using Terraria.ModLoader; namespace ForgottenWawiTech.Content.Items.Weapons.Magic { - public class BookOfUnholy: ModItem + public class TomeOfUnyielding : ModItem { public override void SetDefaults() { diff --git a/Content/Items/Weapons/Magic/TomeOfUnyielding.png b/Content/Items/Weapons/Magic/TomeOfUnyielding.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0cf81e52f4133dbe85453dd9a37993af17b5be GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBbOU@sT!FNbf{DF-NtsjE_3B;! z|NjSy0D+K@p01v+t9x8zR#D@WS?dlQ`1+YJESG!@x4dC7*`C93=UXkhhvvt!hjSLlJ~RwmnP~Bh_e#*cGOJz5H)U2RZk=*d{>S{o z|7E^K_FWXNcxrjXh&wV*Hfp0Ti%!ljhM&t`NT+&77>M@wN(xASbQfH=B6&8`PK|k& o(pT;d?|57xzrgJ7^Ax@sCjQeEzP*#>W`d&2)78&qol`;+07t#pIRF3v literal 0 HcmV?d00001 diff --git a/Content/Tiles/CraftingStations/SingularitySealingUnit.cs b/Content/Tiles/CraftingStations/SingularitySealingUnit.cs new file mode 100644 index 0000000..62cdf68 --- /dev/null +++ b/Content/Tiles/CraftingStations/SingularitySealingUnit.cs @@ -0,0 +1,43 @@ +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 SingularitySealingUnit : ModTile + { + public override void SetStaticDefaults() + { + Main.tileSolid[Type] = false; + Main.tileNoAttach[Type] = true; + AdjTiles = new int[] { + TileID.WorkBenches, + TileID.Anvils, + TileID.Furnaces, + TileID.Sawmill, + TileID.Loom, + TileID.HeavyWorkBench, + TileID.AlchemyTable, + TileID.MythrilAnvil, + TileID.AdamantiteForge, + TileID.Autohammer, + TileID.CrystalBall, + TileID.TinkerersWorkbench + }; + AddMapEntry(new Color(150, 50, 250), Language.GetText("SingularitySealingUnitItem")); + //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/SingularitySealingUnit.png b/Content/Tiles/CraftingStations/SingularitySealingUnit.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0cf81e52f4133dbe85453dd9a37993af17b5be GIT binary patch literal 504 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r53?z4+XPOVBbOU@sT!FNbf{DF-NtsjE_3B;! z|NjSy0D+K@p01v+t9x8zR#D@WS?dlQ`1+YJESG!@x4dC7*`C93=UXkhhvvt!hjSLlJ~RwmnP~Bh_e#*cGOJz5H)U2RZk=*d{>S{o z|7E^K_FWXNcxrjXh&wV*Hfp0Ti%!ljhM&t`NT+&77>M@wN(xASbQfH=B6&8`PK|k& o(pT;d?|57xzrgJ7^Ax@sCjQeEzP*#>W`d&2)78&qol`;+07t#pIRF3v literal 0 HcmV?d00001 diff --git a/Localization/en-US_Mods.ForgottenWawiTech.hjson b/Localization/en-US_Mods.ForgottenWawiTech.hjson index 3fbe25e..dc35b67 100644 --- a/Localization/en-US_Mods.ForgottenWawiTech.hjson +++ b/Localization/en-US_Mods.ForgottenWawiTech.hjson @@ -75,8 +75,8 @@ Items: { Tooltip: A high-tech crafting station. } - BookOfUnholy: { - DisplayName: Book Of Unholy + TomeOfUnyielding: { + DisplayName: Singularity-Infused Tome Of Unyielding Tooltip: ''' A tome radiating with the power of the void. @@ -183,6 +183,16 @@ Items: { Tooltip: "" DisplayName: Containment Unit } + + SingularitySealingUnitItem: { + Tooltip: "" + DisplayName: Singularity Sealing Unit Item + } + + EnergyCore: { + Tooltip: "" + DisplayName: Energy Core + } } NPCs: {