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] Small town buildings #22052

Merged
merged 31 commits into from Jan 4, 2018

Conversation

Reviewers

@Coolthulhu Coolthulhu

Assignees
No one assigned
Labels
None yet
Projects
  
Done in Mapgen and overmapgen improvements
Milestone
No milestone
6 participants
@ZhilkinSerg @John-Candlebury @DeadLeaves @nornagon @Coolthulhu @kevingranade
@ZhilkinSerg
Copy link
Contributor

commented Oct 1, 2017 •
edited

Added small town buildings from http://smf.cataclysmdda.com/index.php?topic=14434.0.

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

Shops

  • bakery (2 variants);
  • candy_shop (2 variants);
  • construction_site (6 variants);
  • icecream_shop;
  • post_office (2 variants).

Overmap specials

  • lumber_yard (4 tiles).

I've decided to move pet_store and zoo to separate PR.
@ZhilkinSerg
Initial commit 
Added small town buildings from http://smf.cataclysmdda.com/index.php?topic=14434.0.

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

### Shops

- `bakery` (2 variants);
- `bike_shop`;
- `candy_shop` (2 variants);
- `construction_site` (6 variants);
- `icecream_shop`;
- `pet_store` (2 variants);
- `post_office` (2 variants).

### Overmap specials

- `lumber_yard` (4 tiles);
- `zoo` (9 tiles with 2 variants for 2 tiles).
Loading status checks…
97a687a

@ZhilkinSerg ZhilkinSerg changed the title Smalltown buildings pack Small town buildings Oct 1, 2017

@John-Candlebury

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Oct 1, 2017

Animals in the zoo should probably be zombies or dead

ZhilkinSerg added some commits Oct 1, 2017

@ZhilkinSerg
Fixed typo
Loading status checks…
5f25784
@ZhilkinSerg
Added `icecream_shop` terrain
Loading status checks…
febc561

@ZhilkinSerg ZhilkinSerg changed the title Small town buildings [RDY] Small town buildings Oct 3, 2017

@ZhilkinSerg ZhilkinSerg changed the title [RDY] Small town buildings [WIP] Small town buildings Oct 5, 2017

@DeadLeaves

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Oct 25, 2017

How's this comming along? I'm really looking forward to this PR.
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/mapgen/small_town_buildings/construction_site.json Outdated
{ "item": "tools_carpentry", "x": 15, "y": 11, "chance": 30 },
{ "item": "power_tools", "x": 9, "y": 12, "chance": 10 },
{ "item": "power_tools", "x": 8, "y": 9, "chance": 10 },
{ "item": "clothing_work_hat", "x": 15, "y": 8, "chance": 0 },

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

0 chance?

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Dec 21, 2017

Author Contributor

Fixed this
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/mapgen/small_town_buildings/lumberyard_1_1.json Outdated
{ "item": "2x4", "x": 12, "y": 19 },
{ "item": "2x4", "x": 13, "y": 19 },
{ "item": "2x4", "x": 14, "y": 19 },
{ "item": "2x4", "x": 15, "y": 19 }

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

A ton of hard-set planks will look bad. Those should be spawned over an area with rolled x, y and repeat.

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Dec 21, 2017

Author Contributor

Fixed this.
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/mapgen/small_town_buildings/pet_store.json Outdated
{ "monster": "mon_dog_zombie_rot", "x": 2, "y": 9 },
{ "monster": "mon_dog", "x": 2, "y": 13 },
{ "monster": "mon_dog", "x": 2, "y": 15 },
{ "monster": "mon_dog_zombie_rot", "x": 10, "y": 19 }

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

The animals should be rolled from a group, not predefined.
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/mapgen/small_town_buildings/pet_store.json Outdated
{ "item": "dogfood", "x": 15, "y": 12 },
{ "item": "catfood", "x": 16, "y": 12 },
{ "item": "catfood", "x": 17, "y": 12 },
{ "item": "pet_carrier", "x": 8, "y": 14 }

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

The items should be a group, unless there is a good reason to place exact types.
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/mapgen/small_town_buildings/zoo_0_2.json Outdated
],
"place_monster": [
{ "monster": "mon_bobcat", "x": 8, "y": 5 },
{ "monster": "mon_spider_jumping", "x": 18, "y": 9 },

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

Giant jumping spider in normal zoo?
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/mapgen/small_town_buildings/zoo_2_1.json Outdated
},
"place_monsters": [
{ "monster": "GROUP_FOREST", "x": 15, "y": 19, "chance": 6, "density": 0 },
{ "monster": "GROUP_FOREST", "x": 4, "y": 19, "chance": 6, "density": 0 }

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

Density 0?
@Coolthulhu

Coolthulhu reviewed Oct 25, 2017
View changes

data/json/overmap_terrain.json
"sym": 83,
"color": "i_green",
"see_cost": 5,
"mondensity": 2

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 25, 2017

Contributor

Should use copy-from instead of redefining things.

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Dec 21, 2017

Author Contributor

Fixed this
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 25, 2017

How's this comming along? I'm really looking forward to this PR.

Slowly 🐢

default
@ZhilkinSerg
zoo monster groups part 1
Loading status checks…
c93c9e8
@nornagon

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Oct 29, 2017

Ah, it looks like we're both adding a bike shop: #22262. We should merge them into variants :)

ZhilkinSerg added some commits Dec 1, 2017

@ZhilkinSerg
Merge branch 'master' into mapgen-small-town-buildings-pack
Loading status checks…
577406a
@ZhilkinSerg
Color name fix
Loading status checks…
ed38bb4
@ZhilkinSerg
Removed bike_shop
Loading status checks…
f8760b2
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Dec 12, 2017 •
edited

Ah, it looks like we're both adding a bike shop: #22262. We should merge them into variants :)

I will move bike shop to separate PR. Thanks.

@ZhilkinSerg ZhilkinSerg changed the title [WIP] Small town buildings [RDY] Small town buildings Dec 21, 2017

@kevingranade kevingranade merged commit 4de01c4 into CleverRaven:master Jan 4, 2018
3 checks passed

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.5%) to 23.345%
Details
gorgon-ghprb Build finished.
Details

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

@ZhilkinSerg ZhilkinSerg deleted the ZhilkinSerg:mapgen-small-town-buildings-pack branch Aug 25, 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.