Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Farm Mutable #62037

Merged
merged 14 commits into from
Nov 14, 2022
Merged

Farm Mutable #62037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ab1ec17
adds hay field overmap terrains, mergers
LovamKicsiGazsii Oct 31, 2022
83e27c4
farm mutable
LovamKicsiGazsii Oct 31, 2022
d95afeb
new dirt roads, hay fields, crop fields
LovamKicsiGazsii Oct 31, 2022
e418cfe
update farm lot palette
LovamKicsiGazsii Oct 31, 2022
f403742
obsolete farms, remove turn1
LovamKicsiGazsii Oct 31, 2022
45ca11f
reroute 3x3 farm's walkway
LovamKicsiGazsii Oct 31, 2022
3ccf707
make orchard sections square-shaped
LovamKicsiGazsii Oct 31, 2022
5424967
obsolete farm specials
LovamKicsiGazsii Oct 31, 2022
bf1438a
obsolete turn1
LovamKicsiGazsii Oct 31, 2022
0ccf5df
obsolete turn1
LovamKicsiGazsii Oct 31, 2022
d432456
should not spawn
LovamKicsiGazsii Nov 1, 2022
4dc5a8c
should not spawn
LovamKicsiGazsii Nov 1, 2022
1dda0f2
weight changes
LovamKicsiGazsii Nov 1, 2022
1af14dd
fix
LovamKicsiGazsii Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions data/json/mapgen/farm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"fill_ter": "t_floor",
"rows": [
" ,,,,,,,,, ││││││││││││││││││││││││ FFFFFFFFFFFFFFFFFFFFFF ",
" ,,,,,,,,, ││││││││││││││││││││││││ F F ",
" ,,,,,,,,,,,,,,,, ││││││││││││││││││││││││ F F ",
" ,,,,,,,,,,,,,,,,,││││││││││││││││││││││││ F DDDDDDDDDDDDDDDD F ",
" ,,,,,,,,,O ││││││││││││││││││││││││ F F ",
" ,,,,,,,,,O ,,││││││││││││││││││││││││ F F ",
" ##W##MMMMMMMMM##W## ││││││││││││││││││││││││ F DDDDDDDDDDDDDDDD F ",
" #yyy__________O___# ││││││││││││││││││││││││,g F ",
" Wyyy______________W ││││││││││││││││││││││││,g DDDDDDDDDDDDDDDD F ",
Expand Down Expand Up @@ -102,11 +102,11 @@
"object": {
"fill_ter": "t_floor",
"rows": [
"..............,,,.......",
"..............,,,p......",
",,,...........,,,.......",
"..,,,.........,,,.......",
"....,,,,,.....,,,.......",
"........................",
".................p......",
",,,,....................",
",,,,,,,,,...............",
"...,,,,,,,,,,,,.........",
".....,..,,,,,,,,,,,,,,,,",
".....,........,,,,,,,,,,",
"....,,........---..$$$$.",
Expand Down Expand Up @@ -158,11 +158,11 @@
"object": {
"fill_ter": "t_floor",
"rows": [
"..............,,,.......",
"..............,,,p......",
",,,...........,,,.......",
"..,,,.........,,,.......",
"....,,,,,.....,,,.......",
"........................",
".................p......",
",,,,....................",
",,,,,,,,,...............",
"...,,,,,,,,,,,,.........",
".....,..,,,,,,,,,,,,,,,,",
".....,........,,,,,,,,,,",
"....,,........---..$$$$.",
Expand Down
629 changes: 268 additions & 361 deletions data/json/mapgen/farm_tiles.json
View file
Open in desktop

Large diffs are not rendered by default.

174 changes: 24 additions & 150 deletions data/json/mapgen/orchard_apple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"q ****btb WXO,,,,,gW q",
"q7 ****btb 7WWW=====WW q",
"q ********* g*****dd q",
"QQQQ***QQQQQQQQQQ***QQQQ"
"QQQQ***QQQQQQQQ*****QQQQ"
],
"palettes": [ "orchard_buildings" ],
"terrain": { " ": "t_region_groundcover_urban" },
Expand Down Expand Up @@ -115,160 +115,34 @@
"type": "mapgen",
"method": "json",
"om_terrain": [ "orchard_tree_apple" ],
"weight": 500,
"object": {
"fill_ter": "t_dirt",
"rows": [
" *** *** ",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
"************************",
"************************",
"************************",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
" *** *** ",
" *** *** ",
" *** *** ",
" *** *** ",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
"************************",
"************************",
"************************",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
" *** *** "
],
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 40 },
{ "monster": "GROUP_SAFE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 30 },
{ "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 25 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "orchard_tree_apple" ],
"weight": 75,
"object": {
"fill_ter": "t_dirt",
"rows": [
" *** *** ",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
"******* *******",
"******* *******",
"******* *******",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
" *** *** ",
" *** *** ",
" *** *** ",
" *** *** ",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
"************************",
"************************",
"************************",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
" *** *** "
],
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 40 },
{ "monster": "GROUP_SAFE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 30 },
{ "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 25 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "orchard_tree_apple" ],
"weight": 75,
"object": {
"fill_ter": "t_dirt",
"rows": [
" *** *** ",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
"************************",
"************************",
"************************",
" *** ",
" 7 *** 7 7 7 ",
" *** ",
" *** ",
" *** ",
" *** ",
" *** ",
" *** ",
" 7 *** 7 7 7 ",
" *** ",
"************************",
"************************",
"************************",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
" *** *** "
],
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
{ "monster": "GROUP_PEST", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 60 },
{ "monster": "GROUP_DOMESTIC", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 50 },
{ "monster": "GROUP_SAFE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 20 },
{ "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "chance": 25 }
]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "orchard_tree_apple" ],
"weight": 75,
"weight": 100,
"object": {
"fill_ter": "t_dirt",
"rows": [
" *** *** ",
" *** *** ",
" 7 *** 7 7 *** 7 ",
" *** *** ",
"************************",
"************************",
"************************",
" *** ",
" 7 *** 7 7 7 ",
" *** ",
" *** ",
" *** ",
" *** ",
" *** ",
" *** ",
" 7 *** 7 7 7 ",
" *** ",
"******* ",
"******* ",
"******* ",
" *** ",
" 7 *** 7 7 7 ",
" *** ",
" *** "
"** ** **",
"** 7 7 7 ** 7 7 7 **",
"** ** **",
"** ** **",
"** 7 7 ** 7 7 **",
"** ** **",
"** ** **",
"** 7 7 7 ** 7 7 7 **",
"** ** **",
"************************",
"************************",
"** ** **",
"** 7 7 7 ** 7 7 7 **",
"** ** **",
"** ** **",
"** 7 7 ** 7 7 **",
"** ** **",
"** ** **",
"** 7 7 7 ** 7 7 7 **",
"** ** **",
"************************",
"************************"
],
"palettes": [ "orchard_tree_apple" ],
"place_monsters": [
Expand Down
34 changes: 16 additions & 18 deletions data/json/mapgen_palettes/farm_lots.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,31 @@
[
{
"type": "palette",
"id": "fm_corn",
"sealed_item": { "#": { "item": { "item": "seed_corn" }, "furniture": "f_plant_seedling", "chance": 70 } },
"item": { ":": { "item": "corn", "repeat": [ 1, 20 ] } }
},
{
"type": "palette",
"id": "fm_wheat",
"sealed_item": { "#": { "item": { "item": "seed_wheat" }, "furniture": "f_plant_seedling", "chance": 70 } },
"item": { ":": { "item": "wheat", "repeat": [ 1, 20 ] } }
},
{
"type": "palette",
"id": "farm_lots",
"palettes": [ { "distribution": [ [ "fm_corn", 10 ], [ "fm_wheat", 2 ] ] } ],
"terrain": {
",": "t_dirtfloor",
":": "t_metal_floor",
"#": [ [ "t_dirtmound", 98 ], [ "t_region_soil", 2 ] ],
"%": "t_fence_wire",
"+": "t_door_c",
"|": [ [ "t_wall_wood", 500 ], [ "t_wall_wood_chipped", 4 ], [ "t_wall_wood_broken", 1 ] ],
" ": [
[ "t_region_groundcover", 380 ],
[ "t_region_groundcover_barren", 70 ],
[ "t_region_shrub", 2 ],
[ "t_dirtmound", 2 ]
],
" ": [ [ "t_region_soil", 25 ], [ "t_region_groundcover", 3 ], [ "t_dirtmound", 2 ] ],
"i": "t_region_groundcover",
".": "t_null",
"/": [ [ "t_region_groundcover_barren", 225 ], [ "t_region_groundcover", 45 ] ],
"/": [ [ "t_region_soil", 200 ], [ "t_region_groundcover", 5 ] ],
"5": "t_barndoor",
"6": "t_palisade_pulley",
"T": [ [ "t_region_groundcover_barren", 20 ], [ "t_region_tree_shade", 30 ] ],
Expand Down Expand Up @@ -45,17 +53,7 @@
"t": "t_region_groundcover_barren",
"B": "t_region_groundcover_barren"
},
"furniture": {
"r": "f_rack",
"t": "f_table",
"B": "f_bench",
"x": "f_crate_c",
"@": "f_hay",
" ": [ [ "f_null", 198 ], [ "f_hay", 2 ] ],
"/": "f_null"
},
"sealed_item": { "#": { "item": { "item": "seed_corn" }, "furniture": "f_plant_seedling", "chance": 70 } },
"item": { ":": { "item": "corn", "repeat": [ 1, 20 ] } }
"furniture": { "r": "f_rack", "t": "f_table", "B": "f_bench", "x": "f_crate_c", "@": "f_hay", "/": "f_null" }
},
{
"type": "palette",
Expand Down
78 changes: 78 additions & 0 deletions data/json/obsoletion/obsolete_mapgen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "dirt_road_turn1" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"predecessor_mapgen": "field",
"rows": [
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
".............../////////",
".........../////////////",
"..........//////////////",
".........///////////////",
".........///////////////",
".........///////////////",
".........///////////////",
".........///////////////",
"........./////////......",
"......../////////.......",
"........////////........",
"........////////........",
"........////////........",
"........////////........",
"........////////........",
"........////////........"
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "farm_lots" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "dirt_road_turn1_forest" ],
"weight": 100,
"object": {
"fill_ter": "t_region_soil",
"predecessor_mapgen": "forest",
"rows": [
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
".............../////////",
".........../////////////",
"..........//////////////",
".........///////////////",
".........///////////////",
".........///////////////",
".........///////////////",
".........///////////////",
"........./////////......",
"......../////////.......",
"........////////........",
"........////////........",
"........////////........",
"........////////........",
"........////////........",
"........////////........"
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "farm_lots" ]
}
}
]
16 changes: 16 additions & 0 deletions data/json/obsoletion/overmap/overmap_terrain/overmap_terrain_obsoletion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[
{
"type": "overmap_terrain",
"id": "dirt_road_turn1",
"copy-from": "generic_dirt_road",
"sym": "┌",
"flags": [ "SHOULD_NOT_SPAWN" ]
},
{
"type": "overmap_terrain",
"id": "dirt_road_turn1_forest",
"copy-from": "generic_dirt_road",
"sym": "┌",
"flags": [ "SHOULD_NOT_SPAWN" ]
}
]
Loading