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

Add roofs to market stalls #74760

Merged
merged 2 commits into from
Jun 25, 2024
Merged

Add roofs to market stalls #74760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3997f0c
Add roofs to market stalls
PatrikLundell Jun 24, 2024
e33b05c
Added recommended flag
PatrikLundell Jun 24, 2024
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
1 change: 1 addition & 0 deletions data/json/mapgen/cs_market_small.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"type": "mapgen",
"method": "json",
"om_terrain": "cs_market_small_roof",
"//": "Obsolete 2024-06-24. Remains to generate in older saves",
"object": {
"fill_ter": "t_open_air",
"rows": [
Expand Down
93 changes: 84 additions & 9 deletions data/json/mapgen/nested/market_stalls_nested.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
[
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "market_6x6_roof",
"object": {
"mapgensize": [ 6, 6 ],
"rows": [
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR",
"RRRRRR"
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
"type": "mapgen",
"method": "json",
Expand All @@ -21,7 +38,8 @@
"f": { "item": "butcher_raw_meat", "chance": 25, "repeat": [ 1, 2 ] },
"H": { "item": "butcher_raw_meat", "chance": 25, "repeat": [ 1, 2 ] }
},
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
Expand All @@ -44,7 +62,8 @@
"T": { "item": "fresh_produce", "chance": 30, "repeat": [ 1, 2 ] },
"d": { "item": "produce", "chance": 30, "repeat": [ 1, 3 ] }
},
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
Expand All @@ -68,7 +87,8 @@
"d": { "item": "fresh_fish", "chance": 50, "repeat": [ 1, 2 ] },
"r": { "item": "fish_market_stall", "chance": 30, "repeat": [ 1, 3 ] }
},
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
Expand All @@ -91,7 +111,23 @@
"r": { "item": "candy_chocolate", "chance": 65, "repeat": [ 1, 2 ] },
"d": { "item": "candy_shop", "chance": 40, "repeat": [ 1, 3 ] }
},
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "market_4x4_roof",
"object": {
"mapgensize": [ 4, 4 ],
"rows": [
"RRRR",
"RRRR",
"RRRR",
"RRRR"
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
Expand All @@ -113,7 +149,8 @@
"T": { "item": "honey_market_stall", "chance": 75, "repeat": [ 1, 2 ] }
},
"palettes": [ "open_air_stall_palette" ],
"//": "Give small chance to spawn mutated/normal bees?"
"//": "Give small chance to spawn mutated/normal bees?",
"place_nested": [ { "chunks": [ "market_4x4_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
Expand Down Expand Up @@ -152,7 +189,24 @@
"I": { "item": "underwear_womens", "chance": 65 },
"T": [ { "item": "gloves_unisex", "chance": 65 }, { "item": "scarfs_unisex", "chance": 40 } ]
},
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "market_5x5_roof",
"object": {
"mapgensize": [ 5, 5 ],
"rows": [
"RRRRR",
"RRRRR",
"RRRRR",
"RRRRR",
"RRRRR"
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
Expand All @@ -171,7 +225,26 @@
"set": [ { "square": "terrain", "id": "t_sidewalk_roof_canvas", "x": 0, "y": 0, "x2": 4, "y2": 4 } ],
"furniture": { "p": [ "f_indoor_plant", "f_indoor_plant_y", [ "f_null", 3 ] ] },
"items": { "t": { "item": "cash_register_random", "chance": 100 } },
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_5x5_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "market_7x7_roof",
"object": {
"mapgensize": [ 7, 7 ],
"rows": [
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR",
"RRRRRRR"
],
"terrain": { "R": "t_canvas_roof" }
}
},
{
Expand All @@ -196,7 +269,8 @@
{ "chance": 50, "repeat": [ 3, 6 ], "item": "office_mess", "x": [ 1, 5 ], "y": [ 3, 3 ] },
{ "chance": 35, "repeat": [ 1, 3 ], "item": "tools_home", "x": [ 1, 5 ], "y": [ 5, 5 ] }
],
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_7x7_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
},
{
Expand All @@ -218,7 +292,8 @@
"t": { "item": "cash_register_random", "chance": 100 },
"T": [ { "item": "homebooks", "chance": 40, "repeat": [ 1, 2 ] } ]
},
"palettes": [ "open_air_stall_palette" ]
"palettes": [ "open_air_stall_palette" ],
"place_nested": [ { "chunks": [ "market_6x6_roof" ], "x": 0, "y": 0, "z": 1 } ]
}
}
]
5 changes: 1 addition & 4 deletions data/json/overmap/multitile_city_buildings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,10 +1410,7 @@
"type": "city_building",
"id": "cs_market_small",
"locations": [ "land" ],
"overmaps": [
{ "point": [ 0, 0, 0 ], "overmap": "cs_market_small_north" },
{ "point": [ 0, 0, 1 ], "overmap": "cs_market_small_roof_north" }
]
"overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "cs_market_small_north" } ]
},
{
"type": "city_building",
Expand Down
4 changes: 3 additions & 1 deletion data/json/overmap/overmap_terrain/overmap_terrain_commercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1510,11 +1510,13 @@
},
{
"type": "overmap_terrain",
"//": "Obsolete 2024-06-24. Remains to work in existing saves",
"id": "cs_market_small_roof",
"name": "small market roof",
"copy-from": "generic_city_building",
"sym": "m",
"color": "i_light_gray"
"color": "i_light_gray",
"flags": [ "SHOULD_NOT_SPAWN" ]
},
{
"type": "overmap_terrain",
Expand Down
Loading