From 2e326c353ca577639e4a660d9a1e60ad6f5376fa Mon Sep 17 00:00:00 2001
From: John Bytheway <jbytheway@gmail.com>
Date: Sat, 8 Feb 2020 21:51:29 -0500
Subject: [PATCH] Test Unicode mapgen with bookcases in house_w
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace bookcase symbol in the house_w_nest_palette with a Unicode
symbol that looks similar to a bookcase (▤).
---
 data/json/mapgen/nested/house_nested.json     | 50 +++++++++----------
 .../json/mapgen_palettes/house_w_palette.json |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/data/json/mapgen/nested/house_nested.json b/data/json/mapgen/nested/house_nested.json
index ffd95d71e5cbb..032ef11d11771 100644
--- a/data/json/mapgen/nested/house_nested.json
+++ b/data/json/mapgen/nested/house_nested.json
@@ -467,7 +467,7 @@
       "mapgensize": [ 4, 4 ],
       "rotation": [ 0, 3 ],
       "rows": [
-        " CR ",
+        " C▤ ",
         "O   ",
         " EE ",
         " EE "
@@ -476,7 +476,7 @@
       "items": {
         "O": [ { "item": "SUS_dresser_mens", "chance": 50 }, { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] } ],
         "E": { "item": "bed", "chance": 40, "repeat": [ 1, 2 ] },
-        "R": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
+        "▤": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
       }
     }
   },
@@ -492,13 +492,13 @@
         " EE ",
         " EE ",
         "O   ",
-        " CR "
+        " C▤ "
       ],
       "palettes": [ "house_w_nest_palette" ],
       "items": {
         "O": [ { "item": "SUS_dresser_mens", "chance": 50 }, { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] } ],
         "E": { "item": "bed", "chance": 40, "repeat": [ 1, 2 ] },
-        "R": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
+        "▤": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
       }
     }
   },
@@ -513,14 +513,14 @@
       "rows": [
         "    ",
         "C EE",
-        "R EE",
+        "▤ EE",
         " O  "
       ],
       "palettes": [ "house_w_nest_palette" ],
       "items": {
         "O": [ { "item": "SUS_dresser_mens", "chance": 50 }, { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] } ],
         "E": { "item": "bed", "chance": 40, "repeat": [ 1, 2 ] },
-        "R": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
+        "▤": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
       }
     }
   },
@@ -535,14 +535,14 @@
       "rows": [
         "    ",
         "EE C",
-        "EE R",
+        "EE ▤",
         "  O "
       ],
       "palettes": [ "house_w_nest_palette" ],
       "items": {
         "O": [ { "item": "SUS_dresser_mens", "chance": 50 }, { "item": "SUS_dresser_womens", "chance": 50, "repeat": [ 1, 2 ] } ],
         "E": { "item": "bed", "chance": 40, "repeat": [ 1, 2 ] },
-        "R": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
+        "▤": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] }
       }
     }
   },
@@ -704,7 +704,7 @@
         "     ",
         "EE  I",
         "L  AI",
-        "y   R",
+        "y   ▤",
         "OCy  "
       ],
       "palettes": [ "house_w_nest_palette" ],
@@ -713,7 +713,7 @@
         "E": { "item": "bed", "chance": 40, "repeat": [ 1, 2 ] },
         "I": { "item": "SUS_desks_bedroom_unisex", "chance": 40, "repeat": [ 1, 2 ] },
         "L": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] },
-        "R": { "item": "homebooks", "chance": 30, "repeat": [ 1, 2 ] }
+        "▤": { "item": "homebooks", "chance": 30, "repeat": [ 1, 2 ] }
       }
     }
   },
@@ -729,8 +729,8 @@
         "  OO ",
         "IB  L",
         "I  EE",
-        "y   R",
-        "RCa  "
+        "y   ▤",
+        "▤Ca  "
       ],
       "palettes": [ "house_w_nest_palette" ],
       "items": {
@@ -739,7 +739,7 @@
         "I": { "item": "SUS_desks_bedroom_unisex", "chance": 40, "repeat": [ 1, 2 ] },
         "L": { "item": "homebooks", "chance": 10, "repeat": [ 1, 2 ] },
         "a": { "item": "unisex_coat_rack", "chance": 100, "repeat": [ 1, 2 ] },
-        "R": { "item": "homebooks", "chance": 30, "repeat": [ 1, 2 ] }
+        "▤": { "item": "homebooks", "chance": 30, "repeat": [ 1, 2 ] }
       }
     }
   },
@@ -1023,8 +1023,8 @@
       "rotation": [ 0, 3 ],
       "rows": [
         " @@p ",
-        "    R",
-        " pp R",
+        "    ▤",
+        " pp ▤",
         "     ",
         " xxx "
       ],
@@ -1118,11 +1118,11 @@
       "mapgensize": [ 2, 2 ],
       "rotation": [ 0, 3 ],
       "rows": [
-        "RR",
+        "▤▤",
         "C "
       ],
       "palettes": [ "house_w_nest_palette" ],
-      "items": { "R": [ { "item": "homebooks", "chance": 30 } ] }
+      "items": { "▤": [ { "item": "homebooks", "chance": 30 } ] }
     }
   },
   {
@@ -1135,10 +1135,10 @@
       "rotation": [ 0, 3 ],
       "rows": [
         "C ",
-        "R "
+        "▤ "
       ],
       "palettes": [ "house_w_nest_palette" ],
-      "items": { "R": [ { "item": "homebooks", "chance": 30 } ] }
+      "items": { "▤": [ { "item": "homebooks", "chance": 30 } ] }
     }
   },
   {
@@ -1151,10 +1151,10 @@
       "rotation": [ 0, 3 ],
       "rows": [
         " C",
-        "HR"
+        "H▤"
       ],
       "palettes": [ "house_w_nest_palette" ],
-      "items": { "R": [ { "item": "homebooks", "chance": 30 } ] }
+      "items": { "▤": [ { "item": "homebooks", "chance": 30 } ] }
     }
   },
   {
@@ -1230,12 +1230,12 @@
       "mapgensize": [ 3, 3 ],
       "rotation": [ 0, 3 ],
       "rows": [
-        "R H",
-        "RC ",
-        "R  "
+        "▤ H",
+        "▤C ",
+        "▤  "
       ],
       "palettes": [ "house_w_nest_palette" ],
-      "items": { "R": [ { "item": "homebooks", "chance": 30 } ] }
+      "items": { "▤": [ { "item": "homebooks", "chance": 30 } ] }
     }
   },
   {
diff --git a/data/json/mapgen_palettes/house_w_palette.json b/data/json/mapgen_palettes/house_w_palette.json
index 7d83fa5b9f07c..1cf6d42e0ae3b 100644
--- a/data/json/mapgen_palettes/house_w_palette.json
+++ b/data/json/mapgen_palettes/house_w_palette.json
@@ -22,7 +22,7 @@
       "O": "f_dresser",
       "P": "f_locker",
       "Q": "f_rack",
-      "R": "f_bookcase",
+      "▤": "f_bookcase",
       "S": [ [ "f_filing_cabinet", 80 ], [ "f_shredder", 20 ] ],
       "U": "f_utility_shelf",
       "V": "f_glass_cabinet",