gitea-mirror/basic-computer-games
1
0
Fork 0
mirror of https://github.com/coding-horror/basic-computer-games.git synced 2026-01-07 02:24:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up shot selection

Browse Source
This commit is contained in:
drewjcooper
2023-05-20 17:12:48 +10:00
parent e27b5ec6e5
commit e02a4ca5da
8 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
77_Salvo/csharp/Targetting/SearchPatternShotSelector.cs
View File

@@ -1,30 +1,30 @@
namespace Salvo.Targetting;
internal class SearchPatternShotSelector : ShotSelector
internal class SearchPatternShotSelectionStrategy : ShotSelectionStrategy
{
private const int MaxSearchPatternAttempts = 100;
private readonly IRandom _random;
private readonly SearchPattern _searchPattern = new();
private readonly List<Position> _shots = new();
internal SearchPatternShotSelector(Grid source, Grid target, IRandom random)
: base(source, target)
internal SearchPatternShotSelectionStrategy(ShotSelector shotSelector, IRandom random)
: base(shotSelector)
{
_random = random;
}
internal override IEnumerable<Position> GetShots()
internal override IEnumerable<Position> GetShots(int numberOfShots)
{
_shots.Clear();
while(_shots.Count < NumberOfShots)
while(_shots.Count < numberOfShots)
{
var (seed, _) = _random.NextShipPosition();
SearchFrom(seed);
SearchFrom(numberOfShots, seed);
}
return _shots;
}
private void SearchFrom(Position candidateShot)
private void SearchFrom(int numberOfShots, Position candidateShot)
{
var attemptsLeft = MaxSearchPatternAttempts;
while (true)
@@ -32,18 +32,18 @@ internal class SearchPatternShotSelector : ShotSelector
_searchPattern.Reset();
if (attemptsLeft-- == 0) { return; }
candidateShot = candidateShot.BringIntoRange(_random);
if (FindValidShots(ref candidateShot)) { return; }
if (FindValidShots(numberOfShots, ref candidateShot)) { return; }
}
}
private bool FindValidShots(ref Position candidateShot)
private bool FindValidShots(int numberOfShots, ref Position candidateShot)
{
while (true)
{
if (IsValidShot(candidateShot))
{
_shots.Add(candidateShot);
if (_shots.Count == NumberOfShots) { return true; }
if (_shots.Count == numberOfShots) { return true; }
}
if (!_searchPattern.TryGetOffset(out var offset)) { return false; }
candidateShot += offset;
@@ -51,5 +51,5 @@ internal class SearchPatternShotSelector : ShotSelector
}
private bool IsValidShot(Position candidate)
=> candidate.IsInRange && !Target.WasTargetedAt(candidate, out _) && !_shots.Contains(candidate);
=> candidate.IsInRange && !WasSelectedPreviously(candidate) && !_shots.Contains(candidate);
}