From 135e3cd336262f0f98fccdba731c8fdcbbd81a0c Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 10 Oct 2017 14:24:39 +0200 Subject: [PATCH] renamed 'DogPlains' enums to 'Hunting' --- bigstuff.cpp | 2 +- classes.cpp | 4 ++-- flags.cpp | 2 +- game.cpp | 12 ++++++------ graph.cpp | 6 +++--- inventory.cpp | 2 +- landgen.cpp | 10 +++++----- landlock.cpp | 6 +++--- monstergen.cpp | 2 +- orbgen.cpp | 2 +- orbs.cpp | 3 +-- system.cpp | 2 +- 12 files changed, 26 insertions(+), 27 deletions(-) diff --git a/bigstuff.cpp b/bigstuff.cpp index 9d2f8ae0..e7473e0a 100644 --- a/bigstuff.cpp +++ b/bigstuff.cpp @@ -1015,7 +1015,7 @@ bool openplains(cell *c) { celllister cl(c, purehepta ? 5 : 7, 1000000, NULL); for(cell *c: cl.lst) { while(c->mpdist > 8) setdist(c, c->mpdist-1, NULL); - if(c->land != laDogPlains) return false; + if(c->land != laHunting) return false; } return true; } diff --git a/classes.cpp b/classes.cpp index 2bfc2ccc..a7164399 100644 --- a/classes.cpp +++ b/classes.cpp @@ -1239,7 +1239,7 @@ enum eItem { itSlime, itAmethyst, itOrbRecall, itDodeca, itOrbDash, itGreenGrass, itOrbHorns, itOrbBull, itBull, itOrbMirror, itInventory, - itLavaLily, itDogPlains, itBlizzard, itTerra, + itLavaLily, itHunting, itBlizzard, itTerra, itOrbSide1, itOrbSide2, itOrbSide3, itOrbLava, itOrbMorph, }; @@ -1679,7 +1679,7 @@ enum eLand { laNone, laBarrier, laCrossroads, laDesert, laIce, laCaves, laJungle laPrairie, laBull, laCrossroads5, laCA, laMirrorWall, laMirrored, laMirrorWall2, laMirrored2, laMirrorOld, - laVolcano, laBlizzard, laDogPlains, laTerracotta, laMercuryRiver + laVolcano, laBlizzard, laHunting, laTerracotta, laMercuryRiver }; // cell information for the game diff --git a/flags.cpp b/flags.cpp index cd1c0d43..d69fcbce 100644 --- a/flags.cpp +++ b/flags.cpp @@ -270,7 +270,7 @@ int itemclass(eItem i) { i == itKraken || i == itBarrow || i == itTrollEgg || i == itTreat || i == itSlime || i == itAmethyst || i == itDodeca || i == itGreenGrass || i == itBull || - i == itLavaLily || i == itDogPlains || + i == itLavaLily || i == itHunting || i == itBlizzard || i == itTerra ) return IC_TREASURE; diff --git a/game.cpp b/game.cpp index bf7f6917..52f0d8e8 100644 --- a/game.cpp +++ b/game.cpp @@ -1484,7 +1484,7 @@ bool earthFloor(cell *c) { c->wall = waNone; return true; } - if(c->wall == waChasm && c->land == laDogPlains) { + if(c->wall == waChasm && c->land == laHunting) { c->wall = waNone; return true; } @@ -1521,7 +1521,7 @@ bool earthWall(cell *c) { c->wall = waBarrowDig; return true; } - if(c->wall == waNone && c->land == laDogPlains) { + if(c->wall == waNone && c->land == laHunting) { c->item = itNone; c->wall = waChasm; return true; @@ -6008,7 +6008,7 @@ void ambush(cell *c, eItem what) { if(c1 != clast && cl.listed(c1) && cl.getdist(c1) == d) c2 = c1; if(!c2) break; - if(c2->land == laDogPlains && c2->wall == waNone && c2->monst == moNone) + if(c2->land == laHunting && c2->wall == waNone && c2->monst == moNone) around.push_back(c2); clast = ccur; ccur = c2; if(c2 == c0) break; @@ -6016,12 +6016,12 @@ void ambush(cell *c, eItem what) { int N = size(around); int dogs; - int qty = items[itDogPlains]; + int qty = items[itHunting]; if(ambushval) dogs = ambushval; else switch(what) { - case itDogPlains: + case itHunting: if(qty <= 16) dogs = qty; else @@ -6144,7 +6144,7 @@ bool collectItem(cell *c2, bool telekinesis) { if(c2->item == itDodeca && peace::on) peace::simon::extend(); } - if(c2->land == laDogPlains && c2->item) { + if(c2->land == laHunting && c2->item) { addMessage(XLAT("You are ambushed!")); ambush(c2, c2->item); } diff --git a/graph.cpp b/graph.cpp index 3c53ca2c..605311fe 100644 --- a/graph.cpp +++ b/graph.cpp @@ -507,7 +507,7 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks, it == itHolyGrail ? &shGrail : isElementalShard(it) ? &shElementalShard : (it == itBombEgg || it == itTrollEgg) ? &shEgg : - it == itDogPlains ? &shTriangle : + it == itHunting ? &shTriangle : it == itDodeca ? &shDodeca : xch == '*' ? &shGem[ct6] : xch == '(' ? &shKnife : @@ -2507,7 +2507,7 @@ void setcolors(cell *c, int& wcol, int &fcol) { } break; - case laDogPlains: + case laHunting: // fcol = pseudohept(c) ? 0x205050 : 0x306060; fcol = 0x40E0D0; fcol /= 2; @@ -3297,7 +3297,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) { c->land == laHalloween ? 1 : c->land == laTrollheim ? 2 : c->land == laReptile ? 0 : - c->land == laDogPlains ? 1 : + c->land == laHunting ? 1 : c->land == laTerracotta ? 1 : c->land == laMercuryRiver ? 0 : 2; diff --git a/inventory.cpp b/inventory.cpp index a39e244a..0cfc1912 100644 --- a/inventory.cpp +++ b/inventory.cpp @@ -320,7 +320,7 @@ namespace inv { gainRandomOrbs(elementalOrbs, itElemental, 12, 0); gainRandomOrbs(demonicOrbs, itHell, 20, 100); gainOrbs(itOrbLava, itLavaLily); - gainOrbs(itOrbSide3, itDogPlains); + gainOrbs(itOrbSide3, itHunting); gainOrbs(itOrbWinter, itBlizzard); gainOrbs(itOrbSide1, itTerra); diff --git a/landgen.cpp b/landgen.cpp index 722ee6f3..127c7eab 100644 --- a/landgen.cpp +++ b/landgen.cpp @@ -1485,15 +1485,15 @@ void giantLandSwitch(cell *c, int d, cell *from) { } break; - case laDogPlains: - if(d == 7 && c->land == laDogPlains) { + case laHunting: + if(d == 7 && c->land == laHunting) { if(hrand(1000) < 20) { if(openplains(c)) { if(hrand(2) == 0) { - c->item = itDogPlains; + c->item = itHunting; vector next; forCellEx(c2, c) if(c2->mpdist > 7) next.push_back(c2); - if(size(next) && items[itDogPlains] < 10) { + if(size(next) && items[itHunting] < 10) { cell *c3 = next[hrand(size(next))]; forCellEx(c4, c3) if(c4->mpdist > 7 && !isNeighbor(c4, c)) c4->monst = moHunterGuard; @@ -1502,7 +1502,7 @@ void giantLandSwitch(cell *c, int d, cell *from) { else placeLocalSpecial(c, 10); } } - if(hrand(5000) < items[itDogPlains]- 17 + yendor::hardness()) + if(hrand(5000) < items[itHunting]- 17 + yendor::hardness()) c->monst = moHunterDog; } break; diff --git a/landlock.cpp b/landlock.cpp index dfc34cc0..0e25896d 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -195,7 +195,7 @@ int isNative(eLand l, eMonster m) { case laBlizzard: return (m == moVoidBeast || m == moIceGolem) ? 2 : 0; - case laDogPlains: + case laHunting: return m == moHunterDog ? 1 : 0; case laCA: return 0; @@ -289,7 +289,7 @@ eItem treasureType(eLand l) { case laVolcano: return itLavaLily; case laTerracotta: case laMercuryRiver: return itTerra; case laBlizzard: return itBlizzard; - case laDogPlains: return itDogPlains; + case laHunting: return itDogPlains; case laCA: return itNone; } @@ -491,7 +491,7 @@ bool landUnlocked(eLand l) { case laVolcano: return gold() >= R30 && items[itElixir] >= U10; - case laDogPlains: + case laHunting: return true; case laTerracotta: case laMercuryRiver: diff --git a/monstergen.cpp b/monstergen.cpp index 96ec1a17..c3ae5e5f 100644 --- a/monstergen.cpp +++ b/monstergen.cpp @@ -444,7 +444,7 @@ void wandering() { else if(c->land == laIce && wchance(items[itDiamond], 10)) c->monst = hrand(2) ? moWolf : moYeti; - else if(c->land == laDogPlains && wchance(items[itDogPlains], 50, 26)) + else if(c->land == laHunting && wchance(items[itDogPlains], 50, 26)) c->monst = moHunterDog; else if(c->land == laDesert && wchance(items[itSpice], 10)) diff --git a/orbgen.cpp b/orbgen.cpp index a7c2e24e..669c0fc4 100644 --- a/orbgen.cpp +++ b/orbgen.cpp @@ -101,7 +101,7 @@ const orbinfo orbinfos[ORBLINES] = { {orbgenflags::S_NATIVE, laPrairie, 0, 3500, itOrbBull}, {orbgenflags::S_GUEST, laWhirlpool, 0, 0, itOrbSafety}, {orbgenflags::S_NATIVE, laVolcano, 0, 7000, itOrbLava}, - {orbgenflags::S_NATIVE, laDogPlains, 0, 2500, itOrbSide3}, + {orbgenflags::S_NATIVE, laHunting, 0, 2500, itOrbSide3}, {orbgenflags::S_NATIVE, laBlizzard, 0, 2000, itOrbWinter}, {orbgenflags::S_NATIVE, laTerracotta, 800, 2500, itOrbSide1}, {orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last diff --git a/orbs.cpp b/orbs.cpp index 7eb5a9bd..4c68b0ec 100644 --- a/orbs.cpp +++ b/orbs.cpp @@ -698,7 +698,7 @@ eMonster summonedAt(cell *dest) { if(dest->wall == waGiantRug) return moVizier; if(dest->wall == waNone) { - if(dest->land == laDogPlains) return moAirElemental; + if(dest->land == laHunting) return moAirElemental; if(dest->land == laBull) return moRagingBull; if(dest->land == laPrairie) return moAirElemental; if(dest->land == laZebra) return moAirElemental; @@ -738,7 +738,6 @@ eMonster summonedAt(cell *dest) { if(dest->land == laBurial) return moEarthElemental; if(dest->land == laVolcano) return moFireElemental; if(dest->land == laBlizzard) return moAirElemental; - if(dest->land == laDogPlains) return moAirElemental; if(dest->land == laTerracotta) return moEarthElemental; if(isHaunted(dest->land)) return moGhost; } diff --git a/system.cpp b/system.cpp index aeddca83..fff5bb51 100644 --- a/system.cpp +++ b/system.cpp @@ -627,7 +627,7 @@ void applyBoxes() { // 10.1: applyBoxI(itLavaLily); - applyBoxI(itDogPlains); + applyBoxI(itHunting); applyBoxI(itBlizzard); applyBoxI(itTerra); applyBoxOrb(itOrbSide1);