gitea-mirror/basic-computer-games
1
0
Fork 0
mirror of https://github.com/coding-horror/basic-computer-games.git synced 2025-12-22 07:10:42 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix action resolution

Browse Source
This commit is contained in:
Andrew Cooper
2022-04-12 17:47:24 +10:00
parent c45fb59747
commit f4fa4f230b
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
07_Basketball/csharp/IReadWriteExtensions.cs
View File

@@ -13,11 +13,11 @@ internal static class IReadWriteExtensions
}
}
private static bool TryReadInteger(this IReadWrite io, string prompt, out int value)
private static bool TryReadInteger(this IReadWrite io, string prompt, out int intValue)
{
var floatValue = io.ReadNumber(prompt);
value = (int)floatValue;
return value == floatValue;
intValue = (int)floatValue;
return intValue == floatValue;
}
public static Shot? ReadShot(this IReadWrite io, string prompt)

26
07_Basketball/csharp/Probably.cs
View File

@@ -14,28 +14,28 @@ internal struct Probably
private readonly IRandom _random;
private readonly bool? _result;
internal Probably(float defenseFactor, IRandom random, bool? result = false)
internal Probably(float defenseFactor, IRandom random, bool? result = null)
{
_defenseFactor = defenseFactor;
_random = random;
_result = result;
}
public Probably Do(float probability, Func<bool?> action) =>
ShouldResolveAction(probability)
? new Probably(_defenseFactor, _random, _result | Resolve(action))
: this;
public Probably Do(float probability, Action action) =>
ShouldResolveAction(probability)
? new Probably(_defenseFactor, _random, _result | Resolve(action))
? new Probably(_defenseFactor, _random, Resolve(action) ?? false)
: this;
public Probably Do(float probability, Func<bool> action) =>
ShouldResolveAction(probability)
? new Probably(_defenseFactor, _random, Resolve(action) ?? false)
: this;
public Probably Or(float probability, Action action) => Do(probability, action);
public Probably Or(float probability, Func<bool?> action) => Do(probability, action);
public Probably Or(float probability, Func<bool> action) => Do(probability, action);
public bool Or(Action action) => _result | Resolve(action) ?? false;
public bool Or(Action action) => _result ?? Resolve(action) ?? false;
private bool? Resolve(Action action)
{
@@ -43,10 +43,8 @@ internal struct Probably
return _result;
}
private bool? Resolve(Func<bool?> action) => action.Invoke();
private bool? Resolve(Func<bool> action) => action.Invoke();
private readonly bool ShouldResolveAction(float probability)
{
return _result is null && _random.NextFloat() <= probability * _defenseFactor;
}
private readonly bool ShouldResolveAction(float probability) =>
_result is null && _random.NextFloat() <= probability * _defenseFactor;
}