mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-07 17:23:00 +00:00
Code Issues Releases Wiki Activity

Orb of Magnetism. Orb of Phasing. Also fixed Aether in Whirlpool.

Browse Source
This commit is contained in:
Zeno Rogue
2017-12-30 23:47:10 +01:00
parent 3d4e7f501a
commit 9d1fe00d8f
9 changed files with 108 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
complex.cpp
View File

@@ -139,8 +139,7 @@ namespace whirlwind {
animateMovement(whirlline[i+1], whirlline[i], LAYER_BOAT);
}
for(int i=0; i<z; i++)
if(isPlayerOn(whirlline[i]) && whirlline[i]->item)
collectItem(whirlline[i], true);
pickupMovedItems(whirlline[i]);
}
void move() {
@@ -985,6 +984,8 @@ namespace whirlpool {
if(wfrom->item == itKey || wfrom->item == itOrbYendor)
for(int i=0; i<wto->type; i++) createMov(wto, i);
moveItem(wfrom, wto, false);
pickupMovedItems(wfrom);
pickupMovedItems(wto);
}
if(wto && !wfrom)
@@ -2184,7 +2185,7 @@ void livecaves() {
}
if(c->aitmp < 0 && c->wall == waBoat) c->wall = waStrandedBoat;
if(c->aitmp < 0 && c->wall == waSea) c->wall = waNone;
}
}
}
for(int i=0; i<size(bringlife); i++) {