Skip to content

fix: region calculation for puzzles with stones #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lkaesberg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: region calculation for puzzles with stones #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef7ef1b
Update PuzzleSymbols.h
lkaesberg Mar 17, 2025
9136a37
Update Generate.cpp
lkaesberg Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Generate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ bool Generate::generate_path(PuzzleSymbols & symbols)

//For stone puzzles, the path must have a certain number of regions
if (symbols.style == Panel::Style::HAS_STONES && _splitPoints.size() == 0)
return generate_path_regions(min(symbols.getNum(Decoration::Stone), (_panel->_width / 2 + _panel->_height / 2) / 2 + 1));
return generate_path_regions(std::min(symbols.getNumColors(Decoration::Stone), (_panel->_width / 2 + _panel->_height / 2) / 2 + 1));

if (symbols.style == Panel::Style::HAS_SHAPERS) {
if (hasFlag(Config::SplitShapes)) {
Expand Down
5 changes: 5 additions & 0 deletions Source/PuzzleSymbols.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ struct PuzzleSymbols {
for (auto& pair : symbols[symbolType]) total += pair.second;
return total;
}
int getNumColors(int symbolType) {
int total = 0;
for (auto& pair : symbols[symbolType]) total += 1;
return total;
}
bool any(int symbolType) { return symbols[symbolType].size() > 0; }
int popRandomSymbol() {
std::vector<int> types;
Expand Down