refactor of previous commits

refactor to enum

typing and many other fixes

fix tests

attempt to fix some typescript

more typescript fixes

more typescript test fixes

revert all API changes

update to pydcs

mypy fixes

Use properties to check if player is blue/red/neutral

update requirements.txt

black -_-

bump pydcs and fix mypy

add opponent property

bump pydcs

game/server/controlpoints/models.py

@@ -29,12 +29,16 @@ class ControlPointJs(BaseModel):
         destination = None
         if control_point.target_position is not None:
             destination = control_point.target_position.latlng()
+        if control_point.captured.is_blue:
+            blue = True
+        else:
+            blue = False
         return ControlPointJs(
             id=control_point.id,
             name=control_point.name,
-            blue=control_point.captured,
+            blue=blue,
             position=control_point.position.latlng(),
-            mobile=control_point.moveable and control_point.captured,
+            mobile=control_point.moveable and control_point.captured.is_blue,
             destination=destination,
             sidc=str(control_point.sidc()),
         )

game/server/controlpoints/routes.py

@@ -6,6 +6,7 @@ from fastapi import APIRouter, Body, Depends, HTTPException, status
 from starlette.responses import Response
 
 from game import Game
+from game.theater.player import Player
 from .models import ControlPointJs
 from ..dependencies import GameContext
 from ..leaflet import LeafletPoint
@@ -75,7 +76,7 @@ def set_destination(
         )
     if not cp.moveable:
         raise HTTPException(status.HTTP_403_FORBIDDEN, detail=f"{cp} is not mobile")
-    if not cp.captured:
+    if not cp.captured.is_blue:
         raise HTTPException(
             status.HTTP_403_FORBIDDEN, detail=f"{cp} is not owned by the player"
         )
@@ -120,7 +121,7 @@ def cancel_travel(cp_id: UUID, game: Game = Depends(GameContext.require)) -> Non
         )
     if not cp.moveable:
         raise HTTPException(status.HTTP_403_FORBIDDEN, detail=f"{cp} is not mobile")
-    if not cp.captured:
+    if not cp.captured.is_blue:
         raise HTTPException(
             status.HTTP_403_FORBIDDEN, detail=f"{cp} is not owned by the player"
         )