Add fields_around() function to object

src/objects/npcs/enemies/bear.py

@@ -32,20 +32,13 @@ def tick(self) -> None:
         self.machine.tick()
 
     def slam(self):
-        Slam(self, [self.properties.position + Direction.NORTH.value,
-                    self.properties.position + Direction.WEST.value,
-                    self.properties.position + Direction.SOUTH.value,
-                    self.properties.position + Direction.EAST.value]).execute()
+        Slam(self, self.fields_around()).execute()
 
     def prepare_to_slam(self):
         PrepareToSlam(self).execute()
 
     def is_there_agent_to_slam(self):
-        points_around = [self.properties.position + Direction.NORTH.value,
-                         self.properties.position + Direction.WEST.value,
-                         self.properties.position + Direction.SOUTH.value,
-                         self.properties.position + Direction.EAST.value]
-        for target_position in points_around:
+        for target_position in self.fields_around():
             if not self.scene._objects_position_map.get(target_position):
                 continue
             for target in self.scene.get_objects_by_position(target_position):

src/objects/object.py

@@ -1,6 +1,7 @@
 from typing import List
 
 from src.common.point import Point
+from src.common.enums import Direction
 from src.common.serializable import Serializable
 
 
@@ -32,6 +33,17 @@ def occupied_fields(self, current_position: Point = None) -> List[Point]:
             current_position = self.properties.position
         return [current_position]
 
+    def fields_around(self) -> List[Point]:
+        fields = []
+        for field in self.occupied_fields():
+            points_around_field = [field + Direction.NORTH.value,
+                                   field + Direction.WEST.value,
+                                   field + Direction.SOUTH.value,
+                                   field + Direction.EAST.value]
+            # append all points around that aren't in self.occupied_fields()
+            fields.extend(list(filter(lambda point: point not in self.occupied_fields(), points_around_field)))
+        return fields
+
     def tick(self) -> None:
         """
         Called every turn of the object to perform actions