Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace explicit check with FATEFUL_HOUR.accept

master
melvin 2012-08-28 21:53:31 +08:00
parent ecab1e8cd1
commit 2bcc7e1924
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/magic/card/Gather_the_Townsfolk.java
View File

@ -9,6 +9,7 @@ import magic.model.action.MagicPlayTokenAction;
import magic.model.event.MagicEvent;
import magic.model.event.MagicSpellCardEvent;
import magic.model.stack.MagicCardOnStack;
import magic.model.condition.MagicCondition;
public class Gather_the_Townsfolk {
public static final MagicSpellCardEvent S = new MagicSpellCardEvent() {
@ -20,7 +21,7 @@ public class Gather_the_Townsfolk {
return new MagicEvent(
cardOnStack.getCard(),
player,
new Object[]{cardOnStack,player},
new Object[]{cardOnStack},
this,
player + " puts two 1/1 white Human " +
"creature tokens onto the battlefield.");
@ -32,11 +33,10 @@ public class Gather_the_Townsfolk {
final Object[] data,
final Object[] choiceResults) {
game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0]));
final MagicPlayer player = (MagicPlayer)data[1];
int amount = (player.getLife() <= 5) ? 5 : 2;
int amount = MagicCondition.FATEFUL_HOUR.accept(event.getSource()) ? 5 : 2;
for (;amount>0;amount--) {
game.doAction(new MagicPlayTokenAction(
player,
event.getPlayer(),
TokenCardDefinitions.get("Human1")));
}
}

6
src/magic/model/condition/MagicCondition.java
View File

@ -259,6 +259,12 @@ public interface MagicCondition {
}
};
MagicCondition FATEFUL_HOUR = new MagicCondition() {
public boolean accept(final MagicSource source) {
return source.getController().getLife() <= 5;
}
};
MagicCondition POWER_4_OR_GREATER_CONDITION = new MagicCondition() {
public boolean accept(final MagicSource source) {
final MagicPermanent permanent = (MagicPermanent)source;