added 'enters tapped' keyword ability
parent
a42b6baf33
commit
7ed5a3784d
3
Makefile
3
Makefile
|
@ -32,6 +32,9 @@ themes: \
|
|||
release/mods/redfire_theme.zip \
|
||||
release/mods/whiteangel_theme.zip
|
||||
|
||||
code_to_remove: $(MAG)
|
||||
cat src/magic/card/*.java | sed 's/\s\+//g' | sort | uniq -c | sort -n | grep publicstaticfinal | grep ");" > $@
|
||||
|
||||
casts: $(MAG)
|
||||
grep -n "([A-Z]\+[a-z]\+[A-Za-z]*)" -r src/ | flip -u > $@
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@ package magic.model;
|
|||
|
||||
public enum MagicAbility {
|
||||
|
||||
EntersTapped("enters tapped", -10),
|
||||
Echo("echo",-20),
|
||||
AttacksEachTurnIfAble("attacks each turn if able",-10),
|
||||
CannotBlock("can't block",-50),
|
||||
|
|
|
@ -17,6 +17,7 @@ import magic.model.trigger.MagicBattleCryTrigger;
|
|||
import magic.model.trigger.MagicExaltedTrigger;
|
||||
import magic.model.trigger.MagicLivingWeaponTrigger;
|
||||
import magic.model.trigger.MagicEchoTrigger;
|
||||
import magic.model.trigger.MagicTappedIntoPlayTrigger;
|
||||
import magic.model.trigger.MagicTrigger;
|
||||
import magic.model.mstatic.MagicStatic;
|
||||
import magic.model.mstatic.MagicCDA;
|
||||
|
@ -609,6 +610,8 @@ public class MagicCardDefinition {
|
|||
addTrigger(MagicLivingWeaponTrigger.getInstance());
|
||||
} else if (ability==MagicAbility.Echo) {
|
||||
addTrigger(MagicEchoTrigger.create());
|
||||
} else if (ability==MagicAbility.EntersTapped) {
|
||||
addTrigger(MagicTappedIntoPlayTrigger.create());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,15 @@ import magic.model.action.MagicTapAction;
|
|||
import magic.model.event.MagicEvent;
|
||||
|
||||
public class MagicTappedIntoPlayTrigger extends MagicWhenComesIntoPlayTrigger {
|
||||
|
||||
private static final MagicTappedIntoPlayTrigger INSTANCE = new MagicTappedIntoPlayTrigger();
|
||||
|
||||
private MagicTappedIntoPlayTrigger() {}
|
||||
|
||||
public static MagicTappedIntoPlayTrigger create() {
|
||||
return INSTANCE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
|
||||
return new MagicEvent(
|
||||
|
|
Loading…
Reference in New Issue