Commit Graph

295 Commits

Author SHA1 Message Date
kilbith dc0aec6f0d add skateboard 2014-09-10 13:59:04 -04:00
kilbith e606ee176c Add sportbench 2014-09-10 12:39:14 -04:00
kilbith 8c68ad9662 Added a grandfather clock 2014-09-10 12:23:55 -04:00
kilbith f2440f3ca4 Added a trophy 2014-09-10 12:04:14 -04:00
kilbith f94aa7616e Added a wall shelf 2014-09-10 11:56:14 -04:00
Vanessa Ezekowitz 484fde70f2 Z-inverted the model for the back half of the pool table
so that it doesn't have to be facedir-flipped in software
use the aforementioned function to handle placing it
added an abm to convert the old node.
2014-09-07 15:14:48 -04:00
Vanessa Ezekowitz 068bff4594 functionalize most of the two-node objects' placement code 2014-09-07 15:01:51 -04:00
kilbith 2ea0800cea Telephone : nodeboxes cleaning.
Telephone : nodeboxes cleaning.
2014-09-07 12:13:36 -04:00
Vanessa Ezekowitz 29b2c262e5 fix cobweb conversion abm 2014-09-05 08:44:26 -04:00
Vanessa Ezekowitz 8c3c1deea5 remove some debug statements 2014-09-04 17:14:21 -04:00
Vanessa Ezekowitz fdfaa42f4f allow placement of cobweb on a flat vertical surface also. 2014-09-04 17:13:58 -04:00
Vanessa Ezekowitz 5c1b4de65a adjust selection box for centered cobweb 2014-09-04 16:50:39 -04:00
Vanessa Ezekowitz 6841b7eafd update cobweb recipe 2014-09-04 16:39:33 -04:00
Vanessa Ezekowitz 60d34095a5 make cobwebs sit in corners when so-placed.
Algorithm tries to find an X-/Z+ or X+/Z- corner first (places the
cobweb using the torchlike "on-floor" mode) then an X-/Z- or X+/Z+
corner ("on-ceiling), then opposing X-/X+ walls (nodebox, not rotated),
then opposing Z-/Z+ walls (nodebox, rotated 90 degrees), then falls back
to plantlike (which also happens to fit places where e.g. three walls
come together only 1m apart)

ABM added to convert old ones.

Node name has changed so if you have cobwebs in your inventory, sorry
about that.
2014-09-04 16:27:05 -04:00
Vanessa Ezekowitz 95d852691d don't use group:stick in recycle recipes :P 2014-09-03 19:52:26 -04:00
Vanessa Ezekowitz 5077df05de forgot deck chair description 2014-09-02 03:03:43 -04:00
Vanessa Ezekowitz 5d0dae8e3d use moreblocks: namespace for stairsplus recipe alternames
(stairsplus: namespace is long since deprecated)
2014-09-01 22:35:04 -04:00
Vanessa Ezekowitz ab393d7960 same for bottles and coffee maker 2014-09-01 13:55:28 -04:00
Vanessa Ezekowitz c192ecff90 don't shadow the surface the toaster sits on
(it's too small to matter)
2014-09-01 13:53:18 -04:00
Vanessa Ezekowitz 1f1fa99c9d make "popped" toaster drop regular one. 2014-09-01 13:50:17 -04:00
kilbith f330d19d03 Added a deckchair 2014-09-01 13:47:46 -04:00
kilbith 7da4ec0e63 Added a toaster
On right-click, the toast pops out & plays a sound.  Right click again to
reset the toast.
2014-09-01 13:31:28 -04:00
kilbith de0ba264fa Removed the useless nodeboxes on radiator
Removed 3 useless nodeboxes on radiator. Identic model.
2014-08-27 11:11:38 +02:00
Vanessa Ezekowitz fd5740bf50 more accurate inventory image for trash can 2014-08-26 14:03:18 -04:00
Vanessa Ezekowitz 82c9c01661 made trash can recipe cheaper 2014-08-26 13:59:14 -04:00
Vanessa Ezekowitz 559cb1f7f7 recipe for piano is too cheap, made it more expensive. 2014-08-26 13:57:12 -04:00
Vanessa Ezekowitz 9df13fe6a2 better inventory image for wallmount coat rack 2014-08-26 13:50:51 -04:00
Vanessa Ezekowitz 7139428181 right half of piano = not in creative inv 2014-08-26 13:33:37 -04:00
Vanessa Ezekowitz f946ea2936 description for piano 2014-08-26 13:32:40 -04:00
Vanessa Ezekowitz 401c85dab8 added a piano 2014-08-26 13:28:47 -04:00
kilbith 09b69280bd Added a dartboard
For a clean & simple circle, I prefered make it as 2D 'signlike'.
2014-08-26 08:33:29 -04:00
kilbith ea6de9ba1f Selection box for the coffee maker 2014-08-26 08:15:49 -04:00
kilbith 2aec716aac Added a coffee maker 2014-08-25 20:24:13 -04:00
Vanessa Ezekowitz 1dc2be2756 fix texture on bench 2014-08-25 20:08:05 -04:00
Vanessa Ezekowitz 0afd5b9b2c add brass and steel chainlinks, recipe changes...
if glooptest is not installed, an alias is added to equate homedecor
steel chainlinks to glooptest's, for compatibility.

The six-steel-ingot wall chain recipe is no longer to make wall chains.
Instead, if glooptest is not installed, this recipe is used to make
chain *links*.

Whether glooptest is installed or not, the steel chainlinks are still
used along with steel ingots, to make wall chains as before.
2014-08-25 18:26:31 -04:00
Vanessa Ezekowitz 5405b71a05 fix positioning of homedecor doorbell sound 2014-08-23 16:22:07 -04:00
kilbith b733c4c5b3 Simple bench closer from the node behind
Simple bench closer from the node behind (prettier usage) : https://cdn.mediacru.sh/SWJdRE4pI0L9.png
2014-08-22 23:19:16 +02:00
kilbith a3c6acc52b Added simple green and brown glass bottles
(e.g. beer and cola but could be anything)
2014-08-22 16:32:03 -04:00
kilbith 578bc6008b Updated bed colors
- Red & green replaced by the default wool textures (the previous were too dark).
- Prettier violet texture
- Added brown, darkgrey, orange, yellow and pink colors (based on the default wool textures too).
2014-08-21 12:04:54 -04:00
Vanessa Ezekowitz 65c502fe0f fixed Z-fighting between ceiling fan blades and block above
moved it to climate control where it belongs
2014-08-20 15:01:41 -04:00
kilbith 2609e68d9d More colors for the bed
red, (dark) green, violet
2014-08-20 14:58:00 -04:00
Vanessa Ezekowitz 482127af2d use slabs for the legs of the "style #2" bench
(sticks are too weak for legs on such a large object)
2014-08-19 11:08:18 -04:00
Vanessa Ezekowitz 998f08abfb simplify trash can 2014-08-19 11:02:56 -04:00
Vanessa Ezekowitz 0c0416b671 added alternate wood slab recipe for dishwasher
damn moreblocks full-sized wooden slabs still use custom names :-/
2014-08-19 10:47:22 -04:00
kilbith 784de299e3 Added a simple bench
slabs to make it can be from moreblocks or default stairs mod
2014-08-19 10:45:16 -04:00
Vanessa Ezekowitz 2973272d63 Merge branch 'patch-11' of https://github.com/kilbith/homedecor_modpack 2014-08-18 13:54:26 -04:00
Vanessa Ezekowitz 9bad267428 fixed locked fridges 2014-08-18 13:52:39 -04:00
kilbith ce760bedc0 Little tweaks on the bench 1
Little tweaks on the bench 1
2014-08-18 19:28:23 +02:00
kilbith 63eee13d4f Made cup "diamater" smaller
Made plate's raised edges X/Z coords aligned to texture pixels
Gave plate raised edge a gold trim
New inventory image to match
2014-08-18 12:04:07 -04:00
kilbith c9556c51ba Improved the knife on the cutlery set
Improved the knife on the cutlery set
2014-08-18 08:22:06 +02:00
Vanessa Ezekowitz 8b3260c57a alternate recipe for cutlery 2014-08-18 00:00:13 -04:00
Vanessa Ezekowitz ce6aef53ed multiple changes
added cutlery set
added steel strip recipe (now two ingots, one below-left of the other)
changed recipe for copper strips to match steel strip recipe
2014-08-17 23:40:56 -04:00
Vanessa Ezekowitz 1d7fb521a7 new doorbell textures 2014-08-17 22:43:00 -04:00
Vanessa Ezekowitz 0671a21426 remove redundant drop= entry from 'closed' toilet 2014-08-17 22:23:35 -04:00
Vanessa Ezekowitz fd84c568af add "gooseneck" style kitchen faucet 2014-08-17 22:20:49 -04:00
Vanessa Ezekowitz c8bfaa6e79 add garden benches 2014-08-17 21:55:55 -04:00
Vanessa Ezekowitz da3689dbe5 fix mis-placement of locked fridge 2014-08-17 13:08:27 -04:00
Vanessa Ezekowitz 207c72daa5 optimize door/gate sounds 2014-08-15 09:00:48 -04:00
Vanessa Ezekowitz c4090a84cd optimize toilet sound 2014-08-15 08:57:45 -04:00
Vanessa Ezekowitz a1f3d7a810 optimized doorbell filesize 2014-08-15 08:46:46 -04:00
Vanessa Ezekowitz 0b0669a969 better doorbell sound 2014-08-15 08:20:51 -04:00
Vanessa Ezekowitz 43db10c8b3 doorbell max hear distance = 15 2014-08-15 08:04:03 -04:00
Vanessa Ezekowitz f150d8146a update fridge recipes to match new node defs
also change the recipe a bit to not rely on moreores
2014-08-14 15:43:32 -04:00
Vanessa Ezekowitz 365247b7c3 prevent crash if screwdriver was able to rotate a part of bed, pool table,
or desk.  (really anything that is a side-by-side object).
2014-08-14 15:34:35 -04:00
Vanessa Ezekowitz e5ec7c88e8 Merge branch 'patch-6' of https://github.com/kilbith/homedecor_modpack 2014-08-14 14:51:57 -04:00
kilbith 645fdf684d Very little tweaks on the pool table
No incidences on the textures...
2014-08-14 20:46:46 +02:00
Vanessa Ezekowitz defa628c4f change dig property of doorbell 2014-08-14 14:26:13 -04:00
Vanessa Ezekowitz e8dd191cfd multiple changes
fridge has new models by jp, and now uses two nodes instead of one.

an abm has been added to convert the old one-node version into this new
two-node version. inventories are kept in the process, but I can't do
anything about fridges that are themselves in someone's inventory or
chests.  If you want to keep them, place them in the world before you
update.

added coat rack on wall, and freestanding coat tree, models by jp

added doorbell, model and texture by jp with changes by me
2014-08-14 14:05:41 -04:00
kilbith 588ef63da5 Improved bucket in the pit.
Improved bucket  in the pit.
2014-08-13 20:03:24 +02:00
kilbith 380ac59b68 Added a bucket at the water well. 2014-08-13 17:59:31 +02:00
Vanessa Ezekowitz d494b85b83 add water to the interior of the well base 2014-08-13 11:31:37 -04:00
Vanessa Ezekowitz 2981890e6d add well 2014-08-13 11:15:57 -04:00
Vanessa Ezekowitz 380ca4c98a give brass and wrought iron poles facedir
so they can be rotated to horizontal with screwdriver.
2014-08-12 12:26:14 -04:00
Vanessa Ezekowitz 9fab61ec90 make cobwebs walkable-through, also sunlight propagates. 2014-08-12 12:23:32 -04:00
Vanessa Ezekowitz 0202d3ed5e add cobwebs 2014-08-12 12:14:21 -04:00
kilbith 8e76593982 Added open/close curtains functions. 2014-08-11 04:00:07 -04:00
Vanessa Ezekowitz 256029f259 add curtain rods and "opened" curtains
rods in brass, wrought iron, wood
opened curtains in same colors as regular
made all curtains use texture alpha, gave their textures ~90% opacity
moved curtains defs into window_treatments.lua
2014-08-10 17:37:58 -04:00
kilbith bd6d361933 Update furniture.lua - wardrobe part
Visually identic, pile of useless nodeboxes removed.
2014-08-10 08:33:20 +02:00
Vanessa Ezekowitz cfd9b11511 fix copy&paste error 2014-08-08 18:45:15 -04:00
Vanessa Ezekowitz a83e40045d allow technic motor in ceiling fan recipe 2014-08-08 16:30:29 -04:00
Vanessa Ezekowitz febcdb2605 add animated ceiling fan 2014-08-08 16:27:46 -04:00
Vanessa Ezekowitz 6626032f28 add radiator, telephone and trash can (decorative) 2014-08-08 15:13:47 -04:00
Vanessa Ezekowitz 075a6195dc add bed, wardrobe and pool table 2014-08-07 14:49:26 -04:00
Vanessa Ezekowitz c26d52ebdd PNGCRUSH _ALL_ THE TEXTURES! "\_:D/ 2014-08-04 13:47:16 -04:00
Vanessa Ezekowitz ac46db1c72 lighted fishtank shouldn't be in creative inventory 2014-08-04 13:04:17 -04:00
Vanessa Ezekowitz bc8b96a0bb better textures for the japanese walls 2014-08-04 11:59:09 -04:00
jp 1a9a9939ee Add japanese walls and tatami mat
(they're supposed to be doors, but they don't open/close yet)
2014-08-04 11:18:02 -04:00
Vanessa Ezekowitz 37ed09edae consolidate text pos and nodebox def tables
each sign type has a separate table which now defines the nodebox
model and position of the text on that model, instead of separate
sets of tables for each.
2014-08-03 19:53:52 -04:00
Vanessa Ezekowitz c5ce3bc53d texture and size cleanups on signs
MUCH more readable background texture for all signs

use exact-to-pixel dimensions on all signs
move sign models to start of signs_lib where they can be seen
make homedecor's brass/iron signs-on-posts use them
adjust all textures accordingly
2014-08-03 19:44:21 -04:00
jp 42e43a3e2c Add doghouse
model by jp, textures by VanessaE
2014-08-03 12:08:43 -04:00
Vanessa Ezekowitz 3b806cfe63 move outlet up a bit, ...
move light switch down to bottom of node

give them selection boxes that are easier to point at
2014-08-02 00:12:23 -04:00
Vanessa Ezekowitz 6dcd5e7bf6 double the yield of copper strips 2014-08-01 21:33:37 -04:00
Vanessa Ezekowitz 3ed1ea822a Add inventory images for medicine cabinet and toilet paper
add craft recipe for medicine cabinet, move it to misc-bathroom.lua
2014-08-01 21:26:04 -04:00
Vanessa Ezekowitz 6bef2b186d Added inventory image for heater 2014-08-01 21:19:19 -04:00
Vanessa Ezekowitz f4165028c3 add dvd/vcr inventory image 2014-08-01 21:11:34 -04:00
Vanessa Ezekowitz f48d8af118 add nice, clear inventory images to clocks 2014-08-01 21:05:22 -04:00
Vanessa Ezekowitz ef0ebac4db Add recipes for power outlet and light switch
also fixed the group settings to make them easier to dig, and gave them
nice, clear inventory images.
2014-08-01 20:45:41 -04:00
Vanessa Ezekowitz 07f9f31e43 add recipe for filing cabinet 2014-08-01 19:51:33 -04:00
Vanessa Ezekowitz 41e518282f use group:stick instead of default:sticks in all recipes, all sub-mods. 2014-07-30 18:19:42 -04:00
Vanessa Ezekowitz c667b4e168 higher quality inventory images for some 3dforniture objects 2014-07-27 16:48:33 -04:00
Vanessa Ezekowitz 5f1d48c40d add wooden lattice lamps 2014-07-27 15:15:47 -04:00
Vanessa Ezekowitz 2e05b5d49c Add candles and oil lamp 2014-07-27 11:52:42 -04:00
Vanessa Ezekowitz f1f2db92c5 Added several more colors of bathroom tiles 2014-07-27 09:13:48 -04:00
Vanessa Ezekowitz 8aeb2f1007 condense node defs for bathroom tiles
give slightly more meaningful filenames for their textures
2014-07-27 09:04:53 -04:00
Vanessa Ezekowitz c30fa31336 add recipes for black/white/grey bathroom tiles, give them better textures 2014-07-27 08:56:56 -04:00
Vanessa Ezekowitz fbed3bfab2 use modern protection function in tabletop nodes 2014-07-20 10:29:12 -04:00
Vanessa Ezekowitz df34140a1a new projection screen inventory image 2014-07-19 20:12:01 -04:00
Vanessa Ezekowitz c4e0ef0aef new brass ingot 2014-07-19 19:41:30 -04:00
Vanessa Ezekowitz 3295ed85c3 update oil extract bottle image 2014-07-19 18:49:32 -04:00
Vanessa Ezekowitz d76dbc1dd9 Improved quality of most inventory textures
Re-drew/re-rendered or just tweaked them to use alpha where appropriate,
since the inventory can use it reliably these days.

Other changes include better image for table legs, reduced the power
crystal image since it doesn't need to be so big now, and reduced the
height/diameter of the motor a little.
2014-07-19 15:56:59 -04:00
Vanessa Ezekowitz a3ccb6176b Change crafting chain for plastic sheets
now leaves become oil extract, which is cooked into paraffin
this is then cooked into plastic sheets.

needed for future recipes that will need some kind of wax.
2014-07-19 08:03:02 -04:00
Vanessa Ezekowitz 3918ff56fc add a roll of toilet paper 2014-07-19 05:39:18 -04:00
Vanessa Ezekowitz 269db07a00 add space heater
rename fans.lua -> climate-control.lua and move air conditioner into it
along with the new heater.
2014-07-18 10:55:09 -04:00
Vanessa Ezekowitz 9e6e26e1ed Use fan blades in air conditioner recipe 2014-07-18 10:01:42 -04:00
Jordach f73cfa1cf5 desk fans (YAHN)
uses new fan blades object for recipe
2014-07-18 09:54:22 -04:00
Vanessa Ezekowitz 6f43085597 better recipe for 3dforniture bars
also lower the yield, they're way too cheap.
2014-07-14 18:09:23 -04:00
Vanessa Ezekowitz 633beb8b88 defer to technic for brass ingots
if technic is not installed, just define its brass ingot and use the standard
moreores silver/default copper craft recipe to make it.

if technic is installed, define no recipe for it - let technic's zinc/copper
alloy furnace recipe handle it.
2014-07-14 15:38:36 -04:00
Vanessa Ezekowitz aa6dbf37f5 change speaker and speaker-based recipes
now, you must craft a speaker driver (the actual speaker itself) first, then
use it to craft the "small" and "large" speakers, alarm clock, etc.
2014-07-13 18:51:31 -04:00
Vanessa Ezekowitz 5b705cf4ed Move the openframe bookshelf into the main homedecor mod
Moved the craft recipe too
this leaves just the default bookshelf and the moreblocks empty counterpart
in the 3d extras mod.
2014-07-13 08:37:42 -04:00
Vanessa Ezekowitz d299dd60dc additional dishwasher top surfaces
same method and limitations as kitchen.  Can make wood, steel, marble, granite
2014-07-13 04:14:46 -04:00
Novatux d9f3df202b new brass ingot image 2014-07-09 12:58:15 -04:00
Vanessa Ezekowitz 2dd7a660a5 add spools of copper and steel wire
use them in some recipes in lieu of steel/copper ingots.
2014-07-08 15:35:21 -04:00
Vanessa Ezekowitz 44b34cf3a3 add recipes for windowblinds via new craft item, plastic strips 2014-07-08 04:03:39 -04:00
Vanessa Ezekowitz 7805035d21 added recipes for several items 2014-07-08 00:31:34 -04:00
Vanessa Ezekowitz 96f3f8fc15 make windowpanes walkable/solid 2014-07-07 13:57:32 -04:00
Vanessa Ezekowitz bd14eca7ad rewrite the paintings crafts
just use dyes in a pattern resembling the painting instead of using binary.
2014-07-04 10:36:06 -04:00
Vanessa Ezekowitz f28cedf837 change bit order of painting craft
now it is:

 --  bit4 bit3
bit2 bit1 bit0
 --  Canv  --
2014-07-04 08:17:25 -04:00
Vanessa Ezekowitz 67598d3280 add blank canvas craft item and recipes for paintings
First, craft a blank canvas from four sticks
and some white wool:

- s -
s W s
- s -

Then, combine that canvas with some black and white dyes in the right
pattern to get the painting you want.

Paintings are numbred in-game, from 1 to 20.  Since there are so many
paintings, and so little crafting space, the only way I could think to
do it was to use binary for the recipe.  Convert the number of the
painting you want into binary, then use black dye for each 0 and white for
each 1, and lay them down into the crafting grid in this pattern:

bit2  bit1  bit0
  -   bit4  bit3
  -   Canv.   -

With the blank canvas in the bottom center slot.  For example, if you
want painting number 9, that would be 01001 in binary, so you'd arrange
the crafting grid like so:

Black Black White  --->  Painting #9
  -   Black White
  -   Canv.   -
2014-07-04 04:45:58 -04:00
Vanessa Ezekowitz 76f92d21d6 fix oven recipe 2014-06-30 13:22:51 -04:00
Vanessa Ezekowitz 86345c778f merge no-moreblocks recipes back into crafts.lua
as these are now the preferred recipes.
2014-06-30 13:07:19 -04:00
Vanessa Ezekowitz 1cb5a5c0fa better recipe for microwave 2014-06-30 12:48:43 -04:00
Vanessa Ezekowitz f9b3160c1d use dye to create frosted skylight
use furnace to turn it back into clear one
2014-06-30 11:37:20 -04:00
Vanessa Ezekowitz fe6a5e1a84 use large glass tabletops to form glass skylights
instead of crafting them from glass blocks
2014-06-30 00:02:51 -04:00
Vanessa Ezekowitz bf3179083a use 2 instead of 4 tabletops to translate small round -> small square
and small square -> large, applies to both glass and wood
2014-06-29 23:58:42 -04:00
Vanessa Ezekowitz 21b6c047b6 use wooden slabs for top of desk 2014-06-29 23:47:57 -04:00
Vanessa Ezekowitz 57ecac2baa Add plasma lamp 2014-06-29 12:49:35 -04:00
Vanessa Ezekowitz 1d01973121 give the desk a proper inventory image 2014-06-29 12:18:16 -04:00
Vanessa Ezekowitz 65246dabfa add recipe for desk 2014-06-29 12:04:56 -04:00
Vanessa Ezekowitz f0c6ab015f allow for technic motors to be used in washer, dryer and dishwasher 2014-06-29 11:12:33 -04:00
Vanessa Ezekowitz ba3abaa6a6 avoid duplicating get_nodedef_field() function
(both doors/gates and desk need it)

moved to init.lua and into homedecor.* namespace.
2014-06-29 10:47:25 -04:00
Vanessa Ezekowitz f8efeee4d7 add computer desk 2014-06-29 10:43:34 -04:00
Vanessa Ezekowitz 328ceacd25 better recipe for oven 2014-06-29 06:40:28 -04:00
Vanessa Ezekowitz 4dab7d0acd better recipe for asphalt shingles 2014-06-29 06:32:27 -04:00
Vanessa Ezekowitz a9c1fe3c46 add dishwasher recipe 2014-06-29 02:59:11 -04:00
Vanessa Ezekowitz 5cd2086998 add washer and dryer recipes 2014-06-29 02:54:16 -04:00
Vanessa Ezekowitz 268d3837e0 add motor and heating element craft items 2014-06-29 02:41:33 -04:00
Vanessa Ezekowitz 38ad778ade move all craftitems to the top of the crafts file 2014-06-29 02:23:03 -04:00
Vanessa Ezekowitz d69b8392ba add craft recipe for box 2014-06-28 04:30:50 -04:00
Vanessa Ezekowitz f3ece0687e use building_blocks marble instead of cobble for toilet, sink and shower tray 2014-06-28 02:58:32 -04:00
Vanessa Ezekowitz c6641ad514 make sure homedecor always loads building_blocks first. 2014-06-28 02:57:25 -04:00