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

Text and coding style fixes from review

Browse source
This commit is contained in:
LoneFox 2015-08-03 20:00:36 +03:00
parent 96bbe01aae
commit c1db04812d
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/apocalypse/MaskOfIntolerance.java
View file

@ -56,7 +56,7 @@ public class MaskOfIntolerance extends CardImpl {
// At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, Mask of Intolerance deals 3 damage to him or her.
TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.ANY, false);
this.addAbility(new ConditionalTriggeredAbility(ability, new MaskOfIntoleranceCondition(),
"At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, Mask of Intolerance deals 3 damage to him or her."));
"At the beginning of each player's upkeep, if there are four or more basic land types among lands that player controls, {this} deals 3 damage to him or her."));
}
public MaskOfIntolerance(final MaskOfIntolerance card) {

3
Mage.Sets/src/mage/sets/planeshift/MaliciousAdvice.java
View file

@ -67,9 +67,6 @@ public class MaliciousAdvice extends CardImpl {
effect.setText("Tap X target artifacts, creatures, and/or lands");
this.getSpellAbility().addEffect(effect);
this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(new ManacostVariableValue()));
// Correct number of targets will be set in adjustTargets
// I'm not sure if/why this needs to be here, but other such cards do have it...
this.getSpellAbility().addTarget(new TargetPermanent(filter));
}
@Override

2
Mage.Sets/src/mage/sets/vintagemasters/Addle.java
View file

@ -95,7 +95,7 @@ class AddleEffect extends OneShotEffect {
controller.choose(outcome, choice, game);
ObjectColor color = choice.getColor();
if(color != null) {
game.informPlayers(new StringBuilder(controller.getLogName()).append(" chooses ").append(color).toString());
game.informPlayers(controller.getLogName() + " chooses " + color + ".");
FilterCard filter = new FilterCard();
filter.add(new ColorPredicate(color));
Effect effect = new DiscardCardYouChooseTargetEffect(filter);

12
Mage/src/mage/abilities/dynamicvalue/common/DomainValue.java
View file

@ -15,7 +15,7 @@ public class DomainValue implements DynamicValue {
private Integer amount;
private boolean countTargetPlayer;
private UUID player;
private UUID playerId;
public DomainValue() {
this(1);
@ -34,15 +34,15 @@ public class DomainValue implements DynamicValue {
this.countTargetPlayer = countTargetPlayer;
}
public DomainValue(Integer amount, UUID player) {
public DomainValue(Integer amount, UUID playerId) {
this(amount, false);
this.player = player;
this.playerId = playerId;
}
public DomainValue(final DomainValue dynamicValue) {
this.amount = dynamicValue.amount;
this.countTargetPlayer = dynamicValue.countTargetPlayer;
this.player = dynamicValue.player;
this.playerId = dynamicValue.playerId;
}
@Override
@ -53,8 +53,8 @@ public class DomainValue implements DynamicValue {
int haveSwamps = 0;
int haveForests = 0;
UUID targetPlayer;
if(player != null) {
targetPlayer = player;
if(playerId != null) {
targetPlayer = playerId;
}
else if(countTargetPlayer) {
targetPlayer = sourceAbility.getTargets().getFirstTarget();

2
Mage/src/mage/abilities/effects/common/DamageAttachedControllerEffect.java
View file

@ -82,7 +82,7 @@ public class DamageAttachedControllerEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "{this} deals " + amount + " to that creature's controller";
return "{this} deals " + amount + " damage to that creature's controller";
}
}