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] Mansion Upgrade Project #22072

Merged
merged 23 commits into from Oct 12, 2017

Conversation

Reviewers

@Coolthulhu Coolthulhu

Assignees

@Coolthulhu Coolthulhu

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

commented Oct 3, 2017 •
edited

Added mansion mapgen from Mansion Upgrade Project (see http://smf.cataclysmdda.com/index.php?topic=13630.0).

Thanks to @egomassive (http://smf.cataclysmdda.com/index.php?action=profile;u=3495).

Todo

  • - test loot;
  • - utilize mapgen palettes:
  • - fix open air tiles;
  • - fix vegetation tiles underground.
@ZhilkinSerg
Initial commit 
Added mansion mapgen from Mansion Upgrade Project (see http://smf.cataclysmdda.com/index.php?topic=13630.0).

Thanks to egomassive (http://smf.cataclysmdda.com/index.php?action=profile;u=3495).
Loading status checks…
9eb90cb

@ZhilkinSerg ZhilkinSerg changed the title Mansion Upgrade Project [WIP] Mansion Upgrade Project Oct 3, 2017

@AdonaiJr

This comment has been minimized.

Sign in to view
Copy link

commented Oct 4, 2017

Yes! Thank you so much for pushing this, Zhilkin. Egomassive made an awesome job at those mansions. It's a pity that his mod was buried in the foruns, and was not working for a while.
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Oct 6, 2017

Needs a rebase, badly
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 6, 2017

Needs a rebase, badly

I've just did something wrong when trying to rebase and resolve conflicts.

Will try to rollback.
@Coolthulhu

Coolthulhu suggested changes Oct 6, 2017
View changes

data/json/mapgen/mansion/mansion.json Outdated
},
"items": {
".": { "item": "clutter_mansion", "chance": 1 },
":": { "item": "clutter_yard", "chance": 1 },

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 6, 2017

Contributor

Chance defaults to 1
data/json/mapgen/mansion/mansion.json Outdated
"+": "t_door_c",
",": "t_sidewalk",
"-": "t_carpet_red",
":": [ "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_grass", "t_dirt" ],

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 6, 2017

Contributor

Not strictly necessary, but those are reused a few times and could use a proper palette instead of copypaste.
data/json/mapgen/mansion/mansion.json Outdated
"object": {
"fill_ter": "t_floor",
"rows": [
"X....nnn.X....X...

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 6, 2017

Contributor

This looks really wrong: chance: 100 means only 1 in 100 safes will have anything in it.

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Oct 6, 2017 •
edited

Author Contributor

Is it one in 100? I thought 100 is for 100%.

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 6, 2017

Contributor

Make sure to test it then.

This comment has been minimized.

Sign in to view
Copy link
@ZhilkinSerg

ZhilkinSerg Oct 6, 2017

Author Contributor

There were no issues in amount of loot when this mansion was in the mod. Will test it again later.

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 6, 2017

Contributor

Oh, I re-read it now. It looks like there are two different functions in mapgen and the item group one uses x_in_y( chance, 100 ), while spawn_item for some reason uses one_in( chance ). This is pretty terrible, but looks like the PR is not affected.
data/json/mapgen/mansion/mansion.json Outdated
"object": {
"fill_ter": "t_floor",
"rows": [
"X....nnn.X....X...

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Oct 6, 2017

Contributor

Terrain definitions should be in a separate file.
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 6, 2017

Fixed eveything reviewуd, except for palettes and item spawn chances.
@Coolthulhu

Coolthulhu approved these changes Oct 6, 2017
View changes

@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 6, 2017

I'm still working on utilizing palettes.
@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 6, 2017

The loot seems to be okay.

@ZhilkinSerg ZhilkinSerg changed the title [WIP] Mansion Upgrade Project [RDY] Mansion Upgrade Project Oct 6, 2017

@ZhilkinSerg

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 6, 2017

The masterpiece should be ready now.

@Coolthulhu Coolthulhu self-assigned this Oct 12, 2017

@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Oct 12, 2017

Got some weird rock-filled rooms here and there:
rock room
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Oct 12, 2017

Pretty much every mansion has this weird room of rock. There is no door leading to it, so I guess it's minor, but it should be fixed.
I guess I'll let it in for now and just report it, since players are very unlikely to see it.

@Coolthulhu Coolthulhu merged commit 3f6775f into CleverRaven:master Oct 12, 2017
3 checks passed

3 checks passed

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

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Oct 12, 2017

Pretty much every mansion has this weird room of rock. There is no door leading to it, so I guess it's minor, but it should be fixed.
I guess I'll let it in for now and just report it, since players are very unlikely to see it.

What floor is it? Was it basement?

@ZhilkinSerg ZhilkinSerg deleted the ZhilkinSerg:mapgen-mansion2 branch Oct 17, 2017

@ZhilkinSerg ZhilkinSerg referenced this pull request Feb 8, 2018

Merged

Remove hardcoded mansions #22906

@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.