From 8e0c066e331c4b9bb1f44f0ef96c6fabeb4c3238 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 5 Mar 2020 22:34:06 +0100 Subject: [PATCH] rollback Hunting Dog --- landgen.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/landgen.cpp b/landgen.cpp index a13912b8..7ce2fe78 100644 --- a/landgen.cpp +++ b/landgen.cpp @@ -2035,7 +2035,6 @@ EX void giantLandSwitch(cell *c, int d, cell *from) { cellwalker cw1 = ci + bonus + wstep + revstep; if(cw0.at->mpdist > 7) if(cw1.at->mpdist > 7) - if(!next->monst || next->monst == moHunterGuard) next.emplace_back(cw0.at, cw1.at); } if(isize(next)) { @@ -2052,7 +2051,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) { c->item = itHunting; cell *c3 = next[hrand(isize(next))]; vector dogcells; - forCellEx(c4, c3) if(c4->mpdist > 7 && !isNeighbor(c4, c) && (c4->monst ==moHunterGuard || !c4->monst)) + forCellEx(c4, c3) if(c4->mpdist > 7 && !isNeighbor(c4, c)) dogcells.push_back(c4); if(items[itHunting] < 10 && isize(dogcells) >= 2) { for(int t=0;; t++) { @@ -2079,7 +2078,7 @@ EX void giantLandSwitch(cell *c, int d, cell *from) { else placeLocalSpecial(c, 10); } } - if(hrand_monster(5000) < items[itHunting]- 17 + yendor::hardness() && !c->monst) + if(hrand_monster(5000) < items[itHunting]- 17 + yendor::hardness()) c->monst = moHunterDog; } break;