mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-06-30 08:52:52 +00:00
Code Issues Releases Wiki Activity

Orb of Purity and Orb of Water.

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

4
content.cpp
View File

@ -591,7 +591,7 @@ ITEM( '$', 0xFFFFFF, "Pearl", itWhirlpool, IC_TREASURE, ZERO, RESERVED, osNone,
ITEM( 'o', 0x306000, "Orb of Friendship", itOrbFriend, IC_ORB, ZERO | IF_SHMUPLIFE | IF_REVIVAL, RESERVED, osFriend, ITEM( 'o', 0x306000, "Orb of Friendship", itOrbFriend, IC_ORB, ZERO | IF_SHMUPLIFE | IF_REVIVAL, RESERVED, osFriend,
"This Orb summons a friendly Bomberbird." "This Orb summons a friendly Bomberbird."
) )
ITEM( 'o', 0x000060, "Orb of Water", itOrbWater, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osTerraform, ITEM( 'o', 0x0070C0, "Orb of Water", itOrbWater, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osTerraform,
"This Orb allows your boat to go against the current, " "This Orb allows your boat to go against the current, "
"and also to go into the land, creating water on the way." "and also to go into the land, creating water on the way."
) )
@ -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', 0xF0F0FF, "Orb of Purity", itOrbPurity, IC_ORB, ZERO, RESERVED, osProtective, ITEM( 'o', 0xFFD520, "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

@ -255,7 +255,7 @@ hpcshape
shHalfFloor[6], shHalfMirror[3], shHalfFloor[6], shHalfMirror[3],
shGem[2], shStar, shFlash, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shEccentricDisk, shGem[2], shStar, shFlash, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shEccentricDisk,
shTinyBird, shTinyShark, shTinyBird, shTinyShark,
shEgg, shEgg, shSmallEgg,
shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing,
shHeptaRing, shSpearRing, shLoveRing, shFrogRing, shHeptaRing, shSpearRing, shLoveRing, shFrogRing,
shPowerGearRing, shProtectiveRing, shTerraRing, shMoveRing, shPowerGearRing, shProtectiveRing, shTerraRing, shMoveRing,

5
graph.cpp
View File

@ -792,6 +792,7 @@ void queue_ring(const shiftmatrix& V, hpcshape& sh, color_t col, PPR p) {
EX color_t orb_auxiliary_color(eItem it) { EX color_t orb_auxiliary_color(eItem it) {
if(it == itOrbFire) return firecolor(200); if(it == itOrbFire) return firecolor(200);
if(it == itOrbWater) return 0x000060;
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;
@ -807,8 +808,8 @@ EX color_t orb_auxiliary_color(eItem it) {
if(it == itOrbSlaying) return 0xFF0000; if(it == itOrbSlaying) return 0xFF0000;
if(it == itOrbSide1) return 0x307080; if(it == itOrbSide1) return 0x307080;
if(it == itOrbDigging) return 0x606060; if(it == itOrbDigging) return 0x606060;
//if(it == itOrbEnergy) return 0x8B4513;
if(it == itOrbEnergy) return 0xFFFF80; if(it == itOrbEnergy) return 0xFFFF80;
if(it == itOrbPurity) return 0xF0F0FF;
return iinf[it].color; return iinf[it].color;
} }
@ -1098,6 +1099,8 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
queuepolyat(Vit, cgi.shSmallFlailTrunk, dark, prio); queuepolyat(Vit, cgi.shSmallFlailTrunk, dark, prio);
queuepolyat(Vit, cgi.shSmallHammerHead, col, prio); queuepolyat(Vit, cgi.shSmallHammerHead, col, prio);
} }
else if (it == itOrbPurity)
queuepolyat(Vit, cgi.shSmallEgg, dark, prio);
/*else if (it == itOrbNature) { /*else if (it == itOrbNature) {
//queuepolyat(Vit, cgi.shILeaf[0], dark, prio); //queuepolyat(Vit, cgi.shILeaf[0], dark, prio);
//queuepolyat(Vit, cgi.shILeaf[0], dark, prio); //queuepolyat(Vit, cgi.shILeaf[0], dark, prio);

4
polygons.cpp
View File

@ -636,6 +636,10 @@ void geometry_information::procedural_shapes() {
bshape(shEgg, PPR::ITEM); bshape(shEgg, PPR::ITEM);
RING(i) RING(i)
hpcpush(hpxy(sin(i*2*M_PI/S84)*0.242 * orbsize, cos(i*2*M_PI/S84)*0.177*orbsize)); hpcpush(hpxy(sin(i*2*M_PI/S84)*0.242 * orbsize, cos(i*2*M_PI/S84)*0.177*orbsize));
bshape(shSmallEgg, PPR::ITEM);
RING(i)
hpcpush(hpxy(sin(i*2*M_PI/S84)*0.242 * orbsize/2, cos(i*2*M_PI/S84)*0.177*orbsize/2));
auto make_ring = [this] (hpcshape& sh, reaction_t f) { auto make_ring = [this] (hpcshape& sh, reaction_t f) {
bshape(sh, PPR::ITEM); bshape(sh, PPR::ITEM);