commit ed06c3d6c58f379a210ee72ee90467c198cc2439
parent db3d8cfe6146e8e51567a6ddc203a33c52431f68
Author: parazyd <parazyd@dyne.org>
Date: Fri, 23 Feb 2018 22:01:40 +0100
More toiletry.
Diffstat:
11 files changed, 149 insertions(+), 12 deletions(-)
diff --git a/act-i/Toilet1.dcgi b/act-i/Toilet1.dcgi
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+. config
+echo Toilet1 > $savegame/room
+. functions
+. maps
+
+map_toilet1
+
+_msg "## TOILET 1 (T1)"
+
+
+cat <<EOM
+You are in one of the toilets.
+
+You see a toilet, sink, and a shower.
+
+[1|Inspect toilet|$path/t1-toilet.dcgi|server|port]
+[1|Inspect shower|$path/t1-shower.dcgi|server|port]
+
+[1|Check inventory|$path/inventory.dcgi|server|port]
+EOM
+
+navigation
diff --git a/act-i/Toilet1.sh b/act-i/Toilet1.sh
@@ -0,0 +1,18 @@
+specific_toilet1() {
+ item="$1"
+
+ case "$item" in
+ Plate_of_Bolognese_Sauce|Used_condom)
+ _msg "You flush the $item down the toilet."
+ rm "$inventory/$item"
+ rm -f "$toilet1/toilet/Vomit"
+ printf 1 "$toilet1/toilet/Water"
+ ;;
+
+ Black_dildo)
+ _msg "You stick the black dildo in the shower drain,
+ rendering it shut."
+ mv "$inventory/$item" "$toilet1/shower"
+ ;;
+ esac
+}
diff --git a/act-i/Toilet2.sh b/act-i/Toilet2.sh
@@ -0,0 +1,16 @@
+specific_toilet2() {
+ item="$1"
+
+ case "$item" in
+ Plate_of_Bolognese_Sauce|Used_condom)
+ _msg "You flush the $item down the toilet."
+ rm "$inventory/$item"
+ rm -f "$toilet1/toilet/Vomit"
+ printf 1 "$toilet1/toilet/Water"
+ ;;
+
+ Smartphone)
+ _msg "You make a dick pic using the smartphone camera."
+ ;;
+ esac
+}
diff --git a/act-i/config b/act-i/config
@@ -104,4 +104,5 @@ printf 1 > "$kitchen/table/Empty_Glasses"
printf 1 > "$kitchen/cupboard/Plates"
printf 1 > "$kitchen/cupboard/Empty_Glasses"
printf 1 > "$kitchen/sink/Dirt"
+printf 1 > "$kitchen/sink/.notyet"
printf 1 > "$kitchen/.notyet-fridge"
diff --git a/act-i/functions b/act-i/functions
@@ -97,7 +97,7 @@ list_items_to() {
cat <<EOM
-(note1: select any item to $what it)
+(note: select any item to $what it)
EOM
}
@@ -212,9 +212,16 @@ use_specific() {
. Bedroom2.sh
specific_bedroom2 "$item"
;;
+ Toilet1)
+ . Toilet1.sh
+ specific_toilet1 "$item"
+ ;;
+ Toilet2)
+ . Toilet2.sh
+ specific_toilet2 "$item"
+ ;;
*)
echo "Not implemented"
;;
esac
}
-
diff --git a/act-i/maps b/act-i/maps
@@ -549,3 +549,37 @@ map_toilet2_unlocked() {
EOM
}
+
+map_toilet1() {
+ cat <<EOM
++-------------------------------------------------------------+
+| | | o |
+| | (R1) | o (R2) |
+|-----------------+....+------+-----------------+....+--------+
+| |
+| |
+| +---+....+---+....+------+....+--------+
+| |bk| | | |x|
+| |bk| | | |x|
+| o o |bk| | | o |x|
+| | DJ | |bk| (T1) | (T2) | TTTT |x|
+| +- +----+ |bk| YOU | | o TTTT o |x|
+| |o o o | |bk| ----> ☃ | | TTTT o |S|
+| | TTT +----------+--------+ TTTT |x|
+| |o TTT | | TTTT o |F|
+| +- (HIP) o +| TTTT o o |x|
+| |_o_☃_<o>| o NX| o TTTT (KIT) |-|
+| o +| TTTT |
+| o o |
+| |
+|bk| o |
+|bk| o o |
+|bk| o TTT o +-------+....+--------+
+|bk| o TTT | (H) |
+|bk| (COMP) | (BAL) o bbb |
+|bk| | o mmm |
+|bk| | |
++---------------+....+----------------------------------------+
+
+EOM
+}
diff --git a/act-i/t1-shower.dcgi b/act-i/t1-shower.dcgi
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. config
+. functions
+
+if [ -f "$toilet1/shower/.notyet" ]; then
+ if [ -f "$toilet1/shower/Black_dildo" ]; then
+ _msg "You see a"
+ list_items_to take "$toilet1/shower"
+ _msg "stuck into the shower drain."
+ else
+ _msg "You find nothing in the shower."
+ fi
+else
+ if [ -f "$toilet1/shower/Black_dildo" ]; then
+ _msg "You see a"
+ list_items_to take "$toilet1/shower"
+ _msg "stuck into the shower drain."
+ else
+ _msg "You see a lab rat run into the shower drain and disappear!"
+ fi
+fi
+_msg "[1|Exit|$path/$(cat $savegame/room).dcgi|server|port]"
diff --git a/act-i/t1-toilet.dcgi b/act-i/t1-toilet.dcgi
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. config
+. functions
+
+_msg "You take a closer look at the toilet and you see:"
+if [ -f "$inventory/Plastic_bag" ]; then
+ list_items_to take "$toilet1/toilet"
+else
+ _msg "$(ls -1 $toilet1/toilet)"
+fi
+
+echo "[1|Exit|$path/$(cat $savegame/room).dcgi|server|port]"
diff --git a/act-i/t2-shower.dcgi b/act-i/t2-shower.dcgi
@@ -5,4 +5,4 @@
_msg "You take a closer look at the shower and you see:"
list_items_to take "$toilet2/shower"
-echo "[1|Exit|$path/$(cat $savegame/room).dcgi|server|port]"
+_msg "[1|Exit|$path/$(cat $savegame/room).dcgi|server|port]"
diff --git a/act-i/take.dcgi b/act-i/take.dcgi
@@ -21,12 +21,13 @@ case "$(basename $2)" in
_msg "The girls smile at you and let you take it."
;;
- Water)
- _msg "You use the plastic bag and fill it up with water.
+ Water|Vomit)
+ _msg "You use the plastic bag and fill it up with $(basename $2).
[1|Exit|$path/$(cat $savegame/room).dcgi|server|port]"
- mv "$inventory/Plastic_bag" "$inventory/Plastic_bag_of_water"
+ mv "$inventory/Plastic_bag" "$inventory/Plastic_bag_of_$(basename $2)"
return
;;
+
shower|toilet)
_msg "The thing is built into the house. You don't manage to pick it up."
return
diff --git a/act-i/usecases.csv b/act-i/usecases.csv
@@ -1,10 +1,10 @@
Old_Thinkpad,Hipster_Area,talk-gentoo
Plastic_bottle_of_rakia,anywhere
Cigarettes,anywhere
-Smartphone,Kitchen,Bedroom1,talk-20h
-Plate_of_Bolognese_Sauce,Kitchen,Hipster_Area,Toilet1,talk-gentoo
-Empty_Beer_Bottles,Toilet1,Balcony,Kitchen
-Empty_Glasses,Kitchen,Toilet1
+Smartphone,Kitchen,Bedroom1,talk-20h,Toilet2
+Plate_of_Bolognese_Sauce,Kitchen,Hipster_Area,Toilet1,Toilet2,talk-gentoo
+Empty_Beer_Bottles,Balcony,Kitchen
+Empty_Glasses,Kitchen
Beers,talk-girls,talk-nerds,talk-20h,talk-gentoo,anywhere
Chocolate_Milks,talk-gentoo,talk-nerds,Kitchen,talk-20h
Black_dildo,Toilet1,Balcony,Bedroom1,Bedroom2,talk-girls,talk-20h,talk-hipster
@@ -15,10 +15,10 @@ Keychain_with_a_key,Bedroom2,anywhere
Used_condom,Toilet1,Toilet2,talk-20h
Condom_balloon,talk-20h,talk-hipster,talk-gentoo,talk-nerds,Kitchen,Balcony
Decorated_condom_balloon,Kitchen,talk-girls
-Plastic_bag,Balcony,Toilet1,Toilet2
+Plastic_bag,Balcony
Old_yoghurt,talk-gentoo
Rolling_tobacco,anywhere
-Empty_Glasses,Kitchen,Toilet1
+Empty_Glasses,Kitchen
Terminal,talk-nerds
Keyboard,talk-nerds
Mouse,talk-nerds
