Skip to content

Commit

Permalink
Adding refugee center roof (#52554)
Browse files Browse the repository at this point in the history 
* Add an overmap icon for the refugee camp roof.
To mark the roof of the refugee center on the map, since the roof
will be added in a future commit.
references #52222

* Add a makeshift roof to the refugee center.
The refugee cetner currently has no roof, which seems odd. This adds
a temporary, flat, square roof to the whole center.
references #52222

* Shaped roof to refugee center ground floor.
Having the roof be a giant square looked weird.
references #52222

* Decorate refugee center roof.
The refugee center roof should have features like solars and
standing tanks instead of blank roof. Now it does.
fixes #52222

* Remove solar panels from refugee center roof.
A merchant mission mentioned them not having solar panels.
To fit the mission text better, they have been removed.
references #52222

* Add solar panels to roof after panel mission.
The merchant has a mission that asks for 10 solar panels.
I thought it would be fitting to add 10 panels to the roof when the
player completed the mission.

* Fix JSON formatting.
To pass JSON formatting tests and maintain style of the project.

Co-authored-by: CosmicHitman <N/A>
  • Loading branch information
@CosmicHitman
CosmicHitman authored Nov 17, 2021
1 parent ad9077b commit 611e3ea
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 12 deletions.
114 changes: 111 additions & 3 deletions data/json/mapgen/refugee_center/z1_refugee_center.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,120 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "evac_center_6_z1", "evac_center_7_z1", "evac_center_8_z1", "evac_center_9_z1", "evac_center_10_z1" ] ],
"weight": 100,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ",
" ",
" .............................................................. ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ...........................oooooooooo........................... ",
" ...........................oooooooooo........................... ",
" ...........................oooooooooo........................... ",
" ................................................................ ",
" ....ooooooooooooo..............................ooooooooooooo.... ",
" ....ooooooooooooo..............................ooooooooooooo.... ",
" ....ooooooooooooo..............................ooooooooooooo.... ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ..........&...........................................:......... ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" .............................................................. "
],
"palettes": [ "roof_palette" ],
"furniture": { ":": "f_standing_tank", "#": "f_solar_unit", "&": "f_roof_turbine_vent" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "evac_center_11_z1", "evac_center_12_z1", "evac_center_13_z1", "evac_center_14_z1", "evac_center_15_z1" ] ],
"weight": 100,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ................................................. ",
" ............................................... ",
" ............................................... ",
" ..................oooo...oooo.................. ",
" ..................oooo...oooo.................. ",
" ............................................... ",
" ..................oooo...oooo.................. ",
" ..................oooo...oooo.................. ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" .......................&....................... ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" .......................:....................... ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" ............................................... ",
" ................................................. "
],
"palettes": [ "roof_palette" ],
"furniture": { ":": "f_standing_tank", "#": "f_solar_unit", "&": "f_roof_turbine_vent" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ [ "evac_center_16_z1", "evac_center_17_z1", "evac_center_18_z1", "evac_center_19_z1", "evac_center_20_z1" ] ],
"weight": 100,
"object": {
"fill_ter": "t_flat_roof",
"rows": [
" ............................................................. ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ................................................................ ",
" ....................... ..........ooo.......... ",
" ....................... ..........ooo.......... ",
" ....................... ..........ooo.......... ",
" ....................... ..........ooo.......... ",
" ...........:........... ...........&........... ",
" ....................... ....................... ",
" ....................... ..........ooo.......... ",
" ....................... ..........ooo.......... ",
" ....................... ..........ooo.......... ",
" ....................... ..........ooo.......... ",
" ....................... ....................... ",
" ....................... ....................... ",
" ....................... ....................... ",
" ....................... ....................... ",
" ..................... ..................... ",
" ",
" "
],
"palettes": [ "roof_palette" ],
"furniture": { ":": "f_standing_tank", "#": "f_solar_unit", "&": "f_roof_turbine_vent" }
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [
[ "evac_center_1_z1", "evac_center_2_z1", "evac_center_3_z1", "evac_center_4_z1", "evac_center_5_z1" ],
[ "evac_center_6_z1", "evac_center_7_z1", "evac_center_8_z1", "evac_center_9_z1", "evac_center_10_z1" ],
[ "evac_center_11_z1", "evac_center_12_z1", "evac_center_13_z1", "evac_center_14_z1", "evac_center_15_z1" ],
[ "evac_center_16_z1", "evac_center_17_z1", "evac_center_18_z1", "evac_center_19_z1", "evac_center_20_z1" ],
[ "evac_center_21_z1", "evac_center_22_z1", "evac_center_23_z1", "evac_center_24_z1", "evac_center_25_z1" ]
],
"weight": 100,
Expand Down
18 changes: 18 additions & 0 deletions data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,24 @@
"effect": [
{ "u_spawn_item": "FMCNote", "count": 100 },
{ "u_add_var": "FMShopkeep_Mission4", "type": "mission", "context": "flag", "value": "yes" }
],
"update_mapgen": [
{
"om_terrain": "evac_center_8_z1",
"set": [ { "line": "furniture", "id": "f_solar_unit", "x": 11, "y": 12, "x2": 12, "y2": 12 } ]
},
{
"om_terrain": "evac_center_12_z1",
"set": [ { "line": "furniture", "id": "f_solar_unit", "x": 21, "y": 12, "x2": 21, "y2": 14 } ]
},
{
"om_terrain": "evac_center_14_z1",
"set": [ { "line": "furniture", "id": "f_solar_unit", "x": 1, "y": 12, "x2": 1, "y2": 14 } ]
},
{
"om_terrain": "evac_center_18_z1",
"set": [ { "line": "furniture", "id": "f_solar_unit", "x": 11, "y": 3, "x2": 12, "y2": 3 } ]
}
]
},
"dialogue": {
Expand Down
32 changes: 23 additions & 9 deletions data/json/overmap/overmap_terrain/overmap_terrain_evac_center.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,29 @@
],
"copy-from": "generic_refctr"
},
{
"type": "overmap_terrain",
"abstract": "generic_rc_roof",
"name": "refugee center roof",
"sym": "┼",
"color": "white",
"see_cost": 2
},
{
"type": "overmap_terrain",
"id": [
"evac_center_12_z1",
"evac_center_13_z1",
"evac_center_14_z1",
"evac_center_17_z1",
"evac_center_18_z1",
"evac_center_19_z1",
"evac_center_7_z1",
"evac_center_8_z1",
"evac_center_9_z1"
],
"copy-from": "generic_rc_roof"
},
{
"type": "overmap_terrain",
"abstract": "generic_rc_air",
Expand All @@ -310,21 +333,15 @@
"evac_center_10_z2",
"evac_center_11_z1",
"evac_center_11_z2",
"evac_center_12_z1",
"evac_center_12_z2",
"evac_center_13_z1",
"evac_center_13_z2",
"evac_center_14_z1",
"evac_center_14_z2",
"evac_center_15_z1",
"evac_center_15_z2",
"evac_center_16_z1",
"evac_center_16_z2",
"evac_center_17_z1",
"evac_center_17_z2",
"evac_center_18_z1",
"evac_center_18_z2",
"evac_center_19_z1",
"evac_center_19_z2",
"evac_center_1_z1",
"evac_center_1_z2",
Expand All @@ -350,11 +367,8 @@
"evac_center_5_z2",
"evac_center_6_z1",
"evac_center_6_z2",
"evac_center_7_z1",
"evac_center_7_z2",
"evac_center_8_z1",
"evac_center_8_z2",
"evac_center_9_z1",
"evac_center_9_z2",
"refctr_E1a_z1",
"refctr_E1a_z2",
Expand Down

0 comments on commit 611e3ea

Please sign in to comment.