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

Half an hourglass for the Orb of Time.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-09-13 10:49:10 -07:00
parent 2f51cfc49e
commit 360aa921aa
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -341,7 +341,7 @@ hpcshape
shDodeca, shSmallerDodeca, shDodeca, shSmallerDodeca,
shLightningBolt, shHumanoid, shHalfHumanoid; shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass;
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;

1
graph.cpp
View File

@ -1130,6 +1130,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(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 == itOrbTime) ? &cgi.shHourglass :
(it == itOrbIllusion || it == itOrbInvis) ? &cgi.shHumanoid : (it == itOrbIllusion || it == itOrbInvis) ? &cgi.shHumanoid :
NULL; NULL;
queuepolyat(Vit, cgi.shDisk, dark, prio); queuepolyat(Vit, cgi.shDisk, dark, prio);

25
polygons.cpp
View File

@ -1257,6 +1257,7 @@ void geometry_information::prepare_shapes() {
bshape(shLightningBolt, PPR::ITEM, scalefactor/1.5, 413); bshape(shLightningBolt, PPR::ITEM, scalefactor/1.5, 413);
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/3.0 /*1250*/, 416);
wormscale = WDIM == 3 ? 3 : 1; wormscale = WDIM == 3 ? 3 : 1;
@ -2418,6 +2419,30 @@ NEWSHAPE, 413, 1,1, 0.0324, -0.1844, 0.1676, -0.1844, 0.0684, -0.078, 0.1292, -0
NEWSHAPE, 414, 1, 2, 0.166, 0, 0.619, 0.186, 0.619, 0.348, 0.13, 0.171, -0.161, 0.129, 0.04, 0.254, -0.038, 0.339, -0.32, 0.186, -0.368, 0.078, -0.467, 0.138, -0.569, 0.141, -0.659, 0.081, -0.674, 0.087, -0.7, 0, NEWSHAPE, 414, 1, 2, 0.166, 0, 0.619, 0.186, 0.619, 0.348, 0.13, 0.171, -0.161, 0.129, 0.04, 0.254, -0.038, 0.339, -0.32, 0.186, -0.368, 0.078, -0.467, 0.138, -0.569, 0.141, -0.659, 0.081, -0.674, 0.087, -0.7, 0,
NEWSHAPE, 415, 1, 1, 0.166, 0, 0.619, 0.186, 0.619, 0.348, 0.13, 0.171, -0.161, 0.129, 0.04, 0.254, -0.038, 0.339, -0.32, 0.186, -0.368, 0.078, -0.467, 0.138, -0.569, 0.141, -0.659, 0.081, -0.674, 0.087, -0.7, 0, NEWSHAPE, 415, 1, 1, 0.166, 0, 0.619, 0.186, 0.619, 0.348, 0.13, 0.171, -0.161, 0.129, 0.04, 0.254, -0.038, 0.339, -0.32, 0.186, -0.368, 0.078, -0.467, 0.138, -0.569, 0.141, -0.659, 0.081, -0.674, 0.087, -0.7, 0,
// shHourglass
#define x (-0.2)
#define y (-0.2)
NEWSHAPE, 416, 1,2,
0.065+x,
0.244+y,
0.065+x,
0.366+y,
0.095+x,
0.366+y,
0.095+x,
0.348+y,
0.132+x,
0.349+y,
0.171+x,
0.342+y,
0.198+x,
0.327+y,
0.244+x,
0.269+y,
#undef x
#undef y
NEWSHAPE, NEWSHAPE NEWSHAPE, NEWSHAPE
}; };