Version 2.3.6

Support for patch 25.2

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.3.6
+## New
+- Updated for patch 25.2.0
+**Note:**
+- There are likely still issues with some new cards in Bob's Buddy. We will update these in the coming days.
+
 # 2.3.5
 ## Fixes
 - Fix detection of decks containing signature cards

HSTracker.xcodeproj/project.pbxproj

@@ -3666,7 +3666,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/downloaded-frameworks/mono/runtimes/osx-x64/native";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 2.3.5;
+				MARKETING_VERSION = 2.3.6;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
@@ -3711,7 +3711,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/downloaded-frameworks/mono/runtimes/osx-x64/native";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 2.3.5;
+				MARKETING_VERSION = 2.3.6;
 				OTHER_CODE_SIGN_FLAGS = "--deep";
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = net.hearthsim.hstracker;

HSTracker/Assets/Assets.xcassets/tribe_undead.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "tribe_undead.jpg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

HSTracker/BobsBuddy-version.txt

@@ -1 +1 @@
-1.8.12
+1.9.0

HSTracker/BobsBuddy/BobsBuddyInvoker.swift

@@ -698,6 +698,28 @@ class BobsBuddyInvoker {
         for m in opponentSide {
             MonoHelper.addToList(list: inputOpponentSide, element: m)
         }
+
+        let playerAttached = BobsBuddyInvoker.getAttachedEntities(game: game, entityId: game.player.id)
+        let pEternalLegion = playerAttached.first { x in x.cardId == CardIds.NonCollectible.Neutral.EternalKnight_EternalKnightPlayerEnchant }
+        if let pEternalLegion {
+            input.playerEternalKnightCounter = Int32(pEternalLegion[.tag_script_data_num_1])
+        }
+        let pUndeadBonus = playerAttached.first { x in x.cardId == CardIds.NonCollectible.Neutral.NerubianDeathswarmer_UndeadBonusAttackPlayerEnchantDnt }
+        if let pUndeadBonus {
+            input.playerUndeadAttackBonus = Int32(pUndeadBonus[.tag_script_data_num_1])
+        }
+
+        let opponentAttached = BobsBuddyInvoker.getAttachedEntities(game: game, entityId: game.opponent.id)
+        let oEternalLegion = opponentAttached.first { x in x.cardId == CardIds.NonCollectible.Neutral.EternalKnight_EternalKnightPlayerEnchant }
+        if let oEternalLegion {
+            input.opponentEternalKnightCounter = Int32(oEternalLegion[.tag_script_data_num_1])
+        }
+        let oUndeadBonus = opponentAttached.first { x in x.cardId == CardIds.NonCollectible.Neutral.NerubianDeathswarmer_UndeadBonusAttackPlayerEnchantDnt }
+        if let oUndeadBonus {
+            input.opponentUndeadAttackBonus = Int32(oUndeadBonus[.tag_script_data_num_1])
+        }
+
+        logger.info("pEternal=\(input.playerEternalKnightCounter), pUndead=\(input.playerUndeadAttackBonus) | oEternal={\(input.opponentEternalKnightCounter), oUndead=\(input.opponentUndeadAttackBonus)");
 
         self.input = input
         self._turn = turn

HSTracker/Core/Extensions/Array.swift

@@ -52,6 +52,12 @@ extension Array {
     func take(_ count: Int) -> [Element] {
         return Array(prefix(count))
     }
+
+    func chunks(_ chunkSize: Int) -> [[Element]] {
+        return stride(from: 0, to: self.count, by: chunkSize).map {
+            Array(self[$0..<Swift.min($0 + chunkSize, self.count)])
+        }
+    }
 }
 
 extension Sequence where Iterator.Element: Hashable {

HSTracker/Database/Database.swift

@@ -146,19 +146,27 @@ class Database {
                         if let overload = jsonCard["overload"] as? Int {
                             card.overload = overload
                         }
+                        if let collectible = jsonCard["collectible"] as? Bool {
+                            card.collectible = collectible
+                        }
                         if let race = jsonCard["race"] as? String,
                             let cardRace = Race(rawValue: race.lowercased()) {
                             card.race = cardRace
-                            if !Database.deckManagerRaces.contains(cardRace) {
+                            if card.collectible && !Database.deckManagerRaces.contains(cardRace) {
                                 Database.deckManagerRaces.append(cardRace)
                             }
                         }
+                        if let races = jsonCard["races"] as? [String] {
+                            card.races = races.compactMap { x in Race(rawValue: x.lowercased()) }
+                            for race in card.races {
+                                if card.collectible && !Database.deckManagerRaces.contains(race) {
+                                    Database.deckManagerRaces.append(race)
+                                }
+                            }
+                        }
                         if let flavor = jsonCard["flavor"] as? String {
                             card.flavor = flavor
                         }
-                        if let collectible = jsonCard["collectible"] as? Bool {
-                            card.collectible = collectible
-                        }
                         if let name = jsonCard["name"] as? String {
                             card.name = name
                             if lang == .enUS && langs.count == 1 {
@@ -220,6 +228,13 @@ class Database {
                 if card.race != .invalid && card.race != .all && !Database.battlegroundRaces.contains(card.race) {
                     Database.battlegroundRaces.append(card.race)
                 }
+                if card.races.count > 0 && card.races[0] != .all {
+                    for race in card.races {
+                        if !Database.battlegroundRaces.contains(race) {
+                            Database.battlegroundRaces.append(race)
+                        }
+                    }
+                }
             }
             for card in Cards.battlegroundsMinions.filter({ x in x.race == .invalid }) {
                 let race = Database.getRace(card: card)

HSTracker/Database/Models/Card.swift

@@ -30,6 +30,7 @@ final class Card {
     var enText = ""
     var race: Race = .invalid
     var bgRace: Race = .invalid
+    var races: [Race] = []
     var type: CardType = .invalid
     var mechanics: [CardMechanic] = []
     var isStandard = false
@@ -195,6 +196,7 @@ extension Card: NSCopying {
         copy.battlegroundsPoolMinion = self.battlegroundsPoolMinion
         copy.deckListIndex = self.deckListIndex
         copy.battlegroundsSkinParentId = self.battlegroundsSkinParentId
+        copy.races = self.races
 
         return copy
     }

HSTracker/Logging/CardIds/Neutral.swift

@@ -702,6 +702,8 @@ extension CardIds.NonCollectible {
         static let Chameleos_ShiftingEnchantment = "GIL_142e"
         static let QueenAzsharaBATTLEGROUNDS = "BG22_HERO_007"
         static let QueenAzshara_NagaQueenAzsharaToken = "BG22_HERO_007t"
+        static let EternalKnight_EternalKnightPlayerEnchant = "BG25_008pe"
+        static let NerubianDeathswarmer_UndeadBonusAttackPlayerEnchantDnt = "BG25_011pe"
     }
 }
 

HSTracker/Logging/Game.swift

@@ -940,7 +940,7 @@ class Game: NSObject, PowerEventHandler {
                         newRaces.append(race)
                     }
                 }
-                if newRaces.count == 4 {
+                if newRaces.count == 5 {
                     logger.info("Battlegrounds unavailable races: \(newRaces) - all races \(races)")
                     _unavailableRaces = newRaces
                     return _unavailableRaces

HSTracker/Mono/InputProxy.swift

@@ -39,7 +39,7 @@ class InputProxy: MonoHandle, MonoClassInitializer {
             InputProxy._setOpponentHeroPower = MonoHelper.getMethod(InputProxy._class, "SetOpponentHeroPower", 3)
 
             // fields
-            initializeFields(fields: [ "opponentSide", "playerSide", "PlayerSecrets", "OpponentSecrets", "DamageCap", "PlayerHeroPower", "OpponentHeroPower", "PlayerHeroPower", "PlayerQuests", "OpponentQuests" ])
+            initializeFields(fields: [ "opponentSide", "playerSide", "PlayerSecrets", "OpponentSecrets", "DamageCap", "PlayerHeroPower", "OpponentHeroPower", "PlayerHeroPower", "PlayerQuests", "OpponentQuests", "PlayerUndeadAttackBonus", "OpponentUndeadAttackBonus", "PlayerEternalKnightCounter", "OpponentEternalKnightCounter" ])
         }
     }
 
@@ -153,4 +153,16 @@ class InputProxy: MonoHandle, MonoClassInitializer {
 
     @MonoHandleField(field: "OpponentQuests", owner: InputProxy.self)
     var opponentQuests: MonoHandle
+
+    @MonoPrimitiveField(field: "PlayerEternalKnightCounter", owner: InputProxy.self)
+    var playerEternalKnightCounter: Int32
+
+    @MonoPrimitiveField(field: "OpponentEternalKnightCounter", owner: InputProxy.self)
+    var opponentEternalKnightCounter: Int32
+
+    @MonoPrimitiveField(field: "PlayerUndeadAttackBonus", owner: InputProxy.self)
+    var playerUndeadAttackBonus: Int32
+
+    @MonoPrimitiveField(field: "OpponentUndeadAttackBonus", owner: InputProxy.self)
+    var opponentUndeadAttackBonus: Int32
 }