mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 17:40:36 +00:00
Code Issues Releases Wiki Activity

Orb of Fish has a tail now

Browse Source
This commit is contained in:
Zeno Rogue 2017-10-17 13:13:36 +02:00
parent c126e734cb
commit b265085392
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
graph.cpp
View File

@ -632,7 +632,8 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks,
int pr = PPR_ITEM; int pr = PPR_ITEM;
bool inice = c && c->wall == waIcewall; bool inice = c && c->wall == waIcewall;
if(inice) pr = PPR_HIDDEN; if(inice) pr = PPR_HIDDEN;
queuepolyat(V, shDisk, darkena(icol, 0, inice ? 0x80 : hidden ? 0x20 : 0xC0), pr);
int icol1 = icol;
if(it == itOrbFire) icol = firecolor(200); if(it == itOrbFire) icol = firecolor(200);
if(it == itOrbFriend || it == itOrbDiscord) icol = 0xC0C0C0; if(it == itOrbFriend || it == itOrbDiscord) icol = 0xC0C0C0;
if(it == itOrbFrog) icol = 0xFF0000; if(it == itOrbFrog) icol = 0xFF0000;
@ -641,6 +642,12 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks,
if(it == itOrbAir) icol = 0xFFFFFF; if(it == itOrbAir) icol = 0xFFFFFF;
if(it == itOrbUndeath) icol = minf[moFriendlyGhost].color; if(it == itOrbUndeath) icol = minf[moFriendlyGhost].color;
if(it == itOrbRecall) icol = 0x101010; if(it == itOrbRecall) icol = 0x101010;
int col = darkena(icol, 0, int(0x80 + 0x70 * sin(ticks / 300.)));
if(it == itOrbFish)
queuepolyat(V * spin(ticks / 1500.), shFishTail, col, PPR_ITEM_BELOW);
queuepolyat(V, shDisk, darkena(icol1, 0, inice ? 0x80 : hidden ? 0x20 : 0xC0), pr);
hpcshape& sh = hpcshape& sh =
it == itOrbLove ? shLoveRing : it == itOrbLove ? shLoveRing :
isRangedOrb(it) ? shTargetRing : isRangedOrb(it) ? shTargetRing :
@ -650,7 +657,7 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks,
isDirectionalOrb(it) ? shSpearRing : isDirectionalOrb(it) ? shSpearRing :
it == itOrb37 ? shHeptaRing : it == itOrb37 ? shHeptaRing :
shRing; shRing;
queuepolyat(V * spin(ticks / 1500.), sh, darkena(icol, 0, int(0x80 + 0x70 * sin(ticks / 300.))), pr); queuepolyat(V * spin(ticks / 1500.), sh, col, pr);
} }
else if(it) return true; else if(it) return true;

1
hyper.h
View File

@ -944,6 +944,7 @@ enum PPR {
PPR_REDWALLm2, PPR_REDWALLs2, PPR_REDWALLp2, PPR_REDWALLt2, PPR_REDWALLm2, PPR_REDWALLs2, PPR_REDWALLp2, PPR_REDWALLt2,
PPR_REDWALLm3, PPR_REDWALLs3, PPR_REDWALLp3, PPR_REDWALLt3, PPR_REDWALLm3, PPR_REDWALLs3, PPR_REDWALLp3, PPR_REDWALLt3,
PPR_HEPTAMARK, PPR_HEPTAMARK,
PPR_ITEM_BELOW,
PPR_ITEM, PPR_ITEMa, PPR_ITEMb, PPR_ITEM, PPR_ITEMa, PPR_ITEMb,
PPR_BIGSTATUE, PPR_BIGSTATUE,