From ad3e6258daa0ee91dabd8fa384d8ad120e63e759 Mon Sep 17 00:00:00 2001
From: mumra <pete.hurst@gmail.com>
Date: Sun, 23 Feb 2025 07:30:31 +0000
Subject: [PATCH] connected rendering both types of lichen (WIP)

---
 crawl-ref/source/rltiles/dc-mon.txt           |  17 ++-
 .../rltiles/mon/fungi_plants/wolf_lichen.png  | Bin 0 -> 3403 bytes
 .../mon/fungi_plants/wolf_lichen_n_s.png      | Bin 0 -> 2897 bytes
 .../mon/fungi_plants/wolf_lichen_ne_sw.png    | Bin 0 -> 3826 bytes
 .../mon/fungi_plants/wolf_lichen_nw_se.png    | Bin 0 -> 3841 bytes
 .../mon/fungi_plants/wolf_lichen_w_e.png      | Bin 0 -> 2785 bytes
 crawl-ref/source/tilecell.h                   |  10 +-
 crawl-ref/source/tiledgnbuf.cc                |  25 ++--
 crawl-ref/source/view.cc                      | 122 +++++++++++++-----
 9 files changed, 122 insertions(+), 52 deletions(-)
 create mode 100644 crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen.png
 create mode 100644 crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_n_s.png
 create mode 100644 crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_ne_sw.png
 create mode 100644 crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_nw_se.png
 create mode 100644 crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_w_e.png

diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 7f5a3c837c3..442725fb3ce 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -1214,15 +1214,20 @@ wandering_mushroom MONS_WANDERING_MUSHROOM
 deathcap MONS_DEATHCAP
 sleepcap MONS_SLEEPCAP
 
+wolf_lichen MONS_WOLF_LICHEN
+wolf_lichen_n_s MONS_WOLF_LICHEN_N_S
+wolf_lichen_w_e MONS_WOLF_LICHEN_W_E
+wolf_lichen_nw_se MONS_WOLF_LICHEN_NW_SE
+wolf_lichen_ne_sw MONS_WOLF_LICHEN_NE_SW
+
 %rim 1
-%sdir misc
-mold_glowing1 MONS_WOLF_LICHEN
-mold_glowing2
-mold_glowing3
-mold_glowing4
+wolf_lichen MONS_WOLF_LICHEN_MASK
+wolf_lichen_n_s MONS_WOLF_LICHEN_N_S_MASK
+wolf_lichen_w_e MONS_WOLF_LICHEN_W_E_MASK
+wolf_lichen_nw_se MONS_WOLF_LICHEN_NW_SE_MASK
+wolf_lichen_ne_sw MONS_WOLF_LICHEN_NE_SW_MASK
 
 %rim 0
-%sdir mon/fungi_plants
 cobalt_lichen MONS_COBALT_LICHEN
 cobalt_lichen_n_s MONS_COBALT_LICHEN_N_S
 cobalt_lichen_w_e MONS_COBALT_LICHEN_W_E
diff --git a/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen.png b/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen.png
new file mode 100644
index 0000000000000000000000000000000000000000..b488e9e173a005c41a2fc89180572e20d39743cb
GIT binary patch
literal 3403
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
V$4fh6TGoDVNCaDaxw-GL{{VQc+K2!E

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_n_s.png b/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_n_s.png
new file mode 100644
index 0000000000000000000000000000000000000000..25cd5c89c88d51d20a76f869ed834e8b63cb2a5b
GIT binary patch
literal 2897
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

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_ne_sw.png b/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_ne_sw.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ce2cb2216baacae065aae694e35b3b6094c625
GIT binary patch
literal 3826
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

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_nw_se.png b/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_nw_se.png
new file mode 100644
index 0000000000000000000000000000000000000000..a214b8c55b0ed913184f0f887aa19037dc593bb9
GIT binary patch
literal 3841
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

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_w_e.png b/crawl-ref/source/rltiles/mon/fungi_plants/wolf_lichen_w_e.png
new file mode 100644
index 0000000000000000000000000000000000000000..23106576f78b13468b8c09e11cf3d789701c5f16
GIT binary patch
literal 2785
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
UI#bc`wVzHqYbUEJ3;$pK15PZf<NyEw

literal 0
HcmV?d00001

diff --git a/crawl-ref/source/tilecell.h b/crawl-ref/source/tilecell.h
index e90623a71e9..6da9fa229d7 100644
--- a/crawl-ref/source/tilecell.h
+++ b/crawl-ref/source/tilecell.h
@@ -50,9 +50,13 @@ struct packed_cell
     tileidx_t bg;
     tileidx_t cloud;
     set<tileidx_t> icons;
-    // Four tiles to use as border connectors; they correspond to NE,E,SE,S in
-    // order (the other 4 borders are handled by tiles to the north and/or west).
-    FixedVector<int, 4> fg_underlay = {0,0,0,0};
+
+    
+    // Four tiles to use to render around the edges and corners; they correspond
+    // to S-SE-E-NE in order. For performance each tile only deals with 4 edges,
+    // the other 4 are handled by the tiles to the N, NW, W and SW.
+    FixedVector<int, 4> edges = {0,0,0,0};
+    FixedVector<int, 4> edge_masks = {0,0,0,0};
 
     bool operator ==(const packed_cell &other) const;
     bool operator !=(const packed_cell &other) const { return !(*this == other); }
diff --git a/crawl-ref/source/tiledgnbuf.cc b/crawl-ref/source/tiledgnbuf.cc
index 21601e88519..ad145041e05 100644
--- a/crawl-ref/source/tiledgnbuf.cc
+++ b/crawl-ref/source/tiledgnbuf.cc
@@ -50,12 +50,12 @@ void DungeonCellBuffer::add_glyph(const char32_t &g, const VColour &col, const V
     m_buf_glyphs.get_font_wrapper().store(m_buf_glyphs, sx, sy, g, col, bg);
 }
 
-static const struct coord_def _buf_offset_coords[] = {
-    {0,16}, {16,16}, {16,0}, {16,-16},
-};
-
 void DungeonCellBuffer::add(const packed_cell &cell, int x, int y)
 {
+    static const coord_def edge_offsets[] = {
+        {0,16}, {16,16}, {16,0}, {16,-16},
+    };
+
     pack_background(x, y, cell);
 
     const tileidx_t fg_idx = cell.fg & TILE_FLAG_MASK;
@@ -69,14 +69,17 @@ void DungeonCellBuffer::add(const packed_cell &cell, int x, int y)
 
     for (int n=0; n < 4; n++)
     {
-        if (cell.fg_underlay[n])
+        if (cell.edges[n])
+        {
+            m_buf_doll.add(cell.edges[n], x, y, 1, false, false,
+                           edge_offsets[n].x, edge_offsets[n].y);
+        }
+        if (cell.edge_masks[n])
         {
-            m_buf_doll.add(cell.fg_underlay[n], x, y, 1, false, false,
-                           _buf_offset_coords[n].x, _buf_offset_coords[n].y);
-            // Mask layer at lower z-index (to add rim around the connector)
-            m_buf_doll.add(cell.fg_underlay[n] + TILEP_MONS_COBALT_LICHEN_MASK
-                           - TILEP_MONS_COBALT_LICHEN, x, y, -2, false, false,
-                           _buf_offset_coords[n].x, _buf_offset_coords[n].y);
+            // Add mask layer at lower z-index. This allows us to build up an
+            // outline for a shape that is made up of several tiles and edges.
+            m_buf_doll.add(cell.edge_masks[n], x, y, -2, false, false,
+                           edge_offsets[n].x, edge_offsets[n].y);
         }
     }
 
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 69fe3a97c5f..59ce9f3959a 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -1696,41 +1696,99 @@ crawl_view_buffer view_dungeon(animation *a, bool anim_updates, view_renderer *r
     return vbuf;
 }
 
-static void _pack_underlays(coord_def gc, packed_cell& cell, const monster_info& mon)
+static bool _has_edge_tiles(monster_type type)
 {
-    if (!in_bounds(gc))
+    switch (mons_species(type))
+    {
+        case MONS_WOLF_LICHEN:
+        case MONS_COBALT_LICHEN:
+            return true;
+        default:
+            return false;
+    }
+}
+
+static int _determine_edge_tile(const monster_info& origin,
+                                const monster_info& connected, int dx, int dy)
+{
+    auto species = mons_species(connected.type);
+    if (species != mons_species(origin.type))
+        return 0;
+
+    switch (species)
+    {
+        case MONS_WOLF_LICHEN:
+            return dx == 0 ? TILEP_MONS_WOLF_LICHEN_N_S
+                 : dy == 0 ? TILEP_MONS_WOLF_LICHEN_W_E
+                 : dy == 1 ? TILEP_MONS_WOLF_LICHEN_NW_SE
+                           : TILEP_MONS_WOLF_LICHEN_NE_SW;
+        case MONS_COBALT_LICHEN:
+            return dx == 0 ? TILEP_MONS_COBALT_LICHEN_N_S
+                 : dy == 0 ? TILEP_MONS_COBALT_LICHEN_W_E
+                 : dy == 1 ? TILEP_MONS_COBALT_LICHEN_NW_SE
+                           : TILEP_MONS_COBALT_LICHEN_NE_SW;
+        // Shouldn't get here unless _has_edge_tiles is wrong
+        default:
+            return 0;
+    }
+}
+
+static int _mask_tile_for(int tile_idx)
+{
+    if (tile_idx >= TILEP_MONS_WOLF_LICHEN && tile_idx <= TILEP_MONS_WOLF_LICHEN_NE_SW)
+        return tile_idx + (TILEP_MONS_WOLF_LICHEN_NE_SW - TILEP_MONS_WOLF_LICHEN) + 1;
+
+    if (tile_idx >= TILEP_MONS_COBALT_LICHEN && tile_idx <= TILEP_MONS_COBALT_LICHEN_NE_SW)
+        return tile_idx + (TILEP_MONS_COBALT_LICHEN_NE_SW - TILEP_MONS_COBALT_LICHEN) + 1;
+
+    // Special cobalt units all just use the base mask
+    if (tile_idx >= TILEP_MONS_COBALT_LICHEN_EYESTALK
+        && tile_idx <= TILEP_MONS_COBALT_LICHEN_SAC)
+    {
+        return TILEP_MONS_COBALT_LICHEN_MASK;
+    }
+
+    return 0;
+}
+
+static void _pack_edges(coord_def gc, packed_cell& cell, const monster_info& mon)
+{
+    if (!in_bounds(gc) || !_has_edge_tiles(mon.type))
         return;
-    if (mons_species(mon.type) == MONS_COBALT_LICHEN)
+    int edge_num = -1;
+    for (adjacent_iterator ri(gc, true); ri; ++ri)
     {
-        int underlay_num = -1;
-        for (adjacent_iterator ri(gc, true); ri; ++ri)
-        {
-            int dx = ri->x - gc.x;
-            if (dx < 0)
-                continue;
-            int dy = ri->y - gc.y;
-            if (dy < 0 && dx < 1)
-                continue;
-            underlay_num++;
-            cell.fg_underlay[underlay_num] = 0;
+        // Get the delta to this tile
+        int dx = ri->x - gc.x;
+        // Not interested in NW, W, or SW - those edges are handled by the
+        // tiles in that direction
+        if (dx < 0)
+            continue;
+        int dy = ri->y - gc.y;
+        // We also let N edge be handled by tile to the N
+        if (dy < 0 && dx < 1)
+            continue;
+        // Now this is one of the 4 edges we handle
+        edge_num++;
+        cell.edges[edge_num] = 0;
 
-            if (!map_bounds(*ri))
-                continue;
-            const map_cell& adj_knowledge = env.map_knowledge(*ri);
-            if (!adj_knowledge.seen() && !adj_knowledge.mapped())
-                continue;
-            // Now we know this is a connection we *might* want to check, see if
-            // there's an applicable monster there first
-            if (!adj_knowledge.monsterinfo()
-                || mons_species(adj_knowledge.monsterinfo()->type) != MONS_COBALT_LICHEN)
-            {
-                continue;
-            }
-            cell.fg_underlay[underlay_num] = dx == 0 ? TILEP_MONS_COBALT_LICHEN_N_S
-                                           : dy == 0 ? TILEP_MONS_COBALT_LICHEN_W_E
-                                           : dy == 1 ? TILEP_MONS_COBALT_LICHEN_NW_SE
-                                                     : TILEP_MONS_COBALT_LICHEN_NE_SW;
-        }
+        if (!in_bounds(*ri))
+            continue;
+        const map_cell& adj_knowledge = env.map_knowledge(*ri);
+        if (!adj_knowledge.seen() && !adj_knowledge.mapped())
+            continue;
+        // Now we know this is a connection we *might* want to check, see if
+        // there's an applicable monster there first
+        auto connected = adj_knowledge.monsterinfo();
+        if (!connected)
+            continue;
+        int edge = _determine_edge_tile(mon, *connected, dx, dy);
+        if (!edge)
+            continue;
+        cell.edges[edge_num] = edge;
+        // Add mask layer at lower z-index. This allows us to build up an
+        // outline for a shape that is made up of several tiles and edges.
+        cell.edge_masks[edge_num] = _mask_tile_for(cell.edges[edge_num]);
     }
 }
 
@@ -1763,7 +1821,7 @@ void draw_cell(screen_cell_t *cell, const coord_def &gc,
     cell->flash_colour = BLACK;
     cell->flash_alpha = 0;
     if (cell->tile.map_knowledge.monsterinfo())
-        _pack_underlays(gc, cell->tile, *cell->tile.map_knowledge.monsterinfo());
+        _pack_edges(gc, cell->tile, *cell->tile.map_knowledge.monsterinfo());
 #endif
 
     // Don't hide important information by recolouring monsters.