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

JSONize Sewage Treatment Plant #33339

Merged
merged 13 commits into from
Aug 20, 2019
Merged

JSONize Sewage Treatment Plant #33339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8686806
Jsonify sewage plant
chaisawlajatang Jul 27, 2019
3bd80ba
Modified road connection
chaisawlajatang Jul 28, 2019
d3ec125
remove draw_sever calls
chaisawlajatang Jul 28, 2019
db7b1a8
Style
kevingranade Jul 28, 2019
577f2a8
move old plant to obsolete
chaisawlajatang Jul 28, 2019
7ba8198
minor layout tweaks
chaisawlajatang Jul 28, 2019
9f7963e
lint
chaisawlajatang Jul 28, 2019
ac79d23
savegame migration
chaisawlajatang Aug 3, 2019
6261ca8
Update sewage_treatment.json
chaisawlajatang Aug 17, 2019
9d8f857
Roof update
chaisawlajatang Aug 17, 2019
3d3d1f6
Let overmap special conversion convert unrelated adjacent tiles to en…
Petethegoat Aug 15, 2019
46b3728
Use new conversion to properly convert the sewage plant special!
Petethegoat Aug 15, 2019
7b33080
style
anothersimulacrum Aug 18, 2019
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
597 changes: 597 additions & 0 deletions data/json/mapgen/sewage_treatment.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions data/json/obsolete_terrains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@
"orchard_tree_apple",
"orchard_stall",
"orchard_processing",
"sewage_treatment",
"sewage_treatment_hub",
"sewage_treatment_under",
"dairy_farm_NW",
"dairy_farm_NE",
"dairy_farm_SW",
Expand Down
38 changes: 20 additions & 18 deletions data/json/overmap/overmap_special/specials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,30 +153,32 @@
"id": "Sewage Treatment Plant",
"overmaps": [
{ "point": [ 0, -1, 0 ], "overmap": "road_end_north" },
{ "point": [ 0, 0, 0 ], "overmap": "s_lot" },
{ "point": [ 0, 1, 0 ], "overmap": "sewage_treatment" },
{ "point": [ 0, 1, -1 ], "overmap": "sewage_treatment_hub" },
{ "point": [ 0, 0, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ -1, 0, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ 1, 0, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ -1, 1, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ 1, 1, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ -1, 2, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ 0, 2, -1 ], "overmap": "sewage_treatment_under" },
{ "point": [ 1, 2, -1 ], "overmap": "sewage_treatment_under" }
{ "point": [ 0, 0, 0 ], "overmap": "sewage_treatment_0_0_0_north" },
{ "point": [ 0, 0, 1 ], "overmap": "sewage_treatment_0_0_roof_north" },
{ "point": [ 1, 0, 0 ], "overmap": "sewage_treatment_1_0_0_north" },
{ "point": [ 1, 0, 1 ], "overmap": "sewage_treatment_1_0_roof_north" },
{ "point": [ 0, 1, 0 ], "overmap": "sewage_treatment_0_1_0_north" },
{ "point": [ 0, 1, 1 ], "overmap": "sewage_treatment_0_1_roof_north" },
{ "point": [ 1, 1, 0 ], "overmap": "sewage_treatment_1_1_0_north" },
{ "point": [ 1, 1, 1 ], "overmap": "sewage_treatment_1_1_roof_north" },
{ "point": [ 0, 0, -1 ], "overmap": "sewage_treatment_0_0_-1_north" },
{ "point": [ 1, 0, -1 ], "overmap": "sewage_treatment_1_0_-1_north" },
{ "point": [ 2, 0, -1 ], "overmap": "sewage_treatment_2_0_-1_north" },
{ "point": [ 0, 1, -1 ], "overmap": "sewage_treatment_0_1_-1_north" },
{ "point": [ 1, 1, -1 ], "overmap": "sewage_treatment_1_1_-1_north" },
{ "point": [ 2, 1, -1 ], "overmap": "sewage_treatment_2_1_-1_north" }
],
"locations": [ "land" ],
"connections": [
{ "point": [ 0, -1, 0 ] },
{ "point": [ 0, -1, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 0, 0, -1 ] },
{ "point": [ 2, 1, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 1, 1, -1 ] },
{ "point": [ 0, 3, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 0, 2, -1 ] },
{ "point": [ -2, 1, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ -1, 1, -1 ] }
{ "point": [ 0, -2, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, -1, 0 ] },
{ "point": [ -1, 0, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 0, 0, -1 ] },
{ "point": [ 1, -1, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 1, 0, -1 ] },
{ "point": [ 3, 0, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 2, 0, -1 ] },
{ "point": [ 1, 2, -1 ], "terrain": "sewer", "connection": "sewer_tunnel", "from": [ 1, 1, -1 ] }
],
"locations": [ "land" ],
"city_distance": [ 10, 20 ],
"city_sizes": [ 4, 12 ],
"occurrences": [ 0, 4 ],
"rotate": false,
"flags": [ "CLASSIC" ]
},
{
Expand Down
86 changes: 75 additions & 11 deletions data/json/overmap/overmap_terrain/overmap_terrain_waste_junk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,95 @@
[
{
"type": "overmap_terrain",
"id": "sewage_treatment",
"name": "sewage treatment",
"id": "sewage_treatment_0_0_0",
"name": "sewage treatment plant",
"sym": "P",
"color": "red",
"see_cost": 5,
"flags": [ "KNOWN_DOWN", "NO_ROTATE" ]
"flags": [ "KNOWN_DOWN" ]
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_0_0_roof",
"name": "open air",
"sym": ".",
"color": "blue",
"see_cost": 5
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_hub",
"name": "sewage treatment",
"id": "sewage_treatment_1_0_0",
"copy-from": "sewage_treatment_0_0_0"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_1_0_roof",
"name": "sewage treatment plant roof",
"sym": "P",
"color": "green",
"color": "red",
"see_cost": 5
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_0_1_0",
"name": "sewage treatment plant",
"sym": "O",
"color": "blue",
"see_cost": 5,
"extras": "build",
"flags": [ "KNOWN_UP", "NO_ROTATE" ]
"flags": [ "KNOWN_DOWN" ]
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_0_1_roof",
"name": "sewage treatment plant roof",
"sym": "O",
"color": "blue",
"see_cost": 5
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_1_1_0",
"copy-from": "sewage_treatment_0_0_0"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_1_1_roof",
"copy-from": "sewage_treatment_1_0_roof"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_under",
"name": "sewage treatment",
"id": "sewage_treatment_0_0_-1",
"name": "sewage treatment plant - underground",
"sym": "P",
"color": "green",
"see_cost": 5,
"flags": [ "NO_ROTATE" ]
"extras": "build",
"flags": [ "KNOWN_UP" ]
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_1_0_-1",
"copy-from": "sewage_treatment_0_0_-1"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_2_0_-1",
"copy-from": "sewage_treatment_0_0_-1"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_0_1_-1",
"copy-from": "sewage_treatment_0_0_-1"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_1_1_-1",
"copy-from": "sewage_treatment_0_0_-1"
},
{
"type": "overmap_terrain",
"id": "sewage_treatment_2_1_-1",
"copy-from": "sewage_treatment_0_0_-1"
},
{
"type": "overmap_terrain",
Expand Down
2 changes: 0 additions & 2 deletions src/map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,8 +1430,6 @@ class map
float density );
void draw_temple( const oter_id &terrain_type, mapgendata &dat, const time_point &when,
float density );
void draw_sewer( const oter_id &terrain_type, mapgendata &dat, const time_point &when,
float density );
void draw_mine( const oter_id &terrain_type, mapgendata &dat, const time_point &when,
float density );
void draw_spiral( const oter_id &terrain_type, mapgendata &dat, const time_point &when,
Expand Down
Loading