[crawl-ref-commits] master branch updated: 0.34-a0-2104-gda2984106b

[<gi...@cr...>]

       via  da2984106b1596fdc341ab775e21956818689923 (commit)
       via  0a107a98f2d68832c89366adb7a6788aa377e927 (commit)
      from  9c19a917d8944fe030ab83f57771a09767df4fbf (commit)

-----------------------------------------------------------------------
commit da2984106b1596fdc341ab775e21956818689923
Author: regret-index <clo...@ho...>
Date:   Mon Jan 26 21:57:04 2026 -0330

    Prevent orcs from spawning inside a spider cage (#5048)
    
    It's supposed to be a quarantine, not a death match cage.

commit 0a107a98f2d68832c89366adb7a6788aa377e927
Author: regret-index <clo...@ho...>
Date:   Mon Jan 26 21:54:50 2026 -0330

    Fix Xom acting around sufficient counts of firewood (Zadiel)
    
    8b305a4 made conjured monsters (e.g. orbs of destruction, battlespheres)
    count as having some minimal amount of experience value to help with
    tension not really being equipped to assess their comparative danger
    levels. This was adjusted into peripheral monsters in 62137d7, which
    accidentally started counting plants, fungi, and other non-hostile
    obstacle-monsters as having non-zero experience values for tension's
    calculations. This doesn't have a lot of problems for most uses of tension,
    but it does mean Xom will act in many pointless ways around sufficient
    amounts of plants, which is extremely undesireable behaviour that is thus
    fixed here.
    
    A more ideal solution for this is most likely to add actual experience
    values for various peripheral monsters for the sake of better tension
    calculations (instead of setting orbs of destruction to be worth half an
    ogre of threat), but with the version release looming, this should function
    enough as a fix for now.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/des/branches/orc.des | 1 +
 crawl-ref/source/religion.cc              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/dat/des/branches/orc.des b/crawl-ref/source/dat/des/branches/orc.des
index 9a83d0e5e7..b755d5275e 100644
--- a/crawl-ref/source/dat/des/branches/orc.des
+++ b/crawl-ref/source/dat/des/branches/orc.des
@@ -1567,6 +1567,7 @@ KFEAT:  m = iron_grate
 KFEAT:  q = web / floor
 KFEAT:  X = x
 SUBST:  e = xx..., f = xx""", g = xm
+KMASK:  "2q = no_monster_gen
 KPROP:  "2q = no_tele_into
 TILE:   X = wall_spider
 TILE:   c = wall_stone_smooth
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 6b611e8819..4795178b90 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -4548,7 +4548,7 @@ int get_monster_tension(const monster& mons, god_type god)
     // is offhand, but they should count for _some_ minimal tension.
     if (exp <= 0)
     {
-        if (mons.is_peripheral())
+        if (mons.is_peripheral() && !mons.is_firewood())
             exp = 50;
         else
             return 0;


-- 
Dungeon Crawl Stone Soup