From 0cdf22c4e06af9770843ef3fba760670eb6d22d2 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 17 Dec 2023 18:53:25 +0100
Subject: [PATCH] small fix

---
 G1BILLETS.sh     | 2 ++
 MAKE_G1BILLET.sh | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index 60f7b3e..00cedfe 100755
--- a/G1BILLETS.sh
+++ b/G1BILLETS.sh
@@ -63,6 +63,8 @@ if [[ $MONTANT != "daemon" ]]; then
     echo "G1BILLET MAKE $NBbillets - ${STYLE} (${DICE}) - "
 
     # CHECK IF $STYLE IMAGES EXIST
+    IMAGESSTYLE="${IMAGES}/${STYLE}"
+    [[ ${STYLE} == "UPlanet" ]] && STYLE="xastro" ## DEFAULT : UPlanet Style
     [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/g1.png ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/g1.png - EXIT" && echo $ERROR && exit 1
     [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/fond.jpg- EXIT" && echo $ERROR && exit 1
     [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/logo.png ]] && ERROR="MISSING ./${IMAGES}/${STYLE}/logo.png- EXIT" && echo $ERROR && exit 1
diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index c2d49e3..e8caddd 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -121,7 +121,7 @@ if [[ "${STYLE:0:1}" != "_" && "${STYLE:0:1}" != "@" && ! "${STYLE}" =~ ^[a-zA-Z
 
     ## ADD PLAYER EMAIL
     convert -gravity southeast -pointsize 28 -fill black -draw "text 5,3 \"${EMAIL}\"" ${MY_PATH}/tmp/fond_qrcode.png ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.ZENCARD.png
-    convert ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.ZENCARD.png -resize 300 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png
+    convert ${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.ZENCARD.png -resize 320 ${MY_PATH}/tmp/g1billet/${UNIQID}/320.png
 
     rm ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
 
@@ -150,7 +150,7 @@ fi
         -c -n QRTWavatar.png \
         -d ${MY_PATH}/tmp/g1billet/${UNIQID}/
 
-    convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 260 ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png
+    convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 280 ${MY_PATH}/tmp/g1billet/${UNIQID}/TW.${ASTRONS}.png
 
 
 [[ "${EMAIL}" != ""  ]] && XZUID="${EMAIL}"
@@ -163,7 +163,7 @@ fi
                     && BOTTOM="$(date) :: ♥Box :: ẐBILLET+ :: $(hostname) ::"
 
          [[ "${STYLE:0:1}" != "_" ]] \
-                        && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \
+                        && mv ${MY_PATH}/tmp/g1billet/${UNIQID}/320.png ${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png \
                             && BOTTOM="$(date) :: ♥Box :: ZENCARD :: $(hostname) ::"
 
         [[ "${STYLE:0:1}" == "x" ]] \
@@ -242,7 +242,7 @@ rm -f ${MY_PATH}/tmp/${BILLETNAME}.jpg
 
 ## ADD SouthWEST
 [[ -s "${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png" ]] && \
-composite -compose Over -gravity SouthWest -geometry +50+50 \
+composite -compose Over -gravity SouthWest -geometry +30+30 \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/LEFT.png" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" \
 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"