# HG changeset patch
# User David Sharpe <decoydavid@gmail.com>
# Date 1378580456 -7200
# Node ID 5f7a44b0d3300873bf51c1d331ca33c143749b4d
# Parent  62784e479ed25972532d7520e71e1c97c901540b# Parent  2def99545eb570baa3c77e442f9bd089a1acb6f4
Merge

diff -r 2def99545eb5 -r 5f7a44b0d330 data/levels/cargo_bay
--- a/data/levels/cargo_bay	Sat Sep 07 20:59:07 2013 +0200
+++ b/data/levels/cargo_bay	Sat Sep 07 21:00:56 2013 +0200
@@ -8,13 +8,25 @@
   - 0
   classname: Door
 - args:
-  - [1700, 2510]
+  - [60, 1250]
   - 'To HANGAR'
   classname: Note
 - args:
+  - [1150, 1420]
+  - cargo_bay
+  - [1150, 1580]
+  - 90
+  classname: Door
+- args:
+  - [1150, 1510]
+  - cargo_bay
+  - [1150, 1350]
+  - 90
+  classname: Door
+- args:
   - [1600, 1200]
   - crew
-  - [110, 1610]
+  - [110, 1650]
   - 180
   classname: Door
 - args:
@@ -22,14 +34,152 @@
   - 'To CREW QUARTERS'
   classname: Note
 - args:
-  - [2100, 1300]
+  - [200, 400]
+  classname: Box
+- args:
+  - [270, 400]
+  classname: Box
+- args:
+  - [280, 505]
+  classname: Box
+- args:
+  - [220, 700]
   classname: Box
+- args:
+  - [1550, 1500]
+  classname: FloorSwitch
+  name: light_switch_1
+- args:
+  - [1675, 1500]
+  classname: FloorSwitch
+  name: light_switch_2
+- args:
+  - [1550, 1645]
+  classname: FloorSwitch
+  name: light_switch_3
+- args:
+  - [1675, 1645]
+  classname: FloorSwitch
+  name: light_switch_4
+- args:
+  - [1550, 1800]
+  classname: FloorSwitch
+  name: light_switch_5
+- args:
+  - [1675, 1800]
+  classname: FloorSwitch
+  name: light_switch_6
+- args:
+  - [337, 1643]
+  classname: Box
+- args:
+  - [607, 1643]
+  classname: Box
+- args:
+  - [607, 1913]
+  classname: Box
+- args:
+  - [607, 2093]
+  classname: Box
+- args:
+  - [789, 2003]
+  classname: Box
+- args:
+  - [789, 1913]
+  classname: Box
+- args:
+  - [1700, 1150]
+  - light_switch_1
+  classname: FloorLight
+  name: light
+- args:
+  - [1700, 1250]
+  - all_switches
+  classname: FloorLight
+  name: light2
+- args: [light_switch_1, light_switch_2, light_switch_3, light_switch_4, light_switch_5, light_switch_6]
+  classname: puzzle.StateLogicalAndPuzzler
+  name: all_switches
 lines: []
 polygons:
   1:
-  - [1600, 2400]
-  - [1600, 10]
-  - [10, 10]
-  - [10, 2400]
-  - [1600, 2400]
-size: [1610, 2410]
+  - [470, 10]
+  - [470, 1330]
+  - [1100, 1330]
+  - [1100, 1420]
+  - [1190, 1420]
+  - [1190, 1330]
+  - [1820, 1330]
+  - [1820, 10]
+  - [470, 10]
+  2:
+  - [100, 100]
+  - [1000, 100]
+  - [1000, 1000]
+  - [980, 1000]
+  - [980, 120]
+  - [680, 120]
+  - [680, 840]
+  - [660, 840]
+  - [660, 120]
+  - [360, 120]
+  - [360, 840]
+  - [340, 840]
+  - [340, 120]
+  - [120, 120]
+  - [120, 980]
+  - [500, 980]
+  - [500, 260]
+  - [520, 260]
+  - [520, 980]
+  - [820, 980]
+  - [820, 260]
+  - [840, 260]
+  - [840, 1000]
+  - [100, 1000]
+  - [100, 100]
+  4:
+  - [200, 1600]
+  - [560, 1600]
+  - [560, 1420]
+  - [1010, 1420]
+  - [1010, 1600]
+  - [1100, 1600]
+  - [1100, 1510]
+  - [1190, 1510]
+  - [1190, 1600]
+  - [1370, 1600]
+  - [1370, 1420]
+  - [1730, 1420]
+  - [1730, 1870]
+  - [1370, 1870]
+  - [1370, 1690]
+  - [920, 1690]
+  - [920, 1960]
+  - [830, 1960]
+  - [830, 2230]
+  - [560, 2230]
+  - [560, 1960]
+  - [380, 1960]
+  - [380, 1780]
+  - [200, 1780]
+  - [200, 1600]
+  5:
+  - [470, 1690]
+  - [560, 1690]
+  - [560, 1870]
+  - [470, 1870]
+  - [470, 1690]
+  6:
+  - [650, 1870]
+  - [830, 1870]
+  - [830, 1690]
+  - [650, 1690]
+  - [650, 1870]
+  7:
+  - [920, 1600]
+  - [650, 1600]
+  - [650, 1510]
+  - [920, 1510]
+  - [920, 1600]
+size: [1910, 2410]