diff --git a/Buffs/SummonerAmbitionBuff.png b/Buffs/SummonerAmbitionBuff.png index 3677bec..dbcdc21 100644 Binary files a/Buffs/SummonerAmbitionBuff.png and b/Buffs/SummonerAmbitionBuff.png differ diff --git a/Items/SummonersAmbition.cs b/Items/SummonersAmbition.cs index 8dc528e..54f821e 100644 --- a/Items/SummonersAmbition.cs +++ b/Items/SummonersAmbition.cs @@ -32,6 +32,7 @@ public class SummonersAmbition : ModItem { public override void ModifyTooltips(List tooltips) { YhtPlayer player = Main.LocalPlayer.GetModPlayer(); + tooltips.Add(new TooltipLine(Mod, "SummonerAmbition", Language.GetTextValue("Mods.YHTMod.Items.SummonersAmbition.Tooltip", player.GetSummonersAmbitionMinionBonus()))); @@ -99,16 +100,22 @@ public class SummonersAmbition : ModItem { Language.GetTextValue("Mods.YHTMod.Items.SummonersAmbition.Skeletron"))); } - if (player.SummonerAmbitions.Contains("wall_of_flesh")) { - tooltips.Add(new TooltipLine(Mod, "SummonerAmbitionWallOfFlesh", - Language.GetTextValue("Mods.YHTMod.Items.SummonersAmbition.WallOfFlesh"))); - } - if (ModLoader.HasMod("CalamityMod") && player.SummonerAmbitions.Contains("slime_god")) { int id = ModContent.ItemType(); tooltips.Add(new TooltipLine(Mod, "SummonerAmbitionSlimeGod", Language.GetTextValue("Mods.YHTMod.Items.SummonersAmbition.SlimeGod", "[i:" + id + "]"))); } + + if (player.SummonerAmbitions.Contains("wall_of_flesh")) { + tooltips.Add(new TooltipLine(Mod, "SummonerAmbitionWallOfFlesh", + Language.GetTextValue("Mods.YHTMod.Items.SummonersAmbition.WallOfFlesh"))); + } + + if (IsPreHardmodeRealized(player.Player)) { + tooltips.Add(new TooltipLine(Mod, "SummonerAmbitionPreHardmodeRealized", + Language.GetTextValue("Mods.YHTMod.Items.SummonersAmbition.PreHardmodeRealized"))); + } + } public override void AddRecipes() { @@ -120,27 +127,33 @@ public class SummonersAmbition : ModItem { .Register(); } - public static bool IsPreHardmodeRealized(Player player) { + private static bool IsPreHardmodeRealized(Player player) { YhtPlayer modPlayer = player.GetModPlayer(); HashSet bossesToCheck = [ "king_slime", "eye_of_cthulhu", "deerclops", - "eater_of_worlds", - "brain_of_cthulhu", "queen_bee", "skeletron", "wall_of_flesh" ]; + if (!modPlayer.SummonerAmbitions.Contains("eater_of_worlds") && !modPlayer.SummonerAmbitions.Contains("brain_of_cthulhu")) { + return false; + } + if (ModLoader.HasMod("CalamityMod")) { bossesToCheck.Add("desert_scourge"); bossesToCheck.Add("crabulon"); - bossesToCheck.Add("perforators"); - bossesToCheck.Add("hive_mind"); bossesToCheck.Add("slime_god"); + + if (!modPlayer.SummonerAmbitions.Contains("perforators") && !modPlayer.SummonerAmbitions.Contains("hive_mind")) { + return false; + } } + + return bossesToCheck.All(boss => modPlayer.SummonerAmbitions.Contains(boss)); } diff --git a/Items/SummonersAmbition.png b/Items/SummonersAmbition.png index 8e27abd..dbcdc21 100644 Binary files a/Items/SummonersAmbition.png and b/Items/SummonersAmbition.png differ diff --git a/Localization/en-US_Mods.YHTMod.hjson b/Localization/en-US_Mods.YHTMod.hjson index c70e9cd..6cab375 100644 --- a/Localization/en-US_Mods.YHTMod.hjson +++ b/Localization/en-US_Mods.YHTMod.hjson @@ -95,6 +95,7 @@ Items: { Skeletron: "[i:4801] Increases minion knockback" WallOfFlesh: "[i:267] Increases max number of minions by 1" SlimeGod: "{0} 10% increased whip size" + PreHardmodeRealized: Fully realized. Seek greater heights. } }