style: 🎨 change to THUAI7.ConstructionState | None

eesast · May 16, 2024 · b73242a · b73242a
1 parent d2c5e55
commit b73242a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/CAPI/python/PyAPI/API.py b/CAPI/python/PyAPI/API.py
@@ -82,7 +82,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]:
     def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType:
         return self.__logic.GetPlaceType(cellX, cellY)
 
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         return self.__logic.GetConstructionState(cellX, cellY)
 
     def GetWormholeHp(self, cellX: int, cellY: int) -> int:
@@ -190,7 +190,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]:
     def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType:
         return self.__logic.GetPlaceType(cellX, cellY)
 
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         return self.__logic.GetConstructionState(cellX, cellY)
 
     def GetWormholeHp(self, cellX: int, cellY: int) -> int:

diff --git a/CAPI/python/PyAPI/DebugAPI.py b/CAPI/python/PyAPI/DebugAPI.py
@@ -227,7 +227,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]:
     def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType:
         return self.__logic.GetPlaceType(cellX, cellY)
 
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         return self.__logic.GetConstructionState(cellX, cellY)
 
     def GetWormholeHp(self, cellX: int, cellY: int) -> int:
@@ -465,7 +465,7 @@ def GetFullMap(self) -> List[List[THUAI7.PlaceType]]:
     def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType:
         return self.__logic.GetPlaceType(cellX, cellY)
 
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         return self.__logic.GetConstructionState(cellX, cellY)
 
     def GetWormholeHp(self, cellX: int, cellY: int) -> int:

diff --git a/CAPI/python/PyAPI/Interface.py b/CAPI/python/PyAPI/Interface.py
@@ -43,7 +43,7 @@ def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType:
         pass
 
     @abstractmethod
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         pass
 
     @abstractmethod
@@ -247,7 +247,7 @@ def GetPlaceType(self, cellX: int, cellY: int) -> THUAI7.PlaceType:
         pass
 
     @abstractmethod
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         """获取当前建筑状态
 
         :param cellX: X坐标, 单位Cell
@@ -415,7 +415,7 @@ def Produce(self) -> Future[bool]:
         pass
 
     @abstractmethod
-    def Rebuild(self, constructionType: THUAI7.ConstructionType) -> Future[bool]:
+    def Rebuild(self, constructionType: THUAI7.ConstructionStateType) -> Future[bool]:
         """发出重建指令
         - 需要接近待重建 `Construction`
 

diff --git a/CAPI/python/PyAPI/logic.py b/CAPI/python/PyAPI/logic.py
@@ -138,21 +138,21 @@ def GetPlayerGUIDs(self) -> List[int]:
         with self.__mtxState:
             return copy.deepcopy(self.__currentState.guids)
 
-    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.Construction:
+    def GetConstructionState(self, cellX: int, cellY: int) -> THUAI7.ConstructionState | None:
         with self.__mtxState:
             self.__logger.debug("Called GetConstructionState")
             if (cellX, cellY) in self.__currentState.mapInfo.factoryState:
-                return THUAI7.Construction(
+                return THUAI7.ConstructionState(
                     self.__currentState.mapInfo.factoryState[(cellX, cellY)],
                     THUAI7.ConstructionType.Factory,
                 )
             elif (cellX, cellY) in self.__currentState.mapInfo.communityState:
-                return THUAI7.Construction(
+                return THUAI7.ConstructionState(
                     self.__currentState.mapInfo.communityState[(cellX, cellY)],
                     THUAI7.ConstructionType.Community,
                 )
             elif (cellX, cellY) in self.__currentState.mapInfo.fortState:
-                return THUAI7.Construction(
+                return THUAI7.ConstructionState(
                     self.__currentState.mapInfo.fortState[(cellX, cellY)],
                     THUAI7.ConstructionType.Fort,
                 )

diff --git a/CAPI/python/PyAPI/structures.py b/CAPI/python/PyAPI/structures.py
@@ -227,7 +227,7 @@ def __init__(self):
         self.teamID: int = 0
         self.guid: int = 0
 
-class Construction:
+class ConstructionState:
     def __init__(self,teamID,HP,type:ConstructionType):
         self.teamID=teamID
         self.hp=HP