mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-04-29 14:13:11 +00:00
Code Issues Releases Wiki Activity

Make Orb of Beauty use a small rose.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-08-26 12:34:04 -07:00
parent 18e1912884
commit d85ad065f6
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geometry.cpp
View File

@ -308,7 +308,7 @@ hpcshape
shPrincessDress, shPrinceDress, shPrincessDress, shPrinceDress,
shWizardCape1, shWizardCape2, shWizardCape1, shWizardCape2,
shBigCarpet1, shBigCarpet2, shBigCarpet3, shBigCarpet1, shBigCarpet2, shBigCarpet3,
shGoatHead, shRose, shRoseItem, shThorns, shGoatHead, shRose, shRoseItem, shSmallRose, shThorns,
shRatHead, shRatTail, shRatEyes, shRatCape1, shRatCape2, shRatHead, shRatTail, shRatEyes, shRatCape1, shRatCape2,
shWizardHat1, shWizardHat2, shWizardHat1, shWizardHat2,
shTortoise[13][6], shTortoise[13][6],

8
graph.cpp
View File

@ -1047,13 +1047,17 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
if(xch == 'c') if(xch == 'c')
queuepolyat(Vit * spinptick(500, 0), cgi.shMoonDisk, darkena(0x801080, 0, hidden ? 0x20 : 0xC0), prio); queuepolyat(Vit * spinptick(500, 0), cgi.shMoonDisk, darkena(0x801080, 0, hidden ? 0x20 : 0xC0), prio);
else { else {
auto dark = darkena(icol1, 0, inice ? 0x80 : hidden ? 0x20 : 0xC0); auto dark = darkena(icol1, 0, inice ? 0x80 : hidden ? 0x20 : (it == itOrbBeauty) ? 0xA0 : 0xC0);
if (it == itOrbLife) { if (it == itOrbLife) {
queuepolyat(Vit, cgi.shSmallPBody, dark, prio); queuepolyat(Vit, cgi.shSmallPBody, dark, prio);
queuepolyat(Vit, cgi.shDiskM, dark, prio); queuepolyat(Vit, cgi.shDiskM, dark, prio);
} }
else if (it == itOrbBeauty)
for(int u=0; u<3; u++)
queuepolyat(Vit * spin(2*M_PI / 3 / 3 * u), cgi.shSmallRose, dark, prio);
else { else {
auto shape = (it == itOrbFriend) ? cgi.shTinyBird : cgi.shDisk; auto shape = (it == itOrbFriend) ? cgi.shTinyBird :
cgi.shDisk;
queuepolyat(Vit, shape, dark, prio); queuepolyat(Vit, shape, dark, prio);
} }
} }

5
polygons.cpp
View File

@ -792,6 +792,11 @@ void geometry_information::procedural_shapes() {
shRoseItem = shRose; shRoseItem = shRose;
bshape(shSmallRose, PPR::ITEM);
PRING(t)
hpcpush(xspinpush0(M_PI * t / (S42+.0), scalefactor/2 * hcrossf7 * (0.2 + .15 * sin(M_PI * t / (S42+.0) * 3))));
finishshape();
bshape(shThorns, PPR::THORNS); bshape(shThorns, PPR::THORNS);
for(int t=0; t<=60; t++) for(int t=0; t<=60; t++)
hpcpush(xspinpush0(M_PI * t / 30.0, scalefactor * hcrossf7 * ((t&1) ? 0.3 : 0.6))); hpcpush(xspinpush0(M_PI * t / 30.0, scalefactor * hcrossf7 * ((t&1) ? 0.3 : 0.6)));