Merge branch 'dev' into dev-map

asdawej · web-flow · commit 5363a49ef3aa · 2024-04-10T17:15:41.000+08:00
diff --git a/CAPI/python/PyAPI/AI.py b/CAPI/python/PyAPI/AI.py
@@ -52,6 +52,6 @@ def ShipPlay(self, api: IShipAPI) -> None:
 
     def TeamPlay(self, api: ITeamAPI) -> None:
         assert self.__playerID == 0, "Team's playerID must be 0"
-        api.BuildShip(shipType=THUAI7.ShipType.CivilianShip)
+        # api.BuildShip(shipType=THUAI7.ShipType.CivilianShip)
         # 操作
         return
diff --git a/logic/Client/ViewModel/GeneralViewModel.cs b/logic/Client/ViewModel/GeneralViewModel.cs
@@ -661,13 +661,15 @@ Show the error message
                 }
             });
 
+            int moveTime = 100;
+
             MoveDownCommand = new Command(() =>
             {
                 MoveMsg movemsg = new MoveMsg();
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.Pi / 2;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
 
@@ -677,7 +679,7 @@ Show the error message
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.Pi;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
 
@@ -687,7 +689,7 @@ Show the error message
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.NegativeZero;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
 
@@ -697,7 +699,7 @@ Show the error message
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.Pi * 5 / 4;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
 
@@ -707,7 +709,7 @@ Show the error message
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.Pi * 7 / 4;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
 
@@ -717,7 +719,7 @@ Show the error message
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.Pi * 3 / 4;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
 
@@ -727,7 +729,7 @@ Show the error message
                 movemsg.PlayerId = playerID;
                 movemsg.TeamId = teamID;
                 movemsg.Angle = double.Pi / 4;
-                movemsg.TimeInMilliseconds = 50;
+                movemsg.TimeInMilliseconds = moveTime;
                 client.Move(movemsg);
             });
             //Links = [
diff --git a/logic/GameClass/GameObj/Areas/Construction.cs b/logic/GameClass/GameObj/Areas/Construction.cs
@@ -7,7 +7,7 @@ public class Construction(XY initPos)
 {
     public AtomicLong TeamID { get; } = new(long.MaxValue);
     public InVariableRange<long> HP { get; } = new(0, GameData.CommunityHP);
-    public override bool IsRigid => constructionType == ConstructionType.Community;
+    public override bool IsRigid => true;
     public override ShapeType Shape => ShapeType.Square;
 
     private readonly object lockOfConstructionType = new();
diff --git a/logic/GameClass/GameObj/Areas/Home.cs b/logic/GameClass/GameObj/Areas/Home.cs
@@ -8,7 +8,7 @@ public class Home(XY initPos, long id)
 {
     public long TeamID { get; } = id;
     public InVariableRange<long> HP => new(GameData.HomeHP);
-    public override bool IsRigid => false;
+    public override bool IsRigid => true;
     public override ShapeType Shape => ShapeType.Square;
 
     public void BeAttacked(Bullet bullet)
diff --git a/logic/GameClass/GameObj/Map/Map.cs b/logic/GameClass/GameObj/Map/Map.cs
@@ -211,6 +211,15 @@ public Map(MapStruct mapResource)
                 {
                     switch (mapResource.map[i, j])
                     {
+                        case PlaceType.Ruin:
+                            Add(new Ruin(GameData.GetCellCenterPos(i, j)));
+                            break;
+                        case PlaceType.Shadow:
+                            Add(new Shadow(GameData.GetCellCenterPos(i, j)));
+                            break;
+                        case PlaceType.Asteroid:
+                            Add(new Asteroid(GameData.GetCellCenterPos(i, j)));
+                            break;
                         case PlaceType.Resource:
                             Add(new Resource(GameData.GetCellCenterPos(i, j)));
                             break;
diff --git a/logic/GameClass/GameObj/Ship.cs b/logic/GameClass/GameObj/Ship.cs
@@ -320,6 +320,7 @@ public long SetShipState(RunningStateType running, ShipStateType value = ShipSta
         lock (actionLock)
         {
             ShipStateType nowShipState = ShipState;
+            Debugger.Output(this, "SetShipState from " + nowShipState + " to " + value);
             if (nowShipState == value) return -1;
             GameObj? lastObj = whatInteractingWith;
             switch (nowShipState)
@@ -336,6 +337,10 @@ public long SetShipState(RunningStateType running, ShipStateType value = ShipSta
                     if (value == ShipStateType.Null || value == ShipStateType.Stunned)
                         return ChangeShipState(running, value, gameObj);
                     else return -1;
+                case ShipStateType.Deceased:
+                    if (value == ShipStateType.Null)
+                        return ChangeShipState(running, value, gameObj);
+                    else return -1;
                 default:
                     return ChangeShipState(running, value, gameObj);
             }
@@ -355,11 +360,16 @@ public bool ResetShipState(long state, RunningStateType running = RunningStateTy
     {
         lock (actionLock)
         {
-            if (state != stateNum) return false;
+            if (state != stateNum)
+            {
+                Debugger.Output(this, "ResetShipState failed");
+                return false;
+            }
             runningState = running;
             whatInteractingWith = (GameObj?)obj;
             shipState = value;
             ++stateNum;
+            Debugger.Output(this, "ResetShipState succeeded" + stateNum);
             return true;
         }
     }
@@ -380,10 +390,12 @@ public bool StartThread(long stateNum, RunningStateType runningState)
         {
             if (StateNum == stateNum)
             {
+                Debugger.Output(this, "StartThread succeeded");
                 this.runningState = runningState;
                 return true;
             }
         }
+        Debugger.Output(this, "StartThread failed");
         return false;
     }
     public bool TryToRemoveFromGame(ShipStateType shipStateType)
diff --git a/logic/GameEngine/MoveEngine.cs b/logic/GameEngine/MoveEngine.cs
@@ -129,6 +129,7 @@ private bool LoopDo(IMovable obj, double direction, ref double deltaLen, long st
 
         public void MoveObj(IMovable obj, int moveTime, double direction, long stateNum)
         {
+            Debugger.Output(obj, $"Position {obj.Position}, Start moving in direction {direction}.");
             if (!gameTimer.IsGaming) return;
             lock (obj.ActionLock)
             {
diff --git a/logic/Gaming/ActionManager.cs b/logic/Gaming/ActionManager.cs
@@ -46,11 +46,13 @@ public bool MoveShip(Ship shipToMove, int moveTimeInMilliseconds, double moveDir
             {
                 if (moveTimeInMilliseconds < 5)
                 {
+                    Debugger.Output("Move time is too short.");
                     return false;
                 }
                 long stateNum = shipToMove.SetShipState(RunningStateType.Waiting, ShipStateType.Moving);
                 if (stateNum == -1)
                 {
+                    Debugger.Output("Ship is not commandable.");
                     return false;
                 }
                 new Thread
diff --git a/logic/Gaming/Game.cs b/logic/Gaming/Game.cs
@@ -133,10 +133,12 @@ public bool MoveShip(long teamID, long shipID, int moveTimeInMilliseconds, doubl
             Ship? ship = gameMap.FindShipInPlayerID(teamID, shipID);
             if (ship != null && ship.IsRemoved == false)
             {
+                Debugger.Output("Trying to move: " + teamID + " " + shipID + " " + moveTimeInMilliseconds + " " + angle);
                 return actionManager.MoveShip(ship, moveTimeInMilliseconds, angle);
             }
             else
             {
+                Debugger.Output("Failed to move: " + teamID + " " + shipID + ", no ship found");
                 return false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public class Construction(XY initPos)`
`7`	`7`	`{`
`8`	`8`	`public AtomicLong TeamID { get; } = new(long.MaxValue);`
`9`	`9`	`public InVariableRange<long> HP { get; } = new(0, GameData.CommunityHP);`
`10`		`- public override bool IsRigid => constructionType == ConstructionType.Community;`
	`10`	`+ public override bool IsRigid => true;`
`11`	`11`	`public override ShapeType Shape => ShapeType.Square;`
`12`	`12`
`13`	`13`	`private readonly object lockOfConstructionType = new();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class Home(XY initPos, long id)`
`8`	`8`	`{`
`9`	`9`	`public long TeamID { get; } = id;`
`10`	`10`	`public InVariableRange<long> HP => new(GameData.HomeHP);`
`11`		`- public override bool IsRigid => false;`
	`11`	`+ public override bool IsRigid => true;`
`12`	`12`	`public override ShapeType Shape => ShapeType.Square;`
`13`	`13`
`14`	`14`	`public void BeAttacked(Bullet bullet)`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,7 @@ public long SetShipState(RunningStateType running, ShipStateType value = ShipSta`
`320`	`320`	`lock (actionLock)`
`321`	`321`	`{`
`322`	`322`	`ShipStateType nowShipState = ShipState;`
	`323`	`+ Debugger.Output(this, "SetShipState from " + nowShipState + " to " + value);`
`323`	`324`	`if (nowShipState == value) return -1;`
`324`	`325`	`GameObj? lastObj = whatInteractingWith;`
`325`	`326`	`switch (nowShipState)`
`@@ -336,6 +337,10 @@ public long SetShipState(RunningStateType running, ShipStateType value = ShipSta`
`336`	`337`	`if (value == ShipStateType.Null \|\| value == ShipStateType.Stunned)`
`337`	`338`	`return ChangeShipState(running, value, gameObj);`
`338`	`339`	`else return -1;`
	`340`	`+ case ShipStateType.Deceased:`
	`341`	`+ if (value == ShipStateType.Null)`
	`342`	`+ return ChangeShipState(running, value, gameObj);`
	`343`	`+ else return -1;`
`339`	`344`	`default:`
`340`	`345`	`return ChangeShipState(running, value, gameObj);`
`341`	`346`	`}`
`@@ -355,11 +360,16 @@ public bool ResetShipState(long state, RunningStateType running = RunningStateTy`
`355`	`360`	`{`
`356`	`361`	`lock (actionLock)`
`357`	`362`	`{`
`358`		`- if (state != stateNum) return false;`
	`363`	`+ if (state != stateNum)`
	`364`	`+ {`
	`365`	`+ Debugger.Output(this, "ResetShipState failed");`
	`366`	`+ return false;`
	`367`	`+ }`
`359`	`368`	`runningState = running;`
`360`	`369`	`whatInteractingWith = (GameObj?)obj;`
`361`	`370`	`shipState = value;`
`362`	`371`	`++stateNum;`
	`372`	`+ Debugger.Output(this, "ResetShipState succeeded" + stateNum);`
`363`	`373`	`return true;`
`364`	`374`	`}`
`365`	`375`	`}`
`@@ -380,10 +390,12 @@ public bool StartThread(long stateNum, RunningStateType runningState)`
`380`	`390`	`{`
`381`	`391`	`if (StateNum == stateNum)`
`382`	`392`	`{`
	`393`	`+ Debugger.Output(this, "StartThread succeeded");`
`383`	`394`	`this.runningState = runningState;`
`384`	`395`	`return true;`
`385`	`396`	`}`
`386`	`397`	`}`
	`398`	`+ Debugger.Output(this, "StartThread failed");`
`387`	`399`	`return false;`
`388`	`400`	`}`
`389`	`401`	`public bool TryToRemoveFromGame(ShipStateType shipStateType)`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ private bool LoopDo(IMovable obj, double direction, ref double deltaLen, long st`
`129`	`129`
`130`	`130`	`public void MoveObj(IMovable obj, int moveTime, double direction, long stateNum)`
`131`	`131`	`{`
	`132`	`+ Debugger.Output(obj, $"Position {obj.Position}, Start moving in direction {direction}.");`
`132`	`133`	`if (!gameTimer.IsGaming) return;`
`133`	`134`	`lock (obj.ActionLock)`
`134`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,13 @@ public bool MoveShip(Ship shipToMove, int moveTimeInMilliseconds, double moveDir`
`46`	`46`	`{`
`47`	`47`	`if (moveTimeInMilliseconds < 5)`
`48`	`48`	`{`
	`49`	`+ Debugger.Output("Move time is too short.");`
`49`	`50`	`return false;`
`50`	`51`	`}`
`51`	`52`	`long stateNum = shipToMove.SetShipState(RunningStateType.Waiting, ShipStateType.Moving);`
`52`	`53`	`if (stateNum == -1)`
`53`	`54`	`{`
	`55`	`+ Debugger.Output("Ship is not commandable.");`
`54`	`56`	`return false;`
`55`	`57`	`}`
`56`	`58`	`new Thread`
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,12 @@ public bool MoveShip(long teamID, long shipID, int moveTimeInMilliseconds, doubl`
`133`	`133`	`Ship? ship = gameMap.FindShipInPlayerID(teamID, shipID);`
`134`	`134`	`if (ship != null && ship.IsRemoved == false)`
`135`	`135`	`{`
	`136`	`+ Debugger.Output("Trying to move: " + teamID + " " + shipID + " " + moveTimeInMilliseconds + " " + angle);`
`136`	`137`	`return actionManager.MoveShip(ship, moveTimeInMilliseconds, angle);`
`137`	`138`	`}`
`138`	`139`	`else`
`139`	`140`	`{`
	`141`	`+ Debugger.Output("Failed to move: " + teamID + " " + shipID + ", no ship found");`
`140`	`142`	`return false;`
`141`	`143`	`}`
`142`	`144`	`}`