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

- Add changes to allow for a one of the two piles to be facedown

Browse Source 
- Add Fortune's Favor
This commit is contained in:
Sol
2016-07-26 14:32:42 +00:00
parent 9496bf38fd
commit d41c0bc3e0
9 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java
View File

@@ -268,11 +268,7 @@ public class PumpEffect extends SpellAbilityEffect {
}
if (sa.hasParam("RememberObjects")) {
pumpRemembered = sa.getParam("RememberObjects");
}
if (pumpRemembered != null) {
for (final Object o : AbilityUtils.getDefinedObjects(host, pumpRemembered, sa)) {
for (final Object o : AbilityUtils.getDefinedObjects(host, sa.getParam("RememberObjects"), sa)) {
host.addRemembered(o);
}
}

15
forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java
View File

@@ -89,16 +89,21 @@ public class TwoPilesEffect extends SpellAbilityEffect {
return;
}
String title = "One".equals(sa.getParamOrDefault("FaceDown", "False")) ? "Select cards for a face down pile" :
"Divide cards into two piles";
card.clearRemembered();
// first, separate the cards into piles
final CardCollectionView pile1 = separator.getController().chooseCardsForEffect(pool, sa, "Divide cards into two piles", 0, size, false);
final CardCollectionView pile1 = separator.getController().chooseCardsForEffect(pool, sa, title, 0, size, false);
final CardCollection pile2 = new CardCollection(pool);
pile2.removeAll(pile1);
System.out.println("Pile 1:" + pile1);
System.out.println("Pile 2:" + pile2);
card.clearRemembered();
//System.out.println("Pile 1:" + pile1);
//System.out.println("Pile 2:" + pile2);
pile1WasChosen = chooser.getController().chooseCardsPile(sa, pile1, pile2, !sa.hasParam("FaceDown"));
pile1WasChosen = chooser.getController().chooseCardsPile(sa, pile1, pile2, sa.getParamOrDefault("FaceDown", "False"));
CardCollectionView chosenPile = pile1WasChosen ? pile1 : pile2;
CardCollectionView unchosenPile = !pile1WasChosen ? pile1 : pile2;

2
forge-game/src/main/java/forge/game/player/PlayerController.java
View File

@@ -205,7 +205,7 @@ public abstract class PlayerController {
public abstract boolean playSaFromPlayEffect(SpellAbility tgtSA);
public abstract Map<GameEntity, CounterType> chooseProliferation();
public abstract boolean chooseCardsPile(SpellAbility sa, CardCollectionView pile1, CardCollectionView pile2, boolean faceUp);
public abstract boolean chooseCardsPile(SpellAbility sa, CardCollectionView pile1, CardCollectionView pile2, String faceUp);
public abstract void revealAnte(String message, Multimap<Player, PaperCard> removedAnteCards);