external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ChangeZoneEffect: add Meld and Mutate for TriggerChangesZoneAll

Browse Source
This commit is contained in:
Hans Mackowiak
2021-03-04 15:23:05 +01:00
parent 35b1fde876
commit a653085e60
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java
View File

@@ -223,6 +223,19 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
if (!movedCard.getZone().equals(originZone)) { if (!movedCard.getZone().equals(originZone)) {
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), movedCard); triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), movedCard);
if (c.getMeldedWith() != null) {
Card meld = game.getCardState(c.getMeldedWith(), null);
if (meld != null) {
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), meld);
}
}
if (c.hasMergedCard()) {
for (final Card cm : c.getMergedCards()) {
if (cm == c) continue;
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), cm);
}
}
} }
} }

22
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -728,16 +728,28 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
} }
} }
if (!movedCard.getZone().equals(originZone)) { if (!movedCard.getZone().equals(originZone)) {
Card meld = null;
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), movedCard); triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), movedCard);
if (gameCard.getMeldedWith() != null) {
meld = game.getCardState(gameCard.getMeldedWith(), null);
if (meld != null) {
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), meld);
}
}
if (gameCard.hasMergedCard()) {
for (final Card c : gameCard.getMergedCards()) {
if (c == gameCard) continue;
triggerList.put(originZone.getZoneType(), movedCard.getZone().getZoneType(), c);
}
}
if (remember != null) { if (remember != null) {
hostCard.addRemembered(movedCard); hostCard.addRemembered(movedCard);
// addRememberedFromCardState ? // addRememberedFromCardState ?
if (gameCard.getMeldedWith() != null) { if (meld != null) {
Card meld = game.getCardState(gameCard.getMeldedWith(), null); hostCard.addRemembered(meld);
if (meld != null) {
hostCard.addRemembered(meld);
}
} }
if (gameCard.hasMergedCard()) { if (gameCard.hasMergedCard()) {
for (final Card c : gameCard.getMergedCards()) { for (final Card c : gameCard.getMergedCards()) {