github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Game log - Uses term choosing instead of targeting for non targeted selections.

Browse source
This commit is contained in:
LevelX2 2014-03-12 17:40:02 +01:00
parent 1e7cfa086b
commit f64ed10fac
2 changed files with 24 additions and 20 deletions
Mage/src/mage
abilities
ActivatedAbilityImpl.java
players
PlayerImpl.java

42
Mage/src/mage/abilities/ActivatedAbilityImpl.java
View file

@ -50,6 +50,7 @@ import mage.game.Game;
import mage.game.stack.Spell; import mage.game.stack.Spell;
import mage.game.stack.StackAbility; import mage.game.stack.StackAbility;
import mage.target.Target; import mage.target.Target;
import mage.target.Targets;
/** /**
@ -281,12 +282,7 @@ public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> ex
sb.append(spellAbility.name); sb.append(spellAbility.name);
} }
} }
if (spellAbility.getTargets().size() > 0) { appendTargetDescriptionForLog(sb, spellAbility.getTargets(), game);
for (Target target: spellAbility.getTargets()) {
sb.append(" targeting ");
sb.append(target.getTargetedName(game));
}
}
} }
} }
} else if (object instanceof Spell && ((Spell) object).getSpellAbility().getModes().size() > 1) { } else if (object instanceof Spell && ((Spell) object).getSpellAbility().getModes().size() > 1) {
@ -297,21 +293,11 @@ public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> ex
if (spellModes.getSelectedModes().contains(mode.getId())) { if (spellModes.getSelectedModes().contains(mode.getId())) {
spellModes.setMode(mode); spellModes.setMode(mode);
sb.append(" (mode ").append(item).append(")"); sb.append(" (mode ").append(item).append(")");
if (getTargets().size() > 0) { appendTargetDescriptionForLog(sb, getTargets(), game);
sb.append(" targeting ");
for (Target target: getTargets()) {
sb.append(target.getTargetedName(game));
}
}
} }
} }
} else { } else {
if (getTargets().size() > 0) { appendTargetDescriptionForLog(sb, getTargets(), game);
sb.append(" targeting ");
for (Target target: getTargets()) {
sb.append(target.getTargetedName(game));
}
}
} }
for (Choice choice :this.getChoices()) { for (Choice choice :this.getChoices()) {
sb.append(" - ").append(choice.getMessage()).append(": ").append(choice.getChoice()); sb.append(" - ").append(choice.getMessage()).append(": ").append(choice.getChoice());
@ -319,7 +305,25 @@ public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> ex
return sb.toString(); return sb.toString();
} }
String getOptionalTextSuffix(Game game, Spell spell) { private void appendTargetDescriptionForLog(StringBuilder sb, Targets targets, Game game) {
if (targets.size() > 0) {
String usedVerb = null;
for (Target target: targets) {
if (!target.isNotTarget()) {
if (usedVerb == null || usedVerb.equals(" choosing ")) {
usedVerb = " targeting ";
sb.append(usedVerb);
}
} else if (target.isNotTarget() && (usedVerb == null || usedVerb.equals(" targeting "))) {
usedVerb = " choosing ";
sb.append(usedVerb);
}
sb.append(target.getTargetedName(game));
}
}
}
private String getOptionalTextSuffix(Game game, Spell spell) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (Ability ability : (Abilities<Ability>) spell.getAbilities()) { for (Ability ability : (Abilities<Ability>) spell.getAbilities()) {
if (ability instanceof OptionalAdditionalSourceCosts) { if (ability instanceof OptionalAdditionalSourceCosts) {

2
Mage/src/mage/players/PlayerImpl.java
View file

@ -2107,7 +2107,7 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
game.informPlayers(new StringBuilder(this.getName()) game.informPlayers(new StringBuilder(this.getName())
.append(" puts ").append(card.getName()).append(" ") .append(" puts ").append(card.getName()).append(" ")
.append(fromZone != null ? new StringBuilder("from ").append(fromZone.toString().toLowerCase(Locale.ENGLISH)).append(" "):"") .append(fromZone != null ? new StringBuilder("from ").append(fromZone.toString().toLowerCase(Locale.ENGLISH)).append(" "):"")
.append("onto his or her hand").toString()); .append("into his or her hand").toString());
} }
return result; return result;
} }