mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-16 22:24:07 +00:00
Code Issues Releases Wiki Activity

Use Pickaxe shape for Orb of Earth ("Digging").

Browse Source
This commit is contained in:
Jacob Mandelson 2022-08-26 19:10:39 -07:00
parent 064468b480
commit 3521ee917c
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content.cpp
View File

@ -482,7 +482,7 @@ ITEM( 'o', 0x306000, "Orb of Life", itOrbLife, IC_ORB, ZERO | IF_SHMUPLIFE | IF_
"This orb can be used to summon friendly golems. It is used instantly when you pick it up.") "This orb can be used to summon friendly golems. It is used instantly when you pick it up.")
ITEM( 'o', 0x60D760, "Orb of Shielding", itOrbShield, IC_ORB, ZERO | IF_PROTECTION | IF_EMPATHY, RESERVED, osProtective, ITEM( 'o', 0x60D760, "Orb of Shielding", itOrbShield, IC_ORB, ZERO | IF_PROTECTION | IF_EMPATHY, RESERVED, osProtective,
"This orb can protect you from damage.") "This orb can protect you from damage.")
ITEM( 'o', 0x606060, "Orb of Earth", itOrbDigging, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osTerraform, ITEM( 'o', 0x00FF00, "Orb of Earth", itOrbDigging, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osTerraform,
"This orb lets you go through living walls. It also has powers in some of the other lands.") "This orb lets you go through living walls. It also has powers in some of the other lands.")
ITEM( 'o', 0x20FFFF, "Orb of Teleport", itOrbTeleport, IC_ORB, ZERO | IF_RANGED, RESERVED, osRanged, ITEM( 'o', 0x20FFFF, "Orb of Teleport", itOrbTeleport, IC_ORB, ZERO | IF_RANGED, RESERVED, osRanged,
"This orb lets you instantly move to another location on the map. Just click a location which " "This orb lets you instantly move to another location on the map. Just click a location which "

2
geometry.cpp
View File

@ -295,7 +295,7 @@ hpcshape
shFemaleBody, shFemaleHair, shFemaleDress, shWitchDress, shFemaleBody, shFemaleHair, shFemaleDress, shWitchDress,
shWitchHair, shBeautyHair, shFlowerHair, shFlowerHand, shSuspenders, shTrophy, shWitchHair, shBeautyHair, shFlowerHair, shFlowerHand, shSuspenders, shTrophy,
shBugBody, shBugArmor, shBugLeg, shBugAntenna, shBugBody, shBugArmor, shBugLeg, shBugAntenna,
shPickAxe, shPike, shFlailBall, shFlailTrunk, shSmallFlailTrunk, shFlailChain, shHammerHead, shSmallHammerHead, shPickAxe, shSmallPickAxe, shPike, shFlailBall, shFlailTrunk, shSmallFlailTrunk, shFlailChain, shHammerHead, shSmallHammerHead,
shBook, shBookCover, shGrail, shBook, shBookCover, shGrail,
shBoatOuter, shBoatInner, shCompass1, shCompass2, shCompass3, shBoatOuter, shBoatInner, shCompass1, shCompass2, shCompass3,
shKnife, shTongue, shFlailMissile, shTrapArrow, shKnife, shTongue, shFlailMissile, shTrapArrow,

2
graph.cpp
View File

@ -807,6 +807,7 @@ EX color_t orb_auxiliary_color(eItem it) {
if(it == itOrbLife) return 0x90B090; if(it == itOrbLife) return 0x90B090;
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;
return iinf[it].color; return iinf[it].color;
} }
@ -1088,6 +1089,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int
else { else {
auto shape = (it == itOrbFriend) ? cgi.shTinyBird : auto shape = (it == itOrbFriend) ? cgi.shTinyBird :
(it == itOrbSide1) ? cgi.shSmallPSword : (it == itOrbSide1) ? cgi.shSmallPSword :
(it == itOrbDigging) ? cgi.shSmallPickAxe :
cgi.shDisk; cgi.shDisk;
queuepolyat(Vit, shape, dark, prio); queuepolyat(Vit, shape, dark, prio);
if (it == itOrbSide1) if (it == itOrbSide1)

1
polygons.cpp
View File

@ -1460,6 +1460,7 @@ void geometry_information::prepare_shapes() {
bshape(shWolfEyes, PPR::MONSTER_EYE0, WOLF, 147); bshape(shWolfEyes, PPR::MONSTER_EYE0, WOLF, 147);
bshape(shWitchDress, PPR::MONSTER_ARMOR0, scalefactor, 148); bshape(shWitchDress, PPR::MONSTER_ARMOR0, scalefactor, 148);
bshape(shPickAxe, PPR::MONSTER_WPN, scalefactor, 149); bshape(shPickAxe, PPR::MONSTER_WPN, scalefactor, 149);
bshape(shSmallPickAxe, PPR::MONSTER_WPN, scalefactor/2, 149);
bshape(shPike, PPR::MONSTER_WPN, scalefactor, 150); bshape(shPike, PPR::MONSTER_WPN, scalefactor, 150);
bshape(shFlailBall, PPR::MONSTER_WPN, scalefactor, 151); bshape(shFlailBall, PPR::MONSTER_WPN, scalefactor, 151);
bshape(shFlailTrunk, PPR::MONSTER_WPN, scalefactor, 152); bshape(shFlailTrunk, PPR::MONSTER_WPN, scalefactor, 152);