From f7e8818e01c5ff8f1e60704fe87bd2831b51427b Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Sat, 17 Sep 2022 13:39:11 -0700 Subject: [PATCH] First draft of ivy leaf for Orb Of Nature. --- geometry.cpp | 2 +- graph.cpp | 1 + polygons.cpp | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/geometry.cpp b/geometry.cpp index 36fdb842..0527f9d4 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -343,7 +343,7 @@ hpcshape shDodeca, shSmallerDodeca, shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass, - shShield, shSmallFan, shTreeIcon; + shShield, shSmallFan, shTreeIcon, shLeafIcon; 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 05e55ab9..e79c8f50 100644 --- a/graph.cpp +++ b/graph.cpp @@ -1139,6 +1139,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int (it == itOrbTime) ? &cgi.shHourglass : (it == itOrbAir) ? &cgi.shSmallFan : (it == itOrbWoods) ? &cgi.shTreeIcon : + (it == itOrbNature) ? &cgi.shLeafIcon : (it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid : (it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment : NULL; diff --git a/polygons.cpp b/polygons.cpp index 6366d4c5..a1712054 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1272,6 +1272,7 @@ void geometry_information::prepare_shapes() { bshape(shHourglass, PPR::ITEM, scalefactor/2.0, 416); bshape(shShield, PPR::ITEM, scalefactor, 418); bshape(shTreeIcon, PPR::ITEM, scalefactor/1.7, 419); + bshape(shLeafIcon, PPR::ITEM, scalefactor/10000, 420); wormscale = WDIM == 3 ? 3 : 1; @@ -2446,6 +2447,22 @@ NEWSHAPE, 418, 1, 2, 0.055384, -0.005846, 0.043076, 0.010769, 0.033846, 0.033846 // shTreeIcon NEWSHAPE, 419, 1, 2, -0.175, 0.010, -0.048, 0.100, -0.044, 0.070, 0.025, 0.118, 0.030, 0.074, 0.107, 0.144, 0.110, 0.030, 0.165, 0.010, +// shLeafIcon +#define x (-900) +#define y (-640) +NEWSHAPE, 420, 1, 1, +480+x,1600+y, +484+x,1623+y, 385+x,1400+y, 336+x,1023+y, + 470+x,750+y, + 567+x,660+y, +860+x,450+y, 1400+x,280+x, +1290+x,690+y, 1300+x,900+y, 1260+x,1315+y, 1130+x,1500+y, 725+x,1650+y, +539+x,1634+y, 594+x,1375+y, 897+x,1271+y, 644+x,1298+y, 781+x,1029+y, 1067+x,924+x, +979+x,710+y, 644+x,1095+y, 561+x,902+y, 605+x,1188+y, 490+x,1518+y, +480+x,1600+y, + + + NEWSHAPE, NEWSHAPE };