commit f5ed3133307232a165c0873c2a636d24d64bedd7
parent d202899be1dd20dec8802d6b2af8e2a5fdef8663
Author: Christoph Lohmann <20h@r-36.net>
Date: Sat, 24 Feb 2018 02:17:27 +0100
Removing the double dildo logic.
Diffstat:
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/act-i/Toilet1.dcgi b/act-i/Toilet1.dcgi
@@ -11,7 +11,7 @@ _msg "## TOILET 1 (T1)"
if [ -f "$hipsters/obese/.takingashit" ]; then
_msg "The toilet is blocked by the spaniard taking a shit."
- if [ -f "$inventory/.toilet1hasdildo" ]; then
+ if [ -f "$toilet1/shower/Black_dildo" ]; then
_msg "You hear the spaniard shouting: 'Who put the dildo in
here? Arrrrgh.'"
fi
diff --git a/act-i/Toilet1.sh b/act-i/Toilet1.sh
@@ -12,10 +12,9 @@ specific_toilet1() {
Black_dildo)
_msg "You stick the black dildo in the shower drain,
rendering it shut."
- echo 1 > "$inventory/.toilet1hasdildo"
mv "$inventory/$item" "$toilet1/shower"
if [ -f "$kitchen/sink/Cheese" ]; then
- if [ -f "$inventory/.toilet2hasdildo" ]; then
+ if [ -f "$toilet2/shower/Black_dildo" ]; then
_msg "You hear a strange noise coming from the NeXT machine."
rm -f "$inventory/.notyet"
fi
diff --git a/act-i/Toilet2.sh b/act-i/Toilet2.sh
@@ -16,10 +16,9 @@ specific_toilet2() {
Black_dildo)
_msg "You stick the black dildo in the shower drain,
rendering it shut."
- echo 1 > "$inventory/.toilet2hasdildo"
mv "$inventory/$item" "$toilet2/shower"
if [ -f "$kitchen/sink/Cheese" ]; then
- if [ -f "$inventory/.toilet1hasdildo" -o \
+ if [ -f "$toilet1/shower/Black_dildo" -o \
"$hipsters/obese/.takingashit" ]; then
_msg "You hear a strange noise coming from the NeXT machine."
rm -f "$inventory/.notyet"
diff --git a/act-i/kitchen-sink.sh b/act-i/kitchen-sink.sh
@@ -4,7 +4,8 @@ specific_talk_kitchensink() {
Cheese)
_msg "You place the cheese in the kitchen sink."
mv "$inventory/$item" "$kitchen/sink"
- if [ -f "$toilet1/shower/Black_dildo" ] && \
+ if [ -f "$toilet1/shower/Black_dildo" -o \
+ "$hipsters/obese/.takingashit" ] && \
[ -f "$toilet2/shower/Black_dildo" ]; then
_msg "You hear a strange noise coming from the NeXT machine."
rm -f "$inventory/.notyet"
diff --git a/act-i/talk-gentoo.sh b/act-i/talk-gentoo.sh
@@ -54,7 +54,7 @@ specific_talk_gentoo() {
cp -f "$hipsters/obese/Plate_of_Bolognese_Sauce" "$hipsters/coffeetable"
if [ -f "$kitchen/sink/Cheese" -a \
- -f "$inventory/.toilet2hasdildo" ]; then
+ -f "$toilet2/shower/Black_dildo" ]; then
_msg "You hear a strange noise coming from the
NeXT machine."
fi
