mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-27 03:47:40 +00:00
Code Issues Releases Wiki Activity

fixed new geometry handling for Archimedean

Browse Source
This commit is contained in:
Zeno Rogue
2019-08-22 12:14:39 +02:00
parent 2f954d0538
commit a03eb0d913
23 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
game.cpp
View File

@@ -2420,7 +2420,7 @@ EX void killMonster(cell *c, eMonster who, flagtype deathflags IS(0)) {
if(m == moPirate && isOnCIsland(c) && c->item == itNone && (
eubinary ||
(c->master->alt && celldistAlt(c) <= 2-getDistLimit()) ||
isHaunted(c->land)) && geometry != gCrystal) {
isHaunted(c->land)) && !cryst) {
bool toomany = false;
for(int i=0; i<c->type; i++) {
cell *c2 = c->move(i);
@@ -7459,7 +7459,7 @@ EX bool in_full_game() {
if(chaosmode) return true;
if(euclid && isCrossroads(specialland)) return true;
if(weirdhyperbolic && specialland == laCrossroads4) return true;
if(geometry == gCrystal && isCrossroads(specialland)) return true;
if(cryst && isCrossroads(specialland)) return true;
if(geometry == gNormal && !NONSTDVAR) return true;
return false;
}
@@ -7495,7 +7495,7 @@ EX void knightFlavorMessage(cell *c2) {
addMessage(XLAT("\"The Holy Grail is in the center of the Round Table.\""));
}
#if CAP_CRYSTAL
else if(msgid == 3 && geometry == gCrystal) {
else if(msgid == 3 && cryst) {
if(crystal::pure())
addMessage(XLAT("\"Each piece of the Round Table is exactly %1 steps away from the Holy Grail.\"", its(roundTableRadius(c2))));
else
@@ -7521,7 +7521,7 @@ EX void knightFlavorMessage(cell *c2) {
string s = "";
if(0) ;
#if CAP_CRYSTAL
else if(geometry == gCrystal)
else if(cryst)
s = crystal::get_table_boundary();
#endif
else if(!quotient)
@@ -7533,7 +7533,7 @@ EX void knightFlavorMessage(cell *c2) {
string s = "";
if(0);
#if CAP_CRYSTAL
else if(geometry == gCrystal)
else if(cryst)
s = crystal::get_table_volume();
#endif
else if(!quotient)