Skip to content

Commit d6c5d1c

Browse files
435THz435THz
authored
Merge pull request #6 from 435THz/ethereal-kit-recipe
Ethereal kit recipe
2 parents c879411 + 6f95952 commit d6c5d1c

File tree

12 files changed

+99
-63
lines changed

12 files changed

+99
-63
lines changed

‎Calamity/Content/Items/SulphuricExtractorItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public override void SetDefaults()
3030
public override void AddRecipes()
3131
{
3232
CreateRecipe()
33-
.AddRecipeGroup(ModContent.GetInstance<Recipes>().demonicExtractorGroupName)
33+
.AddRecipeGroup(Recipes.demonicExtractorGroupName)
3434
.AddIngredient(ModContent.ItemType<SulphuricUpgradeKit>())
3535
.Register();
3636
}

‎Common/Database/BiomeExtractionSystem.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,6 +1441,7 @@ private void SetupDesert()
14411441
AddItemInPool(desert, ItemID.YellowDragonfly, 4);
14421442
AddItemInPool(desert, ItemID.BlackDragonfly, 4);
14431443
AddItemInPool(desert, ItemID.OrangeDragonfly, 4);
1444+
AddItemInPool(desert, ItemID.Oyster, 2);
14441445
AliasItemPool(desert_remix, desert);
14451446

14461447
AddItemInPool(ug_desert, ItemID.None, 20);

‎Common/Recipes.cs‎

Lines changed: 4 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,73 +9,15 @@ namespace BiomeExtractorsMod.Common.Database
99
{
1010
public class Recipes : ModSystem
1111
{
12-
public readonly string goldBarGroupName = nameof(ItemID.GoldBar);
13-
public readonly string basicExtractorGroupName = $"{nameof(BiomeExtractorsMod)}:{nameof(BiomeExtractorItemIron)}";
14-
public readonly string demonicExtractorGroupName = $"{nameof(BiomeExtractorsMod)}:{nameof(BiomeExtractorItemCorruption)}";
15-
public readonly string steampunkExtractorGroupName = $"{nameof(BiomeExtractorsMod)}:{nameof(BiomeExtractorItemAdamantite)}";
12+
public static readonly string goldBarGroupName = nameof(ItemID.GoldBar);
13+
public static readonly string basicExtractorGroupName = $"{nameof(BiomeExtractorsMod)}:{nameof(BiomeExtractorItemIron)}";
14+
public static readonly string demonicExtractorGroupName = $"{nameof(BiomeExtractorsMod)}:{nameof(BiomeExtractorItemCorruption)}";
15+
public static readonly string steampunkExtractorGroupName = $"{nameof(BiomeExtractorsMod)}:{nameof(BiomeExtractorItemAdamantite)}";
1616

1717
public override void AddRecipeGroups()
1818
{
1919
RecipeGroup goldBar = new(() => $"{Language.GetTextValue("LegacyMisc.37")} {Lang.GetItemNameValue(ItemID.GoldBar)}", ItemID.GoldBar, ItemID.PlatinumBar);
2020
RecipeGroup.RegisterGroup(goldBarGroupName, goldBar);
2121
}
22-
23-
24-
public override void AddRecipes()
25-
{
26-
Recipe.Create(ModContent.ItemType<BiomeScanner>())
27-
.AddIngredient(ItemID.Lens, 2)
28-
.AddIngredient(ItemID.Wire, 5)
29-
.AddRecipeGroup(goldBarGroupName, 2)
30-
.AddTile(TileID.TinkerersWorkbench)
31-
.Register();
32-
33-
34-
Recipe.Create(ModContent.ItemType<UpgradeKitCorruption>())
35-
.AddIngredient(ItemID.DemoniteBar, 5)
36-
.AddIngredient(ItemID.VilePowder, 12)
37-
.AddTile(TileID.TinkerersWorkbench)
38-
.Register();
39-
40-
Recipe.Create(ModContent.ItemType<UpgradeKitCrimson>())
41-
.AddIngredient(ItemID.CrimtaneBar, 5)
42-
.AddIngredient(ItemID.ViciousPowder, 12)
43-
.AddTile(TileID.TinkerersWorkbench)
44-
.Register();
45-
46-
Recipe.Create(ModContent.ItemType<UpgradeKitInfernal>())
47-
.AddIngredient(ItemID.HellstoneBar, 5)
48-
.AddIngredient(ItemID.Meteorite, 12)
49-
.AddTile(TileID.TinkerersWorkbench)
50-
.Register();
51-
52-
Recipe.Create(ModContent.ItemType<UpgradeKitAdamantite>())
53-
.AddIngredient(ItemID.AdamantiteBar, 5)
54-
.AddIngredient(ItemID.Cog, 12)
55-
.AddTile(TileID.MythrilAnvil) //covers both
56-
.Register();
57-
58-
Recipe.Create(ModContent.ItemType<UpgradeKitTitanium>())
59-
.AddIngredient(ItemID.TitaniumBar, 5)
60-
.AddIngredient(ItemID.Cog, 12)
61-
.AddTile(TileID.MythrilAnvil) //covers both
62-
.Register();
63-
64-
Recipe.Create(ModContent.ItemType<UpgradeKitCyber>())
65-
.AddIngredient(ItemID.ChlorophyteBar, 5)
66-
.AddIngredient(ItemID.Nanites, 12)
67-
.AddTile(TileID.MythrilAnvil)
68-
.Register();
69-
70-
Recipe.Create(ModContent.ItemType<UpgradeKitLunar>())
71-
.AddIngredient(ItemID.FragmentNebula, 8)
72-
.AddIngredient(ItemID.FragmentSolar, 8)
73-
.AddIngredient(ItemID.FragmentStardust, 8)
74-
.AddIngredient(ItemID.FragmentVortex, 8)
75-
.AddTile(TileID.LunarCraftingStation)
76-
.AddCustomShimmerResult(ModContent.ItemType<UpgradeKitEthereal>())
77-
.AddDecraftCondition(Condition.DownedMoonLord)
78-
.Register();
79-
}
8022
}
8123
}

‎Content/Items/BiomeScanner.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ public override void ModifyTooltips(List<TooltipLine> lines)
115115
}
116116
}
117117

118+
public override void AddRecipes()
119+
{
120+
CreateRecipe()
121+
.AddIngredient(ItemID.Lens, 2)
122+
.AddIngredient(ItemID.Wire, 5)
123+
.AddRecipeGroup(Recipes.goldBarGroupName, 2)
124+
.AddTile(TileID.TinkerersWorkbench)
125+
.Register();
126+
}
127+
118128
public override void SaveData(TagCompound tag)
119129
{
120130
tag["current"] = currentTier;

‎Content/Items/UpgradeKitAdamantite.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using BiomeExtractorsMod.Content.Tiles;
33
using Terraria;
44
using Terraria.Enums;
5+
using Terraria.ID;
56
using Terraria.ModLoader;
67

78
namespace BiomeExtractorsMod.Content.Items
@@ -15,5 +16,14 @@ public override void SetDefaults()
1516
base.SetDefaults();
1617
Item.SetShopValues(ItemRarityColor.Pink5, Item.buyPrice(gold: 5)); // sell at 1
1718
}
19+
20+
public override void AddRecipes()
21+
{
22+
CreateRecipe()
23+
.AddIngredient(ItemID.AdamantiteBar, 5)
24+
.AddIngredient(ItemID.Cog, 12)
25+
.AddTile(TileID.MythrilAnvil) //covers both
26+
.Register();
27+
}
1828
}
1929
}

‎Content/Items/UpgradeKitCorruption.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using BiomeExtractorsMod.Content.Tiles;
33
using Terraria;
44
using Terraria.Enums;
5+
using Terraria.ID;
56
using Terraria.ModLoader;
67

78
namespace BiomeExtractorsMod.Content.Items
@@ -16,5 +17,14 @@ public override void SetDefaults()
1617
base.SetDefaults();
1718
Item.SetShopValues(ItemRarityColor.Green2, Item.buyPrice(gold: 5)); // sell at 1
1819
}
20+
21+
public override void AddRecipes()
22+
{
23+
CreateRecipe()
24+
.AddIngredient(ItemID.DemoniteBar, 5)
25+
.AddIngredient(ItemID.VilePowder, 12)
26+
.AddTile(TileID.TinkerersWorkbench)
27+
.Register();
28+
}
1929
}
2030
}

‎Content/Items/UpgradeKitCrimson.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using BiomeExtractorsMod.Content.Tiles;
33
using Terraria;
44
using Terraria.Enums;
5+
using Terraria.ID;
56
using Terraria.ModLoader;
67

78
namespace BiomeExtractorsMod.Content.Items
@@ -16,5 +17,14 @@ public override void SetDefaults()
1617
base.SetDefaults();
1718
Item.SetShopValues(ItemRarityColor.Green2, Item.buyPrice(gold: 5)); // sell at 1
1819
}
20+
21+
public override void AddRecipes()
22+
{
23+
CreateRecipe()
24+
.AddIngredient(ItemID.CrimtaneBar, 5)
25+
.AddIngredient(ItemID.ViciousPowder, 12)
26+
.AddTile(TileID.TinkerersWorkbench)
27+
.Register();
28+
}
1929
}
2030
}

‎Content/Items/UpgradeKitCyber.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using BiomeExtractorsMod.Content.Tiles;
33
using Terraria;
44
using Terraria.Enums;
5+
using Terraria.ID;
56
using Terraria.ModLoader;
67

78
namespace BiomeExtractorsMod.Content.Items
@@ -17,5 +18,14 @@ public override void SetDefaults()
1718
Item.height = 18;
1819
Item.SetShopValues(ItemRarityColor.Lime7, Item.buyPrice(gold: 5)); // sell at 1
1920
}
21+
22+
public override void AddRecipes()
23+
{
24+
CreateRecipe()
25+
.AddIngredient(ItemID.ChlorophyteBar, 5)
26+
.AddIngredient(ItemID.Nanites, 12)
27+
.AddTile(TileID.MythrilAnvil)
28+
.Register();
29+
}
2030
}
2131
}

‎Content/Items/UpgradeKitEthereal.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using BiomeExtractorsMod.Content.Tiles;
33
using Terraria;
44
using Terraria.Enums;
5+
using Terraria.ID;
56
using Terraria.ModLoader;
67

78
namespace BiomeExtractorsMod.Content.Items
@@ -17,5 +18,15 @@ public override void SetDefaults()
1718
Item.height = 20;
1819
Item.SetShopValues(ItemRarityColor.Purple11, Item.buyPrice(gold: 10)); // sell at 2
1920
}
21+
22+
public override void AddRecipes()
23+
{
24+
CreateRecipe()
25+
.AddIngredient(ItemID.LunarBar, 5)
26+
.AddIngredient(ItemID.CrystalShard, 24)
27+
.AddIngredient(ItemID.GalaxyPearl)
28+
.AddTile(TileID.LunarCraftingStation)
29+
.Register();
30+
}
2031
}
2132
}

‎Content/Items/UpgradeKitInfernal.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using BiomeExtractorsMod.Content.Tiles;
33
using Terraria;
44
using Terraria.Enums;
5+
using Terraria.ID;
56
using Terraria.ModLoader;
67

78
namespace BiomeExtractorsMod.Content.Items
@@ -15,5 +16,14 @@ public override void SetDefaults()
1516
base.SetDefaults();
1617
Item.SetShopValues(ItemRarityColor.Orange3, Item.buyPrice(gold: 5)); // sell at 1
1718
}
19+
20+
public override void AddRecipes()
21+
{
22+
CreateRecipe()
23+
.AddIngredient(ItemID.HellstoneBar, 5)
24+
.AddIngredient(ItemID.Meteorite, 12)
25+
.AddTile(TileID.TinkerersWorkbench)
26+
.Register();
27+
}
1828
}
1929
}

0 commit comments

Comments
 (0)