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

spaceship in turn-based mode attack is graphically represented by shooting a tiny missile, not by bumping

Browse Source
This commit is contained in:
Zeno Rogue 2024-10-12 10:39:30 +02:00
parent 831991d87e
commit 75247f9271
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
celldrawer.cpp
View File

@ -2987,7 +2987,9 @@ void celldrawer::draw() {
ld footphase; ld footphase;
applyAnimation(c, Vthrow, footphase, LAYER_THROW); applyAnimation(c, Vthrow, footphase, LAYER_THROW);
eItem it = animations[LAYER_THROW][c].thrown_item; eItem it = animations[LAYER_THROW][c].thrown_item;
drawItemType(it, c, Vthrow, iinf[it].color, 0, false); if(it) drawItemType(it, c, Vthrow, iinf[it].color, 0, false);
eMonster mo = animations[LAYER_THROW][c].thrown_monster;
if(mo) drawMonsterType(mo, c, Vthrow, minf[mo].color, 0, minf[mo].color);
} }
#if CAP_TEXTURE #if CAP_TEXTURE

1
complex.cpp
View File

@ -1472,6 +1472,7 @@ EX namespace mirror {
} }
c->monst = moNone; c->monst = moNone;
} }
if(!fwd) animateCorrectAttack(movei(cw2+wstep), LAYER_SMALL, moMimic);
if(c2->wall == waBigTree) if(c2->wall == waBigTree)
c2->wall = waSmallTree; c2->wall = waSmallTree;
else if(c2->wall == waSmallTree) else if(c2->wall == waSmallTree)

17
graph.cpp
View File

@ -1710,6 +1710,11 @@ EX bool drawMonsterType(eMonster m, cell *where, const shiftmatrix& V1, color_t
return true; return true;
case moBullet: case moBullet:
if(getcs().charid >= 10) {
ShadowV(V, cgi.shKnife);
queuepoly(VBODY, cgi.shMissile, getcs().swordcolor);
return true;
}
ShadowV(V, cgi.shKnife); ShadowV(V, cgi.shKnife);
queuepoly(VBODY * spin270(), cgi.shKnife, getcs().swordcolor); queuepoly(VBODY * spin270(), cgi.shKnife, getcs().swordcolor);
return true; return true;
@ -6102,6 +6107,7 @@ struct animation {
transmatrix attackat; transmatrix attackat;
bool mirrored; bool mirrored;
eItem thrown_item; /** for thrown items */ eItem thrown_item; /** for thrown items */
eMonster thrown_monster; /** for thrown monsters */
}; };
// we need separate animation layers for Orb of Domination and Tentacle+Ghost, // we need separate animation layers for Orb of Domination and Tentacle+Ghost,
@ -6153,7 +6159,7 @@ EX void animateMovement(const movei& m, int layer) {
a.mirrored = !a.mirrored; a.mirrored = !a.mirrored;
} }
EX void animate_item_throw(cell *from, cell *to, eItem it) { EX void animate_item_throw(cell *from, cell *to, eItem it, eMonster mo IS(moNone)) {
bool steps = false; bool steps = false;
again: again:
@ -6169,6 +6175,7 @@ EX void animate_item_throw(cell *from, cell *to, eItem it) {
if(steps) { if(steps) {
animation& a = animations[LAYER_THROW][to]; animation& a = animations[LAYER_THROW][to];
a.thrown_item = it; a.thrown_item = it;
a.thrown_monster = mo;
} }
} }
@ -6188,6 +6195,14 @@ EX void animateAttack(const movei& m, int layer) {
animateAttackOrHug(m, layer, 1, 1/3., 0); animateAttackOrHug(m, layer, 1, 1/3., 0);
} }
EX void animateCorrectAttack(const movei& m, int layer, eMonster who) {
if(among(who, moPlayer, moMimic, moIllusion, moShadow) && getcs().charid >= 10) {
animate_item_throw(m.s, m.t, itNone, moBullet);
return;
}
animateAttackOrHug(m, layer, 1, 1/3., 0);
}
EX void animateHug(const movei& m, int layer) { EX void animateHug(const movei& m, int layer) {
animateAttackOrHug(m, layer, 3, 0.5, -0.0713828 * cgi.scalefactor); animateAttackOrHug(m, layer, 3, 0.5, -0.0713828 * cgi.scalefactor);
} }

6
monstermove.cpp
View File

@ -742,7 +742,7 @@ EX cell *moveNormal(cell *c, flagtype mf) {
} }
else if(m2) { else if(m2) {
attackMonster(c2, AF_NORMAL | AF_MSG, m); attackMonster(c2, AF_NORMAL | AF_MSG, m);
animateAttack(mi, LAYER_SMALL); animateCorrectAttack(mi, LAYER_SMALL, m);
if(m == moFlailer && m2 == moIllusion) if(m == moFlailer && m2 == moIllusion)
attackMonster(c, 0, m2); attackMonster(c, 0, m2);
return c2; return c2;
@ -1156,7 +1156,7 @@ EX void groupmove2(const movei& mi, eMonster movtype, flagtype mf) {
if(!(mf & MF_NOATTACKS)) for(int j=0; j<c->type; j++) if(!(mf & MF_NOATTACKS)) for(int j=0; j<c->type; j++)
if(c->move(j) && canAttack(c, c->monst, c->move(j), c->move(j)->monst, af)) { if(c->move(j) && canAttack(c, c->monst, c->move(j), c->move(j)->monst, af)) {
attackMonster(c->move(j), AF_NORMAL | AF_GETPLAYER | AF_MSG, c->monst); attackMonster(c->move(j), AF_NORMAL | AF_GETPLAYER | AF_MSG, c->monst);
animateAttack(movei(c, j), LAYER_SMALL); animateCorrectAttack(movei(c, j), LAYER_SMALL, c->monst);
onpath_mark(c); onpath_mark(c);
// XLATC eagle // XLATC eagle
return; return;
@ -1738,7 +1738,7 @@ EX void movegolems(flagtype flags) {
else if((flags & AF_CRUSH) && !canAttack(c, m, c2, c2->monst, flags ^ AF_CRUSH ^ AF_MUSTKILL)) else if((flags & AF_CRUSH) && !canAttack(c, m, c2, c2->monst, flags ^ AF_CRUSH ^ AF_MUSTKILL))
markOrb(itOrbEmpathy), markOrb(itOrbSlaying); markOrb(itOrbEmpathy), markOrb(itOrbSlaying);
attackMonster(c2, flags | AF_MSG, m); attackMonster(c2, flags | AF_MSG, m);
animateAttack(movei(c, dir), LAYER_SMALL); animateCorrectAttack(movei(c, dir), LAYER_SMALL, m);
spread_plague(c, c2, dir, m); spread_plague(c, c2, dir, m);
produceGhost(c2, m2, m); produceGhost(c2, m2, m);
sideAttack(c, dir, m, 0); sideAttack(c, dir, m, 0);

4
pcmove.cpp
View File

@ -503,7 +503,7 @@ bool pcmove::swing() {
if(checkonly) return true; if(checkonly) return true;
if(changes.on) changes.commit(); if(changes.on) changes.commit();
animateAttack(mi, LAYER_SMALL); animateCorrectAttack(mi, LAYER_SMALL, moPlayer);
if(survivalist && isHaunted(mi.t->land)) if(survivalist && isHaunted(mi.t->land))
survivalist = false; survivalist = false;
lastmovetype = lmTree; lastmove = mi.t; lastmovetype = lmTree; lastmove = mi.t;
@ -1233,7 +1233,7 @@ bool pcmove::attack() {
produceGhost(c2, m, moPlayer); produceGhost(c2, m, moPlayer);
} }
if(mip.proper()) pushMonster(mip); if(mip.proper()) pushMonster(mip);
animateAttack(mi, LAYER_SMALL); animateCorrectAttack(mi, LAYER_SMALL, moPlayer);
} }
} }