Mercurial > nagslang
changeset 582:7d8c6e7ffd2b
Music in levels
| author | Stefano Rivera <stefano@rivera.za.net> |
|---|---|
| date | Sat, 07 Sep 2013 23:04:04 +0200 |
| parents | 48aa2074543f |
| children | ea9e489315f7 |
| files | data/levels/alientunnel1 data/levels/alientunnel2 data/levels/alientunnel3 data/levels/cargo_bay data/levels/crew data/levels/finale data/levels/hangar data/levels/level1 data/levels/level2 data/levels/sheep data/levels/shuttle_1 data/levels/shuttle_2 data/levels/start nagslang/level.py |
| diffstat | 14 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/data/levels/alientunnel1 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/alientunnel1 Sat Sep 07 23:04:04 2013 +0200 @@ -99,6 +99,7 @@ classname: collectable.KeyCard name: keycard_yellow lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [500, 1200]
--- a/data/levels/alientunnel2 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/alientunnel2 Sat Sep 07 23:04:04 2013 +0200 @@ -81,6 +81,7 @@ lines: - - [1100, 800] - [1100, 400] +music: POL-cyber-factory-short.ogg polygons: 1: - [500, 1200]
--- a/data/levels/alientunnel3 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/alientunnel3 Sat Sep 07 23:04:04 2013 +0200 @@ -70,6 +70,7 @@ classname: AcidFloor name: acid_3_2 lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [500, 1200]
--- a/data/levels/cargo_bay Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/cargo_bay Sat Sep 07 23:04:04 2013 +0200 @@ -105,6 +105,7 @@ - 'This place always reminds me of something... Oh, I must buy milk.' classname: Note lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [614, 1200]
--- a/data/levels/crew Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/crew Sat Sep 07 23:04:04 2013 +0200 @@ -386,6 +386,7 @@ classname: Note name: store_note lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [766, 2334]
--- a/data/levels/finale Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/finale Sat Sep 07 23:04:04 2013 +0200 @@ -42,6 +42,7 @@ classname: AcidFloor name: acid_4 lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [1000, 2400]
--- a/data/levels/hangar Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/hangar Sat Sep 07 23:04:04 2013 +0200 @@ -173,8 +173,8 @@ - args: - [2595, 1700] - To the Crew Quarters. Have your key-card ready. + classname: Note name: crew_note - classname: Note - args: - [2220, 2466] - - [2220, 2466] @@ -211,6 +211,7 @@ - [280, 1261] - - [280, 1161] - [280, 1101] +music: POL-cyber-factory-short.ogg polygons: 1: - [2400, 280]
--- a/data/levels/level1 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/level1 Sat Sep 07 23:04:04 2013 +0200 @@ -78,6 +78,7 @@ - [750, 680] - - [950, 480] - [950, 680] +music: POL-cyber-factory-short.ogg polygons: 1: - [60, 780]
--- a/data/levels/level2 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/level2 Sat Sep 07 23:04:04 2013 +0200 @@ -42,6 +42,7 @@ classname: collectable.KeyCard name: keycard_red lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [70, 440]
--- a/data/levels/sheep Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/sheep Sat Sep 07 23:04:04 2013 +0200 @@ -80,6 +80,7 @@ - [400, 600] - - [650, 500] - [650, 600] +music: POL-cyber-factory-short.ogg polygons: 1: - [50, 50]
--- a/data/levels/shuttle_1 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/shuttle_1 Sat Sep 07 23:04:04 2013 +0200 @@ -12,6 +12,7 @@ - '<Ok, if I find the bastard who stole my sonic screwdriver, I will use their guts for void-lock grease! I think there's a spare in hangar 2.>' classname: Note lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [50, 300]
--- a/data/levels/shuttle_2 Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/shuttle_2 Sat Sep 07 23:04:04 2013 +0200 @@ -12,6 +12,7 @@ - 'All toolsets recalled to main hangar bay for inventory checks. Please speak to Maintenance Foreman for more information.' classname: Note lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [50, 300]
--- a/data/levels/start Sat Sep 07 23:08:26 2013 +0200 +++ b/data/levels/start Sat Sep 07 23:04:04 2013 +0200 @@ -87,6 +87,7 @@ classname: Note name: keyhints lines: [] +music: POL-cyber-factory-short.ogg polygons: 1: - [50, 300]
--- a/nagslang/level.py Sat Sep 07 23:08:26 2013 +0200 +++ b/nagslang/level.py Sat Sep 07 23:04:04 2013 +0200 @@ -41,6 +41,7 @@ self.world = world self.world.level_state.setdefault(name, {}) self.basetile = 'tiles/floor.png' + self.music = None self._tile_image = None self._surface = None self._base_surface = None @@ -63,6 +64,7 @@ 'base_tile': self.basetile, 'polygons': self.polygons, 'lines': self.lines, + 'music': self.music, 'game_objects': self._game_objects, 'enemies': self._enemies, }, f) @@ -91,6 +93,7 @@ data = self._get_data() self.x, self.y = data['size'] self.basetile = data['base_tile'] + self.music = data['music'] for i, points in data['polygons'].iteritems(): self.polygons[i] = [] for point in points: