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

TriggerCounterAdded: add ValidSource Parameter for Triggers that only should affect your sources

Browse Source
This commit is contained in:
Hanmac
2017-04-21 07:47:13 +00:00
parent d235a8d136
commit 9b2adf7686
2 changed files with 53 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
View File

@@ -17,6 +17,8 @@
*/ */
package forge.game.trigger; package forge.game.trigger;
import java.util.Map;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CounterType; import forge.game.card.CounterType;
import forge.game.player.Player; import forge.game.player.Player;
@@ -44,38 +46,55 @@ public class TriggerCounterAdded extends Trigger {
* @param intrinsic * @param intrinsic
* the intrinsic * the intrinsic
*/ */
public TriggerCounterAdded(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) { public TriggerCounterAdded(final Map<String, String> params, final Card host, final boolean intrinsic) {
super(params, host, intrinsic); super(params, host, intrinsic);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean performTest(final java.util.Map<String, Object> runParams2) { public final boolean performTest(final Map<String, Object> runParams2) {
final CounterType addedType = (CounterType) runParams2.get("CounterType"); final CounterType addedType = (CounterType) runParams2.get("CounterType");
if (this.mapParams.containsKey("ValidCard")) { if (hasParam("ValidCard")) {
if (!runParams2.containsKey("Card")) if (!runParams2.containsKey("Card"))
return false; return false;
final Card addedTo = (Card) runParams2.get("Card"); final Card addedTo = (Card) runParams2.get("Card");
if (!addedTo.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(), if (!addedTo.isValid(getParam("ValidCard").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) { this.getHostCard(), null)) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("ValidPlayer")) { if (hasParam("ValidPlayer")) {
if (!runParams2.containsKey("Player")) if (!runParams2.containsKey("Player"))
return false; return false;
final Player addedTo = (Player) runParams2.get("Player"); final Player addedTo = (Player) runParams2.get("Player");
if (!addedTo.isValid(this.mapParams.get("ValidPlayer").split(","), this.getHostCard().getController(), if (!addedTo.isValid(getParam("ValidPlayer").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) { this.getHostCard(), null)) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("CounterType")) {
final String type = this.mapParams.get("CounterType"); if (hasParam("ValidSource")) {
if (!runParams2.containsKey("Source"))
return false;
final Card source = (Card) runParams2.get("Source");
if (source == null) {
return false;
}
if (!source.isValid(getParam("ValidSource").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) {
return false;
}
}
if (hasParam("CounterType")) {
final String type = getParam("CounterType");
if (!type.equals(addedType.toString())) { if (!type.equals(addedType.toString())) {
return false; return false;
} }

34
forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
View File

@@ -17,6 +17,8 @@
*/ */
package forge.game.trigger; package forge.game.trigger;
import java.util.Map;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CounterType; import forge.game.card.CounterType;
import forge.game.player.Player; import forge.game.player.Player;
@@ -44,39 +46,55 @@ public class TriggerCounterAddedOnce extends Trigger {
* @param intrinsic * @param intrinsic
* the intrinsic * the intrinsic
*/ */
public TriggerCounterAddedOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) { public TriggerCounterAddedOnce(final Map<String, String> params, final Card host, final boolean intrinsic) {
super(params, host, intrinsic); super(params, host, intrinsic);
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean performTest(final java.util.Map<String, Object> runParams2) { public final boolean performTest(final Map<String, Object> runParams2) {
final CounterType addedType = (CounterType) runParams2.get("CounterType"); final CounterType addedType = (CounterType) runParams2.get("CounterType");
if (this.mapParams.containsKey("ValidCard")) { if (hasParam("ValidCard")) {
if (!runParams2.containsKey("Card")) if (!runParams2.containsKey("Card"))
return false; return false;
final Card addedTo = (Card) runParams2.get("Card"); final Card addedTo = (Card) runParams2.get("Card");
if (!addedTo.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(), if (!addedTo.isValid(getParam("ValidCard").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) { this.getHostCard(), null)) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("ValidPlayer")) { if (hasParam("ValidPlayer")) {
if (!runParams2.containsKey("Player")) if (!runParams2.containsKey("Player"))
return false; return false;
final Player addedTo = (Player) runParams2.get("Player"); final Player addedTo = (Player) runParams2.get("Player");
if (!addedTo.isValid(this.mapParams.get("ValidPlayer").split(","), this.getHostCard().getController(), if (!addedTo.isValid(getParam("ValidPlayer").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) { this.getHostCard(), null)) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("CounterType")) { if (hasParam("ValidSource")) {
final String type = this.mapParams.get("CounterType"); if (!runParams2.containsKey("Source"))
return false;
final Card source = (Card) runParams2.get("Source");
if (source == null) {
return false;
}
if (!source.isValid(getParam("ValidSource").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) {
return false;
}
}
if (hasParam("CounterType")) {
final String type = getParam("CounterType");
if (!type.equals(addedType.toString())) { if (!type.equals(addedType.toString())) {
return false; return false;
} }