summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2016-09-16 02:16:59 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2016-09-16 02:16:59 -0400
commit67d414d2f9aa5999e3f1755543a68455b4bb6d99 (patch)
tree64475635b22307682583d843f02d40f1243d07b5
parentc86b260b2bad34d9293d36fb6b9e383777cd250b (diff)
downloaddreambuilder_modpack-67d414d2f9aa5999e3f1755543a68455b4bb6d99.tar
dreambuilder_modpack-67d414d2f9aa5999e3f1755543a68455b4bb6d99.tar.gz
dreambuilder_modpack-67d414d2f9aa5999e3f1755543a68455b4bb6d99.tar.bz2
dreambuilder_modpack-67d414d2f9aa5999e3f1755543a68455b4bb6d99.tar.xz
dreambuilder_modpack-67d414d2f9aa5999e3f1755543a68455b4bb6d99.zip
updated areas, ilights, locks, and signs_lib
-rw-r--r--areas/internal.lua2
-rw-r--r--ilights/init.lua2
-rw-r--r--locks/shared_locked_sign_wall.lua10
-rw-r--r--signs_lib/init.lua41
4 files changed, 29 insertions, 26 deletions
diff --git a/areas/internal.lua b/areas/internal.lua
index 05a31cd..bf7e92c 100644
--- a/areas/internal.lua
+++ b/areas/internal.lua
@@ -1,6 +1,6 @@
function areas:player_exists(name)
- return minetest.auth_table[name] ~= nil
+ return minetest.get_auth_handler().get_auth(name) ~= nil
end
-- Save the areas table to a file
diff --git a/ilights/init.lua b/ilights/init.lua
index d8de447..ca2db24 100644
--- a/ilights/init.lua
+++ b/ilights/init.lua
@@ -66,7 +66,7 @@ for _, row in ipairs(ilights.types) do
groups = {cracky=3},
paramtype = "light",
paramtype2 = "facedir",
- light_source = 15,
+ light_source = 14,
selection_box = lamp_cbox,
collision_box = lamp_cbox,
on_place = minetest.rotate_node
diff --git a/locks/shared_locked_sign_wall.lua b/locks/shared_locked_sign_wall.lua
index 2dcf19e..c04d33e 100644
--- a/locks/shared_locked_sign_wall.lua
+++ b/locks/shared_locked_sign_wall.lua
@@ -5,9 +5,9 @@
minetest.register_node("locks:shared_locked_sign_wall", {
description = "Shared locked sign",
drawtype = "signlike",
- tiles = {"default_sign_wall.png"},
- inventory_image = "default_sign_wall.png",
- wield_image = "default_sign_wall.png",
+ tiles = {"locks_lock16.png^default_sign_wood.png"},
+ inventory_image = "locks_lock16.png^default_sign_wood.png",
+ wield_image = "locks_lock16.png^default_sign_wood.png",
paramtype = "light",
paramtype2 = "wallmounted",
sunlight_propagates = true,
@@ -29,8 +29,8 @@ minetest.register_node("locks:shared_locked_sign_wall", {
"size[8,4]"..
"field[0.3,0.6;6,0.7;text;Text:;${text}]"..
"field[0.3,3.6;6,0.7;locks_sent_lock_command;Locked sign. Type /help for help:;]"..
- "button_exit[6.3,3.2;1.7,0.7;locks_sent_input;Proceed]"..
- "background[-0.5,-0.5;9,5;bg_shared_locked_sign.jpg]" );
+ "button_exit[6.3,3.2;1.7,0.7;locks_sent_input;Proceed]");
+-- "background[-0.5,-0.5;9,5;bg_shared_locked_sign.jpg]" );
end,
after_place_node = function(pos, placer)
diff --git a/signs_lib/init.lua b/signs_lib/init.lua
index 6afe495..b8f56a6 100644
--- a/signs_lib/init.lua
+++ b/signs_lib/init.lua
@@ -31,6 +31,8 @@ end
signs_lib.modpath = minetest.get_modpath("signs_lib")
+local DEFAULT_TEXT_SCALE = {x=0.8, y=0.5}
+
signs_lib.regular_wall_sign_model = {
nodebox = {
type = "wallmounted",
@@ -116,18 +118,19 @@ signs_lib.gettext = S
-- the list of standard sign nodes
signs_lib.sign_node_list = {
- "default:sign_wall_wood",
- "signs:sign_yard",
- "signs:sign_hanging",
- "signs:sign_wall_green",
- "signs:sign_wall_yellow",
- "signs:sign_wall_red",
- "signs:sign_wall_white_red",
- "signs:sign_wall_white_black",
- "signs:sign_wall_orange",
- "signs:sign_wall_blue",
- "signs:sign_wall_brown",
- "locked_sign:sign_wall_locked"
+ "default:sign_wall_wood",
+ "default:sign_wall_steel",
+ "signs:sign_yard",
+ "signs:sign_hanging",
+ "signs:sign_wall_green",
+ "signs:sign_wall_yellow",
+ "signs:sign_wall_red",
+ "signs:sign_wall_white_red",
+ "signs:sign_wall_white_black",
+ "signs:sign_wall_orange",
+ "signs:sign_wall_blue",
+ "signs:sign_wall_brown",
+ "locked_sign:sign_wall_locked"
}
local default_sign, default_sign_image
@@ -160,7 +163,7 @@ end
-- infinite stacks
-if minetest.get_modpath("unified_inventory") or not minetest.setting_getbool("creative_mode") then
+if not minetest.setting_getbool("creative_mode") then
signs_lib.expect_infinite_stacks = false
else
signs_lib.expect_infinite_stacks = true
@@ -179,8 +182,6 @@ local FONT_FMT_SIMPLE = "hdf_%02x.png"
-- Path to the textures.
local TP = MP.."/textures"
-local TEXT_SCALE = {x=0.8, y=0.5}
-
-- Lots of overkill here. KISS advocates, go away, shoo! ;) -- kaeza
local PNG_HDR = string.char(0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A)
@@ -311,9 +312,9 @@ local function make_line_texture(line, lineno, pos)
local words = { }
local n = minetest.registered_nodes[minetest.get_node(pos).name]
- local defaultcolor = n.defaultcolor or 0
+ local default_color = n.default_color or 0
- local cur_color = tonumber(defaultcolor, 16)
+ local cur_color = tonumber(default_color, 16)
-- We check which chars are available here.
for word_i, word in ipairs(line) do
@@ -409,9 +410,11 @@ end
local function set_obj_text(obj, text, new, pos)
local split = new and split_lines_and_words or split_lines_and_words_old
+ local n = minetest.registered_nodes[minetest.get_node(pos).name]
+ local text_scale = n.text_scale or DEFAULT_TEXT_SCALE
obj:set_properties({
textures={make_sign_texture(split(text), pos)},
- visual_size = TEXT_SCALE,
+ visual_size = text_scale,
})
end
@@ -864,7 +867,7 @@ for i, color in ipairs(sign_colors) do
"signs_metal_back.png",
"signs_"..color.."_front.png"
},
- defaultcolor = sign_default_text_colors[i],
+ default_color = sign_default_text_colors[i],
groups = sign_groups,
on_place = function(itemstack, placer, pointed_thing)
return signs_lib.determine_sign_type(itemstack, placer, pointed_thing)