From 6a9bd0d991e6d8be762c0a35a516e5ec24e6074b Mon Sep 17 00:00:00 2001
From: He4eT <He4eTHb1u@gmail.com>
Date: Mon, 11 Nov 2019 02:55:56 +0500
Subject: [PATCH] Cyan room and some polish

---
 experiment.t                  |  2 ++
 map.md                        | 14 +++++------
 src/item/advertisingDisplay.t |  3 ++-
 src/room/cyanRoom.t           | 45 +++++++++++++++++++++++++++++++++++
 src/room/orangeRoom.t         |  1 -
 src/room/yellowRoom.t         | 17 +++++++++----
 6 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 src/room/cyanRoom.t

diff --git a/experiment.t b/experiment.t
index 67a0147..0935ec2 100644
--- a/experiment.t
+++ b/experiment.t
@@ -47,4 +47,6 @@ gameMain: GameMainDef
 #include "src/room/yellowRoom.t"
 #include "src/item/advertisingDisplay.t"
 
+#include "src/room/cyanRoom.t"
+
 #include "src/actor/pc.t"
diff --git a/map.md b/map.md
index 92fd42d..6010e66 100644
--- a/map.md
+++ b/map.md
@@ -7,12 +7,12 @@
 ++---+  ++----+  ++----+  ++
  |   |                    |
  |   |                    |
- |   +---+   +--+---------++
- |   +          +          |
+ |   +---+   +----+-------++
+ |   +            +        |
  |                         |
- |   +          +          |
-++  ++          |          |
-|    |          |          |
-|    +----------+          |
-+----+          +----------+
+ |   +            +        |
+++  ++            |        |
+|    |            |        |
+|    +------------+        |
++----+            +--------+
 ```
diff --git a/src/item/advertisingDisplay.t b/src/item/advertisingDisplay.t
index 6817821..0b38864 100644
--- a/src/item/advertisingDisplay.t
+++ b/src/item/advertisingDisplay.t
@@ -1,7 +1,8 @@
 advertisingDisplay: Decoration, Fixture
   'bright lcd screen/display/monitor'
   'bright lcd display'
-  " Huge and bright display mounted on the wall.<.p>
+  " Huge and bright display mounted on the wall.
+    <br>Images changes one by another.<.p>
     On the screen you see "
 
   location = yellowRoom
diff --git a/src/room/cyanRoom.t b/src/room/cyanRoom.t
new file mode 100644
index 0000000..7a0e08c
--- /dev/null
+++ b/src/room/cyanRoom.t
@@ -0,0 +1,45 @@
+cyanRoom: Room
+  'Square room'
+  " This is a large square room
+    with white plastic panels everywhere.
+    <.p>
+    In the center
+    on the floor is the
+    square area's outline.
+    <.p>
+    The north direction leads to
+    living units.
+    <br>On the east wall you can see
+    the armored door that says <q>Operating room</q>.
+    <br>Enclosed by safety tape,
+    the doorway in the west wall
+    looks damaged and corrupted.
+    <.p>"
+
+  north = yellowRoom
+  east = operatingRoomDoorOutside
+;
+
++ Decoration, Fixture
+  'central square area/outline'
+  'square outline'
+  " The central square area on the floor
+    looks like some kind of markup.
+    <br>Its purpose is unclear to you."
+;
+
++ operatingRoomDoorOutside: LockableWithKey, Door, RoomPartItem
+  'armored operating door*doors'
+  'armored door'
+  " Armored door marked <q>Operating room</q>.
+    <br>Next to the door is a keycard reader
+    and a sign <q>Restricted area</q>.<br>"
+  specialNominalRoomPartLocation = defaultEastWall
+;
+
++ Decoration, Fixture, RoomPartItem
+  'keycard reader'
+  'keycard reader'
+  "Small security device without any visible indicators."
+  specialNominalRoomPartLocation = defaultEastWall
+;
diff --git a/src/room/orangeRoom.t b/src/room/orangeRoom.t
index 524d733..71bac2c 100644
--- a/src/room/orangeRoom.t
+++ b/src/room/orangeRoom.t
@@ -41,7 +41,6 @@ orangeRoom: DarkRoom
 
   dobjFor (TurnOn) {
     preCond = inherited + actorStanding
-    action () { inherited(); }
   }
   makeOn (val) {
     inherited(val);
diff --git a/src/room/yellowRoom.t b/src/room/yellowRoom.t
index 79fda6d..3716af9 100644
--- a/src/room/yellowRoom.t
+++ b/src/room/yellowRoom.t
@@ -3,7 +3,13 @@ yellowRoom: Room
   " This is another room which every surface
     covered with matte white panels.
     <.p>
-    There are three doors in the north wall."
+    A bright screen on the wall attracts your attention.
+    <.p>
+    There are three doors in the north wall
+    and a wide door leading south."
+
+  south = cyanRoom
+
   north: AskConnector {
     promptMessage =
       "There are three doors you could go through to the north.<br>"
@@ -15,30 +21,33 @@ yellowRoom: Room
 
 /* Doors */
 
-+ orangeDoorOutside: Door, AutoClosingDoor
++ orangeDoorOutside: Door, AutoClosingDoor, RoomPartItem
   -> orangeDoor
   'orange door*doors'
   'door with <b>orange</b> triangle'
   " Sliding door with the number
     <q><<gameMain.experimentNumber>></q>
     and an orange triangle.<br>"
+  specialNominalRoomPartLocation = defaultNorthWall
 ;
 
-+ khakiDoor: IndirectLockable, Door
++ khakiDoor: IndirectLockable, Door, RoomPartItem
   'khaki door*doors'
   'door with <b>khaki</b> triangle'
   " Sliding door with the number
     <q><<gameMain.experimentNumber - 1>></q>
     and a khaki triangle.<br>"
+  specialNominalRoomPartLocation = defaultNorthWall
   cannotUnlockMsg = 'The door does not appear to be opened.'
 ;
 
-+ brownDoor: IndirectLockable, Door
++ brownDoor: IndirectLockable, Door, RoomPartItem
   'brown door*doors'
   'door with <b>brown</b> triangle'
   " Sliding door with the number
     <q><<gameMain.experimentNumber - 2>></q>
     and a brown triangle.
     <br>You hear a slight vibration behind the door.<br>"
+  specialNominalRoomPartLocation = defaultNorthWall
   cannotUnlockMsg = 'The door does not appear to be opened.'
 ;