From 7925364a3d624d966984af930ed058f238c8190e Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Wed, 29 Apr 2026 22:55:41 +0200 Subject: [PATCH] actually fix being unable to equip other accessories when ambition was equipped --- Items/SummonersAmbition.cs | 8 ++------ Items/WarriorsAmbition.cs | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Items/SummonersAmbition.cs b/Items/SummonersAmbition.cs index bdb2d66..af8e4a9 100644 --- a/Items/SummonersAmbition.cs +++ b/Items/SummonersAmbition.cs @@ -25,13 +25,9 @@ public class SummonersAmbition : ModItem { Item.noUseGraphic = true; ItemID.Sets.ShimmerTransformToItem[Type] = 0; } - + public override bool CanAccessoryBeEquippedWith(Item equippedItem, Item incomingItem, Player player) { - YhtPlayer modPlayer = player.GetModPlayer(); - if (!YHTMod.GetAmbitionItems().Contains(incomingItem.type)) { - return base.CanAccessoryBeEquippedWith(equippedItem, incomingItem, player); - } - return !modPlayer.hasAmbitionEquipped() && base.CanAccessoryBeEquippedWith(equippedItem, incomingItem, player); + return !(YHTMod.GetAmbitionItems().Contains(incomingItem.type) && YHTMod.GetAmbitionItems().Contains(equippedItem.type)); } public override void UpdateAccessory(Player player, bool hideVisual) { diff --git a/Items/WarriorsAmbition.cs b/Items/WarriorsAmbition.cs index 94737df..558947d 100644 --- a/Items/WarriorsAmbition.cs +++ b/Items/WarriorsAmbition.cs @@ -27,8 +27,7 @@ public class WarriorsAmbition : ModItem { } public override bool CanAccessoryBeEquippedWith(Item equippedItem, Item incomingItem, Player player) { - YhtPlayer modPlayer = player.GetModPlayer(); - return !modPlayer.hasAmbitionEquipped() && base.CanAccessoryBeEquippedWith(equippedItem, incomingItem, player); + return !(YHTMod.GetAmbitionItems().Contains(incomingItem.type) && YHTMod.GetAmbitionItems().Contains(equippedItem.type)); } public override void UpdateAccessory(Player player, bool hideVisual) {