mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-03 03:07:56 +00:00
Code Issues Releases Wiki Activity

show map type, improved expansion

Browse Source
This commit is contained in:
Zeno Rogue
2024-11-14 18:21:49 +01:00
parent 67b3a35f1f
commit d2166aef08
6 changed files with 98 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
expansion.cpp
View File

@@ -732,6 +732,19 @@ string produce_coef_formula(vector<int> coef) {
}
EX bool auto_extend = true;
EX bool use_sight_range_instead = true;
EX int count_max_cells = 100000;
EX int count_max_dist = 999;
void configure_counter() {
dialog::init("");
add_edit(use_analyzer);
add_edit(count_max_dist);
add_edit(count_max_cells);
add_edit(use_sight_range_instead);
dialog::display();
}
void expansion_analyzer::view_distances_dialog() {
static int lastticks;
@@ -749,8 +762,16 @@ void expansion_analyzer::view_distances_dialog() {
auto& expansion = get_expansion();
bool really_use_analyzer = use_analyzer && sizes_known();
bool nomore = false;
bool knowall = false;
if(really_use_analyzer) {
dialog::addSelItem(XLAT("based on analysis"),
reg3::exact_rules() ? XLAT("3D rules") :
currentmap->strict_tree_rules() ? XLAT("generated rules") :
XLAT("built-in rules"), 'A'
);
dialog::add_action_push(configure_counter);
int t;
if(reg3::exact_rules() || currentmap->strict_tree_rules()) {
if(!N) preliminary_grouping();
@@ -762,33 +783,47 @@ void expansion_analyzer::view_distances_dialog() {
qty[r] = expansion.get_descendants(r, t);
}
else {
int count_range = (GDIM == 2 && use_sight_range_instead) ? get_sightrange() : count_max_dist;
count_range = min(count_range, count_max_dist);
count_range = min(count_range, maxlen-1);
celllister cl(cwt.at, count_range, count_max_cells, NULL);
if(cl.reason == celllister::srAll) knowall = true;
if(cl.reason == celllister::srCount) count_range = cl.dists.back();
if(distance_from == dfPlayer) {
celllister cl(cwt.at, closed_manifold ? maxlen-1 : gamerange(), 100000, NULL);
for(int d: cl.dists)
if(d >= 0 && d < maxlen) qty[d]++;
}
else {
celllister cl(cwt.at, closed_manifold ? maxlen-1 : gamerange(), 100000, NULL);
for(cell *c: cl.lst) if((not_only_descendants || is_descendant(c)) && curr_dist(c) < maxlen) qty[curr_dist(c)]++;
}
dialog::addSelItem(XLAT("cell counting range"), its(count_range), 'A');
dialog::add_action_push(configure_counter);
#if !CAP_GMP
if(sizes_known() && !not_only_descendants) {
if((sizes_known() || bt::in()) && !not_only_descendants && !knowall) {
find_coefficients();
if(gamerange()+1 >= valid_from && coefficients_known == 2) {
for(int i=gamerange()+1; i<maxlen; i++)
if(count_range+1 >= valid_from && coefficients_known == 2) {
for(int i=count_range+1; i<maxlen; i++)
for(int j=0; j<isize(coef); j++) {
qty[i].addmul(qty[i-1-j], coef[j]);
}
}
}
else {
maxlen = min(maxlen, count_range+1);
if(maxlen == count_range+1) nomore = true;
}
#endif
}
dialog::start_list(1600, 1600, 'a');
for(int i=0; i<maxlen; i++) if(!qty[i].digits.empty()) {
bool was_zero = false;
for(int i=0; i<maxlen; i++) if(!qty[i].digits.empty() || !was_zero) {
dialog::addSelItem(qty[i].get_str(100), " " + its(i), dialog::list_fake_key);
auto& last = dialog::lastItem();
last.color = last.colorv = distcolors[i];
was_zero = qty[i].digits.empty();
}
dialog::end_list();
@@ -825,7 +860,7 @@ void expansion_analyzer::view_distances_dialog() {
});
dialog::display();
if(auto_extend && dialog::list_skip + dialog::list_actual_size == dialog::list_full_size) last_distance++;
if(auto_extend && dialog::list_skip + dialog::list_actual_size == dialog::list_full_size && !was_zero && !nomore && !knowall) last_distance++;
}
EX void enable_viewdists() {
@@ -845,7 +880,6 @@ bool expansion_handleKey(int sym, int uni) {
dialog::handleNavigation(sym, uni);
if(uni == 'S' && (cmode & sm::EXPANSION)) scrolling_distances = !scrolling_distances;
else if(uni == 'C') pushScreen(viewdist_configure_dialog);
else if(uni == 'A' && (cmode & sm::EXPANSION)) use_analyzer = !use_analyzer;
else if(sym == SDLK_ESCAPE) dialog::list_skip = 0, viewdists = false;
else return false;
return true;