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

Fix computer targetting errors

Browse Source
This commit is contained in:
drewjcooper
2023-05-10 07:54:36 +10:00
parent aa6a06cdc8
commit 405c50e0e7
9 changed files with 67 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
77_Salvo/csharp/Coordinate.cs
View File

@@ -2,14 +2,14 @@ namespace Salvo;
internal record struct Coordinate(int Value)
{
public const int MinValue = 0;
public const int MaxValue = 9;
public const int MinValue = 1;
public const int MaxValue = 10;
public static IEnumerable<Coordinate> Range => Enumerable.Range(0, 10).Select(v => new Coordinate(v));
public static IEnumerable<Coordinate> Range => Enumerable.Range(1, 10).Select(v => new Coordinate(v));
public bool IsInRange => Value is >= MinValue and <= MaxValue;
public static Coordinate Create(float value) => new((int)value - 1);
public static Coordinate Create(float value) => new((int)value);
public static bool TryCreateValid(float value, out Coordinate coordinate)
{
@@ -35,11 +35,11 @@ internal record struct Coordinate(int Value)
_ => this
};
public static implicit operator Coordinate(float value) => new((int)value);
public static implicit operator Coordinate(float value) => Create(value);
public static implicit operator int(Coordinate coordinate) => coordinate.Value;
public static Coordinate operator +(Coordinate coordinate, int offset) => new(coordinate.Value + offset);
public static int operator -(Coordinate a, Coordinate b) => a.Value - b.Value;
public override string ToString() => $" {Value + 1} ";
public override string ToString() => $" {Value} ";
}

78
77_Salvo/csharp/Game.cs
View File

@@ -56,9 +56,9 @@ L2250: goto L2890;
}
foreach (var shot1 in humanShotSelector.GetShots())
{
if (computerGrid.IsHit(shot1, turnNumber, out var shipName))
if (computerGrid.IsHit(shot1, turnNumber, out var ship))
{
_io.Write(Strings.YouHit(shipName));
_io.Write(Strings.YouHit(ship.Name));
}
}
L2620: if (startResponse == "YES") { goto L2670; }
@@ -81,7 +81,7 @@ L2970: if (hitShipValue[i]>0) { goto L3800; }
}
temp = computerShotSelector.GetShots().ToArray();
// display shots
L3380: if (seeShotsResponse == "yes")
L3380: if (seeShotsResponse == "YES")
{
foreach (var shot in temp)
{
@@ -90,17 +90,17 @@ L3380: if (seeShotsResponse == "yes")
}
foreach (var shot in temp)
{
if (!humanGrid.IsHit(shot, turnNumber, out var shipName))
if (!humanGrid.IsHit(shot, turnNumber, out var ship))
{
continue;
}
_io.WriteLine(Strings.IHit(shipName));
_io.Write(Strings.IHit(ship.Name));
L3570: for (var j = 1; j <= 12; j++)
{
// record hit
L3580: if (hitTurnRecord[j] != -1) { continue; }
L3590: hitTurnRecord[j]=10+turnNumber;
L3600: hitShipValue[j]=humanGrid[shot];
L3600: hitShipValue[j]=ship.Value;
// look for past hits on same ship
L3610: var shipHits=0;
L3620: for (var k = 1; k <= 12; k++)
@@ -132,51 +132,65 @@ L3470: humanGrid[shot]=10+turnNumber;
}
L3490: goto L1950;
L3800: //REM************************USINGEARRAY
var tempGrid = new Grid();
var tempGrid = Position.All.ToDictionary(x => x, _ => 0);
L3860: for (var i = 1; i <= 12; i++)
{
if (hitTurnRecord[i]<10) { continue; }
foreach (var position in Position.All)
{
if (humanGrid[position]>=10)
if (humanGrid.WasTargetedAt(position, out _))
{
foreach (var neighbour in position.Neighbours)
{
if (humanGrid[neighbour] == hitTurnRecord[i])
{
tempGrid[position] += hitTurnRecord[i]-position.Y*(int)(hitShipValue[i]+.5F);
}
}
}
else
{
tempGrid[position]=-10000000;
continue;
}
foreach (var neighbour in position.Neighbours)
{
if (humanGrid.WasTargetedAt(neighbour, out var turn) && turn == (hitTurnRecord[i] - 10))
{
tempGrid[position] += hitTurnRecord[i]-position.Y*(int)(hitShipValue[i]+.5F);
}
}
}
}
L4030: for (var i = 1; i <= numberOfShots; i++)
L4030: for (var i = 0; i < numberOfShots; i++)
{
L4040: temp[i]=i;
L4040: temp[i]=i+1;
}
foreach (var position in Position.All)
{
L4090: var Q9=1;
L4100: for (var i = 1; i <= numberOfShots; i++)
L4090: var Q9=0;
L4100: for (var i = 0; i < numberOfShots; i++)
{
L4110: if (tempGrid[temp[i]]>=tempGrid[temp[Q9]]) { continue; }
L4120: Q9=i;
L4110: if (tempGrid[temp[i]] < tempGrid[temp[Q9]])
{
L4120: Q9 = i;
}
}
L4131: if (position.X>numberOfShots) { goto L4140; }
L4132: if (position.IsOnDiagonal) { goto L4210; }
L4140: if (tempGrid[position]<tempGrid[temp[Q9]]) { goto L4210; }
L4150: for (var i = 1; i <= numberOfShots; i++)
L4131: if (position.X <= numberOfShots && position.IsOnDiagonal) { continue; }
L4140: if (tempGrid[position]<tempGrid[temp[Q9]]) { continue; }
if (!temp.Contains(position))
{
L4160: if (temp[i].X != position.X) { break; }
L4170: if (temp[i].Y == position.Y) { goto L4210; }
temp[Q9] = position;
}
L4190: temp[Q9]=position;
L4210: ;// NoOp - NEXT S
}
L4230: goto L3380;
}
}
internal class DataRandom : IRandom
{
private readonly Queue<float> _values =
new(File.ReadAllLines("data.txt").Select(l => float.Parse(l) / 1000000));
private float _previous;
public float NextFloat() => _previous = _values.Dequeue();
public float PreviousFloat() => _previous;
public void Reseed(int seed)
{
throw new NotImplementedException();
}
}

6
77_Salvo/csharp/Grid.cs
View File

@@ -75,14 +75,12 @@ internal class Grid
internal bool WasTargetedAt(Position position, out int turnTargeted)
=> _shots.TryGetValue(position, out turnTargeted);
internal bool IsHit(Position position, int turnNumber, [NotNullWhen(true)] out string? shipName)
internal bool IsHit(Position position, int turnNumber, [NotNullWhen(true)] out Ship? ship)
{
shipName = null;
_shots[position] = turnNumber;
var ship = _ships.FirstOrDefault(s => s.IsHit(position));
ship = _ships.FirstOrDefault(s => s.IsHit(position));
if (ship == null) { return false; }
shipName = ship.Name;
if (ship.IsDestroyed) { _ships.Remove(ship); }

3
77_Salvo/csharp/Program.cs
View File

@@ -5,4 +5,5 @@ global using Salvo;
global using Salvo.Ships;
global using static Salvo.Resources.Resource;
new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();
//new Game(new ConsoleIO(), new RandomNumberGenerator()).Play();
new Game(new ConsoleIO(), new DataRandom()).Play();

2
77_Salvo/csharp/Resources/IHit.txt
View File

@@ -1 +1 @@
I hot your {0}
I hit your {0}

2
77_Salvo/csharp/Resources/WhereAreYourShips.txt
View File

@@ -1 +1 @@
Where are your ships?
Where are your ships?

5
77_Salvo/csharp/Targetting/ComputerShotSelector.cs
View File

@@ -10,6 +10,11 @@ internal class ComputerShotSelector : ShotSelector
_displayShots = displayShots;
}
internal override IEnumerable<Position> GetShots()
{
throw new NotImplementedException();
}
private void DisplayShots(IEnumerable<Position> shots, IReadWrite io)
{
if (_displayShots)

2
77_Salvo/csharp/Targetting/HumanShotSelector.cs
View File

@@ -12,7 +12,7 @@ internal class HumanShotSelector : ShotSelector
internal override IEnumerable<Position> GetShots()
{
var shots = new Position[NumberOfShots()];
var shots = new Position[NumberOfShots];
for (var i = 0; i < shots.Length; i++)
{

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

@@ -15,6 +15,7 @@ internal class SearchPatternShotSelector : ShotSelector
internal override IEnumerable<Position> GetShots()
{
_shots.Clear();
while(_shots.Count < NumberOfShots)
{
var (seed, _) = _random.NextShipPosition();
@@ -31,11 +32,11 @@ internal class SearchPatternShotSelector : ShotSelector
_searchPattern.Reset();
if (attemptsLeft-- == 0) { return; }
candidateShot = candidateShot.BringIntoRange(_random);
if (FindValidShots(candidateShot)) { return; }
if (FindValidShots(ref candidateShot)) { return; }
}
}
private bool FindValidShots(Position candidateShot)
private bool FindValidShots(ref Position candidateShot)
{
while (true)
{