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

Adding More Furniture #35272

Closed
wants to merge 20 commits into from
Closed

Conversation

WhaleyWhaley
Copy link
Contributor

@WhaleyWhaley WhaleyWhaley commented Nov 3, 2019

Summary

SUMMARY: Content "Adds new furniture"

Purpose of change

Adding 26 different pieces of Furniture, and 9 items, with a recipe and snippet type.

Furniture Added -
Charcoal Grill, Sandwich Board, Yard Flamingo, Birdfeeder, Traffic Cone, Taxidermy'd Bear, Foodperson Cardboard Cutout, Fishbowl, Dollhouse, Huge Teddy Bear, Drumset, TV Tray, Litterbox, Postal Boxes, Fire Hydrant, Floral Print Armchair, Beanbag Chair, Purple Velvet Chair, Plastic Lawn Chair, Foot Stool, Leather Chair, Gaming Chair, Wine Rack, Baby Gate, Turnstile, Door mats (With Snippets)

The furniture should add some immersion or flavor. A lot of houses/buildings feel "empty" so hopefully this can be used in the future to add some depth to some locations. I also added the furniture to a few locations.

Many of the furniture types are deployable, especially the decorative ones, because ideally more furniture would mean more base decoration and that way you can wield it and carry it away instead of dragging it.

Describe the solution

It just adds furniture.

Describe alternatives you've considered

The alternative is less furniture.

Testing

Spawned each piece. The ones that can be deployed I deployed and undeployed.

Additional context

Some sprites I made to save SDG some time.

fishbowlempty floralarmchair foodpersoncardboardalt_ sandwichboard_ trafficcone1_ tvtrayclosed tvtrayopen yardflamingo_ beartaxidermy2_ birdfeeder1_ birdfeeder2_ firehydrant fishbowl

Adding 26 different pieces of furniture, and 9 items, with a recipe and snippet type.
@Night-Pryanik
Copy link
Contributor

You need to spawn your new furniture somewhere, otherwise it's a dead weight.

@WhaleyWhaley
Copy link
Contributor Author

I mean, define "Dead Weight." They aren't going to harm anything and are fully available for mappers without making them define new furniture.

@Night-Pryanik
Copy link
Contributor

We don't need stuff in the code (be it c++ or json) that isn't used anywhere in the game. In the past we had several cleanings of the code from unused stuff.
Make every type of your furniture spawn at least once somewhere, and it will be good to go.

data/json/furniture_and_terrain/furniture-appliances.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-decorative.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-decorative.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-decorative.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-decorative.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-seats.json Outdated Show resolved Hide resolved
data/json/items/generic.json Outdated Show resolved Hide resolved
data/json/snippets/snippets.json Outdated Show resolved Hide resolved
data/json/snippets/snippets.json Outdated Show resolved Hide resolved
data/json/snippets/snippets.json Outdated Show resolved Hide resolved
@curstwist curstwist added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. labels Nov 3, 2019
WhaleyWhaley and others added 10 commits November 3, 2019 13:05
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
Co-Authored-By: matskuman5 <selinmatias5@gmail.com>
WhaleyWhaley and others added 4 commits November 3, 2019 14:00
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
Co-Authored-By: DaviBones <davi.deganne@gmail.com>
@ghost
Copy link

ghost commented Nov 5, 2019

Could you add theater seats to the movie theater in the mall?

mall_a_11 and mall_a_20

@ghost
Copy link

ghost commented Nov 5, 2019

house_patio would be a good place for the charcoal grill.

@ZhilkinSerg
Copy link
Contributor

Can you resolve conflicts please?

@ghost
Copy link

ghost commented Dec 6, 2019

@WhaleyWhaley boop

@LilShiningMan
Copy link
Contributor

Hoping this gets merged. Charcoal grill and drumset would be great to use!

@I-am-Erk
Copy link
Member

I'd be happy to merge this if the conflicts were fixed, I can't do that easily on my phone though.

@Night-Pryanik
Copy link
Contributor

@WhaleyWhaley care to resolve conflicts?

@ZhilkinSerg ZhilkinSerg added the stale Closed for lack of activity, but still valid. label Mar 5, 2020
@ZhilkinSerg
Copy link
Contributor

Need conflict resolution. Feel free to rebase and reopen.

@ZhilkinSerg ZhilkinSerg closed this Mar 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON stale Closed for lack of activity, but still valid.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants