From 42c6e6b3fbcc4925a9fe7ea4ef4b9f05464fcc4f Mon Sep 17 00:00:00 2001 From: 0Monet <146018959+0Monet@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:22:03 +0100 Subject: [PATCH 1/4] "t_dirtfloor" below the display racks --- data/json/mapgen/ranch_camp.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/mapgen/ranch_camp.json b/data/json/mapgen/ranch_camp.json index 42b29bb4d5b1..b7b78bd99fd5 100644 --- a/data/json/mapgen/ranch_camp.json +++ b/data/json/mapgen/ranch_camp.json @@ -599,6 +599,7 @@ "..%..................................../W;;;;W;;;;W;;;;W;;;;W;;;;W;;;;W." ], "palettes": [ "ranch_camp" ], + "terrain": { "r": "t_dirtfloor" }, "items": { ";": { "item": "farming_tools", "chance": 1 } }, "place_item": [ { "item": "cattlefodder", "x": [ 41, 44 ], "y": [ 25, 29 ], "amount": [ 0, 2 ] }, From 351b26d4df029c27aae274bcf7e71768e4abd91f Mon Sep 17 00:00:00 2001 From: 0Monet <146018959+0Monet@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:59:21 +0100 Subject: [PATCH 2/4] Add metal floors to grain bins. Fix greenhouse floor Co-authored-by: haveric --- data/json/mapgen/farm.json | 22 +++++++++++++------ data/json/mapgen/ranch_camp.json | 36 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/data/json/mapgen/farm.json b/data/json/mapgen/farm.json index d4b7fd923a8a..9f73b25b8ed1 100644 --- a/data/json/mapgen/farm.json +++ b/data/json/mapgen/farm.json @@ -179,11 +179,11 @@ "rows": [ " ", " IIII ####W###W### ", - " III__III#____rrr___# ", - "II______III________s# ", - "I________A_________s# ", - "II______III________s# ", - " III__III#__________W ", + " IIIffIII#____rrr___# ", + "IIffffffIII________s# ", + "IffffffffA_________s# ", + "IIffffffIII________s# ", + " IIIffIII#__________W ", " IIII #_______O__# ", " ####MMMM#### ", " O ", @@ -202,7 +202,7 @@ " F DDDDDDDDDDDDDDDD F ", "FF F " ], - "terrain": { "I": [ "t_wall_metal" ] }, + "terrain": { "I": [ "t_wall_metal" ], "f": [ "t_metal_floor" ] }, "items": { "r": { "item": "farming_tools", "chance": 25 } }, "sealed_item": { "D": { "item": { "item": "seed_wheat" }, "furniture": "f_plant_harvest" } }, "place_item": [ @@ -303,6 +303,16 @@ "FF F " ], "items": { "r": { "item": "tools_earthworking", "chance": 20 } }, + "terrain": { + "♥": "t_dirtfloor", + "♠": "t_dirtfloor", + "♦": "t_dirtfloor", + "♣": "t_dirtfloor", + "Ʌ": "t_dirtfloor", + "Δ": "t_dirtfloor", + "‡": "t_dirtfloor", + "%": "t_dirtfloor" + }, "sealed_item": { "D": { "item": { "item": "seed_corn" }, "furniture": "f_plant_seedling", "chance": 70 }, "♥": { "item": { "item": "seed_tomato" }, "furniture": "f_planter_harvest" }, diff --git a/data/json/mapgen/ranch_camp.json b/data/json/mapgen/ranch_camp.json index b7b78bd99fd5..b9281ab64899 100644 --- a/data/json/mapgen/ranch_camp.json +++ b/data/json/mapgen/ranch_camp.json @@ -554,11 +554,11 @@ "..%.....................................................................", "..%.................................................<...................", "..%................................................2222..WWWWwWWWwWWW...", - "..%..............................................222//222W;;;;rrr;;;W...", - "..%.............................................22//////22H;;;;;;;;rW...", - "..%.............................................2////////A;;;;;;;;;rW...", - "..%.............................................22//////22H;;;;;;;;rW...", - "..%..............................................222//222W;;;;;;;;;;w...", + "..%..............................................22200222W;;;;rrr;;;W...", + "..%.............................................22000000222;;;;;;;;rW...", + "..%.............................................200000000A;;;;;;;;;rW...", + "..%.............................................22000000222;;;;;;;;rW...", + "..%..............................................22200222W;;;;;;;;;;w...", "..%................................................2222..W;;;;;;;5;;W...", "..%......................................................WWWW====WWWW...", "..%..........................................................////5......", @@ -599,7 +599,7 @@ "..%..................................../W;;;;W;;;;W;;;;W;;;;W;;;;W;;;;W." ], "palettes": [ "ranch_camp" ], - "terrain": { "r": "t_dirtfloor" }, + "terrain": { "r": "t_dirtfloor", "0": "t_metal_floor" }, "items": { ";": { "item": "farming_tools", "chance": 1 } }, "place_item": [ { "item": "cattlefodder", "x": [ 41, 44 ], "y": [ 25, 29 ], "amount": [ 0, 2 ] }, @@ -884,11 +884,11 @@ " ", " >#< ", " 2222 ............ ", - " 222 222............ ", - "22 22........... ", - "2 2........... ", - "22 22........... ", - " 222 222............ ", + " 222^^222............ ", + "22^^^^^^22........... ", + "2^^^^^^^^2........... ", + "22^^^^^^22........... ", + " 222^^222............ ", " 2222 ............ ", " ............ ", " ", @@ -905,7 +905,7 @@ " " ], "palettes": [ "roof_palette" ], - "terrain": { ".": "t_shingle_flat_roof", "2": "t_wall_metal", "<": "t_ladder_up", ">": "t_ladder_down", "#": "t_grate" } + "terrain": { ".": "t_shingle_flat_roof", "2": "t_wall_metal", "<": "t_ladder_up", ">": "t_ladder_down", "#": "t_grate", "^": "t_open_air_rooved" } } }, { @@ -920,11 +920,11 @@ " ", " <#> ", " 2222 ", - " 222 222 ", - "22 22 ", - "2 2 ", - "22 22 ", - " 222 222 ", + " 222^^222 ", + "22^^^^^^22 ", + "2^^^^^^^^2 ", + "22^^^^^^22 ", + " 222^^222 ", " 2222 ", " ", " ", @@ -941,7 +941,7 @@ " " ], "palettes": [ "roof_palette" ], - "terrain": { "2": "t_wall_metal", "<": "t_ladder_up", ">": "t_ladder_down", "#": "t_grate" } + "terrain": { "2": "t_wall_metal", "<": "t_ladder_up", ">": "t_ladder_down", "#": "t_grate", "^": "t_open_air_rooved" } } }, { From 5f42dc2a407bdc6170a3b3b7a979966350f1d04b Mon Sep 17 00:00:00 2001 From: 0Monet <146018959+0Monet@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:09:07 +0100 Subject: [PATCH 3/4] Fix --- data/json/mapgen/ranch_camp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/ranch_camp.json b/data/json/mapgen/ranch_camp.json index b9281ab64899..4be7dccfa760 100644 --- a/data/json/mapgen/ranch_camp.json +++ b/data/json/mapgen/ranch_camp.json @@ -555,9 +555,9 @@ "..%.................................................<...................", "..%................................................2222..WWWWwWWWwWWW...", "..%..............................................22200222W;;;;rrr;;;W...", - "..%.............................................22000000222;;;;;;;;rW...", + "..%.............................................2200000022H;;;;;;;;rW...", "..%.............................................200000000A;;;;;;;;;rW...", - "..%.............................................22000000222;;;;;;;;rW...", + "..%.............................................2200000022H;;;;;;;;rW...", "..%..............................................22200222W;;;;;;;;;;w...", "..%................................................2222..W;;;;;;;5;;W...", "..%......................................................WWWW====WWWW...", From 0aef031f84ee4f5243ab4430ab87d9260de7560f Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 14:52:35 +0000 Subject: [PATCH 4/4] style(autofix.ci): automated formatting --- data/json/mapgen/ranch_camp.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/ranch_camp.json b/data/json/mapgen/ranch_camp.json index 4be7dccfa760..11f809ab3e23 100644 --- a/data/json/mapgen/ranch_camp.json +++ b/data/json/mapgen/ranch_camp.json @@ -905,7 +905,14 @@ " " ], "palettes": [ "roof_palette" ], - "terrain": { ".": "t_shingle_flat_roof", "2": "t_wall_metal", "<": "t_ladder_up", ">": "t_ladder_down", "#": "t_grate", "^": "t_open_air_rooved" } + "terrain": { + ".": "t_shingle_flat_roof", + "2": "t_wall_metal", + "<": "t_ladder_up", + ">": "t_ladder_down", + "#": "t_grate", + "^": "t_open_air_rooved" + } } }, {