Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion HSTracker/Logging/EntityInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,12 @@ class EntityInfo {
var storedCardIds: [String] = []
var copyOfCardId: String?
var latestCardId: String {
get { _latestCardId ?? _entity.cardId }
get {
if let id = _latestCardId, !id.isEmpty {
return id
}
return _entity.cardId
}
set { _latestCardId = newValue }
}
var deckIndex = 0
Expand Down
9 changes: 8 additions & 1 deletion HSTracker/Logging/Parsers/PowerGameStateParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,11 @@ class PowerGameStateParser: LogEventParser {
if let currentBlock = currentBlock, entity.cardId.uppercased().contains("HERO") {
currentBlock.hasFullEntityHeroPackets = true
}
} else if let cardId, !cardId.isBlank, let entity = eventHandler.entities[id] {
// Entity already exists but FULL_ENTITY - Updating arrived with a different CardID
// This happens when a Discover choice is changed via Rewind
entity.cardId = cardId
entity.info.latestCardId = cardId
}

set(currentEntity: id)
Expand Down Expand Up @@ -340,7 +345,9 @@ class PowerGameStateParser: LogEventParser {
entity.cardId.hasPrefix("CREATED_BY_") {
entity.cardId = cardId
}
entity.info.latestCardId = cardId
if !cardId.isEmpty {
entity.info.latestCardId = cardId
}
if type == "SHOW_ENTITY" {
if entity.info.guessedCardState != GuessedCardState.none {
entity.info.guessedCardState = GuessedCardState.revealed
Expand Down
15 changes: 0 additions & 15 deletions HSTracker/Logging/Parsers/TagChangeActions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ struct TagChangeActions {
self.onRevealed(eventHandler: eventHandler, id: id, value: value, previous: prevValue)
case .parent_card:
self.onParentCardChange(eventHandler: eventHandler, id: id, value: value, previous: prevValue)
case .cant_play:
self.cantPlayChange(eventHandler: eventHandler, id: id, value: value, previous: prevValue)
case .health:
self.healthChange(eventHandler: eventHandler, id: id, value: value, previous: prevValue)
case .maxresources:
Expand Down Expand Up @@ -648,19 +646,6 @@ struct TagChangeActions {
}
}

private func cantPlayChange(eventHandler: PowerEventHandler, id: Int, value: Int, previous: Int) {
guard let entity = eventHandler.entities[id] else {
return
}

let player = entity.isControlled(by: eventHandler.player.id) ? eventHandler.player : eventHandler.opponent
player?.cardsPlayedThisMatch.remove(entity)
player?.cardsPlayedThisTurn.remove(entity)
player?.spellsPlayedCards.remove(entity)
player?.spellsPlayedInFriendlyCharacters.remove(entity)
player?.spellsPlayedInOpponentCharacters.remove(entity)
}

private func onParentCardChange(eventHandler: PowerEventHandler, id: Int, value: Int, previous: Int) {
guard let entity = eventHandler.entities[id] else {
return
Expand Down