diff --git a/source/Trek-12/Models/Rules/Rules.cs b/source/Trek-12/Models/Rules/Rules.cs index d9ef85a..90f91c4 100644 --- a/source/Trek-12/Models/Rules/Rules.cs +++ b/source/Trek-12/Models/Rules/Rules.cs @@ -10,15 +10,35 @@ namespace Models.Rules { public bool NearCell(Cell playerChoice, List cells) { - foreach (var item in cells) - { - if(playerChoice.X == item.X +1 || playerChoice.X == item.X - 1 - || playerChoice.Y == item.Y +1 || playerChoice.Y == item.Y -1 ) + foreach (var item in cells) + { + if(playerChoice.Pos.X == item.Pos.X +1 || playerChoice.Pos.X == item.Pos.X - 1 + || playerChoice.Pos.Y == item.Pos.Y +1 || playerChoice.Pos.Y == item.Pos.Y -1 ) { return true; - } + } } return false; } + + public bool IsCellEmpty(Cell playerChoice) + { + if (playerChoice.Value == null) + { + return true; + } + + return false; + } + + public bool IsCellValid(Cell playerChoice, List cells) + { + if (NearCell(playerChoice, cells) && IsCellEmpty(playerChoice)) + { + return true; + } + + return false; + } } }