resolve mergeconflicts
This commit is contained in:
Milan Ihl
commit
029ab5aa0c
488 changed files with 9848 additions and 2154 deletions
|
|
@ -154,7 +154,7 @@ default.cool_lava = function(pos, node)
|
|||
minetest.set_node(pos, {name = lavagen[math.random(1,#lavagen)]})
|
||||
end
|
||||
minetest.sound_play("default_cool_lava",
|
||||
{pos = pos, max_hear_distance = 16, gain = 0.25})
|
||||
{pos = pos, max_hear_distance = 16, gain = 0.25}, true)
|
||||
end
|
||||
|
||||
if minetest.settings:get_bool("enable_lavacooling") ~= false then
|
||||
|
|
@ -223,7 +223,12 @@ end
|
|||
function default.grow_papyrus(pos, node)
|
||||
pos.y = pos.y - 1
|
||||
local name = minetest.get_node(pos).name
|
||||
if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
|
||||
if name ~= "default:dirt" and
|
||||
name ~= "default:dirt_with_grass" and
|
||||
name ~= "default:dirt_with_dry_grass" and
|
||||
name ~= "default:dirt_with_rainforest_litter" and
|
||||
name ~= "default:dry_dirt" and
|
||||
name ~= "default:dry_dirt_with_dry_grass" then
|
||||
return
|
||||
end
|
||||
if not minetest.find_node_near(pos, 3, {"group:water"}) then
|
||||
|
|
@ -260,7 +265,17 @@ minetest.register_abm({
|
|||
minetest.register_abm({
|
||||
label = "Grow papyrus",
|
||||
nodenames = {"default:papyrus"},
|
||||
neighbors = {"default:dirt", "default:dirt_with_grass"},
|
||||
-- Grows on the dirt and surface dirt nodes of the biomes papyrus appears in,
|
||||
-- including the old savanna nodes.
|
||||
-- 'default:dirt_with_grass' is here only because it was allowed before.
|
||||
neighbors = {
|
||||
"default:dirt",
|
||||
"default:dirt_with_grass",
|
||||
"default:dirt_with_dry_grass",
|
||||
"default:dirt_with_rainforest_litter",
|
||||
"default:dry_dirt",
|
||||
"default:dry_dirt_with_dry_grass",
|
||||
},
|
||||
interval = 14,
|
||||
chance = 71,
|
||||
action = function(...)
|
||||
|
|
@ -286,6 +301,7 @@ end
|
|||
--
|
||||
-- Fence registration helper
|
||||
--
|
||||
local fence_collision_extra = minetest.settings:get_bool("enable_fence_tall") and 3/8 or 0
|
||||
|
||||
function default.register_fence(name, def)
|
||||
minetest.register_craft({
|
||||
|
|
@ -304,17 +320,27 @@ function default.register_fence(name, def)
|
|||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "connected",
|
||||
fixed = {{-1/8, -1/2, -1/8, 1/8, 1/2, 1/8}},
|
||||
fixed = {-1/8, -1/2, -1/8, 1/8, 1/2, 1/8},
|
||||
-- connect_top =
|
||||
-- connect_bottom =
|
||||
connect_front = {{-1/16,3/16,-1/2,1/16,5/16,-1/8},
|
||||
{-1/16,-5/16,-1/2,1/16,-3/16,-1/8}},
|
||||
connect_left = {{-1/2,3/16,-1/16,-1/8,5/16,1/16},
|
||||
{-1/2,-5/16,-1/16,-1/8,-3/16,1/16}},
|
||||
connect_back = {{-1/16,3/16,1/8,1/16,5/16,1/2},
|
||||
{-1/16,-5/16,1/8,1/16,-3/16,1/2}},
|
||||
connect_right = {{1/8,3/16,-1/16,1/2,5/16,1/16},
|
||||
{1/8,-5/16,-1/16,1/2,-3/16,1/16}},
|
||||
connect_front = {{-1/16, 3/16, -1/2, 1/16, 5/16, -1/8 },
|
||||
{-1/16, -5/16, -1/2, 1/16, -3/16, -1/8 }},
|
||||
connect_left = {{-1/2, 3/16, -1/16, -1/8, 5/16, 1/16},
|
||||
{-1/2, -5/16, -1/16, -1/8, -3/16, 1/16}},
|
||||
connect_back = {{-1/16, 3/16, 1/8, 1/16, 5/16, 1/2 },
|
||||
{-1/16, -5/16, 1/8, 1/16, -3/16, 1/2 }},
|
||||
connect_right = {{ 1/8, 3/16, -1/16, 1/2, 5/16, 1/16},
|
||||
{ 1/8, -5/16, -1/16, 1/2, -3/16, 1/16}}
|
||||
},
|
||||
collision_box = {
|
||||
type = "connected",
|
||||
fixed = {-1/8, -1/2, -1/8, 1/8, 1/2 + fence_collision_extra, 1/8},
|
||||
-- connect_top =
|
||||
-- connect_bottom =
|
||||
connect_front = {-1/8, -1/2, -1/2, 1/8, 1/2 + fence_collision_extra, -1/8},
|
||||
connect_left = {-1/2, -1/2, -1/8, -1/8, 1/2 + fence_collision_extra, 1/8},
|
||||
connect_back = {-1/8, -1/2, 1/8, 1/8, 1/2 + fence_collision_extra, 1/2},
|
||||
connect_right = { 1/8, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8}
|
||||
},
|
||||
connects_to = {"group:fence", "group:wood", "group:tree", "group:wall"},
|
||||
inventory_image = fence_texture,
|
||||
|
|
@ -366,24 +392,28 @@ function default.register_fence_rail(name, def)
|
|||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "connected",
|
||||
fixed = {
|
||||
{-1/16, 3/16, -1/16, 1/16, 5/16, 1/16},
|
||||
{-1/16, -3/16, -1/16, 1/16, -5/16, 1/16}
|
||||
},
|
||||
fixed = {{-1/16, 3/16, -1/16, 1/16, 5/16, 1/16},
|
||||
{-1/16, -3/16, -1/16, 1/16, -5/16, 1/16}},
|
||||
-- connect_top =
|
||||
-- connect_bottom =
|
||||
connect_front = {
|
||||
{-1/16, 3/16, -1/2, 1/16, 5/16, -1/16},
|
||||
{-1/16, -5/16, -1/2, 1/16, -3/16, -1/16}},
|
||||
connect_left = {
|
||||
{-1/2, 3/16, -1/16, -1/16, 5/16, 1/16},
|
||||
{-1/2, -5/16, -1/16, -1/16, -3/16, 1/16}},
|
||||
connect_back = {
|
||||
{-1/16, 3/16, 1/16, 1/16, 5/16, 1/2},
|
||||
{-1/16, -5/16, 1/16, 1/16, -3/16, 1/2}},
|
||||
connect_right = {
|
||||
{1/16, 3/16, -1/16, 1/2, 5/16, 1/16},
|
||||
{1/16, -5/16, -1/16, 1/2, -3/16, 1/16}},
|
||||
connect_front = {{-1/16, 3/16, -1/2, 1/16, 5/16, -1/16},
|
||||
{-1/16, -5/16, -1/2, 1/16, -3/16, -1/16}},
|
||||
connect_left = {{-1/2, 3/16, -1/16, -1/16, 5/16, 1/16},
|
||||
{-1/2, -5/16, -1/16, -1/16, -3/16, 1/16}},
|
||||
connect_back = {{-1/16, 3/16, 1/16, 1/16, 5/16, 1/2 },
|
||||
{-1/16, -5/16, 1/16, 1/16, -3/16, 1/2 }},
|
||||
connect_right = {{ 1/16, 3/16, -1/16, 1/2, 5/16, 1/16},
|
||||
{ 1/16, -5/16, -1/16, 1/2, -3/16, 1/16}}
|
||||
},
|
||||
collision_box = {
|
||||
type = "connected",
|
||||
fixed = {-1/8, -1/2, -1/8, 1/8, 1/2 + fence_collision_extra, 1/8},
|
||||
-- connect_top =
|
||||
-- connect_bottom =
|
||||
connect_front = {-1/8, -1/2, -1/2, 1/8, 1/2 + fence_collision_extra, -1/8},
|
||||
connect_left = {-1/2, -1/2, -1/8, -1/8, 1/2 + fence_collision_extra, 1/8},
|
||||
connect_back = {-1/8, -1/2, 1/8, 1/8, 1/2 + fence_collision_extra, 1/2},
|
||||
connect_right = { 1/8, -1/2, -1/8, 1/2, 1/2 + fence_collision_extra, 1/8}
|
||||
},
|
||||
connects_to = {"group:fence", "group:wall"},
|
||||
inventory_image = fence_rail_texture,
|
||||
|
|
@ -408,6 +438,51 @@ function default.register_fence_rail(name, def)
|
|||
minetest.register_node(name, def)
|
||||
end
|
||||
|
||||
--
|
||||
-- Mese post registration helper
|
||||
--
|
||||
|
||||
function default.register_mesepost(name, def)
|
||||
minetest.register_craft({
|
||||
output = name .. " 4",
|
||||
recipe = {
|
||||
{'', 'default:glass', ''},
|
||||
{'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
|
||||
{' ', def.material, ''},
|
||||
}
|
||||
})
|
||||
|
||||
local post_texture = def.texture .. "^default_mese_post_light_side.png^[makealpha:0,0,0"
|
||||
local post_texture_dark = def.texture .. "^default_mese_post_light_side_dark.png^[makealpha:0,0,0"
|
||||
-- Allow almost everything to be overridden
|
||||
local default_fields = {
|
||||
wield_image = post_texture,
|
||||
drawtype = "nodebox",
|
||||
node_box = {
|
||||
type = "fixed",
|
||||
fixed = {
|
||||
{-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16},
|
||||
},
|
||||
},
|
||||
paramtype = "light",
|
||||
tiles = {def.texture, def.texture, post_texture_dark, post_texture_dark, post_texture, post_texture},
|
||||
light_source = default.LIGHT_MAX,
|
||||
sunlight_propagates = true,
|
||||
is_ground_content = false,
|
||||
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
}
|
||||
for k, v in pairs(default_fields) do
|
||||
if def[k] == nil then
|
||||
def[k] = v
|
||||
end
|
||||
end
|
||||
|
||||
def.texture = nil
|
||||
def.material = nil
|
||||
|
||||
minetest.register_node(name, def)
|
||||
end
|
||||
|
||||
--
|
||||
-- Leafdecay
|
||||
|
|
@ -416,7 +491,7 @@ end
|
|||
-- Prevent decay of placed leaves
|
||||
|
||||
default.after_place_leaves = function(pos, placer, itemstack, pointed_thing)
|
||||
if placer and placer:is_player() and not placer:get_player_control().sneak then
|
||||
if placer and placer:is_player() then
|
||||
local node = minetest.get_node(pos)
|
||||
node.param2 = 1
|
||||
minetest.set_node(pos, node)
|
||||
|
|
@ -429,12 +504,15 @@ local function leafdecay_after_destruct(pos, oldnode, def)
|
|||
vector.add(pos, def.radius), def.leaves)) do
|
||||
local node = minetest.get_node(v)
|
||||
local timer = minetest.get_node_timer(v)
|
||||
if node.param2 == 0 and not timer:is_started() then
|
||||
if node.param2 ~= 1 and not timer:is_started() then
|
||||
timer:start(math.random(20, 120) / 10)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local movement_gravity = tonumber(
|
||||
minetest.settings:get("movement_gravity")) or 9.81
|
||||
|
||||
local function leafdecay_on_timer(pos, def)
|
||||
if minetest.find_node_near(pos, def.radius, def.trunks) then
|
||||
return false
|
||||
|
|
@ -461,6 +539,21 @@ local function leafdecay_on_timer(pos, def)
|
|||
|
||||
minetest.remove_node(pos)
|
||||
minetest.check_for_falling(pos)
|
||||
|
||||
-- spawn a few particles for the removed node
|
||||
minetest.add_particlespawner({
|
||||
amount = 8,
|
||||
time = 0.001,
|
||||
minpos = vector.subtract(pos, {x=0.5, y=0.5, z=0.5}),
|
||||
maxpos = vector.add(pos, {x=0.5, y=0.5, z=0.5}),
|
||||
minvel = vector.new(-0.5, -1, -0.5),
|
||||
maxvel = vector.new(0.5, 0, 0.5),
|
||||
minacc = vector.new(0, -movement_gravity, 0),
|
||||
maxacc = vector.new(0, -movement_gravity, 0),
|
||||
minsize = 0,
|
||||
maxsize = 0,
|
||||
node = node,
|
||||
})
|
||||
end
|
||||
|
||||
function default.register_leafdecay(def)
|
||||
|
|
@ -485,7 +578,7 @@ end
|
|||
|
||||
|
||||
--
|
||||
-- Convert dirt to something that fits the environment
|
||||
-- Convert default:dirt to something that fits the environment
|
||||
--
|
||||
|
||||
minetest.register_abm({
|
||||
|
|
@ -521,7 +614,6 @@ minetest.register_abm({
|
|||
-- Snow check is cheapest, so comes first
|
||||
if name == "default:snow" then
|
||||
minetest.set_node(pos, {name = "default:dirt_with_snow"})
|
||||
-- Most likely case first
|
||||
elseif minetest.get_item_group(name, "grass") ~= 0 then
|
||||
minetest.set_node(pos, {name = "default:dirt_with_grass"})
|
||||
elseif minetest.get_item_group(name, "dry_grass") ~= 0 then
|
||||
|
|
@ -537,7 +629,7 @@ minetest.register_abm({
|
|||
|
||||
minetest.register_abm({
|
||||
label = "Grass covered",
|
||||
nodenames = {"group:spreading_dirt_type"},
|
||||
nodenames = {"group:spreading_dirt_type", "default:dry_dirt_with_dry_grass"},
|
||||
interval = 8,
|
||||
chance = 50,
|
||||
catch_up = false,
|
||||
|
|
@ -548,7 +640,11 @@ minetest.register_abm({
|
|||
if name ~= "ignore" and nodedef and not ((nodedef.sunlight_propagates or
|
||||
nodedef.paramtype == "light") and
|
||||
nodedef.liquidtype == "none") then
|
||||
minetest.set_node(pos, {name = "default:dirt"})
|
||||
if node.name == "default:dry_dirt_with_dry_grass" then
|
||||
minetest.set_node(pos, {name = "default:dry_dirt"})
|
||||
else
|
||||
minetest.set_node(pos, {name = "default:dirt"})
|
||||
end
|
||||
end
|
||||
end
|
||||
})
|
||||
|
|
@ -558,30 +654,65 @@ minetest.register_abm({
|
|||
-- Moss growth on cobble near water
|
||||
--
|
||||
|
||||
local moss_correspondences = {
|
||||
["default:cobble"] = "default:mossycobble",
|
||||
["stairs:slab_cobble"] = "stairs:slab_mossycobble",
|
||||
["stairs:stair_cobble"] = "stairs:stair_mossycobble",
|
||||
["stairs:stair_inner_cobble"] = "stairs:stair_inner_mossycobble",
|
||||
["stairs:stair_outer_cobble"] = "stairs:stair_outer_mossycobble",
|
||||
["walls:cobble"] = "walls:mossycobble",
|
||||
}
|
||||
minetest.register_abm({
|
||||
label = "Moss growth",
|
||||
nodenames = {"default:stone", "default:cobble", "default:stonebrick", "stairs:slab_cobble", "stairs:stair_cobble", "stairs:slab_cobble", "walls:cobble"},
|
||||
nodenames = {"default:cobble", "stairs:slab_cobble", "stairs:stair_cobble",
|
||||
"stairs:stair_inner_cobble", "stairs:stair_outer_cobble",
|
||||
"walls:cobble", "default:stone", "default:stonebrick"},
|
||||
neighbors = {"group:water"},
|
||||
interval = 16,
|
||||
chance = 200,
|
||||
catch_up = false,
|
||||
action = function(pos, node)
|
||||
if node.name == "default:stone" then
|
||||
minetest.set_node(pos, {name = "default:mossystone"})
|
||||
elseif node.name == "default:cobble" then
|
||||
minetest.set_node(pos, {name = "default:mossycobble"})
|
||||
elseif node.name == "default:stonebrick" then
|
||||
minetest.set_node(pos, {name = "default:mossystonebrick"})
|
||||
elseif node.name == "stairs:slab_cobble" then
|
||||
minetest.set_node(pos, {name = "stairs:slab_mossycobble", param2 = node.param2})
|
||||
elseif node.name == "stairs:stair_cobble" then
|
||||
minetest.set_node(pos, {name = "stairs:stair_mossycobble", param2 = node.param2})
|
||||
elseif node.name == "walls:cobble" then
|
||||
minetest.set_node(pos, {name = "walls:mossycobble", param2 = node.param2})
|
||||
node.name = moss_correspondences[node.name]
|
||||
if node.name then
|
||||
minetest.set_node(pos, node)
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
--
|
||||
-- Register a craft to copy the metadata of items
|
||||
--
|
||||
|
||||
function default.register_craft_metadata_copy(ingredient, result)
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = result,
|
||||
recipe = {ingredient, result}
|
||||
})
|
||||
|
||||
minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
|
||||
if itemstack:get_name() ~= result then
|
||||
return
|
||||
end
|
||||
|
||||
local original
|
||||
local index
|
||||
for i = 1, #old_craft_grid do
|
||||
if old_craft_grid[i]:get_name() == result then
|
||||
original = old_craft_grid[i]
|
||||
index = i
|
||||
end
|
||||
end
|
||||
if not original then
|
||||
return
|
||||
end
|
||||
local copymeta = original:get_meta():to_table()
|
||||
itemstack:get_meta():from_table(copymeta)
|
||||
-- put the book with metadata back in the craft grid
|
||||
craft_inv:set_stack("craft", index, original)
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
--
|
||||
-- NOTICE: This method is not an official part of the API yet.
|
||||
|
|
@ -589,7 +720,7 @@ minetest.register_abm({
|
|||
--
|
||||
|
||||
function default.can_interact_with_node(player, pos)
|
||||
if player then
|
||||
if player and player:is_player() then
|
||||
if minetest.check_player_privs(player, "protection_bypass") then
|
||||
return true
|
||||
end
|
||||
|
|
@ -606,7 +737,7 @@ function default.can_interact_with_node(player, pos)
|
|||
|
||||
-- Is player wielding the right key?
|
||||
local item = player:get_wielded_item()
|
||||
if item:get_name() == "default:key" then
|
||||
if minetest.get_item_group(item:get_name(), "key") == 1 then
|
||||
local key_meta = item:get_meta()
|
||||
|
||||
if key_meta:get_string("secret") == "" then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue