mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

renamed 'DogPlains' enums to 'Hunting'

Browse Source
This commit is contained in:
Zeno Rogue 2017-10-10 14:24:39 +02:00
parent fc1ad02573
commit 135e3cd336
12 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigstuff.cpp
View File

@ -1015,7 +1015,7 @@ bool openplains(cell *c) {
celllister cl(c, purehepta ? 5 : 7, 1000000, NULL); celllister cl(c, purehepta ? 5 : 7, 1000000, NULL);
for(cell *c: cl.lst) { for(cell *c: cl.lst) {
while(c->mpdist > 8) setdist(c, c->mpdist-1, NULL); while(c->mpdist > 8) setdist(c, c->mpdist-1, NULL);
if(c->land != laDogPlains) return false; if(c->land != laHunting) return false;
} }
return true; return true;
} }

4
classes.cpp
View File

@ -1239,7 +1239,7 @@ enum eItem {
itSlime, itAmethyst, itOrbRecall, itDodeca, itOrbDash, itGreenGrass, itOrbHorns, itSlime, itAmethyst, itOrbRecall, itDodeca, itOrbDash, itGreenGrass, itOrbHorns,
itOrbBull, itBull, itOrbMirror, itOrbBull, itBull, itOrbMirror,
itInventory, itInventory,
itLavaLily, itDogPlains, itBlizzard, itTerra, itLavaLily, itHunting, itBlizzard, itTerra,
itOrbSide1, itOrbSide2, itOrbSide3, itOrbSide1, itOrbSide2, itOrbSide3,
itOrbLava, itOrbMorph, itOrbLava, itOrbMorph,
}; };
@ -1679,7 +1679,7 @@ enum eLand { laNone, laBarrier, laCrossroads, laDesert, laIce, laCaves, laJungle
laPrairie, laBull, laCrossroads5, laCA, laPrairie, laBull, laCrossroads5, laCA,
laMirrorWall, laMirrored, laMirrorWall2, laMirrored2, laMirrorWall, laMirrored, laMirrorWall2, laMirrored2,
laMirrorOld, laMirrorOld,
laVolcano, laBlizzard, laDogPlains, laTerracotta, laMercuryRiver laVolcano, laBlizzard, laHunting, laTerracotta, laMercuryRiver
}; };
// cell information for the game // cell information for the game

2
flags.cpp
View File

@ -270,7 +270,7 @@ int itemclass(eItem i) {
i == itKraken || i == itBarrow || i == itTrollEgg || i == itTreat || i == itKraken || i == itBarrow || i == itTrollEgg || i == itTreat ||
i == itSlime || i == itAmethyst || i == itDodeca || i == itSlime || i == itAmethyst || i == itDodeca ||
i == itGreenGrass || i == itBull || i == itGreenGrass || i == itBull ||
i == itLavaLily || i == itDogPlains || i == itLavaLily || i == itHunting ||
i == itBlizzard || i == itTerra i == itBlizzard || i == itTerra
) )
return IC_TREASURE; return IC_TREASURE;

12
game.cpp
View File

@ -1484,7 +1484,7 @@ bool earthFloor(cell *c) {
c->wall = waNone; c->wall = waNone;
return true; return true;
} }
if(c->wall == waChasm && c->land == laDogPlains) { if(c->wall == waChasm && c->land == laHunting) {
c->wall = waNone; c->wall = waNone;
return true; return true;
} }
@ -1521,7 +1521,7 @@ bool earthWall(cell *c) {
c->wall = waBarrowDig; c->wall = waBarrowDig;
return true; return true;
} }
if(c->wall == waNone && c->land == laDogPlains) { if(c->wall == waNone && c->land == laHunting) {
c->item = itNone; c->item = itNone;
c->wall = waChasm; c->wall = waChasm;
return true; return true;
@ -6008,7 +6008,7 @@ void ambush(cell *c, eItem what) {
if(c1 != clast && cl.listed(c1) && cl.getdist(c1) == d) if(c1 != clast && cl.listed(c1) && cl.getdist(c1) == d)
c2 = c1; c2 = c1;
if(!c2) break; 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); around.push_back(c2);
clast = ccur; ccur = c2; clast = ccur; ccur = c2;
if(c2 == c0) break; if(c2 == c0) break;
@ -6016,12 +6016,12 @@ void ambush(cell *c, eItem what) {
int N = size(around); int N = size(around);
int dogs; int dogs;
int qty = items[itDogPlains]; int qty = items[itHunting];
if(ambushval) dogs = ambushval; if(ambushval) dogs = ambushval;
else else
switch(what) { switch(what) {
case itDogPlains: case itHunting:
if(qty <= 16) if(qty <= 16)
dogs = qty; dogs = qty;
else else
@ -6144,7 +6144,7 @@ bool collectItem(cell *c2, bool telekinesis) {
if(c2->item == itDodeca && peace::on) peace::simon::extend(); 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!")); addMessage(XLAT("You are ambushed!"));
ambush(c2, c2->item); ambush(c2, c2->item);
} }

6
graph.cpp
View File

@ -507,7 +507,7 @@ bool drawItemType(eItem it, cell *c, const transmatrix& V, int icol, int ticks,
it == itHolyGrail ? &shGrail : it == itHolyGrail ? &shGrail :
isElementalShard(it) ? &shElementalShard : isElementalShard(it) ? &shElementalShard :
(it == itBombEgg || it == itTrollEgg) ? &shEgg : (it == itBombEgg || it == itTrollEgg) ? &shEgg :
it == itDogPlains ? &shTriangle : it == itHunting ? &shTriangle :
it == itDodeca ? &shDodeca : it == itDodeca ? &shDodeca :
xch == '*' ? &shGem[ct6] : xch == '*' ? &shGem[ct6] :
xch == '(' ? &shKnife : xch == '(' ? &shKnife :
@ -2507,7 +2507,7 @@ void setcolors(cell *c, int& wcol, int &fcol) {
} }
break; break;
case laDogPlains: case laHunting:
// fcol = pseudohept(c) ? 0x205050 : 0x306060; // fcol = pseudohept(c) ? 0x205050 : 0x306060;
fcol = 0x40E0D0; fcol = 0x40E0D0;
fcol /= 2; fcol /= 2;
@ -3297,7 +3297,7 @@ void drawcell(cell *c, transmatrix V, int spinv, bool mirrored) {
c->land == laHalloween ? 1 : c->land == laHalloween ? 1 :
c->land == laTrollheim ? 2 : c->land == laTrollheim ? 2 :
c->land == laReptile ? 0 : c->land == laReptile ? 0 :
c->land == laDogPlains ? 1 : c->land == laHunting ? 1 :
c->land == laTerracotta ? 1 : c->land == laTerracotta ? 1 :
c->land == laMercuryRiver ? 0 : c->land == laMercuryRiver ? 0 :
2; 2;

2
inventory.cpp
View File

@ -320,7 +320,7 @@ namespace inv {
gainRandomOrbs(elementalOrbs, itElemental, 12, 0); gainRandomOrbs(elementalOrbs, itElemental, 12, 0);
gainRandomOrbs(demonicOrbs, itHell, 20, 100); gainRandomOrbs(demonicOrbs, itHell, 20, 100);
gainOrbs(itOrbLava, itLavaLily); gainOrbs(itOrbLava, itLavaLily);
gainOrbs(itOrbSide3, itDogPlains); gainOrbs(itOrbSide3, itHunting);
gainOrbs(itOrbWinter, itBlizzard); gainOrbs(itOrbWinter, itBlizzard);
gainOrbs(itOrbSide1, itTerra); gainOrbs(itOrbSide1, itTerra);

10
landgen.cpp
View File

@ -1485,15 +1485,15 @@ void giantLandSwitch(cell *c, int d, cell *from) {
} }
break; break;
case laDogPlains: case laHunting:
if(d == 7 && c->land == laDogPlains) { if(d == 7 && c->land == laHunting) {
if(hrand(1000) < 20) { if(hrand(1000) < 20) {
if(openplains(c)) { if(openplains(c)) {
if(hrand(2) == 0) { if(hrand(2) == 0) {
c->item = itDogPlains; c->item = itHunting;
vector<cell*> next; vector<cell*> next;
forCellEx(c2, c) if(c2->mpdist > 7) next.push_back(c2); 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))]; cell *c3 = next[hrand(size(next))];
forCellEx(c4, c3) if(c4->mpdist > 7 && !isNeighbor(c4, c)) forCellEx(c4, c3) if(c4->mpdist > 7 && !isNeighbor(c4, c))
c4->monst = moHunterGuard; c4->monst = moHunterGuard;
@ -1502,7 +1502,7 @@ void giantLandSwitch(cell *c, int d, cell *from) {
else placeLocalSpecial(c, 10); else placeLocalSpecial(c, 10);
} }
} }
if(hrand(5000) < items[itDogPlains]- 17 + yendor::hardness()) if(hrand(5000) < items[itHunting]- 17 + yendor::hardness())
c->monst = moHunterDog; c->monst = moHunterDog;
} }
break; break;

6
landlock.cpp
View File

@ -195,7 +195,7 @@ int isNative(eLand l, eMonster m) {
case laBlizzard: case laBlizzard:
return (m == moVoidBeast || m == moIceGolem) ? 2 : 0; return (m == moVoidBeast || m == moIceGolem) ? 2 : 0;
case laDogPlains: case laHunting:
return m == moHunterDog ? 1 : 0; return m == moHunterDog ? 1 : 0;
case laCA: return 0; case laCA: return 0;
@ -289,7 +289,7 @@ eItem treasureType(eLand l) {
case laVolcano: return itLavaLily; case laVolcano: return itLavaLily;
case laTerracotta: case laMercuryRiver: return itTerra; case laTerracotta: case laMercuryRiver: return itTerra;
case laBlizzard: return itBlizzard; case laBlizzard: return itBlizzard;
case laDogPlains: return itDogPlains; case laHunting: return itDogPlains;
case laCA: return itNone; case laCA: return itNone;
} }
@ -491,7 +491,7 @@ bool landUnlocked(eLand l) {
case laVolcano: case laVolcano:
return gold() >= R30 && items[itElixir] >= U10; return gold() >= R30 && items[itElixir] >= U10;
case laDogPlains: case laHunting:
return true; return true;
case laTerracotta: case laMercuryRiver: case laTerracotta: case laMercuryRiver:

2
monstergen.cpp
View File

@ -444,7 +444,7 @@ void wandering() {
else if(c->land == laIce && wchance(items[itDiamond], 10)) else if(c->land == laIce && wchance(items[itDiamond], 10))
c->monst = hrand(2) ? moWolf : moYeti; 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; c->monst = moHunterDog;
else if(c->land == laDesert && wchance(items[itSpice], 10)) else if(c->land == laDesert && wchance(items[itSpice], 10))

2
orbgen.cpp
View File

@ -101,7 +101,7 @@ const orbinfo orbinfos[ORBLINES] = {
{orbgenflags::S_NATIVE, laPrairie, 0, 3500, itOrbBull}, {orbgenflags::S_NATIVE, laPrairie, 0, 3500, itOrbBull},
{orbgenflags::S_GUEST, laWhirlpool, 0, 0, itOrbSafety}, {orbgenflags::S_GUEST, laWhirlpool, 0, 0, itOrbSafety},
{orbgenflags::S_NATIVE, laVolcano, 0, 7000, itOrbLava}, {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, laBlizzard, 0, 2000, itOrbWinter},
{orbgenflags::S_NATIVE, laTerracotta, 800, 2500, itOrbSide1}, {orbgenflags::S_NATIVE, laTerracotta, 800, 2500, itOrbSide1},
{orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last {orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last

3
orbs.cpp
View File

@ -698,7 +698,7 @@ eMonster summonedAt(cell *dest) {
if(dest->wall == waGiantRug) if(dest->wall == waGiantRug)
return moVizier; return moVizier;
if(dest->wall == waNone) { 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 == laBull) return moRagingBull;
if(dest->land == laPrairie) return moAirElemental; if(dest->land == laPrairie) return moAirElemental;
if(dest->land == laZebra) 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 == laBurial) return moEarthElemental;
if(dest->land == laVolcano) return moFireElemental; if(dest->land == laVolcano) return moFireElemental;
if(dest->land == laBlizzard) return moAirElemental; if(dest->land == laBlizzard) return moAirElemental;
if(dest->land == laDogPlains) return moAirElemental;
if(dest->land == laTerracotta) return moEarthElemental; if(dest->land == laTerracotta) return moEarthElemental;
if(isHaunted(dest->land)) return moGhost; if(isHaunted(dest->land)) return moGhost;
} }

2
system.cpp
View File

@ -627,7 +627,7 @@ void applyBoxes() {
// 10.1: // 10.1:
applyBoxI(itLavaLily); applyBoxI(itLavaLily);
applyBoxI(itDogPlains); applyBoxI(itHunting);
applyBoxI(itBlizzard); applyBoxI(itBlizzard);
applyBoxI(itTerra); applyBoxI(itTerra);
applyBoxOrb(itOrbSide1); applyBoxOrb(itOrbSide1);