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

Update some triggers

Browse Source
This commit is contained in:
swordshine
2019-04-17 20:12:39 +08:00
parent afbcdf3928
commit 445c0b2c75
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
View File

@@ -54,22 +54,22 @@ public class TriggerCounterRemoved extends Trigger {
final CounterType addedType = (CounterType) runParams2.get("CounterType"); final CounterType addedType = (CounterType) runParams2.get("CounterType");
final Integer addedNewCounterAmount = (Integer) runParams2.get("NewCounterAmount"); final Integer addedNewCounterAmount = (Integer) runParams2.get("NewCounterAmount");
if (this.mapParams.containsKey("ValidCard")) { if (hasParam("ValidCard")) {
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("CounterType")) { if (hasParam("CounterType")) {
final String type = this.mapParams.get("CounterType"); final String type = getParam("CounterType");
if (!type.equals(addedType.toString())) { if (!type.equals(addedType.toString())) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("NewCounterAmount")) { if (hasParam("NewCounterAmount")) {
final String amtString = this.mapParams.get("NewCounterAmount"); final String amtString = getParam("NewCounterAmount");
int amt = Integer.parseInt(amtString); int amt = Integer.parseInt(amtString);
if(amt != addedNewCounterAmount.intValue()) { if(amt != addedNewCounterAmount.intValue()) {
return false; return false;

10
forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
View File

@@ -50,18 +50,18 @@ public class TriggerCounterRemovedOnce extends Trigger {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final boolean performTest(final java.util.Map<String, Object> runParams2) { public final boolean performTest(final java.util.Map<String, Object> runParams2) {
final Card addedTo = (Card) runParams2.get("Card"); final Card removedFrom = (Card) runParams2.get("Card");
final CounterType removedType = (CounterType) runParams2.get("CounterType"); final CounterType removedType = (CounterType) runParams2.get("CounterType");
if (this.mapParams.containsKey("ValidCard")) { if (hasParam("ValidCard")) {
if (!addedTo.isValid(this.mapParams.get("ValidCard").split(","), this.getHostCard().getController(), if (!removedFrom.isValid(getParam("ValidCard").split(","), this.getHostCard().getController(),
this.getHostCard(), null)) { this.getHostCard(), null)) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("CounterType")) { if (hasParam("CounterType")) {
final String type = this.mapParams.get("CounterType"); final String type = getParam("CounterType");
if (!type.equals(removedType.toString())) { if (!type.equals(removedType.toString())) {
return false; return false;
} }

8
forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
View File

@@ -14,20 +14,20 @@ public class TriggerCrewed extends Trigger {
@Override @Override
public boolean performTest(Map<String, Object> runParams2) { public boolean performTest(Map<String, Object> runParams2) {
if (this.mapParams.containsKey("ValidVehicle")) { if (hasParam("ValidVehicle")) {
if (!matchesValid(runParams2.get("Vehicle"), this.mapParams.get("ValidVehicle").split(","), if (!matchesValid(runParams2.get("Vehicle"), getParam("ValidVehicle").split(","),
this.getHostCard())) { this.getHostCard())) {
return false; return false;
} }
} }
if (this.mapParams.containsKey("ValidCrew")) { if (hasParam("ValidCrew")) {
if (runParams2.get("Crew") == null) { if (runParams2.get("Crew") == null) {
return false; return false;
} }
boolean passes = false; boolean passes = false;
for (Object member : (CardCollection)runParams2.get("Crew")) { for (Object member : (CardCollection)runParams2.get("Crew")) {
passes |= matchesValid(member, this.mapParams.get("ValidCrew").split(","), passes |= matchesValid(member, getParam("ValidCrew").split(","),
this.getHostCard()); this.getHostCard());
} }
if (!passes) if (!passes)