Changeset 558:4abf8cf717e9


Ignore:
Timestamp:
Sep 7, 2013, 8:09:53 PM (7 years ago)
Author:
Jeremy Thurgood <firxen@…>
Branch:
default
rebase_source:
fbeb102cac6de6cbb771dc2eab8a5072a8c05149
Message:

Rename "bulkhead" to "hatch".

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • data/levels/alientunnel2

    r517 r558  
    7777  - [1100, 1000]
    7878  - door_switch
    79   classname: Bulkhead
    80   name: switch_bulkhead
     79  classname: Hatch
     80  name: switch_hatch
    8181lines:
    8282- - [1100, 800]
  • data/levels/hangar

    r532 r558  
    9191  - [280, 1260]
    9292  - maint_output
    93   classname: Bulkhead
    94   name: maint_bulkhead
     93  classname: Hatch
     94  name: maint_hatch
    9595- args: [maint_switch_1, maint_switch_2, maint_toggle_1, maint_toggle_2]
    9696  classname: puzzle.StateLogicalAndPuzzler
  • data/levels/level1

    r416 r558  
    4747  - [900, 680]
    4848  - door_switch
    49   classname: Bulkhead
    50   name: switch_bulkhead
     49  classname: Hatch
     50  name: switch_hatch
    5151- args:
    5252  - [410, 400]
  • data/levels/sheep

    r497 r558  
    3333  - [800, 700]
    3434  - sheep_pen
    35   classname: Bulkhead
    36   name: sheep_bulkhead
     35  classname: Hatch
     36  name: sheep_hatch
    3737- args:
    3838  - [750, 750]
  • data/levels/start

    r550 r558  
    4040  - [225, 350]
    4141  - cockpit_switch
    42   classname: Bulkhead
    43   name: cockpit_bulkhead
     42  classname: Hatch
     43  name: cockpit_hatch
    4444- args:
    4545  - [300, 225]
     
    5050  - [350, 225]
    5151  - room_1_switch
    52   classname: Bulkhead
    53   name: room_1_bulkhead
     52  classname: Hatch
     53  name: room_1_hatch
    5454- args:
    5555  - [550, 225]
     
    6060  - [600, 225]
    6161  - room_2_switch
    62   classname: Bulkhead
    63   name: room_2_bulkhead
     62  classname: Hatch
     63  name: room_2_hatch
    6464- args:
    6565  - [300, 375]
     
    7070  - [350, 375]
    7171  - room_3_switch
    72   classname: Bulkhead
    73   name: room_3_bulkhead
     72  classname: Hatch
     73  name: room_3_hatch
    7474- args:
    7575  - [550, 375]
     
    8080  - [600, 375]
    8181  - room_4_switch
    82   classname: Bulkhead
    83   name: room_4_bulkhead
     82  classname: Hatch
     83  name: room_4_hatch
    8484lines: []
    8585polygons:
  • nagslang/game_object.py

    r551 r558  
    481481
    482482
    483 class Bulkhead(GameObject):
    484     # Yes, I know this should be "hatch" instead of "bulkhead". It was late and
    485     # I was tired and the search/replace would touch *everything* now.
     483class Hatch(GameObject):
    486484    zorder = ZORDER_FLOOR
    487485
     
    494492        else:
    495493            puzzler = puzzle.StateProxyPuzzler(key_state)
    496         super(Bulkhead, self).__init__(
    497             SingleShapePhysicser(space, self.shape),
    498             render.BulkheadRenderer(),
     494        super(Hatch, self).__init__(
     495            SingleShapePhysicser(space, self.shape),
     496            render.HatchRenderer(),
    499497            puzzler,
    500498        )
  • nagslang/render.py

    r521 r558  
    4848
    4949
    50 class BulkheadRenderer(Renderer):
    51     def draw_bulkhead_line(self, surface, a, b):
     50class HatchRenderer(Renderer):
     51    def draw_hatch_line(self, surface, a, b):
    5252        ai, bi = extend_line(a, b, -2)
    5353        a, b, ai, bi = points_to_pygame(surface, (a, b, ai, bi))
     
    6363            ai = shape.a + offset
    6464            bi = shape.b - offset
    65             self.draw_bulkhead_line(surface, shape.a, ai)
    66             self.draw_bulkhead_line(surface, bi, shape.b)
     65            self.draw_hatch_line(surface, shape.a, ai)
     66            self.draw_hatch_line(surface, bi, shape.b)
    6767        else:
    6868            mid = shape.a + (shape.b - shape.a) / 2
    69             self.draw_bulkhead_line(surface, shape.a, mid)
    70             self.draw_bulkhead_line(surface, mid, shape.b)
     69            self.draw_hatch_line(surface, shape.a, mid)
     70            self.draw_hatch_line(surface, mid, shape.b)
    7171
    7272
Note: See TracChangeset for help on using the changeset viewer.