mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 01:50:36 +00:00
Code Issues Releases Wiki Activity

Orbs of Impact and Recall.

Browse Source
This commit is contained in:
Jacob Mandelson 2022-08-28 11:10:12 -07:00
parent c4a7776977
commit afd57fe81d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content.cpp
View File

@ -783,7 +783,7 @@ ITEM( 'o', 0xC00040, "Orb of Recall", itOrbRecall, IC_ORB, ZERO, RESERVED, osUti
ITEM( ']', 0x8080FF, "Dodecahedron", itDodeca, IC_TREASURE, ZERO, RESERVED, osNone, ITEM( ']', 0x8080FF, "Dodecahedron", itDodeca, IC_TREASURE, ZERO, RESERVED, osNone,
"These dodecahedra made of a mysterious material are the Reptiles' favorite toy." "These dodecahedra made of a mysterious material are the Reptiles' favorite toy."
) )
ITEM( 'o', 0x8080FF, "Orb of Vaulting", itOrbDash, IC_ORB, ZERO | IF_RANGED, RESERVED, osFrog, ITEM( 'o', 0xFF0000, "Orb of Vaulting", itOrbDash, IC_ORB, ZERO | IF_RANGED, RESERVED, osFrog,
"This Orb allows you to jump over an adjacent monster, killing or stunning it. " "This Orb allows you to jump over an adjacent monster, killing or stunning it. "
"You can only vault in a roughly straight line. " "You can only vault in a roughly straight line. "
"Target a cell on the other side to use it." "Target a cell on the other side to use it."
@ -836,7 +836,7 @@ ITEM( '!', 0x80FF80, "Sea Glass", itDock, IC_TREASURE, ZERO, RESERVED, osNone, N
ITEM( '*', 0xBBCC99, "Chrysoberyl", itRuins, IC_TREASURE, ZERO, RESERVED, osNone, "Fragment of the past glory.") ITEM( '*', 0xBBCC99, "Chrysoberyl", itRuins, IC_TREASURE, ZERO, RESERVED, osNone, "Fragment of the past glory.")
ITEM( '*', 0x80FF80, "Monopole", itMagnet, IC_TREASURE, ZERO, RESERVED, osNone, NODESCYET) ITEM( '*', 0x80FF80, "Monopole", itMagnet, IC_TREASURE, ZERO, RESERVED, osNone, NODESCYET)
ITEM( '!', 0xFF00FF, "Tasty Jelly", itSwitch, IC_TREASURE, ZERO, RESERVED, osNone, "A tasty byproduct of the Jelly Revolution.") ITEM( '!', 0xFF00FF, "Tasty Jelly", itSwitch, IC_TREASURE, ZERO, RESERVED, osNone, "A tasty byproduct of the Jelly Revolution.")
ITEM( 'o', 0xFFFF80, "Orb of Phasing", itOrbPhasing, IC_ORB, ZERO, RESERVED, osFrog, ITEM( 'o', 0xFF0000, "Orb of Phasing", itOrbPhasing, IC_ORB, ZERO, RESERVED, osFrog,
"This orb lets you pass through walls (one cell wide), and also through monsters, as long as they will not attack you in transit.") "This orb lets you pass through walls (one cell wide), and also through monsters, as long as they will not attack you in transit.")
ITEM( 'o', 0xFFFF80, "Orb of Magnetism", itOrbMagnetism, IC_ORB, ZERO, RESERVED, osUtility, ITEM( 'o', 0xFFFF80, "Orb of Magnetism", itOrbMagnetism, IC_ORB, ZERO, RESERVED, osUtility,
"This orb makes you immediately pickup all the items on adjacent cells.") "This orb makes you immediately pickup all the items on adjacent cells.")

8
graph.cpp
View File

@ -795,8 +795,8 @@ EX color_t orb_auxiliary_color(eItem it) {
if(it == itOrbFriend || it == itOrbDiscord) return 0xC0C0C0; if(it == itOrbFriend || it == itOrbDiscord) return 0xC0C0C0;
if(it == itOrbFrog) return 0xFF0000; if(it == itOrbFrog) return 0xFF0000;
if(it == itOrbImpact) return 0xFF0000; if(it == itOrbImpact) return 0xFF0000;
if(it == itOrbPhasing) return 0xFF0000; if(it == itOrbPhasing) return 0xFFFF80;
if(it == itOrbDash) return 0xFF0000; if(it == itOrbDash) return 0x8080FF;
if(it == itOrbFreedom) return 0xC0FF00; if(it == itOrbFreedom) return 0xC0FF00;
if(it == itOrbPlague) return 0x409040; if(it == itOrbPlague) return 0x409040;
if(it == itOrbChaos) return 0xFF00FF; if(it == itOrbChaos) return 0xFF00FF;
@ -1127,9 +1127,9 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
queuepolyat(Vit*Mirror, shape, dark, prio); queuepolyat(Vit*Mirror, shape, dark, prio);
if (it == itOrbEnergy) if (it == itOrbEnergy)
queuepolyat(Vit*Mirror, shape, col, prio); queuepolyat(Vit*Mirror, shape, col, prio);
if (it == itOrbIntensity) if (it == itOrbIntensity || it == itOrbImpact)
queuepolyat(Vit, cgi.shDiskM, 0x80, prio); queuepolyat(Vit, cgi.shDiskM, 0x80, prio);
if (it == itOrbSafety || it == itOrbFreedom) if (it == itOrbSafety || it == itOrbFreedom || it == itOrbRecall)
queuepolyat(Vit, cgi.shDiskSq, 0x80, prio); queuepolyat(Vit, cgi.shDiskSq, 0x80, prio);
} }
} }