From 89c94d0f86310a8f8678ecb67dd0ac91acb773bc Mon Sep 17 00:00:00 2001 From: DannyRuss <33048298+RussDev7@users.noreply.github.com> Date: Sun, 25 Jun 2023 15:58:38 -0500 Subject: [PATCH] Fixed issues with the new math. --- src/CoreKeeperInventoryEditor/MainForm.cs | 8 ++++---- src/CoreKeeperInventoryEditor/VariationHelper.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CoreKeeperInventoryEditor/MainForm.cs b/src/CoreKeeperInventoryEditor/MainForm.cs index 0c07de8c..39ab45e1 100644 --- a/src/CoreKeeperInventoryEditor/MainForm.cs +++ b/src/CoreKeeperInventoryEditor/MainForm.cs @@ -153,12 +153,12 @@ private void MainForm_Load(object sender, EventArgs e) @"// Here we give thanks to those who have helped the project grow!" + Environment.NewLine, @"// This project would never have grown if not for the following:" + Environment.NewLine + Environment.NewLine, - @"1) ultimaton2 - Most helpful debugger in the projects lifetime." + Environment.NewLine, - @"2) ZeroGravitas - Helped get food tested!" + Environment.NewLine, - @"3) Roupiks - Created assets for all the tabs!" + Environment.NewLine + Environment.NewLine, + @"1) Ultimaton2 - Most helpful debugger in the projects lifetime." + Environment.NewLine, + @"2) Pharuxtan - Helped get the new variaton system working." + Environment.NewLine, + @"3) Roupiks - Created assets for all the tabs!" + Environment.NewLine + Environment.NewLine, @"Honorable Mentions:" + Environment.NewLine, - @"BourbonCrow, puxxy5layer, Flux, pharuxtan, Iskrownik, Yumiko Abe, Ice, Kremnev8, pharuxtan", + @"BourbonCrow, puxxy5layer, Flux, ZeroGravitas, kremnev8, Iskrownik, Ice, Yumiko Abe, TheBgNaz, Arne, Bosh, Smuke.", }); #endregion diff --git a/src/CoreKeeperInventoryEditor/VariationHelper.cs b/src/CoreKeeperInventoryEditor/VariationHelper.cs index 445f0399..1ad788b3 100644 --- a/src/CoreKeeperInventoryEditor/VariationHelper.cs +++ b/src/CoreKeeperInventoryEditor/VariationHelper.cs @@ -76,9 +76,9 @@ public static bool IngredientShouldBePrimary(int ingredient) public static bool IngredientIsGoldenPlant(int ingredient) { - if (ingredient >= 8109) // GoldenGrumpkin. + if (ingredient >= 8100 && ingredient <= 8149) // GoldenHeartBerry. { - return ingredient <= 8150; + return true; } return false;