1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-10-31 19:36:16 +00:00

fixed the orb generation in the Whirlpool in OSM

This commit is contained in:
Zeno Rogue 2017-08-13 21:16:59 +02:00
parent 0afeb9986e
commit f2b34f8466

View File

@ -953,13 +953,13 @@ namespace whirlpool {
// 250 : hard
if(hrand(5000) < 60 + 3 * items[itWhirlpool] + yendor::hardness())
wto->monst = moPirate;
if(hrand(5000) < 20 && d < -20 && !tactic::on)
if(hrand(5000) < 20 && d < -20 && !tactic::on && !peace::on)
wto->item = itOrbSafety;
else if(hrand(5000) < 20 && d < -20 && !tactic::on && markOrb(itOrbLuck))
wto->item = itOrbSafety;
else if(hrand(5000) < 20*PRIZEMUL && d < -20)
placePrizeOrb(wto);
else if(items[itWhirlpool] >= 10 && hrand(5000) < 20 && d < -15)
else if(!peace::on && items[itWhirlpool] >= 10 && hrand(5000) < 20 && d < -15)
wto->item = itOrbWater;
else if(d<-10 && hrand(5000) < 1000-d)
wto->item = itWhirlpool;