diff --git a/landgen.cpp b/landgen.cpp index 5647fac5..e9c9170f 100644 --- a/landgen.cpp +++ b/landgen.cpp @@ -2631,9 +2631,9 @@ EX void giantLandSwitch(cell *c, int d, cell *from) { // if(wet::wetdata.empty()) wet::build_data(); eWall wetwalls[10] = {waNone, waNone, waDeepWater, waDeepWater, waDeepWater, waShallow, waShallow, waShallow, waStone, waStone}; c->wall = wetwalls[hrand(10)]; // wet::wetdata[windmap::getId(c)]]; - if(among(c->wall, waDeepWater, waShallow) && hrand_monster(2000) < 2 * (items[itWet] + yendor::hardness() + 5)) + if(among(c->wall, waDeepWater, waShallow) && hrand_monster(4000) < 2 * (items[itWet] + yendor::hardness() + 5)) c->monst = hrand(100) >= 90 ? moRusalka : moPike; - if(c->wall == waShallow && hrand(2000) < PT(100 + 2 * kills[moPike] + 3 * kills[moRusalka], 200) && notDippingFor(itWet)) + if(c->wall == waShallow && hrand(2000) < min(PT(100 + kills[moPike] + kills[moRusalka], 150), 150) && notDippingFor(itWet)) c->item = itWet; } break; diff --git a/orbgen.cpp b/orbgen.cpp index 2d7b65c1..3d2167c2 100644 --- a/orbgen.cpp +++ b/orbgen.cpp @@ -161,8 +161,10 @@ EX vector orbinfos = { {orbgenflags::S_NATIVE, laEclectic, 1000, 1000, itOrbChaos}, {orbgenflags::S_GUEST, laEclectic, 4000, 0, itOrbWinter}, {orbgenflags::S_GUEST, laEclectic, 2000, 0, itOrbLightning}, - {orbgenflags::S_NATIVE, laWet, 1000, 2500, itOrbPlague}, - {orbgenflags::S_GUEST, laWet, 4000, 0, itOrbFish}, + {orbgenflags::S_NATIVE, laWet, 800, 2500, itOrbPlague}, + {orbgenflags::S_GUEST, laWet, 1200, 0, itOrbFish}, + {orbgenflags::S_GUEST, laWet, 1200, 0, itOrbAether}, + {orbgenflags::S_GUEST, laWet, 1200, 0, itOrbFrog}, {orbgenflags::S_NATIVE, laWhirlpool, 0, 2000, itOrbWater}, // needs to be last };