From ce279246d6e763dd22640c2b2b62a0a04a65302f Mon Sep 17 00:00:00 2001 From: Jonah Bauer Date: Thu, 2 Dec 2021 22:44:27 +0100 Subject: [PATCH] Cleanup --- .../client/libgdx/actors/game/CardActor.java | 79 +++++++++++++++++-- 1 file changed, 71 insertions(+), 8 deletions(-) diff --git a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/CardActor.java b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/CardActor.java index 7140cad..4044597 100644 --- a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/CardActor.java +++ b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/game/CardActor.java @@ -16,21 +16,84 @@ import java.util.Map; @Getter @Setter public class CardActor extends Actor { - public static final float ASPECT_RATIO = 14f / 9f; + public static final float ASPECT_RATIO = 14.4f / 9f; public static final float PREF_WIDTH = 135; - public static final float PREF_HEIGHT = 210; + public static final float PREF_HEIGHT = 216; private static final Map ATLAS_PATHS; static { var paths = new EnumMap(Card.class); for (Card card : Card.values()) { - paths.put(card, switch ((int)(Math.random() * 4)) { - case 0 -> GameAtlas.CARDS_BLUE; - case 1 -> GameAtlas.CARDS_GREEN; - case 2 -> GameAtlas.CARDS_RED; - case 3 -> GameAtlas.CARDS_YELLOW; - default -> throw new AssertionError(); + paths.put(card, switch (card) { + case BLUE_1 -> GameAtlas.CARDS_BLUE_1; + case BLUE_2 -> GameAtlas.CARDS_BLUE_2; + case BLUE_3 -> GameAtlas.CARDS_BLUE_3; + case BLUE_4 -> GameAtlas.CARDS_BLUE_4; + case BLUE_5 -> GameAtlas.CARDS_BLUE_5; + case BLUE_6 -> GameAtlas.CARDS_BLUE_6; + case BLUE_7 -> GameAtlas.CARDS_BLUE_7; + case BLUE_8 -> GameAtlas.CARDS_BLUE_8; + case BLUE_9 -> GameAtlas.CARDS_BLUE_9; + case BLUE_10 -> GameAtlas.CARDS_BLUE_10; + case BLUE_11 -> GameAtlas.CARDS_BLUE_11; + case BLUE_12 -> GameAtlas.CARDS_BLUE_12; + case BLUE_13 -> GameAtlas.CARDS_BLUE_13; + case RED_1 -> GameAtlas.CARDS_RED_1; + case RED_2 -> GameAtlas.CARDS_RED_2; + case RED_3 -> GameAtlas.CARDS_RED_3; + case RED_4 -> GameAtlas.CARDS_RED_4; + case RED_5 -> GameAtlas.CARDS_RED_5; + case RED_6 -> GameAtlas.CARDS_RED_6; + case RED_7 -> GameAtlas.CARDS_RED_7; + case RED_8 -> GameAtlas.CARDS_RED_8; + case RED_9 -> GameAtlas.CARDS_RED_9; + case RED_10 -> GameAtlas.CARDS_RED_10; + case RED_11 -> GameAtlas.CARDS_RED_11; + case RED_12 -> GameAtlas.CARDS_RED_12; + case RED_13 -> GameAtlas.CARDS_RED_13; + case YELLOW_1 -> GameAtlas.CARDS_YELLOW_1; + case YELLOW_2 -> GameAtlas.CARDS_YELLOW_2; + case YELLOW_3 -> GameAtlas.CARDS_YELLOW_3; + case YELLOW_4 -> GameAtlas.CARDS_YELLOW_4; + case YELLOW_5 -> GameAtlas.CARDS_YELLOW_5; + case YELLOW_6 -> GameAtlas.CARDS_YELLOW_6; + case YELLOW_7 -> GameAtlas.CARDS_YELLOW_7; + case YELLOW_8 -> GameAtlas.CARDS_YELLOW_8; + case YELLOW_9 -> GameAtlas.CARDS_YELLOW_9; + case YELLOW_10 -> GameAtlas.CARDS_YELLOW_10; + case YELLOW_11 -> GameAtlas.CARDS_YELLOW_11; + case YELLOW_12 -> GameAtlas.CARDS_YELLOW_12; + case YELLOW_13 -> GameAtlas.CARDS_YELLOW_13; + case GREEN_1 -> GameAtlas.CARDS_GREEN_1; + case GREEN_2 -> GameAtlas.CARDS_GREEN_2; + case GREEN_3 -> GameAtlas.CARDS_GREEN_3; + case GREEN_4 -> GameAtlas.CARDS_GREEN_4; + case GREEN_5 -> GameAtlas.CARDS_GREEN_5; + case GREEN_6 -> GameAtlas.CARDS_GREEN_6; + case GREEN_7 -> GameAtlas.CARDS_GREEN_7; + case GREEN_8 -> GameAtlas.CARDS_GREEN_8; + case GREEN_9 -> GameAtlas.CARDS_GREEN_9; + case GREEN_10 -> GameAtlas.CARDS_GREEN_10; + case GREEN_11 -> GameAtlas.CARDS_GREEN_11; + case GREEN_12 -> GameAtlas.CARDS_GREEN_12; + case GREEN_13 -> GameAtlas.CARDS_GREEN_13; + case JUGGLER, JUGGLER_BLUE, JUGGLER_GREEN, JUGGLER_RED, JUGGLER_YELLOW -> GameAtlas.CARDS_JUGGLER; + case CLOUD, CLOUD_BLUE, CLOUD_GREEN, CLOUD_RED, CLOUD_YELLOW -> GameAtlas.CARDS_CLOUD; + case BOMB -> GameAtlas.CARDS_BOMB; + case FAIRY -> GameAtlas.CARDS_FAIRY; + case DRAGON -> GameAtlas.CARDS_DRAGON; + case CHANGELING, CHANGELING_JESTER, CHANGELING_WIZARD -> GameAtlas.CARDS_CHANGELING; + case BLUE_JESTER -> GameAtlas.CARDS_BLUE_JESTER; + case RED_JESTER -> GameAtlas.CARDS_RED_JESTER; + case GREEN_JESTER -> GameAtlas.CARDS_GREEN_JESTER; + case YELLOW_JESTER -> GameAtlas.CARDS_YELLOW_JESTER; + case RED_WIZARD -> GameAtlas.CARDS_RED_WIZARD; + case GREEN_WIZARD -> GameAtlas.CARDS_GREEN_WIZARD; + case YELLOW_WIZARD -> GameAtlas.CARDS_YELLOW_WIZARD; + case BLUE_WIZARD -> GameAtlas.CARDS_BLUE_WIZARD; + case WEREWOLF -> GameAtlas.CARDS_WEREWOLF; + default -> GameAtlas.CARDS_BACKGROUND; }); } ATLAS_PATHS = Collections.unmodifiableMap(paths);