From 7c1c4278927d4d47a3e34e8184b7b65d05487174 Mon Sep 17 00:00:00 2001 From: Nicolas Margulies Date: Fri, 23 Oct 2020 16:17:48 +0200 Subject: [PATCH] Deleted unwanted code in Player It isn't the player's role to check whether they can move to a tile, check it beforehands and use the move method from its Entity superclass. --- dungeonbattle/entities/player.py | 24 +----------------------- dungeonbattle/interfaces.py | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dungeonbattle/entities/player.py b/dungeonbattle/entities/player.py index 98797bd..b687366 100644 --- a/dungeonbattle/entities/player.py +++ b/dungeonbattle/entities/player.py @@ -1,27 +1,5 @@ -from .interfaces import FightingEntity +from ..interfaces import FightingEntity class Player(FightingEntity): maxhealth = 20 strength = 5 - - - def move_up(self, p : Player, m : Map) : - if p.y > 0 : - cell = Tile(Map.tiles[p.y-1][p.x]) - if can_walk(cell) : - p.y = p.y-1 - def move_down(self, p : Player, m : Map) : - if p.y < Map.height : - cell = Tile(Map.tiles[p.y+1][p.x]) - if can_walk(cell) : - p.y = p.y+1 - def move_left(self, p : Player, m : Map) : - if p.x > 0 : - cell = Tile(Map.tiles[p.y][p.x-1]) - if can_walk(cell) : - p.x = p.x-1 - def move_right(self, p : Player, m : Map) : - if p.x < Map.width : - cell = Tile(Map.tiles[p.y][p.x+1]) - if can_walk(cell) : - p.x = p.x+1 diff --git a/dungeonbattle/interfaces.py b/dungeonbattle/interfaces.py index 934f290..e2be5df 100644 --- a/dungeonbattle/interfaces.py +++ b/dungeonbattle/interfaces.py @@ -11,7 +11,7 @@ class Map: height: int tiles: list - def __init__(self, width: int, height: int, tiles: list, entities = []: list): + def __init__(self, width: int, height: int, tiles: list, entities = []): self.width = width self.height = height self.tiles = tiles