From 971b3e9193222a81566e154b4c1a95a265f7a682 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 8 Aug 2023 19:49:44 -0700 Subject: Updated to 2023-08-04-0433 Add patch fixing incorrect palette usage in labs. --- terrain-13_fix-lab-machinery-palette.patch | 246 +++++++++++++++++++++++++++++ 1 file changed, 246 insertions(+) create mode 100644 terrain-13_fix-lab-machinery-palette.patch diff --git a/terrain-13_fix-lab-machinery-palette.patch b/terrain-13_fix-lab-machinery-palette.patch new file mode 100644 index 0000000..4151d6f --- /dev/null +++ b/terrain-13_fix-lab-machinery-palette.patch @@ -0,0 +1,246 @@ +--- a/data/json/mapgen/lab/lab_floorplans.json ++++ b/data/json/mapgen/lab/lab_floorplans.json +@@ -119,7 +119,7 @@ + "...|...|r......|X.....X|", + "...|...|.......|---W---|", + "LLL|LLL|.......| |", +- "...C..........l| |", ++ "...K..........l| |", + "..............l| |", + "...............+ |", + "...............| |", +@@ -148,7 +148,7 @@ + "F": "t_chainfence_h", + "f": "t_chainfence_v", + "H": "t_chaingate_c", +- "C": "t_gates_control_concrete_lab" ++ "K": "t_gates_control_concrete_lab" + }, + "mapping": { "r": { "items": [ { "item": "hardware", "chance": 10 }, { "item": "robots", "chance": 10 } ] } }, + "place_nested": [ +@@ -238,10 +238,10 @@ + "..c|c..c|c....c|c..c|c..", + "..---..---....---..---..", + "........................", +- "...C....C......C....C...", ++ "...K....K......K....K...", + "........................", + "........................", +- "...C....C......C....C...", ++ "...K....K......K....K...", + "........................", + "..---..---.....|---+---|", + "..c|c..c|c.....| |", +@@ -254,11 +254,11 @@ + "rrr.....!.....l|-------|" + ], + "palettes": [ "lab_palette", "lab_loot_research" ], +- "furniture": { "f": "f_null", "C": "f_centrifuge" }, ++ "furniture": { "f": "f_null", "K": "f_centrifuge" }, + "terrain": { + "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], + "!": [ "t_thconc_floor", "t_thconc_floor", "t_console_broken", "t_generator_broken" ], +- "C": "t_thconc_floor" ++ "K": "t_thconc_floor" + }, + "mapping": { + "c": { "items": [ { "item": "chem_lab", "chance": 10 }, { "item": "tools_science", "chance": 10 } ] }, +@@ -401,7 +401,7 @@ + "...| |---+---|..", + "...| |..........", + "...|---------|..........", +- "...| |C|cccxc...hh", ++ "...| |K|cccxc...hh", + "l..| | +...hc...tt", + "l..| |f|....c...hh", + "l..? |--cc.cc.....", +@@ -415,8 +415,8 @@ + ], + "palettes": [ "lab_palette", "lab_loot_home_office" ], + "terrain": { "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] }, +- "furniture": { "^": "f_indoor_plant", "C": "f_cupboard" }, +- "mapping": { "C": { "items": [ { "item": "kitchen", "chance": 40 } ] }, "t": { "items": [ { "item": "snacks", "chance": 10 } ] } }, ++ "furniture": { "^": "f_indoor_plant", "K": "f_cupboard" }, ++ "mapping": { "K": { "items": [ { "item": "kitchen", "chance": 40 } ] }, "t": { "items": [ { "item": "snacks", "chance": 10 } ] } }, + "place_nested": [ + { "chunks": [ "lab_spawn_9x9_wall_nw" ], "x": 3, "y": 2 }, + { "chunks": [ "lab_spawn_7x7_crossdoors" ], "x": 14, "y": 3 }, +@@ -437,7 +437,7 @@ + ".......L...............l", + ".......L...............l", + ".......L....----?----..l", +- "-------|C...| |..l", ++ "-------|K...| |..l", + ".......L....| |..l", + ".......L....| |..l", + ".......L....+ |..l", +@@ -465,7 +465,7 @@ + "F": "t_chainfence_h", + "f": "t_chainfence_v", + "H": "t_chaingate_c", +- "C": "t_gates_control_concrete_lab", ++ "K": "t_gates_control_concrete_lab", + "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ] + }, + "mapping": { +@@ -509,7 +509,7 @@ + "rows": [ + "..cccccc.|...|,,,|..|,,,", + "c........|...|,,,|.6|,,,", +- "c..Ccxc..|...|,,,g..g,,,", ++ "c..Kcxc..|...|,,,g..g,,,", + "c........g...|,,,g..g,,,", + "c........g...|,,,L..L,,,", + "......llS|...|---|..|---", +@@ -533,10 +533,10 @@ + "........................" + ], + "palettes": [ "lab_palette", "lab_loot_research" ], +- "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "C": "f_centrifuge" }, ++ "furniture": { "?": "f_autodoc", "/": "f_autodoc_couch", "K": "f_centrifuge" }, + "terrain": { + ",": "t_floor_blue", +- "C": "t_floor_blue", ++ "K": "t_floor_blue", + "?": "t_floor_blue", + "/": "t_floor_blue", + "7": "t_console", +@@ -593,7 +593,7 @@ + "bb...+.......| |", + "bb...+.......| |", + "...ht|.......| |", +- "-----|..C6...+ |", ++ "-----|..K6...+ |", + "....l|.......| |", + "bb...+.......| |", + "bb...+.......| |", +@@ -606,7 +606,7 @@ + "bb...+.......| |", + "bb...+.......| |", + "...ht|.......| |", +- "-----|..Cx...? |", ++ "-----|..Kx...? |", + "...ht|.......| |", + "bb...+.......| |", + "bb...+.......| |", +@@ -615,12 +615,12 @@ + ], + "palettes": [ "lab_palette" ], + "terrain": { +- "C": "t_floor", ++ "K": "t_floor", + "?": [ "t_concrete_wall", "t_concrete_wall", "t_door_glass_frosted_lab_c" ], + "7": "t_floor", + "8": "t_floor" + }, +- "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch", "C": "f_centrifuge" }, ++ "furniture": { "7": "f_autodoc", "8": "f_autodoc_couch", "K": "f_centrifuge" }, + "items": { + "b": { "item": "hospital_bed", "chance": 33 }, + "l": { "item": "surgery", "chance": 50 }, +@@ -661,7 +661,7 @@ + "fill_ter": "t_thconc_floor", + "rows": [ + ",,,,,|..|.....|.........", +- ",,,,,|7.|.....|..cxcC...", ++ ",,,,,|7.|.....|..cxcK...", + ",,,,,g..g.....g.......l.", + ",,,,,g..g.....g.......l.", + ",,,,,L..g.....|.......S.", +@@ -686,8 +686,8 @@ + "........................" + ], + "palettes": [ "lab_palette" ], +- "furniture": { "C": "f_centrifuge" }, +- "terrain": { "C": "t_floor_blue", "7": "t_console", ",": "t_floor_blue" }, ++ "furniture": { "K": "f_centrifuge" }, ++ "terrain": { "K": "t_floor_blue", "7": "t_console", ",": "t_floor_blue" }, + "mapping": { + "c": { "items": [ { "item": "office", "chance": 30 }, { "item": "tools_science", "chance": 15 } ] }, + "l": { "items": [ { "item": "science", "chance": 60 } ] } +@@ -746,7 +746,7 @@ + ".......L.........G......", + ".......L.........|..ddd.", + ".......L.........g..dh..", +- "-------|C........g......", ++ "-------|K........g......", + ".......L.........g......", + ".......L.........|dh....", + ".......L.........|dxd.^.", +@@ -762,7 +762,7 @@ + "P": "t_generator_broken", + "S": "t_sewage_pump", + "p": "t_sewage_pipe", +- "C": "t_gates_control_concrete_lab", ++ "K": "t_gates_control_concrete_lab", + "g": "t_wall_glass", + "G": "t_door_glass_lab_c" + }, +@@ -826,21 +826,21 @@ + "...htth..g....gWWWWWWWl|", + "...htth..g....gWWWcWWWl|", + ".........G....LWWWcWWWW|", +- ".........g....gWWWCWWWW|", ++ ".........g....gWWWKWWWW|", + "...htth..g....gWWWcWWWW|", + "...htth..g....gWWWWWWhd|", + "........^|....|rrrWWdxd|", + ".........|....|---------" + ], + "palettes": [ "lab_palette", "lab_loot_home_office" ], +- "furniture": { "^": "f_indoor_plant", "C": "f_centrifuge" }, ++ "furniture": { "^": "f_indoor_plant", "K": "f_centrifuge" }, + "terrain": { + "E": "t_elevator", + "e": "t_elevator_control_off", + "w": "t_water_sh", + "W": "t_water_dp", + "=": "t_door_lab_c", +- "C": "t_thconc_floor" ++ "K": "t_thconc_floor" + }, + "mapping": { "t": { "items": [ { "item": "vending_food_items", "chance": 20 } ] } }, + "place_loot": [ +@@ -920,20 +920,20 @@ + "TS| F +`````+ F |ST|", + "--|V F w`hth`w F V|--|", + "rr--| -w---w- |--rr|", +- "-+|s| CSC|CSC |s|+-|", +- " | C|C | x|", ++ "-+|s| KSK|KSK |s|+-|", ++ " | K|K | x|", + " t + O|O + t|", + "bb |hh f|f hh| bb|", +- "bb ]|tt C|C tt|] bb|", ++ "bb ]|tt K|K tt|] bb|", + "--------+-----+--------|", + "........................", + "........................", + "--------+-----+--------|", +- "bb ]|tt C|C tt|] bb|", ++ "bb ]|tt K|K tt|] bb|", + "bb |hh f|f hh| bb|", + " t + O|O + t|", +- " | C|C | |", +- "-+|s| CSC|CSC |s|+-|", ++ " | K|K | |", ++ "-+|s| KSK|KSK |s|+-|", + "rr--| -w---w- |--rr|", + "--|V F w`hth`w F V|--|", + "TS| F +`````+ F |ST|", +@@ -941,13 +941,13 @@ + "BB|FFFt |`````| tFFF|BB|" + ], + "palettes": [ "lab_palette", "lab_loot_home_office" ], +- "furniture": { "F": "f_sofa", "B": "f_bathtub", "C": "f_counter", "O": "f_oven", "V": "f_table" }, ++ "furniture": { "F": "f_sofa", "B": "f_bathtub", "K": "f_counter", "O": "f_oven", "V": "f_table" }, + "terrain": { "w": "t_window_domestic", "`": "t_grass", "+": "t_door_lab_c" }, + "mapping": { + "t": { "items": [ { "item": "livingroom", "chance": 20 } ] }, + "F": { "items": [ { "item": "livingroom", "chance": 5 } ] }, + "f": { "items": [ { "item": "fridge", "chance": 80 } ] }, +- "C": { "items": [ { "item": "kitchen", "chance": 40 } ] }, ++ "K": { "items": [ { "item": "kitchen", "chance": 40 } ] }, + "O": { "items": [ { "item": "oven", "chance": 70 } ] }, + "r": { + "items": [ -- cgit v1.2.1