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

- RtR: Added Search the City

Browse Source
This commit is contained in:
moomarc
2012-09-19 07:49:38 +00:00
parent fd0f91435c
commit 147793ae9c
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -950,6 +950,7 @@ public final class AbilityFactoryChangeZone {
} }
final String remember = params.get("RememberChanged"); final String remember = params.get("RememberChanged");
final String forget = params.get("ForgetChanged");
final String imprint = params.get("Imprint"); final String imprint = params.get("Imprint");
if (params.containsKey("Unimprint")) { if (params.containsKey("Unimprint")) {
@@ -1034,6 +1035,9 @@ public final class AbilityFactoryChangeZone {
if (remember != null) { if (remember != null) {
card.addRemembered(movedCard); card.addRemembered(movedCard);
} }
if (forget != null) {
sa.getSourceCard().getRemembered().remove(movedCard);
}
// for imprinted since this doesn't use Target // for imprinted since this doesn't use Target
if (imprint != null) { if (imprint != null) {
card.addImprinted(movedCard); card.addImprinted(movedCard);
@@ -1114,6 +1118,7 @@ public final class AbilityFactoryChangeZone {
final ZoneType destination = ZoneType.smartValueOf(params.get("Destination")); final ZoneType destination = ZoneType.smartValueOf(params.get("Destination"));
final CardList fetched = new CardList(); final CardList fetched = new CardList();
final String remember = params.get("RememberChanged"); final String remember = params.get("RememberChanged");
final String forget = params.get("ForgetChanged");
final String imprint = params.get("Imprint"); final String imprint = params.get("Imprint");
if (params.containsKey("Unimprint")) { if (params.containsKey("Unimprint")) {
@@ -1287,6 +1292,9 @@ public final class AbilityFactoryChangeZone {
if (remember != null) { if (remember != null) {
card.addRemembered(newCard); card.addRemembered(newCard);
} }
if (forget != null) {
sa.getSourceCard().getRemembered().remove(movedCard);
}
// for imprinted since this doesn't use Target // for imprinted since this doesn't use Target
if (imprint != null) { if (imprint != null) {
card.addImprinted(newCard); card.addImprinted(newCard);

4
src/main/java/forge/card/abilityfactory/AbilityFactoryZoneAffecting.java
View File

@@ -1053,6 +1053,10 @@ public class AbilityFactoryZoneAffecting {
final int numCards = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("NumCards"), sa); final int numCards = AbilityFactory.calculateAmount(sa.getSourceCard(), params.get("NumCards"), sa);
final boolean bottom = params.containsKey("FromBottom"); final boolean bottom = params.containsKey("FromBottom");
if (params.containsKey("ForgetOtherRemembered")) {
source.clearRemembered();
}
ArrayList<Player> tgtPlayers; ArrayList<Player> tgtPlayers;
final Target tgt = sa.getTarget(); final Target tgt = sa.getTarget();