diff --git a/84 Super Star Trek/csharp/Objects/Enterprise.cs b/84 Super Star Trek/csharp/Objects/Enterprise.cs index feb51646..1608b94b 100644 --- a/84 Super Star Trek/csharp/Objects/Enterprise.cs +++ b/84 Super Star Trek/csharp/Objects/Enterprise.cs @@ -42,7 +42,7 @@ namespace SuperStarTrek.Objects public float TotalEnergy { get; private set; } public int DamagedSystemCount => _systems.Count(s => s.IsDamaged); public IEnumerable Systems => _systems; - public int TorpedoCount { get; } + public PhotonTubes PhotonTubes => (PhotonTubes)_commandExecutors[Command.TOR]; public bool IsDocked => _quadrant.EnterpriseIsNextToStarbase; public bool IsStranded => TotalEnergy < 10 || Energy < 10 && ShieldControl.IsDamaged; diff --git a/84 Super Star Trek/csharp/Systems/PhotonTubes.cs b/84 Super Star Trek/csharp/Systems/PhotonTubes.cs index 024cf7ea..656c65be 100644 --- a/84 Super Star Trek/csharp/Systems/PhotonTubes.cs +++ b/84 Super Star Trek/csharp/Systems/PhotonTubes.cs @@ -39,6 +39,8 @@ namespace SuperStarTrek.Systems return CommandResult.Ok; } + TorpedoCount -= 1; + var isHit = false; _output.WriteLine("Torpedo track:"); foreach (var sector in course.GetSectorsFrom(_enterprise.SectorCoordinates)) diff --git a/84 Super Star Trek/csharp/Systems/ShortRangeSensors.cs b/84 Super Star Trek/csharp/Systems/ShortRangeSensors.cs index e25cf966..ad3929d1 100644 --- a/84 Super Star Trek/csharp/Systems/ShortRangeSensors.cs +++ b/84 Super Star Trek/csharp/Systems/ShortRangeSensors.cs @@ -53,7 +53,7 @@ namespace SuperStarTrek.Systems yield return $"Condition {_enterprise.Condition}"; yield return $"Quadrant {_enterprise.QuadrantCoordinates}"; yield return $"Sector {_enterprise.SectorCoordinates}"; - yield return $"Photon torpedoes {_enterprise.TorpedoCount}"; + yield return $"Photon torpedoes {_enterprise.PhotonTubes.TorpedoCount}"; yield return $"Total energy {Math.Ceiling(_enterprise.TotalEnergy)}"; yield return $"Shields {(int)_enterprise.ShieldControl.ShieldEnergy}"; yield return $"Klingons remaining {_galaxy.KlingonCount}";