From bd4c9e8ca9342aab92592c3499dac84e742c6617 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 10 Apr 2023 13:22:53 +0200 Subject: [PATCH] new one --- API/QRCODE.sh | 2 +- tools/VISA.new.sh | 4 ++-- www/PasseportTerre/index.html | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/API/QRCODE.sh b/API/QRCODE.sh index cd54f24f..79e6ae9c 100755 --- a/API/QRCODE.sh +++ b/API/QRCODE.sh @@ -330,7 +330,7 @@ else echo "VISITEUR POSSEDE ${VISITORCOINS} G1" ## GET G1 WALLET HISTORY - if [ ${VISITORCOINS} -gt 0 ]; then + if [[ ${VISITORCOINS} != "null" && ${VISITORCOINS} -gt 0 ]]; then [[ ! -s ~/.zen/tmp/coucou/${QRCODE}.g1history.json ]] \ && ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/coucou/${QRCODE}.g1history.json diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index c088af64..1ad21532 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -374,8 +374,8 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" convert ${MY_PATH}/../images/astroport.jpg -resize 240 ~/.zen/tmp/${MOATS}/ASTROPORT.png - composite -compose Over -gravity SouthWest -geometry +5+5 ~/.zen/tmp/${MOATS}/ASTROPORT.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/astroport.png - composite -compose Over -gravity East -geometry +5+5 ~/.zen/tmp/${MOATS}/TW.png ~/.zen/tmp/${MOATS}/astroport.png ~/.zen/tmp/${MOATS}/astroport2.png + composite -compose Over -gravity SouthEast -geometry +5+5 ~/.zen/tmp/${MOATS}/ASTROPORT.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/astroport.png + composite -compose Over -gravity NorthEast -geometry +10+55 ~/.zen/tmp/${MOATS}/TW.png ~/.zen/tmp/${MOATS}/astroport.png ~/.zen/tmp/${MOATS}/astroport2.png composite -compose Over -gravity NorthWest -geometry +0+0 ~/.zen/tmp/${MOATS}/QR.png ~/.zen/tmp/${MOATS}/astroport2.png ~/.zen/tmp/${MOATS}/one.png # composite -compose Over -gravity NorthWest -geometry +280+280 ~/.zen/game/players/.current/QRsec.png ~/.zen/tmp/${MOATS}/one.png ~/.zen/tmp/${MOATS}/image.png diff --git a/www/PasseportTerre/index.html b/www/PasseportTerre/index.html index 74c8784e..80770b6c 100644 --- a/www/PasseportTerre/index.html +++ b/www/PasseportTerre/index.html @@ -217,7 +217,7 @@ showGifs(); }); -
+

_PLAYER_

@@ -233,6 +233,8 @@