fix: rebase conflicts

Author: mateuscechetto

Hearthstone Deck Tracker/Hearthstone/CardIds.cs

@@ -249,7 +249,7 @@ public class Hunter : EnumerateMultiId<Hunter>
 				public static readonly MultiIdCard FreezingTrap = new MultiIdCard(Collectible.Hunter.FreezingTrap, Collectible.Hunter.FreezingTrapCore, Collectible.Hunter.FreezingTrapVanilla);
 				public static readonly MultiIdCard HiddenCache = new MultiIdCard(Collectible.Hunter.HiddenCache);
 				public static readonly MultiIdCard HiddenMeaning = new MultiIdCard(Collectible.Hunter.HiddenMeaning);
-				public static readonly MultiIdCard IceTrap = new MultiIdCard(Collectible.Hunter.IceTrap, Collectible.Hunter.IceTrapCorePlaceholder);
+				public static readonly MultiIdCard IceTrap = new MultiIdCard(Collectible.Hunter.IceTrap, Collectible.Hunter.IceTrapCore);
 				public static readonly MultiIdCard Misdirection = new MultiIdCard(Collectible.Hunter.Misdirection, Collectible.Hunter.MisdirectionVanilla);
 				public static readonly MultiIdCard MotionDenied = new MultiIdCard(Collectible.Hunter.MotionDenied);
 				public static readonly MultiIdCard OpenTheCages = new MultiIdCard(Collectible.Hunter.OpenTheCages);

Hearthstone Deck Tracker/Hearthstone/EffectSystem/Effects/Paladin/CrusaderAuraEnchantment.cs

@@ -5,7 +5,7 @@ namespace Hearthstone_Deck_Tracker.Hearthstone.EffectSystem.Effects.Paladin;
 public class CrusaderAura : EntityBasedEffect
 {
 	public override string CardId => HearthDb.CardIds.NonCollectible.Neutral.CrusaderAura_CrusaderAuraCoreEnchantment;
-	protected override string CardIdToShowInUI => HearthDb.CardIds.Collectible.Paladin.CrusaderAuraCorePlaceholderPLACEHOLDER_2022042;
+	protected override string CardIdToShowInUI => HearthDb.CardIds.Collectible.Paladin.CrusaderAuraCore;
 
 	public CrusaderAura(int entityId, bool isControlledByPlayer) : base(entityId, isControlledByPlayer)
 	{

Hearthstone Deck Tracker/Hearthstone/EffectSystem/Effects/Warlock/DemonicStudiesEnchantment.cs

@@ -5,7 +5,7 @@ namespace Hearthstone_Deck_Tracker.Hearthstone.EffectSystem.Effects.Warlock;
 public class DemonicStudiesEnchantment : EntityBasedEffect
 {
 	public override string CardId => HearthDb.CardIds.NonCollectible.Warlock.DemonicStudies_DemonicStudiesEnchantment;
-	protected override string CardIdToShowInUI => HearthDb.CardIds.Collectible.Warlock.DemonicStudiesCorePlaceholder;
+	protected override string CardIdToShowInUI => HearthDb.CardIds.Collectible.Warlock.DemonicStudies;
 
 	public DemonicStudiesEnchantment(int entityId, bool isControlledByPlayer) : base(entityId, isControlledByPlayer)
 	{

Hearthstone Deck Tracker/Hearthstone/GameV2.cs

@@ -593,7 +593,9 @@ public void CacheMulliganGuideParams()
 				MulliganState.KeptCards?.Select(x => x.Card.DbfId).ToArray(),
 				MulliganState.FinalCardsInHand?.Select(x => x.Card.DbfId).ToArray(),
 				Metrics.ConstructedMulliganGuideOverlayDisplayed,
-				PlayerEntity?.GetTag(GameTag.PLAYSTATE) ?? 0
+				PlayerEntity?.GetTag(GameTag.PLAYSTATE) ?? 0,
+				true,
+				false
 			);
 		}
 

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/DemonHunter/Tuskpiercer.cs

@@ -13,5 +13,5 @@ public HighlightColor ShouldHighlight(Card card, IEnumerable<Card> deck) =>
 
 public class TuskpiercerCorePlaceholder : Tuskpiercer
 {
-	public override string GetCardId() => HearthDb.CardIds.Collectible.Demonhunter.TuskpiercerCorePlaceholder;
+	public override string GetCardId() => HearthDb.CardIds.Collectible.Demonhunter.TuskpiercerCore;
 }

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Hunter/BarakKodobane.cs

@@ -16,5 +16,5 @@ public HighlightColor ShouldHighlight(Card card, IEnumerable<Card> deck) =>
 
 public class BarakKodobaneCore : BarakKodobane
 {
-	public override string GetCardId() => HearthDb.CardIds.Collectible.Hunter.BarakKodobaneCorePlaceholder;
+	public override string GetCardId() => HearthDb.CardIds.Collectible.Hunter.BarakKodobaneCore;
 }

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Hunter/MastersCall.cs

@@ -13,5 +13,5 @@ public HighlightColor ShouldHighlight(Card card, IEnumerable<Card> deck) =>
 
 public class MastersCallCore : MastersCall
 {
-	public override string GetCardId() => HearthDb.CardIds.Collectible.Hunter.MastersCallCorePlaceholder;
+	public override string GetCardId() => HearthDb.CardIds.Collectible.Hunter.MastersCallCore;
 }

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Paladin/RedscaleDragontamer.cs

@@ -12,6 +12,6 @@ public HighlightColor ShouldHighlight(Card card, IEnumerable<Card> deck) =>
 
 public class RedscaleDragontamerCorePlaceholder : RedscaleDragontamer
 {
-	public override string GetCardId() => HearthDb.CardIds.Collectible.Paladin.RedscaleDragontamerCorePlaceholder;
+	public override string GetCardId() => HearthDb.CardIds.Collectible.Paladin.RedscaleDragontamerCore;
 
 }

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Priest/SpiritGuide.cs

@@ -19,5 +19,5 @@ public HighlightColor ShouldHighlight(Card card, IEnumerable<Card> deck) =>
 
 public class SpiritGuideCorePlaceholder : SpiritGuide
 {
-	public override string GetCardId() => HearthDb.CardIds.Collectible.Priest.SpiritGuideCorePlaceholder;
+	public override string GetCardId() => HearthDb.CardIds.Collectible.Priest.SpiritGuideCore;
 }

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Priest/ThriveInTheShadowsCore.cs

@@ -5,7 +5,7 @@ namespace Hearthstone_Deck_Tracker.Hearthstone.RelatedCardsSystem.Cards.Priest;
 
 public class ThriveInTheShadowsCore : ICardWithHighlight
 {
-	public string GetCardId() => HearthDb.CardIds.Collectible.Priest.ThriveInTheShadowsCorePlaceholderPLACEHOLDER_2022042;
+	public string GetCardId() => HearthDb.CardIds.Collectible.Priest.ThriveInTheShadowsCore;
 
 	public HighlightColor ShouldHighlight(Card card, IEnumerable<Card> deck) =>
 		HighlightColorHelper.GetHighlightColor(card.TypeEnum == CardType.SPELL);