From 1e85e21fb48fbb2da6e8febf8f51719195a6c87e Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Wed, 3 Jan 2018 21:51:11 +0100 Subject: [PATCH] renamed enums for Invincible -> Ruins --- classes.h | 4 ++-- flags.cpp | 2 +- graph.cpp | 2 +- help.cpp | 2 +- inventory.cpp | 2 +- landgen.cpp | 8 ++++---- landlock.cpp | 10 +++++----- orbgen.cpp | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/classes.h b/classes.h index de7a2b46..5bee0049 100644 --- a/classes.h +++ b/classes.h @@ -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 }; diff --git a/flags.cpp b/flags.cpp index 788e3a9d..f646bcf9 100644 --- a/flags.cpp +++ b/flags.cpp @@ -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) diff --git a/graph.cpp b/graph.cpp index 224342d9..133880b2 100644 --- a/graph.cpp +++ b/graph.cpp @@ -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; diff --git a/help.cpp b/help.cpp index edb6db47..3e9a4393 100644 --- a/help.cpp +++ b/help.cpp @@ -545,7 +545,7 @@ string generateHelpForLand(eLand l) { KILLREQ(moAirElemental, laWhirlwind); } - if(l == laInvincible) + if(l == laRuins) KILLREQ(moSkeleton, laPalace); if(l == laTrollheim) { diff --git a/inventory.cpp b/inventory.cpp index 73548272..c48ed279 100644 --- a/inventory.cpp +++ b/inventory.cpp @@ -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; diff --git a/landgen.cpp b/landgen.cpp index fda992cc..0f88d950 100644 --- a/landgen.cpp +++ b/landgen.cpp @@ -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; } diff --git a/landlock.cpp b/landlock.cpp index 7d39ea00..5cd78fb5 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -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 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 landlist; diff --git a/orbgen.cpp b/orbgen.cpp index 27a1a8ae..0d7f7805 100644 --- a/orbgen.cpp +++ b/orbgen.cpp @@ -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 };