Commit Graph

1661 Commits

Author SHA1 Message Date
Vanessa Dannenberg e289e79aea add intllib as optdepend in homedecor_common
should fix #17 ?
2019-06-07 00:36:05 -04:00
Vanessa Dannenberg 80ab12710b add "light" to a couple of descriptions, for easier searching 2019-06-06 04:38:13 -04:00
Vanessa Dannenberg 1b94c940d7 fix wrong light value on standing lamps 2019-06-06 04:37:26 -04:00
Vanessa Dannenberg df44dd3dad remove some bogus aliases, fix plasma ball 2019-06-06 01:48:44 -04:00
Vanessa Dannenberg bff90189fc fixed french door conversions, for real now. :P
bumped LBM version
2019-06-06 01:17:43 -04:00
Vanessa Dannenberg b407f06dc4 fix wall lantern aliases, for real this time :P 2019-06-06 01:03:57 -04:00
Vanessa Dannenberg e6dc2c5508 bump doors LBM name to force it to run again 2019-06-05 06:16:33 -04:00
Vanessa Dannenberg bde2bf2bf6 fix some missing door LBM entries 2019-06-05 04:26:22 -04:00
Vanessa Dannenberg ea160a6519 simplify mesecons/digilines rules
replaced all "xz" and "toponly" with "alldir"
made on-floor rope lights use "alldir"
2019-06-04 01:37:02 -04:00
Vanessa Dannenberg 631813bb2d make all dimmable lights fully dimmable to any level 0-14
for backward compat, they'll resond to the usual strings, too:

"off" -> 0
"min" -> 3
"med" -> 7
"hi"  -> 11
"max"/"on" -> 14

all dimmable nodes have been renamed to bear the light value in their
names, and aliased.

the non-dimmable lights still respond as before
("off" or n < 4; "on" or n > 3)
2019-06-04 00:56:00 -04:00
Vanessa Dannenberg f33636d473 move wall lamp and torch models to the correct dir 2019-06-03 07:17:12 -04:00
Vanessa Dannenberg cbb41f7d98 give most doors more meaningful, distinct node names
to avoid confusion

doors:wood_glass_{oak,white,mahogany}_{a,b} --> doors:homedecor_french_{oak,white,mahogany}_{a,b}
doors:woodglass2_{a,b}                      --> doors:homedecor_carolina_{a,b}
doors:bedroom_{a,b}                         --> doors:homedecor_basic_panel_{a,b}

All others:
doors:$foo_{a,b}                            --> doors:homedecor_$foo_{a,b}
2019-06-03 03:42:06 -04:00
Vanessa Dannenberg c98ec41ba7 move some images to the right places :P 2019-06-02 08:24:13 -04:00
Vanessa Dannenberg 84c3933fd4 fix wrong textures on a couple of lamps 2019-06-02 03:16:00 -04:00
Vanessa Dannenberg 968cdfd549 rope lights are not dimmable 2019-06-02 03:13:46 -04:00
Vanessa Dannenberg c457874d03 fix bad not-in-creative-inventory flags on wall lamp and plasma ball 2019-06-02 02:51:41 -04:00
Vanessa Dannenberg 67acbd6d59 fix not being able to right-click table and standing lamps 2019-06-02 02:47:46 -04:00
Vanessa Dannenberg fdb37bdaf5 fix wrong colorization table usage in table, standing, and desk lamps 2019-06-02 02:45:01 -04:00
Vanessa Dannenberg ab8bf5586f move "medieval" wall lamp and torch to homedecor_lighting
make them mesecon/digiline controllable (on/off only, alldir rules)

also fix a couple of old texture references
2019-06-02 02:37:02 -04:00
Vanessa Dannenberg 2f3c12eb2a rename and move generic light source textures 2019-06-02 02:23:10 -04:00
Vanessa Dannenberg 4174737a1a make most presently non-dimmable lights dimmable
merge table and standing lamps into the new code

of all the relevant lights, the plasma ball is the only one that remains
on/off-only, since dimmable doesn't make sense there.

That one, and any future lights that get the on/off-only treatment, will
use the previous on/off behavior, i.e. turn off with the messages "off"
or "low" or a number < 4, and turn on with "med", "hi", "max", "on" or
a number > 3

This alters the behavior of table/standing lamps - they will no longer
cycle brightnesses by right-click.  Like all other controllable lights,
they'll just toggle on/off.  If there's enough demand for it, I'll add
that feature back in at a later date.
2019-06-02 02:11:15 -04:00
Vanessa Dannenberg 11771e12cb allow numeric messages for dimmable lamps
allow non-dimmables to respond to "off", "low", "med", "hi", "max", "on"

number messages for dimmables:
0 turns the light off
1-3 sets it to "low"
4-7 sets it to "med"
8-11 sets it to "hi"
12+ sets it to "max" (i.e. full-on)

non-dimmables:
a number > 3 or the strings "med", "hi", "max", or "on" turn the light on
a number < 4 or the strings "off" and "low" turn the light off
2019-06-01 23:13:02 -04:00
Vanessa Dannenberg b3337921a1 fix crash (bad variable ref) 2019-05-31 08:00:46 -04:00
Vanessa Dannenberg 301ae2ee1d Rearrange mesecons, diglines, dimmable functions and related, tweak
digiline stuff to be more generic, and add various digilines connections
rules to complement mesecons rules.

Mesecons must be present to get the "wallmounted" rules for digilines nodes.
Without mesecons, nodes that want wall rules will get alldir rules instead.

Add mesecons support to table and standing lamps (off -> max -> off).

Add digilines support to all other lights that now support mesecons,
except rope lights, since they're a mesecon conductor.

(will approach that last one later)
2019-05-29 22:01:27 -04:00
Vanessa Dannenberg 9b77ba1c28 move door 3d models to "3d extras" mod
by extension, require its presence to cause doors to be 3d

for consistency with the appearance/style of mtg doors in worlds that
wouldn't normally use the 3d extras mod

minor rework of closet door textures to make them work decently in both modes
2019-05-28 07:59:23 -04:00
Vanessa Dannenberg bb1a2c9314 follow proper naming conventions (or at least, make it better than it was :P ) 2019-05-28 06:38:18 -04:00
Vanessa Dannenberg 6181f9c400 3d-ify default doors and trapdoors 2019-05-28 06:26:50 -04:00
Vanessa Dannenberg c13c3a1c8c make sure doors component works without mesecons :P 2019-05-27 05:09:42 -04:00
Vanessa Dannenberg a129cf177f fix broken door recipes
also got rid of some old dirt+coal+door recipes
2019-05-27 03:09:48 -04:00
Vanessa Dannenberg 7be5e15263 use custom models for most doors
all are derived from homedecor's pre-mtg-doors models, with minimal changes,
so doors should look virtually identical to what they used to.

uses the old clone_node() technique to force-dereference the door defs

reworked a few textures for quality and to fix stuff I broke but didn't
notice right away, pulling from pre-mtg-doors when needed.

also fixes the broken alpha on doors that use it.
2019-05-27 02:41:20 -04:00
Vanessa Dannenberg 0f2c4f94de fix missing rules for gates 2019-05-26 22:13:15 -04:00
Vanessa Dannenberg c28df63aae add mesecons support to doors 2019-05-26 21:52:42 -04:00
Vanessa Dannenberg e767b08011 add missing alias 2019-05-26 20:11:50 -04:00
Vanessa Dannenberg c645964dd5 Refactor tables and seating
move lrfurn tables to homedecor_tables

create new mod: homedecor_seating

move lrfurn chair, sofas, and all types of homedecor
chairs, benches, etc. that I could think of,
whether intended for exterior or interior use,
to that new mod.

(except tree swing :P )

lrfurn was left empty after this, so deleted.
2019-05-26 20:02:29 -04:00
Vanessa Dannenberg 603eeba810 make table- and standing lamps respond to diglines messages
"off", "low", "med", "hi", "max".  Any other message is ignored

shift-punch to set the digiline channel

only connects from X/Z directions

right-click still cycles brightness as before

also adds protection check for right-click brightness changing
2019-05-26 19:05:11 -04:00
Vanessa Dannenberg 960f4c4200 fix bad player ref (sneder -> clicker) 2019-05-26 17:13:32 -04:00
Sys Quatre 5c6a994698 Merge branch 'nalc-1.2' of yunohost:nalc/homedecor_modpack into nalc-1.2 2019-05-26 19:11:29 +02:00
Sys Quatre 1eec6e3615 Merge branch 'master' into nalc-1.2 2019-05-26 19:07:00 +02:00
Vanessa Dannenberg 7cdfc3b49c move wall switch up a bit (almost centered now) 2019-05-26 02:17:21 -04:00
Vanessa Dannenberg bf7e47342f remove "on" switch from creative inv
add proper "receiver" group
remove color from switch buttons
2019-05-26 01:59:14 -04:00
Vanessa Dannenberg b85278fbaa make wall switch work (mesecons) 2019-05-26 01:33:22 -04:00
Vanessa Dannenberg cacf04e2d1 Add mesecons support for the rest of the other relevant lights
Each light connects only according to what sides make sense.

For example:

* a plasma lamp cube or large lattice lamp will connect from all 6 sides
* a ground lantern will only connect from its NSEW sides, not its top or
  bottom
* a glowlight slab, glowlight cube, or lattice cube uses the same rules as
  mesecons lamps, so its four edges and it back/bottom, whatever its
  orientation, but not its top/front.
* a (kitchen) ceiling lamp, and a (hanging, exterior) ceiling lantern will
  only connect from the top.

Rope lights are defined as a conductor, just like a mesecons wire,
so if mesecons is present, they will default to off unless powered by
a mesecons wire/switch/etc.

You can still right-click-toggle individual segments on/off.

Ceiling rope light connection rules are a little funky, but they work
(I wanted them to only connect from the top, but I couldn't get it
just right).  Floor-orientation connections are straightforward.
2019-05-26 00:44:37 -04:00
Vanessa Dannenberg 07141bff47 fill-out mesecons support for first few lights,
also removed debug prints

Lights are forced-on when placed, and remain so
until they receive a mesecons "off" signal.

Lights can be toggled on/off independent of the
mesecon signal state by right click, which will
persist until the next signal transition,
which will change the light to follow.
2019-05-25 22:51:49 -04:00
Vanessa Dannenberg 542f688c09 fix global warnings 2019-05-25 21:46:08 -04:00
Vanessa Dannenberg fee09943e3 mesecons support, wip 2019-05-25 21:35:38 -04:00
Vanessa Dannenberg bed4d1e6f8 make table- and standing-lamps return "hi"
brightness version, instead of "off".  do
the same for their crafts.
2019-05-25 20:59:19 -04:00
Vanessa Dannenberg 798ff29b0a add drops 2019-05-25 20:50:30 -04:00
Vanessa Dannenberg 7491fd4aa8 Allow most light sources to be toggled on/off
with right-click.

Rework glowlight slab and cube textures, simplify,
use overlays and compositing, so that the bulk
of the light can switch between a dark, matte surface,
and a bright surface with central glare gradient, and
so that the surface and eging respond to param2 color.

Tweak all other relevant nodes so that their light
source changes to a darkened (or even translucent
texture) when off.

On/off switching doesn't affect things like oil lamps,
candles, chandeliers, etc.  Just basically the stuff
that would be electric-powered in real life.

If in a protected area, only that area's owner can
turn the light on/off.
2019-05-25 19:35:14 -04:00
Sys Quatre 0753606eb0 Merge branch 'master' into nalc-1.2 2019-05-25 15:36:01 +02:00
Vanessa Dannenberg 7ab149275b Add "rope" lighting 2019-05-25 02:34:50 -04:00