fix: fix code not running when not near artefacts (#1736)

* fix: fix code not running when not near artefacts

* altered the field

* added exception for types

* add indent

* adding an if statement

* extended the if statement

* fixed one test

aimmo-game-worker/simulation/action.py

@@ -1,6 +1,7 @@
 from abc import ABCMeta, abstractmethod
 
 from .direction import Direction
+from .world_map import ArtefactType
 
 
 class Action:
@@ -43,22 +44,24 @@ def serialise(self):
 class MoveTowardsAction(Action):
     def __init__(self, artefact):
         self.direction = None
-
-        if not artefact:
-            print("MoveTowardsAction got an invalid parameter. Is it empty?")
-            return
-
-        if len(artefact.path) < 2:
-            return  # not a valid path
-
-        # the first cell in the path is the starting cell
-        avatar_location = artefact.path[0].location
-        next_location = artefact.path[1].location
-
-        # calculate direction
-        x = next_location.x - avatar_location.x
-        y = next_location.y - avatar_location.y
-        self.direction = Direction(x, y)
+        if artefact:
+            try:
+                hasattr(ArtefactType, artefact.type)
+            except AttributeError:
+                print("MoveTowardsAction got an invalid parameter.")
+                return
+
+            if len(artefact.path) < 2:
+                return  # not a valid path
+
+            # the first cell in the path is the starting cell
+            avatar_location = artefact.path[0].location
+            next_location = artefact.path[1].location
+
+            # calculate direction
+            x = next_location.x - avatar_location.x
+            y = next_location.y - avatar_location.y
+            self.direction = Direction(x, y)
 
     def serialise(self):
         if not self.direction:

aimmo-game-worker/simulation/utils.py

@@ -16,8 +16,6 @@ def __getitem__(self, i):
             return super().__getitem__(i)
         except IndexError:
             if len(self) == 0:
-                raise NoNearbyArtefactsError(
-                    "There aren't any nearby artefacts, you need to move closer!"
-                ) from None
+                print("There aren't any nearby artefacts, you need to move closer!")
             else:
                 raise

aimmo-game-worker/tests/tests_simulation/test_world_map.py

@@ -147,7 +147,7 @@ def test_cannot_move_to_inhabited_cell(avatar_state_json):
     assert map.can_move_to(Location(-1, 0)) == False
 
 
-def test_scan_nearby(avatar_state_json):
+def test_scan_nearby(avatar_state_json, capsys):
     cells = _generate_cells(5, 5)
     cells[0]["avatar"] = avatar_state_json
     cells[2]["obstacle"] = {"location": {"x": 0, "y": 0}}
@@ -163,5 +163,7 @@ def test_scan_nearby(avatar_state_json):
     artefacts = map.scan_nearby(Location(5, 5), radius=1)
     assert type(artefacts) == NearbyArtefactsList
     assert len(artefacts) == 0
-    with pytest.raises(NoNearbyArtefactsError):
-        artefacts[0]
+    artefacts[0]
+    captured = capsys.readouterr()
+    # check the print statement matches
+    assert captured.out == "There aren't any nearby artefacts, you need to move closer!\n"