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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ app/main/proto/messages.proto

!.claude/
.claude/CLAUDE.md
.claude/worktrees/

# Contains creds
deploy/services-proxy.conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ object AnnotationBuilder {
fun affectorSourceFromEvents(forgeCardId: Int, events: List<GameEvent>): Int? {
for (ev in events) {
when {
ev is GameEvent.CardMilled && ev.forgeCardId == forgeCardId -> return ev.sourceForgeCardId
ev is GameEvent.CardSurveiled && ev.forgeCardId == forgeCardId -> return ev.sourceForgeCardId
ev is GameEvent.CardDestroyed && ev.forgeCardId == forgeCardId -> return ev.sourceForgeCardId
}
Expand Down
1 change: 1 addition & 0 deletions matchdoor/src/main/kotlin/leyline/game/GameEvent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ sealed interface GameEvent {
data class CardMilled(
val forgeCardId: Int,
val seatId: Int,
val sourceForgeCardId: Int? = null,
) : GameEvent

/** A card was moved Library→Hand via a search effect (tutor, ChangeZone).
Expand Down
6 changes: 4 additions & 2 deletions matchdoor/src/main/kotlin/leyline/game/GameEventCollector.kt
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,10 @@ class GameEventCollector(private val bridge: GameBridge) : IGameEventVisitor.Bas
}
from == ZoneType.Hand && to == ZoneType.Graveyard ->
GameEvent.CardDiscarded(card.id, seat)
from == ZoneType.Library && to == ZoneType.Graveyard ->
GameEvent.CardMilled(card.id, seat)
from == ZoneType.Library && to == ZoneType.Graveyard -> {
val sourceId = bridge.getGame()?.stack?.peek()?.spellAbility?.hostCard?.id
GameEvent.CardMilled(card.id, seat, sourceId)
}
from == ZoneType.Library && to == ZoneType.Hand && isSearchedToHand(card.id) ->
GameEvent.CardSearchedToHand(card.id)
else -> GameEvent.ZoneChanged(card.id, Zone.fromForge(from), Zone.fromForge(to))
Expand Down
11 changes: 9 additions & 2 deletions matchdoor/src/test/kotlin/leyline/game/CategoryFromEventsTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,16 @@ class CategoryFromEventsTest :
AnnotationBuilder.affectorSourceFromEvents(55, events) shouldBe 42
}

test("affectorSourceReturnsNullForNonSurveil") {
test("affectorSourceReturnsMillSourceCard") {
val events = listOf(
GameEvent.CardMilled(forgeCardId = 55, seatId = 1),
GameEvent.CardMilled(forgeCardId = 55, seatId = 1, sourceForgeCardId = 42),
)
AnnotationBuilder.affectorSourceFromEvents(55, events) shouldBe 42
}

test("affectorSourceReturnsNullWhenMillHasNoSource") {
val events = listOf(
GameEvent.CardMilled(forgeCardId = 55, seatId = 1, sourceForgeCardId = null),
)
AnnotationBuilder.affectorSourceFromEvents(55, events).shouldBeNull()
}
Expand Down
Loading