From f9142e9df93569c167b1493e637979f785205373 Mon Sep 17 00:00:00 2001
From: He4eT <He4eTHb1u@gmail.com>
Date: Thu, 7 Nov 2019 03:11:53 +0500
Subject: [PATCH] Bathroom

---
 experiment.t              |  2 ++
 src/room/orangeBathroom.t | 39 +++++++++++++++++++++++++++++++++++++++
 src/room/orangeRoom.t     | 18 +++++++++++-------
 src/room/yellowRoom.t     |  2 +-
 4 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 src/room/orangeBathroom.t

diff --git a/experiment.t b/experiment.t
index 55f067f..4508c73 100644
--- a/experiment.t
+++ b/experiment.t
@@ -42,6 +42,8 @@ gameMain: GameMainDef
 ;
 
 #include "src/room/orangeRoom.t"
+#include "src/room/orangeBathroom.t"
+
 #include "src/room/yellowRoom.t"
 
 #include "src/actor/pc.t"
diff --git a/src/room/orangeBathroom.t b/src/room/orangeBathroom.t
new file mode 100644
index 0000000..5e1786f
--- /dev/null
+++ b/src/room/orangeBathroom.t
@@ -0,0 +1,39 @@
+orangeBathroom: Room
+  'Bathroom'
+  " Tiny bathroom with shower cabine, toilet and sink.
+    <br>On the wall you can see a locker with a mirror door.<.p>
+    The only exit leads to the east."
+  east = orangeRoom
+;
+
++ Decoration, Fixture
+  'shower cabine'
+  'shower cabine'
+  "It's a minimalistic shower cabine."
+;
+
++ Decoration, Fixture
+  'toilet'
+  'toilet'
+  "An ordinary toilet."
+;
+
++ Decoration, Fixture
+  'faucet sink'
+  'sink'
+  "There's a water faucet and a small sink."
+;
+
++ OpenableContainer, Fixture
+  'mirror/locker/door'
+  'locker with mirror door'
+  " <<isOpen
+      ? 'This is'
+      : 'You see your face in the mirror door of'>>
+    a locker for toiletries.<br>"
+;
+
+++ painkillers: Thing
+  'pills/painkillers'
+  'painkillers'
+  "A small orange bottle of pills.";
diff --git a/src/room/orangeRoom.t b/src/room/orangeRoom.t
index 0ddeea4..b7383f8 100644
--- a/src/room/orangeRoom.t
+++ b/src/room/orangeRoom.t
@@ -1,6 +1,6 @@
 orangeRoom: DarkRoom
-  'Orange room'
-  " You're standing in the large room.
+  'Living unit'
+  " You're standing in the small room.
     <br>The walls, floors and ceiling are
     completely covered with white plastic panels.
     <.p>
@@ -11,8 +11,12 @@ orangeRoom: DarkRoom
     <.p>
     The room contains
     an ascetic bed
-    and a desk against the east wall."
+    and a desk against the east wall.
+    </p>
+    The bathroom is to the west,
+    the exit door leads to the south."
   south = orangeDoor
+  west = orangeBathroom
 ;
 
 /* Doors */
@@ -21,14 +25,14 @@ orangeRoom: DarkRoom
   'white sliding door'
   'sliding door'
   "White sliding door in south wall.<br>"
-  isListed = true;
+;
 
 /* Lights */
 
 + OnOffControl, Fixture
   'small luminous switch/light/lights'
   'small luminous switch'
-  "It's a small luminous switch on the wall"
+  "It's a small luminous switch on the wall."
 
   isListed = true
   brightness = 1
@@ -91,9 +95,9 @@ orangeRoom: DarkRoom
     +++ whiteCube: Thing
       'white cube'
       'white cube'
-      "Small glossy white cube";
+      "Small glossy white cube.";
 
     +++ blackCube: Thing
       'black cube'
       'black cube'
-      "Small glossy black cube";
+      "Small glossy black cube.";
diff --git a/src/room/yellowRoom.t b/src/room/yellowRoom.t
index dddd23f..79fda6d 100644
--- a/src/room/yellowRoom.t
+++ b/src/room/yellowRoom.t
@@ -1,5 +1,5 @@
 yellowRoom: Room
-  'Yellow room'
+  'Hallway'
   " This is another room which every surface
     covered with matte white panels.
     <.p>