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

Revert TriggerHandler to r28873; accidentally committed some experimental code that evidently wasn't working.

Browse Source
This commit is contained in:
elcnesh
2015-02-25 22:09:34 +00:00
parent 3b114d8c46
commit 805bed02c7
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -145,22 +145,17 @@ public class TriggerHandler {
} }
public static Trigger parseTrigger(final Map<String, String> mapParams, final Card host, final boolean intrinsic) { public static Trigger parseTrigger(final Map<String, String> mapParams, final Card host, final boolean intrinsic) {
final TriggerType type = TriggerType.smartValueOf(mapParams.get("Mode")); Trigger ret = null;
final Trigger ret = type.createTrigger(mapParams, host, intrinsic);
final String triggerZones = mapParams.get("TriggerZones"); final TriggerType type = TriggerType.smartValueOf(mapParams.get("Mode"));
ret = type.createTrigger(mapParams, host, intrinsic);
String triggerZones = mapParams.get("TriggerZones");
if (null != triggerZones) { if (null != triggerZones) {
ret.setActiveZone(EnumSet.copyOf(ZoneType.listValueOf(triggerZones))); ret.setActiveZone(EnumSet.copyOf(ZoneType.listValueOf(triggerZones)));
} else if (type == TriggerType.ChangesZone) {
// Special case, because ChangesZone triggers on cards don't
// specify their TriggerZone
final String origin = mapParams.get("Destination");
if (!"Any".equals(origin)) {
ret.setActiveZone(EnumSet.copyOf(ZoneType.listValueOf(origin)));
}
} }
final String triggerPhases = mapParams.get("Phase"); String triggerPhases = mapParams.get("Phase");
if (null != triggerPhases) { if (null != triggerPhases) {
ret.setTriggerPhases(PhaseType.parseRange(triggerPhases)); ret.setTriggerPhases(PhaseType.parseRange(triggerPhases));
} }
@@ -503,7 +498,7 @@ public class TriggerHandler {
decider = AbilityUtils.getDefinedPlayers(host, triggerParams.get("OptionalDecider"), sa).get(0); decider = AbilityUtils.getDefinedPlayers(host, triggerParams.get("OptionalDecider"), sa).get(0);
} }
else if (sa instanceof AbilitySub || !sa.hasParam("Cost") || sa.getParam("Cost").equals("0")) { else if (sa instanceof AbilitySub || !sa.hasParam("Cost") || sa.getParam("Cost").equals("0")) {
mand = true; mand = true;
} }
else { // triggers with a cost can't be mandatory else { // triggers with a cost can't be mandatory
sa.setOptionalTrigger(true); sa.setOptionalTrigger(true);