diff --git a/classes.h b/classes.h index 943c2f41..5471d213 100644 --- a/classes.h +++ b/classes.h @@ -133,7 +133,7 @@ enum eItem { itDock, itRuins, itMagnet, itSwitch, itOrbPhasing, itOrbMagnetism, itOrbSlaying, itBrownian, itWest, itVarTreasure, - itOrbBrown, itOrbGravity, itOrbChoice + itOrbIntensity, itOrbGravity, itOrbChoice }; static const int walltypes = 111; diff --git a/game.cpp b/game.cpp index 9e4f4992..432e7a8c 100644 --- a/game.cpp +++ b/game.cpp @@ -6939,7 +6939,7 @@ bool collectItem(cell *c2, bool telekinesis) { else playSound(c2, "pickup-orb"); if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true; int oc = orbcharges(it); - if(markOrb(itOrbBrown)) oc = oc * 6 / 5; + if(markOrb(itOrbIntensity)) oc = oc * 6 / 5; if(!items[it]) items[it]++; items[it] += oc; } diff --git a/inventory.cpp b/inventory.cpp index 9530db68..82329a64 100644 --- a/inventory.cpp +++ b/inventory.cpp @@ -337,7 +337,7 @@ namespace hr { namespace inv { gainOrbs(itRuins, itOrbSlaying); gainOrbs(itWest, itOrbGravity); - gainOrbs(itVarTreasure, itOrbBrown); + gainOrbs(itVarTreasure, itOrbIntensity); gainLate(itVarTreasure, itOrbFire); gainLate(itVarTreasure, itOrbWinter); gainLate(itVarTreasure, itOrbPhasing); diff --git a/orbgen.cpp b/orbgen.cpp index b386e3a8..3fbd7438 100644 --- a/orbgen.cpp +++ b/orbgen.cpp @@ -118,12 +118,12 @@ const vector orbinfos = { {orbgenflags::S_NATIVE, laMagnetic, 2000, 3000, itOrbMagnetism}, {orbgenflags::S_NATIVE, laRuins, 1200, 2500, itOrbSlaying}, {orbgenflags::S_NATIVE, laWestWall, 2000, 4200, itOrbGravity}, - {orbgenflags::S_NATIVE, laVariant, 900, 4200, itOrbChoice}, + {orbgenflags::S_NATIVE, laVariant, 900, 4200, itOrbIntensity}, {orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbFire}, {orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbWinter}, {orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbPhasing}, {orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbDash}, - {orbgenflags::S_NATIVE, laBrownian, 900, 4200, itOrbBrown}, + {orbgenflags::S_NATIVE, laBrownian, 900, 4200, itOrbChoice}, {orbgenflags::S_GUEST, laBrownian, 1000, 0, itOrbAir}, {orbgenflags::S_GUEST, laBrownian, 1000, 0, itOrbDash}, {orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last diff --git a/orbs.cpp b/orbs.cpp index 01932dd3..58b6469b 100644 --- a/orbs.cpp +++ b/orbs.cpp @@ -72,7 +72,7 @@ bool reduceOrbPower(eItem it, int cap) { items[it] -= multi::activePlayers(); if(isHaunted(cwt.at->land)) survivalist = false; if(items[it] < 0) items[it] = 0; - if(items[it] > cap && markOrb(itOrbBrown)) cap = cap * 6 / 5; + if(items[it] > cap && markOrb(itOrbIntensity)) cap = cap * 6 / 5; if(items[it] > cap && timerghost) items[it] = cap; if(items[it] == 0 && it == itOrbLove) princess::bringBack(); @@ -146,7 +146,7 @@ void reduceOrbPowers() { reduceOrbPower(itOrbSlaying, 120); reduceOrbPower(itOrbGravity, 120); reduceOrbPower(itOrbChoice, 120); - reduceOrbPower(itOrbBrown, 120); + reduceOrbPower(itOrbIntensity, 120); reduceOrbPower(itOrbSide1, 120); reduceOrbPower(itOrbSide2, 120); @@ -1355,7 +1355,7 @@ int orbcharges(eItem it) { return 45; case itOrbChoice: return 60; - case itOrbBrown: + case itOrbIntensity: return 50; case itOrbWinter: // "pickup-winter" return inv::on ? 45 : 30;