diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 028bde876c7..6b886c13193 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -4664,13 +4664,14 @@ public class Card extends GameEntity implements Comparable { public final boolean isArtifact() { return this.typeContains("Artifact"); } public final boolean isEquipment() { return this.typeContains("Equipment"); } public final boolean isFortification() { return this.typeContains("Fortification"); } - public final boolean isScheme() { return this.typeContains("Scheme"); } - public final boolean isPlaneswalker() { return this.typeContains("Planeswalker"); } - public final boolean isEnchantment() { return this.typeContains("Enchantment"); } public final boolean isAura() { return this.typeContains("Aura"); } + public final boolean isScheme() { return this.typeContains("Scheme"); } + public final boolean isPhenomenon() { return this.typeContains("Phenomenon"); } + public final boolean isPlane() { return this.typeContains("Plane"); } + private boolean typeContains(final String s) { final Iterator it = this.getType().iterator(); while (it.hasNext()) { diff --git a/forge-gui/res/cardsfolder/o/onakke_catacomb.txt b/forge-gui/res/cardsfolder/o/onakke_catacomb.txt index 43baacfc92d..b64cec74400 100644 --- a/forge-gui/res/cardsfolder/o/onakke_catacomb.txt +++ b/forge-gui/res/cardsfolder/o/onakke_catacomb.txt @@ -5,5 +5,5 @@ S:Mode$ Continuous | EffectZone$ Command | Affected$ Creature | SetColor$ Black T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {C}, creatures you control get +1/+0 and gain first strike until end of turn. SVar:RolledChaos:AB$ PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ First Strike SVar:Picture:http://www.wizards.com/global/images/magic/general/onakke_catacomb.jpg -SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True -Oracle:All creatures are black and have deathtouch.\nWhenever you roll {C}, creatures you control get +1/+0 and gain first strike until end of turn. \ No newline at end of file +SVar:AIRollPlanarDieParams:Mode$ Always | HasCreatureInPlay$ True | RollInMain1$ True +Oracle:All creatures are black and have deathtouch.\nWhenever you roll {C}, creatures you control get +1/+0 and gain first strike until end of turn. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java b/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java index 67bdc0376f6..dd57f523dfd 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java @@ -244,7 +244,7 @@ public enum CardZoomer { } private int getInitialRotation() { - return (thisCard.isSplitCard() ? 90 : 0); + return (thisCard.isSplitCard() || thisCard.isPlane() || thisCard.isPhenomenon() ? 90 : 0); } private void setLayout() {