mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2026-04-26 10:41:22 +00:00
Code Issues Releases Wiki Activity

changed chamfered to bitruncated

Browse Source
This commit is contained in:
Zeno Rogue
2018-01-06 22:34:03 +01:00
parent 1427147fbc
commit 5bf6d54c7d
40 changed files with 357 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system.cpp
View File

@@ -114,7 +114,7 @@ void initgame() {
if(firstland == laElementalWall) cwt.c->land = randomElementalLand();
if(tactic::on && (isGravityLand(firstland) || firstland == laOcean) && firstland != laMountain)
cwt.c->land = nonchamfered ? laCrossroads : laCrossroads2;
cwt.c->land = nonbitrunc ? laCrossroads : laCrossroads2;
createMov(cwt.c, 0);
setdist(cwt.c, BARLEV, NULL);
@@ -547,7 +547,7 @@ void applyBoxes() {
applyBoxBool(survivalist);
if(loadingHi) applyBoxI(itLotus);
else applyBoxNum(truelotus, "lotus/escape");
applyBoxBool(nonchamfered, "heptagons only");
applyBoxBool(nonbitrunc, "heptagons only");
applyBoxI(itRose);
applyBoxOrb(itOrbBeauty);
applyBoxI(itCoral);
@@ -686,7 +686,7 @@ void loadBoxHigh() {
dynamicval<eGeometry> sp2(geometry, (eGeometry) savebox[116]);
dynamicval<bool> sp3(shmup::on, savebox[119]);
dynamicval<bool> sp4(chaosmode, savebox[196]);
dynamicval<bool> sp5(nonchamfered, savebox[186]);
dynamicval<bool> sp5(nonbitrunc, savebox[186]);
if(savebox[238]) geometry = gSphere;
if(savebox[239]) geometry = gElliptic;
@@ -823,7 +823,7 @@ void saveStats(bool emergency = false) {
fprintf(f, "Total enemies killed: %d\n", tkills());
fprintf(f, "cells generated: %d\n", cellcount);
if(pureHardcore()) fprintf(f, "Pure hardcore mode\n");
if(nonchamfered) fprintf(f, "Heptagons only mode\n");
if(nonbitrunc) fprintf(f, "Heptagons only mode\n");
if(chaosmode) fprintf(f, "Chaos mode\n");
if(shmup::on) fprintf(f, "Shoot-em up mode\n");
if(inv::on) fprintf(f, "Inventory mode\n");
@@ -1021,7 +1021,7 @@ namespace gamestack {
gdn.View = View;
gdn.geometry = geometry;
gdn.shmup = shmup::on;
gdn.hepta = nonchamfered;
gdn.hepta = nonbitrunc;
gd.push_back(gdn);
}
@@ -1032,7 +1032,7 @@ namespace gamestack {
viewctr = gdn.viewctr;
View = gdn.View;
geometry = gdn.geometry;
nonchamfered = gdn.hepta;
nonbitrunc = gdn.hepta;
if(shmup::on) shmup::clearMonsters();
shmup::on = gdn.shmup;
resetGeometry();
@@ -1113,7 +1113,7 @@ void restartGame(char switchWhat, bool push, bool keep_screens) {
if(switchWhat == 'T') {
geometry = gNormal;
yendor::on = tactic::on = princess::challenge = peace::on = inv::on = false;
chaosmode = nonchamfered = randomPatternsMode = false;
chaosmode = nonbitrunc = randomPatternsMode = false;
shmup::on = false;
resetGeometry();
tour::on = !tour::on;
@@ -1121,7 +1121,7 @@ void restartGame(char switchWhat, bool push, bool keep_screens) {
#endif
if(switchWhat == '7') {
if(euclid6) geometry = gNormal;
nonchamfered = !nonchamfered;
nonbitrunc = !nonbitrunc;
resetGeometry();
#if CAP_TEXTURE
if(texture::tstate == texture::tsActive)
@@ -1134,7 +1134,7 @@ void restartGame(char switchWhat, bool push, bool keep_screens) {
if(geometry == targetgeometry) geometry = gNormal;
else geometry = targetgeometry;
if(chaosmode && (euclid || sphere || quotient)) chaosmode = false;
if(nonchamfered && euclid6) nonchamfered = false;
if(nonbitrunc && euclid6) nonbitrunc = false;
resetGeometry();
#if CAP_TEXTURE