From 4ea997db72e2b3770b5875d4420c87c7352d1206 Mon Sep 17 00:00:00 2001
From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com>
Date: Thu, 29 Sep 2022 06:52:01 -0700
Subject: [PATCH] standard house palette update - bedside table (#1909)

* [CDDA PORT] adding house_34

adding house_34

* add 2storymodern03

add new house

* Update 2storymodern03.json

* Update 2storymodern03.json

* standard house palette update

added furniture -- nightstand

* Update palettes.json
---
 data/json/mapgen/house/2storymodern03.json           | 10 +++++-----
 data/json/mapgen_palettes/house_general_palette.json |  4 +++-
 data/mods/No_Hope/palettes.json                      |  3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/data/json/mapgen/house/2storymodern03.json b/data/json/mapgen/house/2storymodern03.json
index aeb45c6406cf..b442f2bdbb0a 100644
--- a/data/json/mapgen/house/2storymodern03.json
+++ b/data/json/mapgen/house/2storymodern03.json
@@ -23,7 +23,7 @@
         "^^^^#########        T#^",
         "^^^^#D,$,,,,+         #^",
         "^^^^#,,,,h,,###++#++# #^",
-        "^^^^#C@@,II,+d#zz#LL#<#^",
+        "^^^^#¤@@,II,+d#zz#LL#<#^",
         "^^^^###################^",
         "^^^^^^^^^^^^^^^^^^^^^^^^",
         "^^^^^^^^^^^^^^^^^^^^^^^^",
@@ -46,7 +46,7 @@
         "@": "t_carpet_red",
         "$": "t_carpet_red",
         "D": "t_carpet_red",
-        "C": "t_carpet_red"
+        "¤": "t_carpet_red"
       },
       "furniture": { "!": "f_counter", "$": "f_bigmirror" }
     }
@@ -128,7 +128,7 @@
         "....#d           +  y!#.",
         "....od    T bRRRR#    o.",
         "....#D @@ #+######+## #.",
-        "....##C@@C# d#v    R#>o.",
+        "....##¤@@¤# d#v    R#>o.",
         ".....#::::#Dd#Ph z!R#y#.",
         "..........#####rr#o####.",
         "..............#oo#.^....",
@@ -149,8 +149,8 @@
         ",": "t_floor_noroof",
         "₸": "t_floor_noroof"
       },
-      "furniture": { "!": "f_table", "₸": "f_deckchair", "C": "f_table" },
-      "items": { "!": { "item": "table_foyer", "chance": 50 }, "C": { "item": "nightstand", "chance": 30 } }
+      "furniture": { "!": "f_table", "₸": "f_deckchair" },
+      "items": { "!": { "item": "table_foyer", "chance": 50 } }
     }
   },
   {
diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json
index 89470b676027..47321ee505ad 100644
--- a/data/json/mapgen_palettes/house_general_palette.json
+++ b/data/json/mapgen_palettes/house_general_palette.json
@@ -67,7 +67,8 @@
       "@": "f_bed",
       "Ø": "f_pinball_machine",
       "Æ": "f_arcade_machine",
-      "ʭ": "f_ladder"
+      "ʭ": "f_ladder",
+      "¤": "f_table"
     },
     "terrain": {
       "a": "t_thconc_floor",
@@ -188,6 +189,7 @@
         { "item": "harddrugs", "chance": 2 }
       ],
       "9": { "item": "shower", "chance": 30, "repeat": [ 1, 2 ] },
+      "¤": { "item": "nightstand", "chance": 30 },
       "@": { "item": "bed", "chance": 50 },
       "Z": { "item": "laundry", "chance": 100 },
       "W": { "item": "laundry", "chance": 50 },
diff --git a/data/mods/No_Hope/palettes.json b/data/mods/No_Hope/palettes.json
index 26900462d9d5..43cdbe105a8f 100644
--- a/data/mods/No_Hope/palettes.json
+++ b/data/mods/No_Hope/palettes.json
@@ -70,7 +70,8 @@
       "≠": "f_locker",
       "Ø": "f_pinball_machine",
       "Æ": "f_arcade_machine",
-      "ʭ": "f_ladder"
+      "ʭ": "f_ladder",
+      "¤": "f_table"
     },
     "terrain": {
       "a": "t_thconc_floor",