diff --git a/API/QRCODE.sh b/API/QRCODE.sh
index 82dfc5b5..989bb2d5 100755
--- a/API/QRCODE.sh
+++ b/API/QRCODE.sh
@@ -177,7 +177,7 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
## CREATE game pending TX
mkdir -p $HOME/.zen/game/pending/${G1PUB}/
PENDING="$HOME/.zen/game/pending/${G1PUB}/${MOATS}_${VAL}+${WHAT}.TX"
- echo "UNKNOWN" > ${PENDING}
+ echo "START" > ${PENDING}
######################## ~/.zen/game/pending/*/*_G1WHO+*.TX
if [[ ! -f ~/.zen/game/pending/*/*_${VAL}+*.TX ]]; then
# MAKE PAYMENT
@@ -254,8 +254,8 @@ if [[ ${QRCODE:0:5} == "~~~~~" ]]; then
if [[ ${APPNAME} == "flipper" ]]; then
## Open OSM2IPF "getreceiver" App
- BASE="qrcode=$(urlencode "${QRCODE}")&pass=${PASS}"
- LINK="${myIPFS}${GETRECEIVERCID}/?${BASE}&coins=${CURCOINS}"
+ BASE="qrcode=${QRCODE}&pass=${PASS}"
+ LINK="${myIPFS}${FLIPPERCID}/?${BASE}&coins=${CURCOINS}"
echo "LINK:$LINK"
echo "$HTTPCORS" > ~/.zen/tmp/${MOATS}/disco
echo "" >> ~/.zen/tmp/${MOATS}/disco
@@ -566,8 +566,8 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
else
## TODO : EMPTY WALLET BACK TO ORIGIN
- echo "
${PASS} ${UPASS} TOO OLD
" >> ~/.zen/tmp/${MOATS}/disco
- echo "
" >> ~/.zen/tmp/${MOATS}/disco
+ echo "
${PASS} ${UPASS} ARE BAD
" >> ~/.zen/tmp/${MOATS}/disco
+ echo "
" >> ~/.zen/tmp/${MOATS}/disco
fi
@@ -726,6 +726,7 @@ CURG1=$(cat ~/.zen/game/players/.current/.g1pub)
echo "${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${CURG1}"
CURCOINS=$(${MY_PATH}/../tools/COINScheck.sh ${CURG1} | tail -n 1)
echo "AUTOGRAPH $CURPLAYER : $CURCOINS G1"
+ZEN=$(echo "($CURCOINS - 1) * 10" | bc | cut -d '.' -f 1)
## WALLET VIERGE
###########################################
@@ -750,7 +751,7 @@ fi
if [[ ${CURG1} == ${QRCODE} ]]; then
## SCANNED G1PUB IS CURRENT STATION PLAYER : RETURN BALANCE
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
- echo "$CURPLAYER WALLET : $CURCOINS Ǧ1
" >> ~/.zen/tmp/${MOATS}/index.redirect
+ echo "$CURPLAYER WALLET : $ZEN ẐEN
" >> ~/.zen/tmp/${MOATS}/index.redirect
(
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
echo "BLURP $PORT" && rm -Rf ~/.zen/tmp/${MOATS}
@@ -763,14 +764,14 @@ else
## EMPTY WALLET ? PREPARE PALPE WELCOME
if [[ $VISITORCOINS == "null" ]]; then
- # CADEAU DE 10 JUNE (Si le .current en a plus que 100)
+ # CADEAU DE 10 ZEN (Si le .current a plus de 100 G1)
PALPE=1
echo "PALPE=1"
else
PALPE=0
fi
- echo "VISITEUR POSSEDE ${VISITORCOINS} G1"
+ echo "VISITEUR POSSEDE ${VISITORCOINS} G1 ($ZEN ZEN)"
## GET G1 WALLET HISTORY
if [[ ${VISITORCOINS} != "null" && ${VISITORCOINS} > 0 ]]; then
@@ -779,7 +780,7 @@ else
&& ${MY_PATH}/../tools/timeout.sh -t 20 $MY_PATH/../tools/jaklis/jaklis.py history -p ${QRCODE} -j > ~/.zen/tmp/${MOATS}/${QRCODE}.g1history.json
echo "${HTTPCORS}" > ~/.zen/tmp/${MOATS}/index.redirect
- echo "Solde $VISITORCOINS Ǧ1
" >> ~/.zen/tmp/${MOATS}/index.redirect
+ echo "Solde $ZEN ẐEN
" >> ~/.zen/tmp/${MOATS}/index.redirect
echo "" >> ~/.zen/tmp/${MOATS}/index.redirect
(
cat ~/.zen/tmp/${MOATS}/index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
@@ -850,7 +851,7 @@ else
else
## MESSAGE TO LINKED CESIUM WALLET
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k ${MYPLAYERKEY} send -d "${CPLUS}" -t "COUCOU" \
- -m "VOTRE PORTEFEUILLE ${QRCODE} A ETE SCANNE PAR $myASTROPORT - IL CONTIENT ${VISITORCOINS} G1 -"
+ -m "VOTRE PORTEFEUILLE ${QRCODE} A ETE SCANNE PAR $myASTROPORT - IL CONTIENT ${ZEN} ZEN -"
fi
fi
diff --git a/templates/G1PalPay/index.html b/templates/G1PalPay/index.html
index 65d71f9e..dd7e4314 100644
--- a/templates/G1PalPay/index.html
+++ b/templates/G1PalPay/index.html
@@ -119,16 +119,18 @@ a {
- Oubliez la crise !
- Utilisez la Monnaie Libre.
- Explorez le Monde en confiance...
diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh
index 14754b88..3967fe41 100755
--- a/tools/RSS2UPlanetTW.sh
+++ b/tools/RSS2UPlanetTW.sh
@@ -26,7 +26,7 @@ cat "${RSS}" | jq -r '.[] | .title' > ~/.zen/tmp/${MOATS}/titles.list
while read title; do
- [[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
+ [[ ${title} == "GettingStarted" || ${title} == "GPS" || ${title} == "AstroID" || ${title} == "Astroport" || ${title} == "MadeInZion" || ${title} == "G1Visa" || ${title} == "ZenCard" || ${title::5} == "Draft" ]] \
&& echo "FILTERED TITLE ${title}" && continue
## CHECK FOR TIDDLER WITH SAME TITTLE IN SECTOR TW
diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh
index ee821477..cde8049e 100755
--- a/tools/VOEUX.print.sh
+++ b/tools/VOEUX.print.sh
@@ -40,7 +40,7 @@ PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null)
SECRET1="${PLAYER}"
SECRET2="G1${VoeuName} ${G1PUB}"
- ## ATTACHED G1BILLET+
+ ## ATTACHED G1BILLET+ "EMAIL_SEC1_SEC2"
[[ $(echo ${PLAYER_} | grep '_' ) ]] \
&& echo "G1BILLET+ interlinked : salt pepper refining" \
&& murge=($(echo "${PLAYER_}" | cut -d '_' -f 2- | sed 's/_/ /g' | xargs)) \
diff --git a/tools/my.sh b/tools/my.sh
index 5f110e11..7fb18f8b 100755
--- a/tools/my.sh
+++ b/tools/my.sh
@@ -470,6 +470,4 @@ if [[ $XDG_SESSION_TYPE == 'x11' ]]; then
###
fi
-ASTROJSCID="/ipfs/"
-LOGINCID="/ipfs/"
-GETRECEIVERCID="/ipfs/QmXctju7CKDEwpesQSvSyfxfVdZqhdMdfMx3MikB6u7mLd"
+FLIPPERCID="/ipfs/QmbnqZz17U6Kiea5UzKb9B9gWfXBRmvrd8u5TDRQCJ749u/coinflip"