diff --git a/content.cpp b/content.cpp index 0d127144..f66b9d02 100644 --- a/content.cpp +++ b/content.cpp @@ -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, "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. " "You can only vault in a roughly straight line. " "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( '*', 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( '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.") ITEM( 'o', 0xFFFF80, "Orb of Magnetism", itOrbMagnetism, IC_ORB, ZERO, RESERVED, osUtility, "This orb makes you immediately pickup all the items on adjacent cells.") diff --git a/graph.cpp b/graph.cpp index c589eb56..addb10f6 100644 --- a/graph.cpp +++ b/graph.cpp @@ -795,8 +795,8 @@ EX color_t orb_auxiliary_color(eItem it) { if(it == itOrbFriend || it == itOrbDiscord) return 0xC0C0C0; if(it == itOrbFrog) return 0xFF0000; if(it == itOrbImpact) return 0xFF0000; - if(it == itOrbPhasing) return 0xFF0000; - if(it == itOrbDash) return 0xFF0000; + if(it == itOrbPhasing) return 0xFFFF80; + if(it == itOrbDash) return 0x8080FF; if(it == itOrbFreedom) return 0xC0FF00; if(it == itOrbPlague) return 0x409040; 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); if (it == itOrbEnergy) queuepolyat(Vit*Mirror, shape, col, prio); - if (it == itOrbIntensity) + if (it == itOrbIntensity || it == itOrbImpact) queuepolyat(Vit, cgi.shDiskM, 0x80, prio); - if (it == itOrbSafety || it == itOrbFreedom) + if (it == itOrbSafety || it == itOrbFreedom || it == itOrbRecall) queuepolyat(Vit, cgi.shDiskSq, 0x80, prio); } }