Skip to content

Commit

Permalink
fix(port): Fix farm greenhouse floors. Add metal floors to grain bins. (
Browse files Browse the repository at this point in the history 
#4056)

* "t_dirtfloor" below the display racks

* Add metal floors to grain bins. Fix greenhouse floor

Co-authored-by: haveric <breuerryan@gmail.com>

* Fix

* style(autofix.ci): automated formatting

---------

Co-authored-by: haveric <breuerryan@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
@0Monet @haveric @autofix-ci
3 people authored Jan 5, 2024
1 parent 52969a1 commit 12ab4b2
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 23 deletions.
22 changes: 16 additions & 6 deletions data/json/mapgen/farm.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ",
Expand All @@ -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": [
Expand Down Expand Up @@ -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" },
Expand Down
42 changes: 25 additions & 17 deletions data/json/mapgen/ranch_camp.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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...",
"..%.............................................2200000022H;;;;;;;;rW...",
"..%.............................................200000000A;;;;;;;;;rW...",
"..%.............................................2200000022H;;;;;;;;rW...",
"..%..............................................22200222W;;;;;;;;;;w...",
"..%................................................2222..W;;;;;;;5;;W...",
"..%......................................................WWWW====WWWW...",
"..%..........................................................////5......",
Expand Down Expand Up @@ -599,6 +599,7 @@
"..%..................................../W;;;;W;;;;W;;;;W;;;;W;;;;W;;;;W."
],
"palettes": [ "ranch_camp" ],
"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 ] },
Expand Down Expand Up @@ -883,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 ............ ",
" ............ ",
" ",
Expand All @@ -904,7 +905,14 @@
" "
],
"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"
}
}
},
{
Expand All @@ -919,11 +927,11 @@
" ",
" <#> ",
" 2222 ",
" 222 222 ",
"22 22 ",
"2 2 ",
"22 22 ",
" 222 222 ",
" 222^^222 ",
"22^^^^^^22 ",
"2^^^^^^^^2 ",
"22^^^^^^22 ",
" 222^^222 ",
" 2222 ",
" ",
" ",
Expand All @@ -940,7 +948,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" }
}
},
{
Expand Down

0 comments on commit 12ab4b2

Please sign in to comment.