More typing

dominion/Counter.py

@@ -1,4 +1,5 @@
 """ Counter - wrapped integer """
+from typing import Any
 
 
 ###############################################################################
@@ -13,16 +14,16 @@ def get(self) -> int:
         """Get the value"""
         return self._value
 
-    def set(self, value) -> int:
+    def set(self, value: int) -> int:
         """Set the value - for debugging"""
         self._value = value
         return self._value
 
-    def add(self, mod):
+    def add(self, mod: int) -> None:
         """Add to the value"""
         self._value += mod
 
-    def __add__(self, obj):
+    def __add__(self, obj: Any) -> "Counter":
         if isinstance(obj, int):
             self._value += obj
         elif hasattr(obj, "get"):
@@ -31,7 +32,7 @@ def __add__(self, obj):
             raise NotImplementedError(f"Counter __add__({obj=}) {type(obj)}")
         return Counter(self._name, self._value)
 
-    def __sub__(self, obj):
+    def __sub__(self, obj: Any) -> "Counter":
         if isinstance(obj, int):
             self._value -= obj
         elif hasattr(obj, "get"):
@@ -40,19 +41,19 @@ def __sub__(self, obj):
             raise NotImplementedError(f"Counter __sub__({obj=}) {type(obj)}")
         return Counter(self._name, self._value)
 
-    def __int__(self):
+    def __int__(self) -> int:
         return self._value
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{self._name}={self._value}>"
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return self._value != 0
 
-    def __lt__(self, obj):
+    def __lt__(self, obj: Any) -> bool:
         if isinstance(obj, int):
             return self._value < obj
-        if hasattr(obj, "get"):
+        elif hasattr(obj, "get"):
             return self._value < obj.get()
         raise NotImplementedError(f"Counter __sub__({obj=}) {type(obj)}")
 

dominion/Player.py

@@ -1820,7 +1820,7 @@ def _cost_string(self, card: Card) -> str:
     ###########################################################################
     def plr_trash_card(
         self, num=1, anynum=False, cardsrc=Piles.HAND, **kwargs
-    ) -> Optional[Card]:
+    ) -> Optional[list[Card]]:
         """Ask player to trash num cards"""
         if "prompt" not in kwargs:
             kwargs["prompt"] = "Trash any cards" if anynum else f"Trash {num} cards"