From 360aa921aa037c1c98a3b4b1c103e2475c499c5c Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Tue, 13 Sep 2022 10:49:10 -0700 Subject: [PATCH] Half an hourglass for the Orb of Time. --- geometry.cpp | 2 +- graph.cpp | 1 + polygons.cpp | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/geometry.cpp b/geometry.cpp index 2f0a80a7..08536cc7 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -341,7 +341,7 @@ hpcshape 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; diff --git a/graph.cpp b/graph.cpp index 739c267d..0fc3185a 100644 --- a/graph.cpp +++ b/graph.cpp @@ -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 == itOrbPurity) ? &cgi.shSmallEgg : (it == itOrbLightning) ? &cgi.shLightningBolt : + (it == itOrbTime) ? &cgi.shHourglass : (it == itOrbIllusion || it == itOrbInvis) ? &cgi.shHumanoid : NULL; queuepolyat(Vit, cgi.shDisk, dark, prio); diff --git a/polygons.cpp b/polygons.cpp index 64083c38..96b25bb9 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1257,6 +1257,7 @@ void geometry_information::prepare_shapes() { bshape(shLightningBolt, PPR::ITEM, scalefactor/1.5, 413); bshape(shHumanoid, PPR::ITEM, scalefactor/5.5, 414); bshape(shHalfHumanoid, PPR::ITEM, scalefactor/5.5, 415); + bshape(shHourglass, PPR::ITEM, scalefactor/3.0 /*1250*/, 416); 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, 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 };