1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-18 03:09:59 +00:00

PTM/Yendor scores should be saved correctly for the new geometries

This commit is contained in:
Zeno Rogue 2018-01-06 21:45:13 +01:00
parent b9ab9a1ae8
commit 2a923d0e6d
3 changed files with 18 additions and 14 deletions

View File

@ -1648,19 +1648,19 @@ vector<eLand> randlands = {
};
geometryinfo ginf[gGUARD] = {
{"standard", "HR", 7, 3, 0, gcHyperbolic, {{7, 5}}},
{"Euclidean", "euclid", 6, 3, 0, gcEuclid, {{7, FORBIDDEN}}},
{"spherical", "sphere", 5, 3, 0, gcSphere, {{SEE_ALL, SEE_ALL}}},
{"elliptic", "elliptic", 5, 3, qELLIP, gcSphere, {{SEE_ALL, SEE_ALL}}},
{"Zebra quotient", "Zebra", 7, 3, qZEBRA, gcHyperbolic, {{7, 5}}},
{"field quotient", "field", 7, 3, qFIELD, gcHyperbolic, {{7, 5}}},
{"torus/Klein bottle", "torus", 6, 3, qTORUS, gcEuclid, {{7, FORBIDDEN}}},
{"octagons", "oct", 8, 3, 0, gcHyperbolic, {{6, 4}}},
{"four pentagons", "4x5", 5, 4, 0, gcHyperbolic, {{6, 4}}},
{"four hexagons", "4x6", 6, 4, 0, gcHyperbolic, {{5, 3}}},
{"four heptagons", "4x7", 7, 4, 0, gcHyperbolic, {{4, 3}}},
{"cube", "3x4", 4, 3, 0, gcSphere, {{SEE_ALL, SEE_ALL}}},
{"tetrahedron (buggy)", "3x3", 3, 3, 0, gcSphere, {{SEE_ALL, SEE_ALL}}},
{"square grid", "4x4", 4, 4, 0, gcEuclid, {{7, 7}}}
{"standard", "HR", 7, 3, 0, gcHyperbolic, 0, {{7, 5}}},
{"Euclidean", "euclid", 6, 3, 0, gcEuclid, 0, {{7, FORBIDDEN}}},
{"spherical", "sphere", 5, 3, 0, gcSphere, 0, {{SEE_ALL, SEE_ALL}}},
{"elliptic", "elliptic", 5, 3, qELLIP, gcSphere, 0, {{SEE_ALL, SEE_ALL}}},
{"Zebra quotient", "Zebra", 7, 3, qZEBRA, gcHyperbolic, 0x00400, {{7, 5}}},
{"field quotient", "field", 7, 3, qFIELD, gcHyperbolic, 0x00200, {{7, 5}}},
{"torus/Klein bottle", "torus", 6, 3, qTORUS, gcEuclid, 0x00600, {{7, FORBIDDEN}}},
{"octagons", "oct", 8, 3, 0, gcHyperbolic, 0x08000, {{6, 4}}},
{"four pentagons", "4x5", 5, 4, 0, gcHyperbolic, 0x08200, {{6, 4}}},
{"four hexagons", "4x6", 6, 4, 0, gcHyperbolic, 0x08400, {{5, 3}}},
{"four heptagons", "4x7", 7, 4, 0, gcHyperbolic, 0x08600, {{4, 3}}},
{"cube", "3x4", 4, 3, 0, gcSphere, 0x10000, {{SEE_ALL, SEE_ALL}}},
{"tetrahedron (buggy)", "3x3", 3, 3, 0, gcSphere, 0x10200, {{SEE_ALL, SEE_ALL}}},
{"square grid", "4x4", 4, 4, 0, gcEuclid, 0x10400, {{7, 7}}}
};

View File

@ -206,6 +206,7 @@ struct geometryinfo {
int quotientstyle;
eGeometryClass cclass;
array<int,2> distlimit; // chamfered, non-chamfered
int xcode;
};
static const int qZEBRA = 1;

View File

@ -842,6 +842,9 @@ int modecode() {
if(tour::on) mct += 8192;
#endif
if(numplayers() == 7) mct += 16384;
mct += ginf[geometry].xcode;
return mct;
}