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

changes from zenorogue/hyperrogue#27

Browse Source
This commit is contained in:
Zeno Rogue 2018-06-12 22:40:06 +02:00
parent 520e5e5dbb
commit 50eaba3efd
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debug.cpp
View File

@ -191,9 +191,13 @@ bool applyCheat(char u, cell *c = NULL) {
return true; return true;
} }
if(u == 'Z') { if(u == 'Z') {
if (flipplayer) {
cwt += cwt.c->type/2;
flipplayer = false; flipplayer = false;
mirror::act(1, mirror::SPINSINGLE); }
cwt++; cwt++;
mirror::act(1, mirror::SPINSINGLE);
wavephase = (1+wavephase) & 7; wavephase = (1+wavephase) & 7;
if(shmup::on) shmup::pc[0]->at = Id; if(shmup::on) shmup::pc[0]->at = Id;
return true; return true;

8
flags.cpp
View File

@ -213,10 +213,6 @@ bool isDemon(cell *c) {
return isDemon(c->monst); return isDemon(c->monst);
} }
bool isWormHead(eMonster m) {
return m == moWorm || m == moTentacle || m == moHexSnake || m == moDragonHead;
}
bool isWorm(eMonster m) { bool isWorm(eMonster m) {
return m == moWorm || m == moWormtail || m == moWormwait || return m == moWorm || m == moWormtail || m == moWormwait ||
m == moTentacle || m == moTentacletail || m == moTentaclewait || m == moTentacle || m == moTentacletail || m == moTentaclewait ||
@ -651,10 +647,6 @@ bool survivesFire(eMonster m) {
isDragon(m) || m == moShadow; isDragon(m) || m == moShadow;
} }
/* bool survivesMine(eMonster m) {
return ignoresPlates(m) || isFlying(m);
} */
bool survivesWall(eMonster m) { bool survivesWall(eMonster m) {
return isGhost(m); return isGhost(m);
} }

4
game.cpp
View File

@ -1422,12 +1422,14 @@ bool monstersnear(cell *c, cell *nocount, eMonster who, cell *pushto, cell *come
comefrom->wall = w; comefrom->wall = w;
c->wall = waBigStatue; c->wall = waBigStatue;
} }
if(who == moPlayer && c->wall == waThumperOn) { else if(who == moPlayer && c->wall == waThumperOn) {
c->wall = waNone; c->wall = waNone;
b = monstersnear2(); b = monstersnear2();
c->wall = waThumperOn; c->wall = waThumperOn;
} }
else {
b = monstersnear2(); b = monstersnear2();
}
stalemate::moves.pop_back(); stalemate::moves.pop_back();
return b; return b;
} }

1
hyper.h
View File

@ -461,7 +461,6 @@ bool isCrossroads(eLand l);
enum orbAction { roMouse, roKeyboard, roCheck, roMouseForce, roMultiCheck, roMultiGo }; enum orbAction { roMouse, roKeyboard, roCheck, roMouseForce, roMultiCheck, roMultiGo };
void moveItem (cell *from, cell *to, bool activateYendor); void moveItem (cell *from, cell *to, bool activateYendor);
void uncoverMines(cell *c, int lev, int dist); void uncoverMines(cell *c, int lev, int dist);
bool survivesMine(eMonster m);
void killMonster(cell *c, eMonster who_killed, flagtype flags = 0); void killMonster(cell *c, eMonster who_killed, flagtype flags = 0);
void toggleGates(cell *ct, eWall type, int rad); void toggleGates(cell *ct, eWall type, int rad);
bool destroyHalfvine(cell *c, eWall newwall = waNone, int tval = 6); bool destroyHalfvine(cell *c, eWall newwall = waNone, int tval = 6);