mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

renamed itOrbBrown to itOrbIntensity

Browse Source
This commit is contained in:
Zeno Rogue 2018-12-25 19:27:19 +01:00
parent 54e262c157
commit ebe75cdd62
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes.h
View File

@ -133,7 +133,7 @@ enum eItem {
itDock, itRuins, itMagnet, itSwitch, itDock, itRuins, itMagnet, itSwitch,
itOrbPhasing, itOrbMagnetism, itOrbSlaying, itOrbPhasing, itOrbMagnetism, itOrbSlaying,
itBrownian, itWest, itVarTreasure, itBrownian, itWest, itVarTreasure,
itOrbBrown, itOrbGravity, itOrbChoice itOrbIntensity, itOrbGravity, itOrbChoice
}; };
static const int walltypes = 111; static const int walltypes = 111;

2
game.cpp
View File

@ -6939,7 +6939,7 @@ bool collectItem(cell *c2, bool telekinesis) {
else playSound(c2, "pickup-orb"); else playSound(c2, "pickup-orb");
if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true; if(items[itOrbChoice]) items[itOrbChoice] = 0, had_choice = true;
int oc = orbcharges(it); int oc = orbcharges(it);
if(markOrb(itOrbBrown)) oc = oc * 6 / 5; if(markOrb(itOrbIntensity)) oc = oc * 6 / 5;
if(!items[it]) items[it]++; if(!items[it]) items[it]++;
items[it] += oc; items[it] += oc;
} }

2
inventory.cpp
View File

@ -337,7 +337,7 @@ namespace hr { namespace inv {
gainOrbs(itRuins, itOrbSlaying); gainOrbs(itRuins, itOrbSlaying);
gainOrbs(itWest, itOrbGravity); gainOrbs(itWest, itOrbGravity);
gainOrbs(itVarTreasure, itOrbBrown); gainOrbs(itVarTreasure, itOrbIntensity);
gainLate(itVarTreasure, itOrbFire); gainLate(itVarTreasure, itOrbFire);
gainLate(itVarTreasure, itOrbWinter); gainLate(itVarTreasure, itOrbWinter);
gainLate(itVarTreasure, itOrbPhasing); gainLate(itVarTreasure, itOrbPhasing);

4
orbgen.cpp
View File

@ -118,12 +118,12 @@ const vector<orbinfo> orbinfos = {
{orbgenflags::S_NATIVE, laMagnetic, 2000, 3000, itOrbMagnetism}, {orbgenflags::S_NATIVE, laMagnetic, 2000, 3000, itOrbMagnetism},
{orbgenflags::S_NATIVE, laRuins, 1200, 2500, itOrbSlaying}, {orbgenflags::S_NATIVE, laRuins, 1200, 2500, itOrbSlaying},
{orbgenflags::S_NATIVE, laWestWall, 2000, 4200, itOrbGravity}, {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, itOrbFire},
{orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbWinter}, {orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbWinter},
{orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbPhasing}, {orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbPhasing},
{orbgenflags::S_GUEST, laVariant, 4000, 0, itOrbDash}, {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, itOrbAir},
{orbgenflags::S_GUEST, laBrownian, 1000, 0, itOrbDash}, {orbgenflags::S_GUEST, laBrownian, 1000, 0, itOrbDash},
{orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last {orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last

6
orbs.cpp
View File

@ -72,7 +72,7 @@ bool reduceOrbPower(eItem it, int cap) {
items[it] -= multi::activePlayers(); items[it] -= multi::activePlayers();
if(isHaunted(cwt.at->land)) survivalist = false; if(isHaunted(cwt.at->land)) survivalist = false;
if(items[it] < 0) items[it] = 0; 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] > cap && timerghost) items[it] = cap;
if(items[it] == 0 && it == itOrbLove) if(items[it] == 0 && it == itOrbLove)
princess::bringBack(); princess::bringBack();
@ -146,7 +146,7 @@ void reduceOrbPowers() {
reduceOrbPower(itOrbSlaying, 120); reduceOrbPower(itOrbSlaying, 120);
reduceOrbPower(itOrbGravity, 120); reduceOrbPower(itOrbGravity, 120);
reduceOrbPower(itOrbChoice, 120); reduceOrbPower(itOrbChoice, 120);
reduceOrbPower(itOrbBrown, 120); reduceOrbPower(itOrbIntensity, 120);
reduceOrbPower(itOrbSide1, 120); reduceOrbPower(itOrbSide1, 120);
reduceOrbPower(itOrbSide2, 120); reduceOrbPower(itOrbSide2, 120);
@ -1355,7 +1355,7 @@ int orbcharges(eItem it) {
return 45; return 45;
case itOrbChoice: case itOrbChoice:
return 60; return 60;
case itOrbBrown: case itOrbIntensity:
return 50; return 50;
case itOrbWinter: // "pickup-winter" case itOrbWinter: // "pickup-winter"
return inv::on ? 45 : 30; return inv::on ? 45 : 30;