1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00

fixed the West Wall being not inaccessible from some lands

This commit is contained in:
Zeno Rogue 2024-04-08 00:58:34 +02:00
parent 521b452436
commit 10646933db
2 changed files with 6 additions and 2 deletions

View File

@ -703,6 +703,9 @@ EX int coastval(cell *c, eLand base) {
if(!c->landparam) return UNKNOWN; if(!c->landparam) return UNKNOWN;
return c->landparam & 255; return c->landparam & 255;
} }
else if(base == laWestWall) {
if(c->land != base) return 0;
}
else { else {
if(c->land == laOceanWall || c->land == laCaribbean || c->land == laWhirlpool || if(c->land == laOceanWall || c->land == laCaribbean || c->land == laWhirlpool ||
c->land == laLivefjord || c->land == laWarpSea || c->land == laKraken || c->land == laDocks || c->land == laBrownian) c->land == laLivefjord || c->land == laWarpSea || c->land == laKraken || c->land == laDocks || c->land == laBrownian)

View File

@ -575,6 +575,7 @@ EX bool destroyHalfvine(cell *c, eWall newwall IS(waNone), int tval IS(6)) {
} }
EX int coastvalEdge(cell *c) { return coastval(c, laIvoryTower); } EX int coastvalEdge(cell *c) { return coastval(c, laIvoryTower); }
EX int coastvalWest(cell *c) { return coastval(c, laWestWall); }
EX int gravityLevel(cell *c) { EX int gravityLevel(cell *c) {
if(c->land == laIvoryTower && ls::hv_structure()) if(c->land == laIvoryTower && ls::hv_structure())
@ -601,10 +602,10 @@ EX int gravityLevelDiff(cell *c, cell *d) {
if(shmup::on) return 0; if(shmup::on) return 0;
int nid = neighborId(c, d); int nid = neighborId(c, d);
int id1 = parent_id(c, 1, coastvalEdge) + 1; int id1 = parent_id(c, 1, coastvalWest) + 1;
int di1 = angledist(c->type, id1, nid); int di1 = angledist(c->type, id1, nid);
int id2 = parent_id(c, -1, coastvalEdge) - 1; int id2 = parent_id(c, -1, coastvalWest) - 1;
int di2 = angledist(c->type, id2, nid); int di2 = angledist(c->type, id2, nid);
if(di1 < di2) return 1; if(di1 < di2) return 1;