mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

fixed the incorrect lines in help description (incorrect repetitions, Guest states)

Browse Source
This commit is contained in:
Zeno Rogue
2017-12-03 19:01:35 +01:00
parent 6805673513
commit 386ea268f7
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
help.cpp
View File

@@ -296,7 +296,7 @@ string generateHelpForItem(eItem it) {
if(itemclass(it) == IC_ORB || it == itGreenStone || it == itOrbYendor) { if(itemclass(it) == IC_ORB || it == itGreenStone || it == itOrbYendor) {
for(int i=0; i<ORBLINES; i++) { for(int i=0; i<ORBLINES; i++) {
const orbinfo& oi(orbinfos[i]); const orbinfo& oi(orbinfos[i]);
if(oi.orb == it) describeOrb(help, oi); if(oi.orb == it && oi.is_native()) describeOrb(help, oi);
} }
} }

13
orbgen.cpp
View File

@@ -25,10 +25,12 @@ namespace orbgenflags {
static const int OSM_GLOBAL100 = 1024; static const int OSM_GLOBAL100 = 1024;
// do not create in the Crossroads in the tactics mode // do not create in the Crossroads in the tactics mode
static const int NO_TACTIC = (1<<11); static const int NO_TACTIC = (1<<11);
// guest Orb
static const int GUEST = (1<<12);
// typical combinations // typical combinations
static const int S_NATIVE = LOCAL10 | CROSS10 | GLOBAL25 | NATIVE; static const int S_NATIVE = LOCAL10 | CROSS10 | GLOBAL25 | NATIVE;
static const int S_GUEST = LOCAL10 | OSM_AT10; static const int S_GUEST = LOCAL10 | OSM_AT10 | GUEST;
static const int S_YENDOR = S_NATIVE | OSM_LOCAL25 | OSM_CROSS50 | OSM_GLOBAL100 | NO_TACTIC; static const int S_YENDOR = S_NATIVE | OSM_LOCAL25 | OSM_CROSS50 | OSM_GLOBAL100 | NO_TACTIC;
static const int S_NAT_NT = S_NATIVE | NO_TACTIC; static const int S_NAT_NT = S_NATIVE | NO_TACTIC;
static const int S_NA_O25 = S_NATIVE | OSM_CROSS25; static const int S_NA_O25 = S_NATIVE | OSM_CROSS25;
@@ -208,8 +210,11 @@ eOrbLandRelation getOLR(eItem it, eLand l) {
if(it == itOrbIllusion && l == laCamelot) return olrNative1; if(it == itOrbIllusion && l == laCamelot) return olrNative1;
if(it == itOrbLove) return olrNoPrizeOrb; if(it == itOrbLove) return olrNoPrizeOrb;
if(nativeOrbType(l) == it) return olrNative; if(nativeOrbType(l) == it) return olrNative;
if(it == itOrbWinter && (l == laIce || l == laDryForest || l == laDragon))
for(orbinfo& oi: orbinfos)
if(oi.flags && orbgenflags::GUEST && oi.l == l && oi.orb == it)
return olrGuest; return olrGuest;
if(it == itOrbLuck && l == laIvoryTower) if(it == itOrbLuck && l == laIvoryTower)
return olrUseless; return olrUseless;
if(it == itOrbLuck && l == laEndorian) if(it == itOrbLuck && l == laEndorian)
@@ -228,9 +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 == itOrbDigging && l == laCaves) if(it == itOrbFrog && l == laPrincessQuest)
return olrGuest;
if(it == itOrbFrog && (l == laPalace || l == laPrincessQuest))
return olrGuest; return olrGuest;
if(it == itOrbDragon && l == laRlyeh) if(it == itOrbDragon && l == laRlyeh)
return olrMonster; return olrMonster;