mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-18 19:24:48 +00:00
Code Issues Releases Wiki Activity

3d:: mimics (mirrors not generated correctly yet)

Browse Source
This commit is contained in:
Zeno Rogue 2019-03-09 18:14:38 +01:00
parent 10223d33b9
commit c57679c79f
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
complex.cpp
View File

@ -1196,6 +1196,14 @@ namespace mirror {
cw.mirrored = !cw.mirrored; cw.mirrored = !cw.mirrored;
cell *c = cw.at; cell *c = cw.at;
#if MAXMDIM >= 4
if(DIM == 3 && !binarytiling && shmup::on) {
for(int i=0; i<cw.at->type; i++)
createMirror(cw + i + wstep - i, cpid);
return;
}
#endif
#if CAP_GP #if CAP_GP
if(GOLDBERG) { if(GOLDBERG) {
for(int i=0; i<cw.at->type; i++) { for(int i=0; i<cw.at->type; i++) {
@ -1219,6 +1227,13 @@ namespace mirror {
return; return;
} }
#endif #endif
#if MAXMDIM >= 4
if(DIM == 3 && !binarytiling && shmup::on) {
for(int i=0; i<cw.at->type; i++)
createMirror(cw + i + wstep - i, cpid);
return;
}
#endif
#if CAP_GP #if CAP_GP
if(GOLDBERG && !(S7 & 1)) { if(GOLDBERG && !(S7 & 1)) {
for(int i=0; i<cw.at->type; i++) { for(int i=0; i<cw.at->type; i++) {
@ -1258,7 +1273,6 @@ namespace mirror {
} }
void createHere(cellwalker cw, int cpid) { void createHere(cellwalker cw, int cpid) {
if(DIM == 3) return;
if(!cw.at) return; if(!cw.at) return;
if(cw.at->wall == waCloud) if(cw.at->wall == waCloud)
createMirages(cw, cpid); createMirages(cw, cpid);

19
shmup.cpp
View File

@ -1224,7 +1224,7 @@ void degradeDemons() {
} }
// we need these for the Mimics! // we need these for the Mimics!
double playerturn[MAXPLAYER], playergo[MAXPLAYER], playerstrafe[MAXPLAYER], playerturny[MAXPLAYER]; double playerturn[MAXPLAYER], playergo[MAXPLAYER], playerstrafe[MAXPLAYER], playerturny[MAXPLAYER], playergoturn[MAXPLAYER];
bool playerfire[MAXPLAYER]; bool playerfire[MAXPLAYER];
void awakenMimics(monster *m, cell *c2) { void awakenMimics(monster *m, cell *c2) {
@ -1793,6 +1793,8 @@ void movePlayer(monster *m, int delta) {
go = true; go = true;
playergoturn[cpid] = igospan[go];
if(DIM == 3) if(DIM == 3)
nat = nat1 * cpush(0, playerstrafe[cpid]) * cpush(2, playergo[cpid]) * cspin(0, 2, playerturn[cpid]) * cspin(1, 2, playerturny[cpid]); nat = nat1 * cpush(0, playerstrafe[cpid]) * cpush(2, playergo[cpid]) * cspin(0, 2, playerturn[cpid]) * cspin(1, 2, playerturny[cpid]);
else if(playergo[cpid]) else if(playergo[cpid])
@ -1886,6 +1888,11 @@ void movePlayer(monster *m, int delta) {
if(!go || abs(playergo[cpid]) < 1e-3 || abs(playerturn[cpid]) > 1e-3) bulltime[cpid] = curtime; if(!go || abs(playergo[cpid]) < 1e-3 || abs(playerturn[cpid]) > 1e-3) bulltime[cpid] = curtime;
if(!go) {
playergo[cpid] = playergoturn[cpid] = playerstrafe[cpid] = 0;
if(DIM == 3) playerturn[cpid] = playerturny[cpid] = 0;
}
if(go) { if(go) {
if(DIM == 3) if(DIM == 3)
@ -2157,7 +2164,11 @@ void moveMimic(monster *m) {
m->footphase = getPlayer()->footphase; m->footphase = getPlayer()->footphase;
// no need to care about Mirror images, as they already have their 'at' matrix reversed :| // no need to care about Mirror images, as they already have their 'at' matrix reversed :|
nat = nat * spin(playerturn[cpid]) * xpush(playergo[cpid]);
if(DIM == 3)
nat = nat * cpush(0, playerstrafe[cpid]) * cpush(2, playergo[cpid]) * cspin(0, 2, playerturn[cpid]) * cspin(1, 2, playerturny[cpid]);
else
nat = nat * spin(playerturn[cpid] + playergoturn[cpid]) * xpush(playergo[cpid]) * spin(-playergoturn[cpid]);
cell *c2 = m->findbase(nat); cell *c2 = m->findbase(nat);
reflect(c2, m->base, nat); reflect(c2, m->base, nat);
@ -3566,7 +3577,9 @@ bool drawMonster(const transmatrix& V, cell *c, const transmatrix*& Vboat, trans
if(hasHitpoints(m->type)) if(hasHitpoints(m->type))
c->hitpoints = m->hitpoints; c->hitpoints = m->hitpoints;
if(m->type == moTortoise) tortoise::emap[c] = getBits(m->torigin); if(m->type == moTortoise) tortoise::emap[c] = getBits(m->torigin);
if(DIM == 3) if(m->type == moMimic && DIM == 3)
drawMonsterType(m->type, c, view * spin(-M_PI/2), col, m->footphase);
else if(DIM == 3)
drawMonsterType(m->type, c, view * cspin(0, 2, M_PI/2), col, m->footphase); drawMonsterType(m->type, c, view * cspin(0, 2, M_PI/2), col, m->footphase);
else else
drawMonsterType(m->type, c, view, col, m->footphase); drawMonsterType(m->type, c, view, col, m->footphase);