Krakens can learn from monsters that die in deep water

zenzombie · Mar 24, 2024 · 955bed3 · 955bed3
1 parent fc2ce59
commit 955bed3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changes/release-the-kraken.md b/changes/release-the-kraken.md
@@ -0,0 +1 @@
+Fixed an issue that prevented allies (e.g. kraken) from learning abilities from monsters that die in certain terrain (e.g. deep water).
diff --git a/src/brogue/Combat.c b/src/brogue/Combat.c
@@ -1395,18 +1395,20 @@ static boolean anyoneWantABite(creature *decedent) {
     if ((!(decedent->info.abilityFlags & LEARNABLE_ABILITIES)
          && !(decedent->info.flags & LEARNABLE_BEHAVIORS)
          && decedent->info.bolts[0] == BOLT_NONE)
-        || (cellHasTerrainFlag(decedent->loc, T_PATHING_BLOCKER))
+        || (cellHasTerrainFlag(decedent->loc, T_OBSTRUCTS_PASSABILITY))
         || decedent->info.monsterID == MK_SPECTRAL_IMAGE
         || (decedent->info.flags & (MONST_INANIMATE | MONST_IMMOBILE))) {
 
         return false;
     }
 
     grid = allocGrid();
-    fillGrid(grid, 0);
-    calculateDistances(grid, decedent->loc.x, decedent->loc.y, T_PATHING_BLOCKER, NULL, true, true);
     for (creatureIterator it = iterateCreatures(monsters); hasNextCreature(it);) {
         creature *ally = nextCreature(&it);
+        if (ally->creatureState == MONSTER_ALLY) {
+            fillGrid(grid, 0);
+            calculateDistances(grid, decedent->loc.x, decedent->loc.y, forbiddenFlagsForMonster(&(ally->info)), NULL, true, true);
+        }
         if (canAbsorb(ally, ourBolts, decedent, grid)) {
             candidates++;
         }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed an issue that prevented allies (e.g. kraken) from learning abilities from monsters that die in certain terrain (e.g. deep water).