github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor formattings.

Browse source
This commit is contained in:
LevelX2 2014-08-01 15:21:32 +02:00
parent d70a35961b
commit d3dadc41aa
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/mage/abilities/effects/common/DevourEffect.java
View file

@ -48,6 +48,14 @@ import mage.target.common.TargetControlledCreaturePermanent;
/**
* Effect for the DevourAbility
*
* 702.81. Devour
* 702.81a Devour is a static ability. "Devour N" means "As this object enters the battlefield,
* you may sacrifice any number of creatures. This permanent enters the battlefield with N +1/+1
* counters on it for each creature sacrificed this way."
* 702.81b Some objects have abilities that refer to the number of creatures the permanent devoured.
* "It devoured" means "sacrificed as a result of its devour ability as it entered the battlefield."
*
*
* @author LevelX2
*/
public class DevourEffect extends ReplacementEffectImpl {
@ -56,7 +64,7 @@ public class DevourEffect extends ReplacementEffectImpl {
static {
filter.add(new AnotherPredicate());
}
private DevourFactor devourFactor;
private final DevourFactor devourFactor;
public enum DevourFactor {
Devour1 ("Devour 1", "that many +1/+1 counters on it", 1),
@ -64,9 +72,9 @@ public class DevourEffect extends ReplacementEffectImpl {
Devour3 ("Devour 3", "three times that many +1/+1 counters on it", 3),
DevourX ("Devour X, where X is the number of creatures devoured this way", "X +1/+1 counters on it for each of those creatures", Integer.MAX_VALUE);
private String text;
private String ruleText;
private int factor;
private final String text;
private final String ruleText;
private final int factor;
DevourFactor(String text, String ruleText, int factor) {
this.text = text;
@ -127,7 +135,7 @@ public class DevourEffect extends ReplacementEffectImpl {
if (controller.chooseUse(Outcome.Detriment, "Devour creatures?", game)) {
controller.chooseTarget(Outcome.Detriment, target, source, game);
if (target.getTargets().size() > 0) {
List<ArrayList<String>> cardSubtypes = new ArrayList<ArrayList<String>>();
List<ArrayList<String>> cardSubtypes = new ArrayList<>();
int devouredCreatures = target.getTargets().size();
game.informPlayers(new StringBuilder(creature.getName()).append(" devours ").append(devouredCreatures).append(" creatures").toString());
for (UUID targetId: target.getTargets()) {
@ -167,7 +175,7 @@ public class DevourEffect extends ReplacementEffectImpl {
if (object != null) {
return (List<ArrayList<String>>) object;
}
return new ArrayList<ArrayList<String>>();
return new ArrayList<>();
}
public int getDevouredCreaturesAmount(Game game, UUID permanentId) {

1
Mage/src/mage/abilities/effects/common/SkipUntapSourceEffect.java
View file

@ -32,7 +32,6 @@ import mage.constants.Outcome;
import mage.constants.PhaseStep;
import mage.abilities.Ability;
import mage.abilities.effects.ContinuousRuleModifiyingEffectImpl;
import mage.abilities.effects.ReplacementEffectImpl;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;