external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emblem fixed startwith

Browse Source
This commit is contained in:
Hanmac
2017-09-02 10:28:07 +00:00
parent 190703d74b
commit be3d4723ef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -337,9 +337,9 @@ public abstract class SpellAbilityEffect {
eff.setTimestamp(game.getNextTimestamp()); eff.setTimestamp(game.getNextTimestamp());
eff.setName(name); eff.setName(name);
// if name includes emblem then it should be one // if name includes emblem then it should be one
eff.addType(name.startsWith("emblem") ? "Emblem" : "Effect"); eff.addType(name.startsWith("Emblem") ? "Emblem" : "Effect");
// add Planeswalker types into Emblem for fun // add Planeswalker types into Emblem for fun
if (name.startsWith("emblem") && hostCard.isPlaneswalker()) { if (name.startsWith("Emblem") && hostCard.isPlaneswalker()) {
for (final String type : hostCard.getType().getSubtypes()) { for (final String type : hostCard.getType().getSubtypes()) {
if (CardType.isAPlaneswalkerType(type)) { if (CardType.isAPlaneswalkerType(type)) {
eff.addType(type); eff.addType(type);

2
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -104,7 +104,7 @@ public class EffectEffect extends SpellAbilityEffect {
String image; String image;
if (sa.hasParam("Image")) { if (sa.hasParam("Image")) {
image = ImageKeys.getTokenKey(sa.getParam("Image")); image = ImageKeys.getTokenKey(sa.getParam("Image"));
} else if (name.startsWith("emblem")) { // try to get the image from name } else if (name.startsWith("Emblem")) { // try to get the image from name
image = ImageKeys.getTokenKey(name.replace(",", "").replace(" ", "_").toLowerCase()); image = ImageKeys.getTokenKey(name.replace(",", "").replace(" ", "_").toLowerCase());
} else { // use host image } else { // use host image
image = hostCard.getImageKey(); image = hostCard.getImageKey();