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

War: Proliferate: rework effect now put each counter type on it

Browse Source
This commit is contained in:
Hans Mackowiak
2019-04-10 10:23:00 +00:00
committed by swordshine
parent 5c95216d9d
commit 2617795e37
23 changed files with 116 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
forge-gui/src/main/java/forge/match/input/InputProliferate.java
View File

@@ -1,131 +0,0 @@
package forge.match.input;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.game.GameEntity;
import forge.game.card.Card;
import forge.game.card.CounterType;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.player.PlayerControllerHuman;
import forge.util.ITriggerEvent;
public final class InputProliferate extends InputSelectManyBase<GameEntity> {
private static final long serialVersionUID = -1779224307654698954L;
private final Map<GameEntity, CounterType> chosenCounters = new HashMap<GameEntity, CounterType>();
private SpellAbility sa;
public InputProliferate(final PlayerControllerHuman controller, final SpellAbility sa) {
super(controller, 1, Integer.MAX_VALUE);
this.sa = sa;
}
@Override
protected String getMessage() {
final StringBuilder sb = new StringBuilder();
if ( FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DETAILED_SPELLDESC_IN_PROMPT) &&
sa != null ) {
sb.append(sa.getStackDescription()).append("\n");
}
sb.append("Choose permanents and/or players with counters on them to add one more counter of that type.");
sb.append("\n\nYou've selected so far:\n");
if (chosenCounters.isEmpty()) {
sb.append("(none)");
}
else {
for (final Entry<GameEntity, CounterType> ge : chosenCounters.entrySet()) {
sb.append("* ").append(ge.getKey()).append(" -> ").append(ge.getValue()).append("counter\n");
}
}
return sb.toString();
}
@Override
protected boolean onCardSelected(final Card card, final List<Card> otherCardsToSelect, final ITriggerEvent triggerEvent) {
if (!card.hasCounters()) {
return false;
}
final boolean entityWasSelected = chosenCounters.containsKey(card);
if (entityWasSelected) {
this.chosenCounters.remove(card);
}
else {
final List<CounterType> choices = new ArrayList<CounterType>();
for (final CounterType ct : CounterType.values()) {
if (card.getCounters(ct) > 0) {
choices.add(ct);
}
}
final CounterType toAdd = choices.size() == 1 ? choices.get(0) : getController().getGui().one("Select counter type", choices);
chosenCounters.put(card, toAdd);
}
refresh();
return true;
}
@Override
public String getActivateAction(final Card card) {
if (card.hasCounters() && !chosenCounters.containsKey(card)) {
return "add counter to card";
}
return null;
}
@Override
protected final void onPlayerSelected(final Player player, final ITriggerEvent triggerEvent) {
if (!player.hasCounters()) {
// Can't select a player without counters
return;
}
final boolean entityWasSelected = chosenCounters.containsKey(player);
if (entityWasSelected) {
this.chosenCounters.remove(player);
} else {
final List<CounterType> choices = new ArrayList<CounterType>();
for (final CounterType ct : player.getCounters().keySet()) {
if (player.getCounters(ct) > 0) {
choices.add(ct);
}
}
if (player.hasKeyword("You can't get poison counters")) {
choices.remove(CounterType.POISON);
}
final CounterType toAdd = choices.size() == 1 ? choices.get(0) : getController().getGui().one("Select counter type", choices);
this.chosenCounters.put(player, toAdd);
}
refresh();
}
public Map<GameEntity, CounterType> getProliferationMap() {
return chosenCounters;
}
@Override
protected boolean hasEnoughTargets() { return true; }
@Override
protected boolean hasAllTargets() { return false; }
@Override
public Collection<GameEntity> getSelected() {
// TODO Auto-generated method stub
return chosenCounters.keySet();
}

11
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1724,17 +1724,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
return HumanPlay.playSpellAbility(this, player, tgtSA);
}
@Override
public Map<GameEntity, CounterType> chooseProliferation(final SpellAbility sa) {
final InputProliferate inp = new InputProliferate(this, sa);
inp.setCancelAllowed(true);
inp.showAndWait();
if (inp.hasCancelled()) {
return null;
}
return inp.getProliferationMap();
}
@Override
public boolean chooseTargetsFor(final SpellAbility currentAbility) {
final TargetSelection select = new TargetSelection(this, currentAbility);