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

Fixed some tooltip texts and display of choosen color in tooltip.

Browse source
This commit is contained in:
LevelX2 2014-05-30 21:21:17 +02:00
parent c03c14af52
commit 94d8ff554f
10 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/dissension/UtopiaSprawl.java
View file

@ -114,6 +114,7 @@ class ChooseColorEffect extends OneShotEffect<ChooseColorEffect> {
if (player.choose(Outcome.Neutral, colorChoice, game)) { if (player.choose(Outcome.Neutral, colorChoice, game)) {
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>");
} }
} }
return false; return false;

2
Mage.Sets/src/mage/sets/journeyintonyx/HallOfTriumph.java
View file

@ -102,7 +102,7 @@ class HallOfTriumphEffect extends OneShotEffect<HallOfTriumphEffect> {
if (colorChoice.getChoice() != null) { if (colorChoice.getChoice() != null) {
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", "<i>Chosen color: " + colorChoice.getChoice().toString() + "</i>"); permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>");
} }
} }
return false; return false;

4
Mage.Sets/src/mage/sets/legions/WardSliver.java
View file

@ -107,7 +107,7 @@ class WardSliverEffect extends OneShotEffect<WardSliverEffect> {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId()); Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && permanent != null) { if (player != null && permanent != null) {
Choice colorChoice = new ChoiceColor(); ChoiceColor colorChoice = new ChoiceColor();
colorChoice.setMessage("Choose color"); colorChoice.setMessage("Choose color");
while (!player.choose(Outcome.BoostCreature, colorChoice, game)) { while (!player.choose(Outcome.BoostCreature, colorChoice, game)) {
if (!player.isInGame()) { if (!player.isInGame()) {
@ -117,7 +117,7 @@ class WardSliverEffect extends OneShotEffect<WardSliverEffect> {
if (colorChoice.getChoice() != null) { if (colorChoice.getChoice() != null) {
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(permanent.getId() + "_color", colorChoice.getChoice()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getChoice());
permanent.addInfo("chosen color", "<i>Chosen color: " + colorChoice.getChoice().toString() + "</i>"); permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>");
} }
} }
return false; return false;

15
Mage.Sets/src/mage/sets/newphyrexia/CagedSun.java
View file

@ -103,6 +103,7 @@ class CagedSunEffect1 extends OneShotEffect<CagedSunEffect1> {
if (player.choose(Outcome.BoostCreature, colorChoice, game)) { if (player.choose(Outcome.BoostCreature, colorChoice, game)) {
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>");
} }
} }
return false; return false;
@ -173,8 +174,9 @@ class CagedSunTriggeredAbility extends TriggeredManaAbility<CagedSunTriggeredAbi
} }
if (permanent != null && permanent.getCardType().contains(CardType.LAND)) { if (permanent != null && permanent.getCardType().contains(CardType.LAND)) {
ObjectColor color = (ObjectColor) game.getState().getValue(this.sourceId + "_color"); ObjectColor color = (ObjectColor) game.getState().getValue(this.sourceId + "_color");
if (color != null && event.getData().contains(color.toString())) if (color != null && event.getData().contains(color.toString())) {
return true; return true;
}
} }
} }
return false; return false;
@ -208,16 +210,17 @@ class CagedSunEffect extends ManaEffect<CagedSunEffect> {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
if (player != null) { if (player != null) {
ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color"); ObjectColor color = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color");
if (color.isBlack()) if (color.isBlack()) {
player.getManaPool().addMana(Mana.BlackMana, game, source); player.getManaPool().addMana(Mana.BlackMana, game, source);
else if (color.isBlue()) } else if (color.isBlue()) {
player.getManaPool().addMana(Mana.BlueMana, game, source); player.getManaPool().addMana(Mana.BlueMana, game, source);
else if (color.isRed()) } else if (color.isRed()) {
player.getManaPool().addMana(Mana.RedMana, game, source); player.getManaPool().addMana(Mana.RedMana, game, source);
else if (color.isGreen()) } else if (color.isGreen()) {
player.getManaPool().addMana(Mana.GreenMana, game, source); player.getManaPool().addMana(Mana.GreenMana, game, source);
else if (color.isWhite()) } else if (color.isWhite()) {
player.getManaPool().addMana(Mana.WhiteMana, game, source); player.getManaPool().addMana(Mana.WhiteMana, game, source);
}
} }
return true; return true;
} }

1
Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java
View file

@ -97,6 +97,7 @@ class CurseOfWizardryChooseColorEffect extends OneShotEffect<CurseOfWizardryChoo
if (player.choose(Outcome.Detriment, colorChoice, game)) { if (player.choose(Outcome.Detriment, colorChoice, game)) {
game.informPlayers(curseOfWizardry.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(curseOfWizardry.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(curseOfWizardry.getId() + "_color", colorChoice.getColor()); game.getState().setValue(curseOfWizardry.getId() + "_color", colorChoice.getColor());
curseOfWizardry.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>");
} }
} }
return false; return false;

2
Mage.Sets/src/mage/sets/shadowmoor/GreaterAuramancy.java
View file

@ -50,7 +50,7 @@ import mage.filter.predicate.permanent.EnchantedPredicate;
public class GreaterAuramancy extends CardImpl<GreaterAuramancy> { public class GreaterAuramancy extends CardImpl<GreaterAuramancy> {
private static final FilterPermanent filter = new FilterPermanent("enchantments"); private static final FilterPermanent filter = new FilterPermanent("enchantments");
private static final FilterPermanent filter2 = new FilterPermanent("Creatures"); private static final FilterPermanent filter2 = new FilterPermanent("Enchanted creatures");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(new ControllerPredicate(TargetController.YOU));

14
Mage.Sets/src/mage/sets/shadowmoor/LureboundScarecrow.java
View file

@ -27,8 +27,7 @@
*/ */
package mage.sets.shadowmoor; package mage.sets.shadowmoor;
import mage.constants.CardType; import java.util.UUID;
import mage.constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.ObjectColor; import mage.ObjectColor;
import mage.abilities.Ability; import mage.abilities.Ability;
@ -39,7 +38,9 @@ import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.choices.ChoiceColor; import mage.choices.ChoiceColor;
import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
@ -47,8 +48,6 @@ import mage.game.permanent.Permanent;
import mage.game.stack.StackObject; import mage.game.stack.StackObject;
import mage.players.Player; import mage.players.Player;
import java.util.UUID;
/** /**
* *
* @author jeffwadsworth * @author jeffwadsworth
@ -95,12 +94,13 @@ class LureboundScarecrowChooseColorEffect extends OneShotEffect<LureboundScarecr
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
StackObject sourceStackObject = game.getStack().getStackObject(source.getSourceId()); StackObject sourceStackObject = game.getStack().getStackObject(source.getSourceId());
Card card = game.getCard(source.getSourceId()); Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && sourceStackObject != null && card != null) { if (player != null && sourceStackObject != null && permanent != null) {
ChoiceColor colorChoice = new ChoiceColor(); ChoiceColor colorChoice = new ChoiceColor();
if (player.choose(Outcome.BoostCreature, colorChoice, game)) { if (player.choose(Outcome.BoostCreature, colorChoice, game)) {
game.informPlayers(sourceStackObject.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(sourceStackObject.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(card.getId() + "_color", colorChoice.getColor()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", new StringBuilder("<font color='blue'>Chosen color: ").append(colorChoice.getColor().getDescription()).append("</font>").toString());
} }
} }
return false; return false;

7
Mage.Sets/src/mage/sets/shadowmoor/PaintersServant.java
View file

@ -96,12 +96,13 @@ class ChooseColorEffect extends OneShotEffect<ChooseColorEffect> {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
Card card = game.getCard(source.getSourceId()); Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && card != null) { if (player != null && permanent != null) {
ChoiceColor colorChoice = new ChoiceColor(); ChoiceColor colorChoice = new ChoiceColor();
if (player.choose(Outcome.Neutral, colorChoice, game)) { if (player.choose(Outcome.Neutral, colorChoice, game)) {
game.informPlayers(new StringBuilder(card.getName()).append(": ").append(player.getName()).append(" has chosen ").append(colorChoice.getChoice()).toString()); game.informPlayers(new StringBuilder(permanent.getName()).append(": ").append(player.getName()).append(" has chosen ").append(colorChoice.getChoice()).toString());
game.getState().setValue(source.getSourceId() + "_color", colorChoice.getColor()); game.getState().setValue(source.getSourceId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", "<font color = 'blue'>Chosen color: " + colorChoice.getColor().getDescription() + "</font>");
} }
} }
return false; return false;

2
Mage.Sets/src/mage/sets/zendikar/IonaShieldOfEmeria.java
View file

@ -102,7 +102,7 @@ class IonaShieldOfEmeriaChooseColorEffect extends OneShotEffect<IonaShieldOfEmer
if (player.choose(Outcome.Detriment, colorChoice, game)) { if (player.choose(Outcome.Detriment, colorChoice, game)) {
game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice()); game.informPlayers(permanent.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor()); game.getState().setValue(permanent.getId() + "_color", colorChoice.getColor());
permanent.addInfo("chosen color", new StringBuilder("<font color='blue'>Chosen color: ").append(colorChoice.getChoice()).append("</font>").toString()); permanent.addInfo("chosen color", new StringBuilder("<font color='blue'>Chosen color: ").append(colorChoice.getColor().getDescription()).append("</font>").toString());
} }
return true; return true;
} }

1
Mage/src/mage/ObjectColor.java
View file

@ -182,7 +182,6 @@ public class ObjectColor implements Serializable, Copyable<ObjectColor>, Compara
} }
public String getDescription() { public String getDescription() {
StringBuilder sb = new StringBuilder();
if (getColorCount() > 1) { if (getColorCount() > 1) {
return "multicolored"; return "multicolored";
} else { } else {