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

rename MagicAtEndOfCombatTrigger to AtEndOfCombatTrigger

master
ShawnieBoy 2015-11-21 01:42:52 +00:00
parent 31c6f39b22
commit 1c2d73a33d
9 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/Magarena/scripts/Goblin_Sappers.groovy
View File

@ -33,7 +33,7 @@
));
game.doAction(new AddTurnTriggerAction(
event.getPermanent(),
MagicAtEndOfCombatTrigger.Destroy
AtEndOfCombatTrigger.Destroy
))
});
}
@ -69,7 +69,7 @@
game.doAction(new GainAbilityAction(it, MagicAbility.Unblockable));
game.doAction(new AddTurnTriggerAction(
it,
MagicAtEndOfCombatTrigger.Destroy
AtEndOfCombatTrigger.Destroy
));
});
}

2
release/Magarena/scripts/Kjeldoran_Frostbeast.groovy
View File

@ -15,7 +15,7 @@
event.processRefPermanent(game, {
game.doAction(new AddTurnTriggerAction(
it,
MagicAtEndOfCombatTrigger.Destroy
AtEndOfCombatTrigger.Destroy
))
});
}

2
release/Magarena/scripts/Sosuke__Son_of_Seshiro.groovy
View File

@ -21,7 +21,7 @@
event.processRefPermanent(game, {
game.doAction(new AddTurnTriggerAction(
it,
MagicAtEndOfCombatTrigger.Destroy
AtEndOfCombatTrigger.Destroy
))
});
}

2
release/Magarena/scripts/Stoic_Ephemera.groovy
View File

@ -12,7 +12,7 @@
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new AddTriggerAction(event.getPermanent(), MagicAtEndOfCombatTrigger.Sacrifice));
game.doAction(new AddTriggerAction(event.getPermanent(), AtEndOfCombatTrigger.Sacrifice));
}
}
]

2
release/Magarena/scripts/Venom.groovy
View File

@ -20,7 +20,7 @@
event.processRefPermanent(game, {
game.doAction(new AddTurnTriggerAction(
it,
MagicAtEndOfCombatTrigger.Destroy
AtEndOfCombatTrigger.Destroy
))
});
}

2
release/Magarena/scripts/Wall_of_Junk.groovy
View File

@ -12,7 +12,7 @@
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new AddTriggerAction(
event.getPermanent(),
MagicAtEndOfCombatTrigger.Return
AtEndOfCombatTrigger.Return
))
}
}

5
src/magic/model/action/MagicPlayMod.java
View File

@ -2,7 +2,6 @@ package magic.model.action;
import java.util.List;
import java.util.LinkedList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import magic.model.MagicGame;
@ -15,7 +14,7 @@ import magic.model.MagicCounterType;
import magic.model.MagicManaCost;
import magic.model.MagicSource;
import magic.model.mstatic.MagicStatic;
import magic.model.trigger.MagicAtEndOfCombatTrigger;
import magic.model.trigger.AtEndOfCombatTrigger;
import magic.model.trigger.MagicAtEndOfTurnTrigger;
import magic.model.trigger.MagicWhenLeavesPlayTrigger;
import magic.model.event.MagicEvent;
@ -26,7 +25,7 @@ import magic.model.event.MagicPayManaCostEvent;
public enum MagicPlayMod implements MagicPermanentAction {
EXILE_AT_END_OF_COMBAT("Exile that token at end of combat") {
protected void doAction(final MagicGame game, final MagicPermanent perm) {
game.doAction(new AddTriggerAction(perm, MagicAtEndOfCombatTrigger.Exile));
game.doAction(new AddTriggerAction(perm, AtEndOfCombatTrigger.Exile));
}
},
EXILE_AT_END_OF_TURN("Exile (it|them|that token) at the beginning of the next end step") {

11
src/magic/model/event/MagicRuleEventAction.java
View File

@ -2,7 +2,6 @@ package magic.model.event;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -41,7 +40,7 @@ import magic.model.mstatic.MagicLayer;
import magic.model.stack.MagicCardOnStack;
import magic.model.stack.MagicItemOnStack;
import magic.model.target.*;
import magic.model.trigger.MagicAtEndOfCombatTrigger;
import magic.model.trigger.AtEndOfCombatTrigger;
import magic.model.trigger.MagicAtEndOfTurnTrigger;
import magic.model.trigger.MagicAtUpkeepTrigger;
import magic.model.trigger.MagicPreventDamageTrigger;
@ -81,7 +80,7 @@ public enum MagicRuleEventAction {
if (it.isValid()) {
game.doAction(new AddTurnTriggerAction(
it,
MagicAtEndOfCombatTrigger.Destroy
AtEndOfCombatTrigger.Destroy
));
}
}
@ -1499,7 +1498,7 @@ public enum MagicRuleEventAction {
new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game,final MagicEvent event) {
game.doAction(new AddTurnTriggerAction(event.getPermanent(), MagicAtEndOfCombatTrigger.Clockwork));
game.doAction(new AddTurnTriggerAction(event.getPermanent(), AtEndOfCombatTrigger.Clockwork));
}
}
),
@ -1691,7 +1690,7 @@ public enum MagicRuleEventAction {
if (it.isValid()) {
game.doAction(new AddTriggerAction(
it,
MagicAtEndOfCombatTrigger.Return
AtEndOfCombatTrigger.Return
));
}
}
@ -2424,7 +2423,7 @@ public enum MagicRuleEventAction {
new MagicEventAction() {
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.doAction(new AddTriggerAction(event.getPermanent(), MagicAtEndOfCombatTrigger.Sacrifice));
game.doAction(new AddTriggerAction(event.getPermanent(), AtEndOfCombatTrigger.Sacrifice));
}
}
),

26
src/magic/model/trigger/MagicAtEndOfCombatTrigger.java → src/magic/model/trigger/AtEndOfCombatTrigger.java
View File

@ -11,18 +11,18 @@ import magic.model.action.RemoveFromPlayAction;
import magic.model.action.SacrificeAction;
import magic.model.event.MagicEvent;
public abstract class MagicAtEndOfCombatTrigger extends MagicTrigger<MagicPlayer> {
public MagicAtEndOfCombatTrigger(final int priority) {
public abstract class AtEndOfCombatTrigger extends MagicTrigger<MagicPlayer> {
public AtEndOfCombatTrigger(final int priority) {
super(priority);
}
public MagicAtEndOfCombatTrigger() {}
public AtEndOfCombatTrigger() {}
public MagicTriggerType getType() {
return MagicTriggerType.AtEndOfCombat;
}
public static final MagicAtEndOfCombatTrigger Return = new MagicAtEndOfCombatTrigger() {
public static final AtEndOfCombatTrigger Return = new AtEndOfCombatTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MagicPlayer eocPlayer) {
return new MagicEvent(
@ -39,8 +39,8 @@ public abstract class MagicAtEndOfCombatTrigger extends MagicTrigger<MagicPlayer
));
}
};
public static final MagicAtEndOfCombatTrigger Exile = new MagicAtEndOfCombatTrigger() {
public static final AtEndOfCombatTrigger Exile = new AtEndOfCombatTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer eocPlayer) {
return new MagicEvent(
@ -54,8 +54,8 @@ public abstract class MagicAtEndOfCombatTrigger extends MagicTrigger<MagicPlayer
game.doAction(new RemoveFromPlayAction(event.getPermanent(), MagicLocationType.Exile));
}
};
public static final MagicAtEndOfCombatTrigger Destroy = new MagicAtEndOfCombatTrigger() {
public static final AtEndOfCombatTrigger Destroy = new AtEndOfCombatTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer eocPlayer) {
return new MagicEvent(
@ -69,8 +69,8 @@ public abstract class MagicAtEndOfCombatTrigger extends MagicTrigger<MagicPlayer
game.doAction(new DestroyAction(event.getPermanent()));
}
};
public static final MagicAtEndOfCombatTrigger Sacrifice = new MagicAtEndOfCombatTrigger() {
public static final AtEndOfCombatTrigger Sacrifice = new AtEndOfCombatTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer eotPlayer) {
return new MagicEvent(
@ -84,8 +84,8 @@ public abstract class MagicAtEndOfCombatTrigger extends MagicTrigger<MagicPlayer
game.doAction(new SacrificeAction(event.getPermanent()));
}
};
public static final MagicAtEndOfCombatTrigger Clockwork = new MagicAtEndOfCombatTrigger() {
public static final AtEndOfCombatTrigger Clockwork = new AtEndOfCombatTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer eocPlayer) {
return new MagicEvent(