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

Orb of Horns & Orb of the Bull.

This commit is contained in:
Jacob Mandelson 2022-08-27 18:21:53 -07:00
parent f5d4586d0f
commit 0ebee6a1a3
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -325,6 +325,8 @@ hpcshape
shTrylobiteFrontLeg, shTrylobiteRearLeg, shTrylobiteFrontClaw, shTrylobiteRearClaw,
shBullBody, shBullHead, shBullHorn, shBullRearHoof, shBullFrontHoof,
shSmallBullHead, shSmallBullHorn,
shTinyBullHead, shTinyBullHorn, shTinyBullBody,
shButterflyBody, shButterflyWing, shGadflyBody, shGadflyWing, shGadflyEye,

11
graph.cpp
View File

@ -1065,6 +1065,17 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
if (i>=5 && i<=7)
queuepolyat(Vit*Mirror, cgi.shTortoise[i][2], dark, prio);
}
else if (it == itOrbHorns) {
queuepolyat(Vit, cgi.shSmallBullHead, dark, prio);
queuepolyat(Vit, cgi.shSmallBullHorn, dark, prio);
queuepolyat(Vit*Mirror, cgi.shSmallBullHorn, dark, prio);
}
else if (it == itOrbBull) {
queuepolyat(Vit, cgi.shTinyBullBody, dark, prio);
queuepolyat(Vit, cgi.shTinyBullHead, dark, prio);
queuepolyat(Vit, cgi.shTinyBullHorn, dark, prio);
queuepolyat(Vit * Mirror, cgi.shTinyBullHorn, dark, prio);
}
else if (it == itOrbFrog) {
queuepolyat(Vit, cgi.shSmallFrogBody, dark, prio);
queuepolyat(Vit, cgi.shSmallFrogRearFoot, dark, prio);

18
polygons.cpp
View File

@ -1404,6 +1404,11 @@ void geometry_information::prepare_shapes() {
bshape(shBullRearHoof, PPR::MONSTER_FOOT, scalefactor, 317);
bshape(shBullFrontHoof, PPR::MONSTER_FOOT, scalefactor, 318);
bshape(shBullHead, PPR::MONSTER_HEAD, scalefactor, 319);
bshape(shSmallBullHead, PPR::MONSTER_HEAD, scalefactor/1.5, 411);
bshape(shSmallBullHorn, PPR::MONSTER_HEAD, scalefactor/1.5, 412);
bshape(shTinyBullHead, PPR::MONSTER_HEAD, scalefactor/2.5, 319);
bshape(shTinyBullHorn, PPR::MONSTER_HEAD, scalefactor/2.5, 316);
bshape(shTinyBullBody, PPR::MONSTER_BODY, scalefactor/2.5, 315);
bshape(shButterflyBody, PPR::MONSTER_BODY, scalefactor, 320);
bshape(shButterflyWing, PPR::MONSTER_BODY, scalefactor, 321);
@ -2363,14 +2368,23 @@ NEWSHAPE, 404, 1, 1, -0.157104, 0.037552, -0.119742, 0.0232719, -0.0800179, 0.
// 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
NEWSHAPE, 409,1,1, -0.048707,0.225700, -0.042124,0.230376, -0.032941,0.233710, -0.026424,0.233978, -0.02268,0.229640, 0.047958,-0.201688, 0.041932,-0.211853, 0.038281,-0.216934, 0.029252,-0.216536, 0.018813,-0.210892, 0.012195,-0.202881,
#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
// shSmallBullHead
#define x (-0.33)
NEWSHAPE, 411, 1, 2, 0.334622+x,-0.050250, 0.307607+x,-0.096839, 0.281739+x,-0.111332, 0.258180+x,-0.106443, 0.236906+x,-0.077841, 0.214842+x,-0.061865, 0.184962+x,-0.040355, 0.198626+x,-0.028054, 0.195166+x,-0.013460, 0.181470+x,-0.002240,
// shSmallBullHorn
NEWSHAPE, 412, 1, 1, 0.321702+x,-0.078714, 0.329603+x,-0.122456, 0.342058+x,-0.140037, 0.360561+x,-0.149754, 0.379070+x,-0.152553, 0.395131+x,-0.150636, 0.423718+x,-0.142016, 0.448897+x,-0.133266, 0.441750+x,-0.150756, 0.426899+x,-0.163295, 0.403192+x,-0.169643, 0.371044+x,-0.173385, 0.345193+x,-0.167994, 0.313418+x,-0.152134, 0.303510+x,-0.135781, 0.297242+x,-0.118441, 0.292244+x,-0.102342, 0.308799+x,-0.096856,
#undef x
NEWSHAPE, NEWSHAPE
};