1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 18:10:35 +00:00

Single eccentric disk for the Orb of Discord.

This commit is contained in:
Jacob Mandelson 2022-09-14 18:23:43 -07:00
parent 2933b256e0
commit df6f9eb86a

View File

@ -1126,7 +1126,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbGravity) ? &cgi.shTinyArrow : (it == itOrbGravity) ? &cgi.shTinyArrow :
(it == itOrbSafety || it == itOrbFreedom || it == itOrbRecall) ? &cgi.shDiskSq : (it == itOrbSafety || it == itOrbFreedom || it == itOrbRecall) ? &cgi.shDiskSq :
(it == itOrbEnergy) ? &cgi.shHalfDisk : (it == itOrbEnergy) ? &cgi.shHalfDisk :
(it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism) ? &cgi.shEccentricDisk : (it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism || it == itOrbDiscord) ? &cgi.shEccentricDisk :
(it == itOrbPsi || it == itOrbSide3) ? &cgi.shDiskS : (it == itOrbPsi || it == itOrbSide3) ? &cgi.shDiskS :
(it == itOrbPurity) ? &cgi.shSmallEgg : (it == itOrbPurity) ? &cgi.shSmallEgg :
(it == itOrbLightning) ? &cgi.shLightningBolt : (it == itOrbLightning) ? &cgi.shLightningBolt :
@ -1137,11 +1137,9 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
queuepolyat(Vit, cgi.shDisk, dark, prio); queuepolyat(Vit, cgi.shDisk, dark, prio);
if (shape) if (shape)
queuepolyat(Vit, *shape, (it == itOrbInvis || it == itOrbTeleport) ? 0x20 : 0x80, prio); queuepolyat(Vit, *shape, (it == itOrbInvis || it == itOrbTeleport) ? 0x20 : 0x80, prio);
if (it == itOrbSide1 || shape == &cgi.shEccentricDisk) if (it == itOrbSide1 || (shape == &cgi.shEccentricDisk && it != itOrbDiscord))
queuepolyat(Vit*Mirror, *shape, 0x80, prio); queuepolyat(Vit*Mirror, *shape, 0x80, prio);
if (it == itOrbEnergy) if (it == itOrbPhasing || it == itOrbDash || it == itOrbEnergy)
queuepolyat(Vit*Mirror, *shape, col, prio);
if (it == itOrbPhasing || it == itOrbDash)
queuepolyat(Vit*Mirror, *shape, col, prio); queuepolyat(Vit*Mirror, *shape, col, prio);
if (it == itOrbIntensity || it == itOrbImpact) if (it == itOrbIntensity || it == itOrbImpact)
queuepolyat(Vit, cgi.shDiskM, 0x80, prio); queuepolyat(Vit, cgi.shDiskM, 0x80, prio);