mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #160 from jruderman/slaying_in_hubs

Browse Source 
Orb of Slaying can now appear in hub lands
This commit is contained in:
Zeno Rogue 2021-06-28 20:56:44 +02:00 committed by GitHub
commit ecc33f9d80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
orbgen.cpp
View File

@ -240,11 +240,6 @@ EX eOrbLandRelation getOLR(eItem it, eLand l) {
if(it == itOrbDigging && l == laKraken) return olrUseless; if(it == itOrbDigging && l == laKraken) return olrUseless;
if(it == itOrbIllusion && l == laKraken) return olrUseless; if(it == itOrbIllusion && l == laKraken) return olrUseless;
if(it == itOrbSlaying && !among(l,
laMirror, laHell, laEmerald, laDryForest, laCamelot, laPalace, laStorms, laRose, laTortoise, laBurial, laDungeon, laReptile,
laPrairie, laBull, laVolcano, laTerracotta, laRuins, laVariant, laEclectic, laBrownian))
return olrUseless;
if(it == itOrbYendor && among(l, laWhirlwind, laWestWall)) return olrUseless; if(it == itOrbYendor && among(l, laWhirlwind, laWestWall)) return olrUseless;
if(it == itOrbLife && (l == laKraken)) return olrUseless; if(it == itOrbLife && (l == laKraken)) return olrUseless;
@ -300,6 +295,11 @@ EX eOrbLandRelation getOLR(eItem it, eLand l) {
if(isCrossroads(l) || l == laOcean) if(isCrossroads(l) || l == laOcean)
return olrHub; return olrHub;
if(it == itOrbSlaying && !among(l,
laMirror, laHell, laEmerald, laDryForest, laCamelot, laPalace, laStorms, laRose, laTortoise, laBurial, laDungeon, laReptile,
laPrairie, laBull, laVolcano, laTerracotta, laRuins, laVariant, laEclectic, laBrownian))
return olrUseless;
if(l == laCocytus) if(l == laCocytus)
if(it == itOrbDragon || it == itOrbFire || it == itOrbFlash || it == itOrbLightning) if(it == itOrbDragon || it == itOrbFire || it == itOrbFlash || it == itOrbLightning)
return olrDangerous; return olrDangerous;