mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-11 18:00:34 +00:00
Code Issues Releases Wiki Activity

Use disk segments for Orbs of Vaulting & Phasing.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-09-14 18:11:52 -07:00
parent 92fc237a3e
commit 2933b256e0
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -253,7 +253,7 @@ hpcshape
shTriheptaSpecial[14], shTriheptaSpecial[14],
shCross, shGiantStar[2], shLake, shMirror, shCross, shGiantStar[2], shLake, shMirror,
shHalfFloor[6], shHalfMirror[3], shHalfFloor[6], shHalfMirror[3],
shGem[2], shStar, shFlash, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shEccentricDisk, shGem[2], shStar, shFlash, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shEccentricDisk, shDiskSegment,
shTinyBird, shTinyShark, shTinyBird, shTinyShark,
shEgg, shSmallEgg, shEgg, shSmallEgg,
shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing,

7
graph.cpp
View File

@ -1131,15 +1131,18 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbPurity) ? &cgi.shSmallEgg : (it == itOrbPurity) ? &cgi.shSmallEgg :
(it == itOrbLightning) ? &cgi.shLightningBolt : (it == itOrbLightning) ? &cgi.shLightningBolt :
(it == itOrbTime) ? &cgi.shHourglass : (it == itOrbTime) ? &cgi.shHourglass :
(it == itOrbIllusion || it == itOrbInvis) ? &cgi.shHumanoid : (it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid :
(it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment :
NULL; NULL;
queuepolyat(Vit, cgi.shDisk, dark, prio); queuepolyat(Vit, cgi.shDisk, dark, prio);
if (shape) if (shape)
queuepolyat(Vit, *shape, (it == itOrbInvis) ? 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)
queuepolyat(Vit*Mirror, *shape, 0x80, prio); queuepolyat(Vit*Mirror, *shape, 0x80, prio);
if (it == itOrbEnergy) if (it == itOrbEnergy)
queuepolyat(Vit*Mirror, *shape, col, prio); queuepolyat(Vit*Mirror, *shape, col, prio);
if (it == itOrbPhasing || it == itOrbDash)
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);
if (it == itOrbHorns) { if (it == itOrbHorns) {

4
polygons.cpp
View File

@ -589,6 +589,10 @@ void geometry_information::procedural_shapes() {
for(int i=0; i<=S84/2; i+=SD3) for(int i=0; i<=S84/2; i+=SD3)
hpcpush(ddi(i, orbsize * .2) * C0); hpcpush(ddi(i, orbsize * .2) * C0);
bshape(shDiskSegment, PPR::ITEM);
for(int i=0; i<=S84/2.5; i+=SD3)
hpcpush(ddi(i, orbsize * .2) * C0);
bshape(shMoonDisk, PPR::ITEM); bshape(shMoonDisk, PPR::ITEM);
for(int i=0; i<=S84; i+=SD3) for(int i=0; i<=S84; i+=SD3)
if(i <= S84 * 2 / 3) if(i <= S84 * 2 / 3)