# HG changeset patch
# User David Sharpe <decoydavid@gmail.com>
# Date 1378588381 -7200
# Node ID 6d2f6fcd914d5b86bdf29541be41bbc536f767f4
# Parent  a68951a9fe40fef5bf89776a99b0c2bd49c85059
Fuck you cargo bay!!!!!!

diff -r a68951a9fe40 -r 6d2f6fcd914d data/levels/cargo_bay
--- a/data/levels/cargo_bay	Sat Sep 07 22:26:53 2013 +0200
+++ b/data/levels/cargo_bay	Sat Sep 07 23:13:01 2013 +0200
@@ -24,7 +24,7 @@
   - 90
   classname: Door
 - args:
-  - [1550, 1500]
+  - [1500, 1500]
   classname: FloorSwitch
   name: light_switch_1
 - args:
@@ -32,7 +32,7 @@
   classname: FloorSwitch
   name: light_switch_2
 - args:
-  - [1550, 1645]
+  - [1500, 1645]
   classname: FloorSwitch
   name: light_switch_3
 - args:
@@ -40,11 +40,11 @@
   classname: FloorSwitch
   name: light_switch_4
 - args:
-  - [1550, 1800]
+  - [1500, 1790]
   classname: FloorSwitch
   name: light_switch_5
 - args:
-  - [1675, 1800]
+  - [1675, 1790]
   classname: FloorSwitch
   name: light_switch_6
 - args:
@@ -69,36 +69,53 @@
   - [438, 980]
   classname: Box
 - args:
+  - [1385, 1309]
+  - all_box_switches
+  classname: FloorLight
+  name: light1
+- args:
+  - [1295, 1165]
+  classname: FloorSwitch
+  name: light_switch_7
+- args:
   - [1385, 1220]
   - light_switch_7
   classname: FloorLight
-  name: light
-- args:
-  - [1385, 1309]
-  - 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_box_switches
-- args:
-  - [1295, 1165]
-  classname: FloorSwitch
-  name: light_switch_7
 - args: [all_box_switches, light_switch_7]
   classname: puzzle.StateLogicalAndPuzzler
   name: all_switches
 - args:
-  - [1406, 1265]
+  - [1500, 1200]
+  - cargo_bay
+  - [1500, 1100]
+  - 90
+  - all_switches
+  classname: PuzzleDoor
+  name: switch_door_to_maintenance_office
+- args:
+  - [1500, 1150]
+  - cargo_bay
+  - [1500, 1250]
+  - 90
+  classname: Door
+- args:
+  - [1500, 1000]
+  - keycard_blue
+  classname: collectable.KeyCard
+  name: keycard_blue
+- args:
+  - [1800, 1265]
   - crew
   - [110, 1650]
   - 0
-  - all_switches
-  classname: PuzzleDoor
-  name: switch_door_to_crew_quarters
+  classname: Door
 - args:
-  - [1345, 1309]
-  - 'To CREW QUARTERS: sealed due to box placement exclusion and drainage pipe complex blockages.'
+  - [1750, 1309]
+  - 'To CREW QUARTERS: don't forget to return all safety gear to the lockers'
   classname: Note
 - args:
   - [800, 2200]
@@ -156,8 +173,8 @@
   - [1262, 1128]
   - [1334, 1128]
   - [1334, 1200]
-  - [1406, 1200]
-  - [1406, 1330]
+  - [1800, 1200]
+  - [1800, 1330]
   - [1190, 1330]
   - [1190, 1420]
   - [1100, 1420]
@@ -165,7 +182,7 @@
   - [470, 1330]
   - [470, 1200]
   - [614, 1200]
-  4:
+  2:
   - [200, 1600]
   - [560, 1600]
   - [560, 1420]
@@ -191,22 +208,28 @@
   - [380, 1780]
   - [200, 1780]
   - [200, 1600]
-  5:
+  3:
   - [470, 1690]
   - [560, 1690]
   - [560, 1870]
   - [470, 1870]
   - [470, 1690]
-  6:
+  4:
   - [650, 1870]
   - [830, 1870]
   - [830, 1690]
   - [650, 1690]
   - [650, 1870]
-  7:
+  5:
   - [920, 1600]
   - [650, 1600]
   - [650, 1510]
   - [920, 1510]
   - [920, 1600]
+  6:
+  - [1400, 1150]
+  - [1600, 1150]
+  - [1600, 910]
+  - [1400, 910]
+  - [1400, 1150]
 size: [2400, 2410]
diff -r a68951a9fe40 -r 6d2f6fcd914d nagslang/game_object.py
--- a/nagslang/game_object.py	Sat Sep 07 22:26:53 2013 +0200
+++ b/nagslang/game_object.py	Sat Sep 07 23:13:01 2013 +0200
@@ -361,10 +361,10 @@
 
 class SokoBox(GameObject):
     def __init__(self, space, position):
-        body = make_body(1, pymunk.inf, position, 0.2)
+        body = make_body(1, pymunk.inf, position, 0.1)
         self.shape = pymunk.Poly(
             body, [(-40, -40), (40, -40), (40, 40), (-40, 40)])
-        self.shape.friction = 0.5
+        self.shape.friction = 2.0
         self.shape.collision_type = COLLISION_TYPE_FURNITURE
         super(SokoBox, self).__init__(
             SingleShapePhysicser(space, self.shape),