Mods

cromulant/ants.py

@@ -74,7 +74,7 @@ class Ants:
             ant = Ant()
             ant.created = now
             ant.updated = now
-            ant.name = Utils.random_name()
+            ant.name = Ants.random_name()
 
             Ants.ants.append(ant)
             image_path = Config.hatched_image_path
@@ -180,3 +180,7 @@ class Ants:
             return None
 
         return max(Ants.ants, key=lambda a: a.triumph)
+
+    @staticmethod
+    def random_name() -> str:
+        return Utils.random_name(Ants.get_names())

cromulant/game.py

@@ -162,9 +162,8 @@ class Game:
         elif num == 2:
             ant.hits += 1
             method = "hit"
-        elif (num == 3) and (num_ants > 1):
+        elif num == 3:
-            other = Ants.get_other(ant)
+            status = Utils.random_name([ant.name])
-            status = other.name
             method = "thinking"
         elif num == 4:
             status = s.simple_sentence()

cromulant/utils.py

@@ -86,11 +86,8 @@ class Utils:
         return r, g, b
 
     @staticmethod
-    def random_name() -> str:
+    def random_name(ignore: list[str]) -> str:
-        from .ants import Ants
+        filtered = [name for name in Utils.names if name not in ignore]
-
-        used = Ants.get_names()
-        filtered = [name for name in Utils.names if name not in used]
         return random.choice(filtered)
 
     @staticmethod