Merge pull request #90 from THU-ASTA/develop

Develop

Author: futrime

Assets/Sounds/AutoCharge.wav

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [24.3.0]
+
+### Added
+- Sound effects
+
+### Fixed
+- Forcing to take orders
 
 ## [24.2.0]
 

Assets/Sounds/Charging.wav

@@ -176,6 +176,8 @@ public static readonly (long Min, long Max) OrderDeliveryDurationRange = (
         20000, 60000
     );
 
+    public const decimal OrderForceContactScopeRadius = 16M;
+
     /// <summary>
     /// The order number of each game part.
     /// </summary>
@@ -187,24 +189,6 @@ public static readonly (long Min, long Max) OrderDeliveryDurationRange = (
             { GameStageType.PreMatch, null }
         };
 
-    /// <summary>
-    /// The sound to play when delivering an order.
-    /// </summary>
-    public static readonly SoundPlayer OrderSoundDeliver = new SoundPlayer(
-        @"Assets/Sounds/Deliver.wav"
-    );
-
-    /// <summary>
-    /// The sound to play when taking an order.
-    /// </summary>
-    public static readonly SoundPlayer OrderSoundTake = new SoundPlayer(
-        @"Assets/Sounds/Order.wav"
-    );
-
-
-    public static readonly SoundPlayer SetChargingPileSound = new SoundPlayer(
-        @"Assets/Sounds/SetChargingPile.wav"
-    );
     #endregion
 
     #region Parameters related to vehicles
@@ -329,8 +313,45 @@ public long? RemainingTime
 
     #endregion
 
+
     #region Private properties and fields
 
+    private static readonly SoundPlayer _soundDeliverOrder = new SoundPlayer(
+    @"Assets/Sounds/Deliver.wav"
+);
+
+    private static readonly SoundPlayer _soundTakeOrder = new SoundPlayer(
+        @"Assets/Sounds/Order.wav"
+    );
+
+    private static readonly SoundPlayer _soundNotMoving = new SoundPlayer(
+        @"Assets/Sounds/NotMoving.wav"
+    );
+    private static bool _isSoundNotMovingPlaying = false;
+
+    private static readonly SoundPlayer _soundInBarrier = new SoundPlayer(
+        @"Assets/Sounds/InBarrier.wav"
+    );
+    private static bool _isSoundInBarrierPlaying = false;
+
+    private static readonly SoundPlayer _soundCharging = new SoundPlayer(
+        @"Assets/Sounds/Charging.wav"
+    );
+    private static bool _isSoundChargingPlaying = false;
+
+    private static readonly SoundPlayer _soundDischarging = new SoundPlayer(
+        @"Assets/Sounds/InBarrier.wav"
+    );
+    private static bool _isSoundDischargingPlaying = false;
+
+    private static readonly SoundPlayer _soundAutoCharge = new SoundPlayer(
+        @"Assets/Sounds/AutoCharge.wav"
+    );
+
+    private static readonly SoundPlayer _soundSetChargingPile = new SoundPlayer(
+        @"Assets/Sounds/SetChargingPile.wav"
+    );
+
     private readonly List<Barrier> _barrierList;
 
     private CampType? _camp = null;
@@ -378,9 +399,14 @@ public long? RemainingTime
     public Game()
     {
         // Load sounds
-        Game.OrderSoundDeliver.Load();
-        Game.OrderSoundTake.Load();
-        Game.SetChargingPileSound.Load();
+        Game._soundDeliverOrder.Load();
+        Game._soundTakeOrder.Load();
+        Game._soundNotMoving.Load();
+        Game._soundInBarrier.Load();
+        Game._soundCharging.Load();
+        Game._soundDischarging.Load();
+        Game._soundAutoCharge.Load();
+        Game._soundSetChargingPile.Load();
 
         // Generate barriers
         this._barrierList = new List<Barrier>();
@@ -594,9 +620,85 @@ public void End()
             throw new Exception("The game is not running or paused.");
         }
 
+        Game._soundDeliverOrder.Stop();
+        Game._soundTakeOrder.Stop();
+        Game._soundNotMoving.Stop();
+        Game._soundInBarrier.Stop();
+        Game._soundCharging.Stop();
+        Game._soundDischarging.Stop();
+        Game._soundAutoCharge.Stop();
+        Game._soundSetChargingPile.Stop();
+
         this._gameState = GameStatusType.Ended;
     }
 
+    /// <summary>
+    /// Force to take or deliver an order.
+    /// </summary>
+    public void ForceToTakeOrDeliverOrder(ForceToTakeOrDeliverOrderType action)
+    {
+        var vehicle = this._vehicle[(CampType)this._camp];
+
+        if (vehicle?.Position == null)
+        {
+            return;
+        }
+
+        var vehiclePosition = (Dot)vehicle.Position;
+
+
+        // Count the orders in delivery.
+        var deliveringOrderNumber = 0;
+        foreach (var order in this._orderList)
+        {
+            if (order.Status == OrderStatusType.InDelivery)
+            {
+                ++deliveringOrderNumber;
+            }
+        }
+
+        foreach (var order in this._orderList)
+        {
+            // Take orders.
+            if (order.Status == OrderStatusType.Pending && action == ForceToTakeOrDeliverOrderType.Take)
+            {
+                // Check if the capacity is full.
+                if (deliveringOrderNumber >= Game.OrderDeliveryCapacity)
+                {
+                    continue;
+                }
+
+                if ((decimal)Dot.Distance(order.DeparturePosition, vehiclePosition)
+                    <= Game.OrderForceContactScopeRadius)
+                {
+                    order.Take((long)this.GameTime);
+
+                    // Play the take sound.
+                    Game._soundTakeOrder.Play();
+                }
+            }
+            else if (order.Status == OrderStatusType.InDelivery)
+            {
+                if ((decimal)Dot.Distance(order.DestinationPosition, vehiclePosition)
+                    <= Game.OrderForceContactScopeRadius)
+                {
+                    order.Deliver((long)this.GameTime);
+
+                    if (order.OvertimeDuration == null)
+                    {
+                        throw new Exception("The overtime duration of the order is null.");
+                    }
+
+                    this._score[(CampType)this._camp] +=
+                        Math.Max((decimal)order.Commission + Game.ScoreDeliveryOvertimeRate * (byte)order.OvertimeDuration, 0);
+
+                    // Player the deliver sound.
+                    Game._soundDeliverOrder.Play();
+                }
+            }
+        }
+    }
+
     /// <summary>
     /// Set a charging pile.
     /// </summary>
@@ -640,7 +742,7 @@ public void SetChargingPile()
 
         this._score[(CampType)this._camp] += Game.ScoreSetChargingPile;
 
-        Game.SetChargingPileSound.Play();
+        Game._soundSetChargingPile.Play();
     }
 
     #endregion
@@ -661,6 +763,8 @@ private void AutoCharge()
 
         if (vehicle.IsPowerExhausted)
         {
+            Game._soundAutoCharge.Play();
+
             // Exchange time for power.
             this._startTime -= Game.VehicleAutoChargingStep;
             vehicle.IncreaseMaxDistance(
@@ -822,9 +926,22 @@ void ScoreMoving()
             (long)vehicle.ParkingDuration >= 5000 + this.LastTickDuration
         )
         {
+            if (!Game._isSoundNotMovingPlaying)
+            {
+                Game._isSoundNotMovingPlaying = true;
+                Game._soundNotMoving.PlayLooping();
+            }
             this._score[(CampType)this._camp] +=
                 Game.ScoreOvertimeParkingRate * this.LastTickDuration;
         }
+        else
+        {
+            if (Game._isSoundNotMovingPlaying)
+            {
+                Game._isSoundNotMovingPlaying = false;
+                Game._soundNotMoving.Stop();
+            }
+        }
     }
 
     /// <summary>
@@ -843,10 +960,24 @@ void TackleBarriers()
 
         if (this.IsInBarrier(vehiclePosition))
         {
+            if (!Game._isSoundInBarrierPlaying)
+            {
+                Game._isSoundInBarrierPlaying = true;
+                Game._soundInBarrier.PlayLooping();
+            }
+
             vehicle.IncreaseMaxDistance(
                 (int)Math.Round(Game.BarrierDischargingRate * this.LastTickDuration)
             );
         }
+        else
+        {
+            if (Game._isSoundInBarrierPlaying)
+            {
+                Game._isSoundInBarrierPlaying = false;
+                Game._soundInBarrier.Stop();
+            }
+        }
     }
 
     /// <summary>
@@ -873,21 +1004,49 @@ void TackleChargingPiles()
             camp: (CampType)this._camp
         ))
         {
+            if (!Game._isSoundChargingPlaying)
+            {
+                Game._isSoundChargingPlaying = true;
+                Game._soundCharging.PlayLooping();
+            }
+
             vehicle.IncreaseMaxDistance(
                 (int)Math.Round(Game.ChargingPileChargingRate * this.LastTickDuration)
             );
         }
+        else
+        {
+            if (Game._isSoundChargingPlaying)
+            {
+                Game._isSoundChargingPlaying = false;
+                Game._soundCharging.Stop();
+            }
+        }
 
         if (this.IsInChargingPileInfluenceScope(
             position: vehiclePosition,
             camp: (CampType)this._camp,
             reverse: true
         ))
         {
+            if (!Game._isSoundDischargingPlaying)
+            {
+                Game._isSoundDischargingPlaying = true;
+                Game._soundDischarging.PlayLooping();
+            }
+
             vehicle.IncreaseMaxDistance(
                 (int)Math.Round(Game.ChargingPileDischargingRate * this.LastTickDuration)
             );
         }
+        else
+        {
+            if (Game._isSoundDischargingPlaying)
+            {
+                Game._isSoundDischargingPlaying = false;
+                Game._soundDischarging.Stop();
+            }
+        }
     }
 
     /// <summary>
@@ -932,7 +1091,7 @@ void TakeAndDeliverOrder()
                     order.Take((long)this.GameTime);
 
                     // Play the take sound.
-                    Game.OrderSoundTake.Play();
+                    Game._soundTakeOrder.Play();
                 }
             }
             else if (order.Status == OrderStatusType.InDelivery)
@@ -951,7 +1110,7 @@ void TakeAndDeliverOrder()
                         Math.Max((decimal)order.Commission + Game.ScoreDeliveryOvertimeRate * (long)order.OvertimeDuration, 0);
 
                     // Player the deliver sound.
-                    Game.OrderSoundDeliver.Play();
+                    Game._soundDeliverOrder.Play();
                 }
             }
         }

Assets/Sounds/InBarrier.wav

@@ -65,7 +65,7 @@ public partial class MainWindow : Form
     /// <summary>
     /// FPS = Old FPS * (1 - FpsUpdateDecay) + New FPS * FpsUpdateDecay
     /// </summary>
-    private const decimal FpsUpdateDecay = 0.2M;
+    private const decimal FpsUpdateDecay = 1M;
 
     /// <summary>
     /// The size of icons shown on the monitor
@@ -248,7 +248,8 @@ public MainWindow()
         );
 
         // Setup the timer
-        this.timer.Interval = Math.Min(Math.Max((int)(1000 / this._camera.Fps), 1), 1000);
+        // this.timer.Interval = Math.Min(Math.Max((int)(1000 / this._camera.Fps), 1), 1000);
+        this.timer.Interval = 100;
         this.timer.Start();
 
         // Setup the locators
@@ -477,6 +478,10 @@ private void Communicate()
                     {
                         this._game.SetChargingPile();
                     }
+                    else if (packetFromSlave.GetPacketId() == PacketForceToTakeOrDeliverSlave.PacketId)
+                    {
+                        this._game.ForceToTakeOrDeliverOrder(((PacketForceToTakeOrDeliverSlave)packetFromSlave).Action);
+                    }
                 }
 
                 // Send default packet.