Linting

squirrelbattle/interfaces.py

@@ -81,14 +81,15 @@ class Map:
         return 0 <= y < self.height and 0 <= x < self.width and \
             self.tiles[y][x].can_walk() and \
             not any(entity.x == x and entity.y == y for entity in self.entities)
-    
+
     def entity_is_present(self, y: int, x: int) -> bool:
         """
-        Indicates that the tile at the coordinates (y, x) contains a killable entity
+        Indicates that the tile at the coordinates (y, x) contains a killable
+        entity
         """
         return 0 <= y < self.height and 0 <= x < self.width and \
-            any(entity.x == x and entity.y == y and \
-            entity.is_friendly() for entity in self.entities)
+            any(entity.x == x and entity.y == y and entity.is_friendly()
+                for entity in self.entities)
 
     @staticmethod
     def load(filename: str) -> "Map":
@@ -348,9 +349,9 @@ class Entity:
         from squirrelbattle.entities.items import BodySnatchPotion, Bomb, Heart
         from squirrelbattle.entities.monsters import Tiger, Hedgehog, \
             Rabbit, TeddyBear
-        from squirrelbattle.entities.friendly import Merchant,Sunflower
-        return [BodySnatchPotion, Bomb, Heart, Hedgehog, Rabbit, TeddyBear, \
-                Sunflower,Tiger,Merchant]
+        from squirrelbattle.entities.friendly import Merchant, Sunflower
+        return [BodySnatchPotion, Bomb, Heart, Hedgehog, Rabbit, TeddyBear,
+                Sunflower, Tiger, Merchant]
 
     @staticmethod
     def get_all_entity_classes_in_a_dict() -> dict:
@@ -360,7 +361,7 @@ class Entity:
         from squirrelbattle.entities.player import Player
         from squirrelbattle.entities.monsters import Tiger, Hedgehog, Rabbit, \
             TeddyBear
-        from squirrelbattle.entities.friendly import Merchant,Sunflower
+        from squirrelbattle.entities.friendly import Merchant, Sunflower
         from squirrelbattle.entities.items import BodySnatchPotion, Bomb, Heart
         return {
             "Tiger": Tiger,
@@ -462,17 +463,19 @@ class FightingEntity(Entity):
             d[name] = getattr(self, name)
         return d
 
+
 class FriendlyEntity(FightingEntity):
     """
     Friendly entities are living entities which do not attack the player
     """
-    dialogue_option : list
+    dialogue_option: list
 
-    def talk_to(self, player : Any) -> str :
-        a = randint(0,len(self.dialogue_option)-1)
-        return "The "+self.name+" said : "+self.dialogue_option[a]
+    def talk_to(self, player: Any) -> str:
+        a = randint(0, len(self.dialogue_option) - 1)
+        return "The " + self.translated_name \
+               + " said : " + self.dialogue_option[a]
 
-    def keys(self) -> list :
+    def keys(self) -> list:
         """
         Returns a friendly entity's specific attributes
         """