Ignore:
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • data/levels/alientunnel1

    r605 r613  
    5454- args:
    5555  - [1050, 1050]
    56   - alientunnel1
    57   - [1025, 1025]
     56  - hangar
     57  - [255, 2495]
    5858  - 45
    5959  classname: Door
  • data/levels/crew

    r617 r618  
    4848- args:
    4949  - [834, 1842]
    50   - [500, 500]
     50  - [982, 1680]
    5151  classname: PatrollingAlien
    5252  name: patrol_1
    5353- args:
    5454  - [740, 2122]
    55   - [500, 500]
     55  - [726, 2289]
    5656  classname: PatrollingAlien
    5757  name: patrol_1
    5858- args:
    5959  - [936, 1668]
    60   - [900, 900]
     60  - [1102, 1504]
    6161  classname: PatrollingAlien
    6262  name: patrol_2
    6363- args:
    6464  - [624, 1716]
    65   - [900, 900]
     65  - [470, 1560]
    6666  classname: PatrollingAlien
    6767  name: patrol_3
    6868- args:
    6969  - [1024, 1788]
    70   - [900, 900]
     70  - [1249, 1736]
    7171  classname: PatrollingAlien
    7272  name: patrol_4
    7373- args:
    7474  - [748, 1640]
    75   - [900, 900]
     75  - [668, 1419]
    7676  classname: PatrollingAlien
    7777  name: patrol_5
    7878- args:
    7979  - [572, 2016]
    80   - [900, 900]
     80  - [365, 20035]
    8181  classname: PatrollingAlien
    8282  name: patrol_6
    8383- args:
    8484  - [552, 1864]
    85   - [900, 900]
     85  - [272, 1806]
    8686  classname: PatrollingAlien
    8787  name: patrol_7
     
    9393- args:
    9494  - [932, 2072]
    95   - [900, 900]
     95  - [1050, 2180]
    9696  classname: PatrollingAlien
    9797  name: patrol_9
    9898- args:
    9999  - [740, 1938]
    100   - [900, 900]
     100  - [586, 2090]
    101101  classname: PatrollingAlien
    102102  name: patrol_10
  • data/levels/hangar

    r616 r618  
    205205  classname: Note
    206206  name: cargo_note
     207- args:
     208  - [260, 1781]
     209  - hangar
     210  - [260, 1665]
     211  - 90
     212  classname: Door
     213  name: from_keys
     214- args:
     215  - [260, 1701]
     216  - hangar
     217  - [260, 1810]
     218  - 90
     219  - keycard_red
     220  classname: KeyedDoor
     221  name: to_keys
     222- args:
     223  - [225, 1960]
     224  - [285, 1960]
     225  - keycard_blue
     226  classname: KeyedHatch
     227  name: blue_hatch
     228- args:
     229  - [225, 2160]
     230  - [285, 2160]
     231  - keycard_green
     232  classname: KeyedHatch
     233  name: green_hatch
     234- args:
     235  - [225, 2340]
     236  - [285, 2340]
     237  - keycard_black
     238  classname: KeyedHatch
     239  name: black_hatch
     240- args:
     241  - [255, 2520]
     242  - alientunnel1
     243  - [1025, 1025]
     244  - 90
     245  classname: Door
     246  name: to_alientunnel1
    207247lines:
    208248- - [120, 1321]
     
    212252- - [280, 1161]
    213253  - [280, 1101]
     254- - [120, 1960]
     255  - [225, 1960]
     256- - [285, 1960]
     257  - [380, 1960]
     258- - [120, 2160]
     259  - [225, 2160]
     260- - [285, 2160]
     261  - [380, 2160]
     262- - [120, 2340]
     263  - [225, 2340]
     264- - [285, 2340]
     265  - [380, 2340]
    214266music: POL-cyber-factory-short.ogg
     267music_volume: 0.3
    215268polygons:
    216269  1:
     
    278331  - [2400, 1321]
    279332  - [2400, 280]
     333  2:
     334  - [120, 1781]
     335  - [120, 2521]
     336  - [380, 2521]
     337  - [380, 1781]
     338  - [120, 1781]
    280339size: [3001, 2601]
  • data/sounds/SOURCES.txt

    r588 r612  
    2222Notes:
    2323    Ogg generated using 'oggenc robotstep2.wav'
     24
     25
     26mouth_pop_2a.ogg
     27----------------
     28
     29URL:
     30    http://archive.org/download/Berklee44v5/Berklee44v5.zip
     31Source:
     32    http://archive.org/details/Berklee44v5
     33License:
     34    http://creativecommons.org/licenses/by/3.0
     35Notes:
     36    Ogg generated using 'oggenc -q -1 mouth_pop_2a.wav'
     37
     38
     39vocoder2_short.ogg
     40------------------
     41
     42URL:
     43    http://archive.org/download/Berklee44v5/Berklee44v5.zip
     44Source:
     45    http://archive.org/details/Berklee44v5
     46License:
     47    http://creativecommons.org/licenses/by/3.0
     48Notes:
     49    Ogg generated using 'oggenc -q -1 vocoder2_short.ogg'
  • nagslang/enemies.py

    r603 r612  
    122122                result.add += (Bullet(
    123123                    self.get_space(), self.physicser.position, vec, damage,
    124                     type_, COLLISION_TYPE_ENEMY),)
     124                    type_, COLLISION_TYPE_ENEMY,
     125                    "mouth_pop_2a.ogg"),)
    125126
    126127    def greedy_move(self, target):
  • nagslang/game_object.py

    r609 r612  
    108108        self._extra_shapes = extra_shapes
    109109        shape.physicser = self
     110        for es in extra_shapes:
     111            es.physicser = self
    110112
    111113    def get_shape(self):
     
    562564            body.world_to_local(tuple(end2)), 7)
    563565        self.shape.collision_type = COLLISION_TYPE_DOOR
     566        other_shape = pymunk.Circle(body, 30)
     567        other_shape.collision_type = COLLISION_TYPE_DOOR
     568        other_shape.sensor = True
    564569        self._key_item = key_item
    565570        super(KeyedHatch, self).__init__(
    566             SingleShapePhysicser(space, self.shape),
     571            MultiShapePhysicser(space, self.shape, other_shape),
    567572            render.KeyedHatchRenderer(
    568573                resources.get_image(
     
    633638class Bullet(GameObject):
    634639    def __init__(self, space, position, impulse, damage, bullet_type,
    635                  source_collision_type):
     640                 source_collision_type, bullet_sound=None):
    636641        body = make_body(1, pymunk.inf, position)
    637642        body.angle = impulse.angle
     
    649654        )
    650655        self.physicser.apply_impulse(impulse)
     656        if bullet_sound is not None:
     657            sound.play_sound(bullet_sound, 0.3)
    651658
    652659    def update(self, dt):
  • nagslang/protagonist.py

    r538 r612  
    312312        return Result(add=(Bullet(self.get_space(), self.physicser.position,
    313313                                  vec, BULLET_DAMAGE, 'bullet',
    314                                   COLLISION_TYPE_PLAYER),))
     314                                  COLLISION_TYPE_PLAYER,
     315                                  "vocoder2_short.ogg"),))
    315316
    316317    def claw(self):
Note: See TracChangeset for help on using the changeset viewer.