diff --git a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/PlayChangelingOverlay.java b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/PlayChangelingOverlay.java new file mode 100644 index 0000000..a250617 --- /dev/null +++ b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/PlayChangelingOverlay.java @@ -0,0 +1,62 @@ +package eu.jonahbauer.wizard.client.libgdx.actions.overlay; + +import com.badlogic.gdx.scenes.scene2d.Actor; +import com.badlogic.gdx.scenes.scene2d.InputEvent; +import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup; +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.TextButton; +import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup; +import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; +import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; +import eu.jonahbauer.wizard.client.libgdx.actors.CardActor; +import eu.jonahbauer.wizard.client.libgdx.screens.GameScreen; +import eu.jonahbauer.wizard.common.model.Card; +import org.jetbrains.annotations.NotNull; + +import java.util.EnumMap; + +public class PlayChangelingOverlay extends Overlay implements InteractionOverlay { + public PlayChangelingOverlay(@NotNull GameScreen gameScreen, long timeout) { + super(gameScreen, timeout); + } + + @Override + public Actor createContent() { + var root = new VerticalGroup().columnCenter().space(10); + + var prompt = new Label(messages.get("game.overlay.play_changeling.prompt"), skin); + var cardGroup = new HorizontalGroup().space(20); + + var wizard = new CardActor(Card.CHANGELING_WIZARD, atlas); + var jester = new CardActor(Card.CHANGELING_JESTER, atlas); + cardGroup.addActor(wizard); + cardGroup.addActor(jester); + + cardGroup.addListener(new ClickListener() { + @Override + public void clicked(InputEvent event, float x, float y) { + if (isClosing()) return; + var target = event.getTarget(); + if (target == wizard) { + screen.onCardClicked(Card.CHANGELING_WIZARD); + } else if (target == jester) { + screen.onCardClicked(Card.CHANGELING_JESTER); + } + } + }); + + root.addActor(prompt); + root.addActor(cardGroup); + + var cancel = new TextButton(messages.get("game.overlay.play_changeling.cancel"), skin, "simple"); + cancel.addListener(new ChangeListener() { + @Override + public void changed(ChangeEvent event, Actor actor) { + close(); + } + }); + root.addActor(cancel); + + return root; + } +} diff --git a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/CardActor.java b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/CardActor.java index 9cb346e..8d2cd63 100644 --- a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/CardActor.java +++ b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actors/CardActor.java @@ -18,9 +18,9 @@ import java.util.NoSuchElementException; @Getter @Setter public class CardActor extends Actor { - public static final float ASPECT_RATIO = 14.4f / 9f; + public static final float ASPECT_RATIO = 400f / 260f; public static final float PREF_WIDTH = 135; - public static final float PREF_HEIGHT = 216; + public static final float PREF_HEIGHT = 208; private static final Map ATLAS_PATHS; @@ -80,12 +80,22 @@ public class CardActor extends Actor { 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 JUGGLER -> GameAtlas.CARDS_JUGGLER; + case JUGGLER_BLUE -> GameAtlas.CARDS_JUGGLER_BLUE; + case JUGGLER_RED -> GameAtlas.CARDS_JUGGLER_RED; + case JUGGLER_GREEN -> GameAtlas.CARDS_JUGGLER_GREEN; + case JUGGLER_YELLOW -> GameAtlas.CARDS_JUGGLER_YELLOW; + case CLOUD -> GameAtlas.CARDS_CLOUD; + case CLOUD_GREEN -> GameAtlas.CARDS_CLOUD_GREEN; + case CLOUD_RED -> GameAtlas.CARDS_CLOUD_RED; + case CLOUD_YELLOW -> GameAtlas.CARDS_CLOUD_YELLOW; + case CLOUD_BLUE -> GameAtlas.CARDS_CLOUD_BLUE; 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 CHANGELING -> GameAtlas.CARDS_CHANGELING; + case CHANGELING_WIZARD -> GameAtlas.CARDS_CHANGELING_WIZARD; + case CHANGELING_JESTER -> GameAtlas.CARDS_CHANGELING_JESTER; case BLUE_JESTER -> GameAtlas.CARDS_BLUE_JESTER; case RED_JESTER -> GameAtlas.CARDS_RED_JESTER; case GREEN_JESTER -> GameAtlas.CARDS_GREEN_JESTER; @@ -105,11 +115,9 @@ public class CardActor extends Actor { private Card card; private TextureRegion background; - private TextureRegion border; private CardActor(TextureAtlas atlas) { this.atlas = atlas; - this.border = atlas.findRegion(GameAtlas.CARDS_BORDER2); setWidth(PREF_WIDTH); setHeight(PREF_HEIGHT); setOrigin(PREF_WIDTH / 2, PREF_HEIGHT / 2); @@ -150,6 +158,5 @@ public class CardActor extends Actor { float height = getWidth() * ASPECT_RATIO; batch.draw(background, getX(), getY() + getHeight() - height, getOriginX(), getOriginY(), getWidth(), height, getScaleX(), getScaleY(), getRotation()); - batch.draw(border, getX(), getY() + getHeight() - height, getOriginX(), getOriginY(), getWidth(), height, getScaleX(), getScaleY(), getRotation()); } -} +} \ No newline at end of file diff --git a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/GameScreen.java b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/GameScreen.java index bf08240..b07af16 100644 --- a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/GameScreen.java +++ b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/GameScreen.java @@ -733,7 +733,7 @@ public class GameScreen extends WizardScreen { execute(new TrumpOverlay(this, players.get(player), trumpCard, trumpSuit)); } - public PlayColoredCardOverlay showColoredCardOverlay(@NotNull Card card, long timeout) { + public InteractionOverlay showSpecialCardOverlay(@NotNull Card card, long timeout) { if (card == Card.JUGGLER) { var overlay = new PlayColoredCardOverlay(this, timeout, card, Card.JUGGLER_RED, Card.JUGGLER_GREEN, Card.JUGGLER_BLUE, Card.JUGGLER_YELLOW); execute(overlay); @@ -742,6 +742,10 @@ public class GameScreen extends WizardScreen { var overlay = new PlayColoredCardOverlay(this, timeout, card, Card.CLOUD_RED, Card.CLOUD_GREEN, Card.CLOUD_BLUE, Card.CLOUD_YELLOW); execute(overlay); return overlay; + } else if (card == Card.CHANGELING) { + var overlay = new PlayChangelingOverlay(this, timeout); + execute(overlay); + return overlay; } else { throw new IllegalArgumentException(); } diff --git a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java index 3fa748c..d0ccf1f 100644 --- a/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java +++ b/wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java @@ -252,7 +252,7 @@ public final class Game extends BaseState { hand.remove(handCard); } - if (gameScreen != null) gameScreen.playCard(player, handCard); + if (gameScreen != null) gameScreen.playCard(player, card); } private void onScoreMessage(@Unmodifiable Map<@NotNull UUID, @NotNull Integer> points) { @@ -330,11 +330,11 @@ public final class Game extends BaseState { assert gameScreen != null; if (isActive()) { if (currentInteraction.action() == PLAY_CARD) { - if (card == Card.CLOUD || card == Card.JUGGLER) { + if (card == Card.CLOUD || card == Card.JUGGLER || card == Card.CHANGELING) { var oldOverlay = currentInteraction.overlay(); if (oldOverlay != null) oldOverlay.close(); - currentInteraction.overlay(gameScreen.showColoredCardOverlay(card, currentInteraction.timeout())); + currentInteraction.overlay(gameScreen.showSpecialCardOverlay(card, currentInteraction.timeout())); } else { send(client, new PlayCardMessage(card)); } diff --git a/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages.properties b/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages.properties index ff3167d..f024c69 100644 --- a/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages.properties +++ b/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages.properties @@ -233,4 +233,7 @@ game.overlay.trump.none.player={0} has decided there will be no trump suit this game.overlay.trump.unknown.player=The trump suit is yet to be determined by {0} game.overlay.play_colored_card.prompt=Pick a color -game.overlay.play_colored_card.cancel=Cancel \ No newline at end of file +game.overlay.play_colored_card.cancel=Cancel + +game.overlay.play_changeling.prompt=Do you want to play the changeling as a wizard or a jester? +game.overlay.play_changeling.cancel=Cancel \ No newline at end of file diff --git a/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages_de.properties b/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages_de.properties index 2651073..f80b2a5 100644 --- a/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages_de.properties +++ b/wizard-client/wizard-client-libgdx/core/src/main/resources/i18n/messages_de.properties @@ -220,7 +220,10 @@ game.overlay.trump.green.player={0} hat die Trumpffarbe [#00ff00]grün[] gewähl game.overlay.trump.blue.player={0} hat die Trumpffarbe [#0000ff]blau[] gewählt game.overlay.trump.red.player={0} hat die Trumpffarbe [#ff0000]rot[] gewählt game.overlay.trump.none.player={0} hat entschieden, dass es diese Runde keinen Trump geben wird -game.overlay.trump.unknown.player={0} muss die Trumpffarbe muss noch bestimmen +game.overlay.trump.unknown.player={0} muss die Trumpffarbe noch bestimmen game.overlay.play_colored_card.prompt=Wähle eine Farbe -game.overlay.play_colored_card.cancel=Abbrechen \ No newline at end of file +game.overlay.play_colored_card.cancel=Abbrechen + +game.overlay.play_changeling.prompt=Möchtest du den Gestaltwandler als Zauberer oder als Narr spielen? +game.overlay.play_changeling.cancel=Abbrechen \ No newline at end of file diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/background.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/background.jpg deleted file mode 100644 index 6228659..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/background.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/background.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/background.png new file mode 100644 index 0000000..532e528 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/background.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue.jpg deleted file mode 100644 index 9a62db3..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue.png new file mode 100644 index 0000000..76dd522 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_1.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_1.jpg deleted file mode 100644 index 138fb30..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_1.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_1.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_1.png new file mode 100644 index 0000000..98fc5e5 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_1.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_10.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_10.jpg deleted file mode 100644 index 4358223..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_10.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_10.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_10.png new file mode 100644 index 0000000..cb02382 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_10.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_11.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_11.jpg deleted file mode 100644 index 4fce809..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_11.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_11.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_11.png new file mode 100644 index 0000000..ee4a5ab Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_11.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_12.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_12.jpg deleted file mode 100644 index 7960cce..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_12.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_12.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_12.png new file mode 100644 index 0000000..19f403c Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_12.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_13.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_13.jpg deleted file mode 100644 index d887666..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_13.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_13.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_13.png new file mode 100644 index 0000000..58ca686 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_13.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_2.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_2.jpg deleted file mode 100644 index 69eb31f..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_2.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_2.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_2.png new file mode 100644 index 0000000..51c073b Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_2.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_3.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_3.jpg deleted file mode 100644 index 0ee668c..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_3.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_3.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_3.png new file mode 100644 index 0000000..cec03cd Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_3.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_4.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_4.jpg deleted file mode 100644 index 6784bec..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_4.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_4.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_4.png new file mode 100644 index 0000000..f2c7433 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_4.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_5.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_5.jpg deleted file mode 100644 index 626ec44..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_5.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_5.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_5.png new file mode 100644 index 0000000..cb2aa34 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_5.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_6.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_6.jpg deleted file mode 100644 index e7985df..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_6.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_6.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_6.png new file mode 100644 index 0000000..0704be6 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_6.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_7.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_7.jpg deleted file mode 100644 index cd1d7e0..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_7.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_7.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_7.png new file mode 100644 index 0000000..d797324 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_7.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_8.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_8.jpg deleted file mode 100644 index c53458a..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_8.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_8.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_8.png new file mode 100644 index 0000000..42e2f2f Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_8.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_9.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_9.jpg deleted file mode 100644 index d5a28c0..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_9.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_9.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_9.png new file mode 100644 index 0000000..304b306 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_9.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_jester.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_jester.jpg deleted file mode 100644 index e947637..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_jester.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_jester.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_jester.png new file mode 100644 index 0000000..e6afc4c Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_jester.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_wizard.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_wizard.jpg deleted file mode 100644 index ce27d25..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_wizard.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_wizard.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_wizard.png new file mode 100644 index 0000000..c2bd753 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_wizard.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_yellow.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_yellow.jpg deleted file mode 100644 index 3f324dd..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_yellow.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_yellow.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_yellow.png new file mode 100644 index 0000000..037be04 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/blue_yellow.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/bomb.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/bomb.jpg deleted file mode 100644 index d816e4c..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/bomb.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/bomb.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/bomb.png new file mode 100644 index 0000000..a4373b2 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/bomb.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/border.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/border.png deleted file mode 100644 index 56eba44..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/border.png and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/border2.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/border2.png deleted file mode 100644 index 059feb9..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/border2.png and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling.jpg deleted file mode 100644 index 0dd51d6..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling.png new file mode 100644 index 0000000..84228df Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling_jester.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling_jester.png new file mode 100644 index 0000000..59d11f4 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling_jester.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling_wizard.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling_wizard.png new file mode 100644 index 0000000..c60a124 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/changeling_wizard.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud.jpg deleted file mode 100644 index aa7b5ca..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud.png new file mode 100644 index 0000000..bf6b8dc Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_blue.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_blue.png new file mode 100644 index 0000000..58c8fbf Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_blue.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_green.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_green.png new file mode 100644 index 0000000..c93978c Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_green.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_red.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_red.png new file mode 100644 index 0000000..b21475b Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_red.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_yellow.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_yellow.png new file mode 100644 index 0000000..3fba8c0 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/cloud_yellow.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/dragon.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/dragon.jpg deleted file mode 100644 index a5c41aa..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/dragon.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/dragon.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/dragon.png new file mode 100644 index 0000000..7f80169 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/dragon.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/fairy.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/fairy.jpg deleted file mode 100644 index 46f82fa..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/fairy.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/fairy.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/fairy.png new file mode 100644 index 0000000..6548042 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/fairy.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green.jpg deleted file mode 100644 index eb33995..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green.png new file mode 100644 index 0000000..12f8be0 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_1.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_1.jpg deleted file mode 100644 index 0b94341..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_1.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_1.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_1.png new file mode 100644 index 0000000..8248326 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_1.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_10.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_10.jpg deleted file mode 100644 index 1f09d13..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_10.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_10.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_10.png new file mode 100644 index 0000000..f3562e0 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_10.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_11.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_11.jpg deleted file mode 100644 index 7741d74..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_11.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_11.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_11.png new file mode 100644 index 0000000..7e07520 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_11.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_12.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_12.jpg deleted file mode 100644 index 1fc5109..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_12.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_12.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_12.png new file mode 100644 index 0000000..3330177 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_12.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_13.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_13.jpg deleted file mode 100644 index 6e2512d..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_13.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_13.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_13.png new file mode 100644 index 0000000..1811a51 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_13.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_2.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_2.jpg deleted file mode 100644 index 57e4ca2..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_2.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_2.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_2.png new file mode 100644 index 0000000..b93c206 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_2.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_3.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_3.jpg deleted file mode 100644 index f9ff4ba..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_3.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_3.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_3.png new file mode 100644 index 0000000..7632864 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_3.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_4.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_4.jpg deleted file mode 100644 index d140f4b..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_4.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_4.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_4.png new file mode 100644 index 0000000..3fabf84 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_4.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_5.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_5.jpg deleted file mode 100644 index 5ff9bc7..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_5.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_5.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_5.png new file mode 100644 index 0000000..bbecdc6 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_5.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_6.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_6.jpg deleted file mode 100644 index b70fb55..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_6.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_6.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_6.png new file mode 100644 index 0000000..d39742e Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_6.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_7.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_7.jpg deleted file mode 100644 index 4e61ff2..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_7.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_7.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_7.png new file mode 100644 index 0000000..557e16e Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_7.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_8.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_8.jpg deleted file mode 100644 index 094a787..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_8.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_8.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_8.png new file mode 100644 index 0000000..cade955 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_8.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_9.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_9.jpg deleted file mode 100644 index aa318ec..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_9.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_9.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_9.png new file mode 100644 index 0000000..d889991 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_9.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_jester.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_jester.jpg deleted file mode 100644 index de4de42..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_jester.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_jester.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_jester.png new file mode 100644 index 0000000..b92dc54 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_jester.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_wizard.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_wizard.jpg deleted file mode 100644 index ddaa2b1..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_wizard.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_wizard.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_wizard.png new file mode 100644 index 0000000..15bac41 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/green_wizard.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler.jpg deleted file mode 100644 index c64cb92..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler.png new file mode 100644 index 0000000..f4a8a18 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_blue.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_blue.png new file mode 100644 index 0000000..6546686 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_blue.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_green.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_green.png new file mode 100644 index 0000000..f03ba95 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_green.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_red.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_red.png new file mode 100644 index 0000000..8827a11 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_red.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_yellow.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_yellow.png new file mode 100644 index 0000000..4701bc4 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/juggler_yellow.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red.jpg deleted file mode 100644 index 60a4130..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red.png new file mode 100644 index 0000000..dd582e9 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_1.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_1.jpg deleted file mode 100644 index bb6d209..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_1.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_1.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_1.png new file mode 100644 index 0000000..4c8e114 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_1.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_10.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_10.jpg deleted file mode 100644 index 6f38350..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_10.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_10.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_10.png new file mode 100644 index 0000000..98f8569 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_10.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_11.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_11.jpg deleted file mode 100644 index f9c40a4..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_11.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_11.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_11.png new file mode 100644 index 0000000..d86e78e Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_11.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_12.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_12.jpg deleted file mode 100644 index a47e087..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_12.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_12.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_12.png new file mode 100644 index 0000000..7124e09 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_12.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_13.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_13.jpg deleted file mode 100644 index 8ce6cdc..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_13.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_13.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_13.png new file mode 100644 index 0000000..5da70b6 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_13.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_2.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_2.jpg deleted file mode 100644 index ff17872..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_2.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_2.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_2.png new file mode 100644 index 0000000..e27b3bc Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_2.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_3.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_3.jpg deleted file mode 100644 index d794df5..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_3.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_3.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_3.png new file mode 100644 index 0000000..1883384 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_3.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_4.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_4.jpg deleted file mode 100644 index ac7e910..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_4.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_4.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_4.png new file mode 100644 index 0000000..bdfd59a Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_4.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_5.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_5.jpg deleted file mode 100644 index 354b8a2..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_5.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_5.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_5.png new file mode 100644 index 0000000..cb7551d Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_5.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_6.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_6.jpg deleted file mode 100644 index b0979e6..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_6.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_6.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_6.png new file mode 100644 index 0000000..f999fb4 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_6.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_7.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_7.jpg deleted file mode 100644 index 39f4069..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_7.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_7.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_7.png new file mode 100644 index 0000000..b381cf7 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_7.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_8.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_8.jpg deleted file mode 100644 index 90f6991..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_8.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_8.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_8.png new file mode 100644 index 0000000..f0bf4ea Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_8.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_9.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_9.jpg deleted file mode 100644 index 347fb73..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_9.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_9.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_9.png new file mode 100644 index 0000000..a825eff Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_9.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_green.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_green.jpg deleted file mode 100644 index 743eb41..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_green.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_green.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_green.png new file mode 100644 index 0000000..9f4e63e Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_green.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_jester.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_jester.jpg deleted file mode 100644 index 8f09d09..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_jester.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_jester.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_jester.png new file mode 100644 index 0000000..174efe2 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_jester.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_wizard.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_wizard.jpg deleted file mode 100644 index cafde66..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_wizard.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_wizard.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_wizard.png new file mode 100644 index 0000000..cfbe8c3 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/red_wizard.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/werewolf.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/werewolf.jpg deleted file mode 100644 index 655355d..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/werewolf.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/werewolf.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/werewolf.png new file mode 100644 index 0000000..6d4890d Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/werewolf.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow.jpg deleted file mode 100644 index a52328c..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow.png new file mode 100644 index 0000000..635fd88 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_1.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_1.jpg deleted file mode 100644 index de026d4..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_1.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_1.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_1.png new file mode 100644 index 0000000..a9ed362 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_1.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_10.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_10.jpg deleted file mode 100644 index 8574b7b..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_10.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_10.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_10.png new file mode 100644 index 0000000..b927645 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_10.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_11.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_11.jpg deleted file mode 100644 index 889ebe0..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_11.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_11.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_11.png new file mode 100644 index 0000000..a8ff8e4 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_11.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_12.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_12.jpg deleted file mode 100644 index 671e35c..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_12.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_12.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_12.png new file mode 100644 index 0000000..7d71097 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_12.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_13.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_13.jpg deleted file mode 100644 index 67c3bf7..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_13.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_13.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_13.png new file mode 100644 index 0000000..7de5fb5 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_13.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_2.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_2.jpg deleted file mode 100644 index 49a718a..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_2.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_2.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_2.png new file mode 100644 index 0000000..5e409b9 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_2.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_3.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_3.jpg deleted file mode 100644 index 2427a3d..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_3.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_3.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_3.png new file mode 100644 index 0000000..95c29e0 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_3.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_4.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_4.jpg deleted file mode 100644 index 1ea3790..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_4.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_4.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_4.png new file mode 100644 index 0000000..7dd444c Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_4.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_5.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_5.jpg deleted file mode 100644 index 2c05771..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_5.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_5.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_5.png new file mode 100644 index 0000000..c75d609 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_5.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_6.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_6.jpg deleted file mode 100644 index 18ac78b..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_6.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_6.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_6.png new file mode 100644 index 0000000..18003ae Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_6.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_7.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_7.jpg deleted file mode 100644 index 70e6434..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_7.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_7.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_7.png new file mode 100644 index 0000000..78ba8b6 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_7.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_8.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_8.jpg deleted file mode 100644 index 562641f..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_8.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_8.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_8.png new file mode 100644 index 0000000..c7eca51 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_8.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_9.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_9.jpg deleted file mode 100644 index 27a25c8..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_9.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_9.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_9.png new file mode 100644 index 0000000..bca1089 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_9.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_jester.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_jester.jpg deleted file mode 100644 index 4caf296..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_jester.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_jester.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_jester.png new file mode 100644 index 0000000..b969197 Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_jester.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_wizard.jpg b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_wizard.jpg deleted file mode 100644 index 9af07e9..0000000 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_wizard.jpg and /dev/null differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_wizard.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_wizard.png new file mode 100644 index 0000000..225fb1e Binary files /dev/null and b/wizard-client/wizard-client-libgdx/core/src/main/textures/game/cards/yellow_wizard.png differ diff --git a/wizard-client/wizard-client-libgdx/core/src/main/textures/uiskin/textbutton-focused.9.png b/wizard-client/wizard-client-libgdx/core/src/main/textures/uiskin/textbutton-focused.9.png index 8c6c5fb..ef91c78 100644 Binary files a/wizard-client/wizard-client-libgdx/core/src/main/textures/uiskin/textbutton-focused.9.png and b/wizard-client/wizard-client-libgdx/core/src/main/textures/uiskin/textbutton-focused.9.png differ