From d2c4382e14825f8ccf636f7311ba2db78088ea48 Mon Sep 17 00:00:00 2001 From: Jacob Mandelson Date: Fri, 16 Sep 2022 12:13:20 -0700 Subject: [PATCH] First draft of shield shape. --- geometry.cpp | 3 ++- graph.cpp | 1 + polygons.cpp | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/geometry.cpp b/geometry.cpp index f23bfec0..efb01c52 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -342,7 +342,8 @@ hpcshape shDodeca, shSmallerDodeca, - shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass; + shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass, + shShield; 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 bf6bac9a..92c03c4b 100644 --- a/graph.cpp +++ b/graph.cpp @@ -1135,6 +1135,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 == itOrbShield) ? &cgi.shShield : (it == itOrbTime) ? &cgi.shHourglass : (it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid : (it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment : diff --git a/polygons.cpp b/polygons.cpp index fbe6c9bf..78f38333 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1269,6 +1269,7 @@ void geometry_information::prepare_shapes() { bshape(shHumanoid, PPR::ITEM, scalefactor/5.5, 414); bshape(shHalfHumanoid, PPR::ITEM, scalefactor/5.5, 415); bshape(shHourglass, PPR::ITEM, scalefactor/2.0, 416); + bshape(shShield, PPR::ITEM, scalefactor/600, 418); wormscale = WDIM == 3 ? 3 : 1; @@ -2437,6 +2438,14 @@ NEWSHAPE, 416, 1, 2, -0.155, -0.072, -0.155, 0.085, -0.125, 0.085, -0.125, 0.062 // shSmallPirateHook (1x1) NEWSHAPE, 417, 1, 1, -0.037181, 0.070167, -0.042053, 0.031041, -0.014659, 0.029317, -0.010618, 0.031858, -0.003590, 0.032239, 0.014371, -0.025303, 0.007310, -0.026816, 0.002001, -0.030249, -0.001858, -0.038640, -0.003422, -0.049517, -0.000467, -0.058195, 0.005223, -0.064027, 0.013645, -0.067636, 0.022859, -0.070707, 0.033758, -0.070846, 0.028238, -0.067408, 0.020306, -0.063217, 0.016120, -0.060505, 0.009480, -0.057640, 0.004495, -0.050630, 0.003689, -0.045704, 0.007669, -0.036125, 0.015513, -0.032838, 0.025898, -0.030858, 0.006555, 0.042386, 0.002458, 0.051849, 0.002712, 0.054032, -0.001503, 0.057099, -0.005393, 0.057232, -0.006207, 0.061713, -0.009783, 0.064849, -0.013597, 0.065763, +// shShield +#define x (-100) +#define y (-175) +NEWSHAPE, 418, 1, 1, +96.7+x,211+y, 108+x,204.7+y, 125+x,201+y, 140.3+x,204.7+y, 159.6+x,211.4+y, +158.5+x,190.3+y, 154.8+x,171.6+y, 145.7+x,147+y, 138.5+x,130+y, 116+x,116.3+y, 99.4+x,106+y, +#undef x +#undef y NEWSHAPE, NEWSHAPE };