Changeset 584:6d2f6fcd914d


Ignore:
Timestamp:
09/07/13 21:13:01 (8 years ago)
Author:
David Sharpe <decoydavid@…>
Branch:
default
Phase:
public
Message:

Fuck you cargo bay!!!!!!

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • data/levels/cargo_bay

    r563 r584  
    2525  classname: Door
    2626- args:
    27   - [1550, 1500]
     27  - [1500, 1500]
    2828  classname: FloorSwitch
    2929  name: light_switch_1
     
    3333  name: light_switch_2
    3434- args:
    35   - [1550, 1645]
     35  - [1500, 1645]
    3636  classname: FloorSwitch
    3737  name: light_switch_3
     
    4141  name: light_switch_4
    4242- args:
    43   - [1550, 1800]
     43  - [1500, 1790]
    4444  classname: FloorSwitch
    4545  name: light_switch_5
    4646- args:
    47   - [1675, 1800]
     47  - [1675, 1790]
    4848  classname: FloorSwitch
    4949  name: light_switch_6
     
    7070  classname: Box
    7171- args:
     72  - [1385, 1309]
     73  - all_box_switches
     74  classname: FloorLight
     75  name: light1
     76- args:
     77  - [1295, 1165]
     78  classname: FloorSwitch
     79  name: light_switch_7
     80- args:
    7281  - [1385, 1220]
    7382  - light_switch_7
    74   classname: FloorLight
    75   name: light
    76 - args:
    77   - [1385, 1309]
    78   - all_switches
    7983  classname: FloorLight
    8084  name: light2
     
    8286  classname: puzzle.StateLogicalAndPuzzler
    8387  name: all_box_switches
    84 - args:
    85   - [1295, 1165]
    86   classname: FloorSwitch
    87   name: light_switch_7
    8888- args: [all_box_switches, light_switch_7]
    8989  classname: puzzle.StateLogicalAndPuzzler
    9090  name: all_switches
    9191- args:
    92   - [1406, 1265]
     92  - [1500, 1200]
     93  - cargo_bay
     94  - [1500, 1100]
     95  - 90
     96  - all_switches
     97  classname: PuzzleDoor
     98  name: switch_door_to_maintenance_office
     99- args:
     100  - [1500, 1150]
     101  - cargo_bay
     102  - [1500, 1250]
     103  - 90
     104  classname: Door
     105- args:
     106  - [1500, 1000]
     107  - keycard_blue
     108  classname: collectable.KeyCard
     109  name: keycard_blue
     110- args:
     111  - [1800, 1265]
    93112  - crew
    94113  - [110, 1650]
    95114  - 0
    96   - all_switches
    97   classname: PuzzleDoor
    98   name: switch_door_to_crew_quarters
    99 - args:
    100   - [1345, 1309]
    101   - 'To CREW QUARTERS: sealed due to box placement exclusion and drainage pipe complex blockages.'
     115  classname: Door
     116- args:
     117  - [1750, 1309]
     118  - 'To CREW QUARTERS: don't forget to return all safety gear to the lockers'
    102119  classname: Note
    103120- args:
     
    157174  - [1334, 1128]
    158175  - [1334, 1200]
    159   - [1406, 1200]
    160   - [1406, 1330]
     176  - [1800, 1200]
     177  - [1800, 1330]
    161178  - [1190, 1330]
    162179  - [1190, 1420]
     
    166183  - [470, 1200]
    167184  - [614, 1200]
    168   4:
     185  2:
    169186  - [200, 1600]
    170187  - [560, 1600]
     
    192209  - [200, 1780]
    193210  - [200, 1600]
    194   5:
     211  3:
    195212  - [470, 1690]
    196213  - [560, 1690]
     
    198215  - [470, 1870]
    199216  - [470, 1690]
    200   6:
     217  4:
    201218  - [650, 1870]
    202219  - [830, 1870]
     
    204221  - [650, 1690]
    205222  - [650, 1870]
    206   7:
     223  5:
    207224  - [920, 1600]
    208225  - [650, 1600]
     
    210227  - [920, 1510]
    211228  - [920, 1600]
     229  6:
     230  - [1400, 1150]
     231  - [1600, 1150]
     232  - [1600, 910]
     233  - [1400, 910]
     234  - [1400, 1150]
    212235size: [2400, 2410]
  • nagslang/game_object.py

    r563 r584  
    362362class SokoBox(GameObject):
    363363    def __init__(self, space, position):
    364         body = make_body(1, pymunk.inf, position, 0.2)
     364        body = make_body(1, pymunk.inf, position, 0.1)
    365365        self.shape = pymunk.Poly(
    366366            body, [(-40, -40), (40, -40), (40, 40), (-40, 40)])
    367         self.shape.friction = 0.5
     367        self.shape.friction = 2.0
    368368        self.shape.collision_type = COLLISION_TYPE_FURNITURE
    369369        super(SokoBox, self).__init__(
Note: See TracChangeset for help on using the changeset viewer.