diff options
| author | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2019-05-25 04:52:36 -0400 |
|---|---|---|
| committer | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2019-05-25 04:52:36 -0400 |
| commit | 9e49bc6167e9ee9900fdd205026c3143687ed33e (patch) | |
| tree | c2b654b41901b02d6ac6b510ac1166f64e16311c | |
| parent | 952f9f2b2897668224f580b45fd1634254a4d159 (diff) | |
| download | dreambuilder_modpack-9e49bc6167e9ee9900fdd205026c3143687ed33e.tar dreambuilder_modpack-9e49bc6167e9ee9900fdd205026c3143687ed33e.tar.gz dreambuilder_modpack-9e49bc6167e9ee9900fdd205026c3143687ed33e.tar.bz2 dreambuilder_modpack-9e49bc6167e9ee9900fdd205026c3143687ed33e.tar.xz dreambuilder_modpack-9e49bc6167e9ee9900fdd205026c3143687ed33e.zip | |
update homedecor, basic_materials, led_marquee, signs_lib, unifieddyes
removed the inspector mod
268 files changed, 574 insertions, 597 deletions
diff --git a/basic_materials/electrical-electronic.lua b/basic_materials/electrical-electronic.lua index 065b921..4802bbc 100644 --- a/basic_materials/electrical-electronic.lua +++ b/basic_materials/electrical-electronic.lua @@ -46,10 +46,14 @@ minetest.register_craft( { minetest.register_craft( { output = "basic_materials:motor 2", recipe = { - { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, - { "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" } + { "default:mese_crystal_fragment", "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, + { "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:mese_crystal_fragment", "basic_materials:copper_wire", "basic_materials:plastic_sheet" } }, + replacements = { + { "basic_materials:copper_wire", "basic_materials:empty_spool" }, + { "basic_materials:copper_wire", "basic_materials:empty_spool" }, + } }) minetest.register_craft( { diff --git a/homedecor_bathroom/depends.txt b/homedecor_bathroom/depends.txt index 8cb6cfd..e778f7d 100644 --- a/homedecor_bathroom/depends.txt +++ b/homedecor_bathroom/depends.txt @@ -3,3 +3,5 @@ default basic_materials unifieddyes building_blocks +bucket? +homedecor_fences? diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 0811b70..a043d89 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -347,7 +347,10 @@ homedecor.register("shower_head", { on_rotate = screwdriver.disallow, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-2.0, z=pos.z}) - if below and below.name == "homedecor:shower_tray" then + if below and ( + below.name == "homedecor:shower_tray" or + below.name == "homedecor:bathtub_clawfoot_brass_taps" or + below.name == "homedecor:bathtub_clawfoot_chrome_taps" ) then local particledef = { outlet = { x = 0, y = -0.42, z = 0.1 }, velocity_x = { min = -0.15, max = 0.15 }, @@ -364,6 +367,27 @@ homedecor.register("shower_head", { end }) +local tub_sbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 1.5, 0.3125, 0.5 }, +} + +local tub_cbox = { + type = "fixed", + fixed = { + {-0.4375, -0.0625, -0.5, 1.4375, 0.5, -0.4375}, -- NodeBox1 + {-0.4375, -0.0625, 0.4375, 1.4375, 0.5, 0.5}, -- NodeBox2 + {-0.5, 0.1875, -0.4375, -0.4375, 0.5, 0.4375}, -- NodeBox3 + {1.4375, -0.0625, -0.4375, 1.5, 0.5, 0.4375}, -- NodeBox4 + {-0.3125, -0.3125, -0.4375, -0.125, -0.0625, 0.4375}, -- NodeBox5 + {1.375, -0.3125, -0.4375, 1.4375, -0.0625, 0.4375}, -- NodeBox6 + {-0.125, -0.3125, 0.375, 1.375, -0.0625, 0.4375}, -- NodeBox7 + {-0.125, -0.3125, -0.4375, 1.375, -0.0625, -0.375}, -- NodeBox8 + {-0.125, -0.5, -0.375, 1.375, -0.3125, 0.375}, -- NodeBox9 + {-0.4375, -0.0625, -0.4375, -0.3125, 0.1875, 0.4375}, -- NodeBox10 + } +} + homedecor.register("bathtub_clawfoot_brass_taps", { drawtype = "mesh", mesh = "homedecor_bathtub_clawfoot.obj", @@ -377,10 +401,8 @@ homedecor.register("bathtub_clawfoot_brass_taps", { }, description = S("Bathtub, clawfoot, with brass taps"), groups = {cracky=3}, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 1.5, 0.3125, 0.5 }, - }, + selection_box = tub_sbox, + node_box = tub_cbox, sounds = default.node_sound_stone_defaults(), }) @@ -397,10 +419,8 @@ homedecor.register("bathtub_clawfoot_chrome_taps", { }, description = S("Bathtub, clawfoot, with chrome taps"), groups = {cracky=3}, - selection_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 1.5, 0.3125, 0.5 }, - }, + selection_box = tub_sbox, + node_box = tub_cbox, sounds = default.node_sound_stone_defaults(), }) @@ -531,8 +551,8 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:bathroom_tiles_light 4", recipe = { - { "group:marble", "group:marble", "" }, - { "group:marble", "group:marble", "dye:white" } + { "group:marble", "group:marble" }, + { "group:marble", "group:marble" } }, }) @@ -593,3 +613,67 @@ minetest.register_craft({ { "group:stick", "basic_materials:plastic_sheet", "group:stick" } }, }) + +minetest.register_craft({ + output = "homedecor:toilet", + recipe = { + { "","","bucket:bucket_water"}, + { "group:marble","group:marble", "group:marble" }, + { "", "bucket:bucket_empty", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:sink", + recipe = { + { "group:marble","bucket:bucket_empty", "group:marble" }, + { "", "group:marble", "" } + }, +}) + +minetest.register_craft({ + output = "homedecor:taps", + recipe = { + { "default:steel_ingot","bucket:bucket_water", "default:steel_ingot" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:taps_brass", + recipe = { + { "basic_materials:brass_ingot","bucket:bucket_water", "basic_materials:brass_ingot" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:shower_tray", + recipe = { + { "group:marble","bucket:bucket_empty", "group:marble" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:shower_head", + recipe = { + {"default:steel_ingot", "bucket:bucket_water"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:bathtub_clawfoot_brass_taps", + recipe = { + { "homedecor:taps_brass", "", "" }, + { "group:marble", "", "group:marble" }, + { "default:steel_ingot", "group:marble", "default:steel_ingot"}, + }, +}) + +minetest.register_craft({ + output = "homedecor:bathtub_clawfoot_chrome_taps", + recipe = { + { "homedecor:taps", "", "" }, + { "group:marble", "", "group:marble" }, + {"default:steel_ingot", "group:marble", "default:steel_ingot"}, + }, +}) + diff --git a/homedecor_climate_control/init.lua b/homedecor_climate_control/init.lua index 5524f26..bddf858 100644 --- a/homedecor_climate_control/init.lua +++ b/homedecor_climate_control/init.lua @@ -143,7 +143,19 @@ homedecor.register("radiator", { }) -- crafting +minetest.register_craftitem(":homedecor:fan_blades", { + description = S("Fan blades"), + inventory_image = "homedecor_fan_blades.png" +}) +minetest.register_craft( { + output = "homedecor:fan_blades 2", + recipe = { + { "", "basic_materials:plastic_sheet", "" }, + { "", "default:steel_ingot", "" }, + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" } + }, +}) minetest.register_craft({ output = "homedecor:air_conditioner", diff --git a/homedecor_climate_control/textures/homedecor_fan_blades.png b/homedecor_climate_control/textures/homedecor_fan_blades.png Binary files differnew file mode 100644 index 0000000..efb9f7c --- /dev/null +++ b/homedecor_climate_control/textures/homedecor_fan_blades.png diff --git a/homedecor_doors_and_gates/depends.txt b/homedecor_doors_and_gates/depends.txt index b93a08f..c897dba 100644 --- a/homedecor_doors_and_gates/depends.txt +++ b/homedecor_doors_and_gates/depends.txt @@ -1,4 +1,5 @@ homedecor_common +homedecor_misc? default basic_materials dye diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 1435cbe..effc695 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -2,293 +2,139 @@ local S = homedecor.gettext -local function N_(x) return x end +-- new doors using minetest_game doors API -local m_rules -if minetest.global_exists("mesecon") then - m_rules = mesecon and mesecon.rules and mesecon.rules.pplate -end - --- doors - -local function isSolid(pos, adjust) - local adj = {x = adjust[1], y = adjust[2], z = adjust[3]} - local node = minetest.get_node(vector.add(pos,adj)) - if node then - local idef = minetest.registered_nodes[minetest.get_node(vector.add(pos,adj)).name] - if idef then - return idef.walkable - end - end - return false -end - -local function countSolids(pos,node,level) - local solids = 0 - for x = -1, 1 do - for z = -1, 1 do - local y = (node.param2 == 5) and -level or level - -- special cases when x == z == 0 - if x == 0 and z == 0 then - if level == 1 then - -- when looking past the trap door, cannot be solid in center - if isSolid(pos,{x,y,z}) then - return false - end - -- no else. it doesn't matter if x == y == z is solid, that's us. - end - elseif isSolid(pos,{x,y,z}) then - solids = solids + 1 - end - end - end - return solids -end - -local function calculateClosed(pos) - local node = minetest.get_node(pos) - -- the door is considered closed if it is closing off something. - - local direction = node.param2 % 6 - local isTrap = direction == 0 or direction == 5 - if isTrap then - -- the trap door is considered closed when all nodes on its sides are solid - -- or all nodes in the 3x3 above/below it are solid except the center - for level = 0, 1 do - local solids = countSolids(pos,node,level) - if solids == 8 then - return true - end - end - return false - else - -- the door is considered closed when the nodes on its sides are solid - -- or the 3 nodes in its facing direction are solid nonsolid solid - -- if the door has two levels (i.e. not a gate) then this must - -- be true for the top node as well. - - -- sorry I dunno the math to figure whether to x or z - if direction == 1 or direction == 2 then - if isSolid(pos,{0,0,-1}) and isSolid(pos,{0,0,1}) then - if string.find(node.name,'_bottom_') then - return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) - else - return true - end - end - local x = (direction == 1) and 1 or -1 - if isSolid(pos,{x,0,-1}) and not isSolid(pos,{x,0,0}) and isSolid(pos,{x,0,1}) then - if string.find(node.name,'_bottom_') then - return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) - else - return true - end - end - return false - else - -- direction == 3 or 4 - if isSolid(pos,{-1,0,0}) and isSolid(pos,{1,0,0}) then - if string.find(node.name,'_bottom_') then - return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) - else - return true - end - end - local z = (direction == 3) and 1 or -1 - if isSolid(pos,{-1,0,z}) and not isSolid(pos,{0,0,z}) and isSolid(pos,{1,0,z}) then - if string.find(node.name,'_bottom_') then - return calculateClosed({x=pos.x,y=pos.y+1,z=pos.z}) - else - return true - end - end - return false - end - end -end - --- isClosed flag, is 0 or 1 0 = open, 1 = closed -local function getClosed(pos) - local isClosed = minetest.get_meta(pos):get_string('closed') - if isClosed=='' then - return calculateClosed(pos) - else - isClosed = tonumber(isClosed) - -- may be closed or open (1 or 0) - return isClosed == 1 - end -end - -local function addDoorNode(pos,def,isClosed) - minetest.set_node(pos, def) - minetest.get_meta(pos):set_int('closed', isClosed and 1 or 0) -end - -local door_model_list = { - { name = "closet_mahogany", - description = N_("Mahogany Closet Door (@1 opening)"), - mesh = "homedecor_door_closet.obj" - }, - - { name = "closet_oak", - description = N_("Oak Closet Door (@1 opening)"), - mesh = "homedecor_door_closet.obj" +local door_list = { + { name = "wood_plain", + description = "Plain Wooden Door", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + open = "homedecor_door_open", + close = "homedecor_door_close", + } }, { name = "exterior_fancy", - description = N_("Fancy Wood/Glass Door (@1 opening)"), - mesh = "homedecor_door_fancy.obj", - tiles = { - "homedecor_door_exterior_fancy.png", - "homedecor_door_exterior_fancy_insert.png" + description = "Fancy Wood/Glass Door", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + open = "homedecor_door_open", + close = "homedecor_door_close", }, - usealpha = true + backface = true, + alpha = true }, { name = "wood_glass_oak", - description = N_("Glass and Wood, Oak-colored (@1 opening)"), - mesh = "homedecor_door_wood_glass.obj", - tiles = { - "homedecor_door_wood_glass_oak.png", - "homedecor_door_wood_glass_insert.png", - } + description = "Glass and Wood, Oak-colored", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_glass_defaults(), + }, }, { name = "wood_glass_mahogany", - description = N_("Glass and Wood, Mahogany-colored (@1 opening)"), - mesh = "homedecor_door_wood_glass.obj", - tiles = { - "homedecor_door_wood_glass_mahogany.png", - "homedecor_door_wood_glass_insert.png", - } + description = "Glass and Wood, Mahogany-colored", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_glass_defaults(), + }, }, { name = "wood_glass_white", - description = N_("Glass and Wood, White (@1 opening)"), - mesh = "homedecor_door_wood_glass.obj", - tiles = { - "homedecor_door_wood_glass_white.png", - "homedecor_door_wood_glass_insert.png", - } - }, - - { name = "wood_plain", - description = N_("Plain Wooden Door (@1 opening)"), - mesh = "homedecor_door_plain.obj" + description = "Glass and Wood, White", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_glass_defaults(), + }, }, { name = "bedroom", - description = N_("White Bedroom Door (@1 opening)"), - mesh = "homedecor_door_plain.obj" + description = "White Bedroom Door", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + open = "homedecor_door_open", + close = "homedecor_door_close", + } }, { name = "wrought_iron", - description = N_("Wrought Iron Gate/Door (@1 opening)"), - mesh = "homedecor_door_wrought_iron.obj" + description = "Wrought Iron Gate/Door", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_metal_defaults(), + open = "doors_steel_door_open", + close = "doors_steel_door_close", + }, + backface = true, }, { name = "woodglass", - description = N_("Wooden door with glass insert (@1 opening)"), - mesh = "homedecor_door_woodglass_typea.obj", - tiles = { - "homedecor_door_woodglass_typea.png", - "homedecor_door_woodglass_typea_insert.png", + description = "Wooden door with glass insert", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + open = "homedecor_door_open", + close = "homedecor_door_close", }, - usealpha = true + backface = true, + alpha = true }, { name = "woodglass2", - description = N_("Wooden door with glass insert, type 2 (@1 opening)"), - mesh = "homedecor_door_plain.obj", - usealpha = true + description = "Wooden door with glass insert, type 2", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + open = "homedecor_door_open", + close = "homedecor_door_close", + }, + backface = true, + alpha = true }, -} - -local def_selbox = { - type = "fixed", - fixed = { -0.5, -0.5, 0.375, 0.5, 1.5, 0.5 } -} - -local sides = { N_("left"), N_("right") } - -for i, side in ipairs(sides) do - - for _, door_model in ipairs(door_model_list) do - - local doorname = door_model.name - local selbox = door_model.selectbox or def_selbox - local colbox = door_model.collisionbox or door_model.selectbox or def_selbox - local mesh = door_model.mesh - local groups = {snappy = 3} + { name = "closet_mahogany", + description = "Mahogany Closet Door", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + } + }, - if side == "right" then - mesh = string.gsub(door_model.mesh, ".obj", "_right.obj") - groups = {snappy = 3, not_in_creative_inventory = 1} - end + { name = "closet_oak", + description = "Oak Closet Door", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + sounds = { + main = default.node_sound_wood_defaults(), + } + }, +} - minetest.register_node(":homedecor:door_"..doorname.."_"..side, { - description = S(door_model.description, S(side)), - drawtype = "mesh", - mesh = mesh, - tiles = door_model.tiles or { "homedecor_door_"..doorname..".png" }, - inventory_image = "homedecor_door_"..doorname.."_inv.png", - wield_image = "homedecor_door_"..doorname.."_inv.png", - paramtype = "light", - paramtype2 = "facedir", - groups = groups, - sounds = default.node_sound_wood_defaults(), - use_texture_alpha = door_model.usealpha, - selection_box = selbox, - collision_box = colbox, - on_rotate = screwdriver.rotate_simple, - on_place = function(itemstack, placer, pointed_thing) - return homedecor.stack_wing(itemstack, placer, pointed_thing, - "homedecor:door_"..doorname.."_left", "air", - "homedecor:door_"..doorname.."_right", "air") - end, - on_construct = function(pos) - minetest.get_meta(pos):set_int("closed", 1) - end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - homedecor.flip_door(pos, node, clicker, doorname, side) - return itemstack - end, - -- both left and right doors may be used for open or closed doors - -- so they have to have both action_on and action_off and just - -- check when that action is invoked if to continue - - on_punch = function(pos, node, puncher) - minetest.get_meta(pos):set_string('closed',nil) - end, - drop = "homedecor:door_"..doorname.."_left", - mesecons = { - effector = { - rules = m_rules, - action_on = function(pos,node) - local isClosed = getClosed(pos) - if isClosed then - homedecor.flip_door(pos,node,nil,doorname,side,isClosed) - end - end, - action_off = function(pos,node) - local isClosed = getClosed(pos) - if not isClosed then - homedecor.flip_door(pos,node,nil,doorname,side,isClosed) - end - end - } - } +local old_doors = {} + +for _, door in ipairs(door_list) do + doors.register(door.name, { + tiles = {{ name = "homedecor_door_"..door.name..".png", backface_culling = door.backface }}, + description = door.description, + inventory_image = "homedecor_door_"..door.name.."_inv.png", + groups = table.copy(door.groups), + sounds = door.sounds.main, + sound_open = door.sounds.open, + sound_close = door.sounds.close + }) + if door.alpha then + minetest.override_item("doors:"..door.name.."_a", { + use_texture_apha = true }) - - minetest.register_alias("homedecor:door_"..doorname.."_top_"..side, "air") - minetest.register_alias("homedecor:door_"..doorname.."_bottom_"..side, "homedecor:door_"..doorname.."_"..side) - - end - - minetest.register_alias("homedecor:door_wood_glass_top_"..side, "air") - minetest.register_alias("homedecor:door_wood_glass_bottom_"..side, "homedecor:door_wood_glass_oak_"..side) - + minetest.override_item("doors:"..door.name.."_b", { + use_texture_apha = true + }) + end + old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_left" + old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_right" end -- Gates @@ -451,55 +297,10 @@ minetest.register_alias("homedecor:fence_picket_gate_closed", "homedecor:g minetest.register_alias("homedecor:fence_picket_gate_white_open", "homedecor:gate_picket_white_open") minetest.register_alias("homedecor:fence_picket_gate_white_closed", "homedecor:gate_picket_white_closed") --- to open a door, you switch left for right and subtract from param2, or vice versa right for left --- that is to say open "right" doors become left door nodes, and open left doors right door nodes. --- also adjusting param2 so the node is at 90 degrees. - -function homedecor.flip_door(pos, node, player, name, side, isClosed) - if isClosed == nil then - isClosed = getClosed(pos) - end - -- this is where we swap the isClosed status! - -- i.e. if isClosed, we're adding an open door - -- and if not isClosed, a closed door - isClosed = not isClosed - - local rside - local nfdir - local ofdir = node.param2 or 0 - if side == "left" then - rside = "right" - nfdir=ofdir - 1 - if nfdir < 0 then nfdir = 3 end - else - rside = "left" - nfdir=ofdir + 1 - if nfdir > 3 then nfdir = 0 end - end - local sound = isClosed and 'close' or 'open' - minetest.sound_play("homedecor_door_"..sound, { - pos=pos, - max_hear_distance = 5, - gain = 2, - }) - -- XXX: does the top half have to remember open/closed too? - minetest.set_node({x=pos.x, y=pos.y+1, z=pos.z}, { name = "homedecor:door_"..name.."_top_"..rside, param2=nfdir}) - - addDoorNode(pos,{ name = "homedecor:door_"..name.."_bottom_"..rside, param2=nfdir },isClosed) -end - function homedecor.flip_gate(pos, node, player, gate, oc) - local isClosed = getClosed(pos); - minetest.sound_play("homedecor_gate_open_close", { - pos=pos, - max_hear_distance = 5, - gain = 2, - }) - local fdir = node.param2 or 0 - -- since right facing gates use "open" nodes for closed, we need an - -- isClosed flag to tell if it's "really" closed. + local fdir = node.param2 or 0 local gateresult if oc == "closed" then @@ -508,12 +309,14 @@ function homedecor.flip_gate(pos, node, player, gate, oc) gateresult = "homedecor:gate_"..gate.."_closed" end - local def = {name=gateresult, param2=fdir} - - addDoorNode(pos, def, isClosed) + minetest.set_node(pos, {name = gateresult, param2 = fdir}) + minetest.sound_play("homedecor_gate_open_close", { + pos=pos, + max_hear_distance = 5, + gain = 2, + }) -- the following opens and closes gates below and above in sync with this one - -- (without three gate open/close sounds) local above = {x=pos.x, y=pos.y+1, z=pos.z} local below = {x=pos.x, y=pos.y-1, z=pos.z} @@ -521,69 +324,15 @@ function homedecor.flip_gate(pos, node, player, gate, oc) local nodebelow = minetest.get_node(below) if string.find(nodeabove.name, "homedecor:gate_"..gate) then - addDoorNode(above, def, isClosed) + minetest.set_node(above, {name = gateresult, param2 = fdir}) end if string.find(nodebelow.name, "homedecor:gate_"..gate) then - addDoorNode(below, def, isClosed) + minetest.set_node(below, {name = gateresult, param2 = fdir}) end end --- Japanese-style wood/paper wall pieces and door - -local jp_cbox = { - type = "fixed", - fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, -} - -minetest.register_node(":homedecor:japanese_wall_top", { - description = S("Japanese wall (top)"), - drawtype = "mesh", - mesh = "homedecor_wall_japanese_top.obj", - tiles = { - homedecor.lux_wood, - "homedecor_japanese_paper.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = jp_cbox, - collision_box = jp_cbox, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_node(":homedecor:japanese_wall_middle", { - description = S("Japanese wall"), - drawtype = "mesh", - mesh = "homedecor_wall_japanese_middle.obj", - tiles = { - homedecor.lux_wood, - "homedecor_japanese_paper.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = jp_cbox, - collision_box = jp_cbox, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_node(":homedecor:japanese_wall_bottom", { - description = S("Japanese wall (bottom)"), - drawtype = "mesh", - mesh = "homedecor_wall_japanese_bottom.obj", - tiles = { - homedecor.lux_wood, - "homedecor_japanese_paper.png" - }, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = jp_cbox, - collision_box = jp_cbox, - sounds = default.node_sound_wood_defaults(), -}) - +-- Japanese-style wood/paper door homedecor.register("door_japanese_closed", { description = S("Japanese-style door"), inventory_image = "homedecor_door_japanese_inv.png", @@ -636,6 +385,44 @@ homedecor.register("door_japanese_open", { -- crafting +-- half-doors + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_closed 4", + recipe = { + "homedecor:door_wood_plain_left", + "homedecor:door_wood_plain_left" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_closed 4", + recipe = { + "homedecor:door_wood_plain_right", + "homedecor:door_wood_plain_right" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_white_closed 4", + recipe = { + "homedecor:door_bedroom_left", + "homedecor:door_bedroom_left" + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "homedecor:gate_half_door_white_closed 4", + recipe = { + "homedecor:door_bedroom_right", + "homedecor:door_bedroom_right" + }, +}) + -- Gates minetest.register_craft( { @@ -882,3 +669,25 @@ minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japane minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b") minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a") + +-- flip old homedecor doors around, since they use minetest_game doors API now + +minetest.register_lbm({ + name = ":homedecor:convert_doors", + label = "Convert Homedecor doors to mtg doors API", + nodenames = old_doors, + run_at_every_load = false, + action = function(pos, node) + -- old doors param2: N=0, E=1, S=2, W=3 + local newparam2 = (node.param2 + 2) % 4 + local e = string.find(node.name, "_", -7) + local dir = string.sub(node.name, e+1) + local newname = "doors:"..string.sub(node.name, 16, e-1) + if dir == "right" then + minetest.set_node(pos, {name = newname.."_a", param2 = newparam2 }) + else + minetest.set_node(pos, {name = newname.."_b", param2 = newparam2 }) + end + minetest.set_node({x=pos.x, y=pos.y+1, z=pos.z}, {name = "doors:hidden"}) + end +}) diff --git a/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png b/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png Binary files differindex f94875f..b2614b0 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_bedroom.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png Binary files differindex e2f51f7..4f696d4 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_closet_mahogany.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png Binary files differindex 9355e85..53fd556 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_closet_oak.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png Binary files differindex 9f89482..b4a70ba 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png Binary files differdeleted file mode 100644 index ddc5d22..0000000 --- a/homedecor_doors_and_gates/textures/homedecor_door_exterior_fancy_insert.png +++ /dev/null diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png Binary files differdeleted file mode 100644 index 892f306..0000000 --- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_insert.png +++ /dev/null diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png Binary files differindex ca0ca15..b61fa6d 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_mahogany.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png Binary files differindex 0f08771..b1a5254 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_oak.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png Binary files differindex 202e600..85b645e 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_glass_white.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png Binary files differindex 6b12552..574d6fb 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_wood_plain.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_woodglass.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass.png Binary files differnew file mode 100644 index 0000000..b3187ff --- /dev/null +++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png Binary files differindex ee8ca2b..7dc3918 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_woodglass2.png diff --git a/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png Binary files differdeleted file mode 100644 index 2d5902a..0000000 --- a/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea.png +++ /dev/null diff --git a/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png b/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png Binary files differdeleted file mode 100644 index 12fb2c6..0000000 --- a/homedecor_doors_and_gates/textures/homedecor_door_woodglass_typea_insert.png +++ /dev/null diff --git a/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png Binary files differindex e39b46a..c2034c3 100644 --- a/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png +++ b/homedecor_doors_and_gates/textures/homedecor_door_wrought_iron.png diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 56cc9c7..905fecc 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -425,13 +425,12 @@ minetest.register_craft({ } }) - minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, - { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } + { "basic_materials:ic", "building_blocks:slab_grate_1", "default:steel_ingot", }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) @@ -518,6 +517,15 @@ minetest.register_craft( { }) minetest.register_craft( { + output = "homedecor:kitchen_faucet", + recipe = { + { "default:steel_ingot","" }, + { "", "default:steel_ingot" }, + { "", "homedecor:taps" } + }, +}) + +minetest.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index 53cd52c..3650ec8 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -836,6 +836,64 @@ minetest.register_node(":homedecor:chandelier_brass", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node(":homedecor:rope_light_on_floor", { + description = "Rope lighting (on floor)", + inventory_image = "homedecor_rope_light_on_floor.png", + paramtype = "light", + light_source = default.LIGHT_MAX-3, + walkable = false, + sunlight_propagates = true, + tiles = { "homedecor_table_standing_lamp_lightbulb.png" }, + drawtype = "nodebox", + node_box = { + type = "connected", + fixed = {}, + connect_front = { -1/16, -8/16, -8/16, 1/16, -6/16, 1/16 }, + connect_left = { -8/16, -8/16, -1/16, 1/16, -6/16, 1/16 }, + connect_back = { -1/16, -8/16, -1/16, 1/16, -6/16, 8/16 }, + connect_right = { -1/16, -8/16, -1/16, 8/16, -6/16, 1/16 }, + disconnected_sides = { + { -6/16, -8/16, -6/16, -4/16, -6/16, 6/16 }, + { 4/16, -8/16, -6/16, 6/16, -6/16, 6/16 }, + { -6/16, -8/16, -6/16, 6/16, -6/16, -4/16 }, + { -6/16, -8/16, 4/16, 6/16, -6/16, 6/16 } + }, + }, + connects_to = { "homedecor:rope_light_on_floor" }, + mesh = "homedecor_chandelier.obj", + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node(":homedecor:rope_light_on_ceiling", { + description = "Rope lighting (on ceiling)", + inventory_image = "homedecor_rope_light_on_ceiling.png", + paramtype = "light", + light_source = default.LIGHT_MAX-3, + walkable = false, + sunlight_propagates = true, + tiles = { "homedecor_table_standing_lamp_lightbulb.png" }, + drawtype = "nodebox", + node_box = { + type = "connected", + fixed = {}, + connect_front = { -1/16, 8/16, -8/16, 1/16, 6/16, 1/16 }, + connect_left = { -8/16, 8/16, -1/16, 1/16, 6/16, 1/16 }, + connect_back = { -1/16, 8/16, -1/16, 1/16, 6/16, 8/16 }, + connect_right = { -1/16, 8/16, -1/16, 8/16, 6/16, 1/16 }, + disconnected_sides = { + { -6/16, 8/16, -6/16, -4/16, 6/16, 6/16 }, + { 4/16, 8/16, -6/16, 6/16, 6/16, 6/16 }, + { -6/16, 8/16, -6/16, 6/16, 6/16, -4/16 }, + { -6/16, 8/16, 4/16, 6/16, 6/16, 6/16 } + }, + }, + connects_to = { "homedecor:rope_light_on_ceiling" }, + mesh = "homedecor_chandelier.obj", + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + -- crafting minetest.register_craft({ @@ -1188,6 +1246,79 @@ minetest.register_craft({ }, }) +minetest.register_craft({ + output = "homedecor:standing_lamp_off", + recipe = { + {"homedecor:table_lamp_off"}, + {"group:stick"}, + {"group:stick"}, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:standing_lamp_off", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:standing_lamp_off", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "homedecor:table_lamp_off", + burntime = 10, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "wool:white", "default:torch", "wool:white"}, + { "", "group:stick", ""}, + { "", "stairs:slab_wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "cottages:wool", "default:torch", "cottages:wool"}, + { "", "group:stick", ""}, + { "", "stairs:slab_wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "wool:white", "default:torch", "wool:white"}, + { "", "group:stick", ""}, + { "", "moreblocks:slab_wood", "" }, + }, +}) + +minetest.register_craft({ + output = "homedecor:table_lamp_off", + recipe = { + { "cottages:wool", "default:torch", "cottages:wool"}, + { "", "group:stick", ""}, + { "", "moreblocks:slab_wood", "" }, + }, +}) + +unifieddyes.register_color_craft({ + output = "homedecor:table_lamp_off", + palette = "extended", + type = "shapeless", + neutral_node = "homedecor:table_lamp_off", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + -- aliases minetest.register_alias("chains:chain_top", "homedecor:chain_steel_top") diff --git a/homedecor_lighting/textures/homedecor_rope_light_on_ceiling.png b/homedecor_lighting/textures/homedecor_rope_light_on_ceiling.png Binary files differnew file mode 100644 index 0000000..78e6d4b --- /dev/null +++ b/homedecor_lighting/textures/homedecor_rope_light_on_ceiling.png diff --git a/homedecor_lighting/textures/homedecor_rope_light_on_floor.png b/homedecor_lighting/textures/homedecor_rope_light_on_floor.png Binary files differnew file mode 100644 index 0000000..30bd14c --- /dev/null +++ b/homedecor_lighting/textures/homedecor_rope_light_on_floor.png diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index afeee27..95135ae 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -999,3 +999,58 @@ unifieddyes.register_color_craft({ "MAIN_DYE", } }) + +-- Japanese-style wood/paper wall pieces and door + +local jp_cbox = { + type = "fixed", + fixed = {-0.5, -0.5, 0, 0.5, 0.5, 0.0625}, +} + +minetest.register_node(":homedecor:japanese_wall_top", { + description = S("Japanese wall (top)"), + drawtype = "mesh", + mesh = "homedecor_wall_japanese_top.obj", + tiles = { + homedecor.lux_wood, + "homedecor_japanese_paper.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node(":homedecor:japanese_wall_middle", { + description = S("Japanese wall"), + drawtype = "mesh", + mesh = "homedecor_wall_japanese_middle.obj", + tiles = { + homedecor.lux_wood, + "homedecor_japanese_paper.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), +}) + +minetest.register_node(":homedecor:japanese_wall_bottom", { + description = S("Japanese wall (bottom)"), + drawtype = "mesh", + mesh = "homedecor_wall_japanese_bottom.obj", + tiles = { + homedecor.lux_wood, + "homedecor_japanese_paper.png" + }, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = jp_cbox, + collision_box = jp_cbox, + sounds = default.node_sound_wood_defaults(), +}) diff --git a/inspector/depends.txt b/inspector/depends.txt deleted file mode 100644 index b75ab62..0000000 --- a/inspector/depends.txt +++ /dev/null @@ -1 +0,0 @@ -fsc diff --git a/inspector/description.txt b/inspector/description.txt deleted file mode 100644 index a4144f2..0000000 --- a/inspector/description.txt +++ /dev/null @@ -1 +0,0 @@ -An in-game tool to inspect node parameters and metadata. diff --git a/inspector/init.lua b/inspector/init.lua deleted file mode 100644 index 4b4b711..0000000 --- a/inspector/init.lua +++ /dev/null @@ -1,151 +0,0 @@ - ---[[ - -Copyright (C) 2015 - Auke Kok <sofar@foo-projects.org> - -"inspector" is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 -of the license, or (at your option) any later version. - ---]] - -local function make_fs(title, desc) - return "size[12,8]".. - "label[0.2,0.2;"..title.."]".. - "textlist[0.2,1.0;11.5,7;;".. - desc:gsub("\n", ",").."]".. - "button_exit[11.1,0.2;0.8,0.8;close;x]" -end - -local function inspect_pos(pos) - local node = minetest.get_node(pos) - local desc = "===== node data =====\n" - desc = desc .. "name = " .. node.name .. "\n" - desc = desc .. "param1 = " .. node.param1 .. "\n" - desc = desc .. "param2 = " .. node.param2 .. "\n" - local light = minetest.get_node_light({x = pos.x, y = pos.y + 1, z = pos.x}, nil) - if light then - desc = desc .. "light = " .. light .. "\n" - end - - local timer = minetest.get_node_timer(pos) - if timer:get_timeout() ~= 0 then - desc = desc .. "==== node timer ====\n" - desc = desc .. "timeout = " .. timer:get_timeout() .. "\n" - desc = desc .. "elapsed = " .. timer:get_elapsed() .. "\n" - end - - local nodedef = minetest.registered_items[node.name] - local meta = minetest.get_meta(pos) - local table = meta:to_table() - local fields = minetest.serialize(table.fields) - desc = desc .. "==== meta ====\n" - desc = desc .. "meta.fields = " .. fields .. "\n" - desc = desc .. "\n" - local inventory = meta:get_inventory() - desc = desc .. "meta.inventory = \n" - for key, list in pairs(inventory:get_lists()) do - desc = desc .. key .. " : \n" - local size = #list - for i = 1, size do - local stack = list[i] - if not stack:is_empty() then - desc = desc .. "\"" .. stack:get_name() .. "\" - " .. stack:get_count() .. "\n" - end - end - end - - if nodedef then -- Some built in nodes have no nodedef - desc = desc .. "==== nodedef ====\n" - desc = desc .. dump(nodedef) .. "\n" - end - - return desc -end - -minetest.register_tool("inspector:inspector", { - description = "Inspector Tool", - inventory_image = "inspector.png", - liquids_pointable = true, -- makes it hard to use underwater. - - on_use = function(itemstack, user, pointed_thing) - - local desc = "" - if pointed_thing.type == "nothing" then - return - elseif pointed_thing.type == "node" then - local pos = pointed_thing.under - - if pointed_thing.type ~= "node" then - desc = "..." - else - desc = inspect_pos(pos) - end - elseif pointed_thing.type == "object" then - local ref = pointed_thing.ref - local entity = ref:get_luaentity() - desc = dump(entity) - end - - local formspec = "size[12,8]".. - "label[0.5,0.5;Node Information]".. - "textarea[0.5,1.5;11.5,7;text;Contents:;".. - minetest.formspec_escape(desc).."]".. - "button_exit[2.5,7.5;3,1;close;Close]" - - fsc.show(user:get_player_name(), formspec, {}, function() end) - end, - on_place = function(itemstack, user, pointed_thing) - - local desc = "" - if pointed_thing.type == "nothing" then - return - elseif pointed_thing.type == "node" then - local pos = pointed_thing.above - - if pointed_thing.type ~= "node" then - desc = "..." - else - desc = inspect_pos(pos) - end - elseif pointed_thing.type == "object" then - local ref = pointed_thing.ref - local entity = ref:get_luaentity() - desc = dump(entity) - end - - local formspec = "size[12,8]".. - "label[0.5,0.5;Node Information]".. - "textarea[0.5,1.5;11.5,7;text;Contents:;".. - minetest.formspec_escape(desc).."]".. - "button_exit[2.5,7.5;3,1;close;Close]" - - fsc.show(user:get_player_name(), formspec, {}, function() end) - end -}) - -minetest.register_chatcommand("inspect", { - params = "inspect", - description = "inspect a pos", - privs = {server = true}, - func = function(name, param) - local paramlist = {} - for p in string.gmatch(param, "%S+") do - paramlist[#paramlist + 1] = p - end - local pos = {x = paramlist[1], y = paramlist[2], z = paramlist[3]} - if not pos.x or not pos.y or not pos.z then - return false, "Need 3 parameters for X, Y and Z" - end - local desc = inspect_pos(pos) - local formspec = "size[12,8]".. - "label[0.5,0.5;Node Information]".. - "textarea[0.5,1.5;11.5,7;text;Contents:;".. - minetest.formspec_escape(desc).."]".. - "button_exit[2.5,7.5;3,1;close;Close]" - - fsc.show(name, formspec, {}, function() end) - return true - end, -}) diff --git a/inspector/mod.conf b/inspector/mod.conf deleted file mode 100644 index d2898c0..0000000 --- a/inspector/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = inspector -description = An in-game tool to inspect node parameters and metadata. -depends = fsc diff --git a/inspector/screenshot.png b/inspector/screenshot.png Binary files differdeleted file mode 100644 index fc64fb2..0000000 --- a/inspector/screenshot.png +++ /dev/null diff --git a/inspector/textures/inspector.png b/inspector/textures/inspector.png Binary files differdeleted file mode 100644 index 62da6ad..0000000 --- a/inspector/textures/inspector.png +++ /dev/null diff --git a/led_marquee/init.lua b/led_marquee/init.lua index d035f15..8760a11 100644 --- a/led_marquee/init.lua +++ b/led_marquee/init.lua @@ -369,23 +369,17 @@ for i = 31, 255 do local groups = { cracky = 2, not_in_creative_inventory = 1} local light = LIGHT_MAX-2 local description = S("LED marquee panel ("..i..")") - local tiles = { - { name="led_marquee_base.png", color="white"}, - { name="led_marquee_leds_off.png", color="white"}, - "led_marquee_char_"..i..".png", - } + local leds = "led_marquee_char_"..i..".png^[mask:led_marquee_leds_on.png" if i == 31 then - tiles = { - { name="led_marquee_base.png", color="white"}, - { name="led_marquee_leds_off.png", color="white"}, - { - name = "led_marquee_char_31.png", - animation = {type = "vertical_frames", aspect_w = 32, aspect_h = 32, length = 0.75} - } + leds ={ + name = "led_marquee_char_31.png^[mask:led_marquee_leds_on_cursor.png", + animation = {type = "vertical_frames", aspect_w = 32, aspect_h = 32, length = 0.75} } end + local wimage + if i == 32 then groups = {cracky = 2} light = nil @@ -397,7 +391,11 @@ for i = 31, 255 do description = description, drawtype = "mesh", mesh = "led_marquee.obj", - tiles = tiles, + tiles = { + { name = "led_marquee_base.png", color = "white" }, + { name = "led_marquee_leds_off.png", color = "white" } + }, + overlay_tiles = { "", leds }, inventory_image = wimage, wield_image = wimage, palette="led_marquee_palette.png", diff --git a/led_marquee/models/led_marquee.obj b/led_marquee/models/led_marquee.obj index c91fe27..b4c3c76 100644 --- a/led_marquee/models/led_marquee.obj +++ b/led_marquee/models/led_marquee.obj @@ -21,10 +21,6 @@ v -0.500000 -0.453125 0.468750 v -0.500000 -0.453125 -0.468750 v -0.500000 -0.437500 -0.484375 v -0.500000 -0.437500 -0.500000 -v 0.500000 -0.449125 -0.468750 -v -0.500000 -0.449125 -0.468750 -v -0.500000 -0.449125 0.468750 -v 0.500000 -0.449125 0.468750 vt 0.681855 0.961799 vt 0.723891 0.992824 vt 0.723891 0.000000 @@ -69,10 +65,6 @@ vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 vn 1.0000 0.0000 0.0000 vn 0.0000 -1.0000 -0.0000 vn -1.0000 0.0000 0.0000 @@ -106,7 +98,5 @@ f 7/26/8 6/38/8 19/19/8 f 19/19/6 6/38/6 5/20/6 f 15/22/6 10/39/6 9/23/6 f 8/25/7 17/40/7 16/24/7 -g Cube_Cube_LEDs_Cube_Cube_LEDs_leds_off +g Cube_Cube_LEDs_Cube_Cube_LEDs_base_led_marquee_leds_off.png f 1/41/6 2/42/6 3/43/6 4/44/6 -g Cube_Cube_LEDs_Cube_Cube_LEDs_leds_on -f 21/45/6 22/46/6 23/47/6 24/48/6 diff --git a/led_marquee/textures/led_marquee_base.png b/led_marquee/textures/led_marquee_base.png Binary files differindex 0629b20..06fed31 100644 --- a/led_marquee/textures/led_marquee_base.png +++ b/led_marquee/textures/led_marquee_base.png diff --git a/led_marquee/textures/led_marquee_char_100.png b/led_marquee/textures/led_marquee_char_100.png Binary files differindex 6da1a90..b150ab3 100644 --- a/led_marquee/textures/led_marquee_char_100.png +++ b/led_marquee/textures/led_marquee_char_100.png diff --git a/led_marquee/textures/led_marquee_char_101.png b/led_marquee/textures/led_marquee_char_101.png Binary files differindex 9bd1cea..8d02d7a 100644 --- a/led_marquee/textures/led_marquee_char_101.png +++ b/led_marquee/textures/led_marquee_char_101.png diff --git a/led_marquee/textures/led_marquee_char_102.png b/led_marquee/textures/led_marquee_char_102.png Binary files differindex 7b67eb2..1085d8e 100644 --- a/led_marquee/textures/led_marquee_char_102.png +++ b/led_marquee/textures/led_marquee_char_102.png diff --git a/led_marquee/textures/led_marquee_char_103.png b/led_marquee/textures/led_marquee_char_103.png Binary files differindex 1d1b777..8c8fa79 100644 --- a/led_marquee/textures/led_marquee_char_103.png +++ b/led_marquee/textures/led_marquee_char_103.png diff --git a/led_marquee/textures/led_marquee_char_104.png b/led_marquee/textures/led_marquee_char_104.png Binary files differindex 64317b6..66bf511 100644 --- a/led_marquee/textures/led_marquee_char_104.png +++ b/led_marquee/textures/led_marquee_char_104.png diff --git a/led_marquee/textures/led_marquee_char_105.png b/led_marquee/textures/led_marquee_char_105.png Binary files differindex d2f327f..38f6655 100644 --- a/led_marquee/textures/led_marquee_char_105.png +++ b/led_marquee/textures/led_marquee_char_105.png diff --git a/led_marquee/textures/led_marquee_char_106.png b/led_marquee/textures/led_marquee_char_106.png Binary files differindex e68d039..50b3866 100644 --- a/led_marquee/textures/led_marquee_char_106.png +++ b/led_marquee/textures/led_marquee_char_106.png diff --git a/led_marquee/textures/led_marquee_char_107.png b/led_marquee/textures/led_marquee_char_107.png Binary files differindex 47d7c60..4b8ec5c 100644 --- a/led_marquee/textures/led_marquee_char_107.png +++ b/led_marquee/textures/led_marquee_char_107.png diff --git a/led_marquee/textures/led_marquee_char_108.png b/led_marquee/textures/led_marquee_char_108.png Binary files differindex 07a9e43..37cd774 100644 --- a/led_marquee/textures/led_marquee_char_108.png +++ b/led_marquee/textures/led_marquee_char_108.png diff --git a/led_marquee/textures/led_marquee_char_109.png b/led_marquee/textures/led_marquee_char_109.png Binary files differindex 1be972a..d485181 100644 --- a/led_marquee/textures/led_marquee_char_109.png +++ b/led_marquee/textures/led_marquee_char_109.png diff --git a/led_marquee/textures/led_marquee_char_110.png b/led_marquee/textures/led_marquee_char_110.png Binary files differindex b3be137..6890504 100644 --- a/led_marquee/textures/led_marquee_char_110.png +++ b/led_marquee/textures/led_marquee_char_110.png diff --git a/led_marquee/textures/led_marquee_char_111.png b/led_marquee/textures/led_marquee_char_111.png Binary files differindex 12d9db1..02b24e2 100644 --- a/led_marquee/textures/led_marquee_char_111.png +++ b/led_marquee/textures/led_marquee_char_111.png diff --git a/led_marquee/textures/led_marquee_char_112.png b/led_marquee/textures/led_marquee_char_112.png Binary files differindex afe6ef3..0d3acbe 100644 --- a/led_marquee/textures/led_marquee_char_112.png +++ b/led_marquee/textures/led_marquee_char_112.png diff --git a/led_marquee/textures/led_marquee_char_113.png b/led_marquee/textures/led_marquee_char_113.png Binary files differindex 62814f7..e4e918c 100644 --- a/led_marquee/textures/led_marquee_char_113.png +++ b/led_marquee/textures/led_marquee_char_113.png diff --git a/led_marquee/textures/led_marquee_char_114.png b/led_marquee/textures/led_marquee_char_114.png Binary files differindex 247987c..138c966 100644 --- a/led_marquee/textures/led_marquee_char_114.png +++ b/led_marquee/textures/led_marquee_char_114.png diff --git a/led_marquee/textures/led_marquee_char_115.png b/led_marquee/textures/led_marquee_char_115.png Binary files differindex 376a2ef..532d29d 100644 --- a/led_marquee/textures/led_marquee_char_115.png +++ b/led_marquee/textures/led_marquee_char_115.png diff --git a/led_marquee/textures/led_marquee_char_116.png b/led_marquee/textures/led_marquee_char_116.png Binary files differindex 4f7df3a..546ac98 100644 --- a/led_marquee/textures/led_marquee_char_116.png +++ b/led_marquee/textures/led_marquee_char_116.png diff --git a/led_marquee/textures/led_marquee_char_117.png b/led_marquee/textures/led_marquee_char_117.png Binary files differindex dcce8a8..eb587a7 100644 --- a/led_marquee/textures/led_marquee_char_117.png +++ b/led_marquee/textures/led_marquee_char_117.png diff --git a/led_marquee/textures/led_marquee_char_118.png b/led_marquee/textures/led_marquee_char_118.png Binary files differindex dd5ce18..ad2e2c4 100644 --- a/led_marquee/textures/led_marquee_char_118.png +++ b/led_marquee/textures/led_marquee_char_118.png diff --git a/led_marquee/textures/led_marquee_char_119.png b/led_marquee/textures/led_marquee_char_119.png Binary files differindex a1170cc..cb40546 100644 --- a/led_marquee/textures/led_marquee_char_119.png +++ b/led_marquee/textures/led_marquee_char_119.png diff --git a/led_marquee/textures/led_marquee_char_120.png b/led_marquee/textures/led_marquee_char_120.png Binary files differindex 0b331fc..7da9c36 100644 --- a/led_marquee/textures/led_marquee_char_120.png +++ b/led_marquee/textures/led_marquee_char_120.png diff --git a/led_marquee/textures/led_marquee_char_121.png b/led_marquee/textures/led_marquee_char_121.png Binary files differindex 454818f..daab67e 100644 --- a/led_marquee/textures/led_marquee_char_121.png +++ b/led_marquee/textures/led_marquee_char_121.png diff --git a/led_marquee/textures/led_marquee_char_122.png b/led_marquee/textures/led_marquee_char_122.png Binary files differindex bd0b2d8..d2ca566 100644 --- a/led_marquee/textures/led_marquee_char_122.png +++ b/led_marquee/textures/led_marquee_char_122.png diff --git a/led_marquee/textures/led_marquee_char_123.png b/led_marquee/textures/led_marquee_char_123.png Binary files differindex 94fea35..424a7d3 100644 --- a/led_marquee/textures/led_marquee_char_123.png +++ b/led_marquee/textures/led_marquee_char_123.png diff --git a/led_marquee/textures/led_marquee_char_124.png b/led_marquee/textures/led_marquee_char_124.png Binary files differindex df689c1..80b2bbb 100644 --- a/led_marquee/textures/led_marquee_char_124.png +++ b/led_marquee/textures/led_marquee_char_124.png diff --git a/led_marquee/textures/led_marquee_char_125.png b/led_marquee/textures/led_marquee_char_125.png Binary files differindex 80c41e1..5e224e4 100644 --- a/led_marquee/textures/led_marquee_char_125.png +++ b/led_marquee/textures/led_marquee_char_125.png diff --git a/led_marquee/textures/led_marquee_char_126.png b/led_marquee/textures/led_marquee_char_126.png Binary files differindex 4643e72..ee792c1 100644 --- a/led_marquee/textures/led_marquee_char_126.png +++ b/led_marquee/textures/led_marquee_char_126.png diff --git a/led_marquee/textures/led_marquee_char_127.png b/led_marquee/textures/led_marquee_char_127.png Binary files differindex 176da20..0d63308 100644 --- a/led_marquee/textures/led_marquee_char_127.png +++ b/led_marquee/textures/led_marquee_char_127.png diff --git a/led_marquee/textures/led_marquee_char_128.png b/led_marquee/textures/led_marquee_char_128.png Binary files differindex db3f042..ecf1b1f 100644 --- a/led_marquee/textures/led_marquee_char_128.png +++ b/led_marquee/textures/led_marquee_char_128.png diff --git a/led_marquee/textures/led_marquee_char_129.png b/led_marquee/textures/led_marquee_char_129.png Binary files differindex 796e777..60b22bd 100644 --- a/led_marquee/textures/led_marquee_char_129.png +++ b/led_marquee/textures/led_marquee_char_129.png diff --git a/led_marquee/textures/led_marquee_char_130.png b/led_marquee/textures/led_marquee_char_130.png Binary files differindex 766ffe7..fb5a746 100644 --- a/led_marquee/textures/led_marquee_char_130.png +++ b/led_marquee/textures/led_marquee_char_130.png diff --git a/led_marquee/textures/led_marquee_char_131.png b/led_marquee/textures/led_marquee_char_131.png Binary files differindex 0a53b9b..80b2bbb 100644 --- a/led_marquee/textures/led_marquee_char_131.png +++ b/led_marquee/textures/led_marquee_char_131.png diff --git a/led_marquee/textures/led_marquee_char_132.png b/led_marquee/textures/led_marquee_char_132.png Binary files differindex 387f3ac..5e184cf 100644 --- a/led_marquee/textures/led_marquee_char_132.png +++ b/led_marquee/textures/led_marquee_char_132.png diff --git a/led_marquee/textures/led_marquee_char_133.png b/led_marquee/textures/led_marquee_char_133.png Binary files differindex 6c18d9c..1a5b076 100644 --- a/led_marquee/textures/led_marquee_char_133.png +++ b/led_marquee/textures/led_marquee_char_133.png diff --git a/led_marquee/textures/led_marquee_char_134.png b/led_marquee/textures/led_marquee_char_134.png Binary files differindex dcf5d7b..430db65 100644 --- a/led_marquee/textures/led_marquee_char_134.png +++ b/led_marquee/textures/led_marquee_char_134.png diff --git a/led_marquee/textures/led_marquee_char_135.png b/led_marquee/textures/led_marquee_char_135.png Binary files differindex 81b72e9..d6dacb3 100644 --- a/led_marquee/textures/led_marquee_char_135.png +++ b/led_marquee/textures/led_marquee_char_135.png diff --git a/led_marquee/textures/led_marquee_char_136.png b/led_marquee/textures/led_marquee_char_136.png Binary files differindex 8c789f1..e7e9b9f 100644 --- a/led_marquee/textures/led_marquee_char_136.png +++ b/led_marquee/textures/led_marquee_char_136.png diff --git a/led_marquee/textures/led_marquee_char_137.png b/led_marquee/textures/led_marquee_char_137.png Binary files differindex 388ed39..e3bbd7e 100644 --- a/led_marquee/textures/led_marquee_char_137.png +++ b/led_marquee/textures/led_marquee_char_137.png diff --git a/led_marquee/textures/led_marquee_char_138.png b/led_marquee/textures/led_marquee_char_138.png Binary files differindex 091a34c..283a2c3 100644 --- a/led_marquee/textures/led_marquee_char_138.png +++ b/led_marquee/textures/led_marquee_char_138.png diff --git a/led_marquee/textures/led_marquee_char_139.png b/led_marquee/textures/led_marquee_char_139.png Binary files differindex ce35cc2..a5ee166 100644 --- a/led_marquee/textures/led_marquee_char_139.png +++ b/led_marquee/textures/led_marquee_char_139.png diff --git a/led_marquee/textures/led_marquee_char_140.png b/led_marquee/textures/led_marquee_char_140.png Binary files differindex 055298d..5d8644e 100644 --- a/led_marquee/textures/led_marquee_char_140.png +++ b/led_marquee/textures/led_marquee_char_140.png diff --git a/led_marquee/textures/led_marquee_char_141.png b/led_marquee/textures/led_marquee_char_141.png Binary files differindex 7c112da..8362f2e 100644 --- a/led_marquee/textures/led_marquee_char_141.png +++ b/led_marquee/textures/led_marquee_char_141.png diff --git a/led_marquee/textures/led_marquee_char_142.png b/led_marquee/textures/led_marquee_char_142.png Binary files differindex 780e8b2..1e39abc 100644 --- a/led_marquee/textures/led_marquee_char_142.png +++ b/led_marquee/textures/led_marquee_char_142.png diff --git a/led_marquee/textures/led_marquee_char_143.png b/led_marquee/textures/led_marquee_char_143.png Binary files differindex 6293a97..819f351 100644 --- a/led_marquee/textures/led_marquee_char_143.png +++ b/led_marquee/textures/led_marquee_char_143.png diff --git a/led_marquee/textures/led_marquee_char_144.png b/led_marquee/textures/led_marquee_char_144.png Binary files differindex fda87a1..3f86719 100644 --- a/led_marquee/textures/led_marquee_char_144.png +++ b/led_marquee/textures/led_marquee_char_144.png diff --git a/led_marquee/textures/led_marquee_char_145.png b/led_marquee/textures/led_marquee_char_145.png Binary files differindex 4546837..a5c50de 100644 --- a/led_marquee/textures/led_marquee_char_145.png +++ b/led_marquee/textures/led_marquee_char_145.png diff --git a/led_marquee/textures/led_marquee_char_146.png b/led_marquee/textures/led_marquee_char_146.png Binary files differindex 565ae53..74042b7 100644 --- a/led_marquee/textures/led_marquee_char_146.png +++ b/led_marquee/textures/led_marquee_char_146.png diff --git a/led_marquee/textures/led_marquee_char_147.png b/led_marquee/textures/led_marquee_char_147.png Binary files differindex f9c976c..0b853f6 100644 --- a/led_marquee/textures/led_marquee_char_147.png +++ b/led_marquee/textures/led_marquee_char_147.png diff --git a/led_marquee/textures/led_marquee_char_148.png b/led_marquee/textures/led_marquee_char_148.png Binary files differindex 12aeaa3..623becd 100644 --- a/led_marquee/textures/led_marquee_char_148.png +++ b/led_marquee/textures/led_marquee_char_148.png diff --git a/led_marquee/textures/led_marquee_char_149.png b/led_marquee/textures/led_marquee_char_149.png Binary files differindex 1d7f312..1011146 100644 --- a/led_marquee/textures/led_marquee_char_149.png +++ b/led_marquee/textures/led_marquee_char_149.png diff --git a/led_marquee/textures/led_marquee_char_150.png b/led_marquee/textures/led_marquee_char_150.png Binary files differindex dc4ae80..520546c 100644 --- a/led_marquee/textures/led_marquee_char_150.png +++ b/led_marquee/textures/led_marquee_char_150.png diff --git a/led_marquee/textures/led_marquee_char_151.png b/led_marquee/textures/led_marquee_char_151.png Binary files differindex 9c7e0e9..f532e57 100644 --- a/led_marquee/textures/led_marquee_char_151.png +++ b/led_marquee/textures/led_marquee_char_151.png diff --git a/led_marquee/textures/led_marquee_char_152.png b/led_marquee/textures/led_marquee_char_152.png Binary files differindex 652f97a..254d6d2 100644 --- a/led_marquee/textures/led_marquee_char_152.png +++ b/led_marquee/textures/led_marquee_char_152.png diff --git a/led_marquee/textures/led_marquee_char_153.png b/led_marquee/textures/led_marquee_char_153.png Binary files differindex 425c282..003c57d 100644 --- a/led_marquee/textures/led_marquee_char_153.png +++ b/led_marquee/textures/led_marquee_char_153.png diff --git a/led_marquee/textures/led_marquee_char_154.png b/led_marquee/textures/led_marquee_char_154.png Binary files differindex ac58ac0..c18a20f 100644 --- a/led_marquee/textures/led_marquee_char_154.png +++ b/led_marquee/textures/led_marquee_char_154.png diff --git a/led_marquee/textures/led_marquee_char_155.png b/led_marquee/textures/led_marquee_char_155.png Binary files differindex a3caf9a..0d8bda9 100644 --- a/led_marquee/textures/led_marquee_char_155.png +++ b/led_marquee/textures/led_marquee_char_155.png diff --git a/led_marquee/textures/led_marquee_char_156.png b/led_marquee/textures/led_marquee_char_156.png Binary files differindex fe216f8..cc9c1fe 100644 --- a/led_marquee/textures/led_marquee_char_156.png +++ b/led_marquee/textures/led_marquee_char_156.png diff --git a/led_marquee/textures/led_marquee_char_157.png b/led_marquee/textures/led_marquee_char_157.png Binary files differindex dbd0221..5e1b35d 100644 --- a/led_marquee/textures/led_marquee_char_157.png +++ b/led_marquee/textures/led_marquee_char_157.png diff --git a/led_marquee/textures/led_marquee_char_158.png b/led_marquee/textures/led_marquee_char_158.png Binary files differindex 048fa58..cba6df1 100644 --- a/led_marquee/textures/led_marquee_char_158.png +++ b/led_marquee/textures/led_marquee_char_158.png diff --git a/led_marquee/textures/led_marquee_char_159.png b/led_marquee/textures/led_marquee_char_159.png Binary files differindex 60d4a34..b247f31 100644 --- a/led_marquee/textures/led_marquee_char_159.png +++ b/led_marquee/textures/led_marquee_char_159.png diff --git a/led_marquee/textures/led_marquee_char_160.png b/led_marquee/textures/led_marquee_char_160.png Binary files differindex da04edb..92f14a1 100644 --- a/led_marquee/textures/led_marquee_char_160.png +++ b/led_marquee/textures/led_marquee_char_160.png diff --git a/led_marquee/textures/led_marquee_char_161.png b/led_marquee/textures/led_marquee_char_161.png Binary files differindex 5571459..c5b200c 100644 --- a/led_marquee/textures/led_marquee_char_161.png +++ b/led_marquee/textures/led_marquee_char_161.png diff --git a/led_marquee/textures/led_marquee_char_162.png b/led_marquee/textures/led_marquee_char_162.png Binary files differindex 9f0d784..55700f7 100644 --- a/led_marquee/textures/led_marquee_char_162.png +++ b/led_marquee/textures/led_marquee_char_162.png diff --git a/led_marquee/textures/led_marquee_char_163.png b/led_marquee/textures/led_marquee_char_163.png Binary files differindex d958543..8055a92 100644 --- a/led_marquee/textures/led_marquee_char_163.png +++ b/led_marquee/textures/led_marquee_char_163.png diff --git a/led_marquee/textures/led_marquee_char_164.png b/led_marquee/textures/led_marquee_char_164.png Binary files differindex b9e00b9..4c34ec3 100644 --- a/led_marquee/textures/led_marquee_char_164.png +++ b/led_marquee/textures/led_marquee_char_164.png diff --git a/led_marquee/textures/led_marquee_char_165.png b/led_marquee/textures/led_marquee_char_165.png Binary files differindex e4abbe9..e3fd6ca 100644 --- a/led_marquee/textures/led_marquee_char_165.png +++ b/led_marquee/textures/led_marquee_char_165.png diff --git a/led_marquee/textures/led_marquee_char_166.png b/led_marquee/textures/led_marquee_char_166.png Binary files differindex 7200dd6..770d761 100644 --- a/led_marquee/textures/led_marquee_char_166.png +++ b/led_marquee/textures/led_marquee_char_166.png diff --git a/led_marquee/textures/led_marquee_char_167.png b/led_marquee/textures/led_marquee_char_167.png Binary files differindex 7612a9c..dd4d732 100644 --- a/led_marquee/textures/led_marquee_char_167.png +++ b/led_marquee/textures/led_marquee_char_167.png diff --git a/led_marquee/textures/led_marquee_char_168.png b/led_marquee/textures/led_marquee_char_168.png Binary files differindex c806e93..e3e88fd 100644 --- a/led_marquee/textures/led_marquee_char_168.png +++ b/led_marquee/textures/led_marquee_char_168.png diff --git a/led_marquee/textures/led_marquee_char_169.png b/led_marquee/textures/led_marquee_char_169.png Binary files differindex d5b5ec7..c0c7ad8 100644 --- a/led_marquee/textures/led_marquee_char_169.png +++ b/led_marquee/textures/led_marquee_char_169.png diff --git a/led_marquee/textures/led_marquee_char_170.png b/led_marquee/textures/led_marquee_char_170.png Binary files differindex 262b11e..4d8ed9d 100644 --- a/led_marquee/textures/led_marquee_char_170.png +++ b/led_marquee/textures/led_marquee_char_170.png diff --git a/led_marquee/textures/led_marquee_char_171.png b/led_marquee/textures/led_marquee_char_171.png Binary files differindex bcc43df..294e86d 100644 --- a/led_marquee/textures/led_marquee_char_171.png +++ b/led_marquee/textures/led_marquee_char_171.png diff --git a/led_marquee/textures/led_marquee_char_172.png b/led_marquee/textures/led_marquee_char_172.png Binary files differindex c3cb2fe..c92a7ba 100644 --- a/led_marquee/textures/led_marquee_char_172.png +++ b/led_marquee/textures/led_marquee_char_172.png diff --git a/led_marquee/textures/led_marquee_char_173.png b/led_marquee/textures/led_marquee_char_173.png Binary files differindex 9881872..212a37d 100644 --- a/led_marquee/textures/led_marquee_char_173.png +++ b/led_marquee/textures/led_marquee_char_173.png diff --git a/led_marquee/textures/led_marquee_char_174.png b/led_marquee/textures/led_marquee_char_174.png Binary files differindex d0bb5dc..eabfdc0 100644 --- a/led_marquee/textures/led_marquee_char_174.png +++ b/led_marquee/textures/led_marquee_char_174.png diff --git a/led_marquee/textures/led_marquee_char_175.png b/led_marquee/textures/led_marquee_char_175.png Binary files differindex 932df85..f8b8df7 100644 --- a/led_marquee/textures/led_marquee_char_175.png +++ b/led_marquee/textures/led_marquee_char_175.png diff --git a/led_marquee/textures/led_marquee_char_176.png b/led_marquee/textures/led_marquee_char_176.png Binary files differindex da53f13..489f518 100644 --- a/led_marquee/textures/led_marquee_char_176.png +++ b/led_marquee/textures/led_marquee_char_176.png diff --git a/led_marquee/textures/led_marquee_char_177.png b/led_marquee/textures/led_marquee_char_177.png Binary files differindex 2bf3742..a020344 100644 --- a/led_marquee/textures/led_marquee_char_177.png +++ b/led_marquee/textures/led_marquee_char_177.png diff --git a/led_marquee/textures/led_marquee_char_178.png b/led_marquee/textures/led_marquee_char_178.png Binary files differindex 831fd0a..1c16475 100644 --- a/led_marquee/textures/led_marquee_char_178.png +++ b/led_marquee/textures/led_marquee_char_178.png diff --git a/led_marquee/textures/led_marquee_char_179.png b/led_marquee/textures/led_marquee_char_179.png Binary files differindex d23d617..137dd1c 100644 --- a/led_marquee/textures/led_marquee_char_179.png +++ b/led_marquee/textures/led_marquee_char_179.png diff --git a/led_marquee/textures/led_marquee_char_180.png b/led_marquee/textures/led_marquee_char_180.png Binary files differindex e7803c4..1de2bda 100644 --- a/led_marquee/textures/led_marquee_char_180.png +++ b/led_marquee/textures/led_marquee_char_180.png diff --git a/led_marquee/textures/led_marquee_char_181.png b/led_marquee/textures/led_marquee_char_181.png Binary files differindex 44a558a..c1a6df4 100644 --- a/led_marquee/textures/led_marquee_char_181.png +++ b/led_marquee/textures/led_marquee_char_181.png diff --git a/led_marquee/textures/led_marquee_char_182.png b/led_marquee/textures/led_marquee_char_182.png Binary files differindex 20b7fa5..0010f79 100644 --- a/led_marquee/textures/led_marquee_char_182.png +++ b/led_marquee/textures/led_marquee_char_182.png diff --git a/led_marquee/textures/led_marquee_char_183.png b/led_marquee/textures/led_marquee_char_183.png Binary files differindex 790b4de..8a23992 100644 --- a/led_marquee/textures/led_marquee_char_183.png +++ b/led_marquee/textures/led_marquee_char_183.png diff --git a/led_marquee/textures/led_marquee_char_184.png b/led_marquee/textures/led_marquee_char_184.png Binary files differindex 3879c33..8d298c6 100644 --- a/led_marquee/textures/led_marquee_char_184.png +++ b/led_marquee/textures/led_marquee_char_184.png diff --git a/led_marquee/textures/led_marquee_char_185.png b/led_marquee/textures/led_marquee_char_185.png Binary files differindex 35ab196..b8bd3d8 100644 --- a/led_marquee/textures/led_marquee_char_185.png +++ b/led_marquee/textures/led_marquee_char_185.png diff --git a/led_marquee/textures/led_marquee_char_186.png b/led_marquee/textures/led_marquee_char_186.png Binary files differindex 816e3ec..a7fd3b4 100644 --- a/led_marquee/textures/led_marquee_char_186.png +++ b/led_marquee/textures/led_marquee_char_186.png diff --git a/led_marquee/textures/led_marquee_char_187.png b/led_marquee/textures/led_marquee_char_187.png Binary files differindex 4c2f43b..0444ec6 100644 --- a/led_marquee/textures/led_marquee_char_187.png +++ b/led_marquee/textures/led_marquee_char_187.png diff --git a/led_marquee/textures/led_marquee_char_188.png b/led_marquee/textures/led_marquee_char_188.png Binary files differindex 1772c9f..a756157 100644 --- a/led_marquee/textures/led_marquee_char_188.png +++ b/led_marquee/textures/led_marquee_char_188.png diff --git a/led_marquee/textures/led_marquee_char_189.png b/led_marquee/textures/led_marquee_char_189.png Binary files differindex 6d1ba47..5db4143 100644 --- a/led_marquee/textures/led_marquee_char_189.png +++ b/led_marquee/textures/led_marquee_char_189.png diff --git a/led_marquee/textures/led_marquee_char_190.png b/led_marquee/textures/led_marquee_char_190.png Binary files differindex 4593e94..0fca238 100644 --- a/led_marquee/textures/led_marquee_char_190.png +++ b/led_marquee/textures/led_marquee_char_190.png diff --git a/led_marquee/textures/led_marquee_char_191.png b/led_marquee/textures/led_marquee_char_191.png Binary files differindex bde63e5..44c7fbb 100644 --- a/led_marquee/textures/led_marquee_char_191.png +++ b/led_marquee/textures/led_marquee_char_191.png diff --git a/led_marquee/textures/led_marquee_char_192.png b/led_marquee/textures/led_marquee_char_192.png Binary files differindex c627ab4..9c7df2e 100644 --- a/led_marquee/textures/led_marquee_char_192.png +++ b/led_marquee/textures/led_marquee_char_192.png diff --git a/led_marquee/textures/led_marquee_char_193.png b/led_marquee/textures/led_marquee_char_193.png Binary files differindex 038c9f8..56e1eae 100644 --- a/led_marquee/textures/led_marquee_char_193.png +++ b/led_marquee/textures/led_marquee_char_193.png diff --git a/led_marquee/textures/led_marquee_char_194.png b/led_marquee/textures/led_marquee_char_194.png Binary files differindex 7401be4..f99914d 100644 --- a/led_marquee/textures/led_marquee_char_194.png +++ b/led_marquee/textures/led_marquee_char_194.png diff --git a/led_marquee/textures/led_marquee_char_195.png b/led_marquee/textures/led_marquee_char_195.png Binary files differindex 9e89648..fde4c2c 100644 --- a/led_marquee/textures/led_marquee_char_195.png +++ b/led_marquee/textures/led_marquee_char_195.png diff --git a/led_marquee/textures/led_marquee_char_196.png b/led_marquee/textures/led_marquee_char_196.png Binary files differindex a040073..97b34d9 100644 --- a/led_marquee/textures/led_marquee_char_196.png +++ b/led_marquee/textures/led_marquee_char_196.png diff --git a/led_marquee/textures/led_marquee_char_197.png b/led_marquee/textures/led_marquee_char_197.png Binary files differindex 4445568..628f63a 100644 --- a/led_marquee/textures/led_marquee_char_197.png +++ b/led_marquee/textures/led_marquee_char_197.png diff --git a/led_marquee/textures/led_marquee_char_198.png b/led_marquee/textures/led_marquee_char_198.png Binary files differindex bf64c44..bae680f 100644 --- a/led_marquee/textures/led_marquee_char_198.png +++ b/led_marquee/textures/led_marquee_char_198.png diff --git a/led_marquee/textures/led_marquee_char_199.png b/led_marquee/textures/led_marquee_char_199.png Binary files differindex fcdc5db..bef029b 100644 --- a/led_marquee/textures/led_marquee_char_199.png +++ b/led_marquee/textures/led_marquee_char_199.png diff --git a/led_marquee/textures/led_marquee_char_200.png b/led_marquee/textures/led_marquee_char_200.png Binary files differindex 3732e97..a88b173 100644 --- a/led_marquee/textures/led_marquee_char_200.png +++ b/led_marquee/textures/led_marquee_char_200.png diff --git a/led_marquee/textures/led_marquee_char_201.png b/led_marquee/textures/led_marquee_char_201.png Binary files differindex ce36fd9..3df2586 100644 --- a/led_marquee/textures/led_marquee_char_201.png +++ b/led_marquee/textures/led_marquee_char_201.png diff --git a/led_marquee/textures/led_marquee_char_202.png b/led_marquee/textures/led_marquee_char_202.png Binary files differindex e65878a..afd1a19 100644 --- a/led_marquee/textures/led_marquee_char_202.png +++ b/led_marquee/textures/led_marquee_char_202.png diff --git a/led_marquee/textures/led_marquee_char_203.png b/led_marquee/textures/led_marquee_char_203.png Binary files differindex 4e78b57..8a40982 100644 --- a/led_marquee/textures/led_marquee_char_203.png +++ b/led_marquee/textures/led_marquee_char_203.png diff --git a/led_marquee/textures/led_marquee_char_204.png b/led_marquee/textures/led_marquee_char_204.png Binary files differindex a1c2db0..982ca23 100644 --- a/led_marquee/textures/led_marquee_char_204.png +++ b/led_marquee/textures/led_marquee_char_204.png diff --git a/led_marquee/textures/led_marquee_char_205.png b/led_marquee/textures/led_marquee_char_205.png Binary files differindex 8a50c71..7b7bcaa 100644 --- a/led_marquee/textures/led_marquee_char_205.png +++ b/led_marquee/textures/led_marquee_char_205.png diff --git a/led_marquee/textures/led_marquee_char_206.png b/led_marquee/textures/led_marquee_char_206.png Binary files differindex 0a00f82..9555cd9 100644 --- a/led_marquee/textures/led_marquee_char_206.png +++ b/led_marquee/textures/led_marquee_char_206.png diff --git a/led_marquee/textures/led_marquee_char_207.png b/led_marquee/textures/led_marquee_char_207.png Binary files differindex 1c6a3b6..fd9face 100644 --- a/led_marquee/textures/led_marquee_char_207.png +++ b/led_marquee/textures/led_marquee_char_207.png diff --git a/led_marquee/textures/led_marquee_char_208.png b/led_marquee/textures/led_marquee_char_208.png Binary files differindex 3f8e39c..4e6137e 100644 --- a/led_marquee/textures/led_marquee_char_208.png +++ b/led_marquee/textures/led_marquee_char_208.png diff --git a/led_marquee/textures/led_marquee_char_209.png b/led_marquee/textures/led_marquee_char_209.png Binary files differindex 4d2e31d..52fbf27 100644 --- a/led_marquee/textures/led_marquee_char_209.png +++ b/led_marquee/textures/led_marquee_char_209.png diff --git a/led_marquee/textures/led_marquee_char_210.png b/led_marquee/textures/led_marquee_char_210.png Binary files differindex d696190..7501819 100644 --- a/led_marquee/textures/led_marquee_char_210.png +++ b/led_marquee/textures/led_marquee_char_210.png diff --git a/led_marquee/textures/led_marquee_char_211.png b/led_marquee/textures/led_marquee_char_211.png Binary files differindex bf3b7d6..d40035b 100644 --- a/led_marquee/textures/led_marquee_char_211.png +++ b/led_marquee/textures/led_marquee_char_211.png diff --git a/led_marquee/textures/led_marquee_char_212.png b/led_marquee/textures/led_marquee_char_212.png Binary files differindex b748c3e..1eaf7f4 100644 --- a/led_marquee/textures/led_marquee_char_212.png +++ b/led_marquee/textures/led_marquee_char_212.png diff --git a/led_marquee/textures/led_marquee_char_213.png b/led_marquee/textures/led_marquee_char_213.png Binary files differindex 1de8f76..50869fd 100644 --- a/led_marquee/textures/led_marquee_char_213.png +++ b/led_marquee/textures/led_marquee_char_213.png diff --git a/led_marquee/textures/led_marquee_char_214.png b/led_marquee/textures/led_marquee_char_214.png Binary files differindex d579c28..e4cbf8d 100644 --- a/led_marquee/textures/led_marquee_char_214.png +++ b/led_marquee/textures/led_marquee_char_214.png diff --git a/led_marquee/textures/led_marquee_char_215.png b/led_marquee/textures/led_marquee_char_215.png Binary files differindex 67ccdc3..252aaf4 100644 --- a/led_marquee/textures/led_marquee_char_215.png +++ b/led_marquee/textures/led_marquee_char_215.png diff --git a/led_marquee/textures/led_marquee_char_216.png b/led_marquee/textures/led_marquee_char_216.png Binary files differindex 5dfa7da..e69e0b3 100644 --- a/led_marquee/textures/led_marquee_char_216.png +++ b/led_marquee/textures/led_marquee_char_216.png diff --git a/led_marquee/textures/led_marquee_char_217.png b/led_marquee/textures/led_marquee_char_217.png Binary files differindex 0c719b4..bf740d0 100644 --- a/led_marquee/textures/led_marquee_char_217.png +++ b/led_marquee/textures/led_marquee_char_217.png diff --git a/led_marquee/textures/led_marquee_char_218.png b/led_marquee/textures/led_marquee_char_218.png Binary files differindex efbfa20..6252032 100644 --- a/led_marquee/textures/led_marquee_char_218.png +++ b/led_marquee/textures/led_marquee_char_218.png diff --git a/led_marquee/textures/led_marquee_char_219.png b/led_marquee/textures/led_marquee_char_219.png Binary files differindex cbd4474..1e1d2f7 100644 --- a/led_marquee/textures/led_marquee_char_219.png +++ b/led_marquee/textures/led_marquee_char_219.png diff --git a/led_marquee/textures/led_marquee_char_220.png b/led_marquee/textures/led_marquee_char_220.png Binary files differindex 39fc098..6de8c9f 100644 --- a/led_marquee/textures/led_marquee_char_220.png +++ b/led_marquee/textures/led_marquee_char_220.png diff --git a/led_marquee/textures/led_marquee_char_221.png b/led_marquee/textures/led_marquee_char_221.png Binary files differindex 5aecca9..909bec7 100644 --- a/led_marquee/textures/led_marquee_char_221.png +++ b/led_marquee/textures/led_marquee_char_221.png diff --git a/led_marquee/textures/led_marquee_char_222.png b/led_marquee/textures/led_marquee_char_222.png Binary files differindex e54eecb..6a72d34 100644 --- a/led_marquee/textures/led_marquee_char_222.png +++ b/led_marquee/textures/led_marquee_char_222.png diff --git a/led_marquee/textures/led_marquee_char_223.png b/led_marquee/textures/led_marquee_char_223.png Binary files differindex c02b3e8..de3913e 100644 --- a/led_marquee/textures/led_marquee_char_223.png +++ b/led_marquee/textures/led_marquee_char_223.png diff --git a/led_marquee/textures/led_marquee_char_224.png b/led_marquee/textures/led_marquee_char_224.png Binary files differindex 4e8235e..8d68016 100644 --- a/led_marquee/textures/led_marquee_char_224.png +++ b/led_marquee/textures/led_marquee_char_224.png diff --git a/led_marquee/textures/led_marquee_char_225.png b/led_marquee/textures/led_marquee_char_225.png Binary files differindex ffa9d47..817c71d 100644 --- a/led_marquee/textures/led_marquee_char_225.png +++ b/led_marquee/textures/led_marquee_char_225.png diff --git a/led_marquee/textures/led_marquee_char_226.png b/led_marquee/textures/led_marquee_char_226.png Binary files differindex 9a41d88..004f351 100644 --- a/led_marquee/textures/led_marquee_char_226.png +++ b/led_marquee/textures/led_marquee_char_226.png diff --git a/led_marquee/textures/led_marquee_char_227.png b/led_marquee/textures/led_marquee_char_227.png Binary files differindex a13e6e3..fc68494 100644 --- a/led_marquee/textures/led_marquee_char_227.png +++ b/led_marquee/textures/led_marquee_char_227.png diff --git a/led_marquee/textures/led_marquee_char_228.png b/led_marquee/textures/led_marquee_char_228.png Binary files differindex d147e40..dc81d19 100644 --- a/led_marquee/textures/led_marquee_char_228.png +++ b/led_marquee/textures/led_marquee_char_228.png diff --git a/led_marquee/textures/led_marquee_char_229.png b/led_marquee/textures/led_marquee_char_229.png Binary files differindex c75ebe1..e756427 100644 --- a/led_marquee/textures/led_marquee_char_229.png +++ b/led_marquee/textures/led_marquee_char_229.png diff --git a/led_marquee/textures/led_marquee_char_230.png b/led_marquee/textures/led_marquee_char_230.png Binary files differindex f985af6..fff5033 100644 --- a/led_marquee/textures/led_marquee_char_230.png +++ b/led_marquee/textures/led_marquee_char_230.png diff --git a/led_marquee/textures/led_marquee_char_231.png b/led_marquee/textures/led_marquee_char_231.png Binary files differindex 0b5f979..2f8e562 100644 --- a/led_marquee/textures/led_marquee_char_231.png +++ b/led_marquee/textures/led_marquee_char_231.png diff --git a/led_marquee/textures/led_marquee_char_232.png b/led_marquee/textures/led_marquee_char_232.png Binary files differindex d77c360..c1df000 100644 --- a/led_marquee/textures/led_marquee_char_232.png +++ b/led_marquee/textures/led_marquee_char_232.png diff --git a/led_marquee/textures/led_marquee_char_233.png b/led_marquee/textures/led_marquee_char_233.png Binary files differindex 80e305b..fd2a331 100644 --- a/led_marquee/textures/led_marquee_char_233.png +++ b/led_marquee/textures/led_marquee_char_233.png diff --git a/led_marquee/textures/led_marquee_char_234.png b/led_marquee/textures/led_marquee_char_234.png Binary files differindex bad0987..410c7c9 100644 --- a/led_marquee/textures/led_marquee_char_234.png +++ b/led_marquee/textures/led_marquee_char_234.png diff --git a/led_marquee/textures/led_marquee_char_235.png b/led_marquee/textures/led_marquee_char_235.png Binary files differindex 95b0712..cec7ab3 100644 --- a/led_marquee/textures/led_marquee_char_235.png +++ b/led_marquee/textures/led_marquee_char_235.png diff --git a/led_marquee/textures/led_marquee_char_236.png b/led_marquee/textures/led_marquee_char_236.png Binary files differindex 255f3bc..c98c212 100644 --- a/led_marquee/textures/led_marquee_char_236.png +++ b/led_marquee/textures/led_marquee_char_236.png diff --git a/led_marquee/textures/led_marquee_char_237.png b/led_marquee/textures/led_marquee_char_237.png Binary files differindex 2583ac7..64cf865 100644 --- a/led_marquee/textures/led_marquee_char_237.png +++ b/led_marquee/textures/led_marquee_char_237.png diff --git a/led_marquee/textures/led_marquee_char_238.png b/led_marquee/textures/led_marquee_char_238.png Binary files differindex 9679927..5657b0e 100644 --- a/led_marquee/textures/led_marquee_char_238.png +++ b/led_marquee/textures/led_marquee_char_238.png diff --git a/led_marquee/textures/led_marquee_char_239.png b/led_marquee/textures/led_marquee_char_239.png Binary files differindex 981026b..53c7723 100644 --- a/led_marquee/textures/led_marquee_char_239.png +++ b/led_marquee/textures/led_marquee_char_239.png diff --git a/led_marquee/textures/led_marquee_char_240.png b/led_marquee/textures/led_marquee_char_240.png Binary files differindex 9fa4e0d..856b878 100644 --- a/led_marquee/textures/led_marquee_char_240.png +++ b/led_marquee/textures/led_marquee_char_240.png diff --git a/led_marquee/textures/led_marquee_char_241.png b/led_marquee/textures/led_marquee_char_241.png Binary files differindex c49eb6b..4db2a03 100644 --- a/led_marquee/textures/led_marquee_char_241.png +++ b/led_marquee/textures/led_marquee_char_241.png diff --git a/led_marquee/textures/led_marquee_char_242.png b/led_marquee/textures/led_marquee_char_242.png Binary files differindex 3662543..589ed64 100644 --- a/led_marquee/textures/led_marquee_char_242.png +++ b/led_marquee/textures/led_marquee_char_242.png diff --git a/led_marquee/textures/led_marquee_char_243.png b/led_marquee/textures/led_marquee_char_243.png Binary files differindex fed1909..ed1b689 100644 --- a/led_marquee/textures/led_marquee_char_243.png +++ b/led_marquee/textures/led_marquee_char_243.png diff --git a/led_marquee/textures/led_marquee_char_244.png b/led_marquee/textures/led_marquee_char_244.png Binary files differindex 027c715..f5b16a3 100644 --- a/led_marquee/textures/led_marquee_char_244.png +++ b/led_marquee/textures/led_marquee_char_244.png diff --git a/led_marquee/textures/led_marquee_char_245.png b/led_marquee/textures/led_marquee_char_245.png Binary files differindex fef4ab0..e1e1e72 100644 --- a/led_marquee/textures/led_marquee_char_245.png +++ b/led_marquee/textures/led_marquee_char_245.png diff --git a/led_marquee/textures/led_marquee_char_246.png b/led_marquee/textures/led_marquee_char_246.png Binary files differindex 4c0dff9..cb07303 100644 --- a/led_marquee/textures/led_marquee_char_246.png +++ b/led_marquee/textures/led_marquee_char_246.png diff --git a/led_marquee/textures/led_marquee_char_247.png b/led_marquee/textures/led_marquee_char_247.png Binary files differindex 2c8f09e..7483abe 100644 --- a/led_marquee/textures/led_marquee_char_247.png +++ b/led_marquee/textures/led_marquee_char_247.png diff --git a/led_marquee/textures/led_marquee_char_248.png b/led_marquee/textures/led_marquee_char_248.png Binary files differindex 6ffcf4c..08c4a2e 100644 --- a/led_marquee/textures/led_marquee_char_248.png +++ b/led_marquee/textures/led_marquee_char_248.png diff --git a/led_marquee/textures/led_marquee_char_249.png b/led_marquee/textures/led_marquee_char_249.png Binary files differindex ec7594e..2fc1f82 100644 --- a/led_marquee/textures/led_marquee_char_249.png +++ b/led_marquee/textures/led_marquee_char_249.png diff --git a/led_marquee/textures/led_marquee_char_250.png b/led_marquee/textures/led_marquee_char_250.png Binary files differindex 9031ccd..d17233f 100644 --- a/led_marquee/textures/led_marquee_char_250.png +++ b/led_marquee/textures/led_marquee_char_250.png diff --git a/led_marquee/textures/led_marquee_char_251.png b/led_marquee/textures/led_marquee_char_251.png Binary files differindex 9fe4cb3..4a48524 100644 --- a/led_marquee/textures/led_marquee_char_251.png +++ b/led_marquee/textures/led_marquee_char_251.png diff --git a/led_marquee/textures/led_marquee_char_252.png b/led_marquee/textures/led_marquee_char_252.png Binary files differindex fd0d74b..653b1c1 100644 --- a/led_marquee/textures/led_marquee_char_252.png +++ b/led_marquee/textures/led_marquee_char_252.png diff --git a/led_marquee/textures/led_marquee_char_253.png b/led_marquee/textures/led_marquee_char_253.png Binary files differindex 6282658..b0d17f5 100644 --- a/led_marquee/textures/led_marquee_char_253.png +++ b/led_marquee/textures/led_marquee_char_253.png diff --git a/led_marquee/textures/led_marquee_char_254.png b/led_marquee/textures/led_marquee_char_254.png Binary files differindex 99ddbc7..a02c70b 100644 --- a/led_marquee/textures/led_marquee_char_254.png +++ b/led_marquee/textures/led_marquee_char_254.png diff --git a/led_marquee/textures/led_marquee_char_255.png b/led_marquee/textures/led_marquee_char_255.png Binary files differindex 58a756c..4714c5f 100644 --- a/led_marquee/textures/led_marquee_char_255.png +++ b/led_marquee/textures/led_marquee_char_255.png diff --git a/led_marquee/textures/led_marquee_char_31.png b/led_marquee/textures/led_marquee_char_31.png Binary files differindex a58a028..47ef6a6 100644 --- a/led_marquee/textures/led_marquee_char_31.png +++ b/led_marquee/textures/led_marquee_char_31.png diff --git a/led_marquee/textures/led_marquee_char_32.png b/led_marquee/textures/led_marquee_char_32.png Binary files differindex cd1c405..92f14a1 100644 --- a/led_marquee/textures/led_marquee_char_32.png +++ b/led_marquee/textures/led_marquee_char_32.png diff --git a/led_marquee/textures/led_marquee_char_33.png b/led_marquee/textures/led_marquee_char_33.png Binary files differindex e49d112..6d69bde 100644 --- a/led_marquee/textures/led_marquee_char_33.png +++ b/led_marquee/textures/led_marquee_char_33.png diff --git a/led_marquee/textures/led_marquee_char_34.png b/led_marquee/textures/led_marquee_char_34.png Binary files differindex f9c62d5..dd70d72 100644 --- a/led_marquee/textures/led_marquee_char_34.png +++ b/led_marquee/textures/led_marquee_char_34.png diff --git a/led_marquee/textures/led_marquee_char_35.png b/led_marquee/textures/led_marquee_char_35.png Binary files differindex cb84a3f..d313255 100644 --- a/led_marquee/textures/led_marquee_char_35.png +++ b/led_marquee/textures/led_marquee_char_35.png diff --git a/led_marquee/textures/led_marquee_char_36.png b/led_marquee/textures/led_marquee_char_36.png Binary files differindex 09af200..d0b1571 100644 --- a/led_marquee/textures/led_marquee_char_36.png +++ b/led_marquee/textures/led_marquee_char_36.png diff --git a/led_marquee/textures/led_marquee_char_37.png b/led_marquee/textures/led_marquee_char_37.png Binary files differindex 31c9d79..cc5731c 100644 --- a/led_marquee/textures/led_marquee_char_37.png +++ b/led_marquee/textures/led_marquee_char_37.png diff --git a/led_marquee/textures/led_marquee_char_38.png b/led_marquee/textures/led_marquee_char_38.png Binary files differindex 62b192a..c699d2c 100644 --- a/led_marquee/textures/led_marquee_char_38.png +++ b/led_marquee/textures/led_marquee_char_38.png diff --git a/led_marquee/textures/led_marquee_char_39.png b/led_marquee/textures/led_marquee_char_39.png Binary files differindex fbf5116..8064f78 100644 --- a/led_marquee/textures/led_marquee_char_39.png +++ b/led_marquee/textures/led_marquee_char_39.png diff --git a/led_marquee/textures/led_marquee_char_40.png b/led_marquee/textures/led_marquee_char_40.png Binary files differindex c45ba03..081f689 100644 --- a/led_marquee/textures/led_marquee_char_40.png +++ b/led_marquee/textures/led_marquee_char_40.png diff --git a/led_marquee/textures/led_marquee_char_41.png b/led_marquee/textures/led_marquee_char_41.png Binary files differindex c5b69f4..de4abfd 100644 --- a/led_marquee/textures/led_marquee_char_41.png +++ b/led_marquee/textures/led_marquee_char_41.png diff --git a/led_marquee/textures/led_marquee_char_42.png b/led_marquee/textures/led_marquee_char_42.png Binary files differindex 29a11c1..f2563de 100644 --- a/led_marquee/textures/led_marquee_char_42.png +++ b/led_marquee/textures/led_marquee_char_42.png diff --git a/led_marquee/textures/led_marquee_char_43.png b/led_marquee/textures/led_marquee_char_43.png Binary files differindex 6238d5e..682467f 100644 --- a/led_marquee/textures/led_marquee_char_43.png +++ b/led_marquee/textures/led_marquee_char_43.png diff --git a/led_marquee/textures/led_marquee_char_44.png b/led_marquee/textures/led_marquee_char_44.png Binary files differindex 0b060ba..17f223e 100644 --- a/led_marquee/textures/led_marquee_char_44.png +++ b/led_marquee/textures/led_marquee_char_44.png diff --git a/led_marquee/textures/led_marquee_char_45.png b/led_marquee/textures/led_marquee_char_45.png Binary files differindex c349d10..747d71a 100644 --- a/led_marquee/textures/led_marquee_char_45.png +++ b/led_marquee/textures/led_marquee_char_45.png diff --git a/led_marquee/textures/led_marquee_char_46.png b/led_marquee/textures/led_marquee_char_46.png Binary files differindex baf5f41..de9e3ee 100644 --- a/led_marquee/textures/led_marquee_char_46.png +++ b/led_marquee/textures/led_marquee_char_46.png diff --git a/led_marquee/textures/led_marquee_char_47.png b/led_marquee/textures/led_marquee_char_47.png Binary files differindex bea5b3c..20cf604 100644 --- a/led_marquee/textures/led_marquee_char_47.png +++ b/led_marquee/textures/led_marquee_char_47.png diff --git a/led_marquee/textures/led_marquee_char_48.png b/led_marquee/textures/led_marquee_char_48.png Binary files differindex 26f8cd5..c2997d0 100644 --- a/led_marquee/textures/led_marquee_char_48.png +++ b/led_marquee/textures/led_marquee_char_48.png diff --git a/led_marquee/textures/led_marquee_char_49.png b/led_marquee/textures/led_marquee_char_49.png Binary files differindex acffc77..a905f50 100644 --- a/led_marquee/textures/led_marquee_char_49.png +++ b/led_marquee/textures/led_marquee_char_49.png diff --git a/led_marquee/textures/led_marquee_char_50.png b/led_marquee/textures/led_marquee_char_50.png Binary files differindex f4d1aea..73cf007 100644 --- a/led_marquee/textures/led_marquee_char_50.png +++ b/led_marquee/textures/led_marquee_char_50.png diff --git a/led_marquee/textures/led_marquee_char_51.png b/led_marquee/textures/led_marquee_char_51.png Binary files differindex 92a314d..ed7bf45 100644 --- a/led_marquee/textures/led_marquee_char_51.png +++ b/led_marquee/textures/led_marquee_char_51.png diff --git a/led_marquee/textures/led_marquee_char_52.png b/led_marquee/textures/led_marquee_char_52.png Binary files differindex fcb4e02..5eba19a 100644 --- a/led_marquee/textures/led_marquee_char_52.png +++ b/led_marquee/textures/led_marquee_char_52.png diff --git a/led_marquee/textures/led_marquee_char_53.png b/led_marquee/textures/led_marquee_char_53.png Binary files differindex 80e859f..d0cf830 100644 --- a/led_marquee/textures/led_marquee_char_53.png +++ b/led_marquee/textures/led_marquee_char_53.png diff --git a/led_marquee/textures/led_marquee_char_54.png b/led_marquee/textures/led_marquee_char_54.png Binary files differindex 8406a69..0838e6e 100644 --- a/led_marquee/textures/led_marquee_char_54.png +++ b/led_marquee/textures/led_marquee_char_54.png diff --git a/led_marquee/textures/led_marquee_char_55.png b/led_marquee/textures/led_marquee_char_55.png Binary files differindex 603dd3b..f2764fc 100644 --- a/led_marquee/textures/led_marquee_char_55.png +++ b/led_marquee/textures/led_marquee_char_55.png diff --git a/led_marquee/textures/led_marquee_char_56.png b/led_marquee/textures/led_marquee_char_56.png Binary files differindex bf42071..30cfa5a 100644 --- a/led_marquee/textures/led_marquee_char_56.png +++ b/led_marquee/textures/led_marquee_char_56.png diff --git a/led_marquee/textures/led_marquee_char_57.png b/led_marquee/textures/led_marquee_char_57.png Binary files differindex 20d7ee2..94033d5 100644 --- a/led_marquee/textures/led_marquee_char_57.png +++ b/led_marquee/textures/led_marquee_char_57.png diff --git a/led_marquee/textures/led_marquee_char_58.png b/led_marquee/textures/led_marquee_char_58.png Binary files differindex a0eeb39..ab39597 100644 --- a/led_marquee/textures/led_marquee_char_58.png +++ b/led_marquee/textures/led_marquee_char_58.png diff --git a/led_marquee/textures/led_marquee_char_59.png b/led_marquee/textures/led_marquee_char_59.png Binary files differindex a4ee576..3717f34 100644 --- a/led_marquee/textures/led_marquee_char_59.png +++ b/led_marquee/textures/led_marquee_char_59.png diff --git a/led_marquee/textures/led_marquee_char_60.png b/led_marquee/textures/led_marquee_char_60.png Binary files differindex 02ad90a..85ceea3 100644 --- a/led_marquee/textures/led_marquee_char_60.png +++ b/led_marquee/textures/led_marquee_char_60.png diff --git a/led_marquee/textures/led_marquee_char_61.png b/led_marquee/textures/led_marquee_char_61.png Binary files differindex d25824f..e561381 100644 --- a/led_marquee/textures/led_marquee_char_61.png +++ b/led_marquee/textures/led_marquee_char_61.png diff --git a/led_marquee/textures/led_marquee_char_62.png b/led_marquee/textures/led_marquee_char_62.png Binary files differindex 488f1e4..89d8bc8 100644 --- a/led_marquee/textures/led_marquee_char_62.png +++ b/led_marquee/textures/led_marquee_char_62.png diff --git a/led_marquee/textures/led_marquee_char_63.png b/led_marquee/textures/led_marquee_char_63.png Binary files differindex 5620643..7e4f0af 100644 --- a/led_marquee/textures/led_marquee_char_63.png +++ b/led_marquee/textures/led_marquee_char_63.png diff --git a/led_marquee/textures/led_marquee_char_64.png b/led_marquee/textures/led_marquee_char_64.png Binary files differindex 415e0c6..6a7b71d 100644 --- a/led_marquee/textures/led_marquee_char_64.png +++ b/led_marquee/textures/led_marquee_char_64.png diff --git a/led_marquee/textures/led_marquee_char_65.png b/led_marquee/textures/led_marquee_char_65.png Binary files differindex e853027..2d8f00f 100644 --- a/led_marquee/textures/led_marquee_char_65.png +++ b/led_marquee/textures/led_marquee_char_65.png diff --git a/led_marquee/textures/led_marquee_char_66.png b/led_marquee/textures/led_marquee_char_66.png Binary files differindex 8c9f92d..527903c 100644 --- a/led_marquee/textures/led_marquee_char_66.png +++ b/led_marquee/textures/led_marquee_char_66.png diff --git a/led_marquee/textures/led_marquee_char_67.png b/led_marquee/textures/led_marquee_char_67.png Binary files differindex fcfce9c..7ec781d 100644 --- a/led_marquee/textures/led_marquee_char_67.png +++ b/led_marquee/textures/led_marquee_char_67.png diff --git a/led_marquee/textures/led_marquee_char_68.png b/led_marquee/textures/led_marquee_char_68.png Binary files differindex c221f02..15a7870 100644 --- a/led_marquee/textures/led_marquee_char_68.png +++ b/led_marquee/textures/led_marquee_char_68.png diff --git a/led_marquee/textures/led_marquee_char_69.png b/led_marquee/textures/led_marquee_char_69.png Binary files differindex ad8bda8..034c8a9 100644 --- a/led_marquee/textures/led_marquee_char_69.png +++ b/led_marquee/textures/led_marquee_char_69.png diff --git a/led_marquee/textures/led_marquee_char_70.png b/led_marquee/textures/led_marquee_char_70.png Binary files differindex 4030b60..17ef54a 100644 --- a/led_marquee/textures/led_marquee_char_70.png +++ b/led_marquee/textures/led_marquee_char_70.png diff --git a/led_marquee/textures/led_marquee_char_71.png b/led_marquee/textures/led_marquee_char_71.png Binary files differindex 7fd8aa7..4ac0de9 100644 --- a/led_marquee/textures/led_marquee_char_71.png +++ b/led_marquee/textures/led_marquee_char_71.png diff --git a/led_marquee/textures/led_marquee_char_72.png b/led_marquee/textures/led_marquee_char_72.png Binary files differindex 0f46667..e4b9f93 100644 --- a/led_marquee/textures/led_marquee_char_72.png +++ b/led_marquee/textures/led_marquee_char_72.png diff --git a/led_marquee/textures/led_marquee_char_73.png b/led_marquee/textures/led_marquee_char_73.png Binary files differindex 9b45594..f667ff1 100644 --- a/led_marquee/textures/led_marquee_char_73.png +++ b/led_marquee/textures/led_marquee_char_73.png diff --git a/led_marquee/textures/led_marquee_char_74.png b/led_marquee/textures/led_marquee_char_74.png Binary files differindex 1b78bcb..cec3277 100644 --- a/led_marquee/textures/led_marquee_char_74.png +++ b/led_marquee/textures/led_marquee_char_74.png diff --git a/led_marquee/textures/led_marquee_char_75.png b/led_marquee/textures/led_marquee_char_75.png Binary files differindex 3e72741..efcec5b 100644 --- a/led_marquee/textures/led_marquee_char_75.png +++ b/led_marquee/textures/led_marquee_char_75.png diff --git a/led_marquee/textures/led_marquee_char_76.png b/led_marquee/textures/led_marquee_char_76.png Binary files differindex 7809c03..bdab78a 100644 --- a/led_marquee/textures/led_marquee_char_76.png +++ b/led_marquee/textures/led_marquee_char_76.png diff --git a/led_marquee/textures/led_marquee_char_77.png b/led_marquee/textures/led_marquee_char_77.png Binary files differindex bd9f207..9ac2bae 100644 --- a/led_marquee/textures/led_marquee_char_77.png +++ b/led_marquee/textures/led_marquee_char_77.png diff --git a/led_marquee/textures/led_marquee_char_78.png b/led_marquee/textures/led_marquee_char_78.png Binary files differindex 3244aed..4b0790e 100644 --- a/led_marquee/textures/led_marquee_char_78.png +++ b/led_marquee/textures/led_marquee_char_78.png diff --git a/led_marquee/textures/led_marquee_char_79.png b/led_marquee/textures/led_marquee_char_79.png Binary files differindex 846fca5..4704b18 100644 --- a/led_marquee/textures/led_marquee_char_79.png +++ b/led_marquee/textures/led_marquee_char_79.png diff --git a/led_marquee/textures/led_marquee_char_80.png b/led_marquee/textures/led_marquee_char_80.png Binary files differindex 670d3de..13c9b19 100644 --- a/led_marquee/textures/led_marquee_char_80.png +++ b/led_marquee/textures/led_marquee_char_80.png diff --git a/led_marquee/textures/led_marquee_char_81.png b/led_marquee/textures/led_marquee_char_81.png Binary files differindex 4afe8f9..8113ada 100644 --- a/led_marquee/textures/led_marquee_char_81.png +++ b/led_marquee/textures/led_marquee_char_81.png diff --git a/led_marquee/textures/led_marquee_char_82.png b/led_marquee/textures/led_marquee_char_82.png Binary files differindex ae79820..bb52600 100644 --- a/led_marquee/textures/led_marquee_char_82.png +++ b/led_marquee/textures/led_marquee_char_82.png diff --git a/led_marquee/textures/led_marquee_char_83.png b/led_marquee/textures/led_marquee_char_83.png Binary files differindex 1d9e261..9e45ab3 100644 --- a/led_marquee/textures/led_marquee_char_83.png +++ b/led_marquee/textures/led_marquee_char_83.png diff --git a/led_marquee/textures/led_marquee_char_84.png b/led_marquee/textures/led_marquee_char_84.png Binary files differindex a198bba..22160a9 100644 --- a/led_marquee/textures/led_marquee_char_84.png +++ b/led_marquee/textures/led_marquee_char_84.png diff --git a/led_marquee/textures/led_marquee_char_85.png b/led_marquee/textures/led_marquee_char_85.png Binary files differindex a1b6290..db2095c 100644 --- a/led_marquee/textures/led_marquee_char_85.png +++ b/led_marquee/textures/led_marquee_char_85.png diff --git a/led_marquee/textures/led_marquee_char_86.png b/led_marquee/textures/led_marquee_char_86.png Binary files differindex f526b3f..468bb78 100644 --- a/led_marquee/textures/led_marquee_char_86.png +++ b/led_marquee/textures/led_marquee_char_86.png diff --git a/led_marquee/textures/led_marquee_char_87.png b/led_marquee/textures/led_marquee_char_87.png Binary files differindex 9cd5474..a1fc820 100644 --- a/led_marquee/textures/led_marquee_char_87.png +++ b/led_marquee/textures/led_marquee_char_87.png diff --git a/led_marquee/textures/led_marquee_char_88.png b/led_marquee/textures/led_marquee_char_88.png Binary files differindex f626ebb..2d2e759 100644 --- a/led_marquee/textures/led_marquee_char_88.png +++ b/led_marquee/textures/led_marquee_char_88.png diff --git a/led_marquee/textures/led_marquee_char_89.png b/led_marquee/textures/led_marquee_char_89.png Binary files differindex 94b42bd..d7f1bee 100644 --- a/led_marquee/textures/led_marquee_char_89.png +++ b/led_marquee/textures/led_marquee_char_89.png diff --git a/led_marquee/textures/led_marquee_char_90.png b/led_marquee/textures/led_marquee_char_90.png Binary files differindex 335a96c..d8ed005 100644 --- a/led_marquee/textures/led_marquee_char_90.png +++ b/led_marquee/textures/led_marquee_char_90.png diff --git a/led_marquee/textures/led_marquee_char_91.png b/led_marquee/textures/led_marquee_char_91.png Binary files differindex 034ede9..3a5e16b 100644 --- a/led_marquee/textures/led_marquee_char_91.png +++ b/led_marquee/textures/led_marquee_char_91.png diff --git a/led_marquee/textures/led_marquee_char_92.png b/led_marquee/textures/led_marquee_char_92.png Binary files differindex 4e4f18a..94747ef 100644 --- a/led_marquee/textures/led_marquee_char_92.png +++ b/led_marquee/textures/led_marquee_char_92.png diff --git a/led_marquee/textures/led_marquee_char_93.png b/led_marquee/textures/led_marquee_char_93.png Binary files differindex 6af259b..e67443e 100644 --- a/led_marquee/textures/led_marquee_char_93.png +++ b/led_marquee/textures/led_marquee_char_93.png diff --git a/led_marquee/textures/led_marquee_char_94.png b/led_marquee/textures/led_marquee_char_94.png Binary files differindex b4f5bc4..d670016 100644 --- a/led_marquee/textures/led_marquee_char_94.png +++ b/led_marquee/textures/led_marquee_char_94.png diff --git a/led_marquee/textures/led_marquee_char_95.png b/led_marquee/textures/led_marquee_char_95.png Binary files differindex 4fe5ca1..ca9676f 100644 --- a/led_marquee/textures/led_marquee_char_95.png +++ b/led_marquee/textures/led_marquee_char_95.png diff --git a/led_marquee/textures/led_marquee_char_96.png b/led_marquee/textures/led_marquee_char_96.png Binary files differindex 71c2598..59aa08c 100644 --- a/led_marquee/textures/led_marquee_char_96.png +++ b/led_marquee/textures/led_marquee_char_96.png diff --git a/led_marquee/textures/led_marquee_char_97.png b/led_marquee/textures/led_marquee_char_97.png Binary files differindex c5530a4..ff4e8ab 100644 --- a/led_marquee/textures/led_marquee_char_97.png +++ b/led_marquee/textures/led_marquee_char_97.png diff --git a/led_marquee/textures/led_marquee_char_98.png b/led_marquee/textures/led_marquee_char_98.png Binary files differindex ec532d3..b24b782 100644 --- a/led_marquee/textures/led_marquee_char_98.png +++ b/led_marquee/textures/led_marquee_char_98.png diff --git a/led_marquee/textures/led_marquee_char_99.png b/led_marquee/textures/led_marquee_char_99.png Binary files differindex 7be4f95..116647b 100644 --- a/led_marquee/textures/led_marquee_char_99.png +++ b/led_marquee/textures/led_marquee_char_99.png diff --git a/led_marquee/textures/led_marquee_leds_off.png b/led_marquee/textures/led_marquee_leds_off.png Binary files differindex 82f3ea9..4e6c4d4 100644 --- a/led_marquee/textures/led_marquee_leds_off.png +++ b/led_marquee/textures/led_marquee_leds_off.png diff --git a/led_marquee/textures/led_marquee_leds_on.png b/led_marquee/textures/led_marquee_leds_on.png Binary files differnew file mode 100644 index 0000000..e7209d0 --- /dev/null +++ b/led_marquee/textures/led_marquee_leds_on.png diff --git a/led_marquee/textures/led_marquee_leds_on_cursor.png b/led_marquee/textures/led_marquee_leds_on_cursor.png Binary files differnew file mode 100644 index 0000000..1ddaa88 --- /dev/null +++ b/led_marquee/textures/led_marquee_leds_on_cursor.png diff --git a/led_marquee/textures/led_marquee_palette.png b/led_marquee/textures/led_marquee_palette.png Binary files differindex f181857..a2dbfb7 100644 --- a/led_marquee/textures/led_marquee_palette.png +++ b/led_marquee/textures/led_marquee_palette.png diff --git a/led_marquee/textures/led_marquee_single_led_on.png b/led_marquee/textures/led_marquee_single_led_on.png Binary files differindex dd6a8ed..b7fa3ed 100644 --- a/led_marquee/textures/led_marquee_single_led_on.png +++ b/led_marquee/textures/led_marquee_single_led_on.png diff --git a/signs_lib/init.lua b/signs_lib/init.lua index 82a0f1b..360bc02 100644 --- a/signs_lib/init.lua +++ b/signs_lib/init.lua @@ -41,6 +41,11 @@ local wall_dir_change = { } signs_lib.wallmounted_rotate = function(pos, node, user, mode) + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, + sender:get_player_name()) + return false + end if mode ~= screwdriver.ROTATE_FACE then return false end minetest.swap_node(pos, { name = node.name, param2 = wall_dir_change[node.param2 % 6] }) signs_lib.update_sign(pos,nil,nil,node) @@ -48,6 +53,11 @@ signs_lib.wallmounted_rotate = function(pos, node, user, mode) end signs_lib.facedir_rotate = function(pos, node, user, mode) + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, + sender:get_player_name()) + return false + end if mode ~= screwdriver.ROTATE_FACE then return false end local newparam2 = (node.param2 %8) + 1 if newparam2 == 5 then @@ -61,6 +71,11 @@ signs_lib.facedir_rotate = function(pos, node, user, mode) end signs_lib.facedir_rotate_simple = function(pos, node, user, mode) + if minetest.is_protected(pos, user:get_player_name()) then + minetest.record_protection_violation(pos, + sender:get_player_name()) + return false + end if mode ~= screwdriver.ROTATE_FACE then return false end local newparam2 = (node.param2 %8) + 1 if newparam2 > 3 then newparam2 = 0 end @@ -892,43 +907,65 @@ minetest.register_node(":locked_sign:sign_wall_locked", { return pname == owner or pname == minetest.settings:get("name") or minetest.check_player_privs(pname, {sign_editor=true}) end, - on_rotate = signs_lib.wallmounted_rotate + on_rotate = function(pos, node, user, mode) + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + if owner == user:get_player_name() then + signs_lib.wallmounted_rotate(pos, node, user, mode) + else + return false + end + end }) -- default metal sign, if defined -if minetest.registered_nodes["default:sign_wall_steel"] then - minetest.register_node(":"..default_sign_metal, { - description = S("Sign"), - inventory_image = default_sign_metal_image, - wield_image = default_sign_metal_image, - node_placement_prediction = "", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "wallmounted", - drawtype = "nodebox", - node_box = signs_lib.regular_wall_sign_model.nodebox, - tiles = {"signs_wall_sign_metal.png"}, - groups = sign_groups, - - on_place = function(itemstack, placer, pointed_thing) - return signs_lib.determine_sign_type(itemstack, placer, pointed_thing) - end, - on_construct = function(pos) - signs_lib.construct_sign(pos) - end, - on_destruct = function(pos) - signs_lib.destruct_sign(pos) - end, - on_receive_fields = function(pos, formname, fields, sender) - signs_lib.receive_fields(pos, formname, fields, sender) - end, - on_punch = function(pos, node, puncher) - signs_lib.update_sign(pos,nil,nil,node) - end, - on_rotate = signs_lib.wallmounted_rotate - }) -end +minetest.register_node(":"..default_sign_metal, { + description = S("Sign"), + inventory_image = default_sign_metal_image, + wield_image = default_sign_metal_image, + node_placement_prediction = "", + sunlight_propagates = true, + paramtype = "light", + paramtype2 = "wallmounted", + drawtype = "nodebox", + node_box = signs_lib.regular_wall_sign_model.nodebox, + tiles = {"signs_wall_sign_metal.png"}, + groups = sign_groups, + + on_place = function(itemstack, placer, pointed_thing) + return signs_lib.determine_sign_type(itemstack, placer, pointed_thing) + end, + on_construct = function(pos) + signs_lib.construct_sign(pos) + end, + on_destruct = function(pos) + signs_lib.destruct_sign(pos) + end, + on_receive_fields = function(pos, formname, fields, sender) + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + local pname = sender:get_player_name() or "" + if pname ~= owner and pname ~= minetest.settings:get("name") + and not minetest.check_player_privs(pname, {sign_editor=true}) then + return + end + signs_lib.receive_fields(pos, formname, fields, sender, true) + end, + on_punch = function(pos, node, puncher) + signs_lib.update_sign(pos,nil,nil,node) + end, + on_rotate = function(pos, node, user, mode) + local meta = minetest.get_meta(pos) + local owner = meta:get_string("owner") + if owner == user:get_player_name() then + signs_lib.wallmounted_rotate(pos, node, user, mode) + else + return false + end + end +}) + -- metal, colored signs if enable_colored_metal_signs then diff --git a/unifieddyes/init.lua b/unifieddyes/init.lua index b692810..3f0f827 100644 --- a/unifieddyes/init.lua +++ b/unifieddyes/init.lua @@ -668,10 +668,12 @@ function unifieddyes.on_airbrush(itemstack, player, pointed_thing) minetest.chat_send_player(player_name, "*** No node selected") else local hexcolor = unifieddyes.get_color_from_dye_name(painting_with) - local r = tonumber(string.sub(hexcolor,1,2),16) - local g = tonumber(string.sub(hexcolor,3,4),16) - local b = tonumber(string.sub(hexcolor,5,6),16) - player:set_sky({r=r,g=g,b=b,a=255},"plain") + if hexcolor then + local r = tonumber(string.sub(hexcolor,1,2),16) + local g = tonumber(string.sub(hexcolor,3,4),16) + local b = tonumber(string.sub(hexcolor,5,6),16) + player:set_sky({r=r,g=g,b=b,a=255},"plain") + end end return end |
