Creating & Refreshing a Wish moves 1 G1 (non blocking TX)
This commit is contained in:
parent
cc88d690df
commit
823588beb8
|
|
@ -55,9 +55,9 @@ MYPLAYERKEY=$(grep ${QRCODE} ~/.zen/game/players/*/secret.dunikey | cut -d ':' -
|
|||
|
||||
## COUCOU MSG
|
||||
## CCHANGE +
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myGCHANGE -k $MYPLAYERKEY send -d "${QRCODE}" -t "COUCOU" -m "Rendez vous sur https://astroport.copylaradio.com/"
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myGCHANGE -k $MYPLAYERKEY send -d "${QRCODE}" -t "COUCOU" -m "ASTROPORT CONTACT"
|
||||
## CESIUM +
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${QRCODE}" -t "COUCOU" -m "Rendez vous sur https://astroport.copylaradio.com/"
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -n $myCESIUM -k $MYPLAYERKEY send -d "${QRCODE}" -t "COUCOU" -m "ASTROPORT CONTACT"
|
||||
|
||||
###################################################################################################
|
||||
# THAT=$2 AND=$3 THIS=$4 APPNAME=$5 WHAT=$6 OBJ=$7 VAL=$8
|
||||
|
|
@ -68,11 +68,20 @@ if [[ $AND == "sslpassdunikeysec" ]]; then
|
|||
echo "♥BOX♥BOX♥BOX♥BOX♥BOX"
|
||||
echo "MAGIC WORLD ASTRONAUT & WISHES"
|
||||
|
||||
COINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${QRCODE})
|
||||
[[ $COINS == "" || $COINS == "null" ]] \
|
||||
&& $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/.current/secret.dunikey pay -a 50 -p ${QRCODE} -c "ASTRO:PASSPORT_ACTIVATION" -m
|
||||
echo "************************************************************"
|
||||
echo "$COINS (+ 50 JUNE IF EMPTY) "
|
||||
echo "************************************************************"
|
||||
|
||||
if [[ $APPNAME == "askpass" ]]; then
|
||||
echo ">> ASTRONAUT QRCODE $APPNAME"
|
||||
ENDCODED="$THIS"
|
||||
HPASS="$WHAT"
|
||||
TW="/ipns/$VAL"
|
||||
|
||||
|
||||
fi
|
||||
|
||||
if [[ $APPNAME == "asksalt" ]]; then
|
||||
|
|
@ -80,8 +89,8 @@ echo "MAGIC WORLD ASTRONAUT & WISHES"
|
|||
ENDCODED="$THIS"
|
||||
HSALT="$WHAT"
|
||||
FLUX="/ipns/$VAL"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -257,15 +257,15 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE
|
|||
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 1 -p $WISHKEY -c "$VOEUXNS G1Voeu $PEPPER" -m
|
||||
[[ ! $? == 0 ]] \
|
||||
&& echo "SOOOOOOOOOOOORRRRRRRY GUY. YOU CANNOT AFFORD A NEW WISH" \
|
||||
&& rm -Rf ~/.zen/game/players/$PLAYER/voeux/$PEPPER/$WISHKEY \
|
||||
&& rm -Rf ~/.zen/game/world/$PEPPER/$WISHKEY/ \
|
||||
&& ipfs key rm ${WISHKEY} \
|
||||
&& tiddlywiki --load ${INDEX} \
|
||||
--deletetiddlers '${PEPPER}' \
|
||||
--output ~/.zen/tmp --render "$:/core/save/all" "newindex.html" "text/plain" \
|
||||
&& cp -f ~/.zen/tmp/newindex.html $INDEX \
|
||||
&& echo "G1${PEPPER} FLUX REMOVED"
|
||||
&& echo "SOOOOOOOOOOOORRRRRRRY GUY. YOU CANNOT PAY A G1 FOR A NEW WISH"
|
||||
#~ && rm -Rf ~/.zen/game/players/$PLAYER/voeux/$PEPPER/$WISHKEY \
|
||||
#~ && rm -Rf ~/.zen/game/world/$PEPPER/$WISHKEY/ \
|
||||
#~ && ipfs key rm ${WISHKEY} \
|
||||
#~ && tiddlywiki --load ${INDEX} \
|
||||
#~ --deletetiddlers '${PEPPER}' \
|
||||
#~ --output ~/.zen/tmp --render "$:/core/save/all" "newindex.html" "text/plain" \
|
||||
#~ && cp -f ~/.zen/tmp/newindex.html $INDEX \
|
||||
#~ && echo "G1${PEPPER} FLUX REMOVED"
|
||||
|
||||
echo "************************************************************"
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,30 @@ do
|
|||
VOEUNS=$(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.g1voeu.json | jq .[] | jq -r 'select(.wish=="'${WISH}'") | .wishns')
|
||||
VOEUKEY=$(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.g1voeu.json | jq .[] | jq -r 'select(.wish=="'${WISH}'") | .wish')
|
||||
|
||||
## SIGNALING WISH G1PUB
|
||||
ICHECK=$(ipfs key list -l | grep -w "$VOEUKEY" | cut -d ' ' -f 1 )
|
||||
|
||||
if [[ ! $ICHECK ]]; then
|
||||
echo "MISSING $VOEUKEY (new astronaut here) - RESET G1Voeu to voeu"
|
||||
sed -i "s~G1Voeu~voeu~g" $INDEX
|
||||
continue
|
||||
else
|
||||
VCOINS=$(~/.zen/Astroport.ONE/tools/timeout.sh -t 20 ${MY_PATH}/../tools/jaklis/jaklis.py balance -p ${VOEUKEY})
|
||||
[[ $VCOINS == "" || $VCOINS == "null" ]] \
|
||||
&& echo "ERROR G1WALLET" \
|
||||
|| echo "WISH G1WALLET = $VCOINS G1"
|
||||
fi
|
||||
|
||||
echo "************************************************************"
|
||||
echo "Hop, UNE JUNE pour le Voeu $WISHNAME"
|
||||
echo $MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 1 -p $VOEUKEY -c \'"ASTRO:$VOEUNS G1Voeu $WISHNAME"\' -m
|
||||
echo "************************************************************"
|
||||
echo "************************************************************"
|
||||
|
||||
$MY_PATH/../tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey pay -a 1 -p $VOEUKEY -c "ASTRO:$VOEUXNS G1Voeu $WISHNAME" -m
|
||||
[[ ! $? == 0 ]] \
|
||||
&& echo "POOOOOOOOOOOOOOOOOOOORRRRRR GUY. YOU CANNOT PAY A G1 FOR A YOUR WISH"
|
||||
|
||||
## RUNNING WISH REFRESH
|
||||
mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${WISH}
|
||||
|
||||
##########################################################################
|
||||
|
|
@ -148,6 +171,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
|
|||
echo "TODO : REFRESH WORLD SAME WISH"
|
||||
cat ~/.zen/game/world/$WISHNAME/*/.link 2>/dev/null
|
||||
|
||||
|
||||
echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
|
||||
|
||||
############################################
|
||||
|
|
|
|||
Loading…
Reference in New Issue