Merge pull request #58 from THU-ASTA/develop

Fix bugs

Author: futrime

Source/ChargingPile.cs

@@ -55,7 +55,7 @@ public ChargingPile(
     /// </returns>
     public bool IsInInfluenceScope(Dot position)
     {
-        return ((decimal)Dot.Distance(position, this._position) <
+        return ((decimal)Dot.Distance(position, this._position) <=
             this._influenceScopeRadius);
     }
 

Source/Game.cs

@@ -132,6 +132,11 @@ public static readonly (int Min, int Max) BarrierSideLengthRange = (
 
     #region Parameters related to the charging piles.
 
+    /// <summary>
+    /// The max number of charging piles of a camp.
+    /// </summary>
+    public const int ChargingPileMaxNumber = 3;
+
     /// <summary>
     /// The increasing rate of the max distances of vehicles in the influence
     /// scope of their own charging piles in centimeter per second.
@@ -168,7 +173,7 @@ public static readonly (int Min, int Max) BarrierSideLengthRange = (
     /// The range of the delivery durations of orders.
     /// </summary>
     public static readonly (long Min, long Max) OrderDeliveryDurationRange = (
-        20, 60
+        20000, 60000
     );
 
     /// <summary>
@@ -594,6 +599,26 @@ public void SetChargingPile()
             return;
         }
 
+        // Avoid setting too many charging piles.
+        int chargingPileNumber = 0;
+        foreach (var chargingPile in this._chargingPileList)
+        {
+            if (chargingPile.Camp == this._camp)
+            {
+                ++chargingPileNumber;
+            }
+        }
+        if (chargingPileNumber > Game.ChargingPileMaxNumber)
+        {
+            return;
+        }
+
+        // Can only set charging piles in the first half.
+        if (this._gameStage != GameStageType.FirstHalf)
+        {
+            return;
+        }
+
         this._chargingPileList.Add(new ChargingPile(
             (CampType)this._camp,
             (Dot)this._vehicle[(CampType)this._camp].Position,
@@ -859,57 +884,54 @@ void TakeAndDeliverOrder()
 
         var vehiclePosition = (Dot)vehicle.Position;
 
-        // The vehicle should park there for at least 0ms.
-        if (vehicle.ParkingDuration >= 0)
+
+        // Count the orders in delivery.
+        var deliveringOrderNumber = 0;
+        foreach (var order in this._orderList)
         {
-            // Count the orders in delivery.
-            var deliveringOrderNumber = 0;
-            foreach (var order in this._orderList)
+            if (order.Status == OrderStatusType.InDelivery)
             {
-                if (order.Status == OrderStatusType.InDelivery)
-                {
-                    ++deliveringOrderNumber;
-                }
+                ++deliveringOrderNumber;
             }
+        }
 
-            foreach (var order in this._orderList)
+        foreach (var order in this._orderList)
+        {
+            // Take orders.
+            if (order.Status == OrderStatusType.Pending)
             {
-                // Take orders.
-                if (order.Status == OrderStatusType.Pending)
+                // Check if the capacity is full.
+                if (deliveringOrderNumber > Game.OrderDeliveryCapacity)
                 {
-                    // Check if the capacity is full.
-                    if (deliveringOrderNumber > Game.OrderDeliveryCapacity)
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    if ((decimal)Dot.Distance(order.DeparturePosition, vehiclePosition)
-                        <= Game.OrderContactScopeRadius)
-                    {
-                        order.Take((long)this.GameTime);
+                if ((decimal)Dot.Distance(order.DeparturePosition, vehiclePosition)
+                    <= Game.OrderContactScopeRadius)
+                {
+                    order.Take((long)this.GameTime);
 
-                        // Play the take sound.
-                        Game.OrderSoundTake.Play();
-                    }
+                    // Play the take sound.
+                    Game.OrderSoundTake.Play();
                 }
-                else if (order.Status == OrderStatusType.InDelivery)
+            }
+            else if (order.Status == OrderStatusType.InDelivery)
+            {
+                if ((decimal)Dot.Distance(order.DestinationPosition, vehiclePosition)
+                    <= Game.OrderContactScopeRadius)
                 {
-                    if ((decimal)Dot.Distance(order.DestinationPosition, vehiclePosition)
-                        <= Game.OrderContactScopeRadius)
-                    {
-                        order.Deliver((long)this.GameTime);
+                    order.Deliver((long)this.GameTime);
 
-                        if (order.OvertimeDuration == null)
-                        {
-                            throw new Exception("The overtime duration of the order is null.");
-                        }
+                    if (order.OvertimeDuration == null)
+                    {
+                        throw new Exception("The overtime duration of the order is null.");
+                    }
 
-                        this._score[(CampType)this._camp] +=
-                            Math.Max(order.Commission + Game.ScoreDeliveryOvertimeRate * (long)order.OvertimeDuration, 0);
+                    this._score[(CampType)this._camp] +=
+                        Math.Max(order.Commission + Game.ScoreDeliveryOvertimeRate * (long)order.OvertimeDuration, 0);
 
-                        // Player the deliver sound.
-                        Game.OrderSoundDeliver.Play();
-                    }
+                    // Player the deliver sound.
+                    Game.OrderSoundDeliver.Play();
                 }
             }
         }

Source/MainWindow.cs

@@ -180,9 +180,9 @@ public MainWindow()
         InitializeComponent();
 
         // Initialize the label texts
-        this.labelScoreVehicleA.Text = "0.000";
-        this.labelScoreVehicleB.Text = "0.000";
-        this.labelGameTime.Text = "0.00";
+        this.labelScoreVehicleA.Text = "N/A";
+        this.labelScoreVehicleB.Text = "N/A";
+        this.labelGameTime.Text = "N/A";
         this.labelGameHalf.Text = "Pre-match";
 
         // Resize icons
@@ -809,6 +809,11 @@ private void buttonEnd_Click(object sender, EventArgs e)
     private void buttonReset_Click(object sender, EventArgs e)
     {
         this._game = new Game();
+
+        this.labelScoreVehicleA.Text = "N/A";
+        this.labelScoreVehicleB.Text = "N/A";
+        this.labelGameTime.Text = "N/A";
+        this.labelGameHalf.Text = "Pre-match";
     }
 
     private void buttonFoul_Click(object sender, EventArgs e)

Source/PacketGetGameInformationHost.cs

@@ -46,8 +46,8 @@ public PacketGetGameInformationHost(byte[] bytes)
         int currentIndex = 0;
 
         // Gamestage 
-        this._gameStage = (GameStageType)BitConverter.ToInt32(data, currentIndex);
-        currentIndex += 4;
+        this._gameStage = (GameStageType)(data[currentIndex]);
+        currentIndex += 1;
 
         // Obstacle data
         int barrierListLength = BitConverter.ToInt32(data, currentIndex);
@@ -94,7 +94,7 @@ public override byte[] GetBytes()
     {
         // Compute the length of the data
         int dataLength = (
-            1 * 4 +                                // this._currentGameStage
+            1 +                                   // this._currentGameStage
             4 +                                    // this._obstacleListLength
             this._barrierList.Count * 16 +
             1 * 8 +                                // this._duration
@@ -110,8 +110,8 @@ public override byte[] GetBytes()
 
 
         // Gamestage 
-        BitConverter.GetBytes((int)this._gameStage).CopyTo(data, currentIndex);
-        currentIndex += 4;
+        BitConverter.GetBytes((byte)this._gameStage).CopyTo(data, currentIndex);
+        currentIndex += 1;
 
         // Barrier
         BitConverter.GetBytes(this._barrierList.Count).CopyTo(data, currentIndex);
@@ -167,7 +167,7 @@ public override byte[] GetBytes()
 
         return bytes;
     }
-    
+
     public override byte GetPacketId()
     {
         return PacketGetGameInformationHost.PacketId;

Source/PacketSetChargingPileSlave.cs

@@ -53,7 +53,7 @@ public PacketSetChargingPileSlave(byte[] bytes)
 
     public override byte[] GetBytes()
     {
-        var data = new byte[8];
+        var data = new byte[0];
 
         var header = Packet.GeneratePacketHeader(PacketSetChargingPileSlave.PacketId, data);