auto-combine tabletops with legs

Browse Source

If the player places table legs, and then places a tabletop while
pointing at the legs (from any side), the table and legs will
automatically be combined into a single node that can then have
something placed on top like usual.

This also gets rid of those redundant "utility" table nodes, since
these have always basically just been a set of legs, and a copy
of the small square wood table.  Now they're merged into the above
feature, and aliased as appropriate.

Tecccccccccchhnically, wood legs should only have been allowed to
combine with wooden tabletops...  then I googled around a bit,
and found a number of glass tables with wooden legs that were
surprisingly similar to the in-game versions.

...

This commit is contained in:

Vanessa Dannenberg

2021-03-26 23:08:06 -04:00

parent 40cd59aa24

commit c70fb1a1ed

32 changed files with 1808 additions and 472 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

homedecor_tables/textures/homedecor_glass_face_clean.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 74 B

0

homedecor_tables/textures/homedecor_glass_table_large_edges.png → homedecor_tables/textures/homedecor_glass_table_edges.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 189 B After Width:  |  Height:  |  Size: 189 B

BIN

homedecor_tables/textures/homedecor_glass_table_large_inv.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.4 KiB

BIN

homedecor_tables/textures/homedecor_glass_table_large_square.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 604 B

BIN

homedecor_tables/textures/homedecor_glass_table_large_square_inv.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 315 B

BIN

homedecor_tables/textures/homedecor_glass_table_large_tb.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 146 B

BIN

homedecor_tables/textures/homedecor_glass_table_small_round.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 241 B After Width:  |  Height:  |  Size: 597 B

BIN

homedecor_tables/textures/homedecor_glass_table_small_round_inv.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 713 B

BIN

homedecor_tables/textures/homedecor_glass_table_small_square.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 358 B After Width:  |  Height:  |  Size: 642 B

BIN

homedecor_tables/textures/homedecor_glass_table_small_square_inv.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 334 B

BIN

homedecor_tables/textures/homedecor_table_legs_brass.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 331 B After Width:  |  Height:  |  Size: 476 B

BIN

homedecor_tables/textures/homedecor_table_legs_wood.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 357 B

BIN

homedecor_tables/textures/homedecor_table_legs_wrought_iron.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 325 B After Width:  |  Height:  |  Size: 439 B

BIN

homedecor_tables/textures/homedecor_utility_table_edges.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 465 B

BIN

homedecor_tables/textures/homedecor_utility_table_legs.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 338 B

BIN

homedecor_tables/textures/homedecor_utility_table_legs_inv.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.3 KiB

BIN

homedecor_tables/textures/homedecor_utility_table_tb.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 576 B

BIN

homedecor_tables/textures/homedecor_wood_table_edges.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 204 B

BIN

homedecor_tables/textures/homedecor_wood_table_large_edges.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 465 B

BIN

homedecor_tables/textures/homedecor_wood_table_large_inv.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 4.0 KiB

BIN

homedecor_tables/textures/homedecor_wood_table_large_square.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

homedecor_tables/textures/homedecor_wood_table_large_square_inv.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 652 B

BIN

homedecor_tables/textures/homedecor_wood_table_large_tb.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 529 B

BIN

homedecor_tables/textures/homedecor_wood_table_small_round.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 573 B After Width:  |  Height:  |  Size: 2.2 KiB

BIN

homedecor_tables/textures/homedecor_wood_table_small_round_inv.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.1 KiB After Width:  |  Height:  |  Size: 2.0 KiB

BIN

homedecor_tables/textures/homedecor_wood_table_small_square.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 982 B After Width:  |  Height:  |  Size: 1.4 KiB

BIN

homedecor_tables/textures/homedecor_wood_table_small_square_inv.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 901 B