mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-18 20:10:10 +00:00
Code Issues Releases Wiki Activity

infinite generation for single-land Camelot now only happens in hyperbolic geometry (also fixes the missing Grail in Crystal)

Browse Source
This commit is contained in:
Zeno Rogue 2022-02-21 20:02:58 +01:00
parent 67a19d93bb
commit 9c39688b49
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bigstuff.cpp
View File

@ -24,6 +24,11 @@ EX int newRoundTableRadius() {
} }
#if CAP_COMPLEX2 #if CAP_COMPLEX2
/** should we generate 'Castle Anthrax' instead of Camelot (an infinite sequence of horocyclic Camelot-likes */
EX bool anthrax() {
return ls::single() && hyperbolic && !cryst;
}
EX int getAnthraxData(cell *c, bool b) { EX int getAnthraxData(cell *c, bool b) {
int d = celldistAlt(c); int d = celldistAlt(c);
int rad = 28 + 3 * camelot::anthraxBonus; int rad = 28 + 3 * camelot::anthraxBonus;
@ -62,7 +67,7 @@ EX int celldistAltRelative(cell *c) {
return celldist(c) - 3; return celldist(c) - 3;
} }
#if CAP_COMPLEX2 #if CAP_COMPLEX2
if(ls::single()) return getAnthraxData(c, false); if(anthrax()) return getAnthraxData(c, false);
#endif #endif
return celldistAlt(c) - roundTableRadius(c); return celldistAlt(c) - roundTableRadius(c);
} }
@ -1777,7 +1782,7 @@ EX eMonster camelot_monster() {
EX void buildCamelot(cell *c) { EX void buildCamelot(cell *c) {
int d = celldistAltRelative(c); int d = celldistAltRelative(c);
if(ls::single() || (d <= 14 && roundTableRadius(c) > 20)) { if(anthrax() || (d <= 14 && roundTableRadius(c) > 20)) {
gen_alt(c); gen_alt(c);
preventbarriers(c); preventbarriers(c);
if(d == 10) { if(d == 10) {
@ -1817,7 +1822,8 @@ EX void buildCamelot(cell *c) {
} }
} }
if(d == 0) c->wall = waRoundTable; if(d == 0) c->wall = waRoundTable;
if(celldistAlt(c) == 0 && !ls::single()) c->item = itHolyGrail; if(celldistAlt(c) == 0 && !anthrax()) println(hlog, "placed Holy Grail on ", c);
if(celldistAlt(c) == 0 && !anthrax()) c->item = itHolyGrail;
if(d < 0 && hrand(7000) <= 10 + items[itHolyGrail] * 5) if(d < 0 && hrand(7000) <= 10 + items[itHolyGrail] * 5)
c->monst = camelot_monster(); c->monst = camelot_monster();
if(d == 1) { if(d == 1) {
@ -1829,12 +1835,12 @@ EX void buildCamelot(cell *c) {
if(c->move(i) && celldistAltRelative(c->move(i)) < d) if(c->move(i) && celldistAltRelative(c->move(i)) < d)
c->mondir = (i+3) % 6; c->mondir = (i+3) % 6;
} }
if(ls::single() && d >= 2 && d <= 8 && hrand(1000) < 10) if(anthrax() && d >= 2 && d <= 8 && hrand(1000) < 10)
c->item = itOrbSafety; c->item = itOrbSafety;
if(d == 5 && ls::single()) if(d == 5 && anthrax())
c->item = itGreenStone; c->item = itGreenStone;
if(d <= 10) c->land = laCamelot; if(d <= 10) c->land = laCamelot;
if(d > 10 && !eubinary && !ls::single()) { if(d > 10 && !eubinary && !anthrax()) {
setland(c, eLand(altmap::orig_land(c->master->alt->alt))); setland(c, eLand(altmap::orig_land(c->master->alt->alt)));
if(c->land == laNone) printf("Camelot\n"); // NONEDEBUG if(c->land == laNone) printf("Camelot\n"); // NONEDEBUG
} }