Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Track more missing game state in saves. #362

Merged
merged 4 commits into from
Feb 28, 2024
Merged

Track more missing game state in saves. #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80f90de
Remove spurious semicolon.
Feb 25, 2024
0f84812
Track fatigue across save/load.
Feb 24, 2024
7d04b0c
Record snake oil in savefile.
Feb 24, 2024
e31c9dc
Record moFriendlyGhost kills in savefile.
Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion achievement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ EX void achievement_gain_once(const string& s, char flags IS(0)) {

namespace rg {
char check(bool b, char val = special_geometry) { return b ? val : fail; }
};
}

EX char specgeom_zebra() { return rg::check(geometry == gZebraQuotient && !disksize && BITRUNCATED && firstland == laDesert); }
EX char specgeom_lovasz() { return rg::check(geometry == gKleinQuartic && variation == eVariation::untruncated && gp::param == gp::loc(1,1) && !disksize && in_lovasz()); }
Expand Down
6 changes: 4 additions & 2 deletions system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,17 +596,19 @@ EX void applyBoxes() {

for(int i=0; i<43; i++) {
if(loading) kills[i] = 0;
bool fake = (i == moREMOVED || i == moLesserM || i == moTentacletail);
if(i == moWormtail) applyBoxM(moCrystalSage);
else if(i == moWormwait) applyBoxM(moFireFairy);
else if(i == moTentacleEscaping) applyBoxM(moMiner);
else if(i == moREMOVED) applyBoxI(itFatigue);
else if(i == moGolemMoved) applyBoxM(moIllusion);
else if(i == moTentacletail) applyBoxI(itSnake);
else if(i == moTentaclewait) applyBoxOrb(itOrbThorns);
else if(i == moGreater) applyBoxOrb(itOrbDragon);
else if(i == moGreaterM) applyBoxOrb(itOrbIllusion);
else if(i == moLesserM) applyBoxM(moFriendlyGhost);
else if(i == moWolfMoved) applyBoxM(moWorldTurtle);
else if(i == moNone) applyBoxNum(kills[i], "icewalls melted");
else applyBoxM(eMonster(i), fake);
else applyBoxM(eMonster(i));
}

if(saving) {
Expand Down
Loading