Skip to content

Commit d1a052a

Browse files
fmoraes74fmoraes74
committed
feat: update for 34.2.0
1 parent 6501630 commit d1a052a

File tree

7 files changed

+57
-10
lines changed

7 files changed

+57
-10
lines changed

‎HSTracker.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6960,7 +6960,7 @@
69606960
"$(SDKROOT)/usr/lib/swift",
69616961
);
69626962
MACOSX_DEPLOYMENT_TARGET = 10.14;
6963-
MARKETING_VERSION = 3.4.3;
6963+
MARKETING_VERSION = 3.4.4;
69646964
OTHER_CFLAGS = "$(inherited)";
69656965
OTHER_CODE_SIGN_FLAGS = "--deep";
69666966
OTHER_LDFLAGS = (
@@ -7011,7 +7011,7 @@
70117011
"$(SDKROOT)/usr/lib/swift",
70127012
);
70137013
MACOSX_DEPLOYMENT_TARGET = 10.14;
7014-
MARKETING_VERSION = 3.4.3;
7014+
MARKETING_VERSION = 3.4.4;
70157015
OTHER_CODE_SIGN_FLAGS = "--deep";
70167016
OTHER_LDFLAGS = (
70177017
"$(inherited)",

‎HSTracker/BobsBuddy-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.33.0
1+
1.33.2

‎HSTracker/BobsBuddy/BobsBuddyInvoker.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,10 @@ class BobsBuddyInvoker {
761761
minion.addDeathrattle(deathrattle: GenericDeathrattles.sneedHeroPower())
762762
case CardIds.NonCollectible.Neutral.Brukan_ElementEarth:
763763
minion.addDeathrattle(deathrattle: GenericDeathrattles.earthInvocation())
764+
case CardIds.NonCollectible.Neutral.SurfnSurf_CrabRidingEnchantment:
765+
minion.addDeathrattle(deathrattle: GenericDeathrattles.crab())
766+
case CardIds.NonCollectible.Neutral.SurfnSurf_CrabRiding:
767+
minion.addDeathrattle(deathrattle: GenericDeathrattles.crabGolden())
764768
case CardIds.NonCollectible.Neutral.Brukan_EarthRecollection:
765769
minion.addDeathrattle(deathrattle: BrukanInvocationDeathrattles.earth())
766770
case CardIds.NonCollectible.Neutral.Brukan_FireRecollection:
@@ -1002,13 +1006,24 @@ class BobsBuddyInvoker {
10021006
inputPlayer.undeadAttackBonus = Int32(pUndeadBonus[.tag_script_data_num_1])
10031007
}
10041008

1009+
if let pBeastBonus = playerAttached.first(where: { x in x.cardId == CardIds.NonCollectible.Neutral.TimewarpedGoldrinn_TimewarpedGoldrinnPlayerEnchantDnt }) {
1010+
inputPlayer.beastAttackBonus = Int32(pBeastBonus[GameTag.tag_script_data_num_1])
1011+
inputPlayer.beastHealthBonus = Int32(pBeastBonus[GameTag.tag_script_data_num_2])
1012+
logger.info("pBeastAttack=\(inputPlayer.beastAttackBonus), pBeastHealth=\(inputPlayer.beastHealthBonus), friendly=\(friendly)")
1013+
}
1014+
10051015
if let pAncestralAutomaton = playerAttached.first(where: { x in x.cardId == CardIds.Invalid.AncestralAutomaton_AncestralAutomatonPlayerEnchantDnt }) {
10061016
inputPlayer.ancestralAutomatonCounter = Int32( pAncestralAutomaton[.tag_script_data_num_1])
10071017
}
10081018
if let pBeetle = playerAttached.first(where: { x in x.cardId == CardIds.NonCollectible.Neutral.RunedProgenitor_BeetleArmyPlayerEnchantDnt }) {
10091019
inputPlayer.beetlesAtkBuff = Int32(pBeetle[.tag_script_data_num_1])
10101020
inputPlayer.beetlesHealthBuff = Int32(pBeetle[.tag_script_data_num_2])
10111021
}
1022+
if let pDeepBlues = playerAttached.first(where: { x in x.cardId == CardIds.NonCollectible.Neutral.DeepBlueCrooner_DeepBluesEnchantment }) {
1023+
inputPlayer.deepBluesAtkBuff = Int32(pDeepBlues[GameTag.tag_script_data_num_1])
1024+
inputPlayer.deepBluesHealthBuff = Int32(pDeepBlues[GameTag.tag_script_data_num_2])
1025+
logger.info("pDeepBluesAtk=\(inputPlayer.deepBluesAtkBuff), pDeepBluesHealth=\(inputPlayer.deepBluesHealthBuff), friendly=\(friendly)")
1026+
}
10121027
inputPlayer.elementalPlayCounter = Int32(game.playerEntity?[.gametag_2878] ?? 0)
10131028

10141029
logger.info("pEternal=\(inputPlayer.eternalKnightCounter), pUndead=\(inputPlayer.undeadAttackBonus), pElemental=\(inputPlayer.elementalPlayCounter), friendly=\(friendly)")

‎HSTracker/Logging/CardIds/Neutral.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,5 +1035,7 @@ extension CardIds.NonCollectible {
10351035
static let TemporalTraveler_TemporalShadowToken = "TIME_434t"
10361036
static let ChoralMrrrglr = "BG26_354"
10371037
static let ChoralMrrrglr_ChorusEnchantment = "BG26_354e"
1038+
static let TimewarpedGoldrinn_TimewarpedGoldrinnPlayerEnchantDnt = "BG34_Giant_362pe"
1039+
static let DeepBlueCrooner_DeepBluesEnchantment = "BG26_502e"
10381040
}
10391041
}

‎HSTracker/Mono/GenericDeathrattles.swift‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ class GenericDeathrattles: MonoClassInitializer {
1313
static var _sneedHeroPower: OpaquePointer!
1414
static var _plants: OpaquePointer!
1515
static var _earthInvocation: OpaquePointer!
16-
16+
static var _crab: OpaquePointer!
17+
static var _crabGolden: OpaquePointer!
18+
1719
static var _members = [String: OpaquePointer]()
1820

1921
static func initialize() {
@@ -23,26 +25,42 @@ class GenericDeathrattles: MonoClassInitializer {
2325
_sneedHeroPower = MonoHelper.getField(GenericDeathrattles._class, "SneedHeroPower")
2426
_plants = MonoHelper.getField(GenericDeathrattles._class, "Plants")
2527
_earthInvocation = MonoHelper.getField(GenericDeathrattles._class, "EarthInvocationDeathrattle")
28+
_crab = MonoHelper.getField(GenericDeathrattles._class, "Crab")
29+
_crabGolden = MonoHelper.getField(GenericDeathrattles._class, "CrabGolden")
2630
}
2731
}
2832

2933
static func sneedHeroPower() -> MonoHandle {
3034
let obj = mono_field_get_value_object(MonoHelper._monoInstance, _sneedHeroPower, nil)
3135
let result = MonoHandle(obj: obj)
32-
36+
3337
return result
3438
}
35-
39+
3640
static func plants() -> MonoHandle {
3741
let obj = mono_field_get_value_object(MonoHelper._monoInstance, _plants, nil)
3842
let result = MonoHandle(obj: obj)
39-
43+
4044
return result
4145
}
42-
46+
4347
static func earthInvocation() -> MonoHandle {
4448
let obj = mono_field_get_value_object(MonoHelper._monoInstance, _earthInvocation, nil)
4549
let result = MonoHandle(obj: obj)
50+
51+
return result
52+
}
53+
54+
static func crab() -> MonoHandle {
55+
let obj = mono_field_get_value_object(MonoHelper._monoInstance, _crab, nil)
56+
let result = MonoHandle(obj: obj)
57+
58+
return result
59+
}
60+
61+
static func crabGolden() -> MonoHandle {
62+
let obj = mono_field_get_value_object(MonoHelper._monoInstance, _crabGolden, nil)
63+
let result = MonoHandle(obj: obj)
4664

4765
return result
4866
}

‎HSTracker/Mono/PlayerProxy.swift‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class PlayerProxy: MonoHandle, MonoClassInitializer {
2525
PlayerProxy._setSecrets = MonoHelper.getMethod(PlayerProxy._class, "SetSecretsHstracker", 1)
2626

2727
// fields
28-
initializeProperties(properties: [ "Side", "HeroPowers", "Quests", "Objectives", "Trinkets", "Secrets", "Hand", "FriendlyMinionsDeadLastCombatCounter", "EternalKnightCounter", "AncestralAutomatonCounter", "UndeadAttackBonus", "ElementalPlayCounter", "BloodGemAtkBuff", "BloodGemHealthBuff", "TavernSpellCounter", "PiratesSummonCounter", "ResourcesSpentThisGame", "BeastsSummonCounter", "BeetlesAtkBuff", "BeetlesHealthBuff", "BattlecryCounter", "WonLastCombat", "BattlecriesPlayed", "Health", "DamageTaken", "Tier" ])
28+
initializeProperties(properties: [ "Side", "HeroPowers", "Quests", "Objectives", "Trinkets", "Secrets", "Hand", "FriendlyMinionsDeadLastCombatCounter", "EternalKnightCounter", "AncestralAutomatonCounter", "UndeadAttackBonus", "ElementalPlayCounter", "BloodGemAtkBuff", "BloodGemHealthBuff", "DeepBluesAtkBuff", "DeepBluesHealthBuff", "TavernSpellCounter", "PiratesSummonCounter", "ResourcesSpentThisGame", "BeastsSummonCounter", "BeastAttackBonus", "BeastHealthBonus", "BeetlesAtkBuff", "BeetlesHealthBuff", "BattlecryCounter", "WonLastCombat", "BattlecriesPlayed", "Health", "DamageTaken", "Tier" ])
2929
}
3030
}
3131

@@ -117,6 +117,12 @@ class PlayerProxy: MonoHandle, MonoClassInitializer {
117117
@MonoPrimitiveProperty(property: "BloodGemHealthBuff", owner: PlayerProxy.self)
118118
var bloodGemHealthBuff: Int32
119119

120+
@MonoPrimitiveProperty(property: "DeepBluesAtkBuff", owner: PlayerProxy.self)
121+
var deepBluesAtkBuff: Int32
122+
123+
@MonoPrimitiveProperty(property: "DeepBluesHealthBuff", owner: PlayerProxy.self)
124+
var deepBluesHealthBuff: Int32
125+
120126
@MonoPrimitiveProperty(property: "TavernSpellCounter", owner: PlayerProxy.self)
121127
var tavernSpellCounter: Int32
122128

@@ -129,6 +135,12 @@ class PlayerProxy: MonoHandle, MonoClassInitializer {
129135
@MonoPrimitiveProperty(property: "BeastsSummonCounter", owner: PlayerProxy.self)
130136
var beastsSummonCounter: Int32
131137

138+
@MonoPrimitiveProperty(property: "BeastAttackBonus", owner: PlayerProxy.self)
139+
var beastAttackBonus: Int32
140+
141+
@MonoPrimitiveProperty(property: "BeastHealthBonus", owner: PlayerProxy.self)
142+
var beastHealthBonus: Int32
143+
132144
@MonoPrimitiveProperty(property: "BeetlesAtkBuff", owner: PlayerProxy.self)
133145
var beetlesAtkBuff: Int32
134146

‎HSTracker/UIs/Battlegrounds/BattlegroundsTierOverlayView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class BattlegroundsTierOverlayView: NSView {
171171
}
172172

173173
func onHeroPowers(heroPowers: [String]) {
174-
isThorimRelevant = heroPowers.any { x in x == CardIds.NonCollectible.Neutral.ThorimStormlord_ChooseYourChampion || x == CardIds.NonCollectible.Neutral.ThorimStormlord_ThorimsChampion }
174+
isThorimRelevant = heroPowers.any { x in x == CardIds.NonCollectible.Neutral.ThorimStormlord_ChooseYourChampion }
175175
DispatchQueue.main.async {
176176
self.needsDisplay = true
177177
}

0 commit comments

Comments
 (0)