mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-15 18:28:00 +00:00
add support for "RememberMovedToZone" to DigEffect
This commit is contained in:
@@ -87,6 +87,20 @@ public class DigEffect extends SpellAbilityEffect {
|
|||||||
final boolean mayBeSkipped = sa.hasParam("PromptToSkipOptionalAbility");
|
final boolean mayBeSkipped = sa.hasParam("PromptToSkipOptionalAbility");
|
||||||
final String optionalAbilityPrompt = sa.hasParam("OptionalAbilityPrompt") ? sa.getParam("OptionalAbilityPrompt") : "";
|
final String optionalAbilityPrompt = sa.hasParam("OptionalAbilityPrompt") ? sa.getParam("OptionalAbilityPrompt") : "";
|
||||||
|
|
||||||
|
boolean remZone1 = false;
|
||||||
|
boolean remZone2 = false;
|
||||||
|
if (sa.hasParam("RememberChanged")) {
|
||||||
|
remZone1 = true;
|
||||||
|
}
|
||||||
|
if (sa.hasParam("RememberMovedToZone")) {
|
||||||
|
if (sa.getParam("RememberMovedToZone").contains("1")) {
|
||||||
|
remZone1 = true;
|
||||||
|
}
|
||||||
|
if (sa.getParam("RememberMovedToZone").contains("2")) {
|
||||||
|
remZone2 = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
boolean changeAll = false;
|
boolean changeAll = false;
|
||||||
boolean allButOne = false;
|
boolean allButOne = false;
|
||||||
|
|
||||||
@@ -341,7 +355,7 @@ public class DigEffect extends SpellAbilityEffect {
|
|||||||
if (sa.hasParam("ForgetOtherRemembered")) {
|
if (sa.hasParam("ForgetOtherRemembered")) {
|
||||||
host.clearRemembered();
|
host.clearRemembered();
|
||||||
}
|
}
|
||||||
if (sa.hasParam("RememberChanged")) {
|
if (remZone1) {
|
||||||
host.addRemembered(c);
|
host.addRemembered(c);
|
||||||
}
|
}
|
||||||
rest.remove(c);
|
rest.remove(c);
|
||||||
@@ -376,6 +390,9 @@ public class DigEffect extends SpellAbilityEffect {
|
|||||||
if (m != null && !origin.equals(m.getZone().getZoneType())) {
|
if (m != null && !origin.equals(m.getZone().getZoneType())) {
|
||||||
table.put(origin, m.getZone().getZoneType(), m);
|
table.put(origin, m.getZone().getZoneType(), m);
|
||||||
}
|
}
|
||||||
|
if (remZone2) {
|
||||||
|
host.addRemembered(m);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -395,6 +412,9 @@ public class DigEffect extends SpellAbilityEffect {
|
|||||||
}
|
}
|
||||||
c.setExiledWith(effectHost);
|
c.setExiledWith(effectHost);
|
||||||
c.setExiledBy(effectHost.getController());
|
c.setExiledBy(effectHost.getController());
|
||||||
|
if (remZone2) {
|
||||||
|
host.addRemembered(c);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user