commit 539e72d05b1a7b5ec9d4f1a82e76281eaf6234a2
parent 6e4c5d0f380d7957187f23dbf8d70682600acf5e
Author: parazyd <parazyd@dyne.org>
Date: Thu, 1 Mar 2018 20:46:37 +0100
More fixes for the British.
Diffstat:
2 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/act-i/Bench.dcgi b/act-i/Bench.dcgi
@@ -10,7 +10,7 @@ map_bench
if [ ! -f "$inventory/.starttime" ]; then
date +%s > "$inventory/.starttime"
fi
-difftime=$(($(date +%s) - $(cat "$inventory/.starttime")))
+difftime=$(($(date +%s) - $(cat "$inventory/.starttime")))
cat <<EOM
## THE BENCH
@@ -45,45 +45,31 @@ EOM
case "$(($RANDOM % 7))" in
0)
- cat <<EOM
-You see a cat walking by, look into her eyes. She turns around.
-EOM
+ _msg "You see a cat walking by, look into her eyes. She turns around."
;;
1)
- cat <<EOM
-A police car is driving by, asking you, if you saw some cat. You do
-not know French so you just say something in British English and the
-police turns around quickly.
-EOM
+ _msg "A police car is driving by, asking you, if you saw some cat. You do
+ not know French so you just say something in British English and the
+ police turns around quickly."
;;
2)
- cat <<EOM
-Your Smartphone is playing the notification tone of the "Waaaazzzuup?"
-messenger.
-EOM
+ _msg 'Your Smartphone is playing the notification tone of the "Waaaazzzuup?"
+ messenger.'
printf 1 > "$inventory/.newmessage"
;;
3)
- cat <<EOM
-Some drunk people walk by singing songs and smashing trash bins.
-You are scared.
-EOM
+ _msg "Some drunk people walk by singing songs and smashing trash bins.
+ You are scared."
;;
4)
- cat <<EOM
-Some people walk by talking and greeting you.
-EOM
+ _msg "Some people walk by talking and greeting you."
;;
5)
- cat <<EOM
-You hear moaning and some elve is hanging out of the window naked with
-someone behind her. You are missing out all the fun.
-EOM
+ _msg "You hear moaning and some elf is hanging out of the window naked with
+ someone behind her. You are missing out all the fun."
;;
*)
- cat <<EOM
-Nothing happened.
-EOM
+ _msg "Nothing happened."
;;
esac
diff --git a/act-i/Bench.sh b/act-i/Bench.sh
@@ -5,17 +5,16 @@ specific_bench() {
Smartphone)
if [ -f "$inventory/.newmessage" ];
then
- _msg "Your friend texted you: »Here is
- something for you.« He attached a music."
+ _msg "Your friend texted you:
+ »Here is something for you.«
+ He attached a music file:"
parapluutje
_msg "A small package with a parachute is slowly
- landing next to you. You open it."
+ landing next to you. You open it."
- ritem="$(printf
- "Beers\nChocolate_Milks\nBlack_dildo\nGoogle_Ad_coupons\nDeveloping_NodeJS\nAlso_sprach_Zarathustra\nThe_Birth_of_Tragedy\nSiddharta\nBaby_and_child_care\nThe_C_Programming_Language\nTo_Kill_a_Mockingbird\nSex_drugs_and_coca_puffs\nFight_club\nCheese\nCocaine\n"
- | shuf | head -n 1)"
+ ritem="$(printf "Beers\nChocolate_Milks\nBlack_dildo\nGoogle_Ad_coupons\nDeveloping_NodeJS\nAlso_sprach_Zarathustra\nThe_Birth_of_Tragedy\nSiddharta\nBaby_and_child_care\nThe_C_Programming_Language\nTo_Kill_a_Mockingbird\nSex_drugs_and_coca_puffs\nFight_club\nCheese\nCocaine\n" | shuf | head -n 1)"
_msg "Your friend sent you $ritem. You are
thankful in the cold."
@@ -33,8 +32,7 @@ specific_bench() {
;;
Black_dildo)
- _msg "You wonder what the people at the party are
- doing."
+ _msg "You wonder what the people at the party are doing."
;;
Google_Ad_coupons)
@@ -42,8 +40,7 @@ specific_bench() {
;;
Developing_NodeJS)
- _msg "You make a nice fire from this book. This is
- heartwarming."
+ _msg "You make a nice fire from this book. This is heartwarming."
;;
Also_sprach_Zarathustra)
@@ -63,8 +60,7 @@ specific_bench() {
;;
The_C_Programming_Language)
- _msg "You write some patches for your friend's software
- and commit them."
+ _msg "You write some patches for your friend's software and commit them."
;;
To_Kill_a_Mockingbird)