Fix Labs

diff --git a/Rules/HouseRules.mdwn b/Rules/HouseRules.mdwn
index 6af3140e8c3bfebcdb8818ae2c13d43ae440fcfc..c669d46ccd0abae5011b525babdec1734ce223c9 100644 (file)
--- a/Rules/HouseRules.mdwn
+++ b/Rules/HouseRules.mdwn
@@ -205,3 +205,8 @@ Teacher's Communication + (Scribe's Profession ÷ 2) - 3
 ### Edited Lecture Commentaries
 
 Teacher's Communication + (Scribe's Profession ÷ 2) - 2 + (up to 2 for skilled binder/illuminator) + virtues
+
+# Labs
+## Outdoor
+
+The Safety of an Outdoor Lab is +2

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs.mdwn
index 4b6946520083a91ec035e1a664632d588da62dd1..8da43d4a68e500504526f7c739a75b5838a22408 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs.mdwn
@@ -7,15 +7,21 @@
     * [[SchoolTwo]]
 * [[Inn|LandbeachInn]]
     * [[Alexios]]
-    * [[Johannes]]
-    * [[InnThree]] (Ignem)
     * [[Angelo]] 
+    * [[Johannes]]
     * [[Tanis]]
+    * [[InnThree]] (Ignem)
     * [[InnSix]] (Vim)
     * [[Outdoor]]
     * [[Stored Items]]
+    * Witch Kitchens:
+        * [[Godiuia]]
+        * [[Mary]]
+        * [[Synnove]]
 * [[Esk Valley|EskValley]]
     * [[Auram]]
     * [[Terram]]
+* [[Enys Samson|EnysSamson]]
+    * [[TowerOne]]
 
 [[!map pages="Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/* and ! Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/*/* and ! backlink(.)"]]

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Auram.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Auram.mdwn
index 9066150f4600358971e414f2018f32fd60936634..5f75ba5cda3ffa39e31a488689900a43cf66aa2a 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Auram.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Auram.mdwn
@@ -18,15 +18,26 @@ to maintain the lab and keep it clean, particularly when it is not in use (Serva
 |-----:|:-------------------------|:--:|:--:|:----:|:----:|:----:|:----:|:--:|:--:|:--:|:--:|
 |    0 | Elevated                 |    |    |      |      |      |   +1 |    | +1 |    |    |
 |   +1 | Auspicious Shape         |    |    |      |      |      |   +1 | +1 |    |    |    |
-|   -3 | Outdoors                 | -1 | +2 |   -1 |      |   -2 |   -3 |    |    |    |    |
+|   -3 | Outdoors                 | -1 | +2 |  +2† |      |   -2 |   -3 |    |    |    |    |
 |   +3 | Natural Environment      |    |    |      |      |      |   +2 |    | +3 |    |    |
-|   +1 | Lesser Feature (AS)      |    |    |      |      |      |  (+1)|(+1)|    |    |    | Damaged
+|   +1 | Lesser Feature (AS)      |    |    |      |      |      |   +1 | +1 |    |    |    |
 |   +1 | Lesser Feature (Sundial) |    |    |      |      |      |   +1 |    |    | +1 |    |
 |   -1 | Infested                 |    |    |   -1 |      |      |   -1 |    | +1 |    |    |
 |   +1 | Lesser Expansion         | +1 | +2 |      |      |      |      |    | +1 |    |    |
-|    0 | Servant (Int 1)          |    |    |   +1 |      |      |   +1 |    |    |    | +1 |
+|    0 | Servant (Int 3)          |    |    |   +2 |      |      |   +1 |    |    |    | +1 |
+|   0  | Base Safety (Ref - OccSz)|    |    |  -3  |      |      |      |    |    |    |    |
 |   ||||||||||||
 
-|   +3 | **Totals**               |  0 | +4 |   -1 |    0 |   -2 |   +2 | +1 | +6 | +1 | +1 |
+|   +3 | **Totals**               |  0 | +4 |    0 |    0 |   -2 |   +2 | +1 | +6 | +1 | +1 |
 |   ||||||||||||
 [Lab Details]  
+
+|             |Score|
+|------------:|:---:|
+|   Size      | +3  |
+|Virtue Points|  7  |
+|Flaw Points  |  4  |
+|Refinement   |  0  |
+|Occupied Size| +3  |
+|Free points  |  0  |
+[Lab Size]

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnSix.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnSix.mdwn
index 21c1fc6f124b38ae206405a43057943dce015609..e8a96d4b2fe53372c2b84ed0f102bb3282c89f13 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnSix.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnSix.mdwn
@@ -7,7 +7,7 @@ things littering the room are examples of magical casting tools or
 aids from non- or pre-hermitic traditions (Specimens, also a Realia of
 Quality 4 for Vim).  Sadly the lab is very disorganised (Disorganized)
 and essentially undecorated (Undecorated).  The hypocaust system keeps
-this room warm (Magical Superior Heating).
+this room warm (Magical Superior Heating).   The construction of the inn is notably good.  (Superior Construction)
 
 | Size |                          | GQ | Up | Safe | Warp | Heal | Æsth | Vi | Ig | Mu |
 |-----:|:-------------------------|:--:|:--:|:----:|:----:|:----:|:----:|:--:|:--:|:--:|
@@ -18,7 +18,20 @@ this room warm (Magical Superior Heating).
 |    0 | Disorganized             |    |    |   -1 |      |      |   -1 |    |    | +1 |
 |   -1 | Undecorated              |    | -1 |      |      |      |   -1 | -1 |    |    |
 |    0 | Magical Superior Heating |    |    |      |      |   +1 |   +1 |    | +1 |    |
+|   0  | Superior Construction    |    |    |  +1  |      |      |   +1 |    |    |    |
+|   0  | Base Safety (Ref - OccSz)|    |    |  -1  |      |      |      |    |    |    |
 |   |||||||||
 
-|   +1 | **Totals**               | -2 | +1 |   -1 |      |   +1 |   +3 | +8 | +1 | +1 |
+|   +1 | **Totals**               | -2 | +1 |   -1 |      |   +1 |   +4 | +8 | +1 | +1 |
 |   |||||||||
+[Lab Details]
+
+|             |Score|
+|------------:|:---:|
+|   Size      | +1  |
+|Virtue Points|  5  |
+|Flaw Points  |  4  |
+|Refinement   |  0  |
+|Occupied Size| +1  |
+|Free points  |  0  |
+[Lab Size]

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnThree.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnThree.mdwn
index 582b5b21090c9cb9baf8f153c3f9f946d52e2060..781e91e000b5981882ba60988cadc5ed723f055b 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnThree.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/InnThree.mdwn
@@ -7,7 +7,7 @@ hypocaust system has been blocked off from under this room.  There is
 a large cauldron which has been fitted with wheels to allow it to be
 brought closer to and taken further from the fire (Lesser Focus), and the best
 quality equipment and tools have been provided (mostly because cheaper equipment
-keeps getting burned up) (Superior Equipment, Superiro Tools).
+keeps getting burned up) (Superior Equipment, Superiro Tools).  The construction of the inn is notably good.  (Superior Construction)
 
 | Size |                           | GQ | Up | Safe | Warp | Heal | Æsth | Vis Ex | Ig | Items |
 |-----:|:--------------------------|:--:|:--:|:----:|:----:|:----:|:----:|:------:|:--:|:-----:|
@@ -17,10 +17,20 @@ keeps getting burned up) (Superior Equipment, Superiro Tools).
 |   -1 | Lesser Focus (Cauldron)   | -1 |    |      |      |      |      |        | +2 |       |
 |    0 | Superior Equipment        | +1 | +2 |   +1 |      |      |      |     +1 |    |       |
 |    0 | Superior Tools            |    | +1 |   +1 |      |      |      |        |    |    +1 |
+|   0  | Superior Construction     |    |    |  +1  |      |      |   +1 |        |    |       |
+|   0  | Base Safety (Ref - OccSz) |    |    |  -1  |      |      |      |        |    |       |
 |   ||||||||||
 
-|   +1 | **Totals**                |  0 | +3 |    0 |   +! |      |   +1 |     +1 | +7 |    +1 |
+|   +1 | **Totals**                |  0 | +3 |    0 |   +1 |      |   +2 |     +1 | +7 |    +1 |
 |   ||||||||||
 [Lab Details]
 
-
+|             |Score|
+|------------:|:---:|
+|   Size      | +1  |
+|Virtue Points|  2  |
+|Flaw Points  |  1  |
+|Refinement   |  0  |
+|Occupied Size| +1  |
+|Free points  |  0  |
+[Lab Size]

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Outdoor.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Outdoor.mdwn
index 208fe67dcbc779e44dcca8d320b6f39b4fb7e5f0..1a4c7e3d50370bb77606ff12b22cbc62c41338fd 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Outdoor.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Outdoor.mdwn
@@ -10,7 +10,7 @@ Equipment x 2). There is a deep well in the centre of the lab (Lesser Focus).
 
 | Size |                       | GQ | Up | Safe | Warp | Heal | Æsth | Aq | He | Vi |
 |-----:|:----------------------|:--:|:--:|:----:|:----:|:----:|:----:|:--:|:--:|:--:|
-|   -3 | Outdoors              | -1 | +2 |   -1 |      |   -2 |   -3 |    |    |    |
+|   -3 | Outdoors              | -1 | +2 |  +2† |      |   -2 |   -3 |    |    |    |
 |   +3 | Natural Environment   |    |    |      |      |      |   +2 |    | +3 |    |
 |    0 | Idyllic Surroundings  |    |    |      |      |   +2 |   +1 |    | +1 |    |
 |   +1 | Auspicious Shape      |    |    |      |      |      |   +1 |    |    | +1 |
@@ -19,6 +19,7 @@ Equipment x 2). There is a deep well in the centre of the lab (Lesser Focus).
 |   -2 | Missing Equipment x2  |    | -2 |      |      |      |      |    |    |    |
 |   +1 | Lesser Feature (Well) |    |    |      |      |      |   +1 | +1 |    |    |
 |   -1 | Lesser Focus (Well)   | -1 |    |      |      |      |      | +2 |    |    |
+|   0  | Base Safety (Ref - OccSz)| |    |  -3  |      |      |      |     |    |
 |   ||||||||||                                                             
                                                                                 
 |   +3 | **Totals**            |  0 | +4 |   +1 |      |    0 |   +4 | +3 | +6 | +1 |
@@ -27,3 +28,12 @@ Equipment x 2). There is a deep well in the centre of the lab (Lesser Focus).
 
 *Note: this lab can be reconfigured to an Aq +9 lab with a season's work*
  
+|             |Score|
+|------------:|:---:|
+|   Size      |  ∞  |
+|Virtue Points|  9  |
+|Flaw Points  |  6  |
+|Refinement   |  0  |
+|Occupied Size| +3  |
+|Free points  |  ∞  |
+[Lab Size]

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Tanis.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Tanis.mdwn
index ac56a576dba83701d3e027da713a1f9ce34ca444..a306da5f4a5570e77a8a48912d88391d91d55185 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Tanis.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Tanis.mdwn
@@ -9,7 +9,7 @@ mounted on a plinth in the centre of the room casting rainbow images
 throughout (Greater Focus).  The hypocaust system keeps this room warm
 (Magical Superior Heating).  Due to the distractions caused by mirror
 enchantment this lab is unsuitable for Teaching or Familiar work.
-(Missing Equipment)
+(Missing Equipment).  The construction of the inn is notably good.  (Superior Construction)
 
 
 | Size |                          | GQ | Up | Safe | Warp | Heal | Æsth |  Im | Ig |
@@ -19,10 +19,23 @@ enchantment this lab is unsuitable for Teaching or Familiar work.
 |   +1 | Excessive Lighting       |    | +2 |      |      |      |      |  +2 |    |
 |   +3 | Prism                    |    |    |      |      |      |   +2 |  +3 |    |
 |   -3 | Prism                    | -2 |    |      |      |      |      |  +4 |    |
-|    0 | Magical Superior Heating |    |    |      |      |   +1 |   +1 |     | +1 |
 |   -1 | Missing Equipment        |    | -1 |      |      |      |      |     |    |
+|    0 | Magical Superior Heating |    |    |      |      |   +1 |   +1 |     | +1 |
+|   0  | Superior Construction    |    |    |  +1  |      |      |   +1 |     |    |
+|   0  | Base Safety (Ref - OccSz)|    |    |  -1  |      |      |      |     |    |
 |   |||||||||
 
-|   +1 | **Totals**               | -2 | +1 |   +1 |      |   +1 |   +4 | +11 | +1 |
+|   +1 | **Totals**               | -2 | +1 |   +2 |      |   +1 |   +5 | +11 | +1 |
 |   |||||||||
 [Lab Details]
+
+
+|             |Score|
+|------------:|:---:|
+|   Size      | +1  |
+|Virtue Points|  5  |
+|Flaw Points  |  4  |
+|Refinement   |  0  |
+|Occupied Size| +1  |
+|Free points  |  0  |
+[Lab Size]

diff --git a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Terram.mdwn b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Terram.mdwn
index 99efd8b2ddddf63c822972935c7c9ab6a7767a38..9a9e9a89b91ffb885bbe1317dcf21adc30677d8d 100644 (file)
--- a/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Terram.mdwn
+++ b/Setting/Locations/Stonehenge/ScholaPythagoranis/Labs/Terram.mdwn
@@ -16,22 +16,39 @@ some of which are large enough to be used as pieces of furnature
 The one dry sections; a slightly raised blister in the wall; is devoted
 to a large supply cupboard (Extensive Stores)
 
-| Size |                   | GQ | Up | Safe | Warp | Heal | Æsth | Te | Im | Aq | Ig | Texts |
-|-----:|:------------------|:--:|:--:|:----:|:----:|:----:|:----:|:--:|:--:|:--:|:--:|:-----:|
-|    0 | Uneven Floor      |    |    |   -1 |      |   -1 |   -1 | +1 |    |    |    |       |
-|   +3 | Greater Feature   |    |    |      |      |      |   +3 | +3 |    |    |    |       |
-|   -3 | Greater Focus     | -2 |    |      |      |      |      | +4 |    |    |    |       |
-|   -1 | Awkward Shape     |    |    |   -2 |      |      |   -1 |    |    |    |    |       |
-|   +1 | Lesser Feature    |    |    |      |      |      |   +1 |    |    | +1 |    |       |
-|    0 | Magical Lighting* |    |    |      |      |      |   +1 |    | +1 |    |    |    +1 |
-|   +1 | Superior Heating  |    | +1 |      |      |   +1 |   +1 |    |    |    | +1 |       |
-|   -1 | Damp              |    | +1 |      |      |   -1 |   -1 |    |    | +1 |    |       |
-|   +1 | Specimens         |    | +1 |      |      |      |   +1 | +1 |    |    |    |       |
-|   +1 | Extensive Stores  |    |    |   +2 |      |      |      |    |    |    |    |       |
-|   |||||||||||||
+There is more rock than you can possibly imagine (Inexhaustible Supplies)
+
+| Size |                   | GQ | Up | Safe | Warp | Heal | Æsth | Te | Im | Aq | Ig | Texts | Vis Ext | Items |
+|-----:|:------------------|:--:|:--:|:----:|:----:|:----:|:----:|:--:|:--:|:--:|:--:|:-----:|:-------:|:-----:|
+|    0 | Uneven Floor      |    |    |   -1 |      |   -1 |   -1 | +1 |    |    |    |       |         |       |
+|   +3 | Greater Feature   |    |    |      |      |      |   +3 | +3 |    |    |    |       |         |       |
+|   -3 | Greater Focus     | -2 |    |      |      |      |      | +4 |    |    |    |       |         |       |
+|   -1 | Awkward Shape     |    |    |   -2 |      |      |   -1 |    |    |    |    |       |         |       |
+|   +1 | Lesser Feature    |    |    |      |      |      |   +1 |    |    | +1 |    |       |         |       |
+|    0 | Magical Lighting* |    |    |      |      |      |   +1 |    | +1 |    |    |    +1 |         |       |
+|   +1 | Superior Heating  |    | +1 |      |      |   +1 |   +1 |    |    |    | +1 |       |         |       |
+|   -1 | Damp              |    | +1 |      |      |   -1 |   -1 |    |    | +1 |    |       |         |       |
+|   +1 | Specimens         |    | +1 |      |      |      |   +1 | +1 |    |    |    |       |         |       |
+|   +1 | Extensive Stores  |    |    |   +2 |      |      |      |    |    |    |    |       |         |       |
+|    0 | Inexhaustible Supplies | |-3|      |  +1  |      |      |    |    |    |    |       |         |       |
+|    0 | Servant (Int 1)   |    |    |   +1 |      |      |   +1 |    |    |    | +1 |       |         |       |
+|    0 | Superior Equipment| +1 | +2 |   +1 |      |      |      |    |    |    |    |       |   +1    |       |
+|    0 | Superior Tools    |    | +1 |   +1 |      |      |      |    |    |    |    |       |         |    +1 |
+|   0  | Base Safety (Ref - OccSz) | | | -2 |      |      |      |    |    |    |    |       |         |       |
+   |||||||||||||
 
-|   +2 | **Totals**        | -2 | +3 |   -1 |      |   -1 |   +4 | +9 | +1 | +2 | +1 |    +1 |
+|   +2 | **Totals**        | -2 | +3 |    0 |      |   -1 |   +4 | +9 | +1 | +2 | +1 |    +1 |   +1    |   +1  |
 |   |||||||||||||
 [Lab Details]  
 
 * Stats given are for Superior Lighting
+
+|             |Score|
+|------------:|:---:|
+|   Size      | +2  |
+|Virtue Points|  7  |
+|Flaw Points  |  5  |
+|Refinement   |  0  |
+|Occupied Size| +2  |
+|Free points  |  0  |
+[Lab Size]