diff --git a/gemp-lotr/gemp-lotr-images/src/main/java/com/gempukku/lotro/images/ImageGenerator.java b/gemp-lotr/gemp-lotr-images/src/main/java/com/gempukku/lotro/images/ImageGenerator.java index f9b2490e0..058977242 100644 --- a/gemp-lotr/gemp-lotr-images/src/main/java/com/gempukku/lotro/images/ImageGenerator.java +++ b/gemp-lotr/gemp-lotr-images/src/main/java/com/gempukku/lotro/images/ImageGenerator.java @@ -38,20 +38,18 @@ public class ImageGenerator { final JSONObject cardsObject = (JSONObject) parser.parse(reader); for (Map.Entry cardEntry : (Set>) cardsObject.entrySet()) { final String cardId = cardEntry.getKey(); - if (cardId.equals("40_3") || cardId.equals("40_17")) { - BufferedImage bufferedImage = new BufferedImage(jsonImageRecipe.getWidth(), jsonImageRecipe.getHeight(), BufferedImage.TYPE_INT_RGB); - jsonImageRecipe.renderImage(properties, cardEntry.getValue(), bufferedImage); + BufferedImage bufferedImage = new BufferedImage(jsonImageRecipe.getWidth(), jsonImageRecipe.getHeight(), BufferedImage.TYPE_INT_RGB); + jsonImageRecipe.renderImage(properties, cardEntry.getValue(), bufferedImage); - JPEGImageWriteParam jpegParams = new JPEGImageWriteParam(null); - jpegParams.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); - jpegParams.setCompressionQuality(1f); + JPEGImageWriteParam jpegParams = new JPEGImageWriteParam(null); + jpegParams.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); + jpegParams.setCompressionQuality(1f); - final ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next(); - final File resultFile = new File(output, cardId + ".jpg"); - try (FileImageOutputStream outputStream = new FileImageOutputStream(resultFile)) { - writer.setOutput(outputStream); - writer.write(null, new IIOImage(bufferedImage, null, null), jpegParams); - } + final ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next(); + final File resultFile = new File(output, cardId + ".jpg"); + try (FileImageOutputStream outputStream = new FileImageOutputStream(resultFile)) { + writer.setOutput(outputStream); + writer.write(null, new IIOImage(bufferedImage, null, null), jpegParams); } } } catch (IOException | ParseException e) { diff --git a/gemp-lotr/gemp-lotr-images/src/main/resources/cardRecipe.json b/gemp-lotr/gemp-lotr-images/src/main/resources/cardRecipe.json index 908fffcb3..0822b5453 100644 --- a/gemp-lotr/gemp-lotr-images/src/main/resources/cardRecipe.json +++ b/gemp-lotr/gemp-lotr-images/src/main/resources/cardRecipe.json @@ -714,7 +714,7 @@ "box": { "type": "box", "x": 45, - "y": 685, + "y": 681, "width": 90, "height": 50, "horAlign": "center" @@ -1003,12 +1003,12 @@ "shire": "#", "dwarven": "@" }, - "minYStart": 0.15, + "minYStart": 0.10, "box": { "type": "box", - "x": 160, + "x": 162, "y": 690, - "width": 540, + "width": 536, "height": 265 } } diff --git a/gemp-lotr/gemp-lotr-images/src/main/resources/config.properties b/gemp-lotr/gemp-lotr-images/src/main/resources/config.properties index 7edc47a9e..e8b7c80a7 100644 --- a/gemp-lotr/gemp-lotr-images/src/main/resources/config.properties +++ b/gemp-lotr/gemp-lotr-images/src/main/resources/config.properties @@ -12,7 +12,7 @@ subtitle.size=35 type.font=fonts/o_wap_matbolsmallcap.ttf type.size=35 numbers.font=Joe-resources/GaramondBE-Medium.otf -numbers.size=60 +numbers.size=58 #text.font=Joe-resources/LOTR.ttf text.font=fonts/o_lotrrg__.ttf text.size=27