From 1e93f310aa3e97feac97e0b4df604f37a4ea5d92 Mon Sep 17 00:00:00 2001 From: elcnesh Date: Sun, 27 Jul 2014 09:33:22 +0000 Subject: [PATCH] Remove now unused references to Licid state. --- .../src/main/java/forge/card/CardCharacteristicName.java | 1 - forge-core/src/main/java/forge/card/CardSplitType.java | 4 +--- forge-game/src/main/java/forge/game/card/Card.java | 4 ---- forge-game/src/main/java/forge/game/card/CardFactory.java | 4 ---- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardCharacteristicName.java b/forge-core/src/main/java/forge/card/CardCharacteristicName.java index 81571df0f32..65c333ba0be 100644 --- a/forge-core/src/main/java/forge/card/CardCharacteristicName.java +++ b/forge-core/src/main/java/forge/card/CardCharacteristicName.java @@ -10,7 +10,6 @@ public enum CardCharacteristicName { Flipped, Cloner, Transformed, - Licid, Cloned, LeftSplit, RightSplit; diff --git a/forge-core/src/main/java/forge/card/CardSplitType.java b/forge-core/src/main/java/forge/card/CardSplitType.java index 37855204fcc..d2824a28fca 100644 --- a/forge-core/src/main/java/forge/card/CardSplitType.java +++ b/forge-core/src/main/java/forge/card/CardSplitType.java @@ -7,9 +7,7 @@ public enum CardSplitType None(FaceSelectionMethod.USE_PRIMARY_FACE, null), Transform(FaceSelectionMethod.USE_ACTIVE_FACE, CardCharacteristicName.Transformed), Split(FaceSelectionMethod.COMBINE, CardCharacteristicName.RightSplit), - Flip(FaceSelectionMethod.USE_PRIMARY_FACE, CardCharacteristicName.Flipped), - // used by 12 licid creatures to switch type into enchantment aura - Licid(FaceSelectionMethod.USE_PRIMARY_FACE, CardCharacteristicName.Licid); + Flip(FaceSelectionMethod.USE_PRIMARY_FACE, CardCharacteristicName.Flipped); private CardSplitType(FaceSelectionMethod calcMode, CardCharacteristicName stateName) { method = calcMode; 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 18c10c20fe2..441d70989bf 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -490,10 +490,6 @@ public class Card extends GameEntity implements Comparable { return characteristicsMap.containsKey(CardCharacteristicName.LeftSplit); } - public final boolean isLicid() { - return characteristicsMap.containsKey(CardCharacteristicName.Licid); - } - /** * Checks if is cloned. * diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index 9f9972c3fc7..62e6eee34ef 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -260,10 +260,6 @@ public class CardFactory { c.setState(CardCharacteristicName.RightSplit); c.setImageKey(originalPicture); } - else if (c.isLicid()) { - c.setState(CardCharacteristicName.Licid); - c.setImageKey(originalPicture); - } c.setCurSetCode(cp.getEdition()); c.setRarity(cp.getRarity());