mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-23 17:44:07 +00:00
Code Issues Releases Wiki Activity

no other emeraldval in 535

Browse Source
This commit is contained in:
Zeno Rogue 2020-01-29 18:20:14 +01:00
parent 5ba7b4ce11
commit c925dc162c
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
reg3.cpp
View File

@ -918,9 +918,12 @@ EX namespace reg3 {
auto &nles = nonlooping_earlier_states; auto &nles = nonlooping_earlier_states;
nles.clear(); nles.clear();
vector<address> bfs; vector<address> bfs;
for(int i=0; i<isize(quotient_map->allh); i++) int qty = isize(quotient_map->allh);
if(geometry == gSpace535) qty = 1;
for(int i=0; i<qty; i++)
bfs.emplace_back(i, root[i]); bfs.emplace_back(i, root[i]);
auto mov = [&] (int fv, int d) { auto mov = [&] (int fv, int d) {
if(geometry == gSpace535) return 0;
return quotient_map->allh[fv]->move(d)->fieldval; return quotient_map->allh[fv]->move(d)->fieldval;
}; };
int qstate = isize(children) / S7; int qstate = isize(children) / S7;
@ -946,7 +949,7 @@ EX namespace reg3 {
DEBB(DF_GEOM, ("q2 = ", q2)); DEBB(DF_GEOM, ("q2 = ", q2));
bfs = {}; bfs = {};
for(int i=0; i<isize(quotient_map->allh); i++) for(int i=0; i<qty; i++)
bfs.emplace_back(i, root[i]); bfs.emplace_back(i, root[i]);
for(int i=0; i<isize(bfs); i++) { for(int i=0; i<isize(bfs); i++) {
address last = bfs[i]; address last = bfs[i];
@ -1029,6 +1032,11 @@ EX namespace reg3 {
vector<short> evmemo; vector<short> evmemo;
void find_emeraldval(heptagon *target, heptagon *parent, int d) { void find_emeraldval(heptagon *target, heptagon *parent, int d) {
if(geometry == gSpace535) {
target->emeraldval = target->fieldval;
target->zebraval = 0;
return;
}
auto& cr = cgi.cellrotations; auto& cr = cgi.cellrotations;
if(evmemo.empty()) { if(evmemo.empty()) {
println(hlog, "starting"); println(hlog, "starting");
@ -1110,7 +1118,9 @@ EX namespace reg3 {
res->fieldval = fv; res->fieldval = fv;
res->distance = parent->distance - 1; res->distance = parent->distance - 1;
vector<int> possible; vector<int> possible;
for(auto s: nonlooping_earlier_states[{int(parent->fieldval), id}]) possible.push_back(s.second); int pfv = parent->fieldval;
if(geometry == gSpace535) pfv = 0;
for(auto s: nonlooping_earlier_states[{pfv, id}]) possible.push_back(s.second);
id1 = hrand_elt(possible, 0); id1 = hrand_elt(possible, 0);
res->fiftyval = id1; res->fiftyval = id1;
find_emeraldval(res, parent, d); find_emeraldval(res, parent, d);
@ -1197,13 +1207,14 @@ EX hrmap *new_alt_map(heptagon *o) {
EX void link_structures(heptagon *h, heptagon *alt, hstate firststate) { EX void link_structures(heptagon *h, heptagon *alt, hstate firststate) {
auto cm = (hrmap_reg3_rule*) currentmap; auto cm = (hrmap_reg3_rule*) currentmap;
alt->fieldval = h->fieldval; alt->fieldval = h->fieldval;
if(geometry == gSpace535) alt->fieldval = 0;
if(firststate == hsOrigin) { if(firststate == hsOrigin) {
alt->fiftyval = cm->root[alt->fieldval]; alt->fiftyval = cm->root[alt->fieldval];
return; return;
} }
vector<int> choices; vector<int> choices;
for(auto p: cm->nonlooping_earlier_states) for(auto p: cm->nonlooping_earlier_states)
if(p.first.first == h->fieldval) if(p.first.first == alt->fieldval)
choices.push_back(p.first.second); choices.push_back(p.first.second);
vector<int> choices2; vector<int> choices2;
for(auto c: choices) { for(auto c: choices) {
@ -1214,7 +1225,7 @@ EX void link_structures(heptagon *h, heptagon *alt, hstate firststate) {
ok = false; ok = false;
if(ok) choices2.push_back(c); if(ok) choices2.push_back(c);
} }
alt->fiftyval = hrand_elt(choices, -1); alt->fiftyval = hrand_elt(choices2, -1);
} }
EX bool reg3_rule_available = true; EX bool reg3_rule_available = true;