Patch 31.4 (#72)

* wip: add active effects and related cards for miniset

* wip: add JimRaynor related cards

* fix: JimRaynor for the opponent

* feat: add Colossus counter

* feat: add Mothership and Resonance Coil related cards

* refactor: use cache for related cards that filter the card collection

- This reduces the initiation cost of the class

* feat: update tags and cardIds

Author: mateuscechetto

Hearthstone Deck Tracker/Hearthstone/Card.cs

@@ -563,6 +563,21 @@ public List<string> GetClasses()
 			return null;
 		}
 
+		public GameTag? GetFaction()
+		{
+			var factions = new[]
+			{
+				GameTag.KABAL,
+				GameTag.GRIMY_GOONS,
+				GameTag.JADE_LOTUS,
+				GameTag.PROTOSS,
+				GameTag.TERRAN,
+				GameTag.ZERG
+			};
+
+			return factions.FirstOrDefault(faction => _dbCard?.Entity.GetTag(faction) > 0);
+		}
+
 		public bool ZilliaxCustomizableFunctionalModule => _dbCard?.Entity.GetTag(GameTag.ZILLIAX_CUSTOMIZABLE_FUNCTIONALMODULE) > 0;
 
 		public bool ZilliaxCustomizableCosmeticModule => _dbCard?.Entity.GetTag(GameTag.ZILLIAX_CUSTOMIZABLE_COSMETICMODULE) > 0;

Hearthstone Deck Tracker/Hearthstone/CardUtils.cs

@@ -83,6 +83,7 @@ public static bool MayCardBeRelevant(Card? card, Format? format, string? playerC
 		HearthDb.CardIds.NonCollectible.Hunter.ArkoniteDefenseCrystal_TheAstralCompassToken,
 		HearthDb.CardIds.NonCollectible.Rogue.ArkoniteDefenseCrystal_TheScavengersWillToken,
 		HearthDb.CardIds.NonCollectible.Warlock.ArkoniteDefenseCrystal_TheNethersEyeToken,
+		HearthDb.CardIds.NonCollectible.Invalid.BattlecruiserToken,
 	};
 
 	public static bool IsStarship(string? cardId) => _starshipIds.Contains(cardId);

Hearthstone Deck Tracker/Hearthstone/CounterSystem/Counters/ColossusCounter.cs

@@ -0,0 +1,60 @@
+using HearthDb.Enums;
+using Hearthstone_Deck_Tracker.LogReader.Interfaces;
+using Hearthstone_Deck_Tracker.Utility;
+using Entity = Hearthstone_Deck_Tracker.Hearthstone.Entities.Entity;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.CounterSystem.Counters;
+
+public class ColossusCounter : NumericCounter
+{
+	protected override string? CardIdToShowInUI => HearthDb.CardIds.Collectible.Mage.Colossus;
+
+	public override string[] RelatedCards => new string[]
+	{
+		HearthDb.CardIds.Collectible.Mage.Colossus,
+	};
+
+	public ColossusCounter(bool controlledByPlayer, GameV2 game) : base(controlledByPlayer, game)
+	{
+	}
+
+	public override bool ShouldShow()
+	{
+		if(!Game.IsTraditionalHearthstoneMatch) return false;
+		if(IsPlayerCounter)
+			return InPlayerDeckOrKnown(RelatedCards);
+		return Counter > 2 && OpponentMayHaveRelevantCards();
+	}
+
+	public override string[] GetCardsToDisplay()
+	{
+		return IsPlayerCounter ?
+			GetCardsInDeckOrKnown(RelatedCards).ToArray() :
+			FilterCardsByClassAndFormat(RelatedCards, Game.Opponent.OriginalClass);
+	}
+
+	public override string ValueToShow() => string.Format(LocUtil.Get("Counter_AsteroidDamage_Damage", useCardLanguage: true), $"2x {Counter + 1}");
+
+	public override void HandleTagChange(GameTag tag, IHsGameState gameState, Entity entity, int value, int prevValue)
+	{
+		if(!Game.IsTraditionalHearthstoneMatch)
+			return;
+
+		if(tag != GameTag.ZONE)
+			return;
+
+		if(value != (int)Zone.PLAY && value != (int)Zone.SECRET)
+			return;
+
+		if(!entity.IsSpell)
+			return;
+		
+		if(!entity.HasTag(GameTag.PROTOSS))
+			return;
+
+		var controller = entity.GetTag(GameTag.CONTROLLER);
+
+		if((controller == Game.Player.Id && IsPlayerCounter) || (controller == Game.Opponent.Id && !IsPlayerCounter))
+			Counter++;
+	}
+}

Hearthstone Deck Tracker/Hearthstone/EffectSystem/Effects/DeathKnight/InfestorEnchantment.cs

@@ -0,0 +1,16 @@
+using Hearthstone_Deck_Tracker.Hearthstone.EffectSystem.Enums;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.EffectSystem.Effects.DeathKnight;
+
+public class InfestorEnchantment : EntityBasedEffect
+{
+	public override string CardId => HearthDb.CardIds.NonCollectible.Deathknight.Infestor_ForTheSwarmEnchantment1;
+	protected override string CardIdToShowInUI => HearthDb.CardIds.Collectible.Deathknight.Infestor;
+
+	public InfestorEnchantment(int entityId, bool isControlledByPlayer) : base(entityId, isControlledByPlayer)
+	{
+	}
+
+	public override EffectDuration EffectDuration => EffectDuration.Permanent;
+	public override EffectTag EffectTag => EffectTag.MinionModification;
+}

Hearthstone Deck Tracker/Hearthstone/Player.cs

@@ -41,6 +41,7 @@ public Player(IGame game, bool isLocalPlayer)
 		public List<Entity> CardsPlayedThisMatch { get; } = new();
 		public List<Entity> CardsPlayedThisTurn { get; private set; } = new List<Entity>();
 		public List<Entity> CardsPlayedLastTurn { get; private set; } = new();
+		public List<string?> LaunchedStarships { get; private set; } = new();
 		public bool IsPlayingWhizbang { get; set; }
 		public int PogoHopperPlayedCount { get; private set; }
 		public Entity? LastDiedMinionCard => DeadMinionsCards.LastOrDefault();
@@ -492,6 +493,7 @@ public void Reset()
 			CardsPlayedThisTurn.Clear();
 			CardsPlayedLastTurn.Clear();
 			CardsPlayedThisMatch.Clear();
+			LaunchedStarships.Clear();
 			SecretsTriggeredCards.Clear();
 			LastDrawnCardId = null;
 			LibramReductionCount = 0;

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Mage/ResonanceCoil.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Linq;
+using HearthDb.Enums;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.RelatedCardsSystem.Cards.Mage;
+
+public class ResonanceCoil: ICardWithRelatedCards
+{
+	private List<Card?>? _cache = null;
+
+	public string GetCardId() => HearthDb.CardIds.Collectible.Mage.ResonanceCoil;
+
+	public bool ShouldShowForOpponent(Player opponent) => false;
+
+	public List<Card?> GetRelatedCards(Player player)
+	{
+		if(_cache != null) return _cache;
+
+		var cardId = GetCardId();
+
+		_cache = HearthDb.Cards.Collectible.Values
+			.Where(c =>
+				c.Entity.GetTag(GameTag.PROTOSS) > 0 &&
+				c.Type == CardType.SPELL &&
+				c.Id != cardId)
+			.Select(c => new Card(c))
+			.OrderBy(card => card.Cost)
+			.ToList()!;
+
+		return _cache;
+	}
+}

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Neutral/JimRaynor.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.RelatedCardsSystem.Cards.Neutral;
+
+public class JimRaynor: ICardWithRelatedCards
+{
+	public string GetCardId() => HearthDb.CardIds.Collectible.Invalid.JimRaynor;
+
+	public bool ShouldShowForOpponent(Player opponent)
+	{
+		var card = Database.GetCardFromId(GetCardId());
+		return CardUtils.MayCardBeRelevant(card, Core.Game.CurrentFormat, opponent.OriginalClass) && GetRelatedCards(opponent).Count > 0;
+	}
+
+	public List<Card?> GetRelatedCards(Player player) =>
+		player.LaunchedStarships.Select(Database.GetCardFromId)
+			.ToList();
+}

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Neutral/LiftOff.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.RelatedCardsSystem.Cards.Neutral;
+
+public class LiftOff: ICardWithRelatedCards
+{
+	private readonly List<Card?> _starshipPieces = new List<Card?>
+	{
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Viking),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Liberator),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Raven2),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Banshee2),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Medivac2)
+	};
+
+	public string GetCardId() => HearthDb.CardIds.Collectible.Invalid.LiftOff;
+
+	public bool ShouldShowForOpponent(Player opponent) => false;
+
+	public List<Card?> GetRelatedCards(Player player) => _starshipPieces;
+}

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Neutral/Starport.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.RelatedCardsSystem.Cards.Neutral;
+
+public class Starport: ICardWithRelatedCards
+{
+	private readonly List<Card?> _starshipPieces = new List<Card?>
+	{
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Viking),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Liberator),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Raven2),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Banshee2),
+		Database.GetCardFromId(HearthDb.CardIds.NonCollectible.Invalid.Starport_Medivac2)
+	};
+
+	public string GetCardId() => HearthDb.CardIds.Collectible.Invalid.Starport;
+
+	public bool ShouldShowForOpponent(Player opponent) => false;
+
+	public List<Card?> GetRelatedCards(Player player) => _starshipPieces;
+}

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

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+using System.Linq;
+using HearthDb.Enums;
+
+namespace Hearthstone_Deck_Tracker.Hearthstone.RelatedCardsSystem.Cards.Priest;
+
+public class Mothership: ICardWithRelatedCards
+{
+	private List<Card?>? _cache = null;
+	public string GetCardId() => HearthDb.CardIds.Collectible.Priest.Mothership;
+
+	public bool ShouldShowForOpponent(Player opponent) => false;
+
+	public List<Card?> GetRelatedCards(Player player){
+		if(_cache != null) return _cache;
+
+		var cardId = GetCardId();
+
+		_cache = HearthDb.Cards.Collectible.Values
+			.Where(c =>
+				c.Entity.GetTag(GameTag.PROTOSS) > 0 &&
+				c.Type == CardType.MINION &&
+				c.Id != cardId)
+			.Select(c => new Card(c))
+			.OrderBy(card => card.Cost)
+			.ToList()!;
+
+		return _cache;
+
+	}
+}

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Rogue/ScroungingShipwright.cs

@@ -17,13 +17,18 @@ public class ScroungingShipwright: ICardWithRelatedCards
 		Database.GetCardFromId(HearthDb.CardIds.Collectible.Warlock.HeartOfTheLegion),
 		Database.GetCardFromId(HearthDb.CardIds.Collectible.Hunter.Biopod),
 		Database.GetCardFromId(HearthDb.CardIds.Collectible.Hunter.SpecimenClaw),
+		Database.GetCardFromId(HearthDb.CardIds.Collectible.Shaman.MissilePod),
+		Database.GetCardFromId(HearthDb.CardIds.Collectible.Paladin.UltraCapacitor),
+		Database.GetCardFromId(HearthDb.CardIds.Collectible.Warrior.YamatoCannon),
 	};
 
 	public string GetCardId() => HearthDb.CardIds.Collectible.Rogue.ScroungingShipwright;
 
 	public bool ShouldShowForOpponent(Player opponent) => false;
 
 	public List<Card?> GetRelatedCards(Player player) =>
-		_starshipPieces.Where(card => card != null && !card.IsClass(player.CurrentClass)).ToList();
+		_starshipPieces.Where(card => card != null && !card.IsClass(player.CurrentClass))
+			.OrderBy(card => card?.Cost)
+			.ToList();
 }
 

Hearthstone Deck Tracker/Hearthstone/RelatedCardsSystem/Cards/Rogue/StarshipSchematic.cs

@@ -18,6 +18,9 @@ public class StarshipSchematic: ICardWithRelatedCards
 		Database.GetCardFromId(HearthDb.CardIds.Collectible.Warlock.HeartOfTheLegion),
 		Database.GetCardFromId(HearthDb.CardIds.Collectible.Hunter.Biopod),
 		Database.GetCardFromId(HearthDb.CardIds.Collectible.Hunter.SpecimenClaw),
+		Database.GetCardFromId(HearthDb.CardIds.Collectible.Shaman.MissilePod),
+		Database.GetCardFromId(HearthDb.CardIds.Collectible.Paladin.UltraCapacitor),
+		Database.GetCardFromId(HearthDb.CardIds.Collectible.Warrior.YamatoCannon),
 	};
 
 	public string GetCardId() => HearthDb.CardIds.Collectible.Rogue.StarshipSchematic;

Hearthstone Deck Tracker/LogReader/Handlers/TagChangeActions.cs

@@ -515,9 +515,36 @@ private void OnParentCardChange(IHsGameState gameState, int id, IGame game, int
 			if(!game.Entities.TryGetValue(id, out var entity))
 				return;
 
-			// when a starship is launched it changes the value to 0, but we want to keep the parent stored cards
+			// when a starship is launched it sets the value to 0
+			// otherwise it sets to the parent starship id
 			if(!game.Entities.TryGetValue(value, out var parentEntity))
+			{
+
+				// every piece sets the parent to 0, we only need to get 1 of them
+				if(gameState.StarshipLauchBlockIds.Contains(gameState.CurrentBlock?.Id))
+					return;
+
+				if(gameState.CurrentBlock?.Type != "POWER" ||
+				   !(CardUtils.IsStarship(gameState.CurrentBlock?.CardId) || gameState.CurrentBlock?.CardId == Collectible.Neutral.TheExodar))
+					return;
+
+				if(!game.Entities.TryGetValue(prevValue, out var starshipToken))
+					return;
+
+				var player = entity.IsControlledBy(game.Player.Id) ? game.Player : game.Opponent;
+				gameState.StarshipLauchBlockIds.Add(gameState.CurrentBlock?.Id);
+				player.LaunchedStarships.Add(starshipToken.CardId);
+
+				var excludedPieces = new List<string>
+				{
+					NonCollectible.Neutral.LaunchStarship,
+					NonCollectible.Neutral.AbortLaunch,
+				};
+
+				var starshipPieces = starshipToken.Info.StoredCardIds.Where(cardId => !excludedPieces.Contains(cardId));
+				player.LaunchedStarships.AddRange(starshipPieces);
 				return;
+			}
 
 			if(entity.CardId != null)
 				parentEntity.Info.StoredCardIds.Add(entity.CardId);

Hearthstone Deck Tracker/LogReader/HsGameState.cs

@@ -65,6 +65,7 @@ public void Reset()
 			_maxBlockId = 0;
 			DredgeCounter = 0;
 			TriangulatePlayed = false;
+			StarshipLauchBlockIds.Clear();
 		}
 
 		public void SetCurrentEntity(int id)
@@ -94,6 +95,7 @@ public void BlockEnd()
 		public Dictionary<int, IHsChoice> ChoicesById { get; } = new();
 		public Dictionary<int, List<IHsChoice>> ChoicesByTaskList { get; } = new();
 		public bool TriangulatePlayed { get; set; }
+		public List<int?> StarshipLauchBlockIds { get; } = new();
 	}
 
 	public class Block

Hearthstone Deck Tracker/LogReader/Interfaces/IHsGameState.cs

@@ -44,6 +44,7 @@ public interface IHsGameState
 		Dictionary<int, IHsChoice> ChoicesById { get; }
 		Dictionary<int, List<IHsChoice>> ChoicesByTaskList { get; }
 		bool TriangulatePlayed { get; set; }
+		List<int?> StarshipLauchBlockIds { get; }
 
 	}
 }