Skip to content

/Cataclysm-DDA

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.

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

[RDY] Parks and recreation buildings #22049

Merged
merged 13 commits into from Oct 6, 2017

Conversation

Reviewers

@Coolthulhu Coolthulhu

Assignees
No one assigned
Labels
None yet
Projects
  
Done in Mapgen and overmapgen improvements
Milestone
No milestone
3 participants
@ZhilkinSerg @Coolthulhu @kevingranade
@ZhilkinSerg
Copy link
Contributor

commented Oct 1, 2017

Added parks and recreation buildings from http://smf.cataclysmdda.com/index.php?topic=12533.0.

Thanks to Whaley (http://smf.cataclysmdda.com/index.php?action=profile;u=3470).

Parks

  • skate_park;
  • small_wooded_trail (2 variants);
  • pavilion;
  • cemetary

Stores

  • orchard (2 variants);
  • dispensary;
  • small_office;
  • art_gallery;
  • small_storage_units.

Overmap specials

  • State Park (4 tiles);
  • Fishing Pond (4 tiles);
  • Derelict Property (1 tile in 4 variants);
  • Hunting Blind (1 tile in 2 variants).
@ZhilkinSerg
Initial commit 
Added parks and recreation buildings from http://smf.cataclysmdda.com/index.php?topic=12533.0.

Thanks to Whaley (http://smf.cataclysmdda.com/index.php?action=profile;u=3470).

### Parks

- `skate_park`;
- `small_wooded_trail` (2 variants);
- `pavilion`;
- `cemetary`

### Stores

- `orchard` (2 variants);
- `dispensary`;
- `small_office`;
- `art_gallery`;
- `small_storage_units`.

### Overmap specials

- `State Park` (4 tiles);
- `Fishing Pond` (4 tiles);
- `Derelict Property` (1 tile in 4 variants);
- `Hunting Blind` (1 tile in 2 variants).
Loading status checks…
fc3b250

@ZhilkinSerg ZhilkinSerg changed the title Parks and recreation buildings [RDY] Parks and recreation buildings Oct 3, 2017

@Coolthulhu Coolthulhu self-assigned this Oct 5, 2017

@Coolthulhu

Coolthulhu reviewed Oct 5, 2017
View changes

data/json/mapgen/parks_recreation/cemetary.json Outdated
"f": "f_null",
"p": "f_null",
"s": "f_null",
"u": "f_null"

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

Pretty sure nulls don't need to be (and thus shouldn't) be explicitly declared.
The exception is when using palettes and overriding an existing piece.
@Coolthulhu

Coolthulhu reviewed Oct 5, 2017
View changes

data/json/overmap_terrain.json Outdated
"flags": [ "SIDEWALK" ]
},
{
"id": "cemetary",

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

Those are too similar to the big cemetery id. Should probably be re-id'd to "cemetery_small" or something.
@Coolthulhu

Coolthulhu reviewed Oct 5, 2017
View changes

data/json/overmap_specials.json Outdated
"locations": [ "wilderness" ],
"city_distance": [ 1, 10 ],
"city_sizes": [ 1, 12 ],
"occurrences": [ 4, 10 ]

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

All minimal occurrences are going against the "budget". They should be kept low until we have a fix for overmap special limit.
@Coolthulhu

Coolthulhu suggested changes Oct 5, 2017
View changes

data/json/mapgen/parks_recreation/state_park1_0.json Outdated
"f": "f_null",
"p": "f_null",
"s": "f_null",
"|": "f_null"

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

All "f_null"s have to be removed.
data/json/mapgen/parks_recreation/state_park0_1.json Outdated
{ "item": "rock", "x": 1, "y": 7, "repeat": 1 },
{ "item": "log", "x": 2, "y": 12, "repeat": 1 },
{ "item": "log", "x": 17, "y": 19, "repeat": 1 },
{ "item": "rock", "x": 13, "y": 21, "repeat": 1 }

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

All "repeat": 1 have to be removed.
data/json/mapgen/parks_recreation/small_storage_units.json Outdated
{ "monster": "GROUP_ZOMBIE", "x": 21, "y": 13, "chance": 6, "density": 1 },
{ "monster": "GROUP_ZOMBIE", "x": 3, "y": 13, "chance": 6, "density": 1 },
{ "monster": "GROUP_ZOMBIE", "x": 20, "y": 7, "chance": 6, "density": 1 },
{ "monster": "GROUP_ZOMBIE", "x": 3, "y": 7, "chance": 6, "density": 1 }

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

All "density": 1 have to be removed. This is redundant, as default density is obviously 1.
data/json/mapgen/parks_recreation/small_office.json Outdated
{ "x": 13, "y": 14 },
{ "x": 15, "y": 14 },
{ "x": 17, "y": 14 }
],

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

Toilets would be much better mapped to a symbol. The only excuse not to do that is when a mapgen instance needs to have dry toilets mixed with non-dry ones. This isn't the case here.
data/json/mapgen/parks_recreation/skate_park.json Outdated
"place_vehicles": [
{ "vehicle": "bicycle", "x": 10, "y": 7, "chance": 3, "fuel": 0, "status": 0, "rotation": 270 },
{ "vehicle": "bicycle", "x": 17, "y": 8, "chance": 2, "fuel": 0, "status": 0, "rotation": 180 },
{ "vehicle": "scooter", "x": 16, "y": 12, "chance": 5, "fuel": 0, "status": -1, "rotation": 0 },

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

"status" defaults to -1, "rotation" defaults to 0, explicitly making bicycles have 0 fuel is also wrong.
data/json/mapgen/parks_recreation/fishing_pond0_0.json Outdated
{ "monster": "mon_duck", "x": 8, "y": 17 },
{ "monster": "mon_fish_sbass", "x": 15, "y": 21 },
{ "monster": "mon_fish_bluegill", "x": 21, "y": 23 }
]

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 5, 2017

Contributor

Placing monsters by hand like that is pretty ugly. It's not necessary to rework this here, but they should be wrapped in a group and spawned as entries from the group rather than being hand-picked and completely identical every time.

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Oct 5, 2017

Author Contributor

I fully agree.

@Coolthulhu Coolthulhu removed their assignment Oct 5, 2017

@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 5, 2017

Updated everything reviewed, but monster placement.
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 5, 2017

Monster spawns were moved to monster groups.
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 5, 2017

Conflicts were resolved
@Coolthulhu

Coolthulhu approved these changes Oct 5, 2017
View changes

@ZhilkinSerg
Added missing comma
Loading status checks…
32b1d87

@kevingranade kevingranade merged commit 32b1d87 into CleverRaven:master Oct 6, 2017
3 checks passed

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.1%) to 22.525%
Details
gorgon-ghprb Build finished.
Details

@ZhilkinSerg ZhilkinSerg deleted the ZhilkinSerg:mapgen-parks-recreation branch Oct 6, 2017

@ZhilkinSerg ZhilkinSerg added this to Done in Mapgen and overmapgen improvements Apr 19, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.