External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 12:49:39 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor changes.

Browse source
This commit is contained in:
LevelX2 2016-09-10 11:44:52 +02:00
parent 678a46dba8
commit 79f8617cd3
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java
View file

@ -70,7 +70,7 @@ public class MassMutiny extends CardImpl {
Player opponent = game.getPlayer(opponentId);
if (opponent != null) {
ability.getTargets().clear();
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getLogName());
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getName());
filter.add(new ControllerIdPredicate(opponentId));
TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false);
ability.addTarget(target);

14
Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java
View file

@ -75,7 +75,7 @@ public class NykthosShrineToNyx extends CardImpl {
}
class NykthosShrineToNyxManaAbility extends ManaAbility {
public NykthosShrineToNyxManaAbility() {
super(Zone.BATTLEFIELD, new NykthosDynamicManaEffect(), new GenericManaCost(2));
this.addCost(new TapSourceCost());
@ -94,15 +94,14 @@ class NykthosShrineToNyxManaAbility extends ManaAbility {
public List<Mana> getNetMana(Game game) {
netMana.clear();
if (game != null) {
for (String colorChoice :ChoiceColor.colorChoices) {
netMana.add(((NykthosDynamicManaEffect)this.getEffects().get(0)).computeMana(colorChoice, game, this));
for (String colorChoice : ChoiceColor.colorChoices) {
netMana.add(((NykthosDynamicManaEffect) this.getEffects().get(0)).computeMana(colorChoice, game, this));
}
}
return netMana;
}
}
class NykthosDynamicManaEffect extends ManaEffect {
private final Mana computedMana;
@ -132,7 +131,7 @@ class NykthosDynamicManaEffect extends ManaEffect {
if (controller.choose(outcome, choice, game)) {
computeMana(choice.getChoice(), game, source);
checkToFirePossibleEvents(computedMana, game, source);
game.getPlayer(source.getControllerId()).getManaPool().addMana(computedMana, game, source);
controller.getManaPool().addMana(computedMana, game, source);
return true;
}
}
@ -145,10 +144,9 @@ class NykthosDynamicManaEffect extends ManaEffect {
return null;
}
public Mana computeMana(String color, Game game, Ability source){
public Mana computeMana(String color, Game game, Ability source) {
this.computedMana.clear();
if (color !=null && !color.isEmpty()) {
if (color != null && !color.isEmpty()) {
switch (color) {
case "Red":
computedMana.setRed(new DevotionCount(ColoredManaSymbol.R).calculate(game, source, this));