Spawn hints in neighborhood of open fields #477
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Nice! Thanks for your contribution! |
lucasnlm
reviewed
Nov 11, 2023
Comment on lines
43
to
51
| fun hasUncoveredNeighbor( index: Int ): Boolean { | ||
| val numOfUncoveredNeighbors = field.getOrNull(index)?.run { | ||
| neighborsIds | ||
| .map { field[it] } | ||
| .filter { !it.isCovered } | ||
| .count() | ||
| } | ||
| return numOfUncoveredNeighbors!! > 0 | ||
| } |
There was a problem hiding this comment.
I think you can do this, instead:
private fun hasUncoveredNeighbor(area: Area): Boolean {
return area.neighborsIds.map { field[it] }.count { !it.isCovered } > 0
}
Comment on lines
63
to
71
| val unrevealedMinesWithUncoveredNeighbors = unrevealedMines.filter { | ||
| hasUncoveredNeighbor(it.id) | ||
| } | ||
| val potentialTargets = | ||
| if (unrevealedMinesWithUncoveredNeighbors.count() > 0) { | ||
| unrevealedMinesWithUncoveredNeighbors | ||
| } else { | ||
| unrevealedMines | ||
| } |
There was a problem hiding this comment.
With that suggestion, you can call here:
val unrevealedMinesWithUncoveredNeighbors = unrevealedMines.filter(::hasUncoveredNeighbor)
val potentialTargets = unrevealedMinesWithUncoveredNeighbors.ifEmpty {
unrevealedMines
}| val nearestTarget = | ||
| if (lastX != null && lastY != null) { | ||
| unrevealedMines.filter { | ||
| potentialTargets.filter { | ||
| (lastX - it.posX).absoluteValue < NEAR_MINE_THRESHOLD && | ||
| (lastY - it.posY).absoluteValue < NEAR_MINE_THRESHOLD |
There was a problem hiding this comment.
In the future, I would like to prioritize the mines that are visible in the screen.
|
@gboehl Your suggestion looks functional. Please, let me know if you will implement the suggestions. I can finish for you if you are ok. |
|
Thanks for the suggestions! I actually have zero previous experience with kotlin, so this is much appreciated. I added your suggestions and the PR should now be good to go. |
|
This should close #305 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a proposal to address issue #305. As stated there, hints appear at any random field that is not open and has no marker. Hints out in the void which are not in the neighborhood of any open field are never useful. I thus propose to only show hints that, if possible, are adjacent to a disclosed field.
Thanks for creating this nice app!