From d4f915e94dc70d7f9b41e6167963bc20be6c1286 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Mon, 6 Mar 2023 19:22:13 +0100
Subject: [PATCH] AMZQR optimize

---
 ASTROBOT/G1Voeu.sh | 10 +++++++---
 tools/VISA.new.sh  | 11 ++++++++---
 tools/my.sh        |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh
index c677dc1a..610f576d 100755
--- a/ASTROBOT/G1Voeu.sh
+++ b/ASTROBOT/G1Voeu.sh
@@ -99,13 +99,17 @@ mkdir -p ~/.zen/tmp/$MOATS
     HPass=$(echo "$SALT" | sha512sum | cut -d ' ' -f 1 )
     qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec
 
+    cp ${MY_PATH}/../images/g1magicien.png ~/.zen/tmp/${MOATS}/fond.png
+    convert -gravity northwest -pointsize 25 -fill black -draw "text 40,40 \"$PLAYER\"" ~/.zen/tmp/${MOATS}/fond.png ~/.zen/tmp/${MOATS}/layer1.png
+    convert -gravity southeast -pointsize 25 -fill black -draw "text 30,30 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/result.png
+
     ## MAKE amzqr WITH astro:// LINK
-    amzqr "$myASTROPORT/?qrcode=$WISHKEY&sslpassdunikeysec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \
+    amzqr "$myASTRONEF/?qrcode=$WISHKEY&sslpassdunikeysec=$PASsec&asksalt=$HPass&flux=$VOEUNS&tw=$ASTRONAUTENS" \
                 -d "$HOME/.zen/game/world/$PEPPER/$WISHKEY" \
                 -l H \
-               -p ${MY_PATH}/../images/g1magicien.png -c
+               -p ~/.zen/tmp/${MOATS}/result.png -c
 
-    IMAGIC=$(ipfs add -Hq ~/.zen/game/world/$PEPPER/$WISHKEY/g1magicien_qrcode.png | tail -n 1)
+    IMAGIC=$(ipfs add -Hq ~/.zen/game/world/$PEPPER/$WISHKEY/result_qrcode.png | tail -n 1)
 
     qrencode -s 12 -o "$HOME/.zen/game/world/$PEPPER/$WISHKEY/QR.ASTROLINK.png" "$LIBRA/ipns/$ASTRONAUTENS"
     qrencode -s 12 -o "$HOME/.zen/game/world/$PEPPER/$WISHKEY/QR.G1ASTRO.png" "$G1PUB"
diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh
index 87e6e6f7..26cc0a79 100755
--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@@ -202,15 +202,20 @@ DISCO="https://astroport.$(myHostName)/?salt=${USALT}&pepper=${UPEPPER}&logout=$
     HPass=$(echo "$PASS" | sha512sum | cut -d ' ' -f 1)
     qrencode -s 12 -o $HOME/.zen/game/players/${PLAYER}/QRsec.png $PASsec
 
+    ## ADD NAME
+    cp ${MY_PATH}/../images/astrologo_nb.png ~/.zen/tmp/${MOATS}/fond.png
+    convert -gravity northwest -pointsize 28 -fill black -draw "text 40,40 \"$PLAYER\"" ~/.zen/tmp/${MOATS}/fond.png ~/.zen/tmp/${MOATS}/result.png
+    ## convert -gravity southeast -pointsize 50 -fill black -draw "text 40,40 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/layer1.png ~/.zen/tmp/${MOATS}/result.png
+
     ## MAKE amzqr WITH astro:// LINK
-    amzqr  "$myASTROPORT/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \
+    amzqr  "$myASTRONEF/?qrcode=$G1PUB&sslpassdunikeysec=$PASsec&askpass=$HPass&tw=$ASTRONAUTENS" \
                 -d $HOME/.zen/game/players/${PLAYER} \
                 -l H \
-                -p ${MY_PATH}/../images/plain.png
+                -p ~/.zen/tmp/${MOATS}/result.png
 
     rm -f ~/.zen/tmp/${MOATS}/${PSEUDO}.sec
 
-    ASTROQR="/ipfs/$(ipfs add -q $HOME/.zen/game/players/${PLAYER}/plain_qrcode.png | tail -n 1)"
+    ASTROQR="/ipfs/$(ipfs add -q $HOME/.zen/game/players/${PLAYER}/result_qrcode.png | tail -n 1)"
 
 ############################################################################ TW
     ### INITALISATION WIKI dans leurs répertoires de publication IPFS
diff --git a/tools/my.sh b/tools/my.sh
index a311a9bd..b6759596 100755
--- a/tools/my.sh
+++ b/tools/my.sh
@@ -382,6 +382,7 @@ IPFSNODEID="$(myIpfsPeerId)"
 [[ ! $MOATS ]] && MOATS="$(myDate)"
 isLAN="$(isLan)"
 myASTROPORT="http://$(myIp):1234"
+myASTRONEF="https://astroport.copylaradio.com"
 myAPI="http://$(myIp):5001"
 myDATA="https://data.gchange.fr"
 myGCHANGE="https://www.gchange.fr"