s151636/GenericAI_Sweeper
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add walls

Browse Source
This commit is contained in:
eugenep 2021-04-11 12:02:52 +02:00
parent 5d2603b65e
commit 8632841061
5 changed files with 112 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
images/wall.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

2
main.py
View File

@ -39,6 +39,8 @@ class Game:
Bomb(self, col, row)
if tile == '4':
Grenade(self, col, row)
if tile == "#":
Wall(self, col, row)
if tile == 'A':
self.player = Player(self, col, row)

6
map.txt
View File

@ -1,7 +1,7 @@
.A.....
###....
.......
.......
.......
.......
....2..
...###.
...#2#.
.......

2
maze.py
View File

@ -69,6 +69,8 @@ class Maze:
if not(0 <= i < len(maze[0]) and 0 <= j < len(maze)):
return False
elif (maze[j][i] == "#"):
return False
return True

38
sprites.py
View File

@ -28,6 +28,7 @@ class Player(pg.sprite.Sprite):
if self.direction == Direction.Right.name:
if dx > 0:
if self.check_border(dx):
if not self.collide_with_walls(dx):
if self.collide_with_mines(dx):
#ctypes.windll.user32.MessageBoxW(0, "Mine Ahead!", "Warning", 1)
print("Mine Ahead!")
@ -38,6 +39,7 @@ class Player(pg.sprite.Sprite):
if self.direction == Direction.Up.name:
if dy < 0:
if self.check_border(0, dy):
if not self.collide_with_walls(0, dy):
if self.collide_with_mines(0, dy):
#ctypes.windll.user32.MessageBoxW(0, "Mine Ahead!", "Warning", 1)
print("Mine Ahead!")
@ -48,6 +50,7 @@ class Player(pg.sprite.Sprite):
if self.direction == Direction.Down.name:
if dy > 0:
if self.check_border(0, dy):
if not self.collide_with_walls(0, dy):
if self.collide_with_mines(0, dy):
#ctypes.windll.user32.MessageBoxW(0, "Mine Ahead!", "Warning", 1)
print("Mine Ahead!")
@ -58,6 +61,7 @@ class Player(pg.sprite.Sprite):
if self.direction == Direction.Left.name:
if dx < 0:
if self.check_border(dx):
if not self.collide_with_walls(dx):
if self.collide_with_mines(dx):
#ctypes.windll.user32.MessageBoxW(0, "Mine Ahead!", "Warning", 1)
print("Mine Ahead!")
@ -90,6 +94,12 @@ class Player(pg.sprite.Sprite):
return True
return False
def collide_with_walls(self, dx=0, dy=0):
for wall in self.game.walls:
if wall.x == self.x + dx and wall.y == self.y + dy:
return True
return False
"""
right = 1
@ -105,6 +115,16 @@ class Player(pg.sprite.Sprite):
def parse_maze_moves(self):
self.moves = [char for char in self.maze.moves]
if self.moves[0] != 'R':
if self.moves[0] == 'D':
self.moves.insert(0, 'Turn Down')
if self.moves[0] == 'U':
self.moves.insert(0, 'Turn Up')
if self.moves[0] == 'L':
self.moves.insert(0, 'Turn Left')
for n, i in enumerate(self.moves):
if i == 'R':
self.moves[n] = 'Right'
@ -148,6 +168,7 @@ class Player(pg.sprite.Sprite):
self.moves.insert(n+1, 'Turn Right')
if self.moves[n+1] == 'L':
self.moves.insert(n+1, 'Turn Left')
print(self.moves)
@ -220,4 +241,21 @@ class Grenade(pg.sprite.Sprite):
self.rect.x = self.x * TILESIZE
self.rect.y = self.y * TILESIZE
class Wall(pg.sprite.Sprite):
def __init__(self, game, x, y):
self.groups = game.all_sprites, game.walls
pg.sprite.Sprite.__init__(self, self.groups)
self.game = game
#self.image = pg.Surface((TILESIZE, TILESIZE))
self.image = pg.image.load('images/wall.bmp')
#self.image.fill(YELLOW)
self.image = pg.transform.scale(self.image, (TILESIZE, TILESIZE))
self.rect = self.image.get_rect()
self.x = x
self.y = y
def update(self):
self.rect.x = self.x * TILESIZE
self.rect.y = self.y * TILESIZE