fix: cardIds for 27.2

HearthSim · Aug 22, 2023 · 6d63023 · 6d63023
1 parent 1402290
commit 6d63023
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/HDTTests/DeckImporting/TestData.cs b/HDTTests/DeckImporting/TestData.cs
@@ -9,17 +9,17 @@ public class TestData
 	{
 		public static readonly string[] Deck1Cards =
 		{
-			Druid.AddledGrizzly,
+			Druid.AddledGrizzlyOG,
 			Druid.AncientOfLore,
 			Druid.AncientOfWarExpert1,
 			Druid.AnodizedRoboCub,
 			Druid.AstralCommunion,
-			Druid.Aviana,
+			Druid.AvianaTGT,
 			Druid.Bite,
 			Druid.CelestialDreamer,
 			Druid.Cenarius,
 			Druid.ClawLegacy,
-			Druid.DarkArakkoa,
+			Druid.DarkArakkoaOG,
 			Druid.DarkWispers,
 			Druid.DarnassusAspirant,
 			Druid.DruidOfTheClaw,
@@ -28,11 +28,11 @@ public class TestData
 
 		public static readonly string[] Deck2Cards =
 		{
-			Hunter.Acidmaw,
+			Hunter.AcidmawTGT,
 			Hunter.Alleycat,
 			Hunter.AnimalCompanionLegacy,
 			Hunter.ArcaneShotLegacy,
-			Hunter.BallOfSpiders,
+			Hunter.BallOfSpidersTGT,
 			Hunter.BearTrap,
 			Hunter.BestialWrath,
 			Hunter.BraveArcher,
@@ -41,7 +41,7 @@ public class TestData
 			Hunter.CarrionGrub,
 			Hunter.CatTrick,
 			Hunter.CloakedHuntressKARA,
-			Hunter.CobraShot,
+			Hunter.CobraShotGVG,
 			Hunter.CoreRager,
 		};
 
@@ -68,7 +68,7 @@ public class TestData
 		public static readonly string[] Deck1Cards_MajorChanges = Deck1Cards.Take(12).Concat(new[]
 		{
 			Druid.VerdantLongneck,
-			Druid.VirmenSensei,
+			Druid.VirmenSenseiGANGS,
 			Druid.VolcanicLumberer
 		}).ToArray();
 

diff --git a/Hearthstone Deck Tracker/Controls/DeckView.xaml.cs b/Hearthstone Deck Tracker/Controls/DeckView.xaml.cs
@@ -142,7 +142,7 @@ private int TotalDust(Deck deck)
 				CardSet.CORE
 			}.Select(HearthDbConverter.SetConverter).ToList();
 			var nonCraftableCards = new List<string>() {
-				Neutral.Cthun,
+				Neutral.CthunOG,
 				Neutral.BeckonerOfEvil
 			};
 

diff --git a/Hearthstone Deck Tracker/GameEventHandler.cs b/Hearthstone Deck Tracker/GameEventHandler.cs
@@ -464,7 +464,7 @@ private void HandleTurnStart(Tuple<ActivePlayer, int> turn)
 		private void HandleThaurissanCostReduction()
 		{
 			var thaurissans = _game.Opponent.Board.Where(x =>
-				x.CardId == HearthDb.CardIds.Collectible.Neutral.EmperorThaurissan
+				x.CardId == HearthDb.CardIds.Collectible.Neutral.EmperorThaurissanBRM
 				&& !x.HasTag(SILENCED)).ToList();
 			if(!thaurissans.Any())
 				return;

diff --git a/Hearthstone Deck Tracker/Hearthstone/CardIds.cs b/Hearthstone Deck Tracker/Hearthstone/CardIds.cs
@@ -52,12 +52,12 @@ public class CardIds
 			{Collectible.Hunter.KindlyGrandmother, 1},
 			{Collectible.Hunter.RatPack, 2},
 			{Collectible.Hunter.SavannahHighmane, 2},
-			{Collectible.Rogue.Anubarak, 1},
-			{Collectible.Rogue.JadeSwarmer, 1},
+			{Collectible.Rogue.AnubarakTGT, 1},
+			{Collectible.Rogue.JadeSwarmerGANGS, 1},
 			{Collectible.Warlock.Dreadsteed, 1},
 			{Collectible.Warlock.PossessedVillagerOG, 1},
 			{Collectible.Warlock.Voidcaller, 1}, //false negative better than false positive
-			{Collectible.Neutral.AyaBlackpaw, 1},
+			{Collectible.Neutral.AyaBlackpawGANGS, 1},
 			{Collectible.Neutral.CairneBloodhoof, 1},
 			{Collectible.Neutral.DevilsaurEgg, 1},
 			{Collectible.Neutral.Eggnapper, 2},
@@ -68,7 +68,7 @@ public class CardIds
 			{Collectible.Neutral.PilotedShredder, 1},
 			{Collectible.Neutral.PilotedSkyGolem, 1},
 			{Collectible.Neutral.SatedThreshadon, 3},
-			{Collectible.Neutral.SludgeBelcher, 1},
+			{Collectible.Neutral.SludgeBelcherNAXX, 1},
 			{Collectible.Neutral.SneedsOldShredder, 1},
 			{Collectible.Neutral.TwilightSummoner, 1},
 			{Collectible.Neutral.WobblingRunts, 3},
@@ -190,7 +190,7 @@ public class Hunter : EnumerateMultiId<Hunter>
 				public static readonly MultiIdCard PackTactics = new MultiIdCard(Collectible.Hunter.PackTactics);
 				public static readonly MultiIdCard PressurePlate = new MultiIdCard(Collectible.Hunter.PressurePlate);
 				public static readonly MultiIdCard RatTrap = new MultiIdCard(Collectible.Hunter.RatTrap);
-				public static readonly MultiIdCard Snipe = new MultiIdCard(Collectible.Hunter.Snipe, Collectible.Hunter.SnipeVanilla);
+				public static readonly MultiIdCard Snipe = new MultiIdCard(Collectible.Hunter.SnipeExpert1, Collectible.Hunter.SnipeVanilla);
 				public static readonly MultiIdCard SnakeTrap = new MultiIdCard(Collectible.Hunter.SnakeTrapExpert1, Collectible.Hunter.SnakeTrapPLACEHOLDER_202204, Collectible.Hunter.SnakeTrapVanilla);
 				public static readonly MultiIdCard VenomstrikeTrap = new MultiIdCard(Collectible.Hunter.VenomstrikeTrapICECROWN, Collectible.Hunter.VenomstrikeTrapInvalid);
 				public static readonly MultiIdCard WanderingMonster = new MultiIdCard(Collectible.Hunter.WanderingMonster, Collectible.Hunter.WanderingMonsterCore);

diff --git a/Hearthstone Deck Tracker/Hearthstone/DungeonRun.cs b/Hearthstone Deck Tracker/Hearthstone/DungeonRun.cs
@@ -214,7 +214,7 @@ private static class GilDefaultDecks
 				Collectible.Mage.UnstablePortal,
 				Collectible.Mage.Cinderstorm,
 				Collectible.Mage.Flamewaker,
-				Collectible.Mage.Spellslinger,
+				Collectible.Mage.SpellslingerTGT,
 				Collectible.Neutral.TinkmasterOverspark,
 				Collectible.Mage.WaterElementalLegacy,
 				Collectible.Neutral.Blingtron3000
@@ -230,7 +230,7 @@ private static class LootDefaultDecks
 				Collectible.Rogue.PitSnake,
 				Collectible.Rogue.SinisterStrikeLegacy,
 				Collectible.Neutral.GilblinStalker,
-				Collectible.Rogue.UndercityHuckster,
+				Collectible.Rogue.UndercityHucksterOG,
 				Collectible.Rogue.Si7Agent,
 				Collectible.Rogue.UnearthedRaptor,
 				Collectible.Rogue.AssassinateLegacy,
@@ -378,7 +378,7 @@ private static class TrlDefaultDecks
 					Collectible.Rogue.UndercityValiant,
 					Collectible.Rogue.Betrayal,
 					Collectible.Rogue.ObsidianShard,
-					Collectible.Neutral.SmallTimeBuccaneer,
+					Collectible.Neutral.SmallTimeBuccaneerGANGS,
 					Collectible.Neutral.SouthseaDeckhand,
 					Collectible.Neutral.BloodsailRaider,
 				},
@@ -484,7 +484,7 @@ private static class TrlDefaultDecks
 					Collectible.Shaman.MaelstromPortalKARA,
 					Collectible.Shaman.FarSight,
 					Collectible.Shaman.FeralSpirit,
-					Collectible.Shaman.CallInTheFinishers,
+					Collectible.Shaman.CallInTheFinishersGANGS,
 					Collectible.Shaman.RainOfToads,
 					Collectible.Neutral.ManaAddict,
 					Collectible.Neutral.BananaBuffoon,
@@ -641,7 +641,7 @@ private static class TrlDefaultDecks
 					Collectible.Warlock.ImpLosion,
 					Collectible.Warlock.LesserAmethystSpellstone,
 					Collectible.Warlock.FiendishCircle,
-					Collectible.Warlock.BaneOfDoom,
+					Collectible.Warlock.BaneOfDoomExpert1,
 					Collectible.Neutral.BananaBuffoon,
 					Collectible.Neutral.VioletIllusionist,
 				},
@@ -684,7 +684,7 @@ private static class TrlDefaultDecks
 					Collectible.Mage.ArcaneExplosionLegacy,
 					Collectible.Mage.ShimmeringTempest,
 					Collectible.Mage.ExplosiveRunes,
-					Collectible.Mage.Spellslinger,
+					Collectible.Mage.SpellslingerTGT,
 					Collectible.Mage.GhastlyConjurerICECROWN,
 					Collectible.Mage.BlastWave,
 					Collectible.Neutral.TournamentAttendee,
@@ -697,7 +697,7 @@ private static class TrlDefaultDecks
 					Collectible.Mage.ArcaneBlast,
 					Collectible.Mage.FallenHeroTGT,
 					Collectible.Mage.Cinderstorm,
-					Collectible.Mage.DalaranAspirant,
+					Collectible.Mage.DalaranAspirantTGT,
 					Collectible.Mage.FireballLegacy,
 					Collectible.Neutral.AcherusVeteranICECROWN,
 					Collectible.Neutral.FlameJuggler,
@@ -728,7 +728,7 @@ private static class TrlDefaultDecks
 					NonCollectible.Priest.BwonsamdisSanctum,
 					Collectible.Priest.CrystallineOracle,
 					Collectible.Priest.SpiritLashICECROWN,
-					Collectible.Priest.MuseumCurator,
+					Collectible.Priest.MuseumCuratorLOE,
 					Collectible.Priest.DeadRinger,
 					Collectible.Priest.ShiftingShade,
 					Collectible.Priest.TortollanShellraiser,

diff --git a/Hearthstone Deck Tracker/LogReader/Handlers/PowerHandler.cs b/Hearthstone Deck Tracker/LogReader/Handlers/PowerHandler.cs
@@ -561,7 +561,7 @@ public void Handle(string logLine, IHsGameState gameState, IGame game)
 							case Collectible.Rogue.BeneathTheGrounds:
 								AddKnownCardId(gameState, NonCollectible.Rogue.BeneaththeGrounds_NerubianAmbushToken, 3);
 								break;
-							case Collectible.Warrior.IronJuggernaut:
+							case Collectible.Warrior.IronJuggernautGVG:
 								AddKnownCardId(gameState, NonCollectible.Warrior.IronJuggernaut_BurrowingMineToken);
 								break;
 							case Collectible.Druid.Recycle:

diff --git a/Hearthstone Deck Tracker/Utility/WotogCounterHelper.cs b/Hearthstone Deck Tracker/Utility/WotogCounterHelper.cs
@@ -10,18 +10,18 @@ namespace Hearthstone_Deck_Tracker.Utility
 {
 	public static class WotogCounterHelper
 	{
-		public static Entity PlayerCthun => Core.Game.Player.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Neutral.Cthun && x.Info.OriginalZone != null);
+		public static Entity PlayerCthun => Core.Game.Player.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Neutral.CthunOG && x.Info.OriginalZone != null);
 		public static Entity PlayerCthunProxy => Core.Game.Player.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.NonCollectible.Neutral.Cthun);
 		public static Entity PlayerYogg => Core.Game.Player.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Neutral.YoggSaronHopesEnd && x.Info.OriginalZone != null);
 		public static Entity PlayerArcaneGiant => Core.Game.Player.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Neutral.ArcaneGiant && x.Info.OriginalZone != null);
 		public static Entity PlayerGraveHorror => Core.Game.Player.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Priest.GraveHorror && x.Info.OriginalZone != null);
-		public static Entity OpponentCthun => Core.Game.Opponent.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Neutral.Cthun);
+		public static Entity OpponentCthun => Core.Game.Opponent.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Neutral.CthunOG );
 		public static Entity OpponentCthunProxy => Core.Game.Opponent.PlayerEntities.FirstOrDefault(x => x.CardId == CardIds.NonCollectible.Neutral.Cthun);
 		public static Entity PlayerPogoHopper => Core.Game.Player.RevealedEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Rogue.PogoHopper && x.Info.OriginalZone != null);
 		public static Entity OpponentPogoHopper => Core.Game.Opponent.RevealedEntities.FirstOrDefault(x => x.CardId == CardIds.Collectible.Rogue.PogoHopper && x.Info.OriginalZone != null);
 		public static bool PlayerSeenCthun => Core.Game.PlayerEntity?.HasTag(SEEN_CTHUN) ?? false;
 		public static bool OpponentSeenCthun => Core.Game.OpponentEntity?.HasTag(SEEN_CTHUN) ?? false;
-		public static bool? CthunInDeck => DeckContains(CardIds.Collectible.Neutral.Cthun);
+		public static bool? CthunInDeck => DeckContains(CardIds.Collectible.Neutral.CthunOG);
 		public static bool? YoggInDeck => DeckContains(CardIds.Collectible.Neutral.YoggSaronHopesEnd);
 		public static bool? ArcaneGiantInDeck => DeckContains(CardIds.Collectible.Neutral.ArcaneGiant);
 		public static bool? PogoHopperInDeck => DeckContains(CardIds.Collectible.Rogue.PogoHopper);