From a63fdc993f2219128fbd0d4dd20e88c31bc1289a Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Mon, 17 Jun 2019 07:32:13 +0200 Subject: [PATCH] fixed ocean wandering albatross generation, and added Orbs of Safety --- monstergen.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/monstergen.cpp b/monstergen.cpp index d4a0e40c..85a9a5ba 100644 --- a/monstergen.cpp +++ b/monstergen.cpp @@ -411,6 +411,11 @@ void wandering() { continue; } + else if(c->land == laOcean && cwt.at->land == laOcean && cwt.at->landparam > 25 && c->landparam > 25 && !tactic::on && !yendor::on && hrand(100) < 2) { + c->monst = moPirate; c->wall = waBoat; c->item = itOrbSafety; + continue; + } + else if(c->wall == waCTree && !c->monst && wchance(items[itPirate], 15) && canReachPlayer(c, moSlime)) { c->monst = moParrot; playSeenSound(c); @@ -459,7 +464,7 @@ void wandering() { playSeenSound(c); continue; } - if(c->land == laOcean && (items[itCoast] > 50 || (cwt.at->landparam < 25 && c->landparam < 25)) && wchance(items[itCoast], 25) && canReachPlayer(c, moEagle)) { + if(c->land == laOcean && (items[itCoast] > 50 || ((cwt.at->land != laOcean || cwt.at->landparam < 25) && c->landparam < 25)) && wchance(items[itCoast], 25) && canReachPlayer(c, moEagle)) { c->monst = moAlbatross; playSeenSound(c); continue;