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

prevented Gadflies, Hunting Dogs and Vine Beasts from appearing after using Orb of Safety

Browse Source
This commit is contained in:
Zeno Rogue 2019-10-27 02:43:28 +02:00
parent b1665ab23b
commit 0d80fea18b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
landgen.cpp
View File

@ -188,7 +188,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
case laPrairie: // ------------------------------------------------------------- case laPrairie: // -------------------------------------------------------------
if(d == 7 && chaosmode) { if(d == 7 && chaosmode) {
if(hrand_monster(9000) < items[itGreenGrass] - (prairie::isriver(cwt.at) ? 40 : 0)) if(hrand_monster(9000) < items[itGreenGrass] - (prairie::isriver(cwt.at) ? 40 : 0) && !safety)
c->monst = moGadfly; c->monst = moGadfly;
if(hrand_monster(100) < 5) c->monst = moSleepBull; if(hrand_monster(100) < 5) c->monst = moSleepBull;
if(hrand(800) < 10) { if(hrand(800) < 10) {
@ -203,7 +203,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
if(shmup::on) prairie::beaststogen.push_back(c); if(shmup::on) prairie::beaststogen.push_back(c);
else prairie::generateBeast(c); else prairie::generateBeast(c);
} }
else if(!prairie::nearriver(c) && c->LHU.fi.flowerdist > 7) { else if(!prairie::nearriver(c) && c->LHU.fi.flowerdist > 7 && !safety) {
if(hrand_monster(9000) < items[itGreenGrass] - (prairie::isriver(cwt.at) ? 40 : 0)) if(hrand_monster(9000) < items[itGreenGrass] - (prairie::isriver(cwt.at) ? 40 : 0))
c->monst = moGadfly; c->monst = moGadfly;
else buildPrizeMirror(c, 1000); else buildPrizeMirror(c, 1000);
@ -735,7 +735,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
ONEMPTY { ONEMPTY {
if(hrand(5000) < PT(100 + 2 * (kills[moVineBeast] + kills[moVineSpirit]), 200) && notDippingFor(itWine) && !reptilecheat) if(hrand(5000) < PT(100 + 2 * (kills[moVineBeast] + kills[moVineSpirit]), 200) && notDippingFor(itWine) && !reptilecheat)
c->item = itWine; c->item = itWine;
if(hrand_monster(8000) < 12 * (items[itWine] + yendor::hardness()) && !reptilecheat) if(hrand_monster(8000) < 12 * (items[itWine] + yendor::hardness()) && !reptilecheat && !safety)
c->monst = moVineBeast; c->monst = moVineBeast;
} }
break; break;
@ -1944,7 +1944,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) {
break; break;
case laHunting: case laHunting:
if(d == 7 && c->land == laHunting && !racing::on) { if(d == 7 && c->land == laHunting && !racing::on && !safety) {
if(hrand(1000) < 20) { if(hrand(1000) < 20) {
if(openplains(c)) { if(openplains(c)) {
if(hrand(2) == 0) { if(hrand(2) == 0) {