Mercurial > mamba

annotate mamba/level.py @ 173:71911af9d42d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refactor drawing code. Correct tile variants when painting
author Neil Muller <drnlmuller@gmail.com>
date Wed, 14 Sep 2011 01:13:23 +0200
parents fc6844f7a1e8
children 893fb9f8f468
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
1 """
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
2 Level for our shiny game.
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
3 """
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
4
71
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
5 from pygame.surface import Surface
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
6 from pygame.sprite import RenderUpdates
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
7
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
8 from mamba.data import load_file
162
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
9 from mamba import sprites
83
30c3bbaf7a28 Use Snake direction constants in level.py.
Simon Cross <hodgestar@gmail.com>
parents: 81
diff changeset
10 from mamba.snake import Snake
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
11
21
f76c3f033772 Release early, release broken. Level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 8
diff changeset
12
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
13 class InvalidMapError(Exception):
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
14 pass
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
15
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
16
104
5b92ff941de3 Refactor sprites.
Jeremy Thurgood <firxen@gmail.com>
parents: 98
diff changeset
17 def mktile(cls, **kw):
5b92ff941de3 Refactor sprites.
Jeremy Thurgood <firxen@gmail.com>
parents: 98
diff changeset
18 return (cls, kw)
5b92ff941de3 Refactor sprites.
Jeremy Thurgood <firxen@gmail.com>
parents: 98
diff changeset
19
5b92ff941de3 Refactor sprites.
Jeremy Thurgood <firxen@gmail.com>
parents: 98
diff changeset
20
37
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
21 TILE_MAP = {
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
22 '.': None,
169
fc6844f7a1e8 Set wall name
Neil Muller <drnlmuller@gmail.com>
parents: 165
diff changeset
23 'X': mktile(sprites.TileSprite, image_name='wall', name='wall',
fc6844f7a1e8 Set wall name
Neil Muller <drnlmuller@gmail.com>
parents: 165
diff changeset
24 solid=True),
162
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
25 'R': mktile(sprites.DoorSprite, colour='red'),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
26 'B': mktile(sprites.DoorSprite, colour='blue'),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
27 '^': mktile(sprites.EntrySprite, direction=Snake.UP),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
28 'v': mktile(sprites.EntrySprite, direction=Snake.DOWN),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
29 '<': mktile(sprites.EntrySprite, direction=Snake.LEFT),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
30 '>': mktile(sprites.EntrySprite, direction=Snake.RIGHT),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
31 'E': mktile(sprites.ExitSprite),
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
32 '~': mktile(sprites.PuddleSprite),
37
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
33 }
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
34
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
35 THING_MAP = {
163
41e8d4ce3af2 TileSprites are less magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 162
diff changeset
36 'a': mktile(sprites.TileSprite, image_name='red'),
165
0b2f2627a0ac moved animals to common
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 163
diff changeset
37 'M': mktile(sprites.BigMouse),
0b2f2627a0ac moved animals to common
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 163
diff changeset
38 'm': mktile(sprites.SmallMouse),
0b2f2627a0ac moved animals to common
Adrianna Pińska <adrianna.pinska@gmail.com>
parents: 163
diff changeset
39 'f': mktile(sprites.Frog),
37
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
40 }
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
41
9a0ae29c7f5e Tiles *and* things.
Jeremy Thurgood <firxen@gmail.com>
parents: 34
diff changeset
42
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
43 class Tileset(object):
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
44 def __init__(self, tileset_name):
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
45 self.name = tileset_name
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
46 self.load_tiles()
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
47
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
48 def load_tiles(self):
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
49 self.tiles = {}
163
41e8d4ce3af2 TileSprites are less magic.
Jeremy Thurgood <firxen@gmail.com>
parents: 162
diff changeset
50 self.floor = sprites.TileSprite('.', tileset=self.name,
162
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
51 image_name='floor').image
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
52 for name, value in TILE_MAP.items():
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
53 if value is not None:
104
5b92ff941de3 Refactor sprites.
Jeremy Thurgood <firxen@gmail.com>
parents: 98
diff changeset
54 value[1]['tileset'] = self.name
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
55 self.tiles[name] = value
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
56 self.tiles.update(THING_MAP)
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
57
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
58 def __getitem__(self, key):
84
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
59 try:
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
60 tilespec = self.tiles[key]
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
61 except KeyError:
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
62 raise InvalidMapError("Unknown tile type: '%s'" % key)
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
63 if not tilespec:
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
64 return None
105
87acd3ddc972 Tell sprites what their tile char is.
Jeremy Thurgood <firxen@gmail.com>
parents: 104
diff changeset
65 cls, params = tilespec
87acd3ddc972 Tell sprites what their tile char is.
Jeremy Thurgood <firxen@gmail.com>
parents: 104
diff changeset
66 params['tile_char'] = key
87acd3ddc972 Tell sprites what their tile char is.
Jeremy Thurgood <firxen@gmail.com>
parents: 104
diff changeset
67 return cls(**params)
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
68
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
69 def get_tile(self, key, tile_pos, *groups):
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
70 tile = self[key]
50
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
71 if tile:
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
72 tile.add(*groups)
1b725035b8ef Levels that are visible.
Jeremy Thurgood <firxen@gmail.com>
parents: 37
diff changeset
73 tile.set_tile_pos(tile_pos)
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
74 return tile
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
75
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
76
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
77 class Level(object):
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
78 def __init__(self, level_name):
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
79 self.level_name = level_name
123
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
80 self.tiles_ascii = ''
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
81 self.load_level_data()
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
82
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
83 def load_level_data(self):
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
84 """
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
85 This file format is potentially yucky.
8
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
86 """
66ae99f6903e First stab at tile/level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents:
diff changeset
87 level_data = load_file('levels/%s.txt' % (self.level_name,))
136
00ada2e29798 Somewhat better (but still hideous) image variant support.
Jeremy Thurgood <firxen@gmail.com>
parents: 132
diff changeset
88 self.name = level_data.readline().strip()
31
67218082cdbb More level non-functionality.
Jeremy Thurgood <firxen@gmail.com>
parents: 21
diff changeset
89 tileset_name = level_data.readline().strip()
21
f76c3f033772 Release early, release broken. Level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 8
diff changeset
90 self.tileset = Tileset(tileset_name)
84
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
91 tiles_ascii = [line.strip() for line in level_data.readlines()]
123
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
92 self.tiles_ascii = tiles_ascii
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
93 self.setup_tiles(tiles_ascii)
71
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
94 self.make_background()
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
95
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
96 def setup_tiles(self, tiles_ascii):
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
97 self.sprites = RenderUpdates()
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
98 self.tiles = []
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
99 self.entry = None
84
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
100 self.tile_size = (len(tiles_ascii[0]), len(tiles_ascii))
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
101 for y, row in enumerate(tiles_ascii):
84
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
102 if len(row) != self.tile_size[0]:
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
103 raise InvalidMapError("Map not rectangular.")
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
104 tile_row = []
84
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
105 for x, tile_char in enumerate(row):
141
2c643ec8dc4e pep8 & pyflakes cleanup
Neil Muller <drnlmuller@gmail.com>
parents: 136
diff changeset
106 #tile_orientation = self.get_tile_orientation(y, x, row,
2c643ec8dc4e pep8 & pyflakes cleanup
Neil Muller <drnlmuller@gmail.com>
parents: 136
diff changeset
107 # tile_char)
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
108 tile = self.tileset.get_tile(tile_char, (x, y), self.sprites)
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
109 tile_row.append(tile)
162
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
110 if isinstance(tile, sprites.EntrySprite):
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
111 if self.entry is not None:
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
112 raise InvalidMapError("Too many entry points.")
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
113 self.entry = tile
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
114 self.tiles.append(tile_row)
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
115 if self.entry is None:
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
116 raise InvalidMapError("Not enough entry points.")
144
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
117 self.set_tile_orientations()
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
118
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
119 def set_tile_orientations(self):
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
120 tiles = [tile # This is a scary listcomp. It makes me happy.
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
121 for row in self.tiles
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
122 for tile in row
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
123 if tile is not None]
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
124 for tile in tiles:
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
125 orientation = self.get_tile_orientation(tile)
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
126 tile.use_variant(*orientation)
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
127
123
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
128 def is_same_tile(self, tile, x, y):
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
129 """Is there a tile of the same type?"""
144
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
130 if tile.tile_char is None:
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
131 # This isn't really a tile, so bail
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
132 return False
123
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
133 try:
144
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
134 other_tile = self.tiles[y][x]
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
135 except IndexError:
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
136 # We're over the edge of the map
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
137 return False
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
138 if other_tile is None:
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
139 # Emptiness.
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
140 return False
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
141 return tile.tile_char == other_tile.tile_char
123
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
142
144
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
143 def get_tile_orientation(self, tile):
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
144 if tile is None:
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
145 return (False, False, False, False)
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
146 map_x, map_y = tile.tile_pos
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
147 return (
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
148 self.is_same_tile(tile, map_x, map_y - 1), # above
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
149 self.is_same_tile(tile, map_x, map_y + 1), # below
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
150 self.is_same_tile(tile, map_x - 1, map_y), # left
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
151 self.is_same_tile(tile, map_x + 1, map_y), # right
b292370c4548 Rearranged the orientation stuff. :-)
Jeremy Thurgood <firxen@gmail.com>
parents: 143
diff changeset
152 )
123
915fd0ee28f5 Added test tile orientation
Gideon Visser <gideon@gideonvisser.com>
parents: 112
diff changeset
153
71
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
154 def get_tile_size(self):
84
cced0ddda33f More level validation.
Jeremy Thurgood <firxen@gmail.com>
parents: 83
diff changeset
155 return self.tile_size
21
f76c3f033772 Release early, release broken. Level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 8
diff changeset
156
f76c3f033772 Release early, release broken. Level stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 8
diff changeset
157 def get_size(self):
71
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
158 x, y = self.get_tile_size()
162
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
159 return sprites.tile_sizify((x, y))
71
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
160
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
161 def make_background(self):
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
162 sx, sy = self.get_tile_size()
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
163 self.background = Surface(self.get_size())
162
7fbbe27120a9 Rodents! Amphibians! Import juggling!
Jeremy Thurgood <firxen@gmail.com>
parents: 146
diff changeset
164 [self.background.blit(self.tileset.floor, sprites.tile_sizify((x, y)))
71
58557a89ec86 Some tile improvements and stuff.
Jeremy Thurgood <firxen@gmail.com>
parents: 57
diff changeset
165 for x in range(sx) for y in range(sy)]
81
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
166
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
167 def get_entry(self):
c8d6ca296884 Better level entry points.
Jeremy Thurgood <firxen@gmail.com>
parents: 71
diff changeset
168 return (self.entry.tile_pos, self.entry.direction)
110
e6299eb296ce Draw the world!
Simon Cross <hodgestar@gmail.com>
parents: 105
diff changeset
169
e6299eb296ce Draw the world!
Simon Cross <hodgestar@gmail.com>
parents: 105
diff changeset
170 def draw(self, surface):
112
62a705f4e876 Blit the background onto the screen, not the screen onto the background.
Simon Cross <hodgestar@gmail.com>
parents: 110
diff changeset
171 surface.blit(self.background, (0, 0))
110
e6299eb296ce Draw the world!
Simon Cross <hodgestar@gmail.com>
parents: 105
diff changeset
172 self.sprites.draw(surface)
173
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
173
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
174 def get_tile(self, tile_pos):
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
175 x, y = tile_pos
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
176 if 0 <= x < self.tile_size[0] and 0 <= y < self.tile_size[1]:
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
177 return self.tiles[y][x]
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
178 return None
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
179
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
180 def replace_tile(self, tile_pos, new_tile_char):
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
181 x, y = tile_pos
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
182 old_tile = self.tiles[y][x]
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
183 if old_tile is not None:
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
184 old_tile.remove(self.sprites)
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
185 new_tile = self.tileset.get_tile(new_tile_char, tile_pos, self.sprites)
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
186 self.tiles[y][x] = new_tile
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
187 # Fix orientations
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
188 tiles = [self.get_tile((x + dx, y + dy)) for dx in (-1, 0, 1)
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
189 for dy in (-1, 0, 1)]
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
190 for tile in tiles:
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
191 if tile:
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
192 orientation = self.get_tile_orientation(tile)
71911af9d42d Refactor drawing code. Correct tile variants when painting
Neil Muller <drnlmuller@gmail.com>
parents: 169
diff changeset
193 tile.use_variant(*orientation)