Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Localization/TranslationsNeeded.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
en-US, 255/255, 100%, missing 0
de-DE, 28/255, 11%, missing 227
it-IT, 28/255, 11%, missing 227
fr-FR, 95/255, 37%, missing 160
es-ES, 49/255, 19%, missing 206
ru-RU, 252/255, 99%, missing 3
zh-Hans, 254/255, 100%, missing 1
pt-BR, 95/255, 37%, missing 160
pl-PL, 87/255, 34%, missing 168
en-US, 256/256, 100%, missing 0
de-DE, 28/256, 11%, missing 228
it-IT, 28/256, 11%, missing 228
fr-FR, 95/256, 37%, missing 161
es-ES, 49/256, 19%, missing 207
ru-RU, 252/256, 98%, missing 4
zh-Hans, 254/256, 99%, missing 2
pt-BR, 95/256, 37%, missing 161
pl-PL, 87/256, 34%, missing 169
1 change: 1 addition & 0 deletions Localization/de-DE.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -461,5 +461,6 @@ Mods: {
}

// ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/en-US.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -465,5 +465,6 @@ Mods: {
}

ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/es-ES.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -461,5 +461,6 @@ Mods: {
}

// ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/fr-FR.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -478,5 +478,6 @@ Mods: {
}

// ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/it-IT.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -461,5 +461,6 @@ Mods: {
}

// ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/pl-PL.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -457,5 +457,6 @@ Mods: {
}

// ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/pt-BR.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -457,5 +457,6 @@ Mods: {
}

// ItemLostInQuerySlotWarning: "You left an item in the recipe browser with a full inventory and have lost the item: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/ru-RU.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -474,5 +474,6 @@ Mods: {
}

ItemLostInQuerySlotWarning: "Вы оставили предмет в браузере рецептов, имея заполненный инвентарь, и потеряли его: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
1 change: 1 addition & 0 deletions Localization/zh-Hans.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -461,5 +461,6 @@ Mods: {
}

ItemLostInQuerySlotWarning: "因为背包中物品已经满了,所以您留在合成表中的该物品已经丢失: "
// Conditions.ShimmerTransmutation: Shimmer Transmutation
}
}
2 changes: 1 addition & 1 deletion RecipeBrowserGlobalItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public override void ModifyTooltips(Item item, List<TooltipLine> tooltips) {
if (RecipeCatalogueUI.instance.hoveredIndex < 0) return;

var selectedModRecipe = Main.recipe[RecipeCatalogueUI.instance.hoveredIndex];
if (selectedModRecipe.Mod != null && ModContent.GetInstance<RecipeBrowserClientConfig>().ShowRecipeModSource && item.type == selectedModRecipe.createItem.type)
if (selectedModRecipe.Mod != null && selectedModRecipe.Mod != Mod && ModContent.GetInstance<RecipeBrowserClientConfig>().ShowRecipeModSource && item.type == selectedModRecipe.createItem.type)
{
var line = new TooltipLine(Mod, "RecipeBrowser:RecipeOriginHint", Language.GetTextValue("Mods.RecipeBrowser.RecipeBrowserUI.RecipeAddedBy", selectedModRecipe.Mod.DisplayName))
{
Expand Down
70 changes: 69 additions & 1 deletion UISystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,75 @@ public class UISystem : ModSystem

public override void PreSaveAndQuit() => RecipeBrowser.instance.PreSaveAndQuit();

public override void PostAddRecipes()
public override void AddRecipes() {
Condition shimmerTransmutationCondition = new("Mods.RecipeBrowser.Conditions.ShimmerTransmutation", () => false);
for (int i = 0; i < ItemID.Sets.ShimmerTransformToItem.Length; i++) {
// For some reason this is set initially but gets overriden later on
// So I'll skip it
if (i == ItemID.LihzahrdBrickWall)
continue;
int shimmerTransmutation = ItemID.Sets.ShimmerTransformToItem[i];
if (shimmerTransmutation > 0) {
Recipe.Create(shimmerTransmutation)
.AddIngredient(i)
.AddCondition(shimmerTransmutationCondition)
.Register();
}
}

// Fix for vanilla hardcoded transmutations
Recipe.Create(ItemID.RodOfHarmony)
.AddIngredient(ItemID.RodofDiscord)
.AddCondition(shimmerTransmutationCondition)
.AddCondition(Condition.DownedMoonLord)
.Register();

Recipe.Create(ItemID.Clentaminator2)
.AddIngredient(ItemID.Clentaminator)
.AddCondition(shimmerTransmutationCondition)
.AddCondition(Condition.DownedMoonLord)
.Register();

Recipe.Create(ItemID.BottomlessBucket)
.AddIngredient(ItemID.BottomlessShimmerBucket)
.AddCondition(shimmerTransmutationCondition)
.AddCondition(Condition.DownedMoonLord)
.Register();

Recipe.Create(ItemID.BottomlessShimmerBucket)
.AddIngredient(ItemID.BottomlessBucket)
.AddCondition(shimmerTransmutationCondition)
.AddCondition(Condition.DownedMoonLord)
.Register();

Recipe.Create(ItemID.LihzahrdWallUnsafe)
.AddIngredient(ItemID.LihzahrdBrickWall)
.AddCondition(shimmerTransmutationCondition)
.AddCondition(Condition.DownedGolem)
.Register();

List<KeyValuePair<int, Condition>> luminiteBrickTransmutations = new() {
new KeyValuePair<int, Condition>(ItemID.HeavenforgeBrick, Condition.MoonPhaseFull),
new KeyValuePair<int, Condition>(ItemID.LunarRustBrick, Condition.MoonPhaseWaningGibbous),
new KeyValuePair<int, Condition>(ItemID.AstraBrick, Condition.MoonPhaseThirdQuarter),
new KeyValuePair<int, Condition>(ItemID.DarkCelestialBrick, Condition.MoonPhaseWaningCrescent),
new KeyValuePair<int, Condition>(ItemID.MercuryBrick, Condition.MoonPhaseNew),
new KeyValuePair<int, Condition>(ItemID.StarRoyaleBrick, Condition.MoonPhaseWaxingCrescent),
new KeyValuePair<int, Condition>(ItemID.CryocoreBrick, Condition.MoonPhaseFirstQuarter),
new KeyValuePair<int, Condition>(ItemID.CosmicEmberBrick, Condition.MoonPhaseWaxingGibbous)
};

foreach (var item in luminiteBrickTransmutations)
{
Recipe.Create(item.Key)
.AddIngredient(ItemID.LunarBrick)
.AddCondition(shimmerTransmutationCondition)
.AddCondition(item.Value)
.Register();
}
}

public override void PostAddRecipes()
{
if (!Main.dedServ) {
LootCacheManager.Setup(RecipeBrowser.instance);
Expand Down