External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Game logging - Added target information to log of triggered ability.

Browse source
This commit is contained in:
LevelX2 2014-03-17 16:57:55 +01:00
parent e9a301da3c
commit 20453be5ff
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/mage/abilities/AbilityImpl.java
View file

@ -828,7 +828,7 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
sb.append(spellAbility.name);
}
}
appendTargetDescriptionForLog(sb, spellAbility.getTargets(), game);
sb.append(getTargetDescriptionForLog(spellAbility.getTargets(), game));
}
}
} else if (object instanceof Spell && ((Spell) object).getSpellAbility().getModes().size() > 1) {
@ -839,19 +839,17 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
if (spellModes.getSelectedModes().contains(mode.getId())) {
spellModes.setMode(mode);
sb.append(" (mode ").append(item).append(")");
appendTargetDescriptionForLog(sb, getTargets(), game);
sb.append(getTargetDescriptionForLog(getTargets(), game));
}
}
} else {
appendTargetDescriptionForLog(sb, getTargets(), game);
}
for (Choice choice :this.getChoices()) {
sb.append(" - ").append(choice.getMessage()).append(": ").append(choice.getChoice());
sb.append(getTargetDescriptionForLog(getTargets(), game));
}
return sb.toString();
}
protected void appendTargetDescriptionForLog(StringBuilder sb, Targets targets, Game game) {
protected String getTargetDescriptionForLog(Targets targets, Game game) {
StringBuilder sb = new StringBuilder();
if (targets.size() > 0) {
String usedVerb = null;
for (Target target : targets) {
@ -867,6 +865,10 @@ public abstract class AbilityImpl<T extends AbilityImpl<T>> implements Ability {
sb.append(target.getTargetedName(game));
}
}
for (Choice choice :this.getChoices()) {
sb.append(" - ").append(choice.getMessage()).append(": ").append(choice.getChoice());
}
return sb.toString();
}
private String getOptionalTextSuffix(Game game, Spell spell) {

12
Mage/src/mage/abilities/TriggeredAbilityImpl.java
View file

@ -57,7 +57,7 @@ public abstract class TriggeredAbilityImpl<T extends TriggeredAbilityImpl<T>> ex
this.optional = optional;
}
public TriggeredAbilityImpl(final TriggeredAbilityImpl ability) {
public TriggeredAbilityImpl(final TriggeredAbilityImpl<T> ability) {
super(ability);
this.optional = ability.optional;
}
@ -105,10 +105,14 @@ public abstract class TriggeredAbilityImpl<T extends TriggeredAbilityImpl<T>> ex
MageObject object = game.getObject(sourceId);
StringBuilder sb = new StringBuilder();
if (object != null) {
sb.append(object.getName()).append(" - ability triggered: ").append(this.getRule(object.getName()));
sb.append("Ability triggers: ").append(object.getName()).append(" - ").append(this.getRule(object.getName()));
} else {
sb.append("Ability triggered: ").append(this.getRule());
}
sb.append("Ability triggers: ").append(this.getRule());
}
String targetText = getTargetDescriptionForLog(getTargets(), game);
if (!targetText.isEmpty()) {
sb.append(" - ").append(targetText);
}
return sb.toString();
}