From 592ab5752dede4e0e4d1d90bcce93a396e358aa1 Mon Sep 17 00:00:00 2001 From: moomarc Date: Tue, 12 Mar 2013 10:10:33 +0000 Subject: [PATCH] - Restored Emblem image functionality - Added Domri Rade's emblem to the token download urls --- res/token-images.txt | 1 + src/main/java/forge/card/ability/effects/EffectEffect.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/res/token-images.txt b/res/token-images.txt index 587b0b1f826..641973a0ac3 100644 --- a/res/token-images.txt +++ b/res/token-images.txt @@ -215,6 +215,7 @@ wu_1_1_bird.jpg http://www.cardforge.org/fpics/tokens/wu_ # //Emblems and extras chandra_the_firebrand_effect.jpg http://www.cardforge.org/fpics/effects/chandra_the_firebrand_effect.jpg +domri_rade_emblem.jpg http://www.cardforge.org/fpics/effects/domri_rade_emblem.jpg elspeth_knight_errant_emblem.jpg http://www.cardforge.org/fpics/effects/elspeth_knight_errant_emblem.jpg koth_of_the_hammer_emblem.jpg http://www.cardforge.org/fpics/effects/koth_of_the_hammer_emblem.jpg liliana_of_the_dark_realms_emblem.jpg http://www.cardforge.org/fpics/effects/liliana_of_the_dark_realms_emblem.jpg diff --git a/src/main/java/forge/card/ability/effects/EffectEffect.java b/src/main/java/forge/card/ability/effects/EffectEffect.java index df9dd9867ae..d2608001f07 100644 --- a/src/main/java/forge/card/ability/effects/EffectEffect.java +++ b/src/main/java/forge/card/ability/effects/EffectEffect.java @@ -104,7 +104,7 @@ public class EffectEffect extends SpellAbilityEffect { // nuked eff.addController(controller); eff.setOwner(controller); - eff.setImageFilename(hostCard.getImageFilename()); + eff.setImageFilename(sa.hasParam("Image") ? sa.getParam("Image") : hostCard.getImageFilename()); eff.setColor(hostCard.getColor()); eff.setImmutable(true); eff.setEffectSource(hostCard);