mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-02 20:29:17 +00:00
Code Issues Releases Wiki Activity

Use shSmallTreat for Orbs of Change, Choice, and Chaos.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-08-28 19:41:16 -07:00
parent 5ec6783a2d
commit cc29338305
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content.cpp
View File

@ -1646,7 +1646,7 @@ WALL( '$', 0x40FD40, "Crate on Target", waCrateOnTarget, WF_WALL | WF_PUSHABLE,
"A crate already on a target." "A crate already on a target."
) )
ITEM( 'o', 0xFFD520, "Orb of Purity", itOrbPurity, IC_ORB, ZERO, RESERVED, osProtective, ITEM( 'o', 0xF0F0FF, "Orb of Purity", itOrbPurity, IC_ORB, ZERO, RESERVED, osProtective,
"Reverses all the curses. When found far away from the Cursed Canyon, you gain low amounts of various reversed curse powers." "Reverses all the curses. When found far away from the Cursed Canyon, you gain low amounts of various reversed curse powers."
) )

2
geometry.cpp
View File

@ -262,7 +262,7 @@ hpcshape
shReserved4, shMoonDisk, shReserved4, shMoonDisk,
shDaisy, shSnowflake, shTriangle, shNecro, shStatue, shKey, shWindArrow, shDaisy, shSnowflake, shTriangle, shNecro, shStatue, shKey, shWindArrow,
shGun, shGun,
shFigurine, shTreat, shFigurine, shTreat, shSmallTreat,
shElementalShard, shElementalShard,
// shBranch, // shBranch,
shIBranch, shTentacle, shTentacleX, shILeaf[3], shIBranch, shTentacle, shTentacleX, shILeaf[3],

4
graph.cpp
View File

@ -809,7 +809,7 @@ EX color_t orb_auxiliary_color(eItem it) {
if(it == itOrbSide1) return 0x307080; if(it == itOrbSide1) return 0x307080;
if(it == itOrbDigging) return 0x606060; if(it == itOrbDigging) return 0x606060;
if(it == itOrbEnergy) return 0xFFFF80; if(it == itOrbEnergy) return 0xFFFF80;
if(it == itOrbPurity) return 0xF0F0FF; if(it == itOrbPurity) return 0xFFD520;
return iinf[it].color; return iinf[it].color;
} }
@ -1117,13 +1117,13 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
(it == itOrbThorns) ? cgi.shSmallHedgehogBlade : (it == itOrbThorns) ? cgi.shSmallHedgehogBlade :
(it == itOrbSide2 || it == itOrb37) ? cgi.shDiskT : (it == itOrbSide2 || it == itOrb37) ? cgi.shDiskT :
(it == itOrbGravity) ? cgi.shTinyArrow : (it == itOrbGravity) ? cgi.shTinyArrow :
(it == itOrbMorph) ? cgi.shDiskS :
(it == itOrbMatter || it == itOrbStone) ? cgi.shDiskSq : (it == itOrbMatter || it == itOrbStone) ? cgi.shDiskSq :
(it == itOrbEnergy) ? cgi.shHalfDisk : (it == itOrbEnergy) ? cgi.shHalfDisk :
(it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism) ? cgi.shEccentricDisk : (it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism) ? cgi.shEccentricDisk :
(it == itOrbWinter) ? cgi.shSnowflake : (it == itOrbWinter) ? cgi.shSnowflake :
(it == itOrbLuck) ? cgi.shSmallerDodeca : (it == itOrbLuck) ? cgi.shSmallerDodeca :
(it == itOrbFlash) ? cgi.shFlash : (it == itOrbFlash) ? cgi.shFlash :
(it == itOrbMorph || it == itOrbChaos || it == itOrbPlague) ? cgi.shSmallTreat :
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)

1
polygons.cpp
View File

@ -1254,6 +1254,7 @@ void geometry_information::prepare_shapes() {
bshape(shKey, PPR::ITEM, scalefactor, 68); bshape(shKey, PPR::ITEM, scalefactor, 68);
bshape(shPirateX, PPR::ITEM, scalefactor, 124); bshape(shPirateX, PPR::ITEM, scalefactor, 124);
bshape(shTreat, PPR::ITEM, scalefactor, 253); bshape(shTreat, PPR::ITEM, scalefactor, 253);
bshape(shSmallTreat, PPR::ITEM, scalefactor/1.5, 253);
wormscale = WDIM == 3 ? 3 : 1; wormscale = WDIM == 3 ? 3 : 1;