From 2fa185829fd9f5a67c366355d8d1da95bd4e23cc Mon Sep 17 00:00:00 2001 From: Alexis DRAI Date: Sun, 2 Oct 2022 00:31:43 +0200 Subject: [PATCH] :pencil2: :recycle: Rename Faces and override GetRandomFace() "ListFaces" was misleading because it is not a list GetRandomFace should return a Face when called from a HomogeneousDie --- Sources/Model/Dice/Die.cs | 12 ++++++------ Sources/Model/Dice/HomogeneousDie.cs | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Sources/Model/Dice/Die.cs b/Sources/Model/Dice/Die.cs index 6a1534c..6a62f47 100644 --- a/Sources/Model/Dice/Die.cs +++ b/Sources/Model/Dice/Die.cs @@ -7,21 +7,21 @@ namespace Model.Dice { public abstract class Die { - public IEnumerable ListFaces => listFaces; + public IEnumerable Faces => faces; protected static readonly Random rnd = new(); - private readonly List listFaces = new(); + private readonly List faces = new(); protected Die(params Face[] faces) { - listFaces.AddRange(faces); + this.faces.AddRange(faces); } - public Face GetRandomFace() + public virtual Face GetRandomFace() { - int faceIndex = rnd.Next(0, ListFaces.Count()); - return ListFaces.ElementAt(faceIndex); + int faceIndex = rnd.Next(0, Faces.Count()); + return Faces.ElementAt(faceIndex); } } } diff --git a/Sources/Model/Dice/HomogeneousDie.cs b/Sources/Model/Dice/HomogeneousDie.cs index 22ab110..6ccd6a9 100644 --- a/Sources/Model/Dice/HomogeneousDie.cs +++ b/Sources/Model/Dice/HomogeneousDie.cs @@ -7,5 +7,10 @@ namespace Model.Dice protected HomogeneousDie(params Face[] faces) : base(faces) { } + + public override Face GetRandomFace() + { + return (Face)base.GetRandomFace(); + } } }