Fix Zenos yae Galvus and Shinryu, Transcendent Rival triggers.

This commit is contained in:
Grath 2025-06-08 00:54:31 -04:00
parent 4bc30b4b8e
commit 341f73ff7e
2 changed files with 5 additions and 3 deletions

View file

@ -120,13 +120,14 @@ class ShinryuTranscendentRivalTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.LOSES;
return event.getType() == GameEvent.EventType.LOST;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
this.initSourceObjectZoneChangeCounter(game, false);
return Optional
.ofNullable(this.getId() + "_" + this.getSourceObjectZoneChangeCounter() + "_opponent")
.of(this.getSourceId() + "_" + this.getSourceObjectZoneChangeCounter() + "_opponent")
.map(game.getState()::getValue)
.map(event.getPlayerId()::equals)
.orElse(false);

View file

@ -88,8 +88,9 @@ enum ZenosYaeGalvusPredicate implements ObjectSourcePlayerPredicate<Permanent> {
@Override
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
input.getSource().initSourceObjectZoneChangeCounter(game, false);
return flag == Optional
.ofNullable(CardUtil.getObjectZoneString(
.of(CardUtil.getObjectZoneString(
"chosenCreature", input.getSource().getSourceId(), game,
input.getSource().getSourceObjectZoneChangeCounter(), false
))