Optimizations, fix global variable warnings, update doors mod
parent
a582d09457
commit
74fe55ea09
|
@ -1,19 +0,0 @@
|
|||
-- Only register one global step for this game and just call the respective globalstep functions
|
||||
-- from within this function, preliminary testing shows that registering one globalstep and calling
|
||||
-- all of your global step functions from there could slightly improve performance
|
||||
|
||||
function adventuretest_globalstep(dtime)
|
||||
default.player_globalstep(dtime)
|
||||
default.leaf_globalstep(dtime)
|
||||
energy_globalstep(dtime)
|
||||
hunger.global_step(dtime)
|
||||
itemdrop_globalstep(dtime)
|
||||
armor_globalstep(dtime)
|
||||
wieldview_globalstep(dtime)
|
||||
blacksmith_globalstep(dtime)
|
||||
throwing_globalstep(dtime)
|
||||
magic_globalstep(dtime)
|
||||
ambience_globalstep(dtime)
|
||||
end
|
||||
|
||||
minetest.register_globalstep(adventuretest_globalstep)
|
|
@ -1,4 +1,4 @@
|
|||
-- VARIOUS MISC ADVENTURETEST RELATED STUFF
|
||||
|
||||
dofile(minetest.get_modpath("adventuretest").."/globalstep.lua");
|
||||
dofile(minetest.get_modpath("adventuretest").."/register_functions.lua");
|
||||
dofile(minetest.get_modpath("adventuretest").."/privs.lua")
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
-- Only register one global step for this game and just call the respective globalstep functions
|
||||
-- from within this function, preliminary testing shows that registering one globalstep and calling
|
||||
-- all of your global step functions from there could slightly improve performance
|
||||
-- having all dig node code in one function seemed to have the most improvement over calling several dignode
|
||||
-- functions
|
||||
|
||||
local function adventuretest_globalstep(dtime)
|
||||
default.player_globalstep(dtime)
|
||||
default.leaf_globalstep(dtime)
|
||||
energy_globalstep(dtime)
|
||||
hunger.global_step(dtime)
|
||||
itemdrop_globalstep(dtime)
|
||||
armor_globalstep(dtime)
|
||||
wieldview_globalstep(dtime)
|
||||
blacksmith_globalstep(dtime)
|
||||
throwing_globalstep(dtime)
|
||||
magic_globalstep(dtime)
|
||||
ambience_globalstep(dtime)
|
||||
end
|
||||
minetest.register_globalstep(adventuretest_globalstep)
|
||||
|
||||
local function adventuretest_respawnplayer(player)
|
||||
energy.respawnplayer(player)
|
||||
hunger.update_hunger(player, 20)
|
||||
sethome_respawnplayer(player)
|
||||
end
|
||||
minetest.register_on_respawnplayer(adventuretest_respawnplayer)
|
||||
|
||||
local function adventuretest_dignode(pos, node, digger)
|
||||
--print("on_dignode")
|
||||
-- going to try to consolidate all on_dignode calls here so there is only one function call
|
||||
|
||||
-- ON DIG NODE FOR MONEY MOD
|
||||
for k,v in pairs(money.convert_items) do
|
||||
if ( node.name == money.convert_items[k].dig_block ) then
|
||||
money.stats[k].running_dug = money.stats[k].running_dug + 1
|
||||
end
|
||||
end
|
||||
|
||||
-- EXPERIENCE
|
||||
if minetest.registered_nodes[node.name] ~= nil then
|
||||
if minetest.registered_nodes[node.name]["skill"] ~= nil then
|
||||
default.drop_item(pos,"experience:1_exp")
|
||||
end
|
||||
end
|
||||
|
||||
-- ENERGY
|
||||
if digger ~= nil and digger ~= "" then
|
||||
local name= digger:get_player_name()
|
||||
if player_energy[name] ~= nil then
|
||||
player_energy[name] = player_energy[name] - 0.08
|
||||
end
|
||||
end
|
||||
|
||||
hunger.handle_node_actions(pos, node, digger)
|
||||
end
|
||||
minetest.register_on_dignode(adventuretest_dignode)
|
||||
|
||||
local function adventuretest_placenode(pos, node, placer)
|
||||
hunger.handle_node_actions(pos,node,placer)
|
||||
end
|
||||
minetest.register_on_placenode(adventuretest_placenode)
|
|
@ -102,42 +102,6 @@ function default.register_falling_node(nodename, texture)
|
|||
end
|
||||
end
|
||||
|
||||
--
|
||||
-- Global callbacks
|
||||
--
|
||||
|
||||
function on_dignode(pos, node, digger)
|
||||
--print("on_dignode")
|
||||
-- going to try to consolidate all on_dignode calls here so there is only one function call
|
||||
|
||||
-- ON DIG NODE FOR MONEY MOD
|
||||
for k,v in pairs(money.convert_items) do
|
||||
if ( node.name == money.convert_items[k].dig_block ) then
|
||||
money.stats[k].running_dug = money.stats[k].running_dug + 1
|
||||
end
|
||||
end
|
||||
|
||||
-- EXPERIENCE
|
||||
if minetest.registered_nodes[node.name] ~= nil then
|
||||
if minetest.registered_nodes[node.name]["skill"] ~= nil then
|
||||
default.drop_item(pos,"experience:1_exp")
|
||||
end
|
||||
end
|
||||
-- STAMINA
|
||||
if digger ~= nil and digger ~= "" then
|
||||
local name= digger:get_player_name()
|
||||
if player_energy[name] ~= nil then
|
||||
player_energy[name] = player_energy[name] - 0.1
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
minetest.register_on_dignode(on_dignode)
|
||||
|
||||
--
|
||||
-- Grow trees
|
||||
--
|
||||
|
||||
minetest.register_abm({
|
||||
nodenames = {"default:sapling"},
|
||||
interval = 10,
|
||||
|
|
|
@ -1,297 +1,502 @@
|
|||
doors = {}
|
||||
|
||||
-- Registers a door
|
||||
-- name: The name of the door
|
||||
-- def: a table with the folowing fields:
|
||||
-- description
|
||||
-- inventory_image
|
||||
-- groups
|
||||
-- tiles_bottom: the tiles of the bottom part of the door {front, side}
|
||||
-- tiles_top: the tiles of the bottom part of the door {front, side}
|
||||
-- If the following fields are not defined the default values are used
|
||||
-- node_box_bottom
|
||||
-- node_box_top
|
||||
-- selection_box_bottom
|
||||
-- selection_box_top
|
||||
-- only_placer_can_open: if true only the player who placed the door can
|
||||
-- open it
|
||||
function doors:register_door(name, def)
|
||||
def.groups.not_in_creative_inventory = 1
|
||||
function doors.register_door(name, def)
|
||||
def.groups.not_in_creative_inventory = 1
|
||||
|
||||
local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5+1.5/16}}
|
||||
local box = {{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5+1.5/16}}
|
||||
|
||||
if not def.node_box_bottom then
|
||||
def.node_box_bottom = box
|
||||
end
|
||||
if not def.node_box_top then
|
||||
def.node_box_top = box
|
||||
end
|
||||
if not def.selection_box_bottom then
|
||||
def.selection_box_bottom= box
|
||||
end
|
||||
if not def.selection_box_top then
|
||||
def.selection_box_top = box
|
||||
end
|
||||
if not def.node_box_bottom then
|
||||
def.node_box_bottom = box
|
||||
end
|
||||
if not def.node_box_top then
|
||||
def.node_box_top = box
|
||||
end
|
||||
if not def.selection_box_bottom then
|
||||
def.selection_box_bottom= box
|
||||
end
|
||||
if not def.selection_box_top then
|
||||
def.selection_box_top = box
|
||||
end
|
||||
|
||||
minetest.register_craftitem(name, {
|
||||
description = def.description,
|
||||
inventory_image = def.inventory_image,
|
||||
if not def.sound_close_door then
|
||||
def.sound_close_door = "doors_door_close"
|
||||
end
|
||||
if not def.sound_open_door then
|
||||
def.sound_open_door = "doors_door_open"
|
||||
end
|
||||
|
||||
|
||||
minetest.register_craftitem(name, {
|
||||
description = def.description,
|
||||
inventory_image = def.inventory_image,
|
||||
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
if not pointed_thing.type == "node" then
|
||||
return itemstack
|
||||
end
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
if not pointed_thing.type == "node" then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local ptu = pointed_thing.under
|
||||
local nu = minetest.get_node(ptu)
|
||||
if minetest.registered_nodes[nu.name].on_rightclick then
|
||||
return minetest.registered_nodes[nu.name].on_rightclick(ptu, nu, placer, itemstack)
|
||||
end
|
||||
local ptu = pointed_thing.under
|
||||
local nu = minetest.get_node(ptu)
|
||||
if minetest.registered_nodes[nu.name].on_rightclick then
|
||||
return minetest.registered_nodes[nu.name].on_rightclick(ptu, nu, placer, itemstack)
|
||||
end
|
||||
|
||||
local pt = pointed_thing.above
|
||||
local pt2 = {x=pt.x, y=pt.y, z=pt.z}
|
||||
pt2.y = pt2.y+1
|
||||
if
|
||||
not minetest.registered_nodes[minetest.get_node(pt).name].buildable_to or
|
||||
not minetest.registered_nodes[minetest.get_node(pt2).name].buildable_to or
|
||||
not placer or
|
||||
not placer:is_player()
|
||||
then
|
||||
return itemstack
|
||||
end
|
||||
local pt = pointed_thing.above
|
||||
local pt2 = {x=pt.x, y=pt.y, z=pt.z}
|
||||
pt2.y = pt2.y+1
|
||||
if
|
||||
not minetest.registered_nodes[minetest.get_node(pt).name].buildable_to or
|
||||
not minetest.registered_nodes[minetest.get_node(pt2).name].buildable_to or
|
||||
not placer or
|
||||
not placer:is_player()
|
||||
then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
if minetest.is_protected(pt, placer:get_player_name()) or
|
||||
minetest.is_protected(pt2, placer:get_player_name()) then
|
||||
minetest.record_protection_violation(pt, placer:get_player_name())
|
||||
return itemstack
|
||||
end
|
||||
if minetest.is_protected(pt, placer:get_player_name()) or
|
||||
minetest.is_protected(pt2, placer:get_player_name()) then
|
||||
minetest.record_protection_violation(pt, placer:get_player_name())
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local p2 = minetest.dir_to_facedir(placer:get_look_dir())
|
||||
local pt3 = {x=pt.x, y=pt.y, z=pt.z}
|
||||
if p2 == 0 then
|
||||
pt3.x = pt3.x-1
|
||||
elseif p2 == 1 then
|
||||
pt3.z = pt3.z+1
|
||||
elseif p2 == 2 then
|
||||
pt3.x = pt3.x+1
|
||||
elseif p2 == 3 then
|
||||
pt3.z = pt3.z-1
|
||||
end
|
||||
if not string.find(minetest.get_node(pt3).name, name.."_b_") then
|
||||
minetest.set_node(pt, {name=name.."_b_1", param2=p2})
|
||||
minetest.set_node(pt2, {name=name.."_t_1", param2=p2})
|
||||
else
|
||||
minetest.set_node(pt, {name=name.."_b_2", param2=p2})
|
||||
minetest.set_node(pt2, {name=name.."_t_2", param2=p2})
|
||||
end
|
||||
local p2 = minetest.dir_to_facedir(placer:get_look_dir())
|
||||
local pt3 = {x=pt.x, y=pt.y, z=pt.z}
|
||||
if p2 == 0 then
|
||||
pt3.x = pt3.x-1
|
||||
elseif p2 == 1 then
|
||||
pt3.z = pt3.z+1
|
||||
elseif p2 == 2 then
|
||||
pt3.x = pt3.x+1
|
||||
elseif p2 == 3 then
|
||||
pt3.z = pt3.z-1
|
||||
end
|
||||
if minetest.get_item_group(minetest.get_node(pt3).name, "door") == 0 then
|
||||
minetest.set_node(pt, {name=name.."_b_1", param2=p2})
|
||||
minetest.set_node(pt2, {name=name.."_t_1", param2=p2})
|
||||
else
|
||||
minetest.set_node(pt, {name=name.."_b_2", param2=p2})
|
||||
minetest.set_node(pt2, {name=name.."_t_2", param2=p2})
|
||||
minetest.get_meta(pt):set_int("right", 1)
|
||||
minetest.get_meta(pt2):set_int("right", 1)
|
||||
end
|
||||
|
||||
if def.only_placer_can_open then
|
||||
local pn = placer:get_player_name()
|
||||
local meta = minetest.get_meta(pt)
|
||||
meta:set_string("doors_owner", pn)
|
||||
meta:set_string("infotext", "Owned by "..pn)
|
||||
meta = minetest.get_meta(pt2)
|
||||
meta:set_string("doors_owner", pn)
|
||||
meta:set_string("infotext", "Owned by "..pn)
|
||||
end
|
||||
if def.only_placer_can_open then
|
||||
local pn = placer:get_player_name()
|
||||
local meta = minetest.get_meta(pt)
|
||||
meta:set_string("doors_owner", pn)
|
||||
meta:set_string("infotext", "Owned by "..pn)
|
||||
meta = minetest.get_meta(pt2)
|
||||
meta:set_string("doors_owner", pn)
|
||||
meta:set_string("infotext", "Owned by "..pn)
|
||||
end
|
||||
|
||||
if not minetest.setting_getbool("creative_mode") then
|
||||
itemstack:take_item()
|
||||
end
|
||||
return itemstack
|
||||
end,
|
||||
})
|
||||
if not minetest.setting_getbool("creative_mode") then
|
||||
itemstack:take_item()
|
||||
end
|
||||
return itemstack
|
||||
end,
|
||||
})
|
||||
|
||||
local tt = def.tiles_top
|
||||
local tb = def.tiles_bottom
|
||||
local tt = def.tiles_top
|
||||
local tb = def.tiles_bottom
|
||||
|
||||
local function after_dig_node(pos, name, digger)
|
||||
local node = minetest.get_node(pos)
|
||||
if node.name == name then
|
||||
minetest.node_dig(pos, node, digger)
|
||||
end
|
||||
end
|
||||
|
||||
local function after_dig_node(pos, name)
|
||||
if minetest.get_node(pos).name == name then
|
||||
minetest.remove_node(pos)
|
||||
end
|
||||
end
|
||||
local function check_and_blast(pos, name)
|
||||
local node = minetest.get_node(pos)
|
||||
if node.name == name then
|
||||
minetest.remove_node(pos)
|
||||
end
|
||||
end
|
||||
|
||||
local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
|
||||
minetest.sound_play("doors_wood1",{pos=pos})
|
||||
pos.y = pos.y+dir
|
||||
if not minetest.get_node(pos).name == check_name then
|
||||
return
|
||||
end
|
||||
local p2 = minetest.get_node(pos).param2
|
||||
p2 = params[p2+1]
|
||||
local function make_on_blast(base_name, dir, door_type, other_door_type)
|
||||
if def.only_placer_can_open then
|
||||
return function() end
|
||||
else
|
||||
return function(pos, intensity)
|
||||
check_and_blast(pos, base_name .. door_type)
|
||||
pos.y = pos.y + dir
|
||||
check_and_blast(pos, base_name .. other_door_type)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
minetest.swap_node(pos, {name=replace_dir, param2=p2})
|
||||
local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
|
||||
pos.y = pos.y+dir
|
||||
if not minetest.get_node(pos).name == check_name then
|
||||
return
|
||||
end
|
||||
local p2 = minetest.get_node(pos).param2
|
||||
p2 = params[p2+1]
|
||||
|
||||
minetest.swap_node(pos, {name=replace_dir, param2=p2})
|
||||
|
||||
pos.y = pos.y-dir
|
||||
minetest.swap_node(pos, {name=replace, param2=p2})
|
||||
|
||||
pos.y = pos.y-dir
|
||||
minetest.swap_node(pos, {name=replace, param2=p2})
|
||||
end
|
||||
local snd_1 = def.sound_close_door
|
||||
local snd_2 = def.sound_open_door
|
||||
if params[1] == 3 then
|
||||
snd_1 = def.sound_open_door
|
||||
snd_2 = def.sound_close_door
|
||||
end
|
||||
|
||||
local function check_player_priv(pos, player)
|
||||
if not def.only_placer_can_open then
|
||||
return true
|
||||
end
|
||||
local meta = minetest.get_meta(pos)
|
||||
local pn = player:get_player_name()
|
||||
return (meta:get_string("doors_owner") == pn) or (minetest.check_player_privs(player:get_player_name(), {server=true}))
|
||||
end
|
||||
if minetest.get_meta(pos):get_int("right") ~= 0 then
|
||||
minetest.sound_play(snd_1, {pos = pos, gain = 0.3, max_hear_distance = 10})
|
||||
else
|
||||
minetest.sound_play(snd_2, {pos = pos, gain = 0.3, max_hear_distance = 10})
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_node(name.."_b_1", {
|
||||
tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
drop = name,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_bottom
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_bottom
|
||||
},
|
||||
groups = def.groups,
|
||||
local function check_player_priv(pos, player)
|
||||
if not def.only_placer_can_open then
|
||||
return true
|
||||
end
|
||||
local meta = minetest.get_meta(pos)
|
||||
local pn = player:get_player_name()
|
||||
return meta:get_string("doors_owner") == pn
|
||||
end
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y+1
|
||||
after_dig_node(pos, name.."_t_1")
|
||||
end,
|
||||
local function on_rotate(pos, node, dir, user, check_name, mode, new_param2)
|
||||
if not check_player_priv(pos, user) then
|
||||
return false
|
||||
end
|
||||
if mode ~= screwdriver.ROTATE_FACE then
|
||||
return false
|
||||
end
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
|
||||
end
|
||||
end,
|
||||
pos.y = pos.y + dir
|
||||
if not minetest.get_node(pos).name == check_name then
|
||||
return false
|
||||
end
|
||||
if minetest.is_protected(pos, user:get_player_name()) then
|
||||
minetest.record_protection_violation(pos, user:get_player_name())
|
||||
return false
|
||||
end
|
||||
|
||||
can_dig = check_player_priv,
|
||||
})
|
||||
local node2 = minetest.get_node(pos)
|
||||
node2.param2 = (node2.param2 + 1) % 4
|
||||
minetest.swap_node(pos, node2)
|
||||
|
||||
minetest.register_node(name.."_t_1", {
|
||||
tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1].."^[transformfx"},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
drop = name,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_top
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_top
|
||||
},
|
||||
groups = def.groups,
|
||||
pos.y = pos.y - dir
|
||||
node.param2 = (node.param2 + 1) % 4
|
||||
minetest.swap_node(pos, node)
|
||||
return true
|
||||
end
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y-1
|
||||
after_dig_node(pos, name.."_b_1")
|
||||
end,
|
||||
minetest.register_node(name.."_b_1", {
|
||||
tiles = {tb[2], tb[2], tb[2], tb[2], tb[1], tb[1].."^[transformfx"},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
drop = name,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_bottom
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_bottom
|
||||
},
|
||||
groups = def.groups,
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y+1
|
||||
after_dig_node(pos, name.."_t_1", digger)
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
|
||||
end
|
||||
end,
|
||||
|
||||
on_rotate = function(pos, node, user, mode, new_param2)
|
||||
return on_rotate(pos, node, 1, user, name.."_t_1", mode)
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0})
|
||||
end
|
||||
end,
|
||||
can_dig = check_player_priv,
|
||||
sounds = def.sounds,
|
||||
sunlight_propagates = def.sunlight,
|
||||
on_blast = make_on_blast(name, 1, "_b_1", "_t_1")
|
||||
})
|
||||
|
||||
can_dig = check_player_priv,
|
||||
})
|
||||
minetest.register_node(name.."_t_1", {
|
||||
tiles = {tt[2], tt[2], tt[2], tt[2], tt[1], tt[1].."^[transformfx"},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
drop = "",
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_top
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_top
|
||||
},
|
||||
groups = def.groups,
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y-1
|
||||
after_dig_node(pos, name.."_b_1", digger)
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0})
|
||||
end
|
||||
end,
|
||||
|
||||
on_rotate = function(pos, node, user, mode, new_param2)
|
||||
return on_rotate(pos, node, -1, user, name.."_b_1", mode)
|
||||
end,
|
||||
|
||||
minetest.register_node(name.."_b_2", {
|
||||
tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
drop = name,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_bottom
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_bottom
|
||||
},
|
||||
groups = def.groups,
|
||||
can_dig = check_player_priv,
|
||||
sounds = def.sounds,
|
||||
sunlight_propagates = def.sunlight,
|
||||
on_blast = make_on_blast(name, -1, "_t_1", "_b_1")
|
||||
})
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y+1
|
||||
after_dig_node(pos, name.."_t_2")
|
||||
end,
|
||||
minetest.register_node(name.."_b_2", {
|
||||
tiles = {tb[2], tb[2], tb[2], tb[2], tb[1].."^[transformfx", tb[1]},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
drop = name,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_bottom
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_bottom
|
||||
},
|
||||
groups = def.groups,
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y+1
|
||||
after_dig_node(pos, name.."_t_2", digger)
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
|
||||
end
|
||||
end,
|
||||
|
||||
on_rotate = function(pos, node, user, mode, new_param2)
|
||||
return on_rotate(pos, node, 1, user, name.."_t_2", mode)
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
|
||||
end
|
||||
end,
|
||||
can_dig = check_player_priv,
|
||||
sounds = def.sounds,
|
||||
sunlight_propagates = def.sunlight,
|
||||
on_blast = make_on_blast(name, 1, "_b_2", "_t_2")
|
||||
})
|
||||
|
||||
can_dig = check_player_priv,
|
||||
})
|
||||
minetest.register_node(name.."_t_2", {
|
||||
tiles = {tt[2], tt[2], tt[2], tt[2], tt[1].."^[transformfx", tt[1]},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
drop = "",
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_top
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_top
|
||||
},
|
||||
groups = def.groups,
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y-1
|
||||
after_dig_node(pos, name.."_b_2", digger)
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2})
|
||||
end
|
||||
end,
|
||||
|
||||
on_rotate = function(pos, node, user, mode, new_param2)
|
||||
return on_rotate(pos, node, -1, user, name.."_b_2", mode)
|
||||
end,
|
||||
|
||||
minetest.register_node(name.."_t_2", {
|
||||
tiles = {tt[2], tt[2], tt[2], tt[2], tt[1].."^[transformfx", tt[1]},
|
||||
paramtype = "light",
|
||||
paramtype2 = "facedir",
|
||||
drop = name,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = def.node_box_top
|
||||
},
|
||||
selection_box = {
|
||||
type = "fixed",
|
||||
fixed = def.selection_box_top
|
||||
},
|
||||
groups = def.groups,
|
||||
can_dig = check_player_priv,
|
||||
sounds = def.sounds,
|
||||
sunlight_propagates = def.sunlight,
|
||||
on_blast = make_on_blast(name, -1, "_t_2", "_b_2")
|
||||
})
|
||||
|
||||
after_dig_node = function(pos, oldnode, oldmetadata, digger)
|
||||
pos.y = pos.y-1
|
||||
after_dig_node(pos, name.."_b_2")
|
||||
end,
|
||||
|
||||
on_rightclick = function(pos, node, clicker)
|
||||
if check_player_priv(pos, clicker) then
|
||||
on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2})
|
||||
end
|
||||
end,
|
||||
|
||||
can_dig = check_player_priv,
|
||||
})
|
||||
end
|
||||
|
||||
doors:register_door("doors:door_wood", {
|
||||
description = "Wooden Door",
|
||||
inventory_image = "door_wood.png",
|
||||
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
|
||||
tiles_bottom = {"door_wood_b.png", "door_brown.png"},
|
||||
tiles_top = {"door_wood_a.png", "door_brown.png"},
|
||||
doors.register_door("doors:door_wood", {
|
||||
description = "Wooden Door",
|
||||
inventory_image = "doors_wood.png",
|
||||
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
|
||||
tiles_bottom = {"doors_wood_b.png", "doors_brown.png"},
|
||||
tiles_top = {"doors_wood_a.png", "doors_brown.png"},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
sunlight = false,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "doors:door_wood",
|
||||
recipe = {
|
||||
{"group:wood", "group:wood"},
|
||||
{"group:wood", "group:wood"},
|
||||
{"group:wood", "group:wood"}
|
||||
}
|
||||
output = "doors:door_wood",
|
||||
recipe = {
|
||||
{"group:wood", "group:wood"},
|
||||
{"group:wood", "group:wood"},
|
||||
{"group:wood", "group:wood"}
|
||||
}
|
||||
})
|
||||
|
||||
doors:register_door("doors:door_steel", {
|
||||
description = "Steel Door",
|
||||
inventory_image = "door_steel.png",
|
||||
groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
|
||||
tiles_bottom = {"door_steel_b.png", "door_grey.png"},
|
||||
tiles_top = {"door_steel_a.png", "door_grey.png"},
|
||||
only_placer_can_open = true,
|
||||
doors.register_door("doors:door_steel", {
|
||||
description = "Steel Door",
|
||||
inventory_image = "doors_steel.png",
|
||||
groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
|
||||
tiles_bottom = {"doors_steel_b.png", "doors_grey.png"},
|
||||
tiles_top = {"doors_steel_a.png", "doors_grey.png"},
|
||||
only_placer_can_open = true,
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
sunlight = false,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "doors:door_steel",
|
||||
recipe = {
|
||||
{"default:steel_ingot", "default:steel_ingot"},
|
||||
{"default:steel_ingot", "default:steel_ingot"},
|
||||
{"default:steel_ingot", "default:steel_ingot"}
|
||||
}
|
||||
output = "doors:door_steel",
|
||||
recipe = {
|
||||
{"default:steel_ingot", "default:steel_ingot"},
|
||||
{"default:steel_ingot", "default:steel_ingot"},
|
||||
{"default:steel_ingot", "default:steel_ingot"}
|
||||
}
|
||||
})
|
||||
|
||||
minetest.register_alias("doors:door_wood_a_c", "doors:door_wood_t_1")
|
||||
minetest.register_alias("doors:door_wood_a_o", "doors:door_wood_t_1")
|
||||
minetest.register_alias("doors:door_wood_b_c", "doors:door_wood_b_1")
|
||||
minetest.register_alias("doors:door_wood_b_o", "doors:door_wood_b_1")
|
||||
doors.register_door("doors:door_glass", {
|
||||
description = "Glass Door",
|
||||
inventory_image = "doors_glass.png",
|
||||
groups = {snappy=1,cracky=1,oddly_breakable_by_hand=3,door=1},
|
||||
tiles_bottom = {"doors_glass_b.png", "doors_glass_side.png"},
|
||||
tiles_top = {"doors_glass_a.png", "doors_glass_side.png"},
|
||||
sounds = default.node_sound_glass_defaults(),
|
||||
sunlight = true,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "doors:door_glass",
|
||||
recipe = {
|
||||
{"default:glass", "default:glass"},
|
||||
{"default:glass", "default:glass"},
|
||||
{"default:glass", "default:glass"}
|
||||
}
|
||||
})
|
||||
|
||||
doors.register_door("doors:door_obsidian_glass", {
|
||||
description = "Obsidian Glass Door",
|
||||
inventory_image = "doors_obsidian_glass.png",
|
||||
groups = {snappy=1,cracky=1,oddly_breakable_by_hand=3,door=1},
|
||||
tiles_bottom = {"doors_obsidian_glass_b.png", "doors_obsidian_glass_side.png"},
|
||||
tiles_top = {"doors_obsidian_glass_a.png", "doors_obsidian_glass_side.png"},
|
||||
sounds = default.node_sound_glass_defaults(),
|
||||
sunlight = true,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "doors:door_obsidian_glass",
|
||||
recipe = {
|
||||
{"default:obsidian_glass", "default:obsidian_glass"},
|
||||
{"default:obsidian_glass", "default:obsidian_glass"},
|
||||
{"default:obsidian_glass", "default:obsidian_glass"}
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
----trapdoor----
|
||||
|
||||
function doors.register_trapdoor(name, def)
|
||||
local name_closed = name
|
||||
local name_opened = name.."_open"
|
||||
|
||||
def.on_rightclick = function (pos, node)
|
||||
local newname = node.name == name_closed and name_opened or name_closed
|
||||
local sound = false
|
||||
if node.name == name_closed then sound = def.sound_open end
|
||||
if node.name == name_opened then sound = def.sound_close end
|
||||
if sound then
|
||||
minetest.sound_play(sound, {pos = pos, gain = 0.3, max_hear_distance = 10})
|
||||
end
|
||||
minetest.set_node(pos, {name = newname, param1 = node.param1, param2 = node.param2})
|
||||
end
|
||||
|
||||
def.on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple
|
||||
|
||||
-- Common trapdoor configuration
|
||||
def.drawtype = "nodebox"
|
||||
def.paramtype = "light"
|
||||
def.paramtype2 = "facedir"
|
||||
def.is_ground_content = false
|
||||
|
||||
local def_opened = table.copy(def)
|
||||
local def_closed = table.copy(def)
|
||||
|
||||
def_closed.node_box = {
|
||||
type = "fixed",
|
||||
fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
|
||||
}
|
||||
def_closed.selection_box = {
|
||||
type = "fixed",
|
||||
fixed = {-0.5, -0.5, -0.5, 0.5, -0.4, 0.5}
|
||||
}
|
||||
def_closed.tiles = { def.tile_front, def.tile_front, def.tile_side, def.tile_side,
|
||||
def.tile_side, def.tile_side }
|
||||
|
||||
def_opened.node_box = {
|
||||
type = "fixed",
|
||||
fixed = {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5}
|
||||
}
|
||||
def_opened.selection_box = {
|
||||
type = "fixed",
|
||||
fixed = {-0.5, -0.5, 0.4, 0.5, 0.5, 0.5}
|
||||
}
|
||||
def_opened.tiles = { def.tile_side, def.tile_side, def.tile_side, def.tile_side,
|
||||
def.tile_front, def.tile_front }
|
||||
def_opened.drop = name_closed
|
||||
def_opened.groups.not_in_creative_inventory = 1
|
||||
|
||||
minetest.register_node(name_opened, def_opened)
|
||||
minetest.register_node(name_closed, def_closed)
|
||||
end
|
||||
|
||||
|
||||
|
||||
doors.register_trapdoor("doors:trapdoor", {
|
||||
description = "Trapdoor",
|
||||
inventory_image = "doors_trapdoor.png",
|
||||
wield_image = "doors_trapdoor.png",
|
||||
tile_front = "doors_trapdoor.png",
|
||||
tile_side = "doors_trapdoor_side.png",
|
||||
groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=2, door=1},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
sound_open = "doors_door_open",
|
||||
sound_close = "doors_door_close"
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = 'doors:trapdoor 2',
|
||||
recipe = {
|
||||
{'group:wood', 'group:wood', 'group:wood'},
|
||||
{'group:wood', 'group:wood', 'group:wood'},
|
||||
{'', '', ''},
|
||||
}
|
||||
})
|
|
@ -31,11 +31,11 @@ function energy.update_energy(p,name)
|
|||
-- adjust their energy
|
||||
local vdiff = pos.y - player_lastpos[name].y
|
||||
if vdiff > 0 then
|
||||
adj = adj - ( vdiff * 0.05 )
|
||||
adj = adj - ( vdiff * 0.15 )
|
||||
end
|
||||
|
||||
local hdiff = math.sqrt(math.pow(pos.x-player_lastpos[name].x, 2) + math.pow(pos.z-player_lastpos[name].z, 2))
|
||||
adj = adj - ( hdiff * 0.02 )
|
||||
adj = adj - ( hdiff * 0.05 )
|
||||
|
||||
player_energy[name] = player_energy[name] + adj
|
||||
if player_energy[name] < 0 then
|
||||
|
@ -65,7 +65,6 @@ function energy.update_energy(p,name)
|
|||
end
|
||||
end
|
||||
player_lastpos[name] = pos
|
||||
print("Update Energy for "..name.." "..tostring(player_energy[name]))
|
||||
hud.change_item(p,"energy",{number = player_energy[name]})
|
||||
end
|
||||
|
||||
|
@ -133,11 +132,12 @@ minetest.register_chatcommand("stand",{
|
|||
end,
|
||||
})
|
||||
|
||||
minetest.register_on_respawnplayer(function (player)
|
||||
function energy.respawnplayer(player)
|
||||
local name = player:get_player_name()
|
||||
player_energy[name] = 20
|
||||
player_lastpos[name] = player:getpos()
|
||||
end)
|
||||
affects.removeAffect(name,"tired")
|
||||
end
|
||||
|
||||
minetest.register_on_joinplayer(function (player)
|
||||
local name = player:get_player_name()
|
||||
|
|
|
@ -44,11 +44,5 @@ if minetest.setting_getbool("enable_damage") then
|
|||
end)
|
||||
end)
|
||||
|
||||
-- for exhaustion
|
||||
minetest.register_on_placenode(hunger.handle_node_actions)
|
||||
minetest.register_on_dignode(hunger.handle_node_actions)
|
||||
minetest.register_on_item_eat(hunger.eat)
|
||||
minetest.register_on_respawnplayer(function(player)
|
||||
hunger.update_hunger(player, 20)
|
||||
end)
|
||||
end
|
||||
|
|
|
@ -27,7 +27,6 @@ function magic.register_spell(def)
|
|||
minetest.log("error","Unable to register spell, missing on_cast function")
|
||||
return
|
||||
end
|
||||
print("Cast spell good")
|
||||
magic._spells[def.id] = def
|
||||
end
|
||||
|
||||
|
@ -41,7 +40,6 @@ function magic.register_spell(def)
|
|||
minetest.log("error","Unable to register spell, missing wand_texture")
|
||||
return
|
||||
end
|
||||
print("wand spell good")
|
||||
-- register the wand tool
|
||||
minetest.register_tool("magic:wand_"..def.id,{
|
||||
description = def.desc,
|
||||
|
|
|
@ -457,9 +457,9 @@ local function mg_generate(minp, maxp, emin, emax, vm)
|
|||
local y=math.floor(smooth_surface(x, z, village_noise, vx, vz, vs, vh, ni, noise1, noise2, noise3, noise4))
|
||||
humidity = noise_humidity[ni]
|
||||
temperature = noise_temperature[ni] - math.max(y, 0)/50
|
||||
biome = get_nearest_biome(biome_table, x, z)
|
||||
biome_humidity = biome.h
|
||||
biome_temperature = biome.t
|
||||
local biome = get_nearest_biome(biome_table, x, z)
|
||||
local biome_humidity = biome.h
|
||||
local biome_temperature = biome.t
|
||||
if biome_temperature<-0.4 then
|
||||
liquid_top = c_ice
|
||||
else
|
||||
|
|
|
@ -15,7 +15,7 @@ function draw_sphere(name, wherein, center, radius, data, a, insideva)
|
|||
radius = math.ceil(radius)+variant
|
||||
end
|
||||
|
||||
pos0={}
|
||||
local pos0={}
|
||||
|
||||
for x=-radius, radius do
|
||||
pos0.x=center.x+x
|
||||
|
@ -41,7 +41,7 @@ function place_segment(name, wherein, pos1, pos2, minp, maxp, radius, data, a, i
|
|||
draw_sphere(name,wherein,pos1,radius, data, a, insideva)
|
||||
for i=1,N do
|
||||
p={x=p.x+s.x,y=p.y+s.y,z=p.z+s.z}
|
||||
p0=round_pos(p)
|
||||
local p0=round_pos(p)
|
||||
if not in_cuboid(p0, minp, maxp) then return end
|
||||
draw_sphere(name,wherein,p0,radius, data, a, insideva)
|
||||
end
|
||||
|
@ -100,8 +100,8 @@ function generate_vein(name, wherein, minp, maxp, seeddiff, options, data, a, in
|
|||
for yblocksdiff=-vblocks,vblocks do
|
||||
for zblocksdiff=-hblocks,hblocks do
|
||||
if xblocksdiff~=0 or yblocksdiff~=0 or zblocksdiff~=0 then
|
||||
new_minp={x=minp.x+xblocksdiff*80,y=minp.y+yblocksdiff*80,z=minp.z+zblocksdiff*80}
|
||||
new_maxp={x=maxp.x+xblocksdiff*80,y=maxp.y+yblocksdiff*80,z=maxp.z+zblocksdiff*80}
|
||||
local new_minp={x=minp.x+xblocksdiff*80,y=minp.y+yblocksdiff*80,z=minp.z+zblocksdiff*80}
|
||||
local new_maxp={x=maxp.x+xblocksdiff*80,y=maxp.y+yblocksdiff*80,z=maxp.z+zblocksdiff*80}
|
||||
generate_vein(name, wherein, new_minp, new_maxp, seeddiff, options, data, a, insideva, true)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -122,7 +122,7 @@ minetest.register_chatcommand("sethome", {
|
|||
end,
|
||||
})
|
||||
|
||||
minetest.register_on_respawnplayer( function (player)
|
||||
function sethome_respawnplayer (player)
|
||||
local name = player:get_player_name()
|
||||
if minetest.check_player_privs(name,{immortal = true}) then
|
||||
return true
|
||||
|
@ -133,6 +133,6 @@ minetest.register_on_respawnplayer( function (player)
|
|||
else
|
||||
return false
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue