Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Added replacement of {this} and{source} for selection of replacement effect order.

Browse source
This commit is contained in:
LevelX2 2013-03-23 16:40:15 +01:00
parent 27c96d7ea9
commit 32dff5ae72
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -34,6 +34,7 @@ import mage.Constants.AsThoughEffectType;
import mage.Constants.Duration;
import mage.Constants.Layer;
import mage.Constants.SubLayer;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.StaticAbility;
import mage.game.Game;
@ -376,7 +377,7 @@ public class ContinuousEffects implements Serializable {
else {
//20100716 - 616.1c
Player player = game.getPlayer(event.getPlayerId());
index = player.chooseEffect(rEffects, game);
index = player.chooseEffect(getReplacementEffectsTexts(rEffects, game), game);
}
ReplacementEffect rEffect = rEffects.get(index);
caught = rEffect.replaceEvent(event, this.getAbility(rEffect.getId()), game);
@ -541,6 +542,20 @@ public class ContinuousEffects implements Serializable {
return effects;
}
public List<String> getReplacementEffectsTexts(List<ReplacementEffect> rEffects, Game game) {
List<String> texts = new ArrayList<String>();
for (ReplacementEffect effect: rEffects) {
Ability ability = replacementEffects.getAbility(effect.getId());
MageObject object = game.getObject(ability.getSourceId());
if (object != null) {
texts.add(ability.getRule(object.getName()));
} else {
texts.add(effect.getText(null));
}
}
return texts;
}
}
class TimestampSorter implements Comparator<ContinuousEffect> {
@Override