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

renamed enums for Invincible -> Ruins

Browse Source
This commit is contained in:
Zeno Rogue 2018-01-03 21:51:11 +01:00
parent e20f336b82
commit 1e85e21fb4
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes.h
View File

@ -116,7 +116,7 @@ enum eItem {
itLavaLily, itHunting, itBlizzard, itTerra,
itOrbSide1, itOrbSide2, itOrbSide3,
itOrbLava, itOrbMorph, itGlowCrystal, itSnake,
itDock, itInvix, itMagnet, itSwitch,
itDock, itRuins, itMagnet, itSwitch,
itOrbPhasing, itOrbMagnetism, itOrbSlaying
};
@ -190,7 +190,7 @@ enum eLand { laNone, laBarrier, laCrossroads, laDesert, laIce, laCaves, laJungle
laMirrorWall, laMirrored, laMirrorWall2, laMirrored2,
laMirrorOld,
laVolcano, laBlizzard, laHunting, laTerracotta, laMercuryRiver,
laDual, laSnakeNest, laDocks, laInvincible, laMagnetic,
laDual, laSnakeNest, laDocks, laRuins, laMagnetic,
laSwitch
};

2
flags.cpp
View File

@ -277,7 +277,7 @@ int itemclass(eItem i) {
i == itGreenGrass || i == itBull ||
i == itLavaLily || i == itHunting ||
i == itBlizzard || i == itTerra || i == itGlowCrystal || i == itSnake ||
i == itDock || i == itInvix || i == itSwitch
i == itDock || i == itRuins || i == itSwitch
)
return IC_TREASURE;
if(i == itSavedPrincess || i == itStrongWind || i == itWarning)

2
graph.cpp
View File

@ -2527,7 +2527,7 @@ void setcolors(cell *c, int& wcol, int &fcol) {
case laDragon: case laStorms: case laTerracotta: case laMercuryRiver:
fcol = linf[c->land].color; break;
case laInvincible:
case laRuins:
fcol = pseudohept(c) ? 0xC0C0C0 : 0x40A040;
break;

2
help.cpp
View File

@ -545,7 +545,7 @@ string generateHelpForLand(eLand l) {
KILLREQ(moAirElemental, laWhirlwind);
}
if(l == laInvincible)
if(l == laRuins)
KILLREQ(moSkeleton, laPalace);
if(l == laTrollheim) {

2
inventory.cpp
View File

@ -331,7 +331,7 @@ namespace inv {
gainOrbs(itGlowCrystal, itOrbSide2);
gainOrbs(itSwitch, itOrbPhasing);
gainOrbs(itMagnet, itOrbMagnetism);
gainOrbs(itInvix, itOrbSlaying);
gainOrbs(itRuins, itOrbSlaying);
if(items[itOrbLove] && !items[itSavedPrincess]) items[itSavedPrincess] = 1;

8
landgen.cpp
View File

@ -1914,8 +1914,8 @@ void giantLandSwitch(cell *c, int d, cell *from) {
}
break;
case laInvincible: {
int kf = 10 + items[itInvix] + yendor::hardness();
case laRuins: {
int kf = 10 + items[itRuins] + yendor::hardness();
if(d == 8) {
if(out_ruin(c)) {
if(hrand(100) < 3)
@ -1940,8 +1940,8 @@ void giantLandSwitch(cell *c, int d, cell *from) {
c->monst = pick(moHexDemon, moHexDemon, moHexDemon, moAltDemon, moAltDemon, moMonk, moMonk, moSkeleton, moSkeleton, moCrusher);
c->hitpoints = 3;
}
if(hrand(1500) < PT(30 + kills[moHexDemon] + kills[moSkeleton] + kills[moMonk] + kills[moPair], 100) && notDippingFor(itInvix))
c->item = itInvix;
if(hrand(1500) < PT(30 + kills[moHexDemon] + kills[moSkeleton] + kills[moMonk] + kills[moPair], 100) && notDippingFor(itRuins))
c->item = itRuins;
}
break;
}

10
landlock.cpp
View File

@ -212,7 +212,7 @@ int isNative(eLand l, eMonster m) {
case laSwitch:
return m == moSwitch1 || m == moSwitch2 ? 2 : 0;
case laInvincible:
case laRuins:
return among(m, moPair, moHexDemon, moAltDemon, moMonk, moCrusher) ? 2 :
m == moSkeleton ? 1 : 0;
}
@ -309,7 +309,7 @@ eItem treasureType(eLand l) {
case laDual: return itGlowCrystal;
case laSnakeNest: return itSnake;
case laDocks: return itDock;
case laInvincible: return itInvix;
case laRuins: return itRuins;
case laSwitch: return itSwitch;
case laCA: return itNone;
@ -547,7 +547,7 @@ bool landUnlocked(eLand l) {
case laSwitch:
return gold() >= R90;
case laInvincible:
case laRuins:
return kills[moSkeleton];
}
return false;
@ -808,7 +808,7 @@ eLand getNewLand(eLand old) {
tab[cnt++] = laPalace;
if(old == laDragon && items[itElixir] >= U10) LIKELY tab[cnt++] = laReptile;
if(kills[moVizier]) tab[cnt++] = laEmerald;
if(kills[moSkeleton]) tab[cnt++] = laInvincible;
if(kills[moSkeleton]) tab[cnt++] = laRuins;
if(items[itFeather] >= U10) {
tab[cnt++] = laZebra;
if(old == laMotion || old == laHunting) LIKELY2 tab[cnt++] = laZebra;
@ -966,7 +966,7 @@ vector<eLand> land_over = {
laHell, laCrossroads3, laCocytus, laPower, laCrossroads4,
laCrossroads5,
// EXTRA
laWildWest, laHalloween, laDual, laSnakeNest, laDocks, laInvincible, laSwitch, laMagnetic, laCA
laWildWest, laHalloween, laDual, laSnakeNest, laDocks, laRuins, laSwitch, laMagnetic, laCA
};
vector<eLand> landlist;

2
orbgen.cpp
View File

@ -114,7 +114,7 @@ const orbinfo orbinfos[ORBLINES] = {
{orbgenflags::S_GUEST, laSwitch, 2000, 0, itOrbSpace},
{orbgenflags::S_NATIVE, laSwitch, 2000, 3000, itOrbPhasing},
{orbgenflags::S_NATIVE, laMagnetic, 2000, 3000, itOrbMagnetism},
{orbgenflags::S_NATIVE, laInvincible, 2000, 3000, itOrbSlaying},
{orbgenflags::S_NATIVE, laRuins, 2000, 3000, itOrbSlaying},
{orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last
};