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.

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 new mapgen location - private resort. #35997

Merged
merged 11 commits into from Jan 3, 2020

Conversation

CountAlex
Copy link
Contributor

@CountAlex CountAlex commented Dec 10, 2019

Summary

SUMMARY: Content "Adds new mapgen object - private resort"

Purpose of change

New mapgen content.

Describe the solution

N/A

Describe alternatives you've considered

N/A

Testing

See screenshots. PR was tested on base game with no mods enabled.

Additional context

Depends on #36054
I expect remarks on my wording and most likely on spawn probabilities and ready to tweak any of them.

New location is relative huge adult-only resort with private fence all around for, well, privacy. Place is meant to look a bit out of legal bounds with drugs everywhere, adult dance area, gambling hall.
Loot is mostly regular, except with more liquors and drugs as well as 4 places of regular fireams spawning.
Few additions to game such as deckchair (seems fitting to have them around pool), plastic dice with 6 sides, roulette table, dancing pole.
Place is supposed to look like being raded when SHTF so some cops and police cars have a chance of spawning.
Two basements. One contains some regular maintenance stuff and a bit of food/alcohol. Second one is file room, vault area with few safes and hidden area where some deceased prisoners and three more safes can be found.
First floor. Parking, reception, pool, restaraunt, kitchen, warehouse, dancing area, backrooms, private dancing rooms, gambling hall, offices.
Second floor is mostly guest rooms but also personnel rooms.
Roof is there too, nothing unusual.

pr1
pr2
1
2
3

@CountAlex CountAlex force-pushed the private_resort branch 4 times, most recently from 2a3b855 to 6daf971 Compare December 10, 2019 12:24
@curstwist curstwist added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Dec 10, 2019
@Night-Pryanik
Copy link
Contributor

Screenshot of basement?

@curstwist
Copy link
Contributor

looks like you have some incorrect terrains under furniture, specifically the bar and NW area. I see floor when i should be carpet and... concrete or metal floor.

Walls need some paint or something. don't use t_wall only. And maybe some glass walls for the interior courtyard?

@curstwist
Copy link
Contributor

Screenshot of basement?

and the roof, please.

@CountAlex
Copy link
Contributor Author

looks like you have some incorrect terrains under furniture, specifically the bar and NW area. I see floor when i should be carpet and... concrete or metal floor.

Walls need some paint or something. don't use t_wall only. And maybe some glass walls for the interior courtyard?

Not really sure how to fix this part with floors yet. I am really short on unused pallette symbols for other wall colors and don't really have much feeling about how to color the place right anyway.

No interior glass walls is intended approach as it's meant to separate areas - pool area, gambling area, restaraunt. Gambling area is closed from outside and restaraunt views don't include neraby pool with less high class entertaiments.

Screenshots will be there shortly.

@CountAlex CountAlex force-pushed the private_resort branch 2 times, most recently from 173cafb to b6aeeba Compare December 10, 2019 13:53
@curstwist
Copy link
Contributor

looks like you have some incorrect terrains under furniture, specifically the bar and NW area. I see floor when i should be carpet and... concrete or metal floor.

  1. so: first, for that red carpet area, since you did not merge your maps, each map can have a different fill_ter value. this one appears to share both of your problem spots. So...

  2. make fill_ter either red carpet or metal floor (whichever has the most furniture varieties in that mapgen chunk). Looks like metal floor is the best choice here.

  3. Then, here are some unused symbols in that particular palette: C, k, M, N, o, X, Y, z
    if you use those to duplicate: chair, table, counter, stool and fridge, and counter_gate that still leaves 2 unused letters (I didn't do a symbol check). So, make duplicate furniture entries for those and then use the same letter defined as red carpet in the terrain portion of the palette and update mapgen for the new values. pro tip, use those unused symbols to add some houseplants to warm it up some.

Walls need some paint or something. don't use t_wall only. And maybe some glass walls for the interior courtyard?

Then make the default wall t_wall_w and make it all painted white. unpainted is just drywall really. Or, you can make all the walls brick, which should be appropriate for a resort.

@CountAlex CountAlex force-pushed the private_resort branch 2 times, most recently from 7de9e57 to 1fe573a Compare December 10, 2019 15:29
@I-am-Erk
Copy link
Contributor

Whew, I'm gonna try to take a look at item spawning in here. It's a pretty tall order.

Copy link
Contributor

@I-am-Erk I-am-Erk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main thing that's going to be tough here is going over item spawns. In general I like your work a lot, but I wish you'd posted a work in progress so that we could have discussed this as you went. 2700 lines of JSON is far more than we'd recommend for a cold start... For example, you could have added the furniture and zombies in a separate infrastructure PR

In your pull request can you please talk about what you're adding? "New mapgen content" isn't even enough for a summary let alone a description of a 2700 line PR

data/json/items/generic.json Show resolved Hide resolved
data/json/mapgen/private_resort.json Show resolved Hide resolved
data/json/mapgen/private_resort.json Show resolved Hide resolved
data/json/monstergroups/resort.json Outdated Show resolved Hide resolved
data/json/monstergroups/resort.json Outdated Show resolved Hide resolved
data/json/monsters/zed_resort.json Outdated Show resolved Hide resolved
data/json/monsters/zed_resort.json Show resolved Hide resolved
@CountAlex
Copy link
Contributor Author

Moved restaraunt kitchen and few places to spawning with "items" and SUSificated where possible/reasonable.
Some fridges and tables didn't work well with SUS groups.

@CountAlex
Copy link
Contributor Author

Some of item spawns use anonymous itemgroups as in #36235 so unless it's closed this PR depends on it.

@I-am-Erk
Copy link
Contributor

I-am-Erk commented Jan 3, 2020

As best I can tell this is pretty good. In the future please try to keep your PRs to a manageable size

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants