*Added TurnFaceUp trigger-mode.

This commit is contained in:
jendave
2011-08-06 15:06:18 +00:00
parent ce51bcbbc1
commit cfffda2352
5 changed files with 34 additions and 4 deletions

1
.gitattributes vendored
View File

@@ -6677,6 +6677,7 @@ src/forge/Trigger_Phase.java -text svneol=native#text/plain
src/forge/Trigger_Sacrificed.java -text svneol=native#text/plain
src/forge/Trigger_SpellCast.java -text svneol=native#text/plain
src/forge/Trigger_Taps.java -text svneol=native#text/plain
src/forge/Trigger_TurnFaceUp.java -text svneol=native#text/plain
src/forge/Trigger_Untaps.java -text svneol=native#text/plain
src/forge/UndoCommand.java svneol=native#text/plain
src/forge/Wait.java svneol=native#text/plain

View File

@@ -1377,6 +1377,11 @@ public class Card extends MyObservable {
public void turnFaceUp() {
for(Command var:turnFaceUpCommandList)
var.execute();
//Run triggers
HashMap<String,Object> runParams = new HashMap<String,Object>();
runParams.put("Morpher", this);
AllZone.TriggerHandler.runTrigger("TurnFaceUp", runParams);
}
public void addDestroyCommand(Command c) {

View File

@@ -65,6 +65,10 @@ public class TriggerHandler {
{
ret = new Trigger_Taps(mapParams,host);
}
else if(mode.equals("TurnFaceUp"))
{
ret = new Trigger_TurnFaceUp(mapParams,host);
}
else if(mode.equals("Untaps"))
{
ret = new Trigger_Untaps(mapParams,host);

View File

@@ -14,8 +14,6 @@ public class Trigger_AttackerBlocked extends Trigger {
{
if(!matchesValid(runParams.get("Attacker"),mapParams.get("ValidCard").split(","),hostCard))
{
System.out.println("Attacker = " + ((Card)runParams.get("Attacker")).getName());
System.out.println("Test failed: Attacker not valid.");
return false;
}
}
@@ -23,8 +21,6 @@ public class Trigger_AttackerBlocked extends Trigger {
{
if(!matchesValid(runParams.get("Blocker"),mapParams.get("ValidBlocker").split(","),hostCard))
{
System.out.println("Blocker = " + ((Card)runParams.get("Blocker")).getName());
System.out.println("Test failed: Blocker not valid.");
return false;
}
}

View File

@@ -0,0 +1,24 @@
package forge;
import java.util.HashMap;
public class Trigger_TurnFaceUp extends Trigger {
public Trigger_TurnFaceUp(HashMap<String, String> params, Card host) {
super(params, host);
}
@Override
public boolean performTest(HashMap<String, Object> runParams) {
if(mapParams.containsKey("ValidCard"))
{
if(!matchesValid(runParams.get("Morpher"),mapParams.get("ValidCard").split(","),hostCard))
{
return false;
}
}
return true;
}
}