minor cleanup

CleverRaven · May 18, 2024 · d541bcd · d541bcd
1 parent 968138b
commit d541bcd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/data/json/mapgen/house/house04.json b/data/json/mapgen/house/house04.json
@@ -46,7 +46,7 @@
         { "group": "livingroom", "x": [ 10, 18 ], "y": [ 10, 11 ], "chance": 90, "repeat": [ 1, 5 ] },
         { "group": "magazines", "x": 17, "y": 7, "chance": 80, "repeat": [ 1, 3 ] },
         { "group": "mischw", "x": 13, "y": 2, "chance": 60, "repeat": [ 1, 3 ] },
-        { "group": "SUS_fiction_bookcase", "x": 7, "y": [ 2, 3 ], "chance": 85, "repeat": [ 1, 4 ] },
+        { "group": "SUS_fiction_bookcase", "x": 7, "y": [ 2, 3 ], "chance": 85 },
         { "group": "trash", "x": 19, "y": 15, "chance": 80, "repeat": [ 1, 3 ] },
         { "item": "television", "x": 21, "y": 2, "chance": 85 },
         { "item": "laptop", "x": 2, "y": 20, "chance": 3 }

diff --git a/data/json/mapgen/house/house38.json b/data/json/mapgen/house/house38.json
@@ -10,7 +10,7 @@
         "...%%%.!`!..[.##=====#..",
         "..##o##!`!....#&~~~~~#..",
         "..#D d#$;$#$$$#~~~~~~#..",
-        "..#D d#~~~~Gyy#~~~~~~#..",
+        "..#D d#~~~~Góó#~~~~~~#..",
         ".##|+|#*o##oo##~~~~~~#^.",
         ".#BB'S| L| hhh#~~~~~~##.",
         ".oBB't|    fff#~~~~~~U#.",
@@ -24,7 +24,7 @@
         ".o @@ |H      y|F'453#..",
         ".#¤@@¤|H  l   x##*#o##..",
         ".##oo##H  l   a#~~~~~$..",
-        "...%%^#H   E  x#~~~yy$..",
+        "...%%^#H   E  x#~~~óó$..",
         "......##oo##oo##$;$$$$..",
         "........%%..%%..```!!!..",
         "................`````...",
@@ -37,6 +37,7 @@
         "standard_domestic_lino_bathroom",
         "standard_domestic_landscaping_palette"
       ],
+      "furniture": { "ó": [ "f_indoor_plant", "f_indoor_plant_y" ] },
       "terrain": {
         "=": "t_door_metal_locked",
         "&": "t_gates_control_concrete_lab",
@@ -46,7 +47,7 @@
         "A": "t_thconc_floor",
         "G": "t_thconc_floor",
         "N": "t_thconc_floor",
-        "y": "t_thconc_floor",
+        "ó": "t_thconc_floor",
         "'": { "param": "linoleum_color_bathroom", "fallback": "t_linoleum_gray" },
         "_": { "param": "linoleum_color_kitchen", "fallback": "t_linoleum_gray" },
         "$": "t_screened_porch_wall",