External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 23:12:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor changes to framework and card classes.

Browse source
This commit is contained in:
LevelX2 2013-11-01 17:04:27 +01:00
parent 0697801cdc
commit 17238bee3e
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/mage/abilities/dynamicvalue/common/ManacostVariableValue.java
View file

@ -5,6 +5,7 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.game.Game;
public class ManacostVariableValue implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility) {
return sourceAbility.getManaCostsToPay().getX();

34
Mage/src/mage/abilities/effects/common/PutOntoBattlefieldTargetEffect.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.effects.common;
import mage.constants.Outcome;
@ -75,31 +74,30 @@ public class PutOntoBattlefieldTargetEffect extends OneShotEffect<PutOntoBattlef
Player controller = game.getPlayer(source.getControllerId());
if (controller == null || !controller.chooseUse(Outcome.PutCreatureInPlay,
new StringBuilder("Put ")
.append(source.getTargets() != null ? source.getTargets().get(0).getTargetName():"target")
.append(" onto the battlefield?").toString(), game)) {
.append(source.getTargets() != null ? source.getTargets().get(0).getTargetName() : "target")
.append(" onto the battlefield?").toString(), game)) {
return false;
}
}
for (UUID targetId : targetPointer.getTargets(game, source)) {
Card card = game.getCard(targetId);
if (card != null) {
switch (game.getState().getZone(targetId)) {
case GRAVEYARD:
for (Player player : game.getPlayers().values()) {
if (player.getGraveyard().contains(card.getId())) {
player.getGraveyard().remove(card);
result |= card.moveToZone(Zone.BATTLEFIELD, source.getId(), game, tapped);
}
switch (game.getState().getZone(targetId)) {
case GRAVEYARD:
for (Player player : game.getPlayers().values()) {
if (player.getGraveyard().contains(card.getId())) {
player.getGraveyard().remove(card);
result |= card.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, tapped);
}
case HAND:
for (Player player : game.getPlayers().values()) {
if (player.getHand().contains(card.getId())) {
player.getHand().remove(card);
result |= card.moveToZone(Zone.BATTLEFIELD, source.getId(), game, tapped);
}
}
case HAND:
for (Player player : game.getPlayers().values()) {
if (player.getHand().contains(card.getId())) {
player.getHand().remove(card);
result |= card.moveToZone(Zone.BATTLEFIELD, source.getSourceId(), game, tapped);
}
}
}
}
}
}
return result;

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

@ -104,7 +104,7 @@ public class AddCountersTargetEffect extends OneShotEffect<AddCountersTargetEffe
@Override
public String getText(Mode mode) {
if (staticText != null) {
if (!staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();