From d8dfe5c497059539f7782c365dca20de413eddb4 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 9 Feb 2023 21:07:42 -0800 Subject: [PATCH] Fix some PEP8 formatting issues --- erynrl/object.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/erynrl/object.py b/erynrl/object.py index ba2337a..cc39812 100644 --- a/erynrl/object.py +++ b/erynrl/object.py @@ -15,6 +15,7 @@ from .monsters import Species if TYPE_CHECKING: from .ai import AI + class RenderOrder(Enum): ''' These values indicate the order that an Entity should be rendered. Higher values are rendered later and therefore on @@ -24,6 +25,7 @@ class RenderOrder(Enum): ACTOR = 2000 HERO = 3000 + class Entity: '''A single-tile drawable entity with a symbol and position @@ -47,15 +49,9 @@ class Entity: ''' # A monotonically increasing identifier to help differentiate between entities that otherwise look identical - __NEXT_IDENTIFIER = 1 + __next_identifier = 1 - def __init__(self, symbol: str, *, - position: Optional[Point] = None, - blocks_movement: Optional[bool] = True, - render_order: RenderOrder = RenderOrder.ITEM, - fg: Optional[Tuple[int, int, int]] = None, - bg: Optional[Tuple[int, int, int]] = None): - self.identifier = Entity.__NEXT_IDENTIFIER + self.identifier = Entity.__next_identifier self.position = position if position else Point() self.foreground = fg if fg else (255, 255, 255) self.background = bg @@ -63,7 +59,7 @@ class Entity: self.blocks_movement = blocks_movement self.render_order = render_order - Entity.__NEXT_IDENTIFIER += 1 + Entity.__next_identifier += 1 def print_to_console(self, console: tcod.Console) -> None: '''Render this Entity to the console''' @@ -75,6 +71,7 @@ class Entity: def __repr__(self) -> str: return f'{self.__class__.__name__}({self.symbol!r}, position={self.position!r}, fg={self.foreground!r}, bg={self.background!r})' + class Actor(Entity): ''' An actor is an abstract class that defines an object that can act in the game world. Entities that are actors will @@ -121,6 +118,7 @@ class Actor(Entity): def __repr__(self) -> str: return f'{self.__class__.__name__}({self.symbol!r}, position={self.position!r}, fighter={self.fighter!r}, ai={self.ai!r}, fg={self.foreground!r}, bg={self.background!r})' + class Hero(Actor): '''The hero, the player character''' @@ -143,6 +141,7 @@ class Hero(Actor): def __str__(self) -> str: return f'Hero!{self.identifier} at {self.position} with {self.fighter.hit_points}/{self.fighter.maximum_hit_points} hp' + class Monster(Actor): '''An instance of a Species''' @@ -177,6 +176,7 @@ class Monster(Actor): def __str__(self) -> str: return f'{self.name}!{self.identifier} with {self.fighter.hit_points}/{self.fighter.maximum_hit_points} hp at {self.position}' + class Item(Entity): '''An instance of an Item'''