mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-14 18:10:11 +00:00
Code Issues Releases Wiki Activity

one more special case in orb unlock descs

Browse Source
This commit is contained in:
Zeno Rogue 2017-12-03 19:12:15 +01:00
parent ec3fb2ec80
commit 12d21161bf
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
help.cpp
View File

@ -146,7 +146,8 @@ void describeOrb(string& help, const orbinfo& oi) {
if(inv::on) return; if(inv::on) return;
eOrbLandRelation olr = getOLR(oi.orb, getPrizeLand()); eOrbLandRelation olr = getOLR(oi.orb, getPrizeLand());
eItem tr = treasureType(oi.l); eItem tr = treasureType(oi.l);
help += "\n\n" + XLAT(olrDescriptions[olr], cwt.c->land, tr, treasureType(cwt.c->land)); eItem tt = treasureTypeUnlock(cwt.c->land, oi.orb);
help += "\n\n" + XLAT(olrDescriptions[olr], cwt.c->land, tr, tt);
int t = items[tr] * landMultiplier(oi.l); int t = items[tr] * landMultiplier(oi.l);
if(t >= 25) if(t >= 25)
if(olr == olrPrize25 || olr == olrPrize3 || olr == olrGuest || olr == olrMonster || olr == olrAlways) { if(olr == olrPrize25 || olr == olrPrize3 || olr == olrGuest || olr == olrMonster || olr == olrAlways) {

6
landlock.cpp
View File

@ -300,6 +300,12 @@ eItem treasureType(eLand l) {
return itNone; return itNone;
} }
eItem treasureTypeUnlock(eLand l, eItem u) {
if(u != itOrbLove && l == laPrincessQuest)
return itPalace;
return treasureType(l);
}
eLand landof(eItem it) { eLand landof(eItem it) {
for(int i=0; i<landtypes; i++) if(treasureType(eLand(i)) == it) return eLand(i); for(int i=0; i<landtypes; i++) if(treasureType(eLand(i)) == it) return eLand(i);
return laNone; return laNone;

4
menus.cpp
View File

@ -108,7 +108,7 @@ void showOverview() {
getcstat = 3000+waMirror; getcstat = 3000+waMirror;
if(getcstat == 3000+waMirror) if(getcstat == 3000+waMirror)
mouseovers = XLAT( mouseovers = XLAT(
olrDescriptions[getOLR(io, cwt.c->land)], cwt.c->land, it, treasureType(cwt.c->land)); olrDescriptions[getOLR(io, cwt.c->land)], cwt.c->land, it, treasureTypeUnlock(curland, io));
} }
else if(io) { else if(io) {
if(lv >= 25) col = 0xFFD500; if(lv >= 25) col = 0xFFD500;
@ -125,7 +125,7 @@ void showOverview() {
getcstat = 2000+io; getcstat = 2000+io;
if(getcstat == 2000+io) if(getcstat == 2000+io)
mouseovers = XLAT( mouseovers = XLAT(
olrDescriptions[getOLR(io, curland)], curland, it, treasureType(curland)); olrDescriptions[getOLR(io, curland)], curland, it, treasureTypeUnlock(curland, io));
} }
} }

2
orbgen.cpp
View File

@ -233,7 +233,7 @@ eOrbLandRelation getOLR(eItem it, eLand l) {
return olrUseless; return olrUseless;
if(it == itOrbNature && l == laWineyard) if(it == itOrbNature && l == laWineyard)
return olrDangerous; return olrDangerous;
if(it == itOrbFrog && l == laPrincessQuest) if((it == itOrbFrog || it == itOrbDiscord) && l == laPrincessQuest)
return olrGuest; return olrGuest;
if(it == itOrbDragon && l == laRlyeh) if(it == itOrbDragon && l == laRlyeh)
return olrMonster; return olrMonster;