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

Orbs of the Dragon, Domination, and the Mind.

This commit is contained in:
Jacob Mandelson 2022-08-28 20:05:03 -07:00
parent cc29338305
commit e1f3df2e65
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
geometry.cpp
View File

@ -286,9 +286,9 @@ hpcshape
shSabre, shTurban1, shTurban2, shVikingHelmet, shRaiderHelmet, shRaiderArmor, shRaiderBody, shRaiderShirt, shSabre, shTurban1, shTurban2, shVikingHelmet, shRaiderHelmet, shRaiderArmor, shRaiderBody, shRaiderShirt,
shWestHat1, shWestHat2, shGunInHand, shWestHat1, shWestHat2, shGunInHand,
shKnightArmor, shKnightCloak, shWightCloak, shKnightArmor, shKnightCloak, shWightCloak,
shGhost, shEyes, shSlime, shJelly, shJoint, shWormHead, shTentHead, shShark, shWormSegment, shSmallWormSegment, shWormTail, shSmallWormTail, shGhost, shEyes, shSlime, shJelly, shJoint, shWormHead, shSmallWormHead, shTentHead, shShark, shWormSegment, shSmallWormSegment, shWormTail, shSmallWormTail,
shSlimeEyes, shDragonEyes, shWormEyes, shGhostEyes, shSlimeEyes, shDragonEyes, shSmallDragonEyes, shWormEyes, shSmallWormEyes, shGhostEyes,
shMiniGhost, shMiniEyes, shMiniGhost, shSmallEyes, shMiniEyes,
shHedgehogBlade, shSmallHedgehogBlade, shHedgehogBladePlayer, shHedgehogBlade, shSmallHedgehogBlade, shHedgehogBladePlayer,
shWolfBody, shWolfHead, shWolfLegs, shWolfEyes, shWolfBody, shWolfHead, shWolfLegs, shWolfEyes,
shWolfFrontLeg, shWolfRearLeg, shWolfFrontPaw, shWolfRearPaw, shWolfFrontLeg, shWolfRearLeg, shWolfFrontPaw, shWolfRearPaw,
@ -312,7 +312,7 @@ hpcshape
shRatHead, shRatTail, shRatEyes, shRatCape1, shRatCape2, shRatHead, shRatTail, shRatEyes, shRatCape1, shRatCape2,
shWizardHat1, shWizardHat2, shWizardHat1, shWizardHat2,
shTortoise[13][6], shTortoise[13][6],
shDragonLegs, shDragonTail, shDragonHead, shDragonSegment, shDragonNostril, shDragonLegs, shDragonTail, shDragonHead, shSmallDragonHead, shDragonSegment, shDragonNostril, shSmallDragonNostril,
shDragonWings, shDragonWings,
shSolidBranch, shWeakBranch, shBead0, shBead1, shSolidBranch, shWeakBranch, shBead0, shBead1,
shBatWings, shBatBody, shBatMouth, shBatFang, shBatEye, shBatWings, shBatBody, shBatMouth, shBatFang, shBatEye,

13
graph.cpp
View File

@ -1109,6 +1109,18 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
}*/ }*/
else if (it == itOrbSpeed) else if (it == itOrbSpeed)
drawSpeed(Vit, 0.4); drawSpeed(Vit, 0.4);
else if (it == itOrbDragon) {
queuepolyat(Vit, cgi.shSmallDragonHead, dark, prio);
queuepolyat(Vit, cgi.shSmallDragonNostril, 0xFF, prio);
queuepolyat(Vit*Mirror, cgi.shSmallDragonNostril, 0xFF, prio);
queuepolyat(Vit, cgi.shSmallDragonEyes, 0x60, prio);
queuepolyat(Vit*Mirror, cgi.shSmallDragonEyes, 0x60, prio);
}
else if (it == itOrbDomination) {
queuepolyat(Vit, cgi.shSmallWormHead, dark, prio);
queuepolyat(Vit, cgi.shSmallWormEyes, 0x60, prio);
queuepolyat(Vit*Mirror, cgi.shSmallWormEyes, 0x60, prio);
}
else { else {
auto shape = (it == itOrbFriend) ? cgi.shTinyBird : auto shape = (it == itOrbFriend) ? cgi.shTinyBird :
(it == itOrbSide1) ? cgi.shSmallPSword : (it == itOrbSide1) ? cgi.shSmallPSword :
@ -1124,6 +1136,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbLuck) ? cgi.shSmallerDodeca : (it == itOrbLuck) ? cgi.shSmallerDodeca :
(it == itOrbFlash) ? cgi.shFlash : (it == itOrbFlash) ? cgi.shFlash :
(it == itOrbMorph || it == itOrbChaos || it == itOrbPlague) ? cgi.shSmallTreat : (it == itOrbMorph || it == itOrbChaos || it == itOrbPlague) ? cgi.shSmallTreat :
(it == itOrbPsi) ? cgi.shDiskS :
cgi.shDisk; cgi.shDisk;
queuepolyat(Vit, shape, dark, prio); queuepolyat(Vit, shape, dark, prio);
if (it == itOrbSide1 || it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism) if (it == itOrbSide1 || it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism)

5
polygons.cpp
View File

@ -1268,6 +1268,7 @@ void geometry_information::prepare_shapes() {
copyshape(shJoint, shDisk, PPR::ONTENTACLE); copyshape(shJoint, shDisk, PPR::ONTENTACLE);
bshape(shTentHead, PPR::ONTENTACLE, scalefactor * wormscale, 79); bshape(shTentHead, PPR::ONTENTACLE, scalefactor * wormscale, 79);
bshape(shWormHead, PPR::ONTENTACLE, scalefactor * wormscale, 80); bshape(shWormHead, PPR::ONTENTACLE, scalefactor * wormscale, 80);
bshape(shSmallWormHead, PPR::ONTENTACLE, scalefactor * wormscale / 2, 80);
bshape(shWormSegment, PPR::TENTACLE1); bshape(shWormSegment, PPR::TENTACLE1);
RING(i) RING(i)
@ -1284,6 +1285,8 @@ void geometry_information::prepare_shapes() {
bshape(shDragonTail, PPR::TENTACLE1, scalefactor * wormscale, 240); //239 alt bshape(shDragonTail, PPR::TENTACLE1, scalefactor * wormscale, 240); //239 alt
bshape(shDragonNostril, PPR::ONTENTACLE_EYES, scalefactor * wormscale, 241); bshape(shDragonNostril, PPR::ONTENTACLE_EYES, scalefactor * wormscale, 241);
bshape(shDragonHead, PPR::ONTENTACLE, scalefactor * wormscale, 242); bshape(shDragonHead, PPR::ONTENTACLE, scalefactor * wormscale, 242);
bshape(shSmallDragonNostril, PPR::ONTENTACLE_EYES, scalefactor * wormscale / 2, 241);
bshape(shSmallDragonHead, PPR::ONTENTACLE, scalefactor * wormscale / 2, 242);
ld krsc = 1; ld krsc = 1;
if(sphere) krsc *= 1.4; if(sphere) krsc *= 1.4;
@ -1478,9 +1481,11 @@ void geometry_information::prepare_shapes() {
bshape(shFlowerHand, PPR::MONSTER_WPN, scalefactor, 133); bshape(shFlowerHand, PPR::MONSTER_WPN, scalefactor, 133);
bshape(shPFace, PPR::MONSTER_FACE, scalefactor, 134); bshape(shPFace, PPR::MONSTER_FACE, scalefactor, 134);
bshape(shEyes, PPR::MONSTER_EYE0, scalefactor, 135); bshape(shEyes, PPR::MONSTER_EYE0, scalefactor, 135);
bshape(shSmallEyes, PPR::MONSTER_EYE0, scalefactor/2, 135);
bshape(shMiniEyes, PPR::MONSTER_EYE0, scalefactor/3, 135); bshape(shMiniEyes, PPR::MONSTER_EYE0, scalefactor/3, 135);
bshape(shShark, PPR::MONSTER_BODY, scalefactor, 136); bshape(shShark, PPR::MONSTER_BODY, scalefactor, 136);
shSlimeEyes = shDragonEyes = shWormEyes = shGhostEyes = shEyes; shSlimeEyes = shDragonEyes = shWormEyes = shGhostEyes = shEyes;
shSmallDragonEyes = shSmallWormEyes = shSmallEyes;
bshape(shTinyShark, PPR::MONSTER_BODY, scalefactor / 2, 136); bshape(shTinyShark, PPR::MONSTER_BODY, scalefactor / 2, 136);
bshape(shBugBody, PPR::MONSTER_BODY, scalefactor, 137); bshape(shBugBody, PPR::MONSTER_BODY, scalefactor, 137);
bshape(shBugArmor, PPR::MONSTER_ARMOR0, scalefactor, 138); bshape(shBugArmor, PPR::MONSTER_ARMOR0, scalefactor, 138);