mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-23 15:36:59 +00:00
Code Issues Releases Wiki Activity

Orbs of Air and Empathy.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-09-16 19:24:01 -07:00
parent 22e1799ab3
commit 1ad6b7ebe9
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -343,7 +343,7 @@ hpcshape
shDodeca, shSmallerDodeca, shDodeca, shSmallerDodeca,
shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass, shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass,
shShield; shShield, shSmallFan;
hpcshape shFrogRearFoot, shFrogFrontFoot, shFrogRearLeg, shFrogFrontLeg, shFrogRearLeg2, shFrogBody, shFrogEye, shFrogStripe, shFrogJumpFoot, shFrogJumpLeg, shSmallFrogRearFoot, shSmallFrogFrontFoot, shSmallFrogRearLeg, shSmallFrogFrontLeg, shSmallFrogRearLeg2, shSmallFrogBody; hpcshape shFrogRearFoot, shFrogFrontFoot, shFrogRearLeg, shFrogFrontLeg, shFrogRearLeg2, shFrogBody, shFrogEye, shFrogStripe, shFrogJumpFoot, shFrogJumpLeg, shSmallFrogRearFoot, shSmallFrogFrontFoot, shSmallFrogRearLeg, shSmallFrogFrontLeg, shSmallFrogRearLeg2, shSmallFrogBody;

5
graph.cpp
View File

@ -1112,6 +1112,8 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
queuepolyat(Vit, cgi.shHalfHumanoid, dark, prio); queuepolyat(Vit, cgi.shHalfHumanoid, dark, prio);
queuepolyat(Vit*Mirror, cgi.shHalfHumanoid, 0xFF, prio); queuepolyat(Vit*Mirror, cgi.shHalfHumanoid, 0xFF, prio);
} }
//else if (it == itOrbAir)
// queuepolyat(Vit, cgi.shSmallFan, dark, prio);
else if (it == itOrbFlash) else if (it == itOrbFlash)
queuepolyat(Vit, cgi.shFlash, dark, prio); queuepolyat(Vit, cgi.shFlash, dark, prio);
else if (it == itOrbMatter || it == itOrbStone) else if (it == itOrbMatter || it == itOrbStone)
@ -1131,12 +1133,13 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(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 == itOrbSpace) ? &cgi.shSmallPirateHook : (it == itOrbSpace) ? &cgi.shSmallPirateHook :
(it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism || it == itOrbDiscord) ? &cgi.shEccentricDisk : (it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism || it == itOrbEmpathy || 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 :
(it == itOrbShield) ? &cgi.shShield : (it == itOrbShield) ? &cgi.shShield :
(it == itOrbTime) ? &cgi.shHourglass : (it == itOrbTime) ? &cgi.shHourglass :
(it == itOrbAir) ? &cgi.shSmallFan :
(it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid : (it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid :
(it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment : (it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment :
NULL; NULL;

1
polygons.cpp
View File

@ -1266,6 +1266,7 @@ void geometry_information::prepare_shapes() {
bshape(shTreat, PPR::ITEM, scalefactor, 253); bshape(shTreat, PPR::ITEM, scalefactor, 253);
bshape(shSmallTreat, PPR::ITEM, scalefactor/1.5, 253); bshape(shSmallTreat, PPR::ITEM, scalefactor/1.5, 253);
bshape(shLightningBolt, PPR::ITEM, scalefactor/1.5, 413); bshape(shLightningBolt, PPR::ITEM, scalefactor/1.5, 413);
bshape(shSmallFan, PPR::ITEM, scalefactor/3, 59);
bshape(shHumanoid, PPR::ITEM, scalefactor/5.5, 414); bshape(shHumanoid, PPR::ITEM, scalefactor/5.5, 414);
bshape(shHalfHumanoid, PPR::ITEM, scalefactor/5.5, 415); bshape(shHalfHumanoid, PPR::ITEM, scalefactor/5.5, 415);
bshape(shHourglass, PPR::ITEM, scalefactor/2.0, 416); bshape(shHourglass, PPR::ITEM, scalefactor/2.0, 416);