crawl-ref-commits — Subversion commit logs for crawl-ref

[crawl-ref-commits] nicolae1225-overflowing-cornucopia branch updated: 0.34-a0-1635-ga4bcc7ad2a

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

       via  a4bcc7ad2aa171b1d2327ffa3b7bdb7c219b9ca4 (commit)
      from  ad7cab590542e2b3def042e27b678c59d0da22d4 (commit)

-----------------------------------------------------------------------
commit a4bcc7ad2aa171b1d2327ffa3b7bdb7c219b9ca4
Author: patrick <xd...@gm...>
Date:   Sun Dec 14 21:34:02 2025 -0500

    Some more generic overflows

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

Summary of changes:
 crawl-ref/source/dat/des/altar/overflow.des | 118 +++++++++++++++++++++++++++-
 1 file changed, 115 insertions(+), 3 deletions(-)

diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index e977b2be8a..742e536783 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -5387,8 +5387,8 @@ NSUBST: 1 = 2=1 / 2=1. / .
 : end
 SUBST:  D = cccc., . = ....`
 COLOUR: c. = darkgrey
-FTILE:  1c_. = floor_depthstone
-TILE:   c = floor_cobble_blood
+FTILE:  1c_. = floor_cobble_blood
+TILE:   c = dngn_stone_dark
 : standard_overflow_setup(_G, { { "yredelemnul", "_" } }, true)
 MAP
    ```DDD```
@@ -7192,6 +7192,58 @@ xbx...xbx
 xxxx@xxxx
 ENDMAP
 
+NAME: nicolae_overflow_four_foyers_diagonal
+TAGS: transparent decor
+: standard_overflow_setup(_G, { { "generic", "B" } }, true)
+MAP
++xxx@xxx+
+x..mTm..x
+x.+xmx+.x
+xmx...xmx
+@Tm.B.mT@
+xmx...xmx
+x.+xmx+.x
+x..mTm..x
++xxx@xxx+
+ENDMAP
+
+NAME: nicolae_overflow_four_foyers_orthogonal
+TAGS: transparent decor
+: standard_overflow_setup(_G, { { "generic", "B" } }, true)
+MAP
+@..x+x..@
+.T.m.m.T.
+..mx+xm..
+xmx...xmx
++.+.B.+.+
+xmx...xmx
+..mx+xm..
+.T.m.m.T.
+@..x+x..@
+ENDMAP
+
+NAME:    nicolae_overflow_lobbying_the_gods
+TAGS:    transparent decor
+SHUFFLE: {}/[]/(), DE, pq
+SUBST:   D = c, E = @, p = T, q = G
+SHUFFLE: TG
+: standard_overflow_setup(_G, { { "generic", "B" } }, true)
+MAP
+cEEEcccccEEEc
+D...c...c...D
+D.T.+.G.+.T.D
+D...c...c...D
+ccccc...ccccc
+c...c...c...c
+c.{.+.B.+.}.c
+c...c...c...c
+ccccc...ccccc
+D...c...c...D
+D.p.+.q.+.p.D
+D...c...c...D
+cEEEcccccEEEc
+ENDMAP
+
 NAME:    nicolae_overflow_rhomboverflow
 TAGS:    no_pool_fixup transparent decor
 SHUFFLE: cw
@@ -7227,7 +7279,7 @@ MAP
 ENDMAP
 
 # Each transporter will take you in a straight line across the intersection, but
-# only one will stop in the middle with the altar first.
+# only one will stop in the middle wi th the altar first.
 NAME:    nicolae_overflow_soul_deal_at_the_crossroads
 TAGS:    transparent decor
 WEIGHT:  2
@@ -7537,6 +7589,22 @@ DcccccD.FcccccF
 DDDDDDD@FFFFFFF
 ENDMAP
 
+NAME:  nicolae_overflow_divine_pier_pressure
+TAGS:  temple_overflow_generic_2 transparent decor no_pool_fixup
+FTILE: @.mB : floor_sprouting_squares / floor_sprouting_stone / floor_vines / \
+              floor_moss / floor_sprouting_ruin
+MAP
+wwwwwwwww
+wwwwwwwww
+wwmmmmmww
+wwm.B.mww
+@.......@
+wwm.B.mww
+wwmmmmmww
+wwwwwwwww
+wwwwwwwww
+ENDMAP
+
 NAME: minmay_overflow_temple_star_quad
 TAGS: temple_overflow_generic_3 transparent
 : decorative_floor(_G, 'V', "floral vase")
@@ -8093,3 +8161,47 @@ MAP
  ..nnnnnnnnn..
   ...........
 ENDMAP
+
+NAME:  nicolae_overflow_sandstone_temple
+TAGS:  temple_overflow_generic_7 temple_overflow_generic_6 \
+       temple_overflow_generic_4 temple_overflow_generic_3 \
+       temple_overflow_generic_1 transparent decor
+{{
+  local altarcount = 1
+  if is_validating() then
+    altarcount = 1
+  else
+    altarcount = tonumber(get_overflow_altar_count(_G))
+  end
+  if altarcount == 7 then
+    subst("DEF : B")
+  elseif altarcount == 6 then
+    subst("EF : B")
+  elseif altarcount == 4 then
+    subst("DF : B")
+  elseif altarcount == 3 then
+    subst("E : B")
+  elseif altarcount == 1 then
+    subst("D : B")
+  else
+    subst("D : B")
+  end
+}}
+SUBST:   D : G, E : T, F : U
+SHUFFLE: GTU
+COLOUR:  c` = brown
+FTILE:   c`GTUB = floor_sandstone
+TILE:    c = wall_sandstone
+MAP
+    ...
+ .ccc.ccc.
+ ..`````..
+ cc`F`E`cc
+.c```````c.
+..`E`D`F`..
+.c```````c.
+ cc`F`E`cc
+ ..`````..
+ .ccc.ccc.
+    ...
+ENDMAP


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1804-g99c0725460

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

       via  99c072546068e9ab720d15277f2f2bbde8b25cc3 (commit)
      from  b780494020bc1f7fbf7984f8bb004ff957c39eef (commit)

-----------------------------------------------------------------------
commit 99c072546068e9ab720d15277f2f2bbde8b25cc3
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sun Dec 14 06:28:43 2025 -0600

    Fix mon_info unique name checks in a better way.
    
    monster_info checks both type and base_type for monsters in many places,
    so do that instead of manually specifying an exception for Tiamat.

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

Summary of changes:
 crawl-ref/source/mon-info.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
index 5c7a505135..f15543decd 100644
--- a/crawl-ref/source/mon-info.cc
+++ b/crawl-ref/source/mon-info.cc
@@ -377,10 +377,9 @@ monster_info::monster_info(monster_type p_type, monster_type p_base_type)
         ev += get_mons_class_ev(base_type);
     }
 
-    // Tiamat's base type is set to MONS_DRACONIAN.
-    if (mons_is_unique(base_type) || type == MONS_TIAMAT)
+    if (mons_is_unique(type) || mons_is_unique(base_type))
     {
-        if (mons_is_the(base_type))
+        if (mons_is_the(type) || mons_is_the(base_type))
             mb.set(MB_NAME_THE);
         else
         {
@@ -499,10 +498,9 @@ monster_info::monster_info(const monster* m, int milev)
             mb.set(MB_UNREWARDING);
     }
 
-    // Tiamat's base type is set to MONS_DRACONIAN.
-    if (mons_is_unique(base_type) || type == MONS_TIAMAT)
+    if (mons_is_unique(type) || mons_is_unique(base_type))
     {
-        if (mons_is_the(base_type))
+        if (mons_is_the(type) || mons_is_the(base_type))
             mb.set(MB_NAME_THE);
         else
         {


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1803-gb780494020

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

       via  b780494020bc1f7fbf7984f8bb004ff957c39eef (commit)
      from  a9a8b13fb6351b36255d77f1a9f84473764a6626 (commit)

-----------------------------------------------------------------------
commit b780494020bc1f7fbf7984f8bb004ff957c39eef
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sun Dec 14 06:08:58 2025 -0600

    Treat Tiamat as a name in monster_info again.
    
    Since base_type is set differently for draconians with job classes, as
    well as Tiamat, when we check whether the monster's base type is unique,
    we need to check for Tiamat manually.

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

Summary of changes:
 crawl-ref/source/mon-info.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc
index 541168d848..5c7a505135 100644
--- a/crawl-ref/source/mon-info.cc
+++ b/crawl-ref/source/mon-info.cc
@@ -377,7 +377,8 @@ monster_info::monster_info(monster_type p_type, monster_type p_base_type)
         ev += get_mons_class_ev(base_type);
     }
 
-    if (mons_is_unique(base_type))
+    // Tiamat's base type is set to MONS_DRACONIAN.
+    if (mons_is_unique(base_type) || type == MONS_TIAMAT)
     {
         if (mons_is_the(base_type))
             mb.set(MB_NAME_THE);
@@ -498,7 +499,8 @@ monster_info::monster_info(const monster* m, int milev)
             mb.set(MB_UNREWARDING);
     }
 
-    if (mons_is_unique(base_type))
+    // Tiamat's base type is set to MONS_DRACONIAN.
+    if (mons_is_unique(base_type) || type == MONS_TIAMAT)
     {
         if (mons_is_the(base_type))
             mb.set(MB_NAME_THE);


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1802-ga9a8b13fb6

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

       via  a9a8b13fb6351b36255d77f1a9f84473764a6626 (commit)
       via  53a2113884ecbc85149fbb00d161c9bc03ae3e1b (commit)
      from  da3c44569bf7cf8ee8727b3cd0d22b5bd4f7e65a (commit)

-----------------------------------------------------------------------
commit a9a8b13fb6351b36255d77f1a9f84473764a6626
Author: gammafunk <gam...@gm...>
Date:   Sat Dec 13 16:15:34 2025 -0600

    Fix crashing volcano triggers
    
    This commit contains a fix for erroneous lua map marker behaviour seen
    when hellmonk_volcano_collapse places as well as a fix to the event
    dispatcher to prevent this behaviour from crashing the game. The first
    fix will allow the map to create its markers properly when it places.
    The second will prevent games from crashing where the map has generated
    already with incorrect markers. I'll discuss both fixes more below.
    
    Regarding the lua map maker behaviour, something odd is happening under
    lua 5.4 with a closure that's used directly as a lua map marker. In
    lm_trig.lua, the funciton Triggerable.synchronized_markers() creates a
    closure with an upvalue `first` that initially true and supposed to be
    set to false after the first call to the closure. After that, the
    markers this function makes will be so-called "replica" property
    markers. What's happening in practice is that modifications to `first`
    aren't being retained by subsequent calls, so all markers being placed
    are primary ones (i.e. TriggerrableFunction). Strangely, this problem
    goes away if the lua state context is exited from the closure before
    `first` is examined. That is, if I add calls to e.g. `crawl.mpr()` or to
    the `io` library, subsequent calls to the closure see the updated
    (false) value for `first`. My fix was to store the primary
    initialization in the Triggerable table (keyed by replica id) rather
    than updating an upvalue. But this should be considered a workaround, as
    it's very concerning if closures/upvalues aren't behaving properly.
    
    For the second fix to dgn_event_dispatcher, it seems that this class is
    a bit naive in expecting the listeners in its internal list to be valid.
    Since it fires off events to dlua that can execute arbitrary code, it's
    certainly possible an arbitrary map marker in the dispatcher's list
    might get removed (meaning it's an invalid listener object).
    dgn_event_dispatcher::fire_event() already makes a copy of its listeners
    before firing events because directly iterating over this list is unsafe
    for the same reason. Since the copied list might contain a pointer to a
    deleted map marker, I've added a method to verify that a listener is
    actually in the master list. This is checked before attempting to fire
    off a dungeon event on a listener.

commit 53a2113884ecbc85149fbb00d161c9bc03ae3e1b
Author: gammafunk <gam...@gm...>
Date:   Thu Dec 11 19:31:20 2025 -0600

    Add dlua errors to crash dumps
    
    Like how we do in the dlua_errors section of the morgue, print any dlua
    errors. Do this before we print the back traces, since in a crash
    scenario, this data is less volatile to access then the clua and dlua
    states.

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

Summary of changes:
 crawl-ref/source/dat/dlua/lm_trig.lua | 11 ++++++-----
 crawl-ref/source/dbg-asrt.cc          |  8 ++++++++
 crawl-ref/source/dgn-event.cc         | 17 ++++++++++++++++-
 crawl-ref/source/dgn-event.h          |  1 +
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/crawl-ref/source/dat/dlua/lm_trig.lua b/crawl-ref/source/dat/dlua/lm_trig.lua
index 1c55114495..17461163cb 100644
--- a/crawl-ref/source/dat/dlua/lm_trig.lua
+++ b/crawl-ref/source/dat/dlua/lm_trig.lua
@@ -392,15 +392,16 @@ function Triggerable.make_replica(replica_id)
   return props_marker { replica_to = replica_id }
 end
 
+Triggerable.primary_initialized = {}
 function Triggerable.synchronized_markers(primary)
-  local first = true
   local replica_id = lmark.next_replica_id()
+  Triggerable.primary_initialized[replica_id] = false
   return function ()
-           if first then
-             first = false
-             return Triggerable.make_primary(primary, replica_id)
-           else
+           if Triggerable.primary_initialized[replica_id] then
              return Triggerable.make_replica(replica_id)
+           else
+             Triggerable.primary_initialized[replica_id] = true
+             return Triggerable.make_primary(primary, replica_id)
            end
          end
 end
diff --git a/crawl-ref/source/dbg-asrt.cc b/crawl-ref/source/dbg-asrt.cc
index 350c47a0de..e1fb46aa98 100644
--- a/crawl-ref/source/dbg-asrt.cc
+++ b/crawl-ref/source/dbg-asrt.cc
@@ -736,6 +736,14 @@ void do_crash_dump()
         fprintf(file, "%s\n", screenshot().c_str());
     }
 
+    fprintf(file, "dlua errors:\n");
+    for (const CLuaError &error : dlua_errors)
+    {
+        fprintf(file, "%s\n%s\n", error.message.c_str(),
+                error.stack_trace.c_str());
+    }
+    fprintf(file, "\n");
+
     // If anything has screwed up the Lua runtime stacks then trying to
     // print those stacks will likely crash, so do this after the others.
     fprintf(file, "clua stack:\n");
diff --git a/crawl-ref/source/dgn-event.cc b/crawl-ref/source/dgn-event.cc
index fac4a75a49..3d31c5ea28 100644
--- a/crawl-ref/source/dgn-event.cc
+++ b/crawl-ref/source/dgn-event.cc
@@ -86,8 +86,13 @@ void dgn_event_dispatcher::fire_event(const dgn_event &e)
     {
         auto copy = listeners;
         for (const auto &ldef : copy)
-            if (ldef.eventmask & e.type)
+        {
+            if (ldef.eventmask & e.type
+                    && is_registered_listener(ldef.listener))
+            {
                 ldef.listener->notify_dgn_event(e);
+            }
+        }
     }
 }
 
@@ -158,6 +163,16 @@ void dgn_event_dispatcher::remove_listener_at(const coord_def &pos,
         erase_val(alarm->listeners, listener);
 }
 
+bool dgn_event_dispatcher::is_registered_listener(
+        const dgn_event_listener *listener) const
+{
+    for (auto i = listeners.begin(); i != listeners.end(); ++i)
+    {
+        if (i->listener == listener)
+            return true;
+    }
+    return false;
+}
 /////////////////////////////////////////////////////////////////////////////
 // dgn_event_listener
 
diff --git a/crawl-ref/source/dgn-event.h b/crawl-ref/source/dgn-event.h
index e4c769e6cd..d46316969b 100644
--- a/crawl-ref/source/dgn-event.h
+++ b/crawl-ref/source/dgn-event.h
@@ -103,6 +103,7 @@ public:
     void clear();
     void clear_listeners_at(const coord_def &pos);
     bool has_listeners_at(const coord_def &pos) const;
+    bool is_registered_listener(const dgn_event_listener *listener) const;
     void move_listeners(const coord_def &from, const coord_def &to);
 
     // Returns false if the event is vetoed.


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1800-gda3c44569b

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

       via  da3c44569bf7cf8ee8727b3cd0d22b5bd4f7e65a (commit)
      from  9247e96862b75706cf1978584ccba7879094ed97 (commit)

-----------------------------------------------------------------------
commit da3c44569bf7cf8ee8727b3cd0d22b5bd4f7e65a
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 10:07:37 2025 -0600

    Add comments about possible name/word overlaps.

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

Summary of changes:
 crawl-ref/source/dat/database/colourname.txt | 3 ++-
 crawl-ref/source/dat/database/graffiti.txt   | 4 ++++
 crawl-ref/source/dat/database/monname.txt    | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/dat/database/colourname.txt b/crawl-ref/source/dat/database/colourname.txt
index c66ceeac8e..9f497ad08c 100644
--- a/crawl-ref/source/dat/database/colourname.txt
+++ b/crawl-ref/source/dat/database/colourname.txt
@@ -841,7 +841,8 @@ triangles
 
 whorls
 %%%%
-# Any word other than "glowing" itself will work here.
+# Any word other than "glowing" itself will work here, as long as it's
+# not already in @_writing_adj_@ in graffiti.txt.
 glowing_adj
 
 bright
diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index f50b2bb0fa..e8f7209c35 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -120,6 +120,8 @@ _rare_graffiti_author_god_
 # god is rare).
 Woog the god
 %%%%
+# Any name will work here, as long as it's not already in the orc names
+# in monname.txt.
 _rare_graffiti_author_orc_
 
 Spartorcus the orc
@@ -156,6 +158,8 @@ _pattern_type_
 
 @any_glowing_colour_pattern@
 %%%%
+# Any word will work here, as long as it's not already in @glowing_adj@
+# in colourname.txt.
 _writing_adj_
 
 angular
diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 0b9a1050fd..c32f389617 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -29,7 +29,9 @@
 #
 ##########################################################
 %%%%
-# Any orc name, apostle-specific or otherwise.
+# Any orc name, apostle-specific or otherwise. Any name will work here,
+# as long as it's not already in @_rare_graffiti_author_orc_@ in
+# graffiti.txt.
 any orc name
 
 w:1


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1799-g9247e96862

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

       via  9247e96862b75706cf1978584ccba7879094ed97 (commit)
       via  7de7c6ff57bfbf21f381382382cb73929429262d (commit)
      from  bcc3919a4b95570db715d125a1ab34650521ff2d (commit)

-----------------------------------------------------------------------
commit 9247e96862b75706cf1978584ccba7879094ed97
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 09:50:05 2025 -0600

    Move a glowing adjective to a writing adjective.
    
    Since "pulsating" is more about movement than glowing, and writing
    adjectives already reference motion.

commit 7de7c6ff57bfbf21f381382382cb73929429262d
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 09:46:37 2025 -0600

    Add another writing adjective to graffiti.

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

Summary of changes:
 crawl-ref/source/dat/database/colourname.txt | 2 --
 crawl-ref/source/dat/database/graffiti.txt   | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/dat/database/colourname.txt b/crawl-ref/source/dat/database/colourname.txt
index b3283a3271..c66ceeac8e 100644
--- a/crawl-ref/source/dat/database/colourname.txt
+++ b/crawl-ref/source/dat/database/colourname.txt
@@ -874,8 +874,6 @@ murky
 
 pale
 
-pulsating
-
 shimmering
 
 shining
diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 039866b47c..f50b2bb0fa 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -170,6 +170,8 @@ flowing
 
 jagged
 
+pulsating
+
 shifting
 
 sinuous
@@ -180,6 +182,8 @@ spidery
 
 swirling
 
+throbbing
+
 twitching
 
 writhing


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1797-gbcc3919a4b

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

       via  bcc3919a4b95570db715d125a1ab34650521ff2d (commit)
      from  f8a93123932ae7c7800f1f14bc36073886eee0ed (commit)

-----------------------------------------------------------------------
commit bcc3919a4b95570db715d125a1ab34650521ff2d
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 09:34:33 2025 -0600

    Add another unreadable graffiti line.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 37c1f68ab9..039866b47c 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -960,6 +960,8 @@ _graffiti_unreadable_
 
 graffiti of unreadable @_writing_type_@
 
+graffiti of @_writing_type_@ that are unreadable except for a signature by @_graffiti_author_any_@
+
 w:1
 graffiti of @_writing_type_@ that are unreadable except for bits hailing @_graffiti_hailed_god_@
 


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1796-gf8a9312393

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

       via  f8a93123932ae7c7800f1f14bc36073886eee0ed (commit)
       via  13829917ae49aa324fd8d3ab0303d36f25bb5dad (commit)
      from  fd447d03848af6cb1a9cc16160a0166f6dc299a2 (commit)

-----------------------------------------------------------------------
commit f8a93123932ae7c7800f1f14bc36073886eee0ed
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 09:09:15 2025 -0600

    Add another writing adjective to graffiti.

commit 13829917ae49aa324fd8d3ab0303d36f25bb5dad
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 09:07:10 2025 -0600

    Reweight more god references; update a comment.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 07eabb3270..37c1f68ab9 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -180,6 +180,8 @@ spidery
 
 swirling
 
+twitching
+
 writhing
 %%%%
 # Any word other than "graffiti" will work here.
@@ -294,9 +296,9 @@ w:1
 @_graffiti_author_any_changeable_non-randgen_@ has changed names due to Xom's influence and now goes by @RANDGEN@
 %%%%
 # This can produce an author who's compared to themselves, an author who
-# is secretly e.g. the power of cheese, an orc who worships (or is) Zin,
-# or a non-orc who worships (or is) Beogh, but you shouldn't believe
-# everything you read.
+# is secretly the power of cheese or a wagon full of pancakes, an orc
+# who worships (or is) Zin, or a non-orc who worships (or is) Beogh, but
+# you shouldn't believe everything you read.
 _graffiti_changed_or_compared_religions_
 
 @_graffiti_author_any_@ has abandoned @random_god@
@@ -785,10 +787,6 @@ _graffiti_religion_not_non-orc_or_orc_
 
 glorifying @random_god@ and blaspheming @random_god@
 
-glorifying an unknown god
-
-not just hailing but glorifying @_graffiti_hailed_god_@
-
 # No entries for Ignis or Jiyva here. Ignis has one worshipper in the
 # Cinder Acolyte player, and Jiyva has one (sincere) worshipper in the
 # Royal Jelly who is brainless and tied to the Slime Pits. More
@@ -840,6 +838,12 @@ paying homage to Ru and talking about how all of reality is not what you think i
 giving adulation to the Shining One and talking about how honourably removing evil from the world is essential
 
 flattering Lugonu and talking about how Lugonu and the forces of the Abyss will soon rule over all
+
+w:1
+glorifying an unknown god
+
+w:1
+not just hailing but glorifying @_graffiti_hailed_god_@
 %%%%
 _graffiti_religion_orc_
 


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1794-gfd447d0384

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

       via  fd447d03848af6cb1a9cc16160a0166f6dc299a2 (commit)
       via  e33a68bbb2e33ec829fc064e11b68ffc374c0426 (commit)
       via  3e525b69aa287d77451a1e6b5c0f814834d31433 (commit)
       via  9794acd101fb94106e1e502eca0011dacf59cb6d (commit)
      from  9edff1cd0fae0e886882e64cac3f2a8c7f8772ac (commit)

-----------------------------------------------------------------------
commit fd447d03848af6cb1a9cc16160a0166f6dc299a2
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 08:50:57 2025 -0600

    Move "a wagon full of pancakes" into hailed gods.

commit e33a68bbb2e33ec829fc064e11b68ffc374c0426
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 08:47:09 2025 -0600

    Reweight god references in unreadable graffiti.

commit 3e525b69aa287d77451a1e6b5c0f814834d31433
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 08:32:36 2025 -0600

    Add more references to hailed gods.

commit 9794acd101fb94106e1e502eca0011dacf59cb6d
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 08:21:26 2025 -0600

    Rename a graffiti tag.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 80c8f47261..07eabb3270 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -293,11 +293,11 @@ w:2
 w:1
 @_graffiti_author_any_changeable_non-randgen_@ has changed names due to Xom's influence and now goes by @RANDGEN@
 %%%%
-# This includes a few religious things that aren't actually changes, but
-# don't fit anywhere else. It can produce an orc who worships (or is)
-# Zin, or a non-orc who worships (or is) Beogh, but you shouldn't
-# believe everything you read.
-_graffiti_changed_religions_
+# This can produce an author who's compared to themselves, an author who
+# is secretly e.g. the power of cheese, an orc who worships (or is) Zin,
+# or a non-orc who worships (or is) Beogh, but you shouldn't believe
+# everything you read.
+_graffiti_changed_or_compared_religions_
 
 @_graffiti_author_any_@ has abandoned @random_god@
 
@@ -328,6 +328,12 @@ _graffiti_changed_religions_
 @_graffiti_author_any_@ secretly worships @random_god_evil@
 
 @_graffiti_author_any_@ secretly worships @random_god_evil@ instead of @random_god_good@
+
+w:1
+@_graffiti_author_any_@ is secretly @_graffiti_hailed_god_@
+
+w:1
+@_graffiti_author_any_@ secretly worships @_graffiti_hailed_god_@
 %%%%
 _graffiti_class_any_
 
@@ -411,6 +417,10 @@ w:1
 # Behold the power of cheese!
 w:1
 the power of cheese
+
+# Strong Bad Email #117, "montage"
+w:1
+a wagon full of pancakes
 %%%%
 _graffiti_happened_reason_
 
@@ -880,14 +890,10 @@ what happened to @_graffiti_author_any_@ was @_graffiti_happened_reason_@
 
 @_graffiti_vengeance_@
 
-@_graffiti_changed_religions_@
+@_graffiti_changed_or_compared_religions_@
 
 w:2
 @_graffiti_changed_names_@
-
-# Strong Bad
-w:1
-@_graffiti_author_any_@ is actually a wagon full of pancakes
 %%%%
 _graffiti_species_
 
@@ -950,8 +956,10 @@ _graffiti_unreadable_
 
 graffiti of unreadable @_writing_type_@
 
+w:1
 graffiti of @_writing_type_@ that are unreadable except for bits hailing @_graffiti_hailed_god_@
 
+w:1
 graffiti of @_writing_type_@ that are unreadable except for bits hailing @_graffiti_hailed_god_@ and a signature by @_graffiti_author_any_@
 %%%%
 _graffiti_vengeance_


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1790-g9edff1cd0f

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

       via  9edff1cd0fae0e886882e64cac3f2a8c7f8772ac (commit)
       via  376ce8f1ef5ed50f2eb13043f15abdf824847d93 (commit)
      from  328cd5380eca3d632afb9d4e5fa0bf1e9fb467e8 (commit)

-----------------------------------------------------------------------
commit 9edff1cd0fae0e886882e64cac3f2a8c7f8772ac
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 01:57:18 2025 -0600

    Clarify a comment.

commit 376ce8f1ef5ed50f2eb13043f15abdf824847d93
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Sat Dec 13 01:38:09 2025 -0600

    Add a few religious arguments to graffiti.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 33b9caaaf7..80c8f47261 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -293,8 +293,10 @@ w:2
 w:1
 @_graffiti_author_any_changeable_non-randgen_@ has changed names due to Xom's influence and now goes by @RANDGEN@
 %%%%
-# This can produce an orc who worships (or is) Zin, or a non-orc who
-# worships (or is) Beogh, but you shouldn't believe everything you read.
+# This includes a few religious things that aren't actually changes, but
+# don't fit anywhere else. It can produce an orc who worships (or is)
+# Zin, or a non-orc who worships (or is) Beogh, but you shouldn't
+# believe everything you read.
 _graffiti_changed_religions_
 
 @_graffiti_author_any_@ has abandoned @random_god@
@@ -303,6 +305,8 @@ _graffiti_changed_religions_
 
 @_graffiti_author_any_@ has converted to @random_god@
 
+@_graffiti_author_any_@ is @_graffiti_religion_better_or_worse_@ than @_graffiti_author_any_@
+
 @_graffiti_author_any_@ is secretly an atheist
 
 @_graffiti_author_any_@ is secretly not an atheist
@@ -740,6 +744,20 @@ the spouses
 
 the strength
 %%%%
+_graffiti_religion_better_or_worse_
+
+less of a believer
+
+more of a believer
+
+# Yes, I've actually heard the phrase "I'm a better atheist than you."
+
+w:1
+a better atheist
+
+w:1
+a worse atheist
+%%%%
 _graffiti_religion_non-orc_
 
 lauding Zin and Zin's laws
@@ -822,6 +840,8 @@ proclaiming that Beogh's messiah will soon come
 thanking Beogh for granting salvation while the other gods just watched
 
 talking about how Beogh will help you when the other gods turn away from you
+
+talking about how Beogh is with them and not those other heretic orcs
 %%%%
 _graffiti_rumour_
 


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1788-g328cd5380e

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

       via  328cd5380eca3d632afb9d4e5fa0bf1e9fb467e8 (commit)
      from  155d69319863ec876eb2df956db70c0e5d5c0b02 (commit)

-----------------------------------------------------------------------
commit 328cd5380eca3d632afb9d4e5fa0bf1e9fb467e8
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 22:56:20 2025 -0600

    Add another ancestor name.

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

Summary of changes:
 crawl-ref/source/dat/database/monname.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 0c8647a330..0b9a1050fd 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -1479,6 +1479,8 @@ Nóirín
 
 Onóra
 
+Órlaith
+
 # Another archaicism
 Raghnailt
 


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1787-g155d693198

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

       via  155d69319863ec876eb2df956db70c0e5d5c0b02 (commit)
      from  ad0cd7acd5078af946afbb7c2a7ecbf36ebeb01d (commit)

-----------------------------------------------------------------------
commit 155d69319863ec876eb2df956db70c0e5d5c0b02
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 22:26:19 2025 -0600

    Add more ancestor names.

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

Summary of changes:
 crawl-ref/source/dat/database/monname.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 311c3ddcdc..0c8647a330 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -696,6 +696,8 @@ _west_european_female_name_
 
 Ælfthryth
 
+Ælfwynn
+
 Æðelind
 
 Audrea
@@ -704,6 +706,8 @@ Bealdhild
 
 Cyneburga
 
+Cynethryth
+
 Eadburga
 
 Ealdgyð
@@ -712,6 +716,8 @@ Edmée
 
 Edwyna
 
+Eormenhild
+
 Friðuswiþ
 
 Godgifu
@@ -720,6 +726,8 @@ Gudrun
 
 Kendra
 
+Milburga
+
 Saranna
 
 Solveig


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1786-gad0cd7acd5

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

       via  ad0cd7acd5078af946afbb7c2a7ecbf36ebeb01d (commit)
      from  d9eb6dac1571d317073b135afe1308ed71c9a6b1 (commit)

-----------------------------------------------------------------------
commit ad0cd7acd5078af946afbb7c2a7ecbf36ebeb01d
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 22:18:43 2025 -0600

    Replace one West European name with another.
    
    The replaced name is the Anglicised form of a name that's already in the
    list of Irish names.

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

Summary of changes:
 crawl-ref/source/dat/database/monname.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index ad3111c6bb..311c3ddcdc 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -700,6 +700,8 @@ _west_european_female_name_
 
 Audrea
 
+Bealdhild
+
 Cyneburga
 
 Eadburga
@@ -718,8 +720,6 @@ Gudrun
 
 Kendra
 
-Noreen
-
 Saranna
 
 Solveig


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1785-gd9eb6dac15

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

       via  d9eb6dac1571d317073b135afe1308ed71c9a6b1 (commit)
       via  4e2ae65739fb37d48f2aa0801329455a61777b12 (commit)
      from  d53419731c32f59ca40e25d7e61ce7f35547af1f (commit)

-----------------------------------------------------------------------
commit d9eb6dac1571d317073b135afe1308ed71c9a6b1
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 21:24:10 2025 -0600

    Add a few more Beogh names, and update the count.

commit 4e2ae65739fb37d48f2aa0801329455a61777b12
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 21:18:22 2025 -0600

    Resort orc name entries.

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

Summary of changes:
 crawl-ref/source/dat/database/monname.txt | 54 +++++++++++++++++--------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 27a5a40886..ad3111c6bb 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -29,6 +29,21 @@
 #
 ##########################################################
 %%%%
+# Any orc name, apostle-specific or otherwise.
+any orc name
+
+w:1
+@_orc_warrior_name_@
+
+w:1
+@_orc_wizard_name_@
+
+w:1
+@_orc_priest_name_@
+
+w:50
+@orc name@
+%%%%
 orc name
 
 w:14
@@ -40,19 +55,6 @@ w:12
 w:45
 @_other_orcish_name_@
 %%%%
-_orc_warrior_name_
-
-Orconan
-%%%%
-_orc_wizard_name_
-
-Simorc Magus
-%%%%
-_orc_priest_name_
-
-# Watch out! :p
-Judas
-%%%%
 orc apostle warrior name
 
 w:1
@@ -77,23 +79,21 @@ w:1
 w:50
 @orc name@
 %%%%
-# Any orc name, apostle-specific or otherwise.
-any orc name
-
-w:1
-@_orc_warrior_name_@
+_orc_warrior_name_
 
-w:1
-@_orc_wizard_name_@
+Orconan
+%%%%
+_orc_wizard_name_
 
-w:1
-@_orc_priest_name_@
+Simorc Magus
+%%%%
+_orc_priest_name_
 
-w:50
-@orc name@
+# Watch out! :p
+Judas
 %%%%
 # Obvious references to Beogh
-# (18 at last count)
+# (20 at last count)
 _beogh_name_
 
 Arbeogh
@@ -111,6 +111,8 @@ Bogfrid
 
 Boghold
 
+Bogloth
+
 Bogmar
 
 Bogric
@@ -131,6 +133,8 @@ Morbeogh
 
 Orbeogh
 
+Vorbog
+
 Warbeogh
 %%%%
 # Obvious references to orcs in general


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1783-gd53419731c

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

       via  d53419731c32f59ca40e25d7e61ce7f35547af1f (commit)
      from  35eea0a4d680927b71138cb051ab815894e84e04 (commit)

-----------------------------------------------------------------------
commit d53419731c32f59ca40e25d7e61ce7f35547af1f
Author: Isaac Clancy <ik...@ya...>
Date:   Sat Dec 13 09:39:00 2025 +1300

    Fix tile probabilities in generated html files
    
    The generated html files that give information about tiles in the game
    were showing a few of the tiles as having an inf% chance of being picked
    when showing the tile group they belong to.

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

Summary of changes:
 crawl-ref/source/rltiles/tool/tile_list_processor.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/rltiles/tool/tile_list_processor.cc b/crawl-ref/source/rltiles/tool/tile_list_processor.cc
index 820b9f31e8..c8d2417b78 100644
--- a/crawl-ref/source/rltiles/tool/tile_list_processor.cc
+++ b/crawl-ref/source/rltiles/tool/tile_list_processor.cc
@@ -1586,7 +1586,7 @@ bool tile_list_processor::write_data(bool image, bool code)
                 for (unsigned int c = 0; c < lcenum.size(); c++)
                     lcenum[c] = toalower(lcenum[c]);
 
-                if (i == 0 || m_page.m_counts[i] == 1)
+                if (m_page.m_counts[i] == 1)
                     fprintf(fp, "<td>%s</td>", lcenum.c_str());
                 else
                 {


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1782-g35eea0a4d6

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

       via  35eea0a4d680927b71138cb051ab815894e84e04 (commit)
      from  d1a1f204d818c70cf3c57c9145225b4086b0f743 (commit)

-----------------------------------------------------------------------
commit 35eea0a4d680927b71138cb051ab815894e84e04
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 12:01:42 2025 -0600

    Add underscores to non-public graffiti tags.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 350 ++++++++++++++---------------
 1 file changed, 175 insertions(+), 175 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 85f28b080d..33b9caaaf7 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -13,61 +13,61 @@
 #
 ##########################################################
 %%%%
-graffiti_author_any
+_graffiti_author_any_
 
 w:50
 @ancestor name@
 
-@graffiti_author_orc@
+@_graffiti_author_orc_@
 
 w:2
-@graffiti_author_bland@
+@_graffiti_author_bland_@
 
 w:2
 @RANDGEN@
 
 w:1
-@rare_graffiti_author_any@
+@_rare_graffiti_author_any_@
 %%%%
-# Same as @graffiti_author_any@, but without orc names or rare names (or
-# rare orc names).
-graffiti_author_any_changeable
+# Same as @_graffiti_author_any_@, but without orc names or rare names
+# (or rare orc names).
+_graffiti_author_any_changeable_
 
 w:50
 @ancestor name@
 
 w:2
-@graffiti_author_bland@
+@_graffiti_author_bland_@
 
 w:2
 @RANDGEN@
 %%%%
-# Same as @graffiti_author_any@, but without orc names, randomly
+# Same as @_graffiti_author_any_@, but without orc names, randomly
 # generated names, or rare names (or rare orc names).
-graffiti_author_any_changeable_non-randgen
+_graffiti_author_any_changeable_non-randgen_
 
 w:50
 @ancestor name@
 
 w:2
-@graffiti_author_bland@
+@_graffiti_author_bland_@
 %%%%
-# Same as @graffiti_author_any@, but without orc names.
-graffiti_author_any_non-orc
+# Same as @_graffiti_author_any_@, but without orc names.
+_graffiti_author_any_non-orc_
 
 w:50
 @ancestor name@
 
 w:2
-@graffiti_author_bland@
+@_graffiti_author_bland_@
 
 w:2
 @RANDGEN@
 
 w:1
-@rare_graffiti_author_any_non-orc@
+@_rare_graffiti_author_any_non-orc_@
 %%%%
-graffiti_author_bland
+_graffiti_author_bland_
 
 @bland name@
 
@@ -84,35 +84,35 @@ w:2
 # names (which are aliases), so that rare orc names don't show up
 # significantly more often than other rare names. Assume orcs are less
 # inclined to hide behind aliases.
-graffiti_author_orc
+_graffiti_author_orc_
 
 @any orc name@ the orc
 %%%%
-rare_graffiti_author_any
+_rare_graffiti_author_any_
 
-@rare_graffiti_author_ordinary@
+@_rare_graffiti_author_ordinary_@
 
 w:2
-@rare_graffiti_author_orc@
+@_rare_graffiti_author_orc_@
 
 w:2
-@rare_graffiti_author_title@
+@_rare_graffiti_author_title_@
 
 w:1
-@rare_graffiti_author_god@
+@_rare_graffiti_author_god_@
 %%%%
-# Same as @rare_graffiti_author_any@, but without orc names.
-rare_graffiti_author_any_non-orc
+# Same as @_rare_graffiti_author_any_@, but without orc names.
+_rare_graffiti_author_any_non-orc_
 
-@rare_graffiti_author_ordinary@
+@_rare_graffiti_author_ordinary_@
 
 w:2
-@rare_graffiti_author_title@
+@_rare_graffiti_author_title_@
 
 w:1
-@rare_graffiti_author_god@
+@_rare_graffiti_author_god_@
 %%%%
-rare_graffiti_author_god
+_rare_graffiti_author_god_
 
 # Funny option for rumours that "Woog the god" worships another god, or
 # is secretly an atheist, or is secretly Wu Jian (the similarity in
@@ -120,11 +120,11 @@ rare_graffiti_author_god
 # god is rare).
 Woog the god
 %%%%
-rare_graffiti_author_orc
+_rare_graffiti_author_orc_
 
 Spartorcus the orc
 %%%%
-rare_graffiti_author_ordinary
+_rare_graffiti_author_ordinary_
 
 # Not just in the documentation!
 Durwent the kobold
@@ -135,7 +135,7 @@ Fneeb the oni
 
 Vethion the elf
 %%%%
-rare_graffiti_author_title
+_rare_graffiti_author_title_
 
 # Kilroy was here!
 Kilroy
@@ -150,13 +150,13 @@ Plog the Peerless
 # deserves life, death, or undeath; or worships the Shining One.
 Dead Wendell
 %%%%
-pattern_type
+_pattern_type_
 
 @any_colour_pattern@
 
 @any_glowing_colour_pattern@
 %%%%
-writing_adj
+_writing_adj_
 
 angular
 
@@ -183,7 +183,7 @@ swirling
 writhing
 %%%%
 # Any word other than "graffiti" will work here.
-writing_noun
+_writing_noun_
 
 binary code
 
@@ -215,57 +215,57 @@ text
 
 writing
 %%%%
-writing_style
+_writing_style_
 
 @any_colour@
 
-@writing_adj@ @any_colour@
+@_writing_adj_@ @any_colour@
 
 @any_glowing_colour@
 %%%%
-writing_type
+_writing_type_
 
-@writing_style@ @writing_noun@
+@_writing_style_@ @_writing_noun_@
 %%%%
-graffiti_type
+_graffiti_type_
 
-@writing_style@ graffiti
+@_writing_style_@ graffiti
 %%%%
-graffiti_type_with_signature_maybe
+_graffiti_type_with_signature_maybe_
 
-@graffiti_type@
+@_graffiti_type_@
 
-@graffiti_type@ signed by @graffiti_author_any@
+@_graffiti_type_@ signed by @_graffiti_author_any_@
 %%%%
-graffiti_type_with_signature_maybe_non-orc
+_graffiti_type_with_signature_maybe_non-orc_
 
-@graffiti_type@
+@_graffiti_type_@
 
-@graffiti_type@ signed by @graffiti_author_any_non-orc@
+@_graffiti_type_@ signed by @_graffiti_author_any_non-orc_@
 %%%%
-graffiti_type_with_signature_maybe_orc
+_graffiti_type_with_signature_maybe_orc_
 
-@graffiti_type@
+@_graffiti_type_@
 
-@graffiti_type@ signed by @graffiti_author_orc@
+@_graffiti_type_@ signed by @_graffiti_author_orc_@
 %%%%
-graffiti_advertisement
+_graffiti_advertisement_
 
-advertising a meeting @graffiti_mass_meeting_ordinary@
+advertising a meeting @_graffiti_mass_meeting_ordinary_@
 
-advertising a meeting @graffiti_mass_meeting_religious@
+advertising a meeting @_graffiti_mass_meeting_religious_@
 
 advertising a shop in the dungeon with [cheap|exclusive|expensive|quality|rare|useful] goods
 
 w:2
-advertising @graffiti_class_any@
+advertising @_graffiti_class_any_@
 
 w:1
-advertising a meet-up with @graffiti_author_any@ to learn how to survive in the dungeon
+advertising a meet-up with @_graffiti_author_any_@ to learn how to survive in the dungeon
 
 # Possibly too lowbrow, but a good time can mean many things.
 w:1
-advertising a meet-up with @graffiti_author_any@ for a good time
+advertising a meet-up with @_graffiti_author_any_@ for a good time
 
 # Paint that can come in this many colours and types is special.
 w:1
@@ -280,59 +280,59 @@ advertising the very paint used to make it
 # involved in that. Also, don't change from rare names to non-rare names
 # or vice versa; the rare names are effectively aliases or titles that
 # may also have suffixes.
-graffiti_changed_names
+_graffiti_changed_names_
 
-@graffiti_author_any_changeable@ has changed names and now goes by @graffiti_author_any_changeable@
+@_graffiti_author_any_changeable_@ has changed names and now goes by @_graffiti_author_any_changeable_@
 
 w:2
-@graffiti_author_orc@ has changed names and now goes by @graffiti_author_orc@
+@_graffiti_author_orc_@ has changed names and now goes by @_graffiti_author_orc_@
 
 w:2
-@rare_graffiti_author_any@ has passed on the name to someone else worthy of it
+@_rare_graffiti_author_any_@ has passed on the name to someone else worthy of it
 
 w:1
-@graffiti_author_any_changeable_non-randgen@ has changed names due to Xom's influence and now goes by @RANDGEN@
+@_graffiti_author_any_changeable_non-randgen_@ has changed names due to Xom's influence and now goes by @RANDGEN@
 %%%%
 # This can produce an orc who worships (or is) Zin, or a non-orc who
 # worships (or is) Beogh, but you shouldn't believe everything you read.
-graffiti_changed_religions
+_graffiti_changed_religions_
 
-@graffiti_author_any@ has abandoned @random_god@
+@_graffiti_author_any_@ has abandoned @random_god@
 
-@graffiti_author_any@ has converted away from @random_god@
+@_graffiti_author_any_@ has converted away from @random_god@
 
-@graffiti_author_any@ has converted to @random_god@
+@_graffiti_author_any_@ has converted to @random_god@
 
-@graffiti_author_any@ is secretly an atheist
+@_graffiti_author_any_@ is secretly an atheist
 
-@graffiti_author_any@ is secretly not an atheist
+@_graffiti_author_any_@ is secretly not an atheist
 
-@graffiti_author_any@ is secretly @random_god@
+@_graffiti_author_any_@ is secretly @random_god@
 
-@graffiti_author_any@ secretly worships Zin
+@_graffiti_author_any_@ secretly worships Zin
 
-@graffiti_author_any@ secretly worships Zin instead of @random_god_chaotic@
+@_graffiti_author_any_@ secretly worships Zin instead of @random_god_chaotic@
 
-@graffiti_author_any@ secretly worships @random_god_chaotic@
+@_graffiti_author_any_@ secretly worships @random_god_chaotic@
 
-@graffiti_author_any@ secretly worships @random_god_chaotic@ instead of Zin
+@_graffiti_author_any_@ secretly worships @random_god_chaotic@ instead of Zin
 
-@graffiti_author_any@ secretly worships @random_god_good@
+@_graffiti_author_any_@ secretly worships @random_god_good@
 
-@graffiti_author_any@ secretly worships @random_god_good@ instead of @random_god_evil@
+@_graffiti_author_any_@ secretly worships @random_god_good@ instead of @random_god_evil@
 
-@graffiti_author_any@ secretly worships @random_god_evil@
+@_graffiti_author_any_@ secretly worships @random_god_evil@
 
-@graffiti_author_any@ secretly worships @random_god_evil@ instead of @random_god_good@
+@_graffiti_author_any_@ secretly worships @random_god_evil@ instead of @random_god_good@
 %%%%
-graffiti_class_any
+_graffiti_class_any_
 
-@graffiti_class_remedial@
+@_graffiti_class_remedial_@
 
 w:2
-@graffiti_class_master@
+@_graffiti_class_master_@
 %%%%
-graffiti_class_master
+_graffiti_class_master_
 
 a master class on excavation taught by formicids
 
@@ -346,33 +346,33 @@ a master class on Unarmed Combat taught by felids
 w:1
 a master class on [art|calligraphy] taught by anonymous graffiti authors
 %%%%
-graffiti_class_remedial
+_graffiti_class_remedial_
 
-a Remedial @random_skill@ class taught by @graffiti_professor@
+a Remedial @random_skill@ class taught by @_graffiti_professor_@
 
-a Remedial @random_skill_magic@ class taught by the @graffiti_professor_magic_type@ @graffiti_professor@
+a Remedial @random_skill_magic@ class taught by the @_graffiti_professor_magic_type_@ @_graffiti_professor_@
 
-a Remedial @random_skill_mundane@ class taught by the @graffiti_professor_mundane_type@ @graffiti_professor@
+a Remedial @random_skill_mundane@ class taught by the @_graffiti_professor_mundane_type_@ @_graffiti_professor_@
 
 w:2
-a Remedial Evocations class taught by the @graffiti_professor_evocations_type@ @graffiti_professor@
+a Remedial Evocations class taught by the @_graffiti_professor_evocations_type_@ @_graffiti_professor_@
 
 w:2
-a Remedial Invocations class taught by the @graffiti_professor_invocations_type@ @graffiti_professor@
+a Remedial Invocations class taught by the @_graffiti_professor_invocations_type_@ @_graffiti_professor_@
 
 w:2
-a Remedial Shapeshifting class taught by the @graffiti_professor_shapeshifting_type@ @graffiti_professor@
+a Remedial Shapeshifting class taught by the @_graffiti_professor_shapeshifting_type_@ @_graffiti_professor_@
 
 # Necromancers should be able to teach necromancy or other magic (from
 # branching out) the same way other spellcasters can.
 
 w:2
-a Remedial Necromancy class taught by the @graffiti_professor_necromancy_type@ @graffiti_professor@
+a Remedial Necromancy class taught by the @_graffiti_professor_necromancy_type_@ @_graffiti_professor_@
 
 w:2
-a Remedial @random_skill_magic@ class taught by the @graffiti_professor_necromancy_type@ @graffiti_professor@
+a Remedial @random_skill_magic@ class taught by the @_graffiti_professor_necromancy_type_@ @_graffiti_professor_@
 %%%%
-graffiti_duplicate
+_graffiti_duplicate_
 
 a duplicate
 
@@ -382,11 +382,11 @@ an impostor
 
 a shapeshifter
 %%%%
-graffiti_fight
+_graffiti_fight_
 
-of an argument between @graffiti_author_any@ and @graffiti_author_any@
+of an argument between @_graffiti_author_any_@ and @_graffiti_author_any_@
 
-of a three-way argument between @graffiti_author_any@, @graffiti_author_any@, and @graffiti_author_any@
+of a three-way argument between @_graffiti_author_any_@, @_graffiti_author_any_@, and @_graffiti_author_any_@
 
 w:2
 of a fight between [berserkers|Trog worshippers] and erythrospite sufferers over the true meaning of blood rage
@@ -394,7 +394,7 @@ of a fight between [berserkers|Trog worshippers] and erythrospite sufferers over
 w:2
 of a fight between [artists|Dithmenos worshippers] and [death knights|death mages|Yredelemnul worshippers|necromancers] over whether something was a shadow or a shadowghast
 %%%%
-graffiti_hailed_god
+_graffiti_hailed_god_
 
 Xom
 
@@ -402,20 +402,20 @@ w:2
 an unknown god
 
 w:1
-@rare_graffiti_author_god@
+@_rare_graffiti_author_god_@
 
 # Behold the power of cheese!
 w:1
 the power of cheese
 %%%%
-graffiti_happened_reason
+_graffiti_happened_reason_
 
 an accident
 
 a coincidence
 
 # Garak, Star Trek: Deep Space Nine
-a coincidence but @graffiti_author_any@ doesn't trust coincidences
+a coincidence but @_graffiti_author_any_@ doesn't trust coincidences
 
 a cover-up
 
@@ -460,7 +460,7 @@ undeserved
 
 unnecessary
 %%%%
-graffiti_image
+_graffiti_image_
 
 of [a goblin|a kobold|a spriggan] with its head poking out of a tunnel
 
@@ -481,7 +481,7 @@ of an eggplant just sitting there
 
 that looks like nothing you recognise
 %%%%
-graffiti_life_or_death
+_graffiti_life_or_death_
 
 deserves death
 
@@ -495,7 +495,7 @@ is undead
 
 lives
 %%%%
-graffiti_loves_or_hates
+_graffiti_loves_or_hates_
 
 curses
 
@@ -509,7 +509,7 @@ loves
 
 praises
 %%%%
-graffiti_mass_meeting_ordinary
+_graffiti_mass_meeting_ordinary_
 
 of an athletic club playing [cards|darts|hammer throw|javelin throw|Whack-A-Rock-Fish]
 
@@ -572,7 +572,7 @@ of a group of [crusaders|moralists] [discussing|opposing] evil in the world
 # Non-religious version of Lugonu below.
 of a varied group of people discussing their experiences in the Abyss
 %%%%
-graffiti_mass_meeting_religious
+_graffiti_mass_meeting_religious_
 
 of a [sharper club|group of Nemelex Xobeh worshippers] playing cards the way Nemelex Xobeh intended
 
@@ -622,7 +622,7 @@ of a group of [Lugonu worshippers|mad acolytes of Lugonu] discussing their exper
 
 of a group of orcs promoting Beogh's word
 %%%%
-graffiti_obscenities
+_graffiti_obscenities_
 
 of various obscenities
 
@@ -636,23 +636,23 @@ of some very imaginative obscenities you've never seen before
 # as we do with changed names above. Professors can sometimes get titles
 # that monsters can't (e.g. "the mage So-and-so the orc", or "the
 # [non-priest-type] Judas the orc"), but they're supposed to be special.
-graffiti_professor
+_graffiti_professor_
 
-@graffiti_author_any_changeable@
+@_graffiti_author_any_changeable_@
 
 w:2
-@graffiti_author_orc@
+@_graffiti_author_orc_@
 
 w:1
-@rare_graffiti_author_any@ (supposedly)
+@_rare_graffiti_author_any_@ (supposedly)
 %%%%
-graffiti_professor_evocations_type
+_graffiti_professor_evocations_type_
 
 artificer
 
 tinkerer
 %%%%
-graffiti_professor_invocations_type
+_graffiti_professor_invocations_type_
 
 cleric
 
@@ -662,7 +662,7 @@ priest
 
 theologian
 %%%%
-graffiti_professor_magic_type
+_graffiti_professor_magic_type_
 
 mage
 
@@ -672,7 +672,7 @@ spellcaster
 
 wizard
 %%%%
-graffiti_professor_mundane_type
+_graffiti_professor_mundane_type_
 
 knight
 
@@ -682,19 +682,19 @@ warlord
 
 warrior
 %%%%
-graffiti_professor_necromancy_type
+_graffiti_professor_necromancy_type_
 
 death mage
 
 necromancer
 %%%%
-graffiti_professor_shapeshifting_type
+_graffiti_professor_shapeshifting_type_
 
 shapeshifter
 
 talismancer
 %%%%
-graffiti_relative_or_quality
+_graffiti_relative_or_quality_
 
 all associates
 
@@ -740,7 +740,7 @@ the spouses
 
 the strength
 %%%%
-graffiti_religion_non-orc
+_graffiti_religion_non-orc_
 
 lauding Zin and Zin's laws
 
@@ -751,7 +751,7 @@ lauding Zin and talking about how those who break Zin's laws deserve punishment
 # Paradox!
 lauding Zin but warning that putting graffiti on surfaces is often unlawful
 %%%%
-graffiti_religion_not_non-orc_or_orc
+_graffiti_religion_not_non-orc_or_orc_
 
 [glorifying|blaspheming] the gods
 
@@ -759,7 +759,7 @@ glorifying @random_god@ and blaspheming @random_god@
 
 glorifying an unknown god
 
-not just hailing but glorifying @graffiti_hailed_god@
+not just hailing but glorifying @_graffiti_hailed_god_@
 
 # No entries for Ignis or Jiyva here. Ignis has one worshipper in the
 # Cinder Acolyte player, and Jiyva has one (sincere) worshipper in the
@@ -813,7 +813,7 @@ giving adulation to the Shining One and talking about how honourably removing ev
 
 flattering Lugonu and talking about how Lugonu and the forces of the Abyss will soon rule over all
 %%%%
-graffiti_religion_orc
+_graffiti_religion_orc_
 
 proselytising for Beogh and proper orcishness
 
@@ -823,7 +823,7 @@ thanking Beogh for granting salvation while the other gods just watched
 
 talking about how Beogh will help you when the other gods turn away from you
 %%%%
-graffiti_rumour
+_graffiti_rumour_
 
 speculating about the powers of the Orb of Zot
 
@@ -840,36 +840,36 @@ claiming to know the meaning of [life|unlife]
 # A reference to ploggifying in make_name().
 alluding to the "Plog" Conspiracy and why it hides that word everywhere
 %%%%
-graffiti_short_saying
+_graffiti_short_saying_
 
-@graffiti_author_any@ was here
+@_graffiti_author_any_@ was here
 
-@graffiti_author_any@ @graffiti_loves_or_hates@ @graffiti_author_any@
+@_graffiti_author_any_@ @_graffiti_loves_or_hates_@ @_graffiti_author_any_@
 
-@graffiti_author_any@ @graffiti_loves_or_hates@ @graffiti_relative_or_quality@ of @graffiti_author_any@
+@_graffiti_author_any_@ @_graffiti_loves_or_hates_@ @_graffiti_relative_or_quality_@ of @_graffiti_author_any_@
 
-@graffiti_author_any@ @graffiti_life_or_death@
+@_graffiti_author_any_@ @_graffiti_life_or_death_@
 
-@graffiti_author_any@ sells @graffiti_wares_quality@ wares
+@_graffiti_author_any_@ sells @_graffiti_wares_quality_@ wares
 
-@graffiti_author_any@ steals from @graffiti_author_any@
+@_graffiti_author_any_@ steals from @_graffiti_author_any_@
 
-what happened to @graffiti_author_any@ was @graffiti_happened_reason@
+what happened to @_graffiti_author_any_@ was @_graffiti_happened_reason_@
 
-@graffiti_author_any@ has been replaced by @graffiti_duplicate@
+@_graffiti_author_any_@ has been replaced by @_graffiti_duplicate_@
 
-@graffiti_vengeance@
+@_graffiti_vengeance_@
 
-@graffiti_changed_religions@
+@_graffiti_changed_religions_@
 
 w:2
-@graffiti_changed_names@
+@_graffiti_changed_names_@
 
 # Strong Bad
 w:1
-@graffiti_author_any@ is actually a wagon full of pancakes
+@_graffiti_author_any_@ is actually a wagon full of pancakes
 %%%%
-graffiti_species
+_graffiti_species_
 
 bemoaning how bizarre coglin engineering is to non-coglins
 
@@ -899,7 +899,7 @@ wondering what really happened to the last of the sludge elves
 
 claiming that gnomes really exist and are just superb at hiding
 %%%%
-graffiti_unique_comment
+_graffiti_unique_comment_
 
 saying that Cassandra should stop being so negative
 
@@ -923,68 +923,68 @@ wondering what else Ijyb can make besides wands
 
 speculating on the true nature of Jeremiah's master
 %%%%
-# This is not in @graffiti_religion_[whatever]@ because it's structured
-# too differently. Assume one can hail a god without necessarily
-# worshipping a god.
-graffiti_unreadable
+# This is not in @_graffiti_religion_[whatever]_@ because it's
+# structured too differently. Assume one can hail a god without
+# necessarily worshipping a god.
+_graffiti_unreadable_
 
-graffiti of unreadable @writing_type@
+graffiti of unreadable @_writing_type_@
 
-graffiti of @writing_type@ that are unreadable except for bits hailing @graffiti_hailed_god@
+graffiti of @_writing_type_@ that are unreadable except for bits hailing @_graffiti_hailed_god_@
 
-graffiti of @writing_type@ that are unreadable except for bits hailing @graffiti_hailed_god@ and a signature by @graffiti_author_any@
+graffiti of @_writing_type_@ that are unreadable except for bits hailing @_graffiti_hailed_god_@ and a signature by @_graffiti_author_any_@
 %%%%
-graffiti_vengeance
+_graffiti_vengeance_
 
-@graffiti_author_any@ has avenged @graffiti_author_any@
+@_graffiti_author_any_@ has avenged @_graffiti_author_any_@
 
-@graffiti_author_any@ has avenged @graffiti_author_any@ for @graffiti_vengeance_reason@
+@_graffiti_author_any_@ has avenged @graffiti_author_any@ for @_graffiti_vengeance_reason_@
 
-@graffiti_author_any@ swears vengeance on @graffiti_author_any@
+@_graffiti_author_any_@ swears vengeance on @_graffiti_author_any_@
 
-@graffiti_author_any@ swears vengeance on @graffiti_author_any@ for @graffiti_vengeance_reason@
+@_graffiti_author_any_@ swears vengeance on @_graffiti_author_any_@ for @_graffiti_vengeance_reason_@
 
-the ghost of @graffiti_author_any@ still haunts @graffiti_author_any@
+the ghost of @_graffiti_author_any_@ still haunts @_graffiti_author_any_@
 
-the ghost of @graffiti_author_any@ still haunts @graffiti_author_any@ for @graffiti_vengeance_reason@
+the ghost of @_graffiti_author_any_@ still haunts @_graffiti_author_any_@ for @_graffiti_vengeance_reason_@
 
 # Vengeance is more common among orcs.
 
-@graffiti_author_orc@ has avenged @graffiti_author_any@
+@_graffiti_author_orc_@ has avenged @_graffiti_author_any_@
 
-@graffiti_author_orc@ has avenged @graffiti_author_any@ for @graffiti_vengeance_reason@
+@_graffiti_author_orc_@ has avenged @_graffiti_author_any_@ for @_graffiti_vengeance_reason_@
 
-@graffiti_author_orc@ swears vengeance on @graffiti_author_any@
+@_graffiti_author_orc_@ swears vengeance on @_graffiti_author_any_@
 
-@graffiti_author_orc@ swears vengeance on @graffiti_author_any@ for @graffiti_vengeance_reason@
+@_graffiti_author_orc_@ swears vengeance on @_graffiti_author_any_@ for @_graffiti_vengeance_reason_@
 
-the ghost of @graffiti_author_orc@ still haunts @graffiti_author_any@
+the ghost of @_graffiti_author_orc_@ still haunts @_graffiti_author_any_@
 
-the ghost of @graffiti_author_orc@ still haunts @graffiti_author_any@ for @graffiti_vengeance_reason@
+the ghost of @_graffiti_author_orc_@ still haunts @_graffiti_author_any_@ for @_graffiti_vengeance_reason_@
 %%%%
-graffiti_vengeance_reason
+_graffiti_vengeance_reason_
 
-abandoning @graffiti_author_any@
+abandoning @_graffiti_author_any_@
 
 abandoning them
 
-betraying @graffiti_author_any@
+betraying @_graffiti_author_any_@
 
 betraying them
 
-killing @graffiti_author_any@
+killing @_graffiti_author_any_@
 
 killing them
 
-stealing from @graffiti_author_any@
+stealing from @_graffiti_author_any_@
 
 stealing from them
 
-wounding @graffiti_author_any@
+wounding @_graffiti_author_any_@
 
 wounding them
 %%%%
-graffiti_wares_quality
+_graffiti_wares_quality_
 
 inferior
 
@@ -998,36 +998,36 @@ superior
 %%%%
 any_graffiti
 
-graffiti of @pattern_type@
+graffiti of @_pattern_type_@
 
-graffiti of @writing_type@
+graffiti of @_writing_type_@
 
-@graffiti_unreadable@
+@_graffiti_unreadable_@
 
-@graffiti_type_with_signature_maybe@
+@_graffiti_type_with_signature_maybe_@
 
-@graffiti_type_with_signature_maybe@ @graffiti_image@
+@_graffiti_type_with_signature_maybe_@ @_graffiti_image_@
 
-@graffiti_type_with_signature_maybe@ @graffiti_rumour@
+@_graffiti_type_with_signature_maybe_@ @_graffiti_rumour_@
 
-@graffiti_type_with_signature_maybe@ @graffiti_unique_comment@
+@_graffiti_type_with_signature_maybe_@ @_graffiti_unique_comment_@
 
-@graffiti_type_with_signature_maybe@ @graffiti_species@
+@_graffiti_type_with_signature_maybe_@ @_graffiti_species_@
 
-@graffiti_type@ @graffiti_fight@
+@_graffiti_type_@ @_graffiti_fight_@
 
-@graffiti_type@ @graffiti_advertisement@
+@_graffiti_type_@ @_graffiti_advertisement_@
 
-@graffiti_type@ saying that @graffiti_short_saying@
+@_graffiti_type_@ saying that @_graffiti_short_saying_@
 
 w:2
-@graffiti_type_with_signature_maybe@ @graffiti_religion_not_non-orc_or_orc@
+@_graffiti_type_with_signature_maybe_@ @_graffiti_religion_not_non-orc_or_orc_@
 
 w:2
-@graffiti_type_with_signature_maybe_non-orc@ @graffiti_religion_non-orc@
+@_graffiti_type_with_signature_maybe_non-orc_@ @_graffiti_religion_non-orc_@
 
 w:2
-@graffiti_type_with_signature_maybe_orc@ @graffiti_religion_orc@
+@_graffiti_type_with_signature_maybe_orc_@ @_graffiti_religion_orc_@
 
 w:1
-@graffiti_type@ @graffiti_obscenities@
+@_graffiti_type_@ @_graffiti_obscenities_@


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1781-gd1a1f204d8

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

       via  d1a1f204d818c70cf3c57c9145225b4086b0f743 (commit)
       via  dcab5b4b6ac9356a45ae700b071ceccb69184584 (commit)
       via  21fb4b52dd60a2d7ff0a8c3221d34aab042d7851 (commit)
      from  b18e6e356bee256f53d544840c9229ce9427d302 (commit)

-----------------------------------------------------------------------
commit d1a1f204d818c70cf3c57c9145225b4086b0f743
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 11:49:09 2025 -0600

    Lower weights of individual religious graffiti.
    
    So that group religious graffiti and other graffiti show up more.

commit dcab5b4b6ac9356a45ae700b071ceccb69184584
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 11:52:07 2025 -0600

    Resort individual religious graffiti.

commit 21fb4b52dd60a2d7ff0a8c3221d34aab042d7851
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 11:46:33 2025 -0600

    Update now-inaccurate comment.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 43 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 4262209dad..85f28b080d 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -740,6 +740,17 @@ the spouses
 
 the strength
 %%%%
+graffiti_religion_non-orc
+
+lauding Zin and Zin's laws
+
+lauding Zin and talking about how following Zin's laws is essential
+
+lauding Zin and talking about how those who break Zin's laws deserve punishment
+
+# Paradox!
+lauding Zin but warning that putting graffiti on surfaces is often unlawful
+%%%%
 graffiti_religion_not_non-orc_or_orc
 
 [glorifying|blaspheming] the gods
@@ -802,17 +813,6 @@ giving adulation to the Shining One and talking about how honourably removing ev
 
 flattering Lugonu and talking about how Lugonu and the forces of the Abyss will soon rule over all
 %%%%
-graffiti_religion_non-orc
-
-lauding Zin and Zin's laws
-
-lauding Zin and talking about how following Zin's laws is essential
-
-lauding Zin and talking about how those who break Zin's laws deserve punishment
-
-# Paradox!
-lauding Zin but warning that putting graffiti on surfaces is often unlawful
-%%%%
 graffiti_religion_orc
 
 proselytising for Beogh and proper orcishness
@@ -923,9 +923,9 @@ wondering what else Ijyb can make besides wands
 
 speculating on the true nature of Jeremiah's master
 %%%%
-# This is not in @graffiti_religion_any@ because it's structured too
-# differently. Assume one can hail a god without necessarily worshipping
-# a god.
+# This is not in @graffiti_religion_[whatever]@ because it's structured
+# too differently. Assume one can hail a god without necessarily
+# worshipping a god.
 graffiti_unreadable
 
 graffiti of unreadable @writing_type@
@@ -1008,12 +1008,6 @@ graffiti of @writing_type@
 
 @graffiti_type_with_signature_maybe@ @graffiti_image@
 
-@graffiti_type_with_signature_maybe@ @graffiti_religion_not_non-orc_or_orc@
-
-@graffiti_type_with_signature_maybe_non-orc@ @graffiti_religion_non-orc@
-
-@graffiti_type_with_signature_maybe_orc@ @graffiti_religion_orc@
-
 @graffiti_type_with_signature_maybe@ @graffiti_rumour@
 
 @graffiti_type_with_signature_maybe@ @graffiti_unique_comment@
@@ -1026,5 +1020,14 @@ graffiti of @writing_type@
 
 @graffiti_type@ saying that @graffiti_short_saying@
 
+w:2
+@graffiti_type_with_signature_maybe@ @graffiti_religion_not_non-orc_or_orc@
+
+w:2
+@graffiti_type_with_signature_maybe_non-orc@ @graffiti_religion_non-orc@
+
+w:2
+@graffiti_type_with_signature_maybe_orc@ @graffiti_religion_orc@
+
 w:1
 @graffiti_type@ @graffiti_obscenities@


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1778-gb18e6e356b

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

       via  b18e6e356bee256f53d544840c9229ce9427d302 (commit)
      from  2da860cfb384cbbedaeee2a44f22bcc73f5b3706 (commit)

-----------------------------------------------------------------------
commit b18e6e356bee256f53d544840c9229ce9427d302
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 10:41:55 2025 -0600

    Add a few ancestor names.

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

Summary of changes:
 crawl-ref/source/dat/database/monname.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 90d6f1a4b9..27a5a40886 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -708,6 +708,8 @@ Edwyna
 
 Friðuswiþ
 
+Godgifu
+
 Gudrun
 
 Kendra
@@ -725,6 +727,8 @@ Synnove
 Walburga
 
 Wilfreda
+
+Wynnflæd
 %%%%
 _roman_female_name_
 


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1777-g2da860cfb3

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

       via  2da860cfb384cbbedaeee2a44f22bcc73f5b3706 (commit)
      from  e6b53b88178f313cff996f86700f329d03ddb8dc (commit)

-----------------------------------------------------------------------
commit 2da860cfb384cbbedaeee2a44f22bcc73f5b3706
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 10:29:01 2025 -0600

    Fix orc priest apostle tag (oops).

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

Summary of changes:
 crawl-ref/source/dat/database/monname.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 90137a919c..90d6f1a4b9 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -72,7 +72,7 @@ w:50
 orc apostle priest name
 
 w:1
-_orc_priest_name_
+@_orc_priest_name_@
 
 w:50
 @orc name@


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1776-ge6b53b8817

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

       via  e6b53b88178f313cff996f86700f329d03ddb8dc (commit)
      from  53de3f577f6b77b4ee609ebf764d977664d98654 (commit)

-----------------------------------------------------------------------
commit e6b53b88178f313cff996f86700f329d03ddb8dc
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 10:14:58 2025 -0600

    Adjust comment for tweaked professor names again.
    
    Since the apostle types associated with orc apostle names may not always
    match their professor types.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 72aa22b6f3..4262209dad 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -634,8 +634,8 @@ of some very imaginative obscenities you've never seen before
 # ending with " the orc") and rare names (aliases or titles that may
 # also have suffixes, and may also be orcs) separately from them, just
 # as we do with changed names above. Professors can sometimes get titles
-# that monsters can't (e.g. "the mage So-and-so the orc"), but they're
-# supposed to be special.
+# that monsters can't (e.g. "the mage So-and-so the orc", or "the
+# [non-priest-type] Judas the orc"), but they're supposed to be special.
 graffiti_professor
 
 @graffiti_author_any_changeable@


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1775-g53de3f577f

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

       via  53de3f577f6b77b4ee609ebf764d977664d98654 (commit)
       via  d7528eea97e92fcfe2de0f1dc29ae7c1fcf99a7d (commit)
      from  d2f1f5c0e031c63d578654df205f85c3451c6bb5 (commit)

-----------------------------------------------------------------------
commit 53de3f577f6b77b4ee609ebf764d977664d98654
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 10:05:02 2025 -0600

    Adjust comment for tweaked professor names.
    
    We no longer use e.g. "So-and-so the orc mage", but "the mage So-and-so
    the orc".

commit d7528eea97e92fcfe2de0f1dc29ae7c1fcf99a7d
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 09:54:46 2025 -0600

    Reorganise orc apostle-specific names.
    
    They're in their own sections now, which should make it a bit easier to
    add to them.
    
    (Also, @any orc name@ can now use them all with one less instance of
    recursion, so orc remedial class professors in graffiti should no longer
    produce "TOO MUCH RECURSION" for their names.)

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt |  4 ++--
 crawl-ref/source/dat/database/monname.txt  | 32 +++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 6f6f74be5e..72aa22b6f3 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -634,8 +634,8 @@ of some very imaginative obscenities you've never seen before
 # ending with " the orc") and rare names (aliases or titles that may
 # also have suffixes, and may also be orcs) separately from them, just
 # as we do with changed names above. Professors can sometimes get titles
-# that monsters can't (e.g. orc mages), but they're supposed to be
-# special.
+# that monsters can't (e.g. "the mage So-and-so the orc"), but they're
+# supposed to be special.
 graffiti_professor
 
 @graffiti_author_any_changeable@
diff --git a/crawl-ref/source/dat/database/monname.txt b/crawl-ref/source/dat/database/monname.txt
index 0955ac6338..90137a919c 100644
--- a/crawl-ref/source/dat/database/monname.txt
+++ b/crawl-ref/source/dat/database/monname.txt
@@ -40,10 +40,23 @@ w:12
 w:45
 @_other_orcish_name_@
 %%%%
+_orc_warrior_name_
+
+Orconan
+%%%%
+_orc_wizard_name_
+
+Simorc Magus
+%%%%
+_orc_priest_name_
+
+# Watch out! :p
+Judas
+%%%%
 orc apostle warrior name
 
 w:1
-Orconan
+@_orc_warrior_name_@
 
 w:50
 @orc name@
@@ -51,16 +64,15 @@ w:50
 orc apostle wizard name
 
 w:1
-Simorc Magus
+@_orc_wizard_name_@
 
 w:50
 @orc name@
 %%%%
 orc apostle priest name
 
-# Watch out! :p
 w:1
-Judas
+_orc_priest_name_
 
 w:50
 @orc name@
@@ -68,11 +80,17 @@ w:50
 # Any orc name, apostle-specific or otherwise.
 any orc name
 
-@orc apostle warrior name@
+w:1
+@_orc_warrior_name_@
+
+w:1
+@_orc_wizard_name_@
 
-@orc apostle wizard name@
+w:1
+@_orc_priest_name_@
 
-@orc apostle priest name@
+w:50
+@orc name@
 %%%%
 # Obvious references to Beogh
 # (18 at last count)


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1773-gd2f1f5c0e0

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

       via  d2f1f5c0e031c63d578654df205f85c3451c6bb5 (commit)
      from  4f2349a6e447877e6a3e15d4b129e5f93e495bcc (commit)

-----------------------------------------------------------------------
commit d2f1f5c0e031c63d578654df205f85c3451c6bb5
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 09:41:58 2025 -0600

    Simplify graffiti professor names.
    
    So that there's less recursion.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 81 ++++--------------------------
 1 file changed, 11 insertions(+), 70 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 5f17918434..6f6f74be5e 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -348,28 +348,29 @@ a master class on [art|calligraphy] taught by anonymous graffiti authors
 %%%%
 graffiti_class_remedial
 
-a Remedial @random_skill@ class taught by @graffiti_professor_any@
+a Remedial @random_skill@ class taught by @graffiti_professor@
 
-a Remedial @random_skill_magic@ class taught by @graffiti_professor_magic@
+a Remedial @random_skill_magic@ class taught by the @graffiti_professor_magic_type@ @graffiti_professor@
 
-a Remedial @random_skill_mundane@ class taught by @graffiti_professor_mundane@
+a Remedial @random_skill_mundane@ class taught by the @graffiti_professor_mundane_type@ @graffiti_professor@
 
 w:2
-a Remedial Evocations class taught by @graffiti_professor_evocations@
+a Remedial Evocations class taught by the @graffiti_professor_evocations_type@ @graffiti_professor@
 
 w:2
-a Remedial Invocations class taught by @graffiti_professor_invocations@
+a Remedial Invocations class taught by the @graffiti_professor_invocations_type@ @graffiti_professor@
+
+w:2
+a Remedial Shapeshifting class taught by the @graffiti_professor_shapeshifting_type@ @graffiti_professor@
 
 # Necromancers should be able to teach necromancy or other magic (from
 # branching out) the same way other spellcasters can.
-w:2
-a Remedial Necromancy class taught by @graffiti_professor_necromancy@
 
 w:2
-a Remedial @random_skill_magic@ class taught by @graffiti_professor_necromancy@
+a Remedial Necromancy class taught by the @graffiti_professor_necromancy_type@ @graffiti_professor@
 
 w:2
-a Remedial Shapeshifting class taught by @graffiti_professor_shapeshifting@
+a Remedial @random_skill_magic@ class taught by the @graffiti_professor_necromancy_type@ @graffiti_professor@
 %%%%
 graffiti_duplicate
 
@@ -635,7 +636,7 @@ of some very imaginative obscenities you've never seen before
 # as we do with changed names above. Professors can sometimes get titles
 # that monsters can't (e.g. orc mages), but they're supposed to be
 # special.
-graffiti_professor_any
+graffiti_professor
 
 @graffiti_author_any_changeable@
 
@@ -645,32 +646,12 @@ w:2
 w:1
 @rare_graffiti_author_any@ (supposedly)
 %%%%
-graffiti_professor_evocations
-
-@graffiti_author_any_changeable@ the @graffiti_professor_evocations_type@
-
-w:2
-@graffiti_author_orc@ @graffiti_professor_evocations_type@
-
-w:1
-the @graffiti_professor_evocations_type@ @rare_graffiti_author_any@ (supposedly)
-%%%%
 graffiti_professor_evocations_type
 
 artificer
 
 tinkerer
 %%%%
-graffiti_professor_invocations
-
-@graffiti_author_any_changeable@ the @graffiti_professor_invocations_type@
-
-w:2
-@graffiti_author_orc@ @graffiti_professor_invocations_type@
-
-w:1
-the @graffiti_professor_invocations_type@ @rare_graffiti_author_any@ (supposedly)
-%%%%
 graffiti_professor_invocations_type
 
 cleric
@@ -681,16 +662,6 @@ priest
 
 theologian
 %%%%
-graffiti_professor_magic
-
-@graffiti_author_any_changeable@ the @graffiti_professor_magic_type@
-
-w:2
-@graffiti_author_orc@ @graffiti_professor_magic_type@
-
-w:1
-the @graffiti_professor_magic_type@ @rare_graffiti_author_any@ (supposedly)
-%%%%
 graffiti_professor_magic_type
 
 mage
@@ -701,16 +672,6 @@ spellcaster
 
 wizard
 %%%%
-graffiti_professor_mundane
-
-@graffiti_author_any_changeable@ the @graffiti_professor_mundane_type@
-
-w:2
-@graffiti_author_orc@ @graffiti_professor_mundane_type@
-
-w:1
-the @graffiti_professor_mundane_type@ @rare_graffiti_author_any@ (supposedly)
-%%%%
 graffiti_professor_mundane_type
 
 knight
@@ -721,32 +682,12 @@ warlord
 
 warrior
 %%%%
-graffiti_professor_necromancy
-
-@graffiti_author_any_changeable@ the @graffiti_professor_necromancy_type@
-
-w:2
-@graffiti_author_orc@ @graffiti_professor_necromancy_type@
-
-w:1
-the @graffiti_professor_necromancy_type@ @rare_graffiti_author_any@ (supposedly)
-%%%%
 graffiti_professor_necromancy_type
 
 death mage
 
 necromancer
 %%%%
-graffiti_professor_shapeshifting
-
-@graffiti_author_any_changeable@ the @graffiti_professor_shapeshifting_type@
-
-w:2
-@graffiti_author_orc@ @graffiti_professor_shapeshifting_type@
-
-w:1
-the @graffiti_professor_shapeshifting_type@ @rare_graffiti_author_any@ (supposedly)
-%%%%
 graffiti_professor_shapeshifting_type
 
 shapeshifter


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1772-g4f2349a6e4

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

       via  4f2349a6e447877e6a3e15d4b129e5f93e495bcc (commit)
      from  0cdb165708b14d8d0f6d383e4609402df6ca77c2 (commit)

-----------------------------------------------------------------------
commit 4f2349a6e447877e6a3e15d4b129e5f93e495bcc
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 09:14:49 2025 -0600

    Cut down on graffiti synonyms.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 6a86b72b69..5f17918434 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -251,31 +251,25 @@ graffiti_type_with_signature_maybe_orc
 %%%%
 graffiti_advertisement
 
-@graffiti_advertisement_type@ @graffiti_mass_meeting_type@ @graffiti_mass_meeting_ordinary@
+advertising a meeting @graffiti_mass_meeting_ordinary@
 
-@graffiti_advertisement_type@ @graffiti_mass_meeting_type@ @graffiti_mass_meeting_religious@
+advertising a meeting @graffiti_mass_meeting_religious@
 
-@graffiti_advertisement_type@ a shop in the dungeon with [cheap|exclusive|expensive|quality|rare|useful] goods
+advertising a shop in the dungeon with [cheap|exclusive|expensive|quality|rare|useful] goods
 
 w:2
-@graffiti_advertisement_type@ @graffiti_class_any@
+advertising @graffiti_class_any@
 
 w:1
-@graffiti_advertisement_type@ a meet-up with @graffiti_author_any@ to learn how to survive in the dungeon
+advertising a meet-up with @graffiti_author_any@ to learn how to survive in the dungeon
 
 # Possibly too lowbrow, but a good time can mean many things.
 w:1
-@graffiti_advertisement_type@ a meet-up with @graffiti_author_any@ for a good time
+advertising a meet-up with @graffiti_author_any@ for a good time
 
 # Paint that can come in this many colours and types is special.
 w:1
-@graffiti_advertisement_type@ the very paint used to make it
-%%%%
-graffiti_advertisement_type
-
-advertising
-
-promoting
+advertising the very paint used to make it
 %%%%
 # There's sometimes a chance of the two names being the same, but maybe
 # the author's crazy, or maybe the author spells their name the same way
@@ -627,12 +621,6 @@ of a group of [Lugonu worshippers|mad acolytes of Lugonu] discussing their exper
 
 of a group of orcs promoting Beogh's word
 %%%%
-graffiti_mass_meeting_type
-
-a gathering
-
-a meeting
-%%%%
 graffiti_obscenities
 
 of various obscenities


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1771-g0cdb165708

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

       via  0cdb165708b14d8d0f6d383e4609402df6ca77c2 (commit)
       via  a605de819644eaec2d2d966f5092f3a5d97b31ff (commit)
      from  357cbd44aeca629582ddd250182afcd3d8c6488f (commit)

-----------------------------------------------------------------------
commit 0cdb165708b14d8d0f6d383e4609402df6ca77c2
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 08:44:34 2025 -0600

    Tweak graffiti advertisements.

commit a605de819644eaec2d2d966f5092f3a5d97b31ff
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 08:38:56 2025 -0600

    Resort graffiti mass meeting types.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 34 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index c0b4c28759..6a86b72b69 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -251,25 +251,31 @@ graffiti_type_with_signature_maybe_orc
 %%%%
 graffiti_advertisement
 
-@graffiti_mass_meeting_type@ @graffiti_mass_meeting_ordinary@
+@graffiti_advertisement_type@ @graffiti_mass_meeting_type@ @graffiti_mass_meeting_ordinary@
 
-@graffiti_mass_meeting_type@ @graffiti_mass_meeting_religious@
+@graffiti_advertisement_type@ @graffiti_mass_meeting_type@ @graffiti_mass_meeting_religious@
 
-a shop in the dungeon with [cheap|exclusive|expensive|quality|rare|useful] goods
+@graffiti_advertisement_type@ a shop in the dungeon with [cheap|exclusive|expensive|quality|rare|useful] goods
 
 w:2
-@graffiti_class_any@
+@graffiti_advertisement_type@ @graffiti_class_any@
 
 w:1
-a meet-up with @graffiti_author_any@ to learn how to survive in the dungeon
+@graffiti_advertisement_type@ a meet-up with @graffiti_author_any@ to learn how to survive in the dungeon
 
 # Possibly too lowbrow, but a good time can mean many things.
 w:1
-a meet-up with @graffiti_author_any@ for a good time
+@graffiti_advertisement_type@ a meet-up with @graffiti_author_any@ for a good time
 
 # Paint that can come in this many colours and types is special.
 w:1
-the very paint used to make it
+@graffiti_advertisement_type@ the very paint used to make it
+%%%%
+graffiti_advertisement_type
+
+advertising
+
+promoting
 %%%%
 # There's sometimes a chance of the two names being the same, but maybe
 # the author's crazy, or maybe the author spells their name the same way
@@ -508,12 +514,6 @@ loves
 
 praises
 %%%%
-graffiti_mass_meeting_type
-
-a gathering
-
-a meeting
-%%%%
 graffiti_mass_meeting_ordinary
 
 of an athletic club playing [cards|darts|hammer throw|javelin throw|Whack-A-Rock-Fish]
@@ -627,6 +627,12 @@ of a group of [Lugonu worshippers|mad acolytes of Lugonu] discussing their exper
 
 of a group of orcs promoting Beogh's word
 %%%%
+graffiti_mass_meeting_type
+
+a gathering
+
+a meeting
+%%%%
 graffiti_obscenities
 
 of various obscenities
@@ -1087,7 +1093,7 @@ graffiti of @writing_type@
 
 @graffiti_type@ @graffiti_fight@
 
-@graffiti_type@ advertising @graffiti_advertisement@
+@graffiti_type@ @graffiti_advertisement@
 
 @graffiti_type@ saying that @graffiti_short_saying@
 


-- 
Dungeon Crawl Stone Soup

[crawl-ref-commits] master branch updated: 0.34-a0-1769-g357cbd44ae

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

       via  357cbd44aeca629582ddd250182afcd3d8c6488f (commit)
      from  d727200dd878d269b2dae3af771e9914010b0be6 (commit)

-----------------------------------------------------------------------
commit 357cbd44aeca629582ddd250182afcd3d8c6488f
Author: David Lawrence Ramsey <poo...@gm...>
Date:   Fri Dec 12 08:30:45 2025 -0600

    Reorganise graffiti of colour patterns.

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

Summary of changes:
 crawl-ref/source/dat/database/graffiti.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/crawl-ref/source/dat/database/graffiti.txt b/crawl-ref/source/dat/database/graffiti.txt
index 2ae5c445a3..c0b4c28759 100644
--- a/crawl-ref/source/dat/database/graffiti.txt
+++ b/crawl-ref/source/dat/database/graffiti.txt
@@ -150,6 +150,12 @@ Plog the Peerless
 # deserves life, death, or undeath; or worships the Shining One.
 Dead Wendell
 %%%%
+pattern_type
+
+@any_colour_pattern@
+
+@any_glowing_colour_pattern@
+%%%%
 writing_adj
 
 angular
@@ -1057,9 +1063,7 @@ superior
 %%%%
 any_graffiti
 
-graffiti of @any_colour_pattern@
-
-graffiti of @any_glowing_colour_pattern@
+graffiti of @pattern_type@
 
 graffiti of @writing_type@
 


-- 
Dungeon Crawl Stone Soup