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

added 'your upkeep effect <effect>'

master
melvin 2013-10-30 10:23:56 +08:00
parent fa16fc4018
commit 45bd4a7161
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/magic/model/MagicAbility.java
View File

@ -828,6 +828,13 @@ public enum MagicAbility {
));
}
},
YourUpkeepEffect("your upkeep effect", 10) {
protected void addAbilityImpl(final MagicAbilityStore card, final String arg) {
card.add(MagicAtUpkeepTrigger.createYour(
MagicRuleEventAction.create(arg)
));
}
},
BattalionEffect("battalion effect", 10) {
protected void addAbilityImpl(final MagicAbilityStore card, final String arg) {
card.add(MagicBattalionTrigger.create(

13
src/magic/model/trigger/MagicAtUpkeepTrigger.java
View File

@ -29,6 +29,19 @@ public abstract class MagicAtUpkeepTrigger extends MagicTrigger<MagicPlayer> {
};
}
public static final MagicAtUpkeepTrigger createYour(final MagicSourceEvent sourceEvent) {
return new MagicAtUpkeepTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer upkeepPlayer) {
return sourceEvent.getEvent(permanent);
}
@Override
public boolean accept(final MagicPermanent permanent, final MagicPlayer upkeepPlayer) {
return permanent.isController(upkeepPlayer);
}
};
}
public static final MagicAtUpkeepTrigger MayCharge = new MagicAtUpkeepTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {