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 roof to hunting lodge and cleanup unused features #55501

Merged
merged 6 commits into from
Mar 10, 2022

Conversation

haveric
Copy link
Contributor

@haveric haveric commented Feb 19, 2022

Summary

Bugfixes "Add roof to hunting lodge"

Purpose of change

Add roof to hunting lodge and cleanup unused features.
Slight furniture tweaks around fireplace, such as chairs and adding fireplace to the second floor.
Fixes ground being rock instead of soil.

Done:

  • Add basic roof to second floor
  • Add roof level
  • Add roof terrain objects
  • Add misc. junk to roof
  • Figure out how to remove auto-created roof on top of standing tanks.
  • Consider adjusting downspout locations to make more sense
  • Basic Testing
  • Rotation Testing

Not happening in this PR:

  • Figure out if there are options for mid-level downspouts that are better? Or remove them?
  • Add more threats? For some reason the spawn zombie doesn't always happen. Might be a bug or need adjustment: "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": 29, "y": 4 } ],

Describe the solution

Update second floor and add a roof level

Describe alternatives you've considered

None

Testing

Spawned a bunch of lodges next to each other and checked everything looked correct. See additional context for final rotation test screenshots.

Additional context

I spawned two next to each other to test rotations, so some doors won't make sense between the two.
Floor 1:
image
image

Floor 2:
image
image

Roof:
image
image

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Feb 19, 2022
@NetSysFire NetSysFire added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Feb 19, 2022
@Maleclypse
Copy link
Member

Thank you for doing this!

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 19, 2022
@haveric haveric marked this pull request as ready for review February 20, 2022 19:03
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 20, 2022
@LyleSY LyleSY mentioned this pull request Mar 9, 2022
@Maleclypse
Copy link
Member

Just noticed the diagonals in the middle of the second floor carpets both have two squares misplaced.

@haveric
Copy link
Contributor Author

haveric commented Mar 9, 2022

Oh, is it supposed to be a rotated rectangle? That makes so much more sense. I couldn't figure out whether it was intentionally done the way it was or if I was missing something. I'll tweak that when I am resolving conflicts.

@Maleclypse
Copy link
Member

Oh, is it supposed to be a rotated rectangle? That makes so much more sense. I couldn't figure out whether it was intentionally done the way it was or if I was missing something. I'll tweak that when I am resolving conflicts.

Yep. I’m a terrible interior decorator.

@haveric
Copy link
Contributor Author

haveric commented Mar 9, 2022

Yep. I’m a terrible interior decorator.

Is that why there's bathtubs (hot tubs maybe?) in the open here? I'll be honest in that I didn't know the intention for some of the stuff, so I tried to keep the changes light that I did, especially since this was supposed to just be a roof fix, but I'm open to making more improvements if there were suggestions to be had. I was tempted to move the fireplace to a 3x1 placement along the wall as well, but remember a conversation from a while ago about wanting to have the giant 3x3 fireplace, so I just extended that upwards so it makes a little more sense.

@Maleclypse
Copy link
Member

Maleclypse commented Mar 9, 2022

Yep. I’m a terrible interior decorator.

Is that why there's bathtubs (hot tubs maybe?) in the open here? I'll be honest in that I didn't know the intention for some of the stuff, so I tried to keep the changes light that I did, especially since this was supposed to just be a roof fix, but I'm open to making more improvements if there were suggestions to be had. I was tempted to move the fireplace to a 3x1 placement along the wall as well, but remember a conversation from a while ago about wanting to have the giant 3x3 fireplace, so I just extended that upwards so it makes a little more sense.

It is roughly based and a smaller scale on the main building of a 70’s hunting estate that a friend’s family bought in a bankruptcy auction. Those are in fact representing the random open room hot tub from when they first bought the place. So the three variants were designed to be “swinger pad”, drug distribution, and cannibals with the above floors looking pretty similar no matter what and the basement having the key.

edit: the goal was to tell some stories that the player could find without any words. I should probably add a hot tub furniture.

@haveric
Copy link
Contributor Author

haveric commented Mar 9, 2022

Seems reasonable enough. I know I tried to find examples to compare it to and honestly struggled to find anything I wanted to reference.

Hot tub furniture might make sense just to avoid the confusion, but I suspect it would act the same, so it's not that big of a deal. I also considered adding some head/antler mounts as decoration, but didn't want to bloat the scope of this any more.

I should probably double check the basement carpet layout as well. I remember it being slightly odd, but I didn't change anything, so I assumed it was designed that way. Will update when I get a chance to look at this after work.

@Maleclypse
Copy link
Member

Seems reasonable enough. I know I tried to find examples to compare it to and honestly struggled to find anything I wanted to reference.

Hot tub furniture might make sense just to avoid the confusion, but I suspect it would act the same, so it's not that big of a deal. I also considered adding some head/antler mounts as decoration, but didn't want to bloat the scope of this any more.

I should probably double check the basement carpet layout as well. I remember it being slightly odd, but I didn't change anything, so I assumed it was designed that way. Will update when I get a chance to look at this after work.

Head and antler mount furniture or walls would be pretty cool. I'm gonna ask about that in tileset channel.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 10, 2022
@Maleclypse
Copy link
Member

Thank you for this!

@kevingranade kevingranade merged commit 838d158 into CleverRaven:master Mar 10, 2022
@haveric haveric deleted the hunting-lodge-roof branch March 11, 2022 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions 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