diff --git a/content.cpp b/content.cpp index 6017fb74..9cb46b64 100644 --- a/content.cpp +++ b/content.cpp @@ -478,11 +478,11 @@ ITEM( 'o', 0x8080FF, "Orb of Winter", itOrbWinter, IC_ORB, ZERO | IF_FIREPROOF | "This orb can be used to invoke a wall of ice. It also protects you from fires.") ITEM( 'o', 0xFF6060, "Orb of Speed", itOrbSpeed, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osMovement, "This orb can be used to move faster for some time.") -ITEM( 'o', 0x90B090, "Orb of Life", itOrbLife, IC_ORB, ZERO | IF_SHMUPLIFE | IF_REVIVAL, RESERVED, osFriend, +ITEM( 'o', 0x306000, "Orb of Life", itOrbLife, IC_ORB, ZERO | IF_SHMUPLIFE | IF_REVIVAL, RESERVED, osFriend, "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, "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.") 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 " @@ -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, "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, " "and also to go into the land, creating water on the way." ) @@ -706,7 +706,7 @@ ITEM( 'o', 0xFFFF80, "Orb of the Warp", itOrb37, IC_ORB, ZERO, RESERVED, osWarpi "This Orb creates a warped zone of radius 5 around you, " "and also allows you to move diagonally in warped zones." ) -ITEM( 'o', 0xFFFF80, "Orb of Energy", itOrbEnergy, IC_ORB, ZERO, RESERVED, osPowerUtility, +ITEM( 'o', 0x8B4513, "Orb of Energy", itOrbEnergy, IC_ORB, ZERO, RESERVED, osPowerUtility, "This Orb halves the power usage of orbs which cost some " "charges with each activation. It even affects the " "one-shot orbs such as Flash or Teleport. If such an activation " @@ -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." @@ -816,7 +816,7 @@ ITEM( '*', 0x40E0D0, "Turquoise", itHunting, IC_TREASURE, ZERO, RESERVED, osNone ITEM( '*', 0x009090, "Forgotten Relic", itBlizzard, IC_TREASURE, ZERO, RESERVED, osNone, blizzarddesc) ITEM( '(', 0xFFE080, "Ancient Weapon", itTerra, IC_TREASURE, ZERO, RESERVED, osNone, "This ancient weapon is beautifully encrusted with precious gems, but you prefer your own -- it is much lighter.") -ITEM( 'o', 0x307080, "Orb of Slashing", itOrbSide1, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osOffensive, +ITEM( 'o', 0x00FF00, "Orb of Slashing", itOrbSide1, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osOffensive, "Whenever you attack with this Orb, you also hit the monsters adjacent both to you and the monster you originally attacked.") ITEM( 'o', 0x30A080, "Orb of the Triangle", itOrbSide2, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osOffensive, "Whenever you attack with this Orb, you also hit the monsters adjacent to you which are neither adjacent nor opposite to the monster " @@ -836,11 +836,11 @@ 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.") -ITEM( 'o', 0x202020, "Orb of Slaying", itOrbSlaying, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osOffensive, +ITEM( 'o', 0x20FF20, "Orb of Slaying", itOrbSlaying, IC_ORB, ZERO | IF_EMPATHY, RESERVED, osOffensive, "This Orb lets you defeat Raiders and other tough single-cell monsters in melee." ) ITEM( '*', 0xFFA860, "Tiger's Eye", itBrownian, IC_TREASURE, ZERO, RESERVED, osNone, diff --git a/geometry.cpp b/geometry.cpp index 97bb15d0..03cf0a24 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -254,16 +254,17 @@ hpcshape shTriheptaSpecial[14], shCross, shGiantStar[2], shLake, shMirror, shHalfFloor[6], shHalfMirror[3], - shGem[2], shStar, shDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shRing, + shGem[2], shStar, shFlash, shDisk, shHalfDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shEccentricDisk, shDiskSegment, + shHeptagon, shHeptagram, shTinyBird, shTinyShark, - shEgg, - shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shHeptaRing, - shSpearRing, shLoveRing, - shFrogRing, - shPowerGearRing, shProtectiveRing, shTerraRing, shMoveRing, shReserved4, shMoonDisk, - shDaisy, shTriangle, shNecro, shStatue, shKey, shWindArrow, + shEgg, shSmallEgg, + shRing, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, + shHeptaRing, shSpearRing, shLoveRing, shFrogRing, + shPowerGearRing, shProtectiveRing, shTerraRing, shMoveRing, + shReserved4, shMoonDisk, + shDaisy, shSnowflake, shTriangle, shNecro, shStatue, shKey, shWindArrow, shGun, - shFigurine, shTreat, + shFigurine, shTreat, shSmallTreat, shElementalShard, // shBranch, shIBranch, shTentacle, shTentacleX, shILeaf[3], @@ -277,30 +278,30 @@ hpcshape shWolf1, shWolf2, shWolf3, shRatEye1, shRatEye2, shRatEye3, shDogStripes, - shPBody, shPSword, shPKnife, + shPBody, shSmallPBody, shPSword, shSmallPSword, shPKnife, shFerocityM, shFerocityF, shHumanFoot, shHumanLeg, shHumanGroin, shHumanNeck, shSkeletalFoot, shYetiFoot, - shMagicSword, shMagicShovel, shSeaTentacle, shKrakenHead, shKrakenEye, shKrakenEye2, + shMagicSword, shSmallSword, shMagicShovel, shSeaTentacle, shKrakenHead, shKrakenEye, shKrakenEye2, shArrow, shPHead, shPFace, shGolemhead, shHood, shArmor, shAztecHead, shAztecCap, shSabre, shTurban1, shTurban2, shVikingHelmet, shRaiderHelmet, shRaiderArmor, shRaiderBody, shRaiderShirt, shWestHat1, shWestHat2, shGunInHand, shKnightArmor, shKnightCloak, shWightCloak, - shGhost, shEyes, shSlime, shJelly, shJoint, shWormHead, shTentHead, shShark, shWormSegment, shSmallWormSegment, shWormTail, shSmallWormTail, - shSlimeEyes, shDragonEyes, shWormEyes, shGhostEyes, - shMiniGhost, shMiniEyes, - shHedgehogBlade, shHedgehogBladePlayer, + shGhost, shEyes, shSlime, shJelly, shJoint, shWormHead, shSmallWormHead, shTentHead, shShark, shWormSegment, shSmallWormSegment, shWormTail, shSmallWormTail, + shSlimeEyes, shDragonEyes, shSmallDragonEyes, shWormEyes, shSmallWormEyes, shGhostEyes, + shMiniGhost, shSmallEyes, shMiniEyes, + shHedgehogBlade, shSmallHedgehogBlade, shHedgehogBladePlayer, shWolfBody, shWolfHead, shWolfLegs, shWolfEyes, shWolfFrontLeg, shWolfRearLeg, shWolfFrontPaw, shWolfRearPaw, shFemaleBody, shFemaleHair, shFemaleDress, shWitchDress, shWitchHair, shBeautyHair, shFlowerHair, shFlowerHand, shSuspenders, shTrophy, shBugBody, shBugArmor, shBugLeg, shBugAntenna, - shPickAxe, shPike, shFlailBall, shFlailTrunk, shFlailChain, shHammerHead, + shPickAxe, shSmallPickAxe, shPike, shFlailBall, shSmallFlailBall, shFlailTrunk, shSmallFlailTrunk, shFlailChain, shHammerHead, shSmallHammerHead, shBook, shBookCover, shGrail, shBoatOuter, shBoatInner, shCompass1, shCompass2, shCompass3, shKnife, shTongue, shFlailMissile, shTrapArrow, - shPirateHook, shPirateHood, shEyepatch, shPirateX, + shPirateHook, shSmallPirateHook, shPirateHood, shEyepatch, shPirateX, // shScratch, shHeptaMarker, shSnowball, shHugeDisk, shSun, shNightStar, shEuclideanSky, shSkeletonBody, shSkull, shSkullEyes, shFatBody, shWaterElemental, @@ -309,11 +310,11 @@ hpcshape shPrincessDress, shPrinceDress, shWizardCape1, shWizardCape2, shBigCarpet1, shBigCarpet2, shBigCarpet3, - shGoatHead, shRose, shRoseItem, shThorns, + shGoatHead, shRose, shRoseItem, shSmallRose, shThorns, shRatHead, shRatTail, shRatEyes, shRatCape1, shRatCape2, shWizardHat1, shWizardHat2, shTortoise[13][6], - shDragonLegs, shDragonTail, shDragonHead, shDragonSegment, shDragonNostril, + shDragonLegs, shDragonTail, shDragonHead, shSmallDragonHead, shDragonSegment, shDragonNostril, shSmallDragonNostril, shDragonWings, shSolidBranch, shWeakBranch, shBead0, shBead1, shBatWings, shBatBody, shBatMouth, shBatFang, shBatEye, @@ -326,6 +327,8 @@ hpcshape shTrylobiteFrontLeg, shTrylobiteRearLeg, shTrylobiteFrontClaw, shTrylobiteRearClaw, shBullBody, shBullHead, shBullHorn, shBullRearHoof, shBullFrontHoof, + shSmallBullHead, shSmallBullHorn, + shTinyBullHead, shTinyBullHorn, shTinyBullBody, shButterflyBody, shButterflyWing, shGadflyBody, shGadflyWing, shGadflyEye, @@ -338,9 +341,12 @@ hpcshape shPBodyOnly, shPBodyArm, shPBodyHand, shPHeadOnly, - shDodeca; + shDodeca, shSmallerDodeca, + + shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass, + shShield, shSmallFan, shTreeIcon, shLeafIcon; - hpcshape shFrogRearFoot, shFrogFrontFoot, shFrogRearLeg, shFrogFrontLeg, shFrogRearLeg2, shFrogBody, shFrogEye, shFrogStripe, shFrogJumpFoot, shFrogJumpLeg; + hpcshape shFrogRearFoot, shFrogFrontFoot, shFrogRearLeg, shFrogFrontLeg, shFrogRearLeg2, shFrogBody, shFrogEye, shFrogStripe, shFrogJumpFoot, shFrogJumpLeg, shSmallFrogRearFoot, shSmallFrogFrontFoot, shSmallFrogRearLeg, shSmallFrogFrontLeg, shSmallFrogRearLeg2, shSmallFrogBody; hpcshape_animated shAnimatedEagle, shAnimatedTinyEagle, shAnimatedGadfly, shAnimatedHawk, shAnimatedButterfly, diff --git a/graph.cpp b/graph.cpp index e6e57e7a..4b1c28a8 100644 --- a/graph.cpp +++ b/graph.cpp @@ -192,7 +192,7 @@ EX void drawShield(const shiftmatrix& V, eItem it) { #endif } -void drawSpeed(const shiftmatrix& V) { +void drawSpeed(const shiftmatrix& V, ld scale=1) { #if CAP_CURVE ld ds = ptick(10); color_t col = darkena(iinf[itOrbSpeed].color, 0, 0xFF); @@ -202,7 +202,7 @@ void drawSpeed(const shiftmatrix& V) { #endif for(int b=0; b