HSTracker version 2.4.7

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.4.7
+## New
+- Updated for Hearthstone 26.6.0
+
 # 2.4.6
 ## New
 - Updated for Hearthstone 26.4.3

HSTracker.xcodeproj/project.pbxproj

@@ -3938,7 +3938,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/downloaded-frameworks/mono/runtimes/osx-x64/native";
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.4.6;
+				MARKETING_VERSION = 2.4.7;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
@@ -3983,7 +3983,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/downloaded-frameworks/mono/runtimes/osx-x64/native";
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 2.4.6;
+				MARKETING_VERSION = 2.4.7;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = net.hearthsim.hstracker;

HSTracker/Database/Models/Card.swift

@@ -96,6 +96,10 @@ final class Card {
             cc == cardClass
         }) != nil
     }
+
+    func isNeutral() -> Bool {
+        return playerClass == .neutral && multiClassGroup == .invalid
+    }
 
     static let pluralRegex = Regex("\\$(\\d+) \\|4\\((\\w+),(\\w+)\\)")
 

HSTracker/Database/Models/Deck.swift

@@ -148,6 +148,10 @@ class Deck: Object {
         return sortedCards.all { CardSet.classicSets().contains($0.set ?? .invalid) }
     }
 
+    var isTwistDeck: Bool {
+        return sortedCards.all { CardSet.twistSets().contains($0.set ?? .invalid) && !$0.isNeutral() }
+    }
+
     /**
      * Compares the card content to the other deck
      */

HSTracker/HearthMirror-version.txt

@@ -1 +1 @@
-beb40fbc0797df99f06a61af246c90bcc6f14186
+146d55bf6221f240a9243a9873039f93dc3a60fa

HSTracker/HearthMirror/MatchInfo.swift

@@ -37,6 +37,7 @@ struct MatchInfo {
         var wildMedalInfo: MedalInfo
         var standardMedalInfo: MedalInfo
         var classicMedalInfo: MedalInfo
+        var twistMedalInfo: MedalInfo
         var cardBackId: Int
 
         init(player: MirrorPlayer) {
@@ -50,6 +51,7 @@ struct MatchInfo {
             self.standardMedalInfo = MedalInfo(mirrorMedalInfo: player.standardMedalInfo)
             self.wildMedalInfo = MedalInfo(mirrorMedalInfo: player.wildMedalInfo)
             self.classicMedalInfo = MedalInfo(mirrorMedalInfo: player.classicMedalInfo)
+            self.twistMedalInfo = MedalInfo(mirrorMedalInfo: player.twistMedalInfo)
         }
     }
 

HSTracker/Hearthstone/Secrets/MultiIdCard.swift

@@ -25,6 +25,7 @@ class MultiIdCard: Hashable, Equatable {
     var isWild: Bool { cards.any({ x in !CardSet.classicSets().contains(x.set ?? .invalid)})}
     var isClassic: Bool { cards.any({ x in CardSet.classicSets().contains(x.set ?? .invalid)})}
     var isStandard: Bool { cards.any({ x in !CardSet.wildSets().contains(x.set ?? .invalid) && !CardSet.classicSets().contains(x.set ?? .invalid)})}
+    var isTwist: Bool { cards.any({ x in !CardSet.twistSets().contains(x.set ?? .invalid) && !x.isNeutral()})}
 
     func hasSet(set: CardSet) -> Bool {
         return cards.any { x in x.set == set }
@@ -63,6 +64,8 @@ class MultiIdCard: Hashable, Equatable {
             return cards.first { x in CardSet.classicSets().contains(x.set ?? .invalid) } ?? cards[0]
         case .ft_standard:
             return cards.first { x in !CardSet.wildSets().contains(x.set ?? .invalid) && !CardSet.classicSets().contains(x.set ?? .invalid) } ?? cards[0]
+        case .ft_twist:
+            return cards.first { x in CardSet.twistSets().contains(x.set ?? .invalid) } ?? cards[0]
         case .ft_unknown:
             return cards[0]
         }

HSTracker/Hearthstone/Secrets/SecretsManager.swift

@@ -177,11 +177,14 @@ class SecretsManager {
                         remoteData.arena?.exclusive_secrets?.all { s in card != s } ?? true
                     })
                 }
-                if format == .standard {
+                switch format {
+                case .standard:
                     cards = cards.filter { card in card.isStandard }
-                } else if format == .classic {
+                case .classic:
                     cards = cards.filter { card in card.isClassic }
-                } else if format == .wild {
+                case .twist:
+                    cards = cards.filter { card in card.isTwist }
+                default:
                     cards = cards.filter { card in card.isWild }
                 }
             }

HSTracker/Logging/Enums/BnetGameType.swift

@@ -41,7 +41,10 @@ enum BnetGameType: Int {
     bgt_ranked_classic = 58,
     bgt_casual_classic = 59,
     bgt_mercenaries_pve_coop = 60,
-    bgt_mercenaries_friendly = 61
+    bgt_mercenaries_friendly = 61,
+    bgt_battlegrounds_player_vs_ai = 62,
+    bgt_ranked_twist = 63,
+    bgt_casual_twist = 64
 
     static func getBnetGameType(gameType: GameType, format: Format?) -> BnetGameType {
         switch gameType {

HSTracker/Logging/Enums/CardSet.swift

@@ -58,7 +58,8 @@ enum CardSet: String, CaseIterable {
     return_of_the_lich_king,
     path_of_arthas,
     battle_of_the_bands,
-    placeholder_202204
+    placeholder_202204,
+    titans
 
     static func deckManagerValidCardSets() -> [CardSet] {
         return [.all, .vanilla, .core, .basic, .expert1, .naxx, .gvg, .brm, .tgt,
@@ -67,7 +68,8 @@ enum CardSet: String, CaseIterable {
                 .dalaran, .uldum, .dragons, .year_of_the_dragon,
                 .black_temple, .demon_hunter_initiate, .scholomance, .darkmoon_faire,
                 .the_barrens, .wailing_caverns, .stormwind, .alterac_valley,
-                .the_sunken_city, .revendreth, .return_of_the_lich_king, .path_of_arthas, .battle_of_the_bands ]
+                .the_sunken_city, .revendreth, .return_of_the_lich_king, .path_of_arthas, .battle_of_the_bands,
+                .titans]
     }
 
     static func wildSets() -> [CardSet] {
@@ -86,6 +88,14 @@ enum CardSet: String, CaseIterable {
     static func classicSets() -> [CardSet] {
         return [ .vanilla ]
     }
+
+    static func twistSets() -> [CardSet] {
+        return [ .battle_of_the_bands, .return_of_the_lich_king, .path_of_arthas,
+                 .revendreth, .the_sunken_city, .core,
+                 .alterac_valley, .stormwind, .the_barrens,
+                 .darkmoon_faire, .scholomance, .demon_hunter_initiate,
+                 .black_temple]
+    }
 }
 
 public enum CardSetInt: Int {
@@ -147,5 +157,6 @@ public enum CardSetInt: Int {
     return_of_the_lich_king = 1776,
     battle_of_bands = 1809,
     placeholder_202204 = 1810,
+    titans = 1858,
     path_of_arthas = 1869
 }

HSTracker/Logging/Enums/DeckType.swift

@@ -12,8 +12,9 @@ enum DeckType: Int, CaseIterable {
     case all,
          standard,
          wild,
-         classic,
+         classic, // unused
          arena,
          duels,
-         dungeon
+         dungeon,
+         twist
 }

HSTracker/Logging/Enums/Format.swift

@@ -13,7 +13,8 @@ enum Format: String {
     all,
     standard,
     wild,
-    classic
+    classic,
+    twist
 
     init(formatType: FormatType) {
         switch formatType {
@@ -23,6 +24,8 @@ enum Format: String {
             self = .standard
         case .ft_classic:
             self = .classic
+        case .ft_twist:
+            self = .twist
         default:
             self = .unknown
         }
@@ -36,6 +39,8 @@ enum Format: String {
             return .ft_wild
         case .classic:
             return .ft_classic
+        case .twist:
+            return .ft_twist
         default: return .ft_unknown
         }
     }

HSTracker/Logging/Enums/FormatType.swift

@@ -12,5 +12,6 @@ enum FormatType: Int {
     case ft_unknown = 0,
     ft_wild = 1,
     ft_standard = 2,
-    ft_classic = 3
+    ft_classic = 3,
+    ft_twist = 4
 }

HSTracker/Logging/Game.swift

@@ -1700,13 +1700,17 @@ class Game: NSObject, PowerEventHandler {
 		if let matchInfo = self.matchInfo, self.currentGameMode == .ranked {
 			let wild = self.currentFormat == .wild
             let classic = self.currentFormat == .classic
-
+            let twist = self.currentFormat == .twist
+
             if wild {
                 result.playerMedalInfo = matchInfo.localPlayer.wildMedalInfo
                 result.opponentMedalInfo = matchInfo.opposingPlayer.wildMedalInfo
             } else if classic {
                 result.playerMedalInfo = matchInfo.localPlayer.classicMedalInfo
                 result.opponentMedalInfo = matchInfo.opposingPlayer.classicMedalInfo
+            } else if twist {
+                result.playerMedalInfo = matchInfo.localPlayer.twistMedalInfo;
+                result.opponentMedalInfo = matchInfo.opposingPlayer.twistMedalInfo;
             } else {
                 result.playerMedalInfo = matchInfo.localPlayer.standardMedalInfo
                 result.opponentMedalInfo = matchInfo.opposingPlayer.standardMedalInfo
@@ -2269,10 +2273,11 @@ class Game: NSObject, PowerEventHandler {
                     let hasCoin = player.hasCoin
                     let isWild = currentFormat == .wild
                     let isClassic = currentFormat == .classic
+                    let isTwist = currentFormat == .twist
                     var playerStarLevel = 0
                     if let matchInfo = matchInfo {
                         let localPlayer = matchInfo.localPlayer
-                        let playerInfo = isClassic ? localPlayer.classicMedalInfo : isWild ? localPlayer.wildMedalInfo : localPlayer.standardMedalInfo
+                        let playerInfo = isClassic ? localPlayer.classicMedalInfo : isWild ? localPlayer.wildMedalInfo : isTwist ? localPlayer.twistMedalInfo : localPlayer.standardMedalInfo
                         playerStarLevel = playerInfo.starLevel
                     }
                     let sid = ShortIdHelper.getShortId(deck: currentDeck)

HSTracker/UIs/DeckManager/DeckManager.swift

@@ -180,6 +180,8 @@ class DeckManager: NSWindowController {
             return !deck.isWildDeck
         case .classic:
             return deck.isClassicDeck
+        case .twist:
+            return deck.isTwistDeck
         }
     }
 

HSTracker/cards-version.txt

@@ -1 +1 @@
-178555
+179020

Translations/macOS/Base.lproj/Localizable.strings

@@ -147,6 +147,7 @@
 "RETURN_OF_THE_LICH_KING" = "March of the Lich King";
 "PATH_OF_ARTHAS" = "Path of Arthas";
 "BATTLE_OF_THE_BANDS" = "Festival of Legends";
+"TITANS" = "Titans";
 
 /* card type */
 "all_types" = "All";
@@ -202,6 +203,7 @@
 "DeckType_dungeon"  = "Dungeon Run";
 "DeckType_duels"    = "Duels";
 "DeckType_classic"  = "Classic";
+"DeckType_twist"    = "Twist";
 
 /* Stats tabs */
 "Statistics" = "Statistics";