mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bodies for Orbs of Triangle, Gravity, Warp, Matter, and Stone.

This commit is contained in:
Jacob Mandelson 2022-08-27 11:31:58 -07:00
parent 5766299c0a
commit cc3065f204
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graph.cpp
View File

@ -1091,6 +1091,11 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbDigging) ? cgi.shSmallPickAxe :
(it == itOrbSword || it == itOrbSword2) ? cgi.shSmallSword :
(it == itOrbThorns) ? cgi.shSmallHedgehogBlade :
(it == itOrbSide2 || it == itOrb37) ? cgi.shDiskT :
(it == itOrbGravity) ? cgi.shTinyArrow :
(it == itOrbMorph) ? cgi.shDiskS :
//(it == itOrbDiscord) ? cgi.shDiskM :
(it == itOrbMatter || it == itOrbStone) ? cgi.shDiskSq :
cgi.shDisk;
queuepolyat(Vit, shape, dark, prio);
if (it == itOrbSide1)

15
polygons.cpp
View File

@ -1465,10 +1465,10 @@ void geometry_information::prepare_shapes() {
bshape(shPike, PPR::MONSTER_WPN, scalefactor, 150);
bshape(shFlailBall, PPR::MONSTER_WPN, scalefactor, 151);
bshape(shFlailTrunk, PPR::MONSTER_WPN, scalefactor, 152);
bshape(shSmallFlailTrunk, PPR::MONSTER_WPN, scalefactor/2, 152);
bshape(shSmallFlailTrunk, PPR::MONSTER_WPN, scalefactor/2, 409);
bshape(shFlailChain, PPR::MONSTER_SUBWPN, scalefactor, 153);
bshape(shHammerHead, PPR::MONSTER_WPN, scalefactor, 376);
bshape(shSmallHammerHead, PPR::MONSTER_WPN, scalefactor/2, 376);
bshape(shSmallHammerHead, PPR::MONSTER_WPN, scalefactor/2, 410);
// bshape(shScratch, 17, scalefactor, 156);
bshape(shSkeletonBody, PPR::MONSTER_BODY, scalefactor, 157);
bshape(shSkull, PPR::MONSTER_HEAD, scalefactor, 158);
@ -1750,7 +1750,7 @@ NEWSHAPE, 88,1,2, -0.036955,0.001192, -0.036957,-0.007153, -0.048967,-0.028663,
NEWSHAPE, 89,21,1, -0.064558,0.008369, -0.038156,0.011924,
// shPSword (1x1)
NEWSHAPE, 90,1,1, 0.093822,0.244697, 0.105758,0.251015, 0.110908,0.249862, 0.110690,0.245554, 0.113376,0.247134, 0.117228,0.245924, 0.127263,0.237981, 0.131886,0.226997, 0.116494,0.231721, 0.106117,0.231182, 0.105927,0.226986, 0.263283,-0.174653, 0.086104,0.209645, 0.079571,0.202657, 0.074206,0.190462, 0.068951,0.179766, 0.065727,0.200902, 0.068444,0.209067, 0.077641,0.221653, 0.086737,0.227526, 0.086260,0.248631, 0.086431,0.252937,
// shSmallPSwords
// shSmallPSword
NEWSHAPE, 407,1,1, -0.056178,0.244697, -0.044242,0.251015, -0.039092,0.249862, -0.03931,0.245554, -0.036624,0.247134, -0.032772,0.245924, -0.022737,0.237981, -0.018114,0.226997, -0.033506,0.231721, -0.043883,0.231182, -0.044073,0.226986, 0.113283,-0.174653, -0.063896,0.209645, -0.070429,0.202657, -0.075794,0.190462, -0.081049,0.179766, -0.084273,0.200902, -0.081556,0.209067, -0.072359,0.221653, -0.063263,0.227526, -0.06374,0.248631, -0.063569,0.252937,
// shPKnife (1x1)
NEWSHAPE, 91,1,1, 0.070235,0.261061, 0.085110,0.243297, 0.100384,0.253764, 0.115592,0.241462, 0.106046,0.228043, 0.193021,0.140235, 0.223042,0.069158, 0.217457,0.064184, 0.149083,0.101106, 0.073293,0.198875, 0.059119,0.191168, 0.049288,0.208259, 0.061401,0.222183, 0.046445,0.239874,
@ -2352,6 +2352,15 @@ NEWSHAPE, 403, 1, 1, 0.26453, 0.0305227, 0.274541, 0.0290331, 0.280348, 0.0265
NEWSHAPE, 404, 1, 1, -0.157104, 0.037552, -0.119742, 0.0232719, -0.0800179, 0.03, -0.0600636, 0.0582003, -0.0695215, 0.0851648, -0.0941826, 0.112117, -0.124214, 0.117626, -0.162927, 0.123278, -0.20065, 0.122779, -0.220489, 0.12271, -0.294104, 0.0895822, -0.341594, 0.0607798, -0.344169, 0.0476839, -0.336604, 0.0182726, -0.31669, 0.0111505, -0.296371, 0.0199419, -0.257868, 0.0376895, -0.219528, 0.0568778, -0.198186, 0.0609263,
// shSmallSword (1x2)
NEWSHAPE, 405,1,2, -0.226885,0.018516, -0.212399,0.032471, -0.193062,0.020928, -0.185621,0.046575, -0.192539,0.086182, -0.199612,0.102458, -0.167905,0.095887, -0.15358,0.056176, -0.148822,0.028094, 0.252221,0.023027, 0.294417,0.005175,
// shSmallFlailTrunk
#define x (-0.1)
#define y (-0.05)
NEWSHAPE, 409,1,1, 0.051293+x,0.275700+y, 0.057876+x,0.280376+y, 0.067059+x,0.283710+y, 0.073576+x,0.283978+y, 0.077320+x,0.279640+y, 0.147958+x,-0.151688+y, 0.141932+x,-0.161853+y, 0.138281+x,-0.166934+y, 0.129252+x,-0.166536+y, 0.118813+x,-0.160892+y, 0.112195+x,-0.152881+y,
// shSmallHammerHead
NEWSHAPE, 410, 1, 1, 0.202167+x,-0.134605+y, 0.204591+x,-0.145446+y, 0.192856+x,-0.139999+y, 0.180908+x,-0.136821+y, 0.063679+x,-0.150430+y, 0.054862+x,-0.154571+y, 0.051985+x,-0.159521+y, 0.036546+x,-0.062257+y, 0.043529+x,-0.066187+y, 0.054300+x,-0.069873+y, 0.182749+x,-0.064458+y, 0.195918+x,-0.057169+y, 0.204973+x,-0.052339+y, 0.199643+x,-0.078121+y, 0.042703+x,-0.084239+y, 0.199470+x,-0.077992+y, 0.199531+x,-0.090084+y, 0.044591+x,-0.098658+y, 0.198774+x,-0.089982+y, 0.199787+x,-0.100708+y, 0.045748+x,-0.113148+y, 0.198272+x,-0.100502+y, 0.200147+x,-0.110605+y, 0.048127+x,-0.124053+y, 0.198630+x,-0.110398+y, 0.199672+x,-0.121163+y, 0.050049+x,-0.138713+y, 0.198913+x,-0.121059+y,
#undef x
#undef y
NEWSHAPE, NEWSHAPE
};