mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 22:12:59 +00:00
Code Issues Releases Wiki Activity

fixed the key being generated on ivy

Browse Source
This commit is contained in:
Zeno Rogue
2024-04-08 00:45:03 +02:00
parent 0708c0e2bc
commit 0323e4100e
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mapeffects.cpp
View File

@@ -745,18 +745,27 @@ EX void checkTide(cell *c) {
#endif #endif
} }
EX bool makeEmpty(cell *c) { EX bool makeNoMonster(cell *c) {
changes.ccell(c);
if(c->monst != moPrincess) {
if(isAnyIvy(c->monst)) killMonster(c, moPlayer, 0); if(isAnyIvy(c->monst)) killMonster(c, moPlayer, 0);
else if(c->monst == moPair) { else if(c->monst == moPair) {
changes.ccell(c->move(c->mondir));
if(c->move(c->mondir)->monst == moPair) if(c->move(c->mondir)->monst == moPair)
c->move(c->mondir)->monst = moNone; c->move(c->mondir)->monst = moNone;
} }
else if(isWorm(c->monst)) { else if(isWorm(c->monst)) {
if(!items[itOrbDomination]) return false; if(!items[itOrbDomination]) return false;
} }
else if(isMultitile(c->monst)) {
return false;
}
else c->monst = moNone; else c->monst = moNone;
return true;
}
EX bool makeEmpty(cell *c) {
if(c->monst != moPrincess) {
if(!makeNoMonster(c)) return false;
} }
if(c->land == laCanvas) ; if(c->land == laCanvas) ;

5
yendor.cpp
View File

@@ -278,10 +278,12 @@ EX namespace yendor {
goto retry; goto retry;
} }
auto rollbacks = std::move(changes.rollbacks);
for(int i=-1; i<key->type; i++) { for(int i=-1; i<key->type; i++) {
cell *c2 = i >= 0 ? key->move(i) : key; cell *c2 = i >= 0 ? key->move(i) : key;
checkTide(c2); checkTide(c2);
c2->monst = moNone; c2->item = itNone; makeNoMonster(c2);
c2->item = itNone;
if(!passable(c2, NULL, P_MIRROR | P_MONSTER)) { if(!passable(c2, NULL, P_MIRROR | P_MONSTER)) {
if(c2->wall == waCavewall) c2->wall = waCavefloor; if(c2->wall == waCavewall) c2->wall = waCavefloor;
else if(c2->wall == waDeadwall) c2->wall = waDeadfloor2; else if(c2->wall == waDeadwall) c2->wall = waDeadfloor2;
@@ -311,6 +313,7 @@ EX namespace yendor {
if(c2->land == laMirrorWall && i == -1) if(c2->land == laMirrorWall && i == -1)
c2->wall = waNone; c2->wall = waNone;
} }
changes.rollbacks = std::move(rollbacks);
key->item = itKey; key->item = itKey;
bool split_found = false; bool split_found = false;